MID-7885 fix Cannot display User dashboards when none exists; also fi…

…x for object details and collection views
Evolveum · May 6, 2022 · bef3a0c · bef3a0c
1 parent c140553
commit bef3a0c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/.../impl/page/admin/systemconfiguration/component/ConfigurableUserDashboardContentPanel.java b/.../impl/page/admin/systemconfiguration/component/ConfigurableUserDashboardContentPanel.java
@@ -7,11 +7,16 @@
 
 package com.evolveum.midpoint.gui.impl.page.admin.systemconfiguration.component;
 
+import java.io.Serializable;
 import java.util.Arrays;
 import java.util.List;
+import java.util.function.Supplier;
 
+import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
 
+import com.evolveum.midpoint.web.component.util.SerializableSupplier;
+
 import org.apache.wicket.ajax.AjaxRequestTarget;
 import org.apache.wicket.extensions.markup.html.repeater.data.table.IColumn;
 import org.apache.wicket.markup.html.list.ListItem;
@@ -61,8 +66,8 @@ public ConfigurableUserDashboardContentPanel(String id, AssignmentHolderDetailsM
 
         this.model = PrismContainerWrapperModel.fromContainerWrapper(model.getObjectWrapperModel(), ItemPath.create(
                 SystemConfigurationType.F_ADMIN_GUI_CONFIGURATION,
-                AdminGuiConfigurationType.F_CONFIGURABLE_USER_DASHBOARD
-        ));
+                AdminGuiConfigurationType.F_CONFIGURABLE_USER_DASHBOARD),
+                (SerializableSupplier<PageBase>) () -> getPageBase());
     }
 
     @Override

diff --git a/...point/gui/impl/page/admin/systemconfiguration/component/GuiObjectDetailsContentPanel.java b/...point/gui/impl/page/admin/systemconfiguration/component/GuiObjectDetailsContentPanel.java
@@ -8,6 +8,7 @@
 package com.evolveum.midpoint.gui.impl.page.admin.systemconfiguration.component;
 
 import com.evolveum.midpoint.gui.api.GuiStyleConstants;
+import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper;
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerWrapper;
 import com.evolveum.midpoint.gui.impl.component.MultivalueContainerDetailsPanel;
@@ -22,6 +23,7 @@
 import com.evolveum.midpoint.web.application.PanelType;
 import com.evolveum.midpoint.web.component.data.column.CheckBoxHeaderColumn;
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
+import com.evolveum.midpoint.web.component.util.SerializableSupplier;
 import com.evolveum.midpoint.web.model.PrismContainerWrapperModel;
 import com.evolveum.midpoint.web.session.UserProfileStorage;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
@@ -58,8 +60,8 @@ public GuiObjectDetailsContentPanel(String id, AssignmentHolderDetailsModel mode
         this.model = PrismContainerWrapperModel.fromContainerWrapper(model.getObjectWrapperModel(), ItemPath.create(
                 SystemConfigurationType.F_ADMIN_GUI_CONFIGURATION,
                 AdminGuiConfigurationType.F_OBJECT_DETAILS,
-                GuiObjectDetailsSetType.F_OBJECT_DETAILS_PAGE
-        ));
+                GuiObjectDetailsSetType.F_OBJECT_DETAILS_PAGE),
+                (SerializableSupplier<PageBase>) () -> getPageBase());
     }
 
     @Override

diff --git a/.../gui/impl/page/admin/systemconfiguration/component/ObjectCollectionViewsContentPanel.java b/.../gui/impl/page/admin/systemconfiguration/component/ObjectCollectionViewsContentPanel.java
@@ -8,6 +8,7 @@
 package com.evolveum.midpoint.gui.impl.page.admin.systemconfiguration.component;
 
 import com.evolveum.midpoint.gui.api.GuiStyleConstants;
+import com.evolveum.midpoint.gui.api.page.PageBase;
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerValueWrapper;
 import com.evolveum.midpoint.gui.api.prism.wrapper.PrismContainerWrapper;
 import com.evolveum.midpoint.gui.impl.component.MultivalueContainerDetailsPanel;
@@ -22,6 +23,7 @@
 import com.evolveum.midpoint.web.application.PanelType;
 import com.evolveum.midpoint.web.component.data.column.CheckBoxHeaderColumn;
 import com.evolveum.midpoint.web.component.menu.cog.InlineMenuItem;
+import com.evolveum.midpoint.web.component.util.SerializableSupplier;
 import com.evolveum.midpoint.web.model.PrismContainerWrapperModel;
 import com.evolveum.midpoint.web.session.UserProfileStorage;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
@@ -58,8 +60,8 @@ public ObjectCollectionViewsContentPanel(String id, AssignmentHolderDetailsModel
         this.model = PrismContainerWrapperModel.fromContainerWrapper(model.getObjectWrapperModel(), ItemPath.create(
                 SystemConfigurationType.F_ADMIN_GUI_CONFIGURATION,
                 AdminGuiConfigurationType.F_OBJECT_COLLECTION_VIEWS,
-                GuiObjectListViewsType.F_OBJECT_COLLECTION_VIEW
-        ));
+                GuiObjectListViewsType.F_OBJECT_COLLECTION_VIEW),
+                (SerializableSupplier<PageBase>) () -> getPageBase());
     }
 
     @Override