MID-8096 request access wizard, green checkmarks improved, title added

Evolveum · Sep 13, 2022 · 2821e60 · 2821e60
1 parent 9e19575
commit 2821e60
Show file tree

Hide file tree

Showing 5 changed files with 43 additions and 6 deletions.
diff --git a/gui/admin-gui/src/frontend/scss/_tiles.scss b/gui/admin-gui/src/frontend/scss/_tiles.scss
@@ -72,6 +72,11 @@
     position: relative;
     top: -20px;
     left: 32px;
+    margin-bottom: -20px;
+
+    &.rounded-icon-none {
+      margin-bottom: 0;
+    }
   }
 
   & > .title {

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/tile/CatalogTile.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/tile/CatalogTile.java
@@ -20,6 +20,8 @@ public class CatalogTile<T extends Serializable> extends Tile<T> {
 
     private RoundedIconPanel.State checkState;
 
+    private String checkTitle;
+
     public CatalogTile() {
         this(null, null);
     }
@@ -54,4 +56,12 @@ public RoundedIconPanel.State getCheckState() {
     public void setCheckState(RoundedIconPanel.State checkState) {
         this.checkState = checkState;
     }
+
+    public String getCheckTitle() {
+        return checkTitle;
+    }
+
+    public void setCheckTitle(String checkTitle) {
+        this.checkTitle = checkTitle;
+    }
 }
diff --git a/...min-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/tile/CatalogTilePanel.java b/...min-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/tile/CatalogTilePanel.java
@@ -55,7 +55,7 @@ private void initLayout() {
         RoundedImagePanel logo1 = new RoundedImagePanel(ID_LOGO, () -> createDisplayType(getModel()), createPreferredImage(getModel()));
         add(logo1);
 
-        RoundedIconPanel check = new RoundedIconPanel(ID_CHECK, () -> "fa fa-check", () -> getModelObject().getCheckState());
+        RoundedIconPanel check = new RoundedIconPanel(ID_CHECK, () -> "fa fa-check", () -> getModelObject().getCheckState(), () -> getModelObject().getCheckTitle());
         add(check);
 
         Label description = new Label(ID_DESCRIPTION, () -> getModelObject().getDescription());

diff --git a/...i/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RequestAccess.java b/...i/src/main/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/RequestAccess.java
@@ -728,17 +728,26 @@ private QName findDefaultRelation() {
     }
 
     public boolean isAssignedToAll(String oid) {
+        return countNumberOfAssignees(oid) == requestItems.keySet().size();
+    }
+
+    public boolean isAssignedToNone(String oid) {
+        return countNumberOfAssignees(oid) == 0;
+    }
+
+    private int countNumberOfAssignees(String oid) {
         if (oid == null) {
-            return false;
+            return 0;
         }
 
+        int count = 0;
         for (List<ObjectReferenceType> memberships : existingPoiRoleMemberships.values()) {
             boolean found = memberships.stream().anyMatch(m -> oid.equals(m.getOid()));
-            if (!found) {
-                return false;
+            if (found) {
+                count++;
             }
         }
 
-        return true;
+        return count;
     }
 }
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
@@ -408,7 +408,20 @@ protected CatalogTile createTileObject(SelectableBean<ObjectType> object) {
                         t.setValue(object);
 
                         RequestAccess ra = RoleCatalogPanel.this.getModelObject();
-                        t.setCheckState(ra.isAssignedToAll(obj.getOid()) ? RoundedIconPanel.State.FULL : RoundedIconPanel.State.PARTIAL);
+
+                        RoundedIconPanel.State checkState;
+                        String checkTitle = null;
+                        if (ra.isAssignedToAll(obj.getOid())) {
+                            checkState = RoundedIconPanel.State.FULL;
+                            checkTitle = getString("RoleCatalogPanel.tileFullCheckState");
+                        } else if (ra.isAssignedToNone(obj.getOid())) {
+                            checkState = RoundedIconPanel.State.NONE;
+                        } else {
+                            checkState = RoundedIconPanel.State.PARTIAL;
+                            checkTitle = getString("RoleCatalogPanel.tilePartialCheckState");
+                        }
+                        t.setCheckState(checkState);
+                        t.setCheckTitle(checkTitle);
 
                         return t;
                     }