From 6dba4be6125c10210bafa030ac17737d3a9b28b8 Mon Sep 17 00:00:00 2001 From: Sandeepa Singh Date: Wed, 28 Jul 2021 15:25:14 +0530 Subject: IA update: Add resource management section This is the sixth commit for information architecture changes and has the following changes: - Resource management section has been added - Carbon icon used for resource management section is data--base--alt - Manage power usage page from operations has been moved to resource management - Manage power usage page has been updated to power page Signed-off-by: Sandeepa Singh Change-Id: If3feb994dbad19dd6cfb1507d976d09643c8e4d6 --- src/env/components/AppNavigation/ibm.js | 19 ++++++++++++++----- src/env/components/AppNavigation/intel.js | 19 ++++++++++++++----- 2 files changed, 28 insertions(+), 10 deletions(-) (limited to 'src/env/components') diff --git a/src/env/components/AppNavigation/ibm.js b/src/env/components/AppNavigation/ibm.js index cbf0db55..32f5c9f4 100644 --- a/src/env/components/AppNavigation/ibm.js +++ b/src/env/components/AppNavigation/ibm.js @@ -5,6 +5,7 @@ import IconSettingsAdjust from '@carbon/icons-vue/es/settings--adjust/16'; import IconSettings from '@carbon/icons-vue/es/settings/16'; import IconSecurity from '@carbon/icons-vue/es/security/16'; import IconChevronUp from '@carbon/icons-vue/es/chevron--up/16'; +import IconDataBase from '@carbon/icons-vue/es/data--base--alt/16'; const AppNavigationMixin = { components: { @@ -15,6 +16,7 @@ const AppNavigationMixin = { iconSettings: IconSettings, iconSecurityAndAccess: IconSecurity, iconExpand: IconChevronUp, + iconResourceManagement: IconDataBase, }, data() { return { @@ -79,11 +81,6 @@ const AppNavigationMixin = { label: this.$t('appNavigation.firmware'), route: '/operations/firmware', }, - { - id: 'manage-power-usage', - label: this.$t('appNavigation.managePowerUsage'), - route: '/operations/manage-power-usage', - }, { id: 'reboot-bmc', label: this.$t('appNavigation.rebootBmc'), @@ -155,6 +152,18 @@ const AppNavigationMixin = { }, ], }, + { + id: 'resource-management', + label: this.$t('appNavigation.resourceManagement'), + icon: 'iconResourceManagement', + children: [ + { + id: 'power', + label: this.$t('appNavigation.power'), + route: '/resource-management/power', + }, + ], + }, ], }; }, diff --git a/src/env/components/AppNavigation/intel.js b/src/env/components/AppNavigation/intel.js index a67828d9..a43c1ea4 100644 --- a/src/env/components/AppNavigation/intel.js +++ b/src/env/components/AppNavigation/intel.js @@ -5,6 +5,7 @@ import IconSettingsAdjust from '@carbon/icons-vue/es/settings--adjust/16'; import IconSettings from '@carbon/icons-vue/es/settings/16'; import IconSecurity from '@carbon/icons-vue/es/security/16'; import IconChevronUp from '@carbon/icons-vue/es/chevron--up/16'; +import IconDataBase from '@carbon/icons-vue/es/data--base--alt/16'; const AppNavigationMixin = { components: { @@ -15,6 +16,7 @@ const AppNavigationMixin = { iconSettings: IconSettings, iconSecurityAndAccess: IconSecurity, iconExpand: IconChevronUp, + iconResourceManagement: IconDataBase, }, data() { return { @@ -69,11 +71,6 @@ const AppNavigationMixin = { label: this.$t('appNavigation.firmware'), route: '/operations/firmware', }, - { - id: 'manage-power-usage', - label: this.$t('appNavigation.managePowerUsage'), - route: '/operations/manage-power-usage', - }, { id: 'reboot-bmc', label: this.$t('appNavigation.rebootBmc'), @@ -140,6 +137,18 @@ const AppNavigationMixin = { }, ], }, + { + id: 'resource-management', + label: this.$t('appNavigation.resourceManagement'), + icon: 'iconResourceManagement', + children: [ + { + id: 'power', + label: this.$t('appNavigation.power'), + route: '/resource-management/power', + }, + ], + }, ], }; }, -- cgit v1.2.3