fix for MID-8340 Object collection views in GUI don't allow creation …

…of new objects (plus button missing)
Evolveum · Mar 22, 2023 · 91b64f6 · 91b64f6
1 parent ff716e0
commit 91b64f6
Show file tree

Hide file tree

Showing 12 changed files with 15 additions and 17 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/MainObjectListPanel.java
@@ -17,7 +17,6 @@
 import org.apache.wicket.RestartResponseException;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.behavior.AttributeAppender;
-import org.apache.wicket.extensions.markup.html.repeater.data.table.DataTable;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
 import org.apache.wicket.markup.html.WebPage;
 import org.apache.wicket.model.IModel;
@@ -26,7 +25,6 @@
 import org.jetbrains.annotations.NotNull;
 
 import com.evolveum.midpoint.gui.api.GuiStyleConstants;
-import com.evolveum.midpoint.gui.api.component.button.CsvDownloadButtonPanel;
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
 import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
@@ -65,7 +63,6 @@
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItemAction;
 import com.evolveum.midpoint.web.component.util.SelectableBean;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
-import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 import com.evolveum.midpoint.web.page.admin.configuration.PageImportObject;
 import com.evolveum.midpoint.web.page.admin.users.component.ExecuteChangeOptionsDto;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
@@ -224,7 +221,7 @@ protected void buttonClickPerformed(AjaxRequestTarget target, AssignmentObjectRe
                 getPageBase().showMainPopup(buttonsPanel, target);
             }
         };
-        createNewObjectButton.add(new VisibleBehaviour(this::isCreateNewObjectEnabled));
+        createNewObjectButton.add(new VisibleBehaviour(this::isCreateNewObjectVisible));
         createNewObjectButton.add(AttributeAppender.append("class", "btn btn-default btn-sm"));
         return createNewObjectButton;
     }
@@ -415,8 +412,9 @@ private IModel<String> getRefreshPausePlayButtonTitleModel() {
             return createStringResource("MainObjectListPanel.refresh.start").getString();
         };
     }
-    protected boolean isCreateNewObjectEnabled() {
-        return !isCollectionViewPanel() || !getNewObjectInfluencesList().isEmpty();
+    protected boolean isCreateNewObjectVisible() {
+        return !isCollectionViewPanel() || getObjectCollectionView().isApplicableForOperation(OperationTypeType.ADD) ||
+                CollectionUtils.isNotEmpty(getNewObjectInfluencesList());
     }
 
     @NotNull

diff --git a/...n-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/AbstractObjectListPanel.java b/...n-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/AbstractObjectListPanel.java
@@ -29,7 +29,7 @@ public ObjectDetailsModels<O> getObjectDetailsModel() {
     }
 
     @Override
-    protected boolean isCreateNewObjectEnabled() {
+    protected boolean isCreateNewObjectVisible() {
         return false;
     }
 

diff --git a/...evolveum/midpoint/gui/impl/page/admin/abstractrole/component/AbstractRoleMemberPanel.java b/...evolveum/midpoint/gui/impl/page/admin/abstractrole/component/AbstractRoleMemberPanel.java
@@ -291,7 +291,7 @@ protected String getTitleForNewObjectButton() {
             }
 
             @Override
-            protected boolean isCreateNewObjectEnabled() {
+            protected boolean isCreateNewObjectVisible() {
                 return isAuthorized(GuiAuthorizationConstants.MEMBER_OPERATION_CREATE);
             }
         };

diff --git a/.../main/java/com/evolveum/midpoint/gui/impl/page/admin/cases/component/ChildCasesPanel.java b/.../main/java/com/evolveum/midpoint/gui/impl/page/admin/cases/component/ChildCasesPanel.java
@@ -100,7 +100,7 @@ public String getCssClass() {
             }
 
             @Override
-            protected boolean isCreateNewObjectEnabled(){
+            protected boolean isCreateNewObjectVisible(){
                 return false;
             }
 

diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/mark/ShadowMarkPanel.java b/...min-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/mark/ShadowMarkPanel.java
@@ -258,7 +258,7 @@ protected String getTitleForNewObjectButton() {
             }
 
             @Override
-            protected boolean isCreateNewObjectEnabled() {
+            protected boolean isCreateNewObjectVisible() {
                 return isAuthorized(GuiAuthorizationConstants.MEMBER_OPERATION_CREATE);
             }
         };

diff --git a/...main/java/com/evolveum/midpoint/gui/impl/page/admin/user/component/UserPersonasPanel.java b/...main/java/com/evolveum/midpoint/gui/impl/page/admin/user/component/UserPersonasPanel.java
@@ -105,7 +105,7 @@ protected void objectDetailsPerformed(AjaxRequestTarget target, UserType object)
             }
 
             @Override
-            protected boolean isCreateNewObjectEnabled() {
+            protected boolean isCreateNewObjectVisible() {
                 return false;
             }
 

diff --git a/.../java/com/evolveum/midpoint/web/page/admin/configuration/InternalsLoggedInUsersPanel.java b/.../java/com/evolveum/midpoint/web/page/admin/configuration/InternalsLoggedInUsersPanel.java
@@ -110,7 +110,7 @@ protected SelectableBean<F> createObjectWrapper(UserSessionManagementType princi
             }
 
             @Override
-            protected boolean isCreateNewObjectEnabled() {
+            protected boolean isCreateNewObjectVisible() {
                 return false;
             }
 

diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java b/...in-gui/src/main/java/com/evolveum/midpoint/web/page/admin/reports/PageCreatedReports.java
@@ -206,7 +206,7 @@ protected List<InlineMenuItem> createInlineMenu() {
             }
 
             @Override
-            protected boolean isCreateNewObjectEnabled() {
+            protected boolean isCreateNewObjectVisible() {
                 return false;
             }
 

diff --git a/...-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageConnectorHosts.java b/...-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/PageConnectorHosts.java
@@ -128,7 +128,7 @@ protected List<IColumn<SelectableBean<ConnectorHostType>, String>> createDefault
             }
 
             @Override
-            protected boolean isCreateNewObjectEnabled() {
+            protected boolean isCreateNewObjectVisible() {
                 return false;
             }
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/CasesTablePanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/CasesTablePanel.java
@@ -65,7 +65,7 @@ protected ISelectableDataProvider<SelectableBean<CaseType>> createProvider() {
     }
 
     @Override
-    protected boolean isCreateNewObjectEnabled() {
+    protected boolean isCreateNewObjectVisible() {
         return false;
     }
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageNodes.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/server/PageNodes.java
@@ -96,7 +96,7 @@ protected boolean isObjectDetailsEnabled(IModel<SelectableBean<NodeType>> rowMod
             }
 
             @Override
-            protected boolean isCreateNewObjectEnabled() {
+            protected boolean isCreateNewObjectVisible() {
                 return false;
             }
 

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/shadows/ShadowTablePanel.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/shadows/ShadowTablePanel.java
@@ -113,7 +113,7 @@ protected boolean isShadowDetailsEnabled(IModel<SelectableBean<ShadowType>> rowM
     }
 
     @Override
-    protected boolean isCreateNewObjectEnabled() {
+    protected boolean isCreateNewObjectVisible() {
         return false;
     }