diff options
author | 2020-03-19 16:26:13 -0400 | |
---|---|---|
committer | 2020-03-20 14:18:41 -0400 | |
commit | ac28ae9246294a68a7ccfbd3bf561d61d6b5e438 (patch) | |
tree | acedf6e7bae89f843c307cc3841692ff25298370 /ecomp-portal-BE-common/src/main/java/org | |
parent | aa3977cd66a4fe27fe3f00257872f8c438fd3c92 (diff) |
Header hiding the tab menu
Issue-ID: PORTAL-857
Change-Id: I11eab7411aff67db1fa247d01bd7519ad1c34ed5
Signed-off-by: statta <statta@research.att.com>
Diffstat (limited to 'ecomp-portal-BE-common/src/main/java/org')
-rw-r--r-- | ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/EPLeftMenuServiceImpl.java | 63 |
1 files changed, 34 insertions, 29 deletions
diff --git a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/EPLeftMenuServiceImpl.java b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/EPLeftMenuServiceImpl.java index fc926eb8..4de10d9f 100644 --- a/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/EPLeftMenuServiceImpl.java +++ b/ecomp-portal-BE-common/src/main/java/org/onap/portalapp/portal/service/EPLeftMenuServiceImpl.java @@ -78,6 +78,12 @@ public class EPLeftMenuServiceImpl implements EPLeftMenuService { private ExternalAccessRolesService externalAccessRolesService; @Autowired private DataAccessService dataAccessService; + + public final String appHome = "applicationsHome"; + public final String appCatalog = "appCatalog"; + public final String widCatalog = "widgetCatalog"; + public final String users = "users"; + /* * (non-Javadoc) @@ -176,7 +182,7 @@ public class EPLeftMenuServiceImpl implements EPLeftMenuService { for (JSONObject navItemsDetail : jsonObjs) navItems.put(navItemsDetail); - sidebarModel.put("label", "ECOMP portal"); + sidebarModel.put("label", "Portal"); sidebarModel.put("navItems", navItems); return sidebarModel.toString(); } @@ -188,38 +194,27 @@ public class EPLeftMenuServiceImpl implements EPLeftMenuService { */ private void loadDefaultNavMap(Map<String, JSONObject> defaultNavMap) { String leftMenuRootValue = getLeftMenuPrefixValue(); + JSONObject navItemsDetails1 = new JSONObject(); navItemsDetails1.put("name", "Home"); - navItemsDetails1.put("state", - (isLeftMenuHasRoot(leftMenuRootValue)) - ? leftMenuRootValue+".applicationsHome" - : "applicationsHome"); - navItemsDetails1.put("imageSrc", isLeftMenuHasRoot(leftMenuRootValue) ? "icon-building-home" : "home"); - defaultNavMap.put("applicationsHome", navItemsDetails1); + navItemsDetails1.put("state",leftMenuRootValue+appHome); + navItemsDetails1.put("imageSrc", "home"); + defaultNavMap.put(appHome, navItemsDetails1); JSONObject navItemsDetails2 = new JSONObject(); navItemsDetails2.put("name", "Application Catalog"); - navItemsDetails2.put("state", - (isLeftMenuHasRoot(leftMenuRootValue)) - ? leftMenuRootValue+".appCatalog" - : "appCatalog"); - navItemsDetails2.put("imageSrc", isLeftMenuHasRoot(leftMenuRootValue) ? "icon-apps-marketplace" : "apps"); - defaultNavMap.put("appCatalog", navItemsDetails2); + navItemsDetails2.put("state",leftMenuRootValue+appCatalog); + navItemsDetails2.put("imageSrc", "apps"); + defaultNavMap.put(appCatalog, navItemsDetails2); JSONObject navItemsDetails3 = new JSONObject(); navItemsDetails3.put("name", "Widget Catalog"); - navItemsDetails3.put("state", - isLeftMenuHasRoot(leftMenuRootValue) - ? leftMenuRootValue+".widgetCatalog" - : "widgetCatalog"); - navItemsDetails3.put("imageSrc", isLeftMenuHasRoot(leftMenuRootValue) ? "icon-apps-marketplace" : "apps"); - defaultNavMap.put("widgetCatalog", navItemsDetails3); + navItemsDetails3.put("state",leftMenuRootValue+widCatalog); + navItemsDetails3.put("imageSrc", "apps"); + defaultNavMap.put(widCatalog, navItemsDetails3); } - private boolean isLeftMenuHasRoot(String leftMenuRootValue) { - return (leftMenuRootValue != "" || leftMenuRootValue.isEmpty()) && leftMenuRootValue.equals("root"); - } @SuppressWarnings("unchecked") private void loadNavMapByUserAdminRole(Map<String, JSONObject> defaultNavMap, EPUser user) { @@ -231,16 +226,26 @@ public class EPLeftMenuServiceImpl implements EPLeftMenuService { if (applicationsList.size() > 0) { JSONObject navItemsDetails = new JSONObject(); navItemsDetails.put("name", "Users"); - navItemsDetails.put("state", - ((leftMenuRootValue != "" || !leftMenuRootValue.isEmpty()) && leftMenuRootValue.equals("root")) ? leftMenuRootValue+".users" - : "users"); - navItemsDetails.put("imageSrc", isLeftMenuHasRoot(leftMenuRootValue) ? "person" : "icon-user"); - defaultNavMap.put("users", navItemsDetails); + navItemsDetails.put("state",leftMenuRootValue+users); + navItemsDetails.put("imageSrc", "person"); + defaultNavMap.put(users, navItemsDetails); + } + } + + protected String getLeftMenuPrefixValue() { + String leftMenuRootValue = getLeftMenuValue(); + if (leftMenuRootValue != null) { + leftMenuRootValue += "."; + } else { + leftMenuRootValue = ""; } + + return leftMenuRootValue; + } - private String getLeftMenuPrefixValue() { - return EPCommonSystemProperties.getProperty(EPCommonSystemProperties.PORTAL_LEFT_MENU); + String getLeftMenuValue() { + return EPCommonSystemProperties.containsProperty(EPCommonSystemProperties.PORTAL_LEFT_MENU) ? EPCommonSystemProperties.getProperty(EPCommonSystemProperties.PORTAL_LEFT_MENU):null; } } |