Merge remote-tracking branch 'refs/remotes/origin/master'

Evolveum · Jun 14, 2022 · 979ecca · 979ecca
2 parents 6872e98 + 8e4a54f
commit 979ecca
Show file tree

Hide file tree

Showing 109 changed files with 2,137 additions and 808 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
@@ -0,0 +1,58 @@
+/*
+ * Copyright (c) 2022 Evolveum and contributors
+ *
+ * This work is dual-licensed under the Apache License 2.0
+ * and European Union Public License. See LICENSE file for details.
+ */
+import $ from 'jquery';
+
+const NAME = 'list-group-menu'
+const VERSION = '0.1'
+const DATA_KEY = 'mp.list-group-menu'
+const EVENT_KEY = `.${DATA_KEY}`
+const DATA_API_KEY = '.data-api'
+const JQUERY_NO_CONFLICT = $.fn[NAME]
+
+// todo implement properly
+class ListGroupMenu {
+
+    constructor(element, config) {
+    }
+
+    static get VERSION() {
+        return VERSION
+    }
+
+    static get Default() {
+        return Default
+    }
+
+    static _jQueryInterface(config) {
+
+    }
+}
+
+$.fn[NAME] = ListGroupMenu._jQueryInterface
+$.fn[NAME].Constructor = ListGroupMenu
+$.fn[NAME].noConflict = () => {
+    $.fn[NAME] = JQUERY_NO_CONFLICT
+    return ListGroupMenu._jQueryInterface
+}
+
+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.js b/gui/admin-gui/src/frontend/js/midpoint.js
@@ -7,6 +7,7 @@
 
 import MidPointTheme from './midpoint-theme';
 import MidPointAceEditor from "./ace-editor";
+import "./list-group-menu";
 
 window.MidPointTheme = new MidPointTheme();
 window.MidPointAceEditor = new MidPointAceEditor();
diff --git a/gui/admin-gui/src/frontend/scss/_list-group-menu.scss b/gui/admin-gui/src/frontend/scss/_list-group-menu.scss
@@ -127,6 +127,7 @@ $list-group-item-padding-sm-x: 1rem;
 
 .list-group-submenu-item {
   @include list-group-menu-item;
+  border-radius: inherit;
 
   // 3rd level padding
   & .list-group-submenu > .list-group-submenu-item > a {

diff --git a/gui/admin-gui/src/frontend/scss/_tiles.scss b/gui/admin-gui/src/frontend/scss/_tiles.scss
@@ -9,10 +9,17 @@
  * Contains all styles for all kinds of tile panels
  */
 
-@mixin selectable-tile {
+@mixin tile {
   border: 2px solid $white;
   border-radius: $border-radius;
   background-color: $white;
+
+  &.selectable {
+    @include selectable-tile();
+  }
+}
+
+@mixin selectable-tile {
   cursor: pointer;
 
   &:hover,
@@ -22,11 +29,17 @@
   }
 }
 
-@mixin selectable-tile-dark-mode {
+@mixin tile-dark-mode {
   border-color: $secondary-alt;
   background-color: lighten($dark, 7.5%) !important;
   color: $white !important;
 
+  &.selectable {
+    @include selectable-tile-dark-mode();
+  }
+}
+
+@mixin selectable-tile-dark-mode {
   &:hover,
   &.active {
     border-color: $primary-alt;
@@ -37,19 +50,20 @@
   width: 250px;
   height: 250px;
 
-  @include selectable-tile();
+  @include tile();
 }
 
-@include dark-mode () {
+@include dark-mode() {
   .tile-panel {
-    @include selectable-tile-dark-mode();
+    @include tile-dark-mode();
   }
 }
 
 .catalog-tile-panel {
   width: 317px;
   height: 376px;
-  @include selectable-tile();
+
+  @include tile();
 
   & > .logo {
     min-width: 84px;
@@ -61,8 +75,8 @@
   }
 }
 
-@include dark-mode () {
-  .catalog-tile-panel {
-    @include selectable-tile-dark-mode();
+@include dark-mode() {
+  .catalog-tile-panel.selectable {
+    @include tile-dark-mode();
   }
 }
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/menu/LeftMenuPanel.java
@@ -305,12 +305,11 @@ private SideBarMenuItem createSelfServiceMenu(boolean experimentalFeaturesEnable
         pageParameters.add(OnePageParameterEncoder.PARAMETER, WebModelServiceUtils.getLoggedInFocusOid());
         menu.addMainMenuItem(createMainMenuItem("PageAdmin.menu.profile", GuiStyleConstants.CLASS_ICON_PROFILE,
                 WebComponentUtil.resolveSelfPage(), pageParameters));
-        menu.addMainMenuItem(createMainMenuItem("PageAdmin.menu.credentials", GuiStyleConstants.CLASS_ICON_CREDENTIALS,
-                PageSelfCredentials.class));
-        /** menu item which leads to new self Credentials page
+        // old self credentials page is commented
+//        menu.addMainMenuItem(createMainMenuItem("PageAdmin.menu.credentials", GuiStyleConstants.CLASS_ICON_CREDENTIALS,
+//                PageSelfCredentials.class));
         menu.addMainMenuItem(createMainMenuItem("PageAdmin.menu.credentials", GuiStyleConstants.CLASS_ICON_CREDENTIALS,
                 com.evolveum.midpoint.gui.impl.page.self.credentials.PageSelfCredentials.class));
-         */
         if (WebModelServiceUtils.getLoggedInFocus() instanceof UserType) {
             menu.addMainMenuItem(createMainMenuItem("PageAdmin.menu.request", GuiStyleConstants.CLASS_ICON_REQUEST,
                     PageAssignmentShoppingCart.class));

diff --git a/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchFactory.java b/...dmin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/SearchFactory.java
@@ -460,7 +460,6 @@ public static  <C extends Containerable> PropertySearchItemWrapper createPropert
         if (itemDef instanceof PrismReferenceDefinition) {
             itemWrapper = new ReferenceSearchItemWrapper((PrismReferenceDefinition)itemDef, type);
             itemWrapper.setVisible(isFixedItem);
-            itemWrapper.setCanConfigure(!isFixedItem);
             itemWrapper.setName(WebComponentUtil.getItemDefinitionDisplayNameOrName(itemDef, null));
             return itemWrapper;
         }
@@ -488,7 +487,6 @@ public static  <C extends Containerable> PropertySearchItemWrapper createPropert
             itemWrapper = new TextSearchItemWrapper(path);
         }
         itemWrapper.setVisible(isFixedItem);
-        itemWrapper.setCanConfigure(!isFixedItem);
         itemWrapper.setValueTypeName(itemDef.getTypeName());
         itemWrapper.setName(WebComponentUtil.getItemDefinitionDisplayNameOrName(itemDef, null));
         String help = WebPrismUtil.getHelpText(itemDef);

diff --git a/...admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/tile/TileTablePanel.java b/...admin-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/tile/TileTablePanel.java
@@ -7,14 +7,8 @@
 
 package com.evolveum.midpoint.gui.impl.component.tile;
 
-import com.evolveum.midpoint.gui.api.component.BasePanel;
-import com.evolveum.midpoint.gui.impl.component.search.Search;
-import com.evolveum.midpoint.gui.impl.component.search.SearchPanel;
-import com.evolveum.midpoint.gui.impl.page.self.requestAccess.PageableListView;
-import com.evolveum.midpoint.gui.impl.page.self.requestAccess.ViewToggle;
-import com.evolveum.midpoint.web.component.data.BoxedTablePanel;
-import com.evolveum.midpoint.web.component.data.paging.NavigatorPanel;
-import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
+import java.io.Serializable;
+import java.util.List;
 
 import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -24,9 +18,15 @@
 import org.apache.wicket.markup.html.list.ListItem;
 import org.apache.wicket.model.IModel;
 import org.apache.wicket.model.Model;
+import org.jetbrains.annotations.NotNull;
 
-import java.io.Serializable;
-import java.util.List;
+import com.evolveum.midpoint.gui.api.component.BasePanel;
+import com.evolveum.midpoint.gui.impl.component.search.Search;
+import com.evolveum.midpoint.gui.impl.component.search.SearchPanel;
+import com.evolveum.midpoint.gui.impl.page.self.requestAccess.PageableListView;
+import com.evolveum.midpoint.web.component.data.BoxedTablePanel;
+import com.evolveum.midpoint.web.component.data.paging.NavigatorPanel;
+import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
 
 /**
  * Created by Viliam Repan (lazyman).
@@ -42,13 +42,22 @@ public class TileTablePanel<T extends Tile, O extends Serializable> extends Base
 
     private static final String ID_TILES_PAGING = "tilesPaging";
 
-    private IModel<ViewToggle> viewToggleModel = Model.of(ViewToggle.TILE);
+    private IModel<ViewToggle> viewToggleModel;
 
     private IModel<Search> searchModel;
 
     public TileTablePanel(String id, ISortableDataProvider provider, List<IColumn> columns) {
+        this(id, provider, columns, null);
+    }
+
+    public TileTablePanel(String id, ISortableDataProvider provider, List<IColumn> columns, IModel<ViewToggle> viewToggle) {
         super(id);
 
+        if (viewToggle == null) {
+            viewToggle = Model.of(ViewToggle.TILE);
+        }
+        this.viewToggleModel = viewToggle;
+
         initModels();
         initLayout(provider, columns);
     }

diff --git a/...l/page/self/requestAccess/ViewToggle.java → ...t/gui/impl/component/tile/ViewToggle.java b/...l/page/self/requestAccess/ViewToggle.java → ...t/gui/impl/component/tile/ViewToggle.java
@@ -5,7 +5,7 @@
  * and European Union Public License. See LICENSE file for details.
  */
 
-package com.evolveum.midpoint.gui.impl.page.self.requestAccess;
+package com.evolveum.midpoint.gui.impl.component.tile;
 
 /**
  * Created by Viliam Repan (lazyman).

diff --git a/...e/self/requestAccess/ViewTogglePanel.html → .../impl/component/tile/ViewTogglePanel.html b/...e/self/requestAccess/ViewTogglePanel.html → .../impl/component/tile/ViewTogglePanel.html
diff --git a/...e/self/requestAccess/ViewTogglePanel.java → .../impl/component/tile/ViewTogglePanel.java b/...e/self/requestAccess/ViewTogglePanel.java → .../impl/component/tile/ViewTogglePanel.java
@@ -5,7 +5,7 @@
  * and European Union Public License. See LICENSE file for details.
  */
 
-package com.evolveum.midpoint.gui.impl.page.self.requestAccess;
+package com.evolveum.midpoint.gui.impl.component.tile;
 
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;