MID-7976 request access ui, improving loading menu based on org. tree…

…, wip
Evolveum · Jul 12, 2022 · fe8ebe2 · fe8ebe2
1 parent 5f52920
commit fe8ebe2
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 22 deletions.
diff --git a/gui/admin-gui/src/frontend/js/list-group-menu.js b/gui/admin-gui/src/frontend/js/list-group-menu.js
@@ -6,9 +6,9 @@
  */
 import $ from 'jquery';
 
-const NAME = 'list-group-menu'
+const NAME = 'listGroupMenu'
 const VERSION = '0.1'
-const DATA_KEY = 'mp.list-group-menu'
+const DATA_KEY = 'midpoint.listGroupMenu'
 const EVENT_KEY = `.${DATA_KEY}`
 const DATA_API_KEY = '.data-api'
 const JQUERY_NO_CONFLICT = $.fn[NAME]
@@ -41,18 +41,3 @@ $.fn[NAME].noConflict = () => {
 
 export default ListGroupMenu;
 
-$(document).ready(function () {
-    $('.list-group-menu').find('.chevron').parent().click(function (event) {
-        event.preventDefault();
-
-        var link = $(this);
-        var item = link.parent();
-        var submenu = item.find('.list-group-submenu');
-        if (!submenu.is(':visible')) {
-            $(submenu).slideDown();
-        } else {
-            console.info('visible');
-            $(submenu).slideUp();
-        }
-    });
-});
diff --git a/gui/admin-gui/src/frontend/js/midpoint-theme.js b/gui/admin-gui/src/frontend/js/midpoint-theme.js
@@ -149,6 +149,26 @@ export default class MidPointTheme {
                 }
             });
         });
+
+
+        // todo move to list-group-menu.js plugin
+        $(document).ready(function () {
+            $('.list-group-menu').find('.chevron').parent().attr("href", "#");
+
+            $('.list-group-menu').find('.chevron').parent().click(function (event) {
+                event.preventDefault();
+
+                var link = $(this);
+                var item = link.parent();
+                var submenu = item.find('.list-group-submenu');
+                if (!submenu.is(':visible')) {
+                    $(submenu).slideDown();
+                } else {
+                    console.info('visible');
+                    $(submenu).slideUp();
+                }
+            });
+        });
     }
 
     // I'm not sure why sidebar has 15px padding -> and why I had to use 10px constant here [lazyman]

diff --git a/gui/admin-gui/src/frontend/scss/_list-group-menu.scss b/gui/admin-gui/src/frontend/scss/_list-group-menu.scss
@@ -38,7 +38,7 @@ $list-group-item-padding-sm-x: 1rem;
 
   & > a.item-link {
     display: flex;
-    flex-wrap: wrap;
+    flex-wrap: nowrap;
     align-items: center;
     // todo for "sm" version 0.5rem 1rem
     padding: $list-group-item-padding-y $list-group-item-padding-x;
@@ -77,6 +77,9 @@ $list-group-item-padding-sm-x: 1rem;
 
     & > span.label {
       flex-grow: 1;
+      overflow: hidden;
+      text-overflow: ellipsis;
+      white-space: nowrap;
     }
   }
 

diff --git a/...n/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ListGroupMenuItemPanel.java b/...n/java/com/evolveum/midpoint/gui/impl/page/self/requestAccess/ListGroupMenuItemPanel.java
@@ -7,6 +7,8 @@
 
 package com.evolveum.midpoint.gui.impl.page.self.requestAccess;
 
+import com.evolveum.midpoint.web.component.util.EnableBehaviour;
+
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -60,6 +62,7 @@ public void onClick(AjaxRequestTarget target) {
         };
         link.add(AttributeAppender.append("class", () -> getModelObject().isActive() ? "active" : null));
         link.add(AttributeAppender.append("class", () -> getModelObject().isDisabled() ? "disabled" : null));
+        link.add(new EnableBehaviour(() -> getModelObject().getItems().isEmpty()));
         add(link);
 
         WebMarkupContainer icon = new WebMarkupContainer(ID_ICON);

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,10 +14,6 @@
 import java.util.stream.Collectors;
 import javax.xml.namespace.QName;
 
-import com.evolveum.midpoint.gui.api.component.Toggle;
-
-import com.evolveum.midpoint.gui.api.component.TogglePanel;
-
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -33,6 +29,8 @@
 import org.apache.wicket.util.string.Strings;
 
 import com.evolveum.midpoint.gui.api.component.Badge;
+import com.evolveum.midpoint.gui.api.component.Toggle;
+import com.evolveum.midpoint.gui.api.component.TogglePanel;
 import com.evolveum.midpoint.gui.api.component.result.Toast;
 import com.evolveum.midpoint.gui.api.component.wizard.WizardStepPanel;
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
@@ -331,6 +329,17 @@ private List<ListGroupMenuItem> loadMenuItems(ObjectReferenceType ref) {
             for (PrismObject o : objects) {
                 String name = WebComponentUtil.getDisplayNameOrName(o, true);
                 ListGroupMenuItem menu = new ListGroupMenuItem(name);
+                menu.setItemsModel(new LoadableModel<>(false) {
+                    @Override
+                    protected List<ListGroupMenuItem> load() {
+                        ObjectReferenceType parentRef = new ObjectReferenceType()
+                                .oid(o.getOid())
+                                .targetName(o.getName().getOrig())
+                                .type(o.getDefinition().getTypeName());
+
+                        return loadMenuItems(parentRef);
+                    }
+                });
                 list.add(menu);
             }
         } catch (Exception ex) {