adding dropdown button for configuration and task operations on resou…

…rce object type tab panel (MID-8827, MID-8800)
Evolveum · Aug 26, 2023 · 4da1314 · 4da1314
1 parent 30da7b2
commit 4da1314
Show file tree

Hide file tree

Showing 15 changed files with 502 additions and 120 deletions.
diff --git a/...gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonPanel.java b/...gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonPanel.java
@@ -6,7 +6,7 @@
  */
 package com.evolveum.midpoint.gui.api.component.button;
 
-import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItemAction;
+import com.evolveum.midpoint.web.component.menu.cog.*;
 
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -20,8 +20,6 @@
 import org.apache.wicket.model.PropertyModel;
 
 import com.evolveum.midpoint.gui.api.component.BasePanel;
-import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
-import com.evolveum.midpoint.web.component.menu.cog.MenuLinkPanel;
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 
@@ -123,25 +121,47 @@ protected boolean visibleCaret() {
     protected void populateMenuItem(String componentId, ListItem<InlineMenuItem> menuItem) {
         menuItem.setRenderBodyOnly(true);
 
-        MenuLinkPanel menuItemBody = new MenuLinkPanel(componentId, menuItem.getModel()){
-            @Override
-            protected void onClick(AjaxRequestTarget target, InlineMenuItemAction action, IModel<InlineMenuItem> item) {
-                onBeforeClickMenuItem(target, action, item);
-                super.onClick(target, action, item);
-            }
-
-            @Override
-            protected void onSubmit(AjaxRequestTarget target, InlineMenuItemAction action, IModel<InlineMenuItem> item) {
-                onBeforeClickMenuItem(target, action, item);
-                super.onSubmit(target, action, item);
-            }
-        };
+        MenuLinkPanel menuItemBody;
+        if (showIcon() && menuItem.getModelObject() instanceof ButtonInlineMenuItem) {
+            IModel model = menuItem.getModel();
+            menuItemBody = new IconMenuLinkPanel(componentId, model) {
+                @Override
+                protected void onClick(AjaxRequestTarget target, InlineMenuItemAction action, IModel<ButtonInlineMenuItem> item) {
+                    onBeforeClickMenuItem(target, action, item);
+                    super.onClick(target, action, item);
+                }
+
+                @Override
+                protected void onSubmit(AjaxRequestTarget target, InlineMenuItemAction action, IModel<ButtonInlineMenuItem> item) {
+                    onBeforeClickMenuItem(target, action, item);
+                    super.onSubmit(target, action, item);
+                }
+            };
+        } else {
+            menuItemBody = new MenuLinkPanel<>(componentId, menuItem.getModel()) {
+                @Override
+                protected void onClick(AjaxRequestTarget target, InlineMenuItemAction action, IModel<InlineMenuItem> item) {
+                    onBeforeClickMenuItem(target, action, item);
+                    super.onClick(target, action, item);
+                }
+
+                @Override
+                protected void onSubmit(AjaxRequestTarget target, InlineMenuItemAction action, IModel<InlineMenuItem> item) {
+                    onBeforeClickMenuItem(target, action, item);
+                    super.onSubmit(target, action, item);
+                }
+            };
+        }
         menuItemBody.setRenderBodyOnly(true);
         menuItem.add(menuItemBody);
         menuItem.add(new VisibleBehaviour(() -> menuItem.getModelObject().getVisible().getObject()));
     }
 
-    protected void onBeforeClickMenuItem(AjaxRequestTarget target, InlineMenuItemAction action, IModel<InlineMenuItem> item) {
+    protected boolean showIcon() {
+        return false;
+    }
+
+    protected void onBeforeClickMenuItem(AjaxRequestTarget target, InlineMenuItemAction action, IModel<? extends InlineMenuItem> item) {
     }
 
     protected String getSpecialButtonClass() {

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/tile/MemberTilePanel.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/tile/MemberTilePanel.java
@@ -110,7 +110,7 @@ protected String getSpecialButtonClass() {
             }
 
             @Override
-            protected void onBeforeClickMenuItem(AjaxRequestTarget target, InlineMenuItemAction action, IModel<InlineMenuItem> item) {
+            protected void onBeforeClickMenuItem(AjaxRequestTarget target, InlineMenuItemAction action, IModel<? extends InlineMenuItem> item) {
                 if (action instanceof ColumnMenuAction) {
                     ((ColumnMenuAction) action).setRowModel(() -> MemberTilePanel.this.getModelObject().getValue());
                 }

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
@@ -151,54 +151,52 @@ private boolean useNoFetchOption() {
         return resource == null || StringUtils.isNotEmpty(resource.getOid());
     }
 
-    public void showResourceObjectTypeBasicWizard(AjaxRequestTarget target, ItemPath pathToValue) {
-        ResourceObjectTypeBasicWizardPanel wizardPanel = showWizard(target, pathToValue, ResourceObjectTypeBasicWizardPanel.class);
-        addWizardBreadcrumbsForObjectType(wizardPanel);
-    }
-
     public void showResourceObjectTypePreviewWizard(AjaxRequestTarget target, ItemPath pathToValue) {
         ResourceObjectTypeWizardPanel wizard = showObjectTypeWizard(target, pathToValue);
         wizard.setShowObjectTypePreview(true);
     }
 
+    public ResourceObjectTypeWizardPanel showObjectTypeWizard(AjaxRequestTarget target, ItemPath pathToValue) {
+        ResourceObjectTypeWizardPanel wizard =
+                showWizard(target, pathToValue, ResourceObjectTypeWizardPanel.class);
+        return wizard;
+    }
+
+    public void showResourceObjectTypeBasicWizard(AjaxRequestTarget target, ItemPath pathToValue) {
+        showContainerWizard(target, pathToValue, ResourceObjectTypeBasicWizardPanel.class);
+    }
+
     public void showSynchronizationWizard(AjaxRequestTarget target, ItemPath pathToValue) {
-        SynchronizationWizardPanel wizardPanel = showWizard(target, pathToValue, SynchronizationWizardPanel.class);
-        addWizardBreadcrumbsForObjectType(wizardPanel);
+        showContainerWizard(target, pathToValue, SynchronizationWizardPanel.class);
+    }
+
+    public void showAttributeMappingWizard(AjaxRequestTarget target, ItemPath pathToValue) {
+        showContainerWizard(target, pathToValue, AttributeMappingWizardPanel.class);
     }
 
     public void showCorrelationWizard(AjaxRequestTarget target, ItemPath pathToValue) {
-        CorrelationWizardPanel wizardPanel = showWizard(target, pathToValue, CorrelationWizardPanel.class);
-        addWizardBreadcrumbsForObjectType(wizardPanel);
+        showContainerWizard(target, pathToValue, CorrelationWizardPanel.class);
     }
 
     public void showCapabilitiesWizard(AjaxRequestTarget target, ItemPath pathToValue) {
-        CapabilitiesWizardPanel wizardPanel = showWizard(target, pathToValue, CapabilitiesWizardPanel.class);
-        addWizardBreadcrumbsForObjectType(wizardPanel);
+        showContainerWizard(target, pathToValue, CapabilitiesWizardPanel.class);
     }
 
     public void showCredentialsWizard(AjaxRequestTarget target, ItemPath pathToValue) {
-        CredentialsWizardPanel wizardPanel = showWizard(target, pathToValue, CredentialsWizardPanel.class);
-        addWizardBreadcrumbsForObjectType(wizardPanel);
+        showContainerWizard(target, pathToValue, CredentialsWizardPanel.class);
     }
 
     public void showActivationsWizard(AjaxRequestTarget target, ItemPath pathToValue) {
-        ActivationsWizardPanel wizardPanel = showWizard(target, pathToValue, ActivationsWizardPanel.class);
-        addWizardBreadcrumbsForObjectType(wizardPanel);
+        showContainerWizard(target, pathToValue, ActivationsWizardPanel.class);
     }
 
     public void showAssociationsWizard(AjaxRequestTarget target, ItemPath pathToValue) {
-        AssociationsWizardPanel wizardPanel = showWizard(target, pathToValue, AssociationsWizardPanel.class);
-        addWizardBreadcrumbsForObjectType(wizardPanel);
+        showContainerWizard(target, pathToValue, AssociationsWizardPanel.class);
     }
 
-    public ResourceObjectTypeWizardPanel showObjectTypeWizard(AjaxRequestTarget target, ItemPath pathToValue) {
-        ResourceObjectTypeWizardPanel wizard =
-                showWizard(target, pathToValue, ResourceObjectTypeWizardPanel.class);
-        return wizard;
-    }
-
-    public void showAttributeMappingWizard(AjaxRequestTarget target, ItemPath pathToValue) {
-        AttributeMappingWizardPanel wizardPanel = showWizard(target, pathToValue, AttributeMappingWizardPanel.class);
+    private <P extends AbstractWizardPanel> void showContainerWizard(
+            AjaxRequestTarget target, ItemPath pathToValue, Class<P> wizardClass) {
+        P wizardPanel = (P) showWizard(target, pathToValue, wizardClass);
         addWizardBreadcrumbsForObjectType(wizardPanel);
     }
 

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
@@ -398,8 +398,8 @@ public void onClick(AjaxRequestTarget target) {
     private void initSychronizationButton(RepeatingView topButtons) {
         AjaxIconButton synchConfButton = new AjaxIconButton(
                 topButtons.newChildId(),
-                Model.of(ResourceObjectTypePreviewTileType.SYNCHRONIZATION_CONFIG.getIcon()),
-                getPageBase().createStringResource(ResourceObjectTypePreviewTileType.SYNCHRONIZATION_CONFIG)) {
+                Model.of(ResourceObjectTypePreviewTileType.SYNCHRONIZATION.getIcon()),
+                getPageBase().createStringResource(ResourceObjectTypePreviewTileType.SYNCHRONIZATION)) {
             @Override
             public void onClick(AjaxRequestTarget target) {
                 IModel<PrismContainerValueWrapper<ResourceObjectTypeDefinitionType>> valueModel =
@@ -420,8 +420,8 @@ public void onClick(AjaxRequestTarget target) {
     private void initCorrelationButton(RepeatingView topButtons) {
         AjaxIconButton correlationConfButton = new AjaxIconButton(
                 topButtons.newChildId(),
-                Model.of(ResourceObjectTypePreviewTileType.CORRELATION_CONFIG.getIcon()),
-                getPageBase().createStringResource(ResourceObjectTypePreviewTileType.CORRELATION_CONFIG)) {
+                Model.of(ResourceObjectTypePreviewTileType.CORRELATION.getIcon()),
+                getPageBase().createStringResource(ResourceObjectTypePreviewTileType.CORRELATION)) {
             @Override
             public void onClick(AjaxRequestTarget target) {
                 IModel<PrismContainerValueWrapper<ResourceObjectTypeDefinitionType>> valueModel =
@@ -442,8 +442,8 @@ public void onClick(AjaxRequestTarget target) {
     private void initCapabilitiesButton(RepeatingView topButtons) {
         AjaxIconButton capabilitiesConfButton = new AjaxIconButton(
                 topButtons.newChildId(),
-                Model.of(ResourceObjectTypePreviewTileType.CAPABILITIES_CONFIG.getIcon()),
-                getPageBase().createStringResource(ResourceObjectTypePreviewTileType.CAPABILITIES_CONFIG)) {
+                Model.of(ResourceObjectTypePreviewTileType.CAPABILITIES.getIcon()),
+                getPageBase().createStringResource(ResourceObjectTypePreviewTileType.CAPABILITIES)) {
             @Override
             public void onClick(AjaxRequestTarget target) {
                 IModel<PrismContainerValueWrapper<ResourceObjectTypeDefinitionType>> valueModel =

diff --git a/...va/com/evolveum/midpoint/gui/impl/page/admin/resource/component/ResourceObjectsPanel.html b/...va/com/evolveum/midpoint/gui/impl/page/admin/resource/component/ResourceObjectsPanel.html
@@ -12,10 +12,8 @@
         <h3 wicket:id="title"/>
         <div wicket:id="objectType"/>
         <div wicket:id="lifecycleState"/>
-        <div class="d-table">
-            <button wicket:id="configuration" class="btn btn-sm btn-primary mr-3"/>
-            <button wicket:id="createTask" class="btn btn-sm btn-default"/>
-        </div>
+        <div wicket:id="configuration"/>
+        <div wicket:id="tasks"/>
         <div wicket:id="showStatistics" class="ml-auto"/>
     </div>