diff --git a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js index 222da7d5edb2c653e594e77e7ea20c4bf8ca918e..d694ed75448f0e4d42a607c3034a5e1650c72ac0 100644 --- a/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js +++ b/openbis_standard_technologies/dist/core-plugins/eln-lims/1/as/webapps/eln-lims/html/js/views/SideMenu/SideMenuWidgetView.js @@ -203,7 +203,7 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) { Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â sortField = "displayName"; Â Â Â Â Â Â Â Â Â Â Â Â } Â Â Â Â Â Â Â Â Â Â Â Â // descending order for registrationDate -Â Â Â Â Â Â Â Â Â Â Â Â if (sortField == "registrationDate") { +Â Â Â Â Â Â Â Â Â Â Â Â if (sortField === "registrationDate") { Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â return naturalSort(resultB[sortField], resultA[sortField]); Â Â Â Â Â Â Â Â Â Â Â Â } Â Â Â Â Â Â Â Â Â Â Â Â return naturalSort(resultA[sortField], resultB[sortField]); @@ -226,8 +226,8 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) { } if(profile.mainMenu.showStock) { - Â Â Â Â var inventoryLink = _this.getLinkForNode("Stock", "STOCK", "showStockPage", null); - Â Â Â Â treeModel.push({ displayName: "Stock", title : inventoryLink, entityType: "STOCK", key : "STOCK", folder : true, lazy : true, view : "showStockPage", icon: "fa fa-shopping-cart" }); + Â Â Â Â var stockLink = _this.getLinkForNode("Stock", "STOCK", "showStockPage", null); + Â Â Â Â treeModel.push({ displayName: "Stock", title : stockLink, entityType: "STOCK", key : "STOCK", folder : true, lazy : true, view : "showStockPage", icon: "fa fa-shopping-cart" }); } var treeModelUtils = []; @@ -241,8 +241,8 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) { } if(profile.mainMenu.showUserProfile && profile.isFileAuthenticationService && profile.isFileAuthenticationUser) { - Â Â Â Â var settingsLink = _this.getLinkForNode("User Profile", "USER_PROFILE", "showUserProfilePage", null); - Â Â Â Â treeModelUtils.push({ title : settingsLink, entityType: "USER_PROFILE", key : "USER_PROFILE", folder : false, lazy : false, view : "showUserProfilePage", icon : "glyphicon glyphicon-user" }); + Â Â Â Â var userProfileLink = _this.getLinkForNode("User Profile", "USER_PROFILE", "showUserProfilePage", null); + Â Â Â Â treeModelUtils.push({ title : userProfileLink, entityType: "USER_PROFILE", key : "USER_PROFILE", folder : false, lazy : false, view : "showUserProfilePage", icon : "glyphicon glyphicon-user" }); } if(profile.mainMenu.showDrawingBoard) { @@ -264,25 +264,38 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) { Â Â Â Â var advancedSearchLink = _this.getLinkForNode("Advanced Search", "ADVANCED_SEARCH", "showAdvancedSearchPage", null); Â Â Â Â treeModelUtils.push({ displayName: "Advanced Search", title : advancedSearchLink, entityType: "ADVANCED_SEARCH", key : "ADVANCED_SEARCH", folder : false, lazy : false, view : "showAdvancedSearchPage", icon : "glyphicon glyphicon-search" }); } - - if(profile.mainMenu.showExports) { - Â Â Â Â var exportBuilderLink = _this.getLinkForNode("Export Builder", "EXPORT_BUILDER", "showExportTreePage", null); - Â Â Â Â treeModelUtils.push({ displayName: "Export Builder", title : exportBuilderLink, entityType: "EXPORT_BUILDER", key : "EXPORT_BUILDER", - folder : false, lazy : false, view : "showExportTreePage", icon : "glyphicon glyphicon-export" }); - } - if (profile.mainMenu.showResearchCollectionExportBuilder) { - var researchCollectionExportBuilderLink = _this.getLinkForNode("Research Collection Export Builder", "RESEARCH_COLLECTION_EXPORT_BUILDER", - "showResearchCollectionExportPage", null); - treeModelUtils.push({ displayName: "Research Collection Export Builder", title: researchCollectionExportBuilderLink, - entityType: "RESEARCH_COLLECTION_EXPORT_BUILDER", key: "RESEARCH_COLLECTION_EXPORT_BUILDER", folder: false, lazy: false, - view: "showResearchCollectionExportPage" }); - } + if (profile.mainMenu.showExports || profile.mainMenu.showResearchCollectionExportBuilder || profile.mainMenu.showZenodoExportBuilder) { + var treeModelExports = []; + + if (profile.mainMenu.showExports) { + var exportBuilderLink = _this.getLinkForNode("Export Builder", "EXPORT_BUILDER", "showExportTreePage", null); + treeModelExports.push({ + displayName: "Export Builder", title: exportBuilderLink, entityType: "EXPORT_BUILDER", key: "EXPORT_BUILDER", + folder: false, lazy: false, view: "showExportTreePage", icon: "glyphicon glyphicon-export" + }); + } + + if (profile.mainMenu.showResearchCollectionExportBuilder) { + var researchCollectionExportBuilderLink = _this.getLinkForNode("Research Collection Export Builder", + "RESEARCH_COLLECTION_EXPORT_BUILDER", "showResearchCollectionExportPage", null); + treeModelExports.push({ + displayName: "Research Collection Export Builder", title: researchCollectionExportBuilderLink, + entityType: "RESEARCH_COLLECTION_EXPORT_BUILDER", key: "RESEARCH_COLLECTION_EXPORT_BUILDER", folder: false, lazy: false, + view: "showResearchCollectionExportPage", icon: "./img/research-collection-icon.png" + }); + } + + if (profile.mainMenu.showZenodoExportBuilder) { + var zenodoExportBuilderLink = _this.getLinkForNode("Zenodo Export Builder", "ZENODO_EXPORT_BUILDER", "showZenodoExportPage", null); + treeModelExports.push({ + displayName: "Zenodo Export Builder", title: zenodoExportBuilderLink, entityType: "ZENODO_EXPORT_BUILDER", + key: "ZENODO_EXPORT_BUILDER", folder: false, lazy: false, view: "showZenodoExportPage", icon: "glyphicon glyphicon-export" + }); + } - if (profile.mainMenu.showZenodoExportBuilder) { - var zenodoExportBuilderLink = _this.getLinkForNode("Zenodo Export Builder", "ZENODO_EXPORT_BUILDER", "showZenodoExportPage", null); - treeModelUtils.push({ displayName: "Zenodo Export Builder", title: zenodoExportBuilderLink, entityType: "ZENODO_EXPORT_BUILDER", - key: "ZENODO_EXPORT_BUILDER", folder: false, lazy: false, view: "showZenodoExportPage", icon: "glyphicon glyphicon-export" }); + treeModelUtils.push({ displayName: "Export", title: "Export", entityType: "EXPORT", key: "EXPORT", folder: true, lazy: false, + expanded: false, children: treeModelExports, icon: "glyphicon glyphicon-export" }); } if(profile.mainMenu.showStorageManager) { @@ -456,7 +469,7 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) { Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â registrationDate: space.registrationDate, Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â Â }; Â Â Â Â if(!space.getCode().endsWith("STOCK_CATALOG") && !space.getCode().endsWith("STOCK_ORDERS")) { - Â Â Â Â Â Â Â Â Â Â Â Â results.push(spaceNode); + Â Â Â Â Â Â Â Â Â Â Â Â results.push(spaceNode); Â Â Â Â } Â Â Â Â } Â Â Â Â } @@ -826,7 +839,6 @@ function SideMenuWidgetView(sideMenuWidgetController, sideMenuWidgetModel) { Â Â Â Â Â Â Â Â Â Â Â Â stock.setExpanded(true); Â Â Â Â Â Â Â Â } Â Â Â Â Â Â Â Â - setCustomIcon($tree, "RESEARCH_COLLECTION_EXPORT_BUILDER", "./img/research-collection-icon.png"); Â Â Â Â Â Â Â Â setCustomIcon($tree, "JUPYTER_WORKSPACE", "./img/jupyter-icon.png"); Â Â Â Â Â Â Â Â setCustomIcon($tree, "NEW_JUPYTER_NOTEBOOK", "./img/jupyter-icon.png"); }