MID-8147; fix for css style, click on save button without changes, ad…

…ding step for synchronization action
Evolveum · Oct 5, 2022 · e230632 · e230632
1 parent 090faa3
commit e230632
Show file tree

Hide file tree

Showing 31 changed files with 491 additions and 54 deletions.
diff --git a/...rc/main/java/com/evolveum/midpoint/gui/api/component/wizard/AbstractWizardBasicPanel.java b/...rc/main/java/com/evolveum/midpoint/gui/api/component/wizard/AbstractWizardBasicPanel.java
@@ -137,7 +137,6 @@ protected void populateItem(ListItem<Breadcrumb> item) {
                 getExitLabel()) {
             @Override
             public void onClick(AjaxRequestTarget target) {
-                removeLastBreadcrumb();
                 onExitPerformed(target);
             }
         };
@@ -171,7 +170,7 @@ protected IModel<String> getExitLabel() {
     }
 
     protected void onExitPerformed(AjaxRequestTarget target) {
-        getPageBase().navigateToNext(PageResources.class);
+        removeLastBreadcrumb();
     }
 
     protected void addCustomButtons(RepeatingView buttons) {

diff --git a/...src/main/java/com/evolveum/midpoint/gui/impl/component/input/ContainersDropDownPanel.java b/...src/main/java/com/evolveum/midpoint/gui/impl/component/input/ContainersDropDownPanel.java
@@ -212,7 +212,7 @@ private class ContainerDisplayableValue implements DisplayableValue<ItemName>, S
 
         private ContainerDisplayableValue(ItemDefinition itemDefinition) {
             this.displayName = itemDefinition.getDisplayName() == null ?
-                    itemDefinition.getItemName().getLocalPart() : itemDefinition.getDisplayName();
+                    itemDefinition.getItemName().getLocalPart() : getPageBase().createStringResource(itemDefinition.getDisplayName()).getString();
             this.help = itemDefinition.getHelp();
             this.value = itemDefinition.getItemName();
         }

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
@@ -266,7 +266,7 @@ protected Collection<ObjectDeltaOperation<? extends ObjectType>> executeChanges(
         if (noChangesToExecute(deltas, options)) {
             recordNoChangesWarning(result);
 
-            showResult(result);
+            showResultNoChangesWarning(result);
             return null;
         }
         //TODO force
@@ -287,6 +287,10 @@ protected Collection<ObjectDeltaOperation<? extends ObjectType>> executeChanges(
         return executedDeltas;
     }
 
+    protected void showResultNoChangesWarning(OperationResult result) {
+        showResult(result);
+    }
+
     protected void showResultAfterExecuteChanges(ObjectChangeExecutor changeExecutor, OperationResult result) {
         if (changeExecutor instanceof ObjectChangesExecutorImpl) {
             showResult(result);

diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/PageResource.java b/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/PageResource.java
@@ -352,4 +352,20 @@ protected boolean isSavedAfterWizard() {
     public List<Breadcrumb> getWizardBreadcrumbs() {
         return wizardBreadcrumbs;
     }
+
+    @Override
+    protected void recordNoChangesWarning(OperationResult result) {
+        if (isEditObject()) {
+            super.recordNoChangesWarning(result);
+        } else {
+            result.recordSuccess();
+        }
+    }
+
+    @Override
+    protected void showResultNoChangesWarning(OperationResult result) {
+        if (isEditObject()) {
+            super.showResultNoChangesWarning(result);
+        }
+    }
 }
diff --git a/...dpoint/gui/impl/page/admin/resource/component/wizard/AbstractResourceWizardStepPanel.java b/...dpoint/gui/impl/page/admin/resource/component/wizard/AbstractResourceWizardStepPanel.java
@@ -77,6 +77,11 @@ protected WebMarkupContainer getFeedback() {
         return (WebMarkupContainer) get(ID_FEEDBACK_CONTAINER);
     }
 
+    @Override
+    protected void updateFeedbackPanels(AjaxRequestTarget target) {
+        target.add(getFeedback());
+    }
+
     @Override
     public VisibleEnableBehaviour getStepsBehaviour() {
         if (getWizard().getSteps().size() <= 1) {

diff --git a/.../evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/ResourceWizardPanel.java b/.../evolveum/midpoint/gui/impl/page/admin/resource/component/wizard/ResourceWizardPanel.java
@@ -88,6 +88,7 @@ protected void onEditValue(IModel<PrismContainerValueWrapper<ResourceObjectTypeD
 
             @Override
             protected void onExitPerformed(AjaxRequestTarget target) {
+                super.onExitPerformed(target);
                 exitToPreview(target);
             }
         };
@@ -116,6 +117,7 @@ private PreviewResourceDataWizardPanel createPreviewResourceDataWizardPanel() {
         return new PreviewResourceDataWizardPanel(ID_WIZARD_PANEL, getResourceModel()) {
             @Override
             protected void onExitPerformed(AjaxRequestTarget target) {
+                super.onExitPerformed(target);
                 exitToPreview(target);
             }
         };

diff --git a/...i/impl/page/admin/resource/component/wizard/objectType/ResourceObjectTypeWizardPanel.java b/...i/impl/page/admin/resource/component/wizard/objectType/ResourceObjectTypeWizardPanel.java
@@ -156,6 +156,7 @@ protected void onResourceTileClick(ResourceObjectTypePreviewTileType value, Ajax
 
             @Override
             protected void onExitPerformed(AjaxRequestTarget target) {
+                super.onExitPerformed(target);
                 ResourceObjectTypeWizardPanel.this.onExitPerformed(target);
             }
         });
@@ -282,6 +283,7 @@ private void showTableForDataOfCurrentlyObjectType (
                     valueModel) {
                 @Override
                 protected void onExitPerformed(AjaxRequestTarget target) {
+                    super.onExitPerformed(target);
                     showObjectTypePreviewFragment(getResourceObjectType(), target);
                 }
             });

diff --git a/...page/admin/resource/component/wizard/objectType/ResourceObjectTypeWizardPreviewPanel.java b/...page/admin/resource/component/wizard/objectType/ResourceObjectTypeWizardPreviewPanel.java
@@ -15,6 +15,7 @@
 import com.evolveum.midpoint.gui.impl.util.GuiDisplayNameUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceObjectTypeDefinitionType;
 
+import org.apache.wicket.behavior.AttributeAppender;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.LoadableDetachableModel;
 import org.apache.wicket.model.Model;
@@ -31,6 +32,12 @@ public ResourceObjectTypeWizardPreviewPanel(
         this.valueModel = valueModel;
     }
 
+    @Override
+    protected void onInitialize() {
+        super.onInitialize();
+        add(AttributeAppender.append("class", "col-xxl-10 col-12 gap-3 m-auto"));
+    }
+
     public enum ResourceObjectTypePreviewTileType implements TileEnum {
 
         PREVIEW_DATA("fa fa-magnifying-glass"),

diff --git a/...admin/resource/component/wizard/objectType/associations/AssociationsTableWizardPanel.java b/...admin/resource/component/wizard/objectType/associations/AssociationsTableWizardPanel.java
@@ -94,7 +94,6 @@ public void onClick(AjaxRequestTarget target) {
             @Override
             public void onClick(AjaxRequestTarget target) {
                 onSaveResourcePerformed(target);
-                onExitPerformed(target);
             }
         };
         saveButton.showTitleAsLabel(true);

diff --git a/...page/admin/resource/component/wizard/objectType/associations/AssociationsWizardPanel.java b/...page/admin/resource/component/wizard/objectType/associations/AssociationsWizardPanel.java
@@ -74,6 +74,7 @@ protected void onSaveResourcePerformed(AjaxRequestTarget target) {
 
                     @Override
                     protected void onExitPerformed(AjaxRequestTarget target) {
+                        super.onExitPerformed(target);
                         AssociationsWizardPanel.this.onExitPerformed(target);
                     }
 

diff --git a/...in/resource/component/wizard/objectType/attributeMapping/AttributeMappingWizardPanel.java b/...in/resource/component/wizard/objectType/attributeMapping/AttributeMappingWizardPanel.java
@@ -83,6 +83,7 @@ protected void inEditInboundValue(IModel<PrismContainerValueWrapper<MappingType>
 
             @Override
             protected void onExitPerformed(AjaxRequestTarget target) {
+                super.onExitPerformed(target);
                 AttributeMappingWizardPanel.this.onExitPerformed(target);
             }
 
@@ -137,6 +138,7 @@ protected void onSaveResourcePerformed(AjaxRequestTarget target) {
 
                     @Override
                     protected void onExitPerformed(AjaxRequestTarget target) {
+                        super.onExitPerformed(target);
                         showTableFragment(target, selectedTable);
                     }
 

diff --git a/...e/admin/resource/component/wizard/objectType/attributeMapping/AttributeMappingsTable.java b/...e/admin/resource/component/wizard/objectType/attributeMapping/AttributeMappingsTable.java
@@ -307,7 +307,7 @@ protected List<IColumn<PrismContainerValueWrapper<MappingType>, String>> createD
 
             @Override
             public String getCssClass() {
-                return "col-lg-3 col-md-3";
+                return "col-xl-3 col-lg-3 col-md-3";
             }
         });
 

diff --git a/...ource/component/wizard/objectType/attributeMapping/AttributeMappingsTableWizardPanel.java b/...ource/component/wizard/objectType/attributeMapping/AttributeMappingsTableWizardPanel.java
@@ -185,7 +185,6 @@ public void onClick(AjaxRequestTarget target) {
             @Override
             public void onClick(AjaxRequestTarget target) {
                 onSaveResourcePerformed(target);
-                onExitPerformed(target);
             }
         };
         saveButton.showTitleAsLabel(true);

diff --git a/...source/component/wizard/objectType/attributeMapping/MappingOverridesTableWizardPanel.java b/...source/component/wizard/objectType/attributeMapping/MappingOverridesTableWizardPanel.java
@@ -94,7 +94,6 @@ public void onClick(AjaxRequestTarget target) {
             @Override
             public void onClick(AjaxRequestTarget target) {
                 onSaveResourcePerformed(target);
-                onExitPerformed(target);
             }
         };
         saveButton.showTitleAsLabel(true);

diff --git a/...resource/component/wizard/objectType/attributeMapping/OutboundAttributeMappingsTable.java b/...resource/component/wizard/objectType/attributeMapping/OutboundAttributeMappingsTable.java
@@ -152,7 +152,7 @@ public void setObject(Collection<VariableBindingDefinitionType> newValues) {
 
             @Override
             public String getCssClass() {
-                return "col-lg-4 col-md-4";
+                return "col-xl-4 col-lg-4 col-md-4";
             }
         });
 
@@ -191,7 +191,7 @@ public String getCssClass() {
 
             @Override
             public String getCssClass() {
-                return "col-lg-2 col-md-3";
+                return "col-xl-2 col-lg-2 col-md-3";
             }
 
         });

diff --git a/...in/resource/component/wizard/objectType/correlation/CorrelationItemsTableWizardPanel.java b/...in/resource/component/wizard/objectType/correlation/CorrelationItemsTableWizardPanel.java
@@ -76,7 +76,6 @@ protected void addCustomButtons(RepeatingView buttons) {
             @Override
             public void onClick(AjaxRequestTarget target) {
                 onSaveResourcePerformed(target);
-                onExitPerformed(target);
             }
         };
         saveButton.showTitleAsLabel(true);

diff --git a/...l/page/admin/resource/component/wizard/objectType/correlation/CorrelationWizardPanel.java b/...l/page/admin/resource/component/wizard/objectType/correlation/CorrelationWizardPanel.java
@@ -53,11 +53,14 @@ protected void onSaveResourcePerformed(AjaxRequestTarget target) {
                             .delay(5_000)
                             .body(getString("ResourceWizardPanel.updateResource.text")).show(target);
                     onExitPerformed(target);
+                } else {
+                    target.add(getFeedback());
                 }
             }
 
             @Override
             protected void onExitPerformed(AjaxRequestTarget target) {
+                super.onExitPerformed(target);
                 CorrelationWizardPanel.this.onExitPerformed(target);
             }
 
@@ -66,6 +69,7 @@ protected void showTableForItemRefs(AjaxRequestTarget target, IModel<PrismContai
                 showChoiceFragment(target, new CorrelationItemRefsTableWizardPanel(getIdOfChoicePanel(), getResourceModel(), rowModel) {
                     @Override
                     protected void onExitPerformed(AjaxRequestTarget target) {
+                        super.onExitPerformed(target);
                         showChoiceFragment(target, createTablePanel());
                     }
                 });

diff --git a/...i/impl/page/admin/resource/component/wizard/objectType/credentials/PasswordStepPanel.java b/...i/impl/page/admin/resource/component/wizard/objectType/credentials/PasswordStepPanel.java
@@ -108,11 +108,6 @@ protected IModel<? extends PrismContainerWrapper> getContainerFormModel() {
         return containerModel;
     }
 
-    @Override
-    protected void updateFeedbackPanels(AjaxRequestTarget target) {
-        target.add(getPageBase().getFeedbackPanel());
-    }
-
     protected String getPanelType() {
         return PANEL_TYPE;
     }

diff --git a/...impl/page/admin/resource/component/wizard/objectType/synchronization/ActionStepPanel.html b/...impl/page/admin/resource/component/wizard/objectType/synchronization/ActionStepPanel.html
@@ -0,0 +1,39 @@
+<!--
+  ~ Copyright (c) 2010-2018 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">
+<wicket:extend>
+    <div wicket:id="feedbackContainer" class="col-8 feedbackContainer">
+        <div wicket:id="feedback" class="messagePanel"/>
+    </div>
+    <div class="col-8" wicket:id="container">
+        <div class="p-2 pl-3 pr-3 card mb-0 btn" wicket:id="header">
+            <div class="row">
+                <span>
+                    <i class="fa fa-wrench"></i>
+                    <span style="text-decoration: none;">
+                <wicket:message key="PageResource.wizard.step.synchronization.reaction.action"/>
+            </span>
+                </span>
+                <button wicket:id="expandCollapseButton" wicket:message="title:PrismObjectPanel.expandCollapseContainer" class="btn btn-tool text-body ml-auto" trigger="hover"></button>
+            </div>
+        </div>
+        <div class="card border-top">
+            <div class="p-3 mb-0" wicket:id="actionContainer">
+                <span class="mt-4 text-gray font-weight-bold text-center">
+                    <span style="text-decoration: none;">
+                        <wicket:message key="SynchronizationReactionType.actions"/>
+                    </span>
+                </span>
+                <div wicket:id="action"/>
+            </div>
+            <div wicket:id="panel"/>
+        </div>
+    </div>
+</wicket:extend>
+</html>