adding resource wizard steps for configuration and discovery

Evolveum · Jun 6, 2022 · adb3a87 · adb3a87
1 parent a7337eb
commit adb3a87
Show file tree

Hide file tree

Showing 22 changed files with 526 additions and 241 deletions.
diff --git a/gui/admin-gui/src/frontend/scss/_admin-lte-overrides.scss b/gui/admin-gui/src/frontend/scss/_admin-lte-overrides.scss
@@ -16,44 +16,3 @@
     color: darken($button-default-color, 10%);
   }
 }
-
-.col-5i,
-.col-sm-5i,
-.col-md-5i,
-.col-lg-5i,
-.col-xl-5i {
-  position: relative;
-  width: 100%;
-  padding-right: 15px;
-  padding-left: 15px;
-}
-
-.col-5i {
-  flex: 0 0 20%;
-  max-width: 20%;
-}
-
-@media (min-width: 576px){
-  .col-sm-5i {
-    flex: 0 0 20%;
-    max-width: 20%;
-  }
-}
-@media (min-width: 768px){
-  .col-md-5i {
-    flex: 0 0 20%;
-    max-width: 20%;
-  }
-}
-@media (min-width: 992px){
-  .col-lg-5i {
-    flex: 0 0 20%;
-    max-width: 20%;
-  }
-}
-@media (min-width: 1200px){
-  .col-xl-5i {
-    flex: 0 0 20%;
-    max-width: 20%;
-  }
-}
diff --git a/gui/admin-gui/src/frontend/scss/midpoint.scss b/gui/admin-gui/src/frontend/scss/midpoint.scss
@@ -1710,3 +1710,44 @@ th.debug-list-buttons {
     }
   }
 }
+
+.col-5i,
+.col-sm-5i,
+.col-md-5i,
+.col-lg-5i,
+.col-xl-5i {
+  position: relative;
+  width: 100%;
+  padding-right: 15px;
+  padding-left: 15px;
+}
+
+.col-5i {
+  flex: 0 0 20%;
+  max-width: 20%;
+}
+
+@media (min-width: 576px){
+  .col-sm-5i {
+    flex: 0 0 20%;
+    max-width: 20%;
+  }
+}
+@media (min-width: 768px){
+  .col-md-5i {
+    flex: 0 0 20%;
+    max-width: 20%;
+  }
+}
+@media (min-width: 992px){
+  .col-lg-5i {
+    flex: 0 0 20%;
+    max-width: 20%;
+  }
+}
+@media (min-width: 1200px){
+  .col-xl-5i {
+    flex: 0 0 20%;
+    max-width: 20%;
+  }
+}
diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/gui/api/component/wizard/BasicWizardPanel.java b/...in-gui/src/main/java/com/evolveum/midpoint/gui/api/component/wizard/BasicWizardPanel.java
@@ -88,32 +88,24 @@ protected IModel<?> getSubTextModel() {
     }
 
     private IModel<?> createNextStepLabel() {
-        MarkupContainer parent = getParent();
-        if (parent instanceof WizardPanel) {
-            WizardStep panel = ((WizardPanel) parent).getWizardModel().getNextPanel();
-            return panel.getTitle();
+        WizardStep nextPanel = getWizard().getNextPanel();
+        if (nextPanel != null){
+            return nextPanel.getTitle();
         }
         return Model.of();
     }
 
     private void onNextPerformed(AjaxRequestTarget target) {
-        MarkupContainer parent = getParent();
-        if (parent instanceof WizardPanel) {
-            ((WizardPanel) parent).getWizardModel().next();
-            target.add(parent);
-        }
+        getWizard().next();
+        target.add(getParent());
     }
 
     protected void onBackPerformed(AjaxRequestTarget target) {
-        MarkupContainer parent = getParent();
-        if (parent instanceof WizardPanel) {
-            WizardPanel wizard = (WizardPanel) parent;
-            int index = wizard.getWizardModel().getActiveStepIndex();
-            if (index > 0) {
-                wizard.getWizardModel().previous();
-                target.add(wizard);
-                return;
-            }
+        int index = getWizard().getActiveStepIndex();
+        if (index > 0) {
+            getWizard().previous();
+            target.add(getParent());
+            return;
         }
         getPageBase().redirectBack();
     }

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/wizard/WizardHeader.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/wizard/WizardHeader.java
@@ -7,6 +7,8 @@
 
 package com.evolveum.midpoint.gui.api.component.wizard;
 
+import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
+
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -17,6 +19,8 @@
 
 import com.evolveum.midpoint.gui.api.component.BasePanel;
 
+import org.jetbrains.annotations.NotNull;
+
 /**
  * Created by Viliam Repan (lazyman).
  */
@@ -71,10 +75,15 @@ public void onClick(AjaxRequestTarget target) {
         next.setOutputMarkupPlaceholderTag(true);
 
         next.add(new Label(ID_NEXT_LABEL, nextPanelTitle));
-
+        next.add(getNextVisibilityBehaviour());
         return next;
     }
 
+    @NotNull
+    protected VisibleEnableBehaviour getNextVisibilityBehaviour() {
+        return VisibleEnableBehaviour.ALWAYS_VISIBLE_ENABLED;
+    }
+
     protected AjaxLink createBackButton(String id) {
         AjaxLink back = new AjaxLink<>(id) {
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/wizard/WizardPanel.html b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/wizard/WizardPanel.html
@@ -8,13 +8,13 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
-    <div class="bs-stepper-header flex-wrap flex-column flex-sm-row" role="tablist" wicket:id="header">
+    <div class="bs-stepper-header flex-row" role="tablist" wicket:id="header">
         <wicket:container wicket:id="steps">
             <div class="flex flex-row no-wrap" wicket:id="step"/>
             <div class="line" wicket:id="line"/>
         </wicket:container>
     </div>
-    <div class="bs-stepper-content">
+    <div class="bs-stepper-content px-0">
         <div wicket:id="contentHeader"/>
         <div wicket:id="contentBody"/>
     </div>

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/wizard/WizardPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/wizard/WizardPanel.java
@@ -22,6 +22,8 @@
 import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
 
+import org.jetbrains.annotations.NotNull;
+
 /**
  * Created by Viliam Repan (lazyman).
  */
@@ -73,6 +75,7 @@ private void initLayout() {
 
         WebMarkupContainer header = new WebMarkupContainer(ID_HEADER);
         header.setOutputMarkupId(true);
+        header.add(getVisibilityOfStepsHeader());
         add(header);
 
         ListView<IModel<String>> steps = new ListView<>(ID_STEPS, () -> wizardModel.getSteps().stream().map(s -> s.getTitle()).collect(Collectors.toList())) {
@@ -105,7 +108,11 @@ protected Component createHeaderContent(String id) {
 
             @Override
             protected void onBackPerformed(AjaxRequestTarget target) {
-                wizardModel.previous();
+                if (wizardModel.getActiveStepIndex() == 0) {
+                    getPageBase().redirectBack();
+                } else {
+                    wizardModel.previous();
+                }
 
                 target.add(WizardPanel.this);
             }
@@ -116,6 +123,11 @@ protected void onNextPerformed(AjaxRequestTarget target) {
 
                 target.add(WizardPanel.this);
             }
+
+            @Override
+            protected @NotNull VisibleEnableBehaviour getNextVisibilityBehaviour() {
+                return wizardModel.getActiveStep().getNextBehaviour();
+            }
         };
         contentHeader.add(new VisibleEnableBehaviour() {
 
@@ -137,6 +149,11 @@ public boolean isEnabled() {
         addOrReplace(new WebMarkupContainer(ID_CONTENT_BODY));
     }
 
+    @NotNull
+    protected VisibleEnableBehaviour getVisibilityOfStepsHeader() {
+        return VisibleEnableBehaviour.ALWAYS_VISIBLE_ENABLED;
+    }
+
     public WizardStep getCurrentPanel() {
         return wizardModel.getActiveStep();
     }

diff --git a/...m/evolveum/midpoint/gui/impl/page/admin/assignmentholder/PageAssignmentHolderDetails.java b/...m/evolveum/midpoint/gui/impl/page/admin/assignmentholder/PageAssignmentHolderDetails.java
@@ -61,19 +61,23 @@ public PageAssignmentHolderDetails(PrismObject<AH> assignmentHolder) {
     @Override
     protected void initLayout() {
         if (isAdd() && isApplicableTemplate()) {
-            TemplateFragment templateFragment = new TemplateFragment(ID_DETAILS_VIEW, ID_TEMPLATE_VIEW, PageAssignmentHolderDetails.this);
+            Fragment templateFragment  = createTemplateFragment();
             add(templateFragment);
         } else {
             super.initLayout();
         }
     }
 
+    protected Fragment createTemplateFragment() {
+        return new TemplateFragment(ID_DETAILS_VIEW, ID_TEMPLATE_VIEW, PageAssignmentHolderDetails.this);
+    }
+
     protected boolean isApplicableTemplate() {
         Collection<CompiledObjectCollectionView> applicableArchetypes = findAllApplicableArchetypeViews();
         return applicableArchetypes.size() > 1;
     }
 
-    class TemplateFragment extends Fragment {
+    private class TemplateFragment extends Fragment {
 
         public TemplateFragment(String id, String markupId, MarkupContainer markupProvider) {
             super(id, markupId, markupProvider);
@@ -87,12 +91,12 @@ protected void onInitialize() {
         }
 
         protected void initTemplateLayout() {
-            add(createTemplatePanel(ID_TEMPLATE));
+            add(createTemplatePanel());
         }
     }
 
-    protected WebMarkupContainer createTemplatePanel(String id) {
-        return new CreateTemplatePanel<>(id) {
+    private WebMarkupContainer createTemplatePanel() {
+        return new CreateTemplatePanel<>(ID_TEMPLATE) {
 
             @Override
             protected Collection<CompiledObjectCollectionView> findAllApplicableArchetypeViews() {
@@ -121,14 +125,18 @@ protected void onTemplateChosePerformed(CompiledObjectCollectionView collectionV
                 }
 
                 reloadObjectDetailsModel(assignmentHolder);
-                Fragment fragment = createDetailsFragment();
+                Fragment fragment = createFragmentAfterChoseTemplate();
                 fragment.setOutputMarkupId(true);
                 PageAssignmentHolderDetails.this.replace(fragment);
                 target.add(fragment);
             }
         };
     }
 
+    protected Fragment createFragmentAfterChoseTemplate() {
+        return createDetailsFragment();
+    }
+
     protected List<ObjectReferenceType> getArchetypeReferencesList(CompiledObjectCollectionView collectionViews) {
         return ObjectCollectionViewUtil.getArchetypeReferencesList(collectionViews);
     }

diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/PageResource.html b/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/page/admin/resource/PageResource.html
@@ -9,8 +9,8 @@
 <body>
 <wicket:extend>
     <wicket:fragment wicket:id="wizardView">
-        <form wicket:id="mainForm" class="d-flex justify-content-center">
-            <div wicket:id="wizard" class="mt-5"/>
+        <form wicket:id="mainForm">
+            <div wicket:id="wizard"/>
         </form>
     </wicket:fragment>
     <wicket:child/>