Seld Dashboard widgets visibility

Evolveum · Feb 27, 2017 · 1164746 · 1164746
1 parent b8b856e
commit 1164746
Show file tree

Hide file tree

Showing 2 changed files with 78 additions and 20 deletions.
diff --git a/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java b/gui/admin-gui/src/main/java/com/evolveum/midpoint/web/page/self/PageSelfDashboard.java
@@ -19,6 +19,8 @@
 
 import java.util.*;
 
+import com.evolveum.midpoint.gui.api.PredefinedDashboardWidgetId;
+import com.evolveum.midpoint.schema.util.AdminGuiConfigTypeUtil;
 import com.evolveum.midpoint.xml.ns._public.common.common_3.*;
 import org.apache.commons.lang.Validate;
 import org.apache.wicket.Application;
@@ -73,6 +75,8 @@
 import com.evolveum.midpoint.web.page.self.component.LinksPanel;
 import com.evolveum.midpoint.web.security.SecurityUtils;
 
+import javax.xml.namespace.QName;
+
 /**
  * @author Viliam Repan (lazyman)
  * @author Kate Honchar
@@ -106,8 +110,10 @@ public class PageSelfDashboard extends PageSelf {
     private static final int MAX_REQUESTS = 1000;
 
     private final Model<PrismObject<UserType>> principalModel = new Model<PrismObject<UserType>>();
+    private AdminGuiConfigurationType adminGuiConfig;
 
     public PageSelfDashboard() {
+        adminGuiConfig = getPrincipal().getAdminGuiConfiguration();
         principalModel.setObject(loadUser());
         setTimeZone(PageSelfDashboard.this);
         initLayout();
@@ -125,29 +131,25 @@ protected void createBreadcrumb() {
 
     private void initLayout(){
         DashboardSearchPanel dashboardSearchPanel = new DashboardSearchPanel(ID_SEARCH_PANEL, null);
-        add(dashboardSearchPanel);
-        if (! WebComponentUtil.isAuthorized(AuthorizationConstants.AUTZ_UI_USERS_ALL_URL,
+        List<String> searchPanelActions = Arrays.asList(AuthorizationConstants.AUTZ_UI_USERS_ALL_URL,
                 AuthorizationConstants.AUTZ_UI_USERS_URL, AuthorizationConstants.AUTZ_UI_RESOURCES_ALL_URL,
                 AuthorizationConstants.AUTZ_UI_RESOURCES_URL, AuthorizationConstants.AUTZ_UI_TASKS_ALL_URL,
-                AuthorizationConstants.AUTZ_UI_TASKS_URL)) {
-            dashboardSearchPanel.setVisible(false);
-        }
-        LinksPanel linksPanel = new LinksPanel(ID_LINKS_PANEL, new IModel<List<RichHyperlinkType>>() {
-        	private static final long serialVersionUID = 1L;
-
+                AuthorizationConstants.AUTZ_UI_TASKS_URL);
+        dashboardSearchPanel.add(new VisibleEnableBehaviour(){
+            private static final long serialVersionUID = 1L;
             @Override
-            public List<RichHyperlinkType> getObject() {
-                return loadLinksList();
-            }
-
-            @Override
-            public void setObject(List<RichHyperlinkType> richHyperlinkTypes) {
-
+            public boolean isVisible(){
+                return isWidgetVisible(PredefinedDashboardWidgetId.SEARCH, searchPanelActions);
             }
+        });
+        add(dashboardSearchPanel);
 
+        LinksPanel linksPanel = new LinksPanel(ID_LINKS_PANEL, Model.ofList(loadLinksList()));
+        linksPanel.add(new VisibleEnableBehaviour(){
+            private static final long serialVersionUID = 1L;
             @Override
-            public void detach() {
-
+            public boolean isVisible(){
+                return isWidgetVisible(PredefinedDashboardWidgetId.SHORTCUTS);
             }
         });
         add(linksPanel);
@@ -193,7 +195,7 @@ protected Component getMainComponent(String markupId) {
         workItemsPanel.add(new VisibleEnableBehaviour() {
             @Override
             public boolean isVisible() {
-                return getWorkflowManager().isEnabled();
+                return getWorkflowManager().isEnabled() && isWidgetVisible(PredefinedDashboardWidgetId.MY_WORKITEMS);
             }
         });
         add(workItemsPanel);
@@ -235,7 +237,7 @@ protected Component getMainComponent(String markupId) {
 
             @Override
             public boolean isVisible() {
-                return getWorkflowManager().isEnabled();
+                return getWorkflowManager().isEnabled() && isWidgetVisible(PredefinedDashboardWidgetId.MY_REQUESTS);
             }
         });
         add(myRequestsPanel);
@@ -391,6 +393,14 @@ private void showFetchResult() {
                         }
                     }
                 };
+        accounts.add(new VisibleEnableBehaviour(){
+            private static final long serialVersionUID = 1L;
+
+            @Override
+            public boolean isVisible() {
+                return isWidgetVisible(PredefinedDashboardWidgetId.MY_ACCOUNTS);
+            }
+        });
         add(accounts);
     }
 
@@ -474,6 +484,14 @@ protected Component getMainComponent(String markupId) {
                                 new PropertyModel<List<AssignmentItemDto>>(getModel(), CallableResult.F_VALUE));
                     }
                 };
+        assignedOrgUnits.add(new VisibleEnableBehaviour(){
+            private static final long serialVersionUID = 1L;
+
+            @Override
+            public boolean isVisible() {
+                return isWidgetVisible(PredefinedDashboardWidgetId.MY_ASSIGNMENTS);
+            }
+        });
         add(assignedOrgUnits);
 
     }
@@ -562,4 +580,44 @@ private AssignmentItemDto createAssignmentItem(PrismObject<UserType> user,
 		return new AssignmentItemDto(type, name, description, relation);
 	}
 
+	private UserInterfaceElementVisibilityType getComponentVisibility(PredefinedDashboardWidgetId componentId){
+        if (adminGuiConfig == null || adminGuiConfig.getUserDashboard() == null) {
+            return UserInterfaceElementVisibilityType.AUTOMATIC;
+        }
+        List<DashboardWidgetType> widgetsList = adminGuiConfig.getUserDashboard().getWidget();
+        if (widgetsList == null || widgetsList.size() == 0){
+            return UserInterfaceElementVisibilityType.VACANT;
+        }
+        DashboardWidgetType widget = AdminGuiConfigTypeUtil.findWidget(adminGuiConfig.getUserDashboard(),
+                componentId.getUri());
+        if (widget == null || widget.getVisibility() == null){
+            return UserInterfaceElementVisibilityType.HIDDEN;
+        } else {
+            return widget.getVisibility();
+        }
+    }
+
+    private boolean isWidgetVisible(PredefinedDashboardWidgetId componentId) {
+        return isWidgetVisible(componentId, new ArrayList<>());
+    }
+
+    private boolean isWidgetVisible(PredefinedDashboardWidgetId componentId, List<String> requiredAuthorizations){
+        UserInterfaceElementVisibilityType visibilityType = getComponentVisibility(componentId);
+        if (UserInterfaceElementVisibilityType.HIDDEN.equals(visibilityType) ||
+                UserInterfaceElementVisibilityType.VACANT.equals(visibilityType)){
+            return false;
+        }
+        if (UserInterfaceElementVisibilityType.VISIBLE.equals(visibilityType)){
+            return true;
+        }
+        if (UserInterfaceElementVisibilityType.AUTOMATIC.equals(visibilityType)){
+            if (WebComponentUtil.isAuthorized(requiredAuthorizations)){
+                return true;
+            } else {
+                return false;
+            }
+        }
+        return true;
+    }
+
 }
diff --git a/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java b/infra/schema/src/main/java/com/evolveum/midpoint/schema/util/AdminGuiConfigTypeUtil.java
@@ -132,7 +132,7 @@ private static UserInterfaceElementVisibilityType mergeVisibility(
 		return UserInterfaceElementVisibilityType.VACANT;
 	}
 
-	private static DashboardWidgetType findWidget(DashboardLayoutType dashboard, String widgetIdentifier) {
+	public static DashboardWidgetType findWidget(DashboardLayoutType dashboard, String widgetIdentifier) {
 		for (DashboardWidgetType widget: dashboard.getWidget()) {
 			if (widget.getIdentifier().equals(widgetIdentifier)) {
 				return widget;