Merge branch 'master' of github.com:Evolveum/midpoint

Evolveum · Aug 18, 2022 · fe264dc · fe264dc
2 parents e4730a7 + cca1881
commit fe264dc
Show file tree

Hide file tree

Showing 11 changed files with 136 additions and 26 deletions.
diff --git a/...rc/main/java/com/evolveum/midpoint/gui/api/component/wizard/AbstractWizardBasicPanel.html b/...rc/main/java/com/evolveum/midpoint/gui/api/component/wizard/AbstractWizardBasicPanel.html
@@ -11,6 +11,13 @@
 <body>
 <wicket:panel>
     <div class="d-flex flex-column gap-3 align-items-center mt-5">
+        <div>
+            <ol class="breadcrumb p-0 bg-transparent">
+                <li class="breadcrumb-item" wicket:id="breadcrumb">
+                    <span wicket:id="bcName"/>
+                </li>
+            </ol>
+        </div>
         <h2 class="mb-3" wicket:id="text"/>
         <h5 class="text-secondary mb-5" wicket:id="subText"/>
         <div class="col-12">

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
@@ -7,20 +7,34 @@
 package com.evolveum.midpoint.gui.api.component.wizard;
 
 import com.evolveum.midpoint.gui.api.component.BasePanel;
+import com.evolveum.midpoint.gui.api.page.PageBase;
+import com.evolveum.midpoint.gui.impl.page.admin.resource.PageResource;
 import com.evolveum.midpoint.gui.impl.page.admin.resource.ResourceDetailsModel;
 import com.evolveum.midpoint.web.component.AjaxIconButton;
+import com.evolveum.midpoint.web.component.breadcrumbs.Breadcrumb;
+import com.evolveum.midpoint.web.component.util.EnableBehaviour;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 import com.evolveum.midpoint.web.page.admin.resources.PageResources;
 
+import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.markup.html.AjaxLink;
 import org.apache.wicket.behavior.AttributeAppender;
+import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.list.ListItem;
+import org.apache.wicket.markup.html.list.ListView;
 import org.apache.wicket.markup.repeater.RepeatingView;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
 
+import java.util.List;
+
 public abstract class AbstractWizardBasicPanel extends BasePanel {
 
+
+    private static final String ID_BREADCRUMB = "breadcrumb";
+    private static final String ID_BC_NAME = "bcName";
     private static final String ID_TEXT = "text";
     private static final String ID_SUBTEXT = "subText";
     private static final String ID_BUTTONS = "buttons";
@@ -39,9 +53,36 @@ public ResourceDetailsModel getResourceModel() {
     protected void onInitialize() {
         super.onInitialize();
         initLayout();
+        getBreadcrumbsModel().getObject().add(new Breadcrumb(getBreadcrumbLabel()));
+    }
+
+    protected abstract IModel<String> getBreadcrumbLabel();
+
+    protected void removeLastBreadcrumb() {
+        int index = getBreadcrumbsModel().getObject().size() - 1;
+        getBreadcrumbsModel().getObject().remove(index);
     }
 
     private void initLayout() {
+        ListView<Breadcrumb> breadcrumbs = new ListView<>(ID_BREADCRUMB, getBreadcrumbsModel()) {
+
+            private static final long serialVersionUID = 1L;
+
+            @Override
+            protected void populateItem(ListItem<Breadcrumb> item) {
+                int index = item.getIndex() + 1;
+                if (index == getList().size()) {
+                    item.add(AttributeAppender.append("class", "text-primary"));
+                }
+
+                Label bcName = new Label(ID_BC_NAME, item.getModelObject().getLabel());
+                item.add(bcName);
+
+                item.add(new VisibleBehaviour(() -> item.getModelObject().isVisible()));
+            }
+        };
+        add(breadcrumbs);
+        breadcrumbs.add(new VisibleBehaviour(() -> getBreadcrumbsModel().getObject().size() > 1));
 
         Label mainText = new Label(ID_TEXT, getTextModel());
         mainText.add(new VisibleBehaviour(() -> getTextModel().getObject() != null));
@@ -70,6 +111,14 @@ public void onClick(AjaxRequestTarget target) {
         add(buttons);
     }
 
+    private IModel<List<Breadcrumb>> getBreadcrumbsModel() {
+        PageBase page = getPageBase();
+        if (page instanceof PageResource) {
+            return ((PageResource)page).getWizardBreadcrumbs();
+        }
+        return Model.ofList(List.of());
+    }
+
     protected IModel<String> getExitLabel() {
         return getPageBase().createStringResource("WizardPanel.exit");
     }

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
@@ -6,7 +6,9 @@
  */
 package com.evolveum.midpoint.gui.impl.page.admin.resource;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.List;
 
 import com.evolveum.midpoint.gui.api.component.result.Toast;
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper;
@@ -28,13 +30,15 @@
 import com.evolveum.midpoint.authentication.api.authorization.Url;
 
 import com.evolveum.midpoint.task.api.Task;
+import com.evolveum.midpoint.web.component.breadcrumbs.Breadcrumb;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.markup.html.WebMarkupContainer;
 import org.apache.wicket.markup.html.panel.Fragment;
 import org.apache.wicket.markup.html.panel.Panel;
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
@@ -60,6 +64,7 @@ public class PageResource extends PageAssignmentHolderDetails<ResourceType, Reso
 
     private static final String ID_WIZARD_FRAGMENT = "wizardFragment";
     private static final String ID_WIZARD = "wizard";
+    private IModel<List<Breadcrumb>> wizardBreadcrumbs = Model.ofList(new ArrayList<>());
 
     public PageResource(PageParameters pageParameters) {
         super(pageParameters);
@@ -205,4 +210,8 @@ protected void onExitPerformed(AjaxRequestTarget target) {
         fragment.add(wizard);
         target.add(fragment);
     }
+
+    public IModel<List<Breadcrumb>> getWizardBreadcrumbs() {
+        return wizardBreadcrumbs;
+    }
 }
diff --git a/...idpoint/gui/impl/page/admin/resource/component/wizard/PreviewResourceDataWizardPanel.java b/...idpoint/gui/impl/page/admin/resource/component/wizard/PreviewResourceDataWizardPanel.java
@@ -73,6 +73,11 @@ ContainerPanelConfigurationType getConfiguration(){
                 PANEL_TYPE);
     }
 
+    @Override
+    protected IModel<String> getBreadcrumbLabel() {
+        return getPageBase().createStringResource("PreviewResourceDataWizardPanel.title");
+    }
+
     @Override
     protected IModel<String> getSubTextModel() {
         return getPageBase().createStringResource("PreviewResourceDataWizardPanel.text");

diff --git a/...um/midpoint/gui/impl/page/admin/resource/component/wizard/ResourceWizardPreviewPanel.java b/...um/midpoint/gui/impl/page/admin/resource/component/wizard/ResourceWizardPreviewPanel.java
@@ -35,6 +35,11 @@ public String getIcon() {
         }
     }
 
+    @Override
+    protected IModel<String> getBreadcrumbLabel() {
+        return getPageBase().createStringResource("ResourceWizardPreviewPanel.title");
+    }
+
     @Override
     protected IModel<String> getSubTextModel() {
         return getPageBase().createStringResource("ResourceWizardPreviewPanel.subText");

diff --git a/.../admin/resource/component/wizard/objectType/PreviewResourceObjectTypeDataWizardPanel.java b/.../admin/resource/component/wizard/objectType/PreviewResourceObjectTypeDataWizardPanel.java
@@ -94,6 +94,11 @@ protected IModel<PrismContainerValueWrapper<ResourceObjectTypeDefinitionType>> g
         return resourceObjectType;
     }
 
+    @Override
+    protected IModel<String> getBreadcrumbLabel() {
+        return getPageBase().createStringResource("PreviewResourceObjectTypeDataWizardPanel.title");
+    }
+
     //    @Override
 //    protected IModel<String> getSubTextModel() {
 //        return getPageBase().createStringResource("PreviewResourceObjectTypeDataWizardPanel.text");

diff --git a/...l/page/admin/resource/component/wizard/objectType/ResourceObjectTypeTableWizardPanel.java b/...l/page/admin/resource/component/wizard/objectType/ResourceObjectTypeTableWizardPanel.java
@@ -106,6 +106,11 @@ protected IModel<String> getSubTextModel() {
         return getPageBase().createStringResource("ResourceObjectTypeTableWizardPanel.text");
     }
 
+    @Override
+    protected IModel<String> getBreadcrumbLabel() {
+        return getPageBase().createStringResource("ResourceObjectTypeTableWizardPanel.title");
+    }
+
     @Override
     protected IModel<String> getTextModel() {
         return getPageBase().createStringResource("ResourceObjectTypeTableWizardPanel.subText");

diff --git a/...page/admin/resource/component/wizard/objectType/ResourceObjectTypeWizardPreviewPanel.java b/...page/admin/resource/component/wizard/objectType/ResourceObjectTypeWizardPreviewPanel.java
@@ -12,9 +12,11 @@
 
 import com.evolveum.midpoint.gui.impl.page.admin.resource.component.wizard.ResourceWizardChoicePanel;
 
+import com.evolveum.midpoint.gui.impl.util.GuiDisplayNameUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.ResourceObjectTypeDefinitionType;
 
 import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.Model;
 
 public abstract class ResourceObjectTypeWizardPreviewPanel extends ResourceWizardChoicePanel<ResourceObjectTypeWizardPreviewPanel.ResourceObjectTypePreviewTileType> {
 
@@ -60,6 +62,11 @@ protected IModel<PrismContainerValueWrapper<ResourceObjectTypeDefinitionType>> g
         return valueModel;
     }
 
+    @Override
+    protected IModel<String> getBreadcrumbLabel() {
+        return Model.of(GuiDisplayNameUtil.getDisplayName(valueModel.getObject().getRealValue()));
+    }
+
     @Override
     protected IModel<String> getSubTextModel() {
         return getPageBase().createStringResource("ResourceObjectTypeWizardPreviewPanel.subText");

diff --git a/...ource/component/wizard/objectType/attributeMapping/AttributeMappingsTableWizardPanel.java b/...ource/component/wizard/objectType/attributeMapping/AttributeMappingsTableWizardPanel.java
@@ -116,6 +116,11 @@ public void onClick(AjaxRequestTarget target) {
 
     protected abstract void onEditValue(IModel<PrismContainerValueWrapper<ResourceAttributeDefinitionType>> value, AjaxRequestTarget target);
 
+    @Override
+    protected IModel<String> getBreadcrumbLabel() {
+        return getPageBase().createStringResource("AttributeMappingsTableWizardPanel.title");
+    }
+
     @Override
     protected IModel<String> getSubTextModel() {
         return getPageBase().createStringResource("AttributeMappingsTableWizardPanel.text");

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/util/GuiDisplayNameUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/util/GuiDisplayNameUtil.java
@@ -93,6 +93,45 @@ public static String getDisplayName(AssignmentType assignmentType) {
         return displayName;
     }
 
+    public static String getDisplayName(ResourceObjectTypeDefinitionType objectType) {
+        if (StringUtils.isNotEmpty(objectType.getDisplayName())) {
+            return objectType.getDisplayName();
+        }
+        StringBuilder sb = new StringBuilder();
+        if (objectType.getKind() != null) {
+            sb.append(PageBase.createStringResourceStatic(null, objectType.getKind()));
+        }
+        if (StringUtils.isNotEmpty(objectType.getIntent())) {
+            if (StringUtils.isNotEmpty(sb.toString())) {
+                sb.append("-");
+            }
+            sb.append(objectType.getIntent());
+        }
+
+        QName objectClass = null;
+        if (objectType.getDelineation() != null) {
+            objectClass = objectType.getDelineation().getObjectClass();
+        }
+        if (objectClass == null) {
+            objectClass = objectType.getObjectClass();
+        }
+        if (objectClass != null) {
+            boolean isNotDisplayNameEmpty = StringUtils.isNotEmpty(sb.toString());
+            if (isNotDisplayNameEmpty) {
+                sb.append("(");
+            }
+            sb.append(objectClass.getLocalPart());
+            if (isNotDisplayNameEmpty) {
+                sb.append(")");
+            }
+        }
+
+        if (StringUtils.isEmpty(sb.toString())) {
+            return PageBase.createStringResourceStatic("SchemaHandlingType.objectType").getString();
+        }
+        return sb.toString();
+    }
+
     public static String getDisplayName(ExclusionPolicyConstraintType exclusionConstraint) {
         String exclusionConstraintName = getExclusionConstraintName(exclusionConstraint);
         return exclusionConstraintNameExists(exclusionConstraintName, exclusionConstraint) ? exclusionConstraintName : "ExclusionPolicyConstraintType.details";

diff --git a/gui/admin-gui/src/main/resources/initial-objects/000-system-configuration.xml b/gui/admin-gui/src/main/resources/initial-objects/000-system-configuration.xml
@@ -971,32 +971,6 @@
                             <visibility>visible</visibility>
                         </item>
                     </container>
-                    <container>
-                        <identifier>baseContext</identifier>
-                        <display>
-                            <label>ResourceObjectTypeDelineationType.baseContext</label>
-                        </display>
-                        <item>
-                            <path>schemaHandling/objectType/delineation/baseContext/objectClass</path>
-                            <visibility>visible</visibility>
-                        </item>
-                        <item>
-                            <path>schemaHandling/objectType/delineation/baseContext/filter</path>
-                            <visibility>visible</visibility>
-                        </item>
-                        <item>
-                            <path>schemaHandling/objectType/delineation/baseContext/shadowRef</path>
-                            <visibility>visible</visibility>
-                        </item>
-                        <item>
-                            <path>schemaHandling/objectType/delineation/baseContext/resolutionStrategy</path>
-                            <visibility>visible</visibility>
-                        </item>
-                        <item>
-                            <path>schemaHandling/objectType/delineation/baseContext/resolutionFrequency</path>
-                            <visibility>visible</visibility>
-                        </item>
-                    </container>
                     <container>
                         <visibility>hidden</visibility>
                         <path>schemaHandling/objectType/delineation</path>