MID-7976 replaces viewtoggle panel with more generic toggle panel, up…

…dated behavior of shopping cart step
Evolveum · Jun 17, 2022 · 5c3805f · 5c3805f
1 parent e351771
commit 5c3805f
Show file tree

Hide file tree

Showing 10 changed files with 44 additions and 113 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/wizard/WizardStep.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/wizard/WizardStep.java
@@ -52,7 +52,7 @@ default IModel<List<Badge>> getTitleBadges() {
     }
 
     default VisibleEnableBehaviour getStepsBehaviour() {
-        return VisibleEnableBehaviour.ALWAYS_INVISIBLE;
+        return VisibleEnableBehaviour.ALWAYS_VISIBLE_ENABLED;
     }
 
     default VisibleEnableBehaviour getHeaderBehaviour() {

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/tile/ViewTogglePanel.html b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/tile/ViewTogglePanel.html
diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/tile/ViewTogglePanel.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/tile/ViewTogglePanel.java
diff --git a/...rc/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/CartSummaryPanel.java b/...rc/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/CartSummaryPanel.java
@@ -188,7 +188,6 @@ protected void openConflictPerformed(AjaxRequestTarget target) {
     protected void submitPerformed(AjaxRequestTarget target) {
     }
 
-    //todo use configuration to populate this
     private IModel<List> createValidityOptions() {
         return new LoadableModel<>(false) {
 
@@ -227,7 +226,7 @@ private List<ValidityPredefinedValueType> getValidityPeriods() {
 
         CheckoutValidityConfigurationType validityConfig = config.getValidityConfiguration();
         List<ValidityPredefinedValueType> values = validityConfig.getPredefinedValue();
-        return values != null ? values : DEFAULT_VALIDITY_PERIODS;
+        return values != null && !values.isEmpty() ? values : DEFAULT_VALIDITY_PERIODS;
     }
 
     private CheckoutType getCheckoutConfiguration() {

diff --git a/...main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ConflictSolverPanel.java b/...main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ConflictSolverPanel.java
@@ -47,7 +47,7 @@ protected List<Toggle<ConflictState>> load() {
                 List<Toggle<ConflictState>> list = new ArrayList<>();
 
                 for (ConflictState cs : ConflictState.values()) {
-                    Toggle<ConflictState> t = new Toggle<>(null, cs.name());
+                    Toggle<ConflictState> t = new Toggle<>(null, getString(cs));
                     if (cs == ConflictState.UNRESOLVED) {
                         t.setActive(true);
                         t.setBadge("2");

diff --git a/...rc/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RoleCatalogPanel.html b/...rc/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RoleCatalogPanel.html
@@ -12,7 +12,10 @@
             <div wicket:id="viewToggle"/>
             <ul wicket:id="menu"/>
         </div>
-        <div class="flex-grow-1" wicket:id="tilesTable"/>
+        <wicket:remove>
+            <!-- todo mt-2 added because search panel now uses *-sm classes and it doesn't match rest of the layout -->
+        </wicket:remove>
+        <div class="flex-grow-1 mt-2" wicket:id="tilesTable"/>
     </div>
 </wicket:panel>
 

diff --git a/...rc/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RoleCatalogPanel.java b/...rc/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RoleCatalogPanel.java
@@ -14,8 +14,6 @@
 import java.util.stream.Collectors;
 import javax.xml.namespace.QName;
 
-import com.evolveum.midpoint.gui.api.component.result.Toast;
-
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -30,6 +28,7 @@
 import org.apache.wicket.model.Model;
 import org.apache.wicket.util.string.Strings;
 
+import com.evolveum.midpoint.gui.api.component.result.Toast;
 import com.evolveum.midpoint.gui.api.component.wizard.Badge;
 import com.evolveum.midpoint.gui.api.component.wizard.WizardStepPanel;
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
@@ -38,7 +37,10 @@
 import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
 import com.evolveum.midpoint.gui.impl.component.search.Search;
 import com.evolveum.midpoint.gui.impl.component.search.SearchFactory;
-import com.evolveum.midpoint.gui.impl.component.tile.*;
+import com.evolveum.midpoint.gui.impl.component.tile.CatalogTile;
+import com.evolveum.midpoint.gui.impl.component.tile.CatalogTilePanel;
+import com.evolveum.midpoint.gui.impl.component.tile.TileTablePanel;
+import com.evolveum.midpoint.gui.impl.component.tile.ViewToggle;
 import com.evolveum.midpoint.model.api.authentication.CompiledGuiProfile;
 import com.evolveum.midpoint.prism.PrismObject;
 import com.evolveum.midpoint.prism.query.ObjectQuery;
@@ -201,11 +203,34 @@ protected IModel<Search> createSearchModel() {
                 };
         add(tilesTable);
 
-        ViewTogglePanel viewToggle = new ViewTogglePanel(ID_VIEW_TOGGLE, tilesTable.getViewToggleModel()) {
+        IModel<List<Toggle<ViewToggle>>> items = new LoadableModel<>(false) {
+
+            @Override
+            protected List<Toggle<ViewToggle>> load() {
+                ViewToggle toggle = tilesTable.getViewToggleModel().getObject();
+                List<Toggle<ViewToggle>> list = new ArrayList<>();
+
+                Toggle asList = new Toggle("fa-solid fa-table-list", null);
+                asList.setActive(ViewToggle.TABLE == toggle);
+                asList.setValue(ViewToggle.TABLE);
+                list.add(asList);
+
+                Toggle asTile = new Toggle("fa-solid fa-table-cells", null);
+                asTile.setActive(ViewToggle.TILE == toggle);
+                asTile.setValue(ViewToggle.TILE);
+                list.add(asTile);
+
+                return list;
+            }
+        };
+
+        TogglePanel<ViewToggle> viewToggle = new TogglePanel<>(ID_VIEW_TOGGLE, items) {
 
             @Override
-            protected void onTogglePerformed(AjaxRequestTarget target, ViewToggle newState) {
-                super.onTogglePerformed(target, newState);
+            protected void itemSelected(AjaxRequestTarget target, IModel<Toggle<ViewToggle>> item) {
+                super.itemSelected(target, item);
+
+                tilesTable.getViewToggleModel().setObject(item.getObject().getValue());
                 target.add(RoleCatalogPanel.this);
             }
         };

diff --git a/...c/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ShoppingCartPanel.java b/...c/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ShoppingCartPanel.java
@@ -209,6 +209,7 @@ private ContainerDelta handleAssignmentDeltas(ObjectDelta<UserType> focusDelta,
         return delta;
     }
 
+    // todo this doesn't work properly first time loading conflict numbers - model is evaluated before computeConflicts...
     @Override
     public IModel<List<Badge>> getTitleBadges() {
         return () -> {

diff --git a/...gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/TogglePanel.html b/...gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/TogglePanel.html
@@ -8,7 +8,7 @@
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
     <wicket:container wicket:id="buttons">
-        <button type="button" class="btn btn-default d-flex align-items-baseline gap-1" data-toggle="button" wicket:id="button">
+        <button type="button" class="btn btn-default" data-toggle="button" wicket:id="button">
             <wicket:container wicket:id="content"/>
         </button>
     </wicket:container>

diff --git a/...gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/TogglePanel.java b/...gui/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/TogglePanel.java
@@ -40,10 +40,8 @@ public class TogglePanel<O extends Serializable> extends BasePanel<List<Toggle<O
     private static final String ID_LABEL = "label";
     private static final String ID_BADGE = "badge";
 
-    private boolean multipleActive;
-
-    public TogglePanel(String id, IModel<List<Toggle<O>>> model) {
-        super(id, model);
+    public TogglePanel(String id, IModel<List<Toggle<O>>> items) {
+        super(id, items);
 
         initLayout();
     }
@@ -92,23 +90,13 @@ protected Component createButtonContent(String id, IModel<Toggle<O>> model) {
         return defaultButtonContent;
     }
 
-    public boolean isMultipleActive() {
-        return multipleActive;
-    }
-
-    public void setMultipleActive(boolean multipleActive) {
-        this.multipleActive = multipleActive;
-    }
-
     protected void itemSelected(AjaxRequestTarget target, IModel<Toggle<O>> item) {
         Toggle<O> toggle = item.getObject();
 
         boolean wasActiveBefore = toggle.isActive();
 
-        if (!multipleActive) {
-            List<Toggle<O>> list = getModelObject();
-            list.forEach(t -> t.setActive(false));
-        }
+        List<Toggle<O>> list = getModelObject();
+        list.forEach(t -> t.setActive(false));
 
         toggle.setActive(!wasActiveBefore);