support for org details and serivce details pages. soem fixes for old…

… resource detials page
Evolveum · Aug 26, 2021 · 574df60 · 574df60
1 parent f9e31e9
commit 574df60
Show file tree

Hide file tree

Showing 13 changed files with 153 additions and 16 deletions.
diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/api/DefaultGuiConfigurationCompiler.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/api/DefaultGuiConfigurationCompiler.java
@@ -54,6 +54,7 @@ public class DefaultGuiConfigurationCompiler implements GuiProfileCompilable {
             "com.evolveum.midpoint.gui.impl.component.assignment",
             "com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.component.assignmentType.assignment",
             "com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.component.assignmentType.inducement",
+            "com.evolveum.midpoint.gui.impl.page.admin.org.component"
     };
 
     private Map<String, Class<? extends Panel>> panelsMap = new HashMap<>();

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -784,8 +784,7 @@ private static ObjectReferenceType getArchetypeReference(AssignmentHolderType as
             return archetypeRef;
         }
         for (AssignmentType assignment : assignmentHolder.getAssignment()) {
-            if (StringUtils.isNotEmpty(assignment.getTargetRef().getOid())
-                    && assignment.getTargetRef() != null && QNameUtil.match(assignment.getTargetRef().getType(), ArchetypeType.COMPLEX_TYPE)) {
+            if (isArchetypeAssignment(assignment)) {
                 archetypeRef = assignment.getTargetRef();
             }
         }
@@ -800,13 +799,6 @@ private static String getArchetypeOid(AssignmentHolderType assignmentHolder) {
         return null;
     }
 
-    public static void iterativeExecuteBulkAction(PageBase pageBase, ExecuteScriptType script, Task task, OperationResult result)
-            throws SchemaException, SecurityViolationException, ObjectNotFoundException, ExpressionEvaluationException,
-            CommunicationException, ConfigurationException {
-
-        pageBase.getScriptingService().evaluateIterativeExpressionInBackground(script, task, result);
-    }
-
     public static boolean isAuthorized(String... action) {
         if (action == null || action.length == 0) {
             return true;

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/org/PageOrg.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/org/PageOrg.html
@@ -0,0 +1,14 @@
+<!--
+  ~ Copyright (c) 2021 Evolveum
+  ~
+  ~ This work is dual-licensed under the Apache License 2.0
+  ~ and European Union Public License. See LICENSE file for details.
+  -->
+<!DOCTYPE html>
+<html xmlns:wicket="http://wicket.apache.org">
+<body>
+<wicket:extend>
+    <wicket:child />
+</wicket:extend>
+</body>
+</html>
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/org/PageOrg.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/org/PageOrg.java
@@ -0,0 +1,48 @@
+/*
+ * Copyright (c) 2021 Evolveum and contributors
+ *
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
+ */
+package com.evolveum.midpoint.gui.impl.page.admin.org;
+
+import com.evolveum.midpoint.gui.api.model.LoadableModel;
+import com.evolveum.midpoint.gui.impl.page.admin.focus.PageFocusDetails;
+import com.evolveum.midpoint.security.api.AuthorizationConstants;
+import com.evolveum.midpoint.web.application.AuthorizationAction;
+import com.evolveum.midpoint.web.application.PageDescriptor;
+import com.evolveum.midpoint.web.application.Url;
+import com.evolveum.midpoint.web.page.admin.users.component.OrgSummaryPanel;
+import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.OrgType;
+
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+@PageDescriptor(
+        urls = {
+                @Url(mountUrl = "/admin/org")
+        },
+        encoder = OnePageParameterEncoder.class, action = {
+        @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_ORG_ALL_URL,
+                label = "PageAdminUsers.auth.orgAll.label",
+                description = "PageAdminUsers.auth.orgAll.description"),
+        @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_ORG_UNIT_URL,
+                label = "PageOrgUnit.auth.orgUnit.label",
+                description = "PageOrgUnit.auth.orgUnit.description") })
+public class PageOrg extends PageFocusDetails<OrgType> {
+
+    public PageOrg(PageParameters pageParameters) {
+        super(pageParameters);
+    }
+
+    @Override
+    protected Class<OrgType> getType() {
+        return OrgType.class;
+    }
+
+    @Override
+    protected Panel getSummaryPanel(String id, LoadableModel<OrgType> summaryModel) {
+        return new OrgSummaryPanel(id, summaryModel, this);
+    }
+}
diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/service/PageService.html b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/service/PageService.html
@@ -0,0 +1,14 @@
+<!--
+  ~ Copyright (c) 2021 Evolveum
+  ~
+  ~ This work is dual-licensed under the Apache License 2.0
+  ~ and European Union Public License. See LICENSE file for details.
+  -->
+<!DOCTYPE html>
+<html xmlns:wicket="http://wicket.apache.org">
+<body>
+<wicket:extend>
+    <wicket:child />
+</wicket:extend>
+</body>
+</html>
diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/service/PageService.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/service/PageService.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright (c) 2021 Evolveum and contributors
+ *
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
+ */
+package com.evolveum.midpoint.gui.impl.page.admin.service;
+
+import com.evolveum.midpoint.gui.api.model.LoadableModel;
+import com.evolveum.midpoint.gui.impl.page.admin.focus.PageFocusDetails;
+import com.evolveum.midpoint.security.api.AuthorizationConstants;
+import com.evolveum.midpoint.web.application.AuthorizationAction;
+import com.evolveum.midpoint.web.application.PageDescriptor;
+import com.evolveum.midpoint.web.application.Url;
+import com.evolveum.midpoint.web.page.admin.roles.component.RoleSummaryPanel;
+import com.evolveum.midpoint.web.page.admin.users.component.ServiceSummaryPanel;
+import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.RoleType;
+
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ServiceType;
+
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+
+@PageDescriptor(
+        urls = {
+                @Url(mountUrl = "/admin/serviceNew")
+        },
+        encoder = OnePageParameterEncoder.class, action = {
+        @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_SERVICES_ALL_URL,
+                label = "PageAdminServices.auth.servicesAll.label",
+                description = "PageAdminServices.auth.servicesAll.description"),
+        @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_SERVICE_URL,
+                label = "PageService.auth.role.label",
+                description = "PageService.auth.role.description") })
+public class PageService extends PageFocusDetails<ServiceType> {
+
+    public PageService(PageParameters pageParameters) {
+        super(pageParameters);
+    }
+
+    @Override
+    protected Class<ServiceType> getType() {
+        return ServiceType.class;
+    }
+
+    @Override
+    protected Panel getSummaryPanel(String id, LoadableModel<ServiceType> summaryModel) {
+        return new ServiceSummaryPanel(id, summaryModel, PageService.this);
+    }
+}
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/application/DescriptorLoader.java
@@ -58,10 +58,12 @@ public final class DescriptorLoader implements DebugDumpable {
             "com.evolveum.midpoint.web.page.self",
             "com.evolveum.midpoint.web.component.prism.show",
             "com.evolveum.midpoint.gui.impl.page.admin",
-            "com.evolveum.midpoint.gui.impl.page.admin.user",
-            "com.evolveum.midpoint.gui.impl.page.admin.role",
+            "com.evolveum.midpoint.gui.impl.page.admin.org",
             "com.evolveum.midpoint.gui.impl.page.admin.resource",
-            "com.evolveum.midpoint.gui.impl.page.admin.task"
+            "com.evolveum.midpoint.gui.impl.page.admin.role",
+            "com.evolveum.midpoint.gui.impl.page.admin.service",
+            "com.evolveum.midpoint.gui.impl.page.admin.task",
+            "com.evolveum.midpoint.gui.impl.page.admin.user"
     };
 
     // All could be final, but then Checkstyle complains about lower-case, although these are not constants.

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/PageOrgs.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/orgs/PageOrgs.java
@@ -9,6 +9,7 @@
 
 import com.evolveum.midpoint.gui.api.component.MainObjectListPanel;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
+import com.evolveum.midpoint.gui.impl.page.admin.org.PageOrg;
 import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.schema.GetOperationOptions;
 import com.evolveum.midpoint.schema.SelectorOptions;
@@ -137,7 +138,7 @@ private Collection<SelectorOptions<GetOperationOptions>> getQueryOptions() {
     private void orgDetailsPerformed(AjaxRequestTarget target, String oid) {
         PageParameters parameters = new PageParameters();
         parameters.add(OnePageParameterEncoder.PARAMETER, oid);
-        navigateToNext(PageOrgUnit.class, parameters);
+        navigateToNext(PageOrg.class, parameters);
     }
 
     private IModel<String> getConfirmationMessageModel(ColumnMenuAction action, String actionName){

diff --git a/...src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceDetailsTabPanel.java b/...src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceDetailsTabPanel.java
@@ -94,6 +94,12 @@ protected CapabilitiesDto load() {
         };
     }
 
+    @Override
+    protected void onInitialize() {
+        super.onInitialize();
+        initLayout();
+    }
+
     protected void initLayout() {
 
         PrismObject<ResourceType> resourceObject = getModelObject();

diff --git a/...-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceTasksPanel.java b/...-gui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceTasksPanel.java
@@ -97,6 +97,12 @@ public ResourceTasksPanel(String id, LoadableModel<PrismObject<ResourceType>> re
 //
 //    }
 
+    @Override
+    protected void onInitialize() {
+        super.onInitialize();
+        initLayout();
+    }
+
     protected void initLayout() {
         final MainObjectListPanel<TaskType> tasksPanel =
                 new MainObjectListPanel<>(ID_TASKS_TABLE, TaskType.class, null) {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServices.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/admin/services/PageServices.java
@@ -9,6 +9,7 @@
 
 import com.evolveum.midpoint.gui.api.component.MainObjectListPanel;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
+import com.evolveum.midpoint.gui.impl.page.admin.service.PageService;
 import com.evolveum.midpoint.prism.path.ItemPath;
 import com.evolveum.midpoint.security.api.AuthorizationConstants;
 import com.evolveum.midpoint.util.logging.Trace;

diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/users/component/TreeTablePanel.java
@@ -11,6 +11,7 @@
 import java.util.List;
 
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
+import com.evolveum.midpoint.gui.impl.page.admin.org.PageOrg;
 import com.evolveum.midpoint.schema.GetOperationOptions;
 import com.evolveum.midpoint.schema.SelectorOptions;
 
@@ -698,6 +699,6 @@ private void editRootPerformed(SelectableBeanImpl<OrgType> root) {
         }
         PageParameters parameters = new PageParameters();
         parameters.add(OnePageParameterEncoder.PARAMETER, root.getValue().getOid());
-        getPageBase().navigateToNext(PageOrgUnit.class, parameters);
+        getPageBase().navigateToNext(PageOrg.class, parameters);
     }
 }
diff --git a/gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractGuiIntegrationTest.java b/gui/admin-gui/src/test/java/com/evolveum/midpoint/web/AbstractGuiIntegrationTest.java
@@ -316,14 +316,14 @@ protected void clickOnTab(int order, Class<? extends Page> expectedPage) {
     protected void clickOnDetailsAssignmentMenu(int order, Class<? extends Page> expectedPage) {
         tester.assertRenderedPage(expectedPage);
         tester.debugComponentTrees("navigation");
-        String tabPath = "navigation:menu:2:navLinkStyle:subNavigation:menu:" + order + ":navLinkStyle:navItem";
+        String tabPath = "details:navigation:menu:2:navLinkStyle:subNavigation:menu:" + order + ":navLinkStyle:navItem";
         tester.clickLink(tabPath);
     }
 
     protected void clickOnDetailsMenu(int order, Class<? extends Page> expectedPage) {
         tester.assertRenderedPage(expectedPage);
         tester.debugComponentTrees("navigation");
-        String tabPath = "navigation:menu:" + order + ":navLinkStyle:navItem";
+        String tabPath = "detailsnavigation:menu:" + order + ":navLinkStyle:navItem";
         tester.clickLink(tabPath);
     }
 }