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/components/AppNavigation/AppNavigationMixin.js | 19 ++- src/env/components/AppNavigation/ibm.js | 19 ++- src/env/components/AppNavigation/intel.js | 19 ++- src/env/router/ibm.js | 18 +-- src/env/router/intel.js | 18 +-- src/locales/en-US.json | 24 +-- src/router/routes.js | 18 +-- .../ManagePowerUsage/ManagePowerUsage.vue | 165 ------------------- src/views/Operations/ManagePowerUsage/index.js | 2 - src/views/ResourceManagement/Power.vue | 163 +++++++++++++++++++ src/views/ResourceManagement/index.js | 2 + .../unit/__snapshots__/AppNavigation.spec.js.snap | 174 ++++++++++++++++++--- 12 files changed, 403 insertions(+), 238 deletions(-) delete mode 100644 src/views/Operations/ManagePowerUsage/ManagePowerUsage.vue delete mode 100644 src/views/Operations/ManagePowerUsage/index.js create mode 100644 src/views/ResourceManagement/Power.vue create mode 100644 src/views/ResourceManagement/index.js diff --git a/src/components/AppNavigation/AppNavigationMixin.js b/src/components/AppNavigation/AppNavigationMixin.js index da8a59cd..edeabc52 100644 --- a/src/components/AppNavigation/AppNavigationMixin.js +++ b/src/components/AppNavigation/AppNavigationMixin.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'), @@ -160,6 +157,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/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', + }, + ], + }, ], }; }, diff --git a/src/env/router/ibm.js b/src/env/router/ibm.js index f32635fc..c6ac61f7 100644 --- a/src/env/router/ibm.js +++ b/src/env/router/ibm.js @@ -11,7 +11,6 @@ import Ldap from '@/views/SecurityAndAccess/Ldap'; 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 SerialOverLan from '@/views/Operations/SerialOverLan'; 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 @@ -190,14 +190,6 @@ const routes = [ title: i18n.t('appPageTitle.firmware'), }, }, - { - path: '/operations/manage-power-usage', - name: 'manage-power-usage', - component: ManagePowerUsage, - meta: { - title: i18n.t('appPageTitle.managePowerUsage'), - }, - }, { path: '/settings/network', name: 'network', @@ -214,6 +206,14 @@ const routes = [ title: i18n.t('appPageTitle.powerRestorePolicy'), }, }, + { + path: '/resource-management/power', + name: 'power', + component: Power, + meta: { + title: i18n.t('appPageTitle.power'), + }, + }, { path: '/operations/factory-reset', name: 'factory-reset', diff --git a/src/env/router/intel.js b/src/env/router/intel.js index dec42afc..9f698056 100644 --- a/src/env/router/intel.js +++ b/src/env/router/intel.js @@ -11,7 +11,6 @@ import KvmConsole from '@/views/Operations/Kvm/KvmConsole'; 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 SerialOverLanConsole from '@/views/Operations/SerialOverLan/SerialOverLan 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 = [ @@ -178,14 +178,6 @@ const routes = [ title: i18n.t('appPageTitle.firmware'), }, }, - { - path: '/operations/manage-power-usage', - name: 'manage-power-usage', - component: ManagePowerUsage, - meta: { - title: i18n.t('appPageTitle.managePowerUsage'), - }, - }, { path: '/settings/network', name: 'network', @@ -194,6 +186,14 @@ const routes = [ title: i18n.t('appPageTitle.network'), }, }, + { + path: '/resource-management/power', + name: 'power', + component: Power, + meta: { + title: i18n.t('appPageTitle.power'), + }, + }, { path: '/operations/reboot-bmc', name: 'reboot-bmc', diff --git a/src/locales/en-US.json b/src/locales/en-US.json index 33e65f58..e4fb94a5 100644 --- a/src/locales/en-US.json +++ b/src/locales/en-US.json @@ -98,6 +98,7 @@ "titleRefresh": "Refresh application data" }, "appNavigation": { + "resourceManagement": "Resource management", "securityAndAccess": "Security and access", "sessions": "@:appPageTitle.sessions", "settings": "Settings", @@ -113,7 +114,6 @@ "ldap": "@:appPageTitle.ldap", "logs": "Logs", "userManagement": "@:appPageTitle.userManagement", - "managePowerUsage": "@:appPageTitle.managePowerUsage", "network": "@:appPageTitle.network", "overview": "@:appPageTitle.overview", "primaryNavigation": "Primary navigation", @@ -125,10 +125,12 @@ "serialOverLan": "SOL console", "serverPowerOperations": "@:appPageTitle.serverPowerOperations", "certificates": "@:appPageTitle.certificates", - "virtualMedia": "@:appPageTitle.virtualMedia" + "virtualMedia": "@:appPageTitle.virtualMedia", + "power": "@:appPageTitle.power" }, "appPageTitle": { "changePassword": "Change password", + "power": "Power", "sessions": "Sessions", "dateTime": "Date and time", "dumps": "Dumps", @@ -140,7 +142,6 @@ "ldap": "LDAP", "userManagement": "User management", "login": "Login", - "managePowerUsage": "Manage power usage", "network": "Network", "overview": "Overview", "pageNotFound": "Page not found", @@ -621,14 +622,6 @@ "successSaveSettings": "Successfully saved account settings." } }, - "pageManagePowerUsage": { - "description": "Set a power cap to keep power consumption at or below the specified value in watts", - "powerCapLabel": "Power cap value (in watts)", - "powerCapLabelTextInfo": " Value must be between %{min} and %{max}", - "powerCapSettingData": "Apply power cap", - "powerCapSettingLabel": "Power cap setting", - "powerConsumption": "Current power consumption" - }, "pageNetwork": { "dhcp": "DHCP", "ipv4": "IPV4", @@ -721,6 +714,15 @@ "successSshEnabled": "Successfully enabled SSH security setting." } }, + "pagePower": { + "description": "Set a power cap to keep power consumption at or below the specified value in watts", + "powerCapLabel": "Power cap value (in watts)", + "powerCapLabelTextInfo": " Value must be between %{min} and %{max}", + "powerCapSettingData": "Apply power cap", + "powerCapSettingLabel": "Power cap setting", + "powerConsumption": "Current power consumption", + "serverPowCapSetting": "Server power cap setting" + }, "pageSensors": { "exportFilePrefix": "sensors_", "searchForSensors": "Search for sensors", diff --git a/src/router/routes.js b/src/router/routes.js index da103755..b99aac51 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -13,7 +13,6 @@ import Ldap from '@/views/SecurityAndAccess/Ldap'; 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'; @@ -28,6 +27,7 @@ import SerialOverLanConsole from '@/views/Operations/SerialOverLan/SerialOverLan 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 = [ @@ -206,14 +206,6 @@ const routes = [ title: i18n.t('appPageTitle.firmware'), }, }, - { - path: '/operations/manage-power-usage', - name: 'manage-power-usage', - component: ManagePowerUsage, - meta: { - title: i18n.t('appPageTitle.managePowerUsage'), - }, - }, { path: '/settings/network', name: 'network', @@ -230,6 +222,14 @@ const routes = [ title: i18n.t('appPageTitle.powerRestorePolicy'), }, }, + { + path: '/resource-management/power', + name: 'power', + component: Power, + meta: { + title: i18n.t('appPageTitle.power'), + }, + }, { path: '/operations/reboot-bmc', name: 'reboot-bmc', diff --git a/src/views/Operations/ManagePowerUsage/ManagePowerUsage.vue b/src/views/Operations/ManagePowerUsage/ManagePowerUsage.vue deleted file mode 100644 index 38dbf0b8..00000000 --- a/src/views/Operations/ManagePowerUsage/ManagePowerUsage.vue +++ /dev/null @@ -1,165 +0,0 @@ - - - diff --git a/src/views/Operations/ManagePowerUsage/index.js b/src/views/Operations/ManagePowerUsage/index.js deleted file mode 100644 index f3e95ac1..00000000 --- a/src/views/Operations/ManagePowerUsage/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import ManagePowerUsage from './ManagePowerUsage.vue'; -export default ManagePowerUsage; diff --git a/src/views/ResourceManagement/Power.vue b/src/views/ResourceManagement/Power.vue new file mode 100644 index 00000000..8e4acdd3 --- /dev/null +++ b/src/views/ResourceManagement/Power.vue @@ -0,0 +1,163 @@ + + + diff --git a/src/views/ResourceManagement/index.js b/src/views/ResourceManagement/index.js new file mode 100644 index 00000000..5882decd --- /dev/null +++ b/src/views/ResourceManagement/index.js @@ -0,0 +1,2 @@ +import Power from './Power.vue'; +export default Power; diff --git a/tests/unit/__snapshots__/AppNavigation.spec.js.snap b/tests/unit/__snapshots__/AppNavigation.spec.js.snap index d87d44ed..37609d39 100644 --- a/tests/unit/__snapshots__/AppNavigation.spec.js.snap +++ b/tests/unit/__snapshots__/AppNavigation.spec.js.snap @@ -320,15 +320,6 @@ exports[`AppNavigation.vue should render correctly 1`] = ` appNavigation.firmware - - - - appNavigation.managePowerUsage - +
  • + + + + + +
    • @@ -912,15 +981,6 @@ exports[`AppNavigation.vue should render with nav-container open 1`] = ` appNavigation.firmware - - - - appNavigation.managePowerUsage - +
  • + + + + + +
    • -- cgit v1.2.3