Merge remote-tracking branch 'origin/master'

Evolveum · Mar 28, 2023 · fd4f50b · fd4f50b
2 parents 0d552a7 + e539c80
commit fd4f50b
Show file tree

Hide file tree

Showing 13 changed files with 202 additions and 118 deletions.
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
@@ -35,6 +35,7 @@
 import com.evolveum.midpoint.gui.impl.page.admin.user.PageUserHistory;
 
 import com.evolveum.midpoint.web.security.MidPointAuthWebSession;
+import com.evolveum.midpoint.web.component.dialog.Popupable;
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.BooleanUtils;
@@ -5763,6 +5764,17 @@ public static ItemPath getPath(GuiObjectColumnType column) {
         return column.getPath().getItemPath();
     }
 
+    public static boolean hasPopupableParent(@NotNull Component component) {
+        Component parent = component.getParent();
+        while (parent != null) {
+            if (parent instanceof Popupable) {
+                return true;
+            }
+            parent = parent.getParent();
+        }
+        return false;
+    }
+
     public static boolean isEnabledExperimentalFeatures() {
         GuiProfiledPrincipal principal = AuthUtil.getPrincipalUser();
         if (principal == null) {

diff --git a/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java b/...in-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/ContainerableListPanel.java
@@ -101,7 +101,6 @@ public abstract class ContainerableListPanel<C extends Serializable, PO extends
 
     private static final Trace LOGGER = TraceManager.getTrace(ContainerableListPanel.class);
 
-    private static final String DOT_CLASS = ContainerableListPanel.class.getName() + ".";
     private static final String ID_ITEMS_TABLE = "itemsTable";
     private static final String ID_BUTTON_BAR = "buttonBar";
     private static final String ID_BUTTON = "button";
@@ -764,17 +763,15 @@ protected String getFilename() {
             }
 
         };
-        exportDataLink.add(new VisibleEnableBehaviour() {
-            private static final long serialVersionUID = 1L;
-
-            @Override
-            public boolean isVisible() {
-                return WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_ADMIN_CSV_EXPORT_ACTION_URI);
-            }
-        });
+        exportDataLink.add(new VisibleBehaviour(this::isExportDataLinkVisible));
         return exportDataLink;
     }
 
+    private boolean isExportDataLinkVisible() {
+        return !WebComponentUtil.hasPopupableParent(ContainerableListPanel.this)
+                && WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_ADMIN_CSV_EXPORT_ACTION_URI);
+    }
+
     private boolean isRawOrNoFetchOption(Collection<SelectorOptions<GetOperationOptions>> options) {
         if (options == null) {
             return false;

diff --git a/...main/java/com/evolveum/midpoint/gui/impl/component/search/SearchableItemsDefinitions.java b/...main/java/com/evolveum/midpoint/gui/impl/component/search/SearchableItemsDefinitions.java
@@ -307,11 +307,20 @@ private Collection<ItemPath> createExtensionPaths() {
         List<ItemPath> extensionPaths = new ArrayList<>();
         extensionPaths.add(ObjectType.F_EXTENSION);
         if (AssignmentType.class.equals(type)) {
-            extensionPaths.add(ItemPath.create(AssignmentType.F_TARGET_REF, new ObjectReferencePathSegment(assignmentTargetType), ObjectType.F_EXTENSION));
+            if (assignmentTargetType == null || isAssignmentTargetTypeObjectable()) {
+                extensionPaths.add(ItemPath.create(AssignmentType.F_TARGET_REF,
+                        new ObjectReferencePathSegment(assignmentTargetType), ObjectType.F_EXTENSION));
+            }
         }
         return extensionPaths;
     }
 
+    private boolean isAssignmentTargetTypeObjectable() {
+        TypeDefinition targetRefTypeDef = PrismContext.get().getSchemaRegistry().findTypeDefinitionByType(assignmentTargetType);
+        return targetRefTypeDef != null && targetRefTypeDef.getCompileTimeClass() != null
+                && ObjectType.class.isAssignableFrom(targetRefTypeDef.getCompileTimeClass());
+    }
+
     private PrismObjectDefinition findObjectDefinition() {
 
         Task task = modelServiceLocator.createSimpleTask(LOAD_OBJECT_DEFINITION);

diff --git a/...-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/SearchPanel.java b/...-gui/src/main/java/com/evolveum/midpoint/gui/impl/component/search/panel/SearchPanel.java
@@ -14,7 +14,6 @@
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.wicket.AttributeModifier;
-import org.apache.wicket.Component;
 import org.apache.wicket.ajax.AjaxEventBehavior;
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.ajax.markup.html.AjaxLink;
@@ -39,7 +38,6 @@
 import com.evolveum.midpoint.gui.impl.component.search.wrapper.FilterableSearchItemWrapper;
 import com.evolveum.midpoint.gui.impl.component.search.wrapper.ObjectCollectionListSearchItemWrapper;
 import com.evolveum.midpoint.gui.impl.component.search.wrapper.PropertySearchItemWrapper;
-import com.evolveum.midpoint.prism.Containerable;
 import com.evolveum.midpoint.prism.PrismContext;
 import com.evolveum.midpoint.prism.PrismValue;
 import com.evolveum.midpoint.prism.delta.ObjectDelta;
@@ -54,7 +52,6 @@
 import com.evolveum.midpoint.web.application.CollectionInstance;
 import com.evolveum.midpoint.web.component.AjaxButton;
 import com.evolveum.midpoint.web.component.dialog.DeleteConfirmationPanel;
-import com.evolveum.midpoint.web.component.dialog.Popupable;
 import com.evolveum.midpoint.web.component.form.MidpointForm;
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItemAction;
@@ -186,7 +183,7 @@ public void initSpecificSearchPanel(String panelId, Form form) {
 
     private void initSavedFiltersContainer(MidpointForm form) {
         WebMarkupContainer saveSearchContainer = new WebMarkupContainer(ID_SAVE_SEARCH_CONTAINER);
-        saveSearchContainer.add(new VisibleBehaviour(() -> !isPopupWindow() && isCollectionInstancePage()));
+        saveSearchContainer.add(new VisibleBehaviour(this::isSaveSearchVisible));
         saveSearchContainer.setOutputMarkupId(true);
         form.add(saveSearchContainer);
         savedSearchListModel = new LoadableDetachableModel<>() {
@@ -436,15 +433,8 @@ private CollectionInstance getCollectionInstance() {
         return page.getClass().getAnnotation(CollectionInstance.class);
     }
 
-    private boolean isPopupWindow() {
-        Component parent = SearchPanel.this.getParent();
-        while (parent != null) {
-            if (parent instanceof Popupable) {
-                return true;
-            }
-            parent = parent.getParent();
-        }
-        return false;
+    private boolean isSaveSearchVisible() {
+        return  !WebComponentUtil.hasPopupableParent(SearchPanel.this) && isCollectionInstancePage();
     }
 
     private void searchBoxTypeUpdated(AjaxRequestTarget target) {

diff --git a/...om/evolveum/midpoint/gui/impl/page/admin/abstractrole/component/GovernanceCardsPanel.java b/...om/evolveum/midpoint/gui/impl/page/admin/abstractrole/component/GovernanceCardsPanel.java
@@ -301,9 +301,7 @@ private List<TemplateTile<SelectableBean<FocusType>>> createTileObjects(Template
 
         SelectableBean<FocusType> object = defaultTile.getValue();
         List<AssignmentType> memberships = object.getValue().getAssignment().stream()
-                .filter(assignment -> assignment.getTargetRef() != null
-                        && getObjectWrapper().getOid().equals(assignment.getTargetRef().getOid())
-                        && WebComponentUtil.getRelationDefinition(assignment.getTargetRef().getRelation()).getCategory().contains(AreaCategoryType.GOVERNANCE))
+                .filter(this::isMember)
                 .collect(Collectors.toList());
         if (memberships.size() == 1) {
             defaultTile.getValue().setCustomData(memberships.get(0).getTargetRef().getRelation());
@@ -326,6 +324,13 @@ && getObjectWrapper().getOid().equals(assignment.getTargetRef().getOid())
         return ret;
     }
 
+    private boolean isMember(AssignmentType assignment) {
+        return assignment.getTargetRef() != null
+                && getObjectWrapper().getOid() != null
+                && getObjectWrapper().getOid().equals(assignment.getTargetRef().getOid())
+                && WebComponentUtil.getRelationDefinition(assignment.getTargetRef().getRelation()).getCategory().contains(AreaCategoryType.GOVERNANCE);
+    }
+
     private WebMarkupContainer createBaseTileForAssignMembers() {
         WebMarkupContainer newMemberTile = new WebMarkupContainer(ID_NEW_MEMBER_TILE);
         newMemberTile.add(new AjaxEventBehavior("click") {

diff --git a/...mpl/page/admin/assignmentholder/component/assignmentType/AbstractAssignmentTypePanel.java b/...mpl/page/admin/assignmentholder/component/assignmentType/AbstractAssignmentTypePanel.java
@@ -513,7 +513,8 @@ protected ISelectableDataProvider<PrismContainerValueWrapper<AssignmentType>> cr
         var searchModel = getSearchModel();
         var assignments = loadValuesModel();
         var itemPath = model.getObject().getPath();
-        return providerFactory().create(AbstractAssignmentTypePanel.this, searchModel, assignments, objectType, objectOid, itemPath, getObjectCollectionView(), new ContainerValueDataProviderFactory.Customization<AssignmentType>() {
+        return providerFactory().create(AbstractAssignmentTypePanel.this, searchModel, assignments, objectType, objectOid,
+                itemPath, getObjectCollectionView(), new ContainerValueDataProviderFactory.Customization<AssignmentType>() {
 
             private static final long serialVersionUID = 1L;
 

diff --git a/.../main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResult.java b/.../main/java/com/evolveum/midpoint/gui/impl/page/admin/simulation/PageSimulationResult.java
@@ -239,8 +239,10 @@ protected List<DashboardWidgetType> load() {
                         }
 
                         dw.setDisplay(display);
-                    } else {
-                        // built-in -> ignored
+                    } else if (metricRef.getBuiltIn() != null) {
+                        DisplayType display = new DisplayType();
+                        display.setLabel(new PolyStringType(LocalizationUtil.createKeyForEnum(metricRef.getBuiltIn())));
+                        dw.setDisplay(display);
                     }
 
                     return dw;
@@ -432,6 +434,17 @@ private ListView<DashboardWidgetType> createWidgetList(String id, String widgetI
             protected void populateItem(ListItem<DashboardWidgetType> item) {
                 item.add(new MetricWidgetPanel(widgetId, item.getModel()) {
 
+                    @Override
+                    protected boolean isMoreInfoVisible() {
+                        DashboardWidgetDataType data = getWidgetData();
+                        SimulationMetricReferenceType ref = data.getMetricRef();
+                        if (ref == null || ref.getEventMarkRef() == null) {
+                            return false;
+                        }
+
+                        return StringUtils.isNotEmpty(data.getStoredData()) || !metricValues.getObject().isEmpty();
+                    }
+
                     @Override
                     protected void onMoreInfoPerformed(AjaxRequestTarget target) {
                         openMarkMetricPerformed(item.getModelObject());