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 <sandeepa.singh@ibm.com>
Change-Id: If3feb994dbad19dd6cfb1507d976d09643c8e4d6
diff --git a/src/env/components/AppNavigation/ibm.js b/src/env/components/AppNavigation/ibm.js
index cbf0db5..32f5c9f 100644
--- a/src/env/components/AppNavigation/ibm.js
+++ b/src/env/components/AppNavigation/ibm.js
@@ -5,6 +5,7 @@
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 @@
iconSettings: IconSettings,
iconSecurityAndAccess: IconSecurity,
iconExpand: IconChevronUp,
+ iconResourceManagement: IconDataBase,
},
data() {
return {
@@ -80,11 +82,6 @@
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'),
route: '/operations/reboot-bmc',
@@ -155,6 +152,18 @@
},
],
},
+ {
+ 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 a67828d..a43c1ea 100644
--- a/src/env/components/AppNavigation/intel.js
+++ b/src/env/components/AppNavigation/intel.js
@@ -5,6 +5,7 @@
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 @@
iconSettings: IconSettings,
iconSecurityAndAccess: IconSecurity,
iconExpand: IconChevronUp,
+ iconResourceManagement: IconDataBase,
},
data() {
return {
@@ -70,11 +72,6 @@
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'),
route: '/operations/reboot-bmc',
@@ -140,6 +137,18 @@
},
],
},
+ {
+ 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/router/ibm.js b/src/env/router/ibm.js
index f32635f..c6ac61f 100644
--- a/src/env/router/ibm.js
+++ b/src/env/router/ibm.js
@@ -11,7 +11,6 @@
import UserManagement from '@/views/SecurityAndAccess/UserManagement';
import Login from '@/views/Login';
import LoginLayout from '@/layouts/LoginLayout';
-import ManagePowerUsage from '@/views/Operations/ManagePowerUsage';
import Network from '@/views/Settings/Network';
import Overview from '@/views/Overview';
import PageNotFound from '@/views/PageNotFound';
@@ -25,6 +24,7 @@
import SerialOverLanConsole from '@/views/Operations/SerialOverLan/SerialOverLanConsole';
import ServerPowerOperations from '@/views/Operations/ServerPowerOperations';
import Certificates from '@/views/SecurityAndAccess/Certificates';
+import Power from '@/views/ResourceManagement/Power';
import i18n from '@/i18n';
// Custom components
@@ -191,14 +191,6 @@
},
},
{
- path: '/operations/manage-power-usage',
- name: 'manage-power-usage',
- component: ManagePowerUsage,
- meta: {
- title: i18n.t('appPageTitle.managePowerUsage'),
- },
- },
- {
path: '/settings/network',
name: 'network',
component: Network,
@@ -215,6 +207,14 @@
},
},
{
+ path: '/resource-management/power',
+ name: 'power',
+ component: Power,
+ meta: {
+ title: i18n.t('appPageTitle.power'),
+ },
+ },
+ {
path: '/operations/factory-reset',
name: 'factory-reset',
component: FactoryReset,
diff --git a/src/env/router/intel.js b/src/env/router/intel.js
index dec42af..9f69805 100644
--- a/src/env/router/intel.js
+++ b/src/env/router/intel.js
@@ -11,7 +11,6 @@
import UserManagement from '@/views/SecurityAndAccess/UserManagement';
import Login from '@/views/Login';
import LoginLayout from '@/layouts/LoginLayout';
-import ManagePowerUsage from '@/views/Operations/ManagePowerUsage';
import Network from '@/views/Settings/Network';
import Overview from '@/views/Overview';
import PageNotFound from '@/views/PageNotFound';
@@ -24,6 +23,7 @@
import ServerPowerOperations from '@/views/Operations/ServerPowerOperations';
import Certificates from '@/views/SecurityAndAccess/Certificates';
import VirtualMedia from '@/views/Operations/VirtualMedia';
+import Power from '@/views/ResourceManagement/Power';
import i18n from '@/i18n';
const routes = [
@@ -179,14 +179,6 @@
},
},
{
- path: '/operations/manage-power-usage',
- name: 'manage-power-usage',
- component: ManagePowerUsage,
- meta: {
- title: i18n.t('appPageTitle.managePowerUsage'),
- },
- },
- {
path: '/settings/network',
name: 'network',
component: Network,
@@ -195,6 +187,14 @@
},
},
{
+ path: '/resource-management/power',
+ name: 'power',
+ component: Power,
+ meta: {
+ title: i18n.t('appPageTitle.power'),
+ },
+ },
+ {
path: '/operations/reboot-bmc',
name: 'reboot-bmc',
component: RebootBmc,