Merge remote-tracking branch 'origin/master' into feature/simulations…

…-repo
Evolveum · Nov 25, 2022 · 8790286 · 8790286
2 parents ab240df + 557789c
commit 8790286
Show file tree

Hide file tree

Showing 407 changed files with 15,334 additions and 9,481 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,6 +12,7 @@ node_modules/
 
 # IDEA files
 /.idea/
+/.run/
 *.iml
 
 # Eclipse files

diff --git a/gui/admin-gui/package-lock.json b/gui/admin-gui/package-lock.json
diff --git a/gui/admin-gui/src/frontend/scss/_list-group-menu.scss b/gui/admin-gui/src/frontend/scss/_list-group-menu.scss
@@ -8,6 +8,8 @@
 $list-group-item-padding-sm-y: 0.5rem;
 $list-group-item-padding-sm-x: 1rem;
 
+$max-levels: 10;
+
 @mixin list-reset() {
   list-style: none;
   padding-left: 0;
@@ -148,14 +150,11 @@ $list-group-item-padding-sm-x: 1rem;
   @include list-group-menu-item;
   border-radius: inherit;
 
-  // 3rd level padding
-  & .list-group-submenu > .list-group-submenu-item > div {
-    padding-left: 3.25rem;
-  }
-
-  // 2nd level padding
-  & > div.item {
-    padding-left: 2rem;
+  // padding for level 3-10
+  @for $i from 2 through $max-levels {
+    & > div.item.level-#{$i} {
+      padding-left: 2rem + ($i - 2) * 1.25rem;
+    }
   }
 }
 

diff --git a/gui/admin-gui/src/frontend/scss/_tiles.scss b/gui/admin-gui/src/frontend/scss/_tiles.scss
@@ -30,6 +30,7 @@
   &.active {
     border: 2px solid $primary;
     border-radius: $border-radius;
+    background-color: rgba($primary, 15%);
   }
 }
 
@@ -50,6 +51,7 @@
 
   &.active {
     border-color: $primary-alt;
+    background-color: rgba($primary-alt, 15%);
   }
 }
 

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/component/ObjectListPanel.java
@@ -112,7 +112,7 @@ protected List<ObjectOrdering> createObjectOrderings(SortParam<String> sortParam
             }
 
             @Override
-            protected Set<? extends O> getSelected() {
+            public Set<? extends O> getSelected() {
                 List<O> preselectedObjects = getPreselectedObjectList();
                 return preselectedObjects == null ? new HashSet<>() : new HashSet<>(preselectedObjects);
             }

diff --git a/...rc/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/ReferenceConverter.java b/...rc/main/java/com/evolveum/midpoint/gui/api/component/autocomplete/ReferenceConverter.java
@@ -59,8 +59,7 @@ public ObjectReferenceType convertToObject(String value, Locale locale) throws C
                 type, query, new OperationResult("searchObjects"), pageBase);
         if (CollectionUtils.isNotEmpty(objectsList)) {
             if (objectsList.size() == 1) {
-                return ObjectTypeUtil.createObjectRefWithFullObject(
-                        objectsList.get(0), pageBase.getPrismContext());
+                return ObjectTypeUtil.createObjectRefWithFullObject(objectsList.get(0));
             }
             pageBase.error("Couldn't specify one object by name '" + value + "' and type " + type.getSimpleName() + ". Please will try specific type of object.");
         }

diff --git a/...gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonPanel.html b/...gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonPanel.html
@@ -8,7 +8,7 @@
 <!DOCTYPE html>
 <html xmlns:wicket="http://wicket.apache.org">
 <wicket:panel>
-    <button wicket:id="buttonContainer" class="btn dropdown-toggle dropdown-icon" type="button" data-toggle="dropdown">
+    <button wicket:id="buttonContainer" class="btn dropdown-icon" type="button" data-toggle="dropdown">
         <span class="badge bg-teal" wicket:id="info"></span>
         <i class="mr-1 fa " wicket:id="icon"></i>
         <span wicket:id="label"/>

diff --git a/...gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonPanel.java b/...gui/src/main/java/com/evolveum/midpoint/gui/api/component/button/DropdownButtonPanel.java
@@ -59,6 +59,7 @@ private void initLayout() {
         WebMarkupContainer buttonContainer = new WebMarkupContainer(ID_BUTTON_CONTAINER);
         buttonContainer.setOutputMarkupId(true);
         buttonContainer.add(AttributeAppender.append("class", getSpecialButtonClass()));
+        buttonContainer.add(AttributeAppender.append("class", () -> hasToggleIcon() ? " dropdown-toggle " : ""));
         add(buttonContainer);
 
         Label info = new Label(ID_INFO, new PropertyModel<>(getModel(), DropdownButtonDto.F_INFO));
@@ -107,6 +108,10 @@ protected void populateItem(ListItem<InlineMenuItem> item) {
         dropdownMenuContainer.add(li);
     }
 
+    protected boolean hasToggleIcon() {
+        return true;
+    }
+
     public WebMarkupContainer getButtonContainer() {
         return (WebMarkupContainer)get(ID_BUTTON_CONTAINER);
     }

diff --git a/...rc/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.java b/...rc/main/java/com/evolveum/midpoint/gui/api/component/delta/ObjectDeltaOperationPanel.java
@@ -6,6 +6,8 @@
  */
 package com.evolveum.midpoint.gui.api.component.delta;
 
+import com.evolveum.midpoint.model.api.visualizer.Visualization;
+
 import org.apache.wicket.AttributeModifier;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.behavior.AttributeAppender;
@@ -18,8 +20,6 @@
 import com.evolveum.midpoint.gui.api.component.result.OperationResultPopupPanel;
 import com.evolveum.midpoint.gui.api.model.ReadOnlyModel;
 import com.evolveum.midpoint.gui.api.page.PageBase;
-import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
-import com.evolveum.midpoint.model.api.visualizer.Scene;
 import com.evolveum.midpoint.prism.delta.ObjectDelta;
 import com.evolveum.midpoint.schema.DeltaConvertor;
 import com.evolveum.midpoint.schema.result.OperationResult;
@@ -164,7 +164,7 @@ private String getBoxCssClass() {
     }
 
     private SceneDto loadSceneForDelta() throws SchemaException, ExpressionEvaluationException {
-        Scene scene;
+        Visualization scene;
 
         ObjectDelta<? extends ObjectType> delta;
         ObjectDeltaType deltaType = getModel().getObject().getObjectDelta();

diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/gui/api/util/WebComponentUtil.java
@@ -125,7 +125,7 @@
 import com.evolveum.midpoint.model.api.authentication.CompiledObjectCollectionView;
 import com.evolveum.midpoint.model.api.authentication.GuiProfiledPrincipal;
 import com.evolveum.midpoint.model.api.util.ResourceUtils;
-import com.evolveum.midpoint.model.api.visualizer.Scene;
+import com.evolveum.midpoint.model.api.visualizer.Visualization;
 import com.evolveum.midpoint.prism.*;
 import com.evolveum.midpoint.prism.crypto.EncryptionException;
 import com.evolveum.midpoint.prism.crypto.Protector;
@@ -4450,7 +4450,7 @@ public static SceneDto createSceneDto(CaseType caseObject, PageBase pageBase, St
         OperationResult result = new OperationResult(operation);
         Task task = pageBase.createSimpleTask(operation);
         try {
-            Scene deltasScene = SceneUtil.visualizeObjectTreeDeltas(caseObject.getApprovalContext().getDeltasToApprove(),
+            Visualization deltasScene = SceneUtil.visualizeObjectTreeDeltas(caseObject.getApprovalContext().getDeltasToApprove(),
                     CaseTypeUtil.isClosed(caseObject) ? "pageWorkItem.changesApplied" : "pageWorkItem.delta",
                     pageBase.getPrismContext(), pageBase.getModelInteractionService(), objectRef, task, result);
             return new SceneDto(deltasScene);
@@ -4469,7 +4469,7 @@ public static SceneDto createSceneDtoForManualCase(CaseType caseObject, PageBase
         OperationResult result = new OperationResult(operation);
         Task task = pageBase.createSimpleTask(operation);
         try {
-            Scene deltasScene = SceneUtil.visualizeObjectDeltaType(caseObject.getManualProvisioningContext().getPendingOperation().getDelta(),
+            Visualization deltasScene = SceneUtil.visualizeObjectDeltaType(caseObject.getManualProvisioningContext().getPendingOperation().getDelta(),
                     CaseTypeUtil.isClosed(caseObject) ? "pageWorkItem.changesApplied" : "pageWorkItem.changesToBeApplied", pageBase.getPrismContext(), pageBase.getModelInteractionService(), objectRef, task, result);
             return new SceneDto(deltasScene);
         } catch (SchemaException | ExpressionEvaluationException ex) {
@@ -4653,7 +4653,7 @@ public static List<SceneDto> computeChangesCategorizationList(ChangesByState cha
     private static SceneDto createTaskChangesDto(String titleKey, String boxClassOverride, ObjectTreeDeltas deltas, ModelInteractionService modelInteractionService,
             PrismContext prismContext, ObjectReferenceType objectRef, Task opTask, OperationResult result) throws SchemaException, ExpressionEvaluationException {
         ObjectTreeDeltasType deltasType = ObjectTreeDeltas.toObjectTreeDeltasType(deltas);
-        Scene scene = SceneUtil.visualizeObjectTreeDeltas(deltasType, titleKey, prismContext, modelInteractionService, objectRef, opTask, result);
+        Visualization scene = SceneUtil.visualizeObjectTreeDeltas(deltasType, titleKey, prismContext, modelInteractionService, objectRef, opTask, result);
         SceneDto sceneDto = new SceneDto(scene);
         sceneDto.setBoxClassOverride(boxClassOverride);
         return sceneDto;
@@ -5431,4 +5431,17 @@ private static void createToastForResource(AjaxRequestTarget target, Component p
                 .delay(5_000)
                 .body(panel.getString(key + ".text")).show(target);
     }
+
+    public static String translateMessage(LocalizableMessage msg) {
+        if (msg == null) {
+            return null;
+        }
+
+        MidPointApplication application = MidPointApplication.get();
+        if (application == null) {
+            return msg.getFallbackMessage();
+        }
+
+        return application.getLocalizationService().translate(msg, getCurrentLocale());
+    }
 }
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
@@ -7,22 +7,12 @@
 package com.evolveum.midpoint.gui.impl.component.menu;
 
 import java.util.ArrayList;
+import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 import javax.xml.namespace.QName;
 
-import com.evolveum.midpoint.cases.api.util.QueryUtils;
-import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
-import com.evolveum.midpoint.gui.impl.page.admin.assignmentholder.PageAssignmentHolderDetails;
-import com.evolveum.midpoint.gui.impl.page.admin.cases.PageCase;
-import com.evolveum.midpoint.gui.impl.page.admin.resource.PageResource;
-import com.evolveum.midpoint.gui.impl.page.self.PageRequestAccess;
-import com.evolveum.midpoint.gui.impl.page.self.dashboard.PageSelfDashboard;
-import com.evolveum.midpoint.prism.PrismObject;
-import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
-import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
-import com.evolveum.midpoint.web.security.MidPointApplication;
-
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -39,16 +29,20 @@
 import org.apache.wicket.request.mapper.parameter.PageParameters;
 import org.apache.wicket.util.string.StringValue;
 
+import com.evolveum.midpoint.cases.api.util.QueryUtils;
 import com.evolveum.midpoint.gui.api.GuiStyleConstants;
 import com.evolveum.midpoint.gui.api.component.BasePanel;
 import com.evolveum.midpoint.gui.api.model.LoadableModel;
 import com.evolveum.midpoint.gui.api.page.PageBase;
+import com.evolveum.midpoint.gui.api.util.GuiDisplayTypeUtil;
 import com.evolveum.midpoint.gui.api.util.WebComponentUtil;
 import com.evolveum.midpoint.gui.api.util.WebModelServiceUtils;
 import com.evolveum.midpoint.gui.impl.page.admin.AbstractPageObjectDetails;
+import com.evolveum.midpoint.gui.impl.page.admin.cases.PageCase;
 import com.evolveum.midpoint.gui.impl.page.admin.systemconfiguration.page.PageBaseSystemConfiguration;
+import com.evolveum.midpoint.gui.impl.page.self.PageRequestAccess;
+import com.evolveum.midpoint.gui.impl.page.self.dashboard.PageSelfDashboard;
 import com.evolveum.midpoint.model.api.AccessCertificationService;
-import com.evolveum.midpoint.model.api.ModelAuthorizationAction;
 import com.evolveum.midpoint.model.api.authentication.CompiledDashboardType;
 import com.evolveum.midpoint.model.api.authentication.CompiledGuiProfile;
 import com.evolveum.midpoint.model.api.authentication.CompiledObjectCollectionView;
@@ -62,7 +56,12 @@
 import com.evolveum.midpoint.util.logging.TraceManager;
 import com.evolveum.midpoint.web.application.PageMounter;
 import com.evolveum.midpoint.web.component.menu.*;
-import com.evolveum.midpoint.web.page.admin.cases.*;
+import com.evolveum.midpoint.web.component.util.VisibleBehaviour;
+import com.evolveum.midpoint.web.component.util.VisibleEnableBehaviour;
+import com.evolveum.midpoint.web.page.admin.cases.PageCaseWorkItem;
+import com.evolveum.midpoint.web.page.admin.cases.PageCaseWorkItemsAll;
+import com.evolveum.midpoint.web.page.admin.cases.PageCaseWorkItemsAllocatedToMe;
+import com.evolveum.midpoint.web.page.admin.cases.PageWorkItemsClaimable;
 import com.evolveum.midpoint.web.page.admin.certification.*;
 import com.evolveum.midpoint.web.page.admin.configuration.*;
 import com.evolveum.midpoint.web.page.admin.home.PageDashboardConfigurable;
@@ -79,6 +78,7 @@
 import com.evolveum.midpoint.web.page.admin.workflow.PageAttorneySelection;
 import com.evolveum.midpoint.web.page.admin.workflow.PageWorkItemsAttorney;
 import com.evolveum.midpoint.web.page.self.PageSelfConsents;
+import com.evolveum.midpoint.web.security.MidPointApplication;
 import com.evolveum.midpoint.web.util.OnePageParameterEncoder;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import com.evolveum.prism.xml.ns._public.types_3.PolyStringType;
@@ -179,7 +179,7 @@ public void onClick(AjaxRequestTarget target) {
                 setResponsePage(page);
             }
         };
-        logo.add(new VisibleEnableBehaviour(() ->  !isCustomLogoVisible(), () -> getPageBase().isLogoLinkEnabled()));
+        logo.add(new VisibleEnableBehaviour(() -> !isCustomLogoVisible(), () -> getPageBase().isLogoLinkEnabled()));
         logo.add(AttributeAppender.append("class", () -> WebComponentUtil.getMidPointSkin().getNavbarCss()));
         add(logo);
 
@@ -528,9 +528,35 @@ private SideBarMenuItem createAdditionalMenu(boolean experimentalFeaturesEnabled
     }
 
     private void createBasicAssignmentHolderMenuItems(MainMenuItem mainMenuItem, PageTypes pageDesc) {
-        MenuItem objectListMenuItem = createObjectListPageMenuItem(
-                "PageAdmin.menu.top." + pageDesc.getIdentifier() + ".list", pageDesc.getIcon(), pageDesc.getListClass());
-        mainMenuItem.addMenuItem(objectListMenuItem);
+        String label = "PageAdmin.menu.top." + pageDesc.getIdentifier() + ".list";
+        String icon = pageDesc.getIcon();
+        Class<? extends PageBase> page = pageDesc.getListClass();
+        boolean isDefaultViewVisible = true;
+
+        CompiledObjectCollectionView defaultView = getPageBase().getCompiledGuiProfile().findAllApplicableObjectCollectionViews(pageDesc.getTypeName()).stream()
+                .filter(view -> view.isDefaultView()).findFirst().orElse(null);
+
+        if (defaultView != null) {
+            isDefaultViewVisible = WebComponentUtil.getElementVisibility(defaultView.getVisibility());
+            if (isDefaultViewVisible) {
+                DisplayType viewDisplayType = defaultView.getDisplay();
+
+                PolyStringType display = WebComponentUtil.getCollectionLabel(viewDisplayType);
+                if (display != null) {
+                    label = WebComponentUtil.getTranslatedPolyString(display);
+                }
+
+                String iconClass = GuiDisplayTypeUtil.getIconCssClass(viewDisplayType);
+                if (StringUtils.isNotEmpty(iconClass)) {
+                    icon = iconClass;
+                }
+            }
+        }
+
+        if (isDefaultViewVisible) {
+            mainMenuItem.addMenuItem(createObjectListPageMenuItem(label, icon, page));
+        }
+
         addCollectionsMenuItems(mainMenuItem, pageDesc.getTypeName(), pageDesc.getListClass());
 
         if (PageTypes.CASE != pageDesc) {
@@ -647,18 +673,18 @@ public boolean isMenuActive(WebPage page) {
     private void addCollectionsMenuItems(MainMenuItem mainMenuItem, QName type, Class<? extends PageBase> redirectToPage) {
         List<CompiledObjectCollectionView> objectViews = getPageBase().getCompiledGuiProfile().findAllApplicableObjectCollectionViews(type);
 
-        objectViews.forEach(objectView -> {
+        List<MenuItem> items = objectViews.stream().map(objectView -> {
             if (objectView.isDefaultView() || !WebComponentUtil.getElementVisibility(objectView.getVisibility())) {
-                return;
+                return null;
             }
 
             OperationTypeType operationTypeType = objectView.getApplicableForOperation();
             if (operationTypeType != null && operationTypeType != OperationTypeType.MODIFY) {
-                return;
+                return null;
             }
 
             if (objectView.isDefaultView()) {
-                return;
+                return null;
             }
             DisplayType viewDisplayType = objectView.getDisplay();
 
@@ -672,19 +698,18 @@ private void addCollectionsMenuItems(MainMenuItem mainMenuItem, QName type, Clas
             }
 
             String iconClass = GuiDisplayTypeUtil.getIconCssClass(viewDisplayType);
-            MenuItem userViewMenu = new MenuItem(label,
+            MenuItem menuItem = new MenuItem(label,
                     StringUtils.isEmpty(iconClass) ? BaseMenuItem.DEFAULT_ICON : iconClass, redirectToPage, pageParameters, isObjectCollectionMenuActive(objectView));
-            userViewMenu.setDisplayOrder(objectView.getDisplayOrder());
-            mainMenuItem.addCollectionMenuItem(userViewMenu);
-        });
+            menuItem.setDisplayOrder(objectView.getDisplayOrder());
+
+            return menuItem;
+        }).filter(i -> i != null).collect(Collectors.toList());
 
-        // We need to sort after we get all the collections. Only then we have correct collection labels.
-        // We do not want to determine the labels twice.
+        items.sort(
+                Comparator.comparing(MenuItem::getDisplayOrder, Comparator.nullsLast(Comparator.naturalOrder()))
+                        .thenComparing(MenuItem::getNameModel, Comparator.nullsLast(Comparator.naturalOrder())));
 
-        // TODO: can this be combined in a single sort?
-//        collectionMenuItems.sort(Comparator.comparing(o -> o.getNameModel().getObject()));
-//        collectionMenuItems.sort(Comparator.comparingInt(o -> ObjectUtils.defaultIfNull(o.getDisplayOrder(), Integer.MAX_VALUE)));
-//        return collectionMenuItems;
+        items.forEach(i -> mainMenuItem.addCollectionMenuItem(i));
     }
 
     private boolean isObjectCollectionMenuActive(CompiledObjectCollectionView objectView) {

diff --git a/...equestAccess/CustomListGroupMenuItem.java → ...nu/listGroup/CustomListGroupMenuItem.java b/...equestAccess/CustomListGroupMenuItem.java → ...nu/listGroup/CustomListGroupMenuItem.java
@@ -1,11 +1,11 @@
 /*
- * Copyright (c) 2022 Evolveum and contributors
+ * Copyright (c) 2010-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.
  */
 
-package com.evolveum.midpoint.gui.impl.page.self.requestAccess;
+package com.evolveum.midpoint.gui.impl.component.menu.listGroup;
 
 import java.io.Serializable;
 
@@ -31,5 +31,5 @@ public CustomListGroupMenuItem(String iconCss, String label) {
         super(iconCss, label);
     }
 
-    abstract Component createMenuItemPanel(String id, IModel<ListGroupMenuItem<T>> model, SerializableBiConsumer<AjaxRequestTarget, ListGroupMenuItem<T>> oncClickHandler);
+    public abstract Component createMenuItemPanel(String id, IModel<ListGroupMenuItem<T>> model, SerializableBiConsumer<AjaxRequestTarget, ListGroupMenuItem<T>> oncClickHandler);
 }