Fixing a few Console glitches

apache · Jun 26, 2023 · 9f353bb · 9f353bb
1 parent 2de9269
commit 9f353bb
Show file tree

Hide file tree

Showing 31 changed files with 141 additions and 157 deletions.
diff --git a/...che/syncope/client/console/commons/IdMAnyDirectoryPanelAdditionalActionLinksProvider.java b/...che/syncope/client/console/commons/IdMAnyDirectoryPanelAdditionalActionLinksProvider.java
@@ -30,9 +30,12 @@
 import org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
 import org.apache.syncope.client.console.wicket.markup.html.form.Action;
 import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink;
+import org.apache.syncope.client.console.wizards.any.AnyObjectWrapper;
+import org.apache.syncope.client.console.wizards.any.GroupWrapper;
 import org.apache.syncope.client.console.wizards.any.MergeLinkedAccountsWizardBuilder;
 import org.apache.syncope.client.ui.commons.wizards.AjaxWizard;
 import org.apache.syncope.client.ui.commons.wizards.any.AnyWrapper;
+import org.apache.syncope.client.ui.commons.wizards.any.UserWrapper;
 import org.apache.syncope.common.lib.to.AnyObjectTO;
 import org.apache.syncope.common.lib.to.GroupTO;
 import org.apache.syncope.common.lib.to.UserTO;
@@ -81,7 +84,7 @@ public List<Action<UserTO>> get(
             @Override
             public void onClick(final AjaxRequestTarget target, final UserTO ignore) {
                 IModel<AnyWrapper<UserTO>> formModel = new CompoundPropertyModel<>(
-                        new AnyWrapper<>(model.getObject()));
+                        new UserWrapper(model.getObject()));
                 modal.setFormModel(formModel);
 
                 target.add(modal.setContent(new AnyStatusModal<>(
@@ -108,7 +111,7 @@ public void onClick(final AjaxRequestTarget target, final UserTO ignore) {
             public void onClick(final AjaxRequestTarget target, final UserTO ignore) {
                 model.setObject(userRestClient.read(model.getObject().getKey()));
                 IModel<AnyWrapper<UserTO>> formModel = new CompoundPropertyModel<>(
-                        new AnyWrapper<>(model.getObject()));
+                        new UserWrapper(model.getObject()));
                 modal.setFormModel(formModel);
 
                 target.add(modal.setContent(new AnyStatusModal<>(
@@ -190,7 +193,7 @@ public List<Action<GroupTO>> get(
             @Override
             public void onClick(final AjaxRequestTarget target, final GroupTO ignore) {
                 IModel<AnyWrapper<GroupTO>> formModel = new CompoundPropertyModel<>(
-                        new AnyWrapper<>(modelObject));
+                        new GroupWrapper(modelObject));
                 modal.setFormModel(formModel);
 
                 target.add(modal.setContent(new AnyStatusModal<>(
@@ -231,8 +234,8 @@ public List<Action<AnyObjectTO>> get(
 
             @Override
             public void onClick(final AjaxRequestTarget target, final AnyObjectTO ignore) {
-                final IModel<AnyWrapper<AnyObjectTO>> formModel = new CompoundPropertyModel<>(
-                        new AnyWrapper<>(modelObject));
+                IModel<AnyWrapper<AnyObjectTO>> formModel = new CompoundPropertyModel<>(
+                        new AnyObjectWrapper(modelObject));
                 modal.setFormModel(formModel);
 
                 target.add(modal.setContent(new AnyStatusModal<>(

diff --git a/.../src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java b/.../src/main/java/org/apache/syncope/client/console/status/ResourceStatusDirectoryPanel.java
@@ -206,6 +206,10 @@ public void updateResultTable(final String type, final AjaxRequestTarget target)
             }
         }
 
+        synchronized (this) {
+            dataProvider = dataProvider();
+        }
+
         super.updateResultTable(target);
     }
 

diff --git a/...ommon-ui/src/main/java/org/apache/syncope/client/ui/commons/status/ConnObjectWrapper.java b/...ommon-ui/src/main/java/org/apache/syncope/client/ui/commons/status/ConnObjectWrapper.java
@@ -49,5 +49,4 @@ public String getResource() {
     public ConnObject getConnObjectTO() {
         return connObjectTO;
     }
-
 }
diff --git a/.../common-ui/src/main/java/org/apache/syncope/client/ui/commons/wizards/any/AnyWrapper.java b/.../common-ui/src/main/java/org/apache/syncope/client/ui/commons/wizards/any/AnyWrapper.java
@@ -21,7 +21,7 @@
 import java.io.Serializable;
 import org.apache.syncope.common.lib.to.AnyTO;
 
-public class AnyWrapper<T extends AnyTO> implements Serializable {
+public abstract class AnyWrapper<T extends AnyTO> implements Serializable {
 
     private static final long serialVersionUID = 8058288034211558375L;
 

diff --git a/...mmon-ui/src/main/java/org/apache/syncope/client/ui/commons/wizards/any/EntityWrapper.java b/...mmon-ui/src/main/java/org/apache/syncope/client/ui/commons/wizards/any/EntityWrapper.java
@@ -18,9 +18,12 @@
  */
 package org.apache.syncope.client.ui.commons.wizards.any;
 
+import java.io.Serializable;
 import org.apache.syncope.common.lib.to.EntityTO;
 
-public class EntityWrapper<T extends EntityTO> {
+public class EntityWrapper<T extends EntityTO> implements Serializable {
+
+    private static final long serialVersionUID = 1L;
 
     protected final T entityTO;
 
@@ -31,5 +34,4 @@ public EntityWrapper(final T entityTO) {
     public T getInnerObject() {
         return entityTO;
     }
-
 }
diff --git a/...main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java b/...main/java/org/apache/syncope/client/console/notifications/NotificationDirectoryPanel.java
@@ -54,6 +54,7 @@
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.PropertyColumn;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
 import org.apache.wicket.model.StringResourceModel;
 import org.apache.wicket.spring.injection.annot.SpringBean;
 
@@ -80,7 +81,9 @@ public class NotificationDirectoryPanel
     protected final BaseModal<String> utilityModal = new BaseModal<>(Constants.OUTER);
 
     public NotificationDirectoryPanel(
-            final String id, final NotificationRestClient restClient, final PageReference pageRef) {
+            final String id,
+            final NotificationRestClient restClient,
+            final PageReference pageRef) {
 
         super(id, restClient, pageRef, true);
         disableCheckBoxes();
@@ -126,9 +129,9 @@ protected List<IColumn<NotificationTO, String>> getColumns() {
 
     @Override
     public ActionsPanel<NotificationTO> getActions(final IModel<NotificationTO> model) {
-        final ActionsPanel<NotificationTO> panel = super.getActions(model);
+        ActionsPanel<NotificationTO> actions = super.getActions(model);
 
-        panel.add(new ActionLink<>() {
+        actions.add(new ActionLink<>() {
 
             private static final long serialVersionUID = -7978723352517770645L;
 
@@ -140,21 +143,20 @@ public void onClick(final AjaxRequestTarget target, final NotificationTO ignore)
             }
         }, ActionLink.ActionType.EDIT, IdRepoEntitlement.NOTIFICATION_UPDATE);
 
-        panel.add(new ActionLink<>() {
+        actions.add(new ActionLink<>() {
 
             private static final long serialVersionUID = -7978723352517770645L;
 
             @Override
             public void onClick(final AjaxRequestTarget target, final NotificationTO ignore) {
-                target.add(utilityModal.setContent(
-                        new NotificationTasks(model.getObject().getKey(), pageRef)));
+                target.add(utilityModal.setContent(new NotificationTasks(model.getObject().getKey(), pageRef)));
                 utilityModal.header(new StringResourceModel("notification.tasks", model));
                 utilityModal.show(true);
                 target.add(utilityModal);
             }
         }, ActionLink.ActionType.NOTIFICATION_TASKS, IdRepoEntitlement.TASK_LIST);
 
-        panel.add(new ActionLink<>() {
+        actions.add(new ActionLink<>() {
 
             private static final long serialVersionUID = -3722207913631435501L;
 
@@ -172,7 +174,7 @@ public void onClick(final AjaxRequestTarget target, final NotificationTO ignore)
             }
         }, ActionLink.ActionType.DELETE, IdRepoEntitlement.NOTIFICATION_DELETE, true);
 
-        return panel;
+        return actions;
     }
 
     @Override
@@ -217,15 +219,7 @@ public long size() {
 
         @Override
         public IModel<NotificationTO> model(final NotificationTO notification) {
-            return new IModel<>() {
-
-                private static final long serialVersionUID = 774694801558497248L;
-
-                @Override
-                public NotificationTO getObject() {
-                    return notification;
-                }
-            };
+            return Model.of(notification);
         }
     }
 }
diff --git a/...le/src/main/java/org/apache/syncope/client/console/notifications/NotificationWrapper.java b/...le/src/main/java/org/apache/syncope/client/console/notifications/NotificationWrapper.java
@@ -18,7 +18,6 @@
  */
 package org.apache.syncope.client.console.notifications;
 
-import java.io.Serializable;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -28,30 +27,29 @@
 import org.apache.syncope.client.console.panels.search.SearchClause;
 import org.apache.syncope.client.console.panels.search.SearchUtils;
 import org.apache.syncope.client.lib.SyncopeClient;
+import org.apache.syncope.client.ui.commons.wizards.any.EntityWrapper;
 import org.apache.syncope.common.lib.search.AbstractFiqlSearchConditionBuilder;
 import org.apache.syncope.common.lib.to.NotificationTO;
 
-public class NotificationWrapper implements Serializable {
+public class NotificationWrapper extends EntityWrapper<NotificationTO> {
 
     private static final long serialVersionUID = 8058288034211558376L;
 
-    private final NotificationTO notificationTO;
-
     private List<Pair<String, List<SearchClause>>> aboutClauses;
 
     private List<SearchClause> recipientClauses;
 
     public NotificationWrapper(final NotificationTO notificationTO) {
-        this.notificationTO = notificationTO;
+        super(notificationTO);
     }
 
     public final String getKey() {
-        return this.notificationTO.getKey();
+        return getInnerObject().getKey();
     }
 
     public List<Pair<String, List<SearchClause>>> getAboutClauses() {
         if (this.aboutClauses == null) {
-            this.aboutClauses = SearchUtils.getSearchClauses(this.notificationTO.getAbouts()).entrySet().stream().
+            this.aboutClauses = SearchUtils.getSearchClauses(getInnerObject().getAbouts()).entrySet().stream().
                     map(entry -> Pair.of(entry.getKey(), entry.getValue())).collect(Collectors.toList());
         }
 
@@ -64,7 +62,7 @@ public void setAboutClauses(final List<Pair<String, List<SearchClause>>> dynClau
 
     public List<SearchClause> getRecipientClauses() {
         if (this.recipientClauses == null) {
-            this.recipientClauses = SearchUtils.getSearchClauses(this.notificationTO.getRecipientsFIQL());
+            this.recipientClauses = SearchUtils.getSearchClauses(getInnerObject().getRecipientsFIQL());
         }
         return this.recipientClauses;
     }
@@ -75,7 +73,7 @@ public void setRecipientClauses(final List<SearchClause> dynClauses) {
 
     public Map<String, String> getAboutFIQLs() {
         if (CollectionUtils.isEmpty(this.aboutClauses) || this.aboutClauses.get(0).getValue().isEmpty()) {
-            return this.notificationTO.getAbouts();
+            return getInnerObject().getAbouts();
         } else {
             Map<String, String> res = new HashMap<>();
             for (Pair<String, List<SearchClause>> pair : this.aboutClauses) {
@@ -107,17 +105,13 @@ private String getRecipientsFIQL() {
     }
 
     public NotificationTO fillAboutConditions() {
-        this.notificationTO.getAbouts().clear();
-        this.notificationTO.getAbouts().putAll(this.getAboutFIQLs());
-        return this.notificationTO;
+        getInnerObject().getAbouts().clear();
+        getInnerObject().getAbouts().putAll(this.getAboutFIQLs());
+        return getInnerObject();
     }
 
     public NotificationTO fillRecipientConditions() {
-        this.notificationTO.setRecipientsFIQL(this.getRecipientsFIQL());
-        return this.notificationTO;
-    }
-
-    public NotificationTO getInnerObject() {
-        return this.notificationTO;
+        getInnerObject().setRecipientsFIQL(this.getRecipientsFIQL());
+        return getInnerObject();
     }
 }
diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/Engagements.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/Engagements.java
@@ -61,7 +61,7 @@ public Engagements(final PageParameters parameters) {
         body.add(content);
     }
 
-    private List<ITab> buildTabList() {
+    protected List<ITab> buildTabList() {
         List<ITab> tabs = new ArrayList<>();
 
         tabs.add(new AbstractTab(new ResourceModel("schedTasks")) {

diff --git a/...t/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/Notifications.java b/...t/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/Notifications.java
@@ -52,8 +52,8 @@ public Notifications(final PageParameters parameters) {
         body.add(content);
     }
 
-    private List<ITab> buildTabList() {
-        final List<ITab> tabs = new ArrayList<>();
+    protected List<ITab> buildTabList() {
+        List<ITab> tabs = new ArrayList<>();
 
         tabs.add(new AbstractTab(new ResourceModel("notifications")) {
 
@@ -74,6 +74,7 @@ public Panel getPanel(final String panelId) {
                 return new MailTemplateDirectoryPanel(panelId, notificationRestClient, getPageReference());
             }
         });
+
         return tabs;
     }
 }
diff --git a/...nsole/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java b/...nsole/src/main/java/org/apache/syncope/client/console/panels/AnyObjectDirectoryPanel.java
@@ -34,6 +34,7 @@
 import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink.ActionType;
 import org.apache.syncope.client.console.wicket.markup.html.form.ActionsPanel;
 import org.apache.syncope.client.console.wizards.WizardMgtPanel;
+import org.apache.syncope.client.console.wizards.any.AnyObjectWrapper;
 import org.apache.syncope.client.ui.commons.Constants;
 import org.apache.syncope.client.ui.commons.wizards.AjaxWizard;
 import org.apache.syncope.client.ui.commons.wizards.any.AnyWrapper;
@@ -117,7 +118,7 @@ public ActionsPanel<AnyObjectTO> getActions(final IModel<AnyObjectTO> model) {
             public void onClick(final AjaxRequestTarget target, final AnyObjectTO ignore) {
                 send(AnyObjectDirectoryPanel.this, Broadcast.EXACT,
                         new AjaxWizard.EditItemActionEvent<>(
-                                new AnyWrapper<>(restClient.read(model.getObject().getKey())), target));
+                                new AnyObjectWrapper(restClient.read(model.getObject().getKey())), target));
             }
         }, ActionType.EDIT,
                 String.format("%s,%s", AnyEntitlement.READ.getFor(type), AnyEntitlement.UPDATE.getFor(type))).
@@ -129,7 +130,7 @@ public void onClick(final AjaxRequestTarget target, final AnyObjectTO ignore) {
                     model.getObject(),
                     realm,
                     altDefaultModal,
-                    getString("any.edit", new Model<>(new AnyWrapper<>(model.getObject()))),
+                    getString("any.edit", new Model<>(new AnyObjectWrapper(model.getObject()))),
                     this,
                     pageRef).forEach(panel::add);
 
@@ -214,7 +215,7 @@ public void onClick(final AjaxRequestTarget target, final AnyObjectTO ignore) {
                 final AnyObjectTO clone = SerializationUtils.clone(model.getObject());
                 clone.setKey(null);
                 send(AnyObjectDirectoryPanel.this, Broadcast.EXACT,
-                        new AjaxWizard.NewItemActionEvent<>(new AnyWrapper<>(clone), target));
+                        new AjaxWizard.NewItemActionEvent<>(new AnyObjectWrapper(clone), target));
             }
 
             @Override

diff --git a/...idrepo/console/src/main/java/org/apache/syncope/client/console/panels/DirectoryPanel.java b/...idrepo/console/src/main/java/org/apache/syncope/client/console/panels/DirectoryPanel.java
@@ -282,7 +282,11 @@ protected void updateResultTable(final boolean create) {
     }
 
     protected void updateResultTable(final boolean create, final int rows) {
-        dataProvider = dataProvider();
+        synchronized (this) {
+            if (dataProvider == null) {
+                dataProvider = dataProvider();
+            }
+        }
 
         int currentPage = Optional.ofNullable(resultTable).
                 map(table -> (create ? (int) table.getPageCount() - 1 : (int) table.getCurrentPage())).orElse(0);