MID-8379:disable open shadow details page in wizard preview data panels

Evolveum · Mar 20, 2023 · 3d49da6 · 3d49da6
1 parent 28e132a
commit 3d49da6
Show file tree

Hide file tree

Showing 9 changed files with 58 additions and 63 deletions.
diff --git a/...c/main/java/com/evolveum/midpoint/gui/impl/component/wizard/AbstractWizardBasicPanel.java b/...c/main/java/com/evolveum/midpoint/gui/impl/component/wizard/AbstractWizardBasicPanel.java
@@ -178,7 +178,7 @@ protected void onSubmitPerformed(AjaxRequestTarget target) {
     }
 
     protected String getSubmitIcon() {
-        return "fa fa-floppy-disk";
+        return "fa fa-check";
     }
 
     protected IModel<String> getSubmitLabelModel() {

diff --git a/...om/evolveum/midpoint/gui/impl/factory/wrapper/ResourceAttributeMappingWrapperFactory.java b/...om/evolveum/midpoint/gui/impl/factory/wrapper/ResourceAttributeMappingWrapperFactory.java
@@ -47,18 +47,16 @@ public PrismContainerValueWrapper<ResourceAttributeDefinitionType> createContain
             WrapperContext context) {
         ResourceAttributeMappingValueWrapper value = new ResourceAttributeMappingValueWrapper(objectWrapper, objectValue, status);
         @Nullable ResourceAttributeDefinitionType realValue = objectValue.getRealValue();
-        if (context.isConfigureMappingType()) {
-            if (status.equals(ValueStatus.NOT_CHANGED) && realValue != null) {
-                value.addAttributeMappingType(AttributeMappingType.OVERRIDE);
-                if (!realValue.getInbound().isEmpty()) {
-                    value.addAttributeMappingType(AttributeMappingType.INBOUND);
-                }
-                if (realValue.getOutbound() != null) {
-                    value.addAttributeMappingType(AttributeMappingType.OUTBOUND);
-                }
-            } else if (status.equals(ValueStatus.ADDED) && context.getAttributeMappingType() != null) {
-                value.addAttributeMappingType(context.getAttributeMappingType());
+        if (status.equals(ValueStatus.NOT_CHANGED) && realValue != null) {
+            value.addAttributeMappingType(AttributeMappingType.OVERRIDE);
+            if (!realValue.getInbound().isEmpty()) {
+                value.addAttributeMappingType(AttributeMappingType.INBOUND);
             }
+            if (realValue.getOutbound() != null) {
+                value.addAttributeMappingType(AttributeMappingType.OUTBOUND);
+            }
+        } else if (status.equals(ValueStatus.ADDED) && context.getAttributeMappingType() != null) {
+            value.addAttributeMappingType(context.getAttributeMappingType());
         }
         return value;
     }

diff --git a/...rc/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/ResourceDetailsModel.java b/...rc/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/ResourceDetailsModel.java
@@ -6,6 +6,7 @@
  */
 package com.evolveum.midpoint.gui.impl.page.admin.resource;
 
+import com.evolveum.midpoint.gui.api.factory.wrapper.WrapperContext;
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
 import com.evolveum.midpoint.gui.api.page.PageAdminLTE;
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismObjectWrapper;
@@ -17,6 +18,7 @@
 import com.evolveum.midpoint.schema.processor.ResourceSchema;
 import com.evolveum.midpoint.schema.processor.ResourceSchemaFactory;
 import com.evolveum.midpoint.schema.result.OperationResult;
+import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.util.exception.ConfigurationException;
 import com.evolveum.midpoint.util.exception.SchemaException;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
@@ -99,50 +101,10 @@ public PageResource getPageResource() {
         return (PageResource) super.getPageBase();
     }
 
-//    @Override
-//    protected WrapperContext createWrapperContext(Task task, OperationResult result) {
-//        WrapperContext ctx = new WrapperContext(task, result) {
-//            @Override
-//            protected void collectVirtualContainers(@NotNull Collection<? extends ContainerPanelConfigurationType> panelConfigs, Collection<VirtualContainersSpecificationType> virtualContainers) {
-//                if (!(getModelServiceLocator() instanceof PageResource)) {
-//                    super.collectVirtualContainers(panelConfigs, virtualContainers);
-//                    return;
-//                }
-//                PageResource pageResource = (PageResource) getModelServiceLocator();
-//                for (ContainerPanelConfigurationType panelConfig : panelConfigs) {
-//                    if (getObjectStatus() == null || panelConfig.getApplicableForOperation() == null
-//                            || (pageResource.isEditObject()
-//                            && OperationTypeType.MODIFY.equals(panelConfig.getApplicableForOperation()))
-//                            || (!pageResource.isEditObject()
-//                            && OperationTypeType.ADD.equals(panelConfig.getApplicableForOperation()))
-//                            || (DelineationResourceObjectTypeStepPanel.PANEL_TYPE.equals(panelConfig.getIdentifier())
-//                            || BasicSettingResourceObjectTypeStepPanel.PANEL_TYPE.equals(panelConfig.getIdentifier())
-//                            || FocusResourceObjectTypeStepPanel.PANEL_TYPE.equals(panelConfig.getIdentifier())
-//                            || ReactionMainSettingStepPanel.PANEL_TYPE.equals(panelConfig.getIdentifier())
-//                            || ReactionOptionalSettingStepPanel.PANEL_TYPE.equals(panelConfig.getIdentifier())
-//                            || AttributeInboundStepPanel.PANEL_TYPE.equals(panelConfig.getIdentifier())
-//                            || AttributeOutboundStepPanel.PANEL_TYPE.equals(panelConfig.getIdentifier())
-//                            || MainConfigurationStepPanel.PANEL_TYPE.equals(panelConfig.getIdentifier())
-//                            || PasswordStepPanel.PANEL_TYPE.equals(panelConfig.getIdentifier())
-//                            || AssociationStepPanel.PANEL_TYPE.equals(panelConfig.getIdentifier())
-//                            || AdministrativeStatusStepPanel.PANEL_TYPE.equals(panelConfig.getIdentifier())
-//                            || ExistenceStepPanel.PANEL_TYPE.equals(panelConfig.getIdentifier())
-//                            || ValidFromStepPanel.PANEL_TYPE.equals(panelConfig.getIdentifier())
-//                            || ValidToStepPanel.PANEL_TYPE.equals(panelConfig.getIdentifier())
-//                            || LockoutStatusStepPanel.PANEL_TYPE.equals(panelConfig.getIdentifier())
-//                            || LimitationsStepPanel.PANEL_TYPE.equals(panelConfig.getIdentifier()))) { // UGLY HACK we need define visibility of panel in menu
-//                        virtualContainers.addAll(panelConfig.getContainer());
-//                        collectVirtualContainers(panelConfig.getPanel(), virtualContainers);
-//                    }
-//                }
-//            }
-//        };
-//        ctx.setCreateIfEmpty(true);
-//        ctx.setDetailsPageTypeConfiguration(getPanelConfigurations());
-//        ctx.setConfigureMappingType(true);
-//        if (getModelServiceLocator() instanceof PageResource) {
-//            ctx.setShowEmpty(!((PageResource)getModelServiceLocator()).isEditObject());
-//        }
-//        return ctx;
-//    }
+    @Override
+    protected WrapperContext createWrapperContext(Task task, OperationResult result) {
+        WrapperContext ctx = super.createWrapperContext(task, result);
+        ctx.setConfigureMappingType(true);
+        return ctx;
+    }
 }
diff --git a/...va/com/evolveum/midpoint/gui/impl/page/admin/resource/component/ResourceContentPanel.java b/...va/com/evolveum/midpoint/gui/impl/page/admin/resource/component/ResourceContentPanel.java
@@ -29,6 +29,7 @@
 import com.evolveum.midpoint.web.component.AjaxIconButton;
 import com.evolveum.midpoint.web.component.data.BoxedTablePanel;
 import com.evolveum.midpoint.web.component.dialog.ConfirmationPanel;
+import com.evolveum.midpoint.web.component.util.SelectableBean;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 
 import com.evolveum.midpoint.web.model.ContainerValueWrapperFromObjectWrapperModel;
@@ -650,12 +651,20 @@ protected Collection<? extends Component> createToolbarButtonsList(String button
                 return ResourceContentPanel.this.createToolbarButtonsList(buttonId);
             }
 
+            @Override
+            protected boolean isShadowDetailsEnabled(IModel<SelectableBean<ShadowType>> rowModel) {
+                return ResourceContentPanel.this.isShadowDetailsEnabled(rowModel);
+            }
         };
         resourceContent.setOutputMarkupId(true);
         return resourceContent;
 
     }
 
+    protected boolean isShadowDetailsEnabled(IModel<SelectableBean<ShadowType>> rowModel) {
+        return true;
+    }
+
     protected void customizeProvider(SelectableBeanObjectDataProvider<ShadowType> provider) {
     }
 

diff --git a/...idpoint/gui/impl/page/admin/resource/component/wizard/PreviewResourceDataWizardPanel.java b/...idpoint/gui/impl/page/admin/resource/component/wizard/PreviewResourceDataWizardPanel.java
@@ -15,6 +15,7 @@
 import com.evolveum.midpoint.schema.constants.SchemaConstants;
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.web.component.data.BoxedTablePanel;
+import com.evolveum.midpoint.web.component.util.SelectableBean;
 import com.evolveum.midpoint.web.component.util.SerializableConsumer;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ContainerPanelConfigurationType;
 
@@ -91,6 +92,11 @@ protected void customizeProvider(SelectableBeanObjectDataProvider<ShadowType> pr
             protected boolean isReclassifyButtonVisible() {
                 return false;
             }
+
+            @Override
+            protected boolean isShadowDetailsEnabled(IModel<SelectableBean<ShadowType>> rowModel) {
+                return false;
+            }
         };
         table.setOutputMarkupId(true);
 

diff --git a/.../admin/resource/component/wizard/objectType/PreviewResourceObjectTypeDataWizardPanel.java b/.../admin/resource/component/wizard/objectType/PreviewResourceObjectTypeDataWizardPanel.java
@@ -15,6 +15,7 @@
 import com.evolveum.midpoint.schema.constants.SchemaConstants;
 import com.evolveum.midpoint.task.api.Task;
 import com.evolveum.midpoint.web.component.data.BoxedTablePanel;
+import com.evolveum.midpoint.web.component.util.SelectableBean;
 import com.evolveum.midpoint.web.component.util.SerializableConsumer;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceObjectTypeDefinitionType;
 
@@ -125,6 +126,11 @@ protected void customizeProvider(SelectableBeanObjectDataProvider<ShadowType> pr
             protected boolean isReclassifyButtonVisible() {
                 return false;
             }
+
+            @Override
+            protected boolean isShadowDetailsEnabled(IModel<SelectableBean<ShadowType>> rowModel) {
+                return false;
+            }
         };
         table.setOutputMarkupId(true);
         add(table);

diff --git a/...resource/component/wizard/objectType/correlation/CorrelationItemRefsTableWizardPanel.java b/...resource/component/wizard/objectType/correlation/CorrelationItemRefsTableWizardPanel.java
@@ -63,11 +63,6 @@ protected void onSubmitPerformed(AjaxRequestTarget target) {
         onExitPerformed(target);
     }
 
-    @Override
-    protected String getSubmitIcon() {
-        return "fa fa-check";
-    }
-
     @Override
     protected IModel<String> getSubmitLabelModel() {
         return getPageBase().createStringResource("CorrelationItemRefsTableWizardPanel.confirmSettings");

diff --git a/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java b/...ui/src/main/java/com/evolveum/midpoint/web/page/admin/resources/ResourceContentPanel.java
@@ -14,6 +14,7 @@
 import com.evolveum.midpoint.schema.processor.*;
 import com.evolveum.midpoint.util.exception.*;
 
+import com.evolveum.midpoint.web.component.util.SelectableBean;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 
 import org.apache.commons.lang3.StringUtils;
@@ -278,6 +279,11 @@ protected List<Component> createToolbarButtonsList(String buttonId) {
                 buttonsList.addAll(super.createToolbarButtonsList(buttonId));
                 return buttonsList;
             }
+
+            @Override
+            protected boolean isShadowDetailsEnabled(IModel<SelectableBean<ShadowType>> rowModel) {
+                return ResourceContentPanel.this.isShadowDetailsEnabled(rowModel);
+            }
         };
         shadowListPanel.setOutputMarkupId(true);
         shadowListPanel.add(new VisibleEnableBehaviour() {
@@ -336,6 +342,10 @@ public boolean isVisible() {
         initCustomLayout();
     }
 
+    protected boolean isShadowDetailsEnabled(IModel<SelectableBean<ShadowType>> rowModel) {
+        return true;
+    }
+
     private void initSimulationButton(String id, String label, String icon, WebMarkupContainer taskButtonsContainer) {
         List<InlineMenuItem> items = new ArrayList<>();
 

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
@@ -103,6 +103,15 @@ protected void objectDetailsPerformed(AjaxRequestTarget target, ShadowType objec
         shadowDetailsPerformed(target, WebComponentUtil.getName(object), object.getOid());
     }
 
+    @Override
+    protected boolean isObjectDetailsEnabled(IModel<SelectableBean<ShadowType>> rowModel) {
+        return isShadowDetailsEnabled(rowModel);
+    }
+
+    protected boolean isShadowDetailsEnabled(IModel<SelectableBean<ShadowType>> rowModel) {
+        return true;
+    }
+
     @Override
     protected boolean isCreateNewObjectEnabled() {
         return false;