display order for dashboard widgets; my accounts widget

Evolveum · Aug 8, 2022 · 50feb2e · 50feb2e
1 parent 5e66c46
commit 50feb2e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 21 deletions.
diff --git a/gui/admin-gui/src/main/resources/initial-objects/000-system-configuration.xml b/gui/admin-gui/src/main/resources/initial-objects/000-system-configuration.xml
@@ -183,11 +183,6 @@
                         <cssClass>fa fa-history</cssClass>
                     </icon>
                 </display>
-                <listView>
-                    <paging>
-                        <maxSize>10</maxSize>
-                    </paging>
-                </listView>
                 <panelType>history</panelType>
                 <preview>true</preview>
             </widget>
@@ -205,11 +200,6 @@
                         <cssClass>fe fe-assignment</cssClass>
                     </icon>
                 </display>
-                <listView>
-                    <paging>
-                        <maxSize>10</maxSize>
-                    </paging>
-                </listView>
                 <panelType>myAccesses</panelType>
                 <preview>true</preview>
             </widget>
@@ -227,11 +217,6 @@
                         <cssClass>fe fe-case</cssClass>
                     </icon>
                 </display>
-                <listView>
-                    <paging>
-                        <maxSize>10</maxSize>
-                    </paging>
-                </listView>
                 <panelType>focusCases</panelType>
                 <preview>true</preview>
             </widget>
@@ -249,15 +234,26 @@
                         <cssClass>fa fa-inbox</cssClass>
                     </icon>
                 </display>
-                <listView>
-                    <paging>
-                        <maxSize>10</maxSize>
-                    </paging>
-                </listView>
                 <panelType>myWorkItems</panelType>
                 <preview>true</preview>
             </widget>
-
+            <widget>
+                <identifier>myAccounts</identifier>
+                <display>
+                    <label>
+                        <orig>My accounts</orig>
+                        <translation>
+                            <key>PageDashboard.accounts</key>
+                        </translation>
+                    </label>
+                    <cssClass>col-md-6</cssClass>
+                    <icon>
+                        <cssClass>fa fa-male</cssClass>
+                    </icon>
+                </display>
+                <panelType>projections</panelType>
+                <preview>true</preview>
+            </widget>
         </homePage>
         <userDashboardLink>
             <targetUrl>/self/profile</targetUrl>

diff --git a/...odel-impl/src/main/java/com/evolveum/midpoint/model/impl/security/GuiProfileCompiler.java b/...odel-impl/src/main/java/com/evolveum/midpoint/model/impl/security/GuiProfileCompiler.java
@@ -344,6 +344,13 @@ private void applyAdminGuiConfiguration(CompiledGuiProfile composite, AdminGuiCo
                 composite.setHomePage(mergeHomePage(composite.getHomePage(), configuredHomePage));
             }
         }
+        if (composite.getHomePage() != null && composite.getHomePage().getWidget() != null) {
+            List<ContainerPanelConfigurationType> sorted = new ArrayList<>();
+            sorted.addAll(composite.getHomePage().getWidget());
+            MiscSchemaUtil.sortFeaturesPanels(sorted);
+            composite.getHomePage().getWidget().clear();
+            composite.getHomePage().getWidget().addAll(sorted);
+        }
     }
 
     private HomePageType getHomePageByFocusType(List<HomePageType> homePageList, QName type) {