From b440616c23b61166ae6d87839a70eec31bdca235 Mon Sep 17 00:00:00 2001 From: Sandeepa Singh Date: Mon, 26 Jul 2021 15:05:39 +0530 Subject: IA update: Update access and control section This is the fifth commit of the information architecture changes and has the following changes: - The icon for access and control has been updated - Access and control section has been updated to security and access section - Security settings page has been updated to policies page and moved to security and access section - Client sessions page has been updated to sessions page - Local user management page has been updated to user management page - SSL certificates page has been updated to certificates page Signed-off-by: Sandeepa Singh Change-Id: Ie93cee9002742ecf7d33615636f4f159f4395fc4 --- src/env/components/AppNavigation/ibm.js | 40 ++++++++++++------------ src/env/components/AppNavigation/intel.js | 38 +++++++++++----------- src/env/router/ibm.js | 52 +++++++++++++++---------------- src/env/router/intel.js | 48 ++++++++++++++-------------- 4 files changed, 89 insertions(+), 89 deletions(-) (limited to 'src/env') diff --git a/src/env/components/AppNavigation/ibm.js b/src/env/components/AppNavigation/ibm.js index d6a62893..cbf0db55 100644 --- a/src/env/components/AppNavigation/ibm.js +++ b/src/env/components/AppNavigation/ibm.js @@ -3,7 +3,7 @@ import IconTextLinkAnalysis from '@carbon/icons-vue/es/text-link--analysis/16'; import IconDataCheck from '@carbon/icons-vue/es/data--check/16'; import IconSettingsAdjust from '@carbon/icons-vue/es/settings--adjust/16'; import IconSettings from '@carbon/icons-vue/es/settings/16'; -import IconPassword from '@carbon/icons-vue/es/password/16'; +import IconSecurity from '@carbon/icons-vue/es/security/16'; import IconChevronUp from '@carbon/icons-vue/es/chevron--up/16'; const AppNavigationMixin = { @@ -13,7 +13,7 @@ const AppNavigationMixin = { iconHealth: IconDataCheck, iconControl: IconSettingsAdjust, iconSettings: IconSettings, - iconAccessControl: IconPassword, + iconSecurityAndAccess: IconSecurity, iconExpand: IconChevronUp, }, data() { @@ -121,37 +121,37 @@ const AppNavigationMixin = { label: this.$t('appNavigation.powerRestorePolicy'), route: '/settings/power-restore-policy', }, - { - id: 'security-settings', - label: this.$t('appNavigation.securitySettings'), - route: '/settings/security-settings', - }, ], }, { - id: 'access-control', - label: this.$t('appNavigation.accessControl'), - icon: 'iconAccessControl', + id: 'security-and-access', + label: this.$t('appNavigation.securityAndAccess'), + icon: 'iconSecurityAndAccess', children: [ { - id: 'client-sessions', - label: this.$t('appNavigation.clientSessions'), - route: '/access-control/client-sessions', + id: 'sessions', + label: this.$t('appNavigation.sessions'), + route: '/security-and-access/sessions', }, { id: 'ldap', label: this.$t('appNavigation.ldap'), - route: '/access-control/ldap', + route: '/security-and-access/ldap', + }, + { + id: 'user-management', + label: this.$t('appNavigation.userManagement'), + route: '/security-and-access/user-management', }, { - id: 'local-user-management', - label: this.$t('appNavigation.localUserManagement'), - route: '/access-control/local-user-management', + id: 'policies', + label: this.$t('appNavigation.policies'), + route: '/security-and-access/policies', }, { - id: 'ssl-certificates', - label: this.$t('appNavigation.sslCertificates'), - route: '/access-control/ssl-certificates', + id: 'certificates', + label: this.$t('appNavigation.certificates'), + route: '/security-and-access/certificates', }, ], }, diff --git a/src/env/components/AppNavigation/intel.js b/src/env/components/AppNavigation/intel.js index 20aa4f23..a67828d9 100644 --- a/src/env/components/AppNavigation/intel.js +++ b/src/env/components/AppNavigation/intel.js @@ -3,7 +3,7 @@ import IconTextLinkAnalysis from '@carbon/icons-vue/es/text-link--analysis/16'; import IconDataCheck from '@carbon/icons-vue/es/data--check/16'; import IconSettingsAdjust from '@carbon/icons-vue/es/settings--adjust/16'; import IconSettings from '@carbon/icons-vue/es/settings/16'; -import IconPassword from '@carbon/icons-vue/es/password/16'; +import IconSecurity from '@carbon/icons-vue/es/security/16'; import IconChevronUp from '@carbon/icons-vue/es/chevron--up/16'; const AppNavigationMixin = { @@ -13,7 +13,7 @@ const AppNavigationMixin = { iconHealth: IconDataCheck, iconControl: IconSettingsAdjust, iconSettings: IconSettings, - iconAccessControl: IconPassword, + iconSecurityAndAccess: IconSecurity, iconExpand: IconChevronUp, }, data() { @@ -111,32 +111,32 @@ const AppNavigationMixin = { label: this.$t('appNavigation.network'), route: '/settings/network', }, - { - id: 'security-settings', - label: this.$t('appNavigation.securitySettings'), - route: '/settings/security-settings', - }, ], }, { - id: 'access-control', - label: this.$t('appNavigation.accessControl'), - icon: 'iconAccessControl', + id: 'security-and-access', + label: this.$t('appNavigation.securityAndAccess'), + icon: 'iconSecurityAndAccess', children: [ { - id: 'client-sessions', - label: this.$t('appNavigation.clientSessions'), - route: '/access-control/client-sessions', + id: 'sessions', + label: this.$t('appNavigation.sessions'), + route: '/security-and-access/sessions', + }, + { + id: 'user-management', + label: this.$t('appNavigation.userManagement'), + route: '/security-and-access/user-management', }, { - id: 'local-user-management', - label: this.$t('appNavigation.localUserManagement'), - route: '/access-control/local-user-management', + id: 'policies', + label: this.$t('appNavigation.policies'), + route: '/security-and-access/policies', }, { - id: 'ssl-certificates', - label: this.$t('appNavigation.sslCertificates'), - route: '/access-control/ssl-certificates', + id: 'certificates', + label: this.$t('appNavigation.certificates'), + route: '/security-and-access/certificates', }, ], }, diff --git a/src/env/router/ibm.js b/src/env/router/ibm.js index 4149b97a..f32635fc 100644 --- a/src/env/router/ibm.js +++ b/src/env/router/ibm.js @@ -1,14 +1,14 @@ import AppLayout from '@/layouts/AppLayout.vue'; import ChangePassword from '@/views/ChangePassword'; -import ClientSessions from '@/views/AccessControl/ClientSessions'; +import Sessions from '@/views/SecurityAndAccess/Sessions'; import ConsoleLayout from '@/layouts/ConsoleLayout.vue'; import DateTime from '@/views/Settings/DateTime'; import EventLogs from '@/views/Logs/EventLogs'; import FactoryReset from '@/views/Operations/FactoryReset'; import Firmware from '@/views/Operations/Firmware'; import Inventory from '@/views/HardwareStatus/Inventory'; -import Ldap from '@/views/AccessControl/Ldap'; -import LocalUserManagement from '@/views/AccessControl/LocalUserManagement'; +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'; @@ -19,12 +19,12 @@ import PostCodeLogs from '@/views/Logs/PostCodeLogs'; import PowerRestorePolicy from '@/views/Settings/PowerRestorePolicy'; import ProfileSettings from '@/views/ProfileSettings'; import RebootBmc from '@/views/Operations/RebootBmc'; -import SecuritySettings from '@/views/Settings/SecuritySettings'; +import Policies from '@/views/SecurityAndAccess/Policies'; import Sensors from '@/views/HardwareStatus/Sensors'; import SerialOverLan from '@/views/Operations/SerialOverLan'; import SerialOverLanConsole from '@/views/Operations/SerialOverLan/SerialOverLanConsole'; import ServerPowerOperations from '@/views/Operations/ServerPowerOperations'; -import SslCertificates from '@/views/AccessControl/SslCertificates'; +import Certificates from '@/views/SecurityAndAccess/Certificates'; import i18n from '@/i18n'; // Custom components @@ -135,15 +135,15 @@ const routes = [ }, }, { - path: '/access-control/client-sessions', - name: 'client-sessions', - component: ClientSessions, + path: '/security-and-access/sessions', + name: 'sessions', + component: Sessions, meta: { - title: i18n.t('appPageTitle.clientSessions'), + title: i18n.t('appPageTitle.sessions'), }, }, { - path: '/access-control/ldap', + path: '/security-and-access/ldap', name: 'ldap', component: Ldap, meta: { @@ -151,19 +151,27 @@ const routes = [ }, }, { - path: '/access-control/local-user-management', - name: 'local-users', - component: LocalUserManagement, + path: '/security-and-access/user-management', + name: 'user-management', + component: UserManagement, meta: { - title: i18n.t('appPageTitle.localUserManagement'), + title: i18n.t('appPageTitle.userManagement'), }, }, { - path: '/access-control/ssl-certificates', - name: 'ssl-certificates', - component: SslCertificates, + path: '/security-and-access/policies', + name: 'policies', + component: Policies, meta: { - title: i18n.t('appPageTitle.sslCertificates'), + title: i18n.t('appPageTitle.policies'), + }, + }, + { + path: '/security-and-access/certificates', + name: 'certificates', + component: Certificates, + meta: { + title: i18n.t('appPageTitle.certificates'), }, }, { @@ -206,14 +214,6 @@ const routes = [ title: i18n.t('appPageTitle.powerRestorePolicy'), }, }, - { - path: '/settings/security-settings', - name: 'security-settings', - component: SecuritySettings, - meta: { - title: i18n.t('appPageTitle.securitySettings'), - }, - }, { path: '/operations/factory-reset', name: 'factory-reset', diff --git a/src/env/router/intel.js b/src/env/router/intel.js index a8c5a2af..dec42afc 100644 --- a/src/env/router/intel.js +++ b/src/env/router/intel.js @@ -1,6 +1,6 @@ import AppLayout from '@/layouts/AppLayout.vue'; import ChangePassword from '@/views/ChangePassword'; -import ClientSessions from '@/views/AccessControl/ClientSessions'; +import Sessions from '@/views/SecurityAndAccess/Sessions'; import ConsoleLayout from '@/layouts/ConsoleLayout.vue'; import DateTime from '@/views/Settings/DateTime'; import EventLogs from '@/views/Logs/EventLogs'; @@ -8,7 +8,7 @@ import Firmware from '@/views/Operations/Firmware'; import Inventory from '@/views/HardwareStatus/Inventory'; import Kvm from '@/views/Operations/Kvm'; import KvmConsole from '@/views/Operations/Kvm/KvmConsole'; -import LocalUserManagement from '@/views/AccessControl/LocalUserManagement'; +import UserManagement from '@/views/SecurityAndAccess/UserManagement'; import Login from '@/views/Login'; import LoginLayout from '@/layouts/LoginLayout'; import ManagePowerUsage from '@/views/Operations/ManagePowerUsage'; @@ -17,12 +17,12 @@ import Overview from '@/views/Overview'; import PageNotFound from '@/views/PageNotFound'; import ProfileSettings from '@/views/ProfileSettings'; import RebootBmc from '@/views/Operations/RebootBmc'; -import SecuritySettings from '@/views/Settings/SecuritySettings'; +import Policies from '@/views/SecurityAndAccess/Policies'; import Sensors from '@/views/HardwareStatus/Sensors'; import SerialOverLan from '@/views/Operations/SerialOverLan'; import SerialOverLanConsole from '@/views/Operations/SerialOverLan/SerialOverLanConsole'; import ServerPowerOperations from '@/views/Operations/ServerPowerOperations'; -import SslCertificates from '@/views/AccessControl/SslCertificates'; +import Certificates from '@/views/SecurityAndAccess/Certificates'; import VirtualMedia from '@/views/Operations/VirtualMedia'; import i18n from '@/i18n'; @@ -123,27 +123,35 @@ const routes = [ }, }, { - path: '/access-control/client-sessions', - name: 'client-sessions', - component: ClientSessions, + path: '/security-and-access/sessions', + name: 'sessions', + component: Sessions, meta: { - title: i18n.t('appPageTitle.clientSessions'), + title: i18n.t('appPageTitle.sessions'), }, }, { - path: '/access-control/local-user-management', - name: 'local-users', - component: LocalUserManagement, + path: '/security-and-access/user-management', + name: 'user-management', + component: UserManagement, meta: { - title: i18n.t('appPageTitle.localUserManagement'), + title: i18n.t('appPageTitle.userManagement'), }, }, { - path: '/access-control/ssl-certificates', - name: 'ssl-certificates', - component: SslCertificates, + path: '/security-and-access/policies', + name: 'policies', + component: Policies, meta: { - title: i18n.t('appPageTitle.sslCertificates'), + title: i18n.t('appPageTitle.policies'), + }, + }, + { + path: '/security-and-access/certificates', + name: 'certificates', + component: Certificates, + meta: { + title: i18n.t('appPageTitle.certificates'), }, }, { @@ -186,14 +194,6 @@ const routes = [ title: i18n.t('appPageTitle.network'), }, }, - { - path: '/settings/security-settings', - name: 'security-settings', - component: SecuritySettings, - meta: { - title: i18n.t('appPageTitle.securitySettings'), - }, - }, { path: '/operations/reboot-bmc', name: 'reboot-bmc', -- cgit v1.2.3