[SYNCOPE-1846] - Fixed a bug that always displayed the same panel for…

… creating relationships, preventing the creation of more than one relationship at a time. Fixed a console issue occurring after deleting a relationship.
apache · Dec 9, 2024 · 56507da · 56507da
1 parent 77dd1ec
commit 56507da
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/...console/src/main/java/org/apache/syncope/client/console/panels/RelationshipViewPanel.java b/...console/src/main/java/org/apache/syncope/client/console/panels/RelationshipViewPanel.java
@@ -75,6 +75,7 @@ protected void populateItem(final ListItem<RelationshipTO> relationshipItem) {
                     @Override
                     public void onClick(final AjaxRequestTarget target, final RelationshipTO modelObject) {
                         relationships.remove(modelObject);
+                        relationshipsList.remove(relationshipItem);
                         target.add(RelationshipViewPanel.this);
                     }
                 }, ActionLink.ActionType.DELETE, AnyEntitlement.UPDATE.getFor(anyTO.getType()), true).hideLabel();
@@ -133,12 +134,12 @@ private void buildRowLabels(
 
         row.add(new Label("relationship", relationshipTO.getType()));
         Label leftEnd = new Label("left_end", isLeftRelation
-                ? String.format("%s %s", anyTO.getType() , anyName)
+                ? String.format("%s %s", anyTO.getType(), anyName)
                 : String.format("%s %s", relationshipTO.getOtherEndType(), relationshipTO.getOtherEndName()));
 
         Label rightEnd = new Label("right_end", isLeftRelation
                 ? String.format("%s %s", relationshipTO.getOtherEndType(), relationshipTO.getOtherEndName())
-                : String.format("%s %s", anyTO.getType() , anyName));
+                : String.format("%s %s", anyTO.getType(), anyName));
 
         if (anyTO.getKey() != null && anyTO.getKey().equals(relationshipTO.getOtherEndKey())) {
             setBold(leftEnd, rightEnd);

diff --git a/...po/console/src/main/java/org/apache/syncope/client/console/wizards/any/Relationships.java b/...po/console/src/main/java/org/apache/syncope/client/console/wizards/any/Relationships.java
@@ -91,8 +91,6 @@ public class Relationships extends WizardStep implements ICondition {
 
     protected final AnyTO anyTO;
 
-    protected final Specification specification;
-
     protected final PageReference pageRef;
 
     public Relationships(final AnyWrapper<?> modelObject, final PageReference pageRef) {
@@ -110,7 +108,6 @@ public Relationships(final AnyWrapper<?> modelObject, final PageReference pageRe
         }
 
         this.anyTO = modelObject.getInnerObject();
-        this.specification = new Specification();
         this.pageRef = pageRef;
 
         // ------------------------
@@ -148,7 +145,7 @@ protected Fragment getViewFragment() {
             public void onClick(final AjaxRequestTarget target, final RelationshipTO ignore) {
                 Fragment addFragment = new Fragment("relationships", "addFragment", Relationships.this);
                 addOrReplace(addFragment);
-                addFragment.add(specification.setRenderBodyOnly(true));
+                addFragment.add(new Specification().setRenderBodyOnly(true));
                 target.add(Relationships.this);
             }
         }, ActionType.CREATE, AnyEntitlement.UPDATE.getFor(anyTO.getType())).hideLabel();