Merge branch 'feature/schema-cleanup-4.4' of github.com:Evolveum/midp…

…oint into feature/schema-cleanup-4.4
Evolveum · Sep 14, 2021 · 956c620 · 956c620
2 parents 780abc2 + 7484d83
commit 956c620
Show file tree

Hide file tree

Showing 96 changed files with 9,946 additions and 8,953 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
@@ -63,6 +63,7 @@ public class DefaultGuiConfigurationCompiler implements GuiProfileCompilable {
             "com.evolveum.midpoint.gui.impl.page.admin.org.component",
             "com.evolveum.midpoint.gui.impl.page.admin.cases.component",
             "com.evolveum.midpoint.gui.impl.page.admin.user.component",
+            "com.evolveum.midpoint.gui.impl.page.admin.objectcollection.component",
             "com.evolveum.midpoint.gui.impl.page.admin.report.component"
     };
 

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
@@ -255,7 +255,7 @@ public final class WebComponentUtil {
         OBJECT_DETAILS_PAGE_MAP_NEW.put(CaseType.class, com.evolveum.midpoint.gui.impl.page.admin.cases.PageCase.class);
         OBJECT_DETAILS_PAGE_MAP_NEW.put(ArchetypeType.class, PageArchetype.class);
         OBJECT_DETAILS_PAGE_MAP_NEW.put(ShadowType.class, PageAccount.class);
-        OBJECT_DETAILS_PAGE_MAP_NEW.put(ObjectCollectionType.class, PageObjectCollection.class);
+        OBJECT_DETAILS_PAGE_MAP_NEW.put(ObjectCollectionType.class, com.evolveum.midpoint.gui.impl.page.admin.objectcollection.PageObjectCollection.class);
         OBJECT_DETAILS_PAGE_MAP_NEW.put(ObjectTemplateType.class, PageObjectTemplate.class);
     }
 
@@ -4833,6 +4833,13 @@ public static boolean isArchetypeAssignment(AssignmentType assignmentType) {
         return QNameUtil.match(assignmentType.getTargetRef().getType(), ArchetypeType.COMPLEX_TYPE);
     }
 
+    public static boolean isDelegationAssignment(AssignmentType assignmentType) {
+        if (assignmentType.getTargetRef() == null) {
+            return false;
+        }
+        return QNameUtil.match(assignmentType.getTargetRef().getType(), UserType.COMPLEX_TYPE);
+    }
+
     public static <AH extends AssignmentHolderType> boolean hasArchetypeAssignment(AH assignmentHolder, String archetypeOid) {
         if (assignmentHolder.getAssignment() == null) {
             return false;

diff --git a/...ui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.java b/...ui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/AbstractPageObjectDetails.java
@@ -79,7 +79,7 @@ public abstract class AbstractPageObjectDetails<O extends ObjectType, ODM extend
 
     private ODM objectDetailsModels;
 
-    private ProgressPanel progressPanel;
+    protected ProgressPanel progressPanel;
     protected boolean previewRequested;
 
     public AbstractPageObjectDetails() {
@@ -313,23 +313,12 @@ private void executeAddDelta(Collection<ObjectDelta<? extends ObjectType>> delta
         }
     }
 
-    private void executeModifyDelta(Collection<ObjectDelta<? extends ObjectType>> deltas, boolean previewOnly, ExecuteChangeOptionsDto executeChangeOptionsDto, Task task, OperationResult result, AjaxRequestTarget target) {
-        //TODO only in UserDetialsPanel
-        //boolean delegationChangesExist = processDeputyAssignments(previewOnly);
+    protected void executeModifyDelta(Collection<ObjectDelta<? extends ObjectType>> deltas, boolean previewOnly, ExecuteChangeOptionsDto executeChangeOptionsDto, Task task, OperationResult result, AjaxRequestTarget target) {
         try {
             if (deltas.isEmpty() && !executeChangeOptionsDto.isReconcile()) {
                 progressPanel.clearProgressPanel();            // from previous attempts (useful only if we would call finishProcessing at the end, but that's not the case now)
                 if (!previewOnly) {
-//                    if (!delegationChangesExist) {
-//                        result.recordWarning(getString("PageAdminObjectDetails.noChangesSave"));
-//                        showResult(result);
-//                    }  //TODO user page
                     redirectBack();
-                } else {
-//                    if (!delegationChangesExist) {
-//                        warn(getString("PageAdminObjectDetails.noChangesPreview"));
-//                        target.add(getFeedbackPanel());
-//                    } //TODO user page
                 }
                 return;
             }

diff --git a/...point/gui/impl/page/admin/assignmentholder/component/AssignmentHolderAssignmentPanel.java b/...point/gui/impl/page/admin/assignmentholder/component/AssignmentHolderAssignmentPanel.java
@@ -11,19 +11,18 @@
 import com.evolveum.midpoint.gui.impl.page.admin.AbstractObjectMainPanel;
 import com.evolveum.midpoint.gui.impl.page.admin.ObjectDetailsModels;
 import com.evolveum.midpoint.web.application.*;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.ContainerPanelConfigurationType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.model.Model;
 
 import com.evolveum.midpoint.web.component.assignment.SwitchAssignmentTypePanel;
 import com.evolveum.midpoint.web.model.PrismContainerWrapperModel;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentHolderType;
-import com.evolveum.midpoint.xml.ns._public.common.common_3.AssignmentType;
 
 //@PanelType(name = "assignments", defaultContainerPath = "assignment")
 @PanelInstance(identifier = "assignments",
         applicableFor = AssignmentHolderType.class,
+        notApplicableFor = ObjectCollectionType.class,
         display = @PanelDisplay(label = "pageAdminFocus.assignments", icon = GuiStyleConstants.EVO_ASSIGNMENT_ICON, order = 30))
 @Counter(provider = AssignmentCounter.class)
 public class AssignmentHolderAssignmentPanel<AH extends AssignmentHolderType> extends AbstractObjectMainPanel<AH, ObjectDetailsModels<AH>> {

diff --git a/...java/com/evolveum/midpoint/gui/impl/page/admin/objectcollection/PageObjectCollection.java b/...java/com/evolveum/midpoint/gui/impl/page/admin/objectcollection/PageObjectCollection.java
@@ -0,0 +1,70 @@
+/*
+ * 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.objectcollection;
+
+import com.evolveum.midpoint.gui.api.model.LoadableModel;
+import com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.AssignmentHolderDetailsModel;
+import com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.PageAssignmentHolderDetails;
+
+import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
+
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.request.mapper.parameter.PageParameters;
+import com.evolveum.midpoint.prism.PrismObject;
+import com.evolveum.midpoint.security.api.AuthorizationConstants;
+import com.evolveum.midpoint.util.logging.Trace;
+import com.evolveum.midpoint.util.logging.TraceManager;
+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.configuration.PageAdminConfiguration;
+import com.evolveum.midpoint.web.page.admin.objectCollection.ObjectCollectionSummaryPanel;
+import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
+
+@PageDescriptor(
+        urls = {
+                @Url(mountUrl = "/admin/newObjectCollection")
+        },
+        encoder = OnePageParameterEncoder.class,
+        action = {
+                @AuthorizationAction(actionUri = PageAdminConfiguration.AUTH_CONFIGURATION_ALL,
+                        label = PageAdminConfiguration.AUTH_CONFIGURATION_ALL_LABEL,
+                        description = PageAdminConfiguration.AUTH_CONFIGURATION_ALL_DESCRIPTION),
+                @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_OBJECT_COLLECTIONS_ALL_URL,
+                        label = "PageObjectCollection.auth.objectCollectionsAll.label",
+                        description = "PageObjectCollection.auth.objectCollectionsAll.description"),
+                @AuthorizationAction(actionUri = AuthorizationConstants.AUTZ_UI_OBJECT_COLLECTION_URL,
+                        label = "PageObjectCollection.auth.objectCollection.label",
+                        description = "PageObjectCollection.auth.objectCollection.description")
+        })
+public class PageObjectCollection extends PageAssignmentHolderDetails<ObjectCollectionType, AssignmentHolderDetailsModel<ObjectCollectionType>> {
+
+    private static final Trace LOGGER = TraceManager.getTrace(PageObjectCollection.class);
+
+    public PageObjectCollection() {
+        super();
+    }
+
+    public PageObjectCollection(PageParameters parameters) {
+        super(parameters);
+    }
+
+    public PageObjectCollection(final PrismObject<ObjectCollectionType> unitToEdit) {
+        super(unitToEdit);
+    }
+
+    @Override
+    protected Class<ObjectCollectionType> getType() {
+        return ObjectCollectionType.class;
+    }
+
+    @Override
+    protected Panel createSummaryPanel(String id, LoadableModel<ObjectCollectionType> summaryModel) {
+        return new ObjectCollectionSummaryPanel(id, summaryModel, this);
+    }
+
+}
diff --git a/...evolveum/midpoint/gui/impl/page/admin/objectcollection/component/BaseCollectionPanel.html b/...evolveum/midpoint/gui/impl/page/admin/objectcollection/component/BaseCollectionPanel.html
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+        xmlns:wicket="http://wicket.apache.org">
+<body>
+<wicket:panel>
+    <div class="row">
+        <div class="col-md-12">
+            <div wicket:id="panel" />
+        </div>
+    </div>
+</wicket:panel>
+</body>
+</html>
diff --git a/...evolveum/midpoint/gui/impl/page/admin/objectcollection/component/BaseCollectionPanel.java b/...evolveum/midpoint/gui/impl/page/admin/objectcollection/component/BaseCollectionPanel.java
@@ -0,0 +1,73 @@
+/*
+ * 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.objectcollection.component;
+
+import org.apache.wicket.model.IModel;
+
+import com.evolveum.midpoint.gui.api.prism.ItemStatus;
+import com.evolveum.midpoint.gui.api.prism.wrapper.ItemWrapper;
+import com.evolveum.midpoint.gui.api.prism.wrapper.PrismObjectWrapper;
+import com.evolveum.midpoint.gui.impl.page.admin.AbstractObjectMainPanel;
+import com.evolveum.midpoint.gui.impl.page.admin.ObjectDetailsModels;
+import com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.AssignmentHolderDetailsModel;
+import com.evolveum.midpoint.gui.impl.page.admin.task.component.TaskActivityPanel;
+import com.evolveum.midpoint.gui.impl.prism.panel.SingleContainerPanel;
+import com.evolveum.midpoint.prism.Containerable;
+import com.evolveum.midpoint.prism.path.ItemName;
+import com.evolveum.midpoint.prism.path.ItemPath;
+import com.evolveum.midpoint.util.logging.Trace;
+import com.evolveum.midpoint.util.logging.TraceManager;
+import com.evolveum.midpoint.web.application.PanelDisplay;
+import com.evolveum.midpoint.web.application.PanelInstance;
+import com.evolveum.midpoint.web.application.PanelType;
+import com.evolveum.midpoint.web.component.prism.ItemVisibility;
+import com.evolveum.midpoint.web.model.PrismContainerWrapperModel;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.CollectionRefSpecificationType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ContainerPanelConfigurationType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectCollectionType;
+
+@PanelType(name = "baseCollection")
+@PanelInstance(identifier = "baseCollection",
+        applicableFor = ObjectCollectionType.class,
+        status = ItemStatus.NOT_CHANGED,
+        display = @PanelDisplay(label = "pageObjectCollection.baseCollection.title", order = 40))
+public class BaseCollectionPanel  extends AbstractObjectMainPanel<ObjectCollectionType, ObjectDetailsModels<ObjectCollectionType>> {
+    private static final long serialVersionUID = 1L;
+
+    private static final Trace LOGGER = TraceManager.getTrace(BaseCollectionPanel.class);
+    private static final String ID_PANEL = "panel";
+
+    private static final String DOT_CLASS = BaseCollectionPanel.class.getName() + ".";
+
+    public BaseCollectionPanel(String id, AssignmentHolderDetailsModel<ObjectCollectionType> model, ContainerPanelConfigurationType config) {
+        super(id, model, config);
+    }
+
+    @Override
+    protected void initLayout() {
+        SingleContainerPanel panel =
+                new SingleContainerPanel<CollectionRefSpecificationType>(ID_PANEL,
+                        createModel(getObjectWrapperModel(), ObjectCollectionType.F_BASE_COLLECTION),
+                        CollectionRefSpecificationType.COMPLEX_TYPE) {
+                    private static final long serialVersionUID = 1L;
+
+                    @Override
+                    protected ItemVisibility getVisibility(ItemWrapper itemWrapper) {
+                        if (ItemPath.create(ObjectCollectionType.F_BASE_COLLECTION, CollectionRefSpecificationType.F_BASE_COLLECTION_REF)
+                                .isSuperPathOrEquivalent(itemWrapper.getPath())) {
+                            return ItemVisibility.HIDDEN;
+                        }
+                        return ItemVisibility.AUTO;
+                    }
+                };
+        add(panel);
+    }
+
+    private <C extends Containerable> PrismContainerWrapperModel<ObjectCollectionType, C> createModel(IModel<PrismObjectWrapper<ObjectCollectionType>> model, ItemName itemName) {
+        return PrismContainerWrapperModel.fromContainerWrapper(model, itemName);
+    }
+}
diff --git a/...oint/gui/impl/page/admin/objectcollection/component/ObjectCollectionDefaultViewPanel.html b/...oint/gui/impl/page/admin/objectcollection/component/ObjectCollectionDefaultViewPanel.html
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+        xmlns:wicket="http://wicket.apache.org">
+<body>
+<wicket:panel>
+    <div class="row">
+        <div class="col-md-12">
+            <div wicket:id="panel" />
+        </div>
+    </div>
+</wicket:panel>
+</body>
+</html>
diff --git a/...oint/gui/impl/page/admin/objectcollection/component/ObjectCollectionDefaultViewPanel.java b/...oint/gui/impl/page/admin/objectcollection/component/ObjectCollectionDefaultViewPanel.java
@@ -0,0 +1,54 @@
+/*
+ * 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.objectcollection.component;
+
+import com.evolveum.midpoint.gui.api.prism.ItemStatus;
+import com.evolveum.midpoint.gui.api.prism.wrapper.PrismObjectWrapper;
+import com.evolveum.midpoint.gui.impl.page.admin.AbstractObjectMainPanel;
+import com.evolveum.midpoint.gui.impl.page.admin.ObjectDetailsModels;
+import com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.AssignmentHolderDetailsModel;
+import com.evolveum.midpoint.gui.impl.prism.panel.SingleContainerPanel;
+import com.evolveum.midpoint.prism.Containerable;
+import com.evolveum.midpoint.prism.path.ItemName;
+import com.evolveum.midpoint.util.logging.Trace;
+import com.evolveum.midpoint.util.logging.TraceManager;
+import com.evolveum.midpoint.web.application.PanelDisplay;
+import com.evolveum.midpoint.web.application.PanelInstance;
+import com.evolveum.midpoint.web.application.PanelType;
+import com.evolveum.midpoint.web.model.PrismContainerWrapperModel;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ContainerPanelConfigurationType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.GuiObjectListViewType;
+import com.evolveum.midpoint.xml.ns._public.common.common_3.ObjectCollectionType;
+
+import org.apache.wicket.model.IModel;
+
+@PanelType(name = "defaultView")
+@PanelInstance(identifier = "defaultView",
+        applicableFor = ObjectCollectionType.class,
+        status = ItemStatus.NOT_CHANGED,
+        display = @PanelDisplay(label = "pageObjectCollection.defaultView.title", order = 50))
+public class ObjectCollectionDefaultViewPanel extends AbstractObjectMainPanel<ObjectCollectionType, ObjectDetailsModels<ObjectCollectionType>> {
+    private static final long serialVersionUID = 1L;
+
+    private static final Trace LOGGER = TraceManager.getTrace(ObjectCollectionDefaultViewPanel.class);
+    private static final String ID_PANEL = "panel";
+
+    private static final String DOT_CLASS = ObjectCollectionDefaultViewPanel.class.getName() + ".";
+
+    public ObjectCollectionDefaultViewPanel(String id, AssignmentHolderDetailsModel<ObjectCollectionType> model, ContainerPanelConfigurationType config) {
+        super(id, model, config);
+    }
+
+    @Override
+    protected void initLayout() {
+        SingleContainerPanel panel =
+                new SingleContainerPanel<>(ID_PANEL,
+                        PrismContainerWrapperModel.fromContainerWrapper(getObjectWrapperModel(), ObjectCollectionType.F_DEFAULT_VIEW),
+                        GuiObjectListViewType.COMPLEX_TYPE);
+        add(panel);
+    }
+}
diff --git a/.../midpoint/gui/impl/page/admin/objectcollection/component/ObjectCollectionDomainPanel.html b/.../midpoint/gui/impl/page/admin/objectcollection/component/ObjectCollectionDomainPanel.html
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ 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.
+  -->
+
+<html xmlns="http://www.w3.org/1999/xhtml"
+        xmlns:wicket="http://wicket.apache.org">
+<body>
+<wicket:panel>
+    <div class="row">
+        <div class="col-md-12">
+            <div wicket:id="panel" />
+        </div>
+    </div>
+</wicket:panel>
+</body>
+</html>