diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/components/AppHeader/AppHeader.vue | 2 | ||||
-rw-r--r-- | src/components/AppNavigation/AppNavigationMixin.js | 35 | ||||
-rw-r--r-- | src/env/components/AppNavigation/ibm.js | 31 | ||||
-rw-r--r-- | src/env/components/AppNavigation/intel.js | 31 | ||||
-rw-r--r-- | src/env/router/ibm.js | 39 | ||||
-rw-r--r-- | src/env/router/intel.js | 53 | ||||
-rw-r--r-- | src/locales/en-US.json | 14 | ||||
-rw-r--r-- | src/router/routes.js | 63 | ||||
-rw-r--r-- | src/store/index.js | 14 | ||||
-rw-r--r-- | src/store/modules/HardwareStatus/ServerLedStore.js | 15 | ||||
-rw-r--r-- | src/store/modules/Operations/BootSettingsStore.js (renamed from src/store/modules/Control/BootSettingsStore.js) | 0 | ||||
-rw-r--r-- | src/store/modules/Operations/ControlStore.js (renamed from src/store/modules/Control/ControlStore.js) | 0 | ||||
-rw-r--r-- | src/store/modules/Operations/FactoryResetStore.js (renamed from src/store/modules/Control/FactoryResetStore.js) | 0 | ||||
-rw-r--r-- | src/store/modules/Operations/FirmwareStore.js (renamed from src/store/modules/Configuration/FirmwareStore.js) | 0 | ||||
-rw-r--r-- | src/store/modules/Operations/PowerControlStore.js (renamed from src/store/modules/Control/PowerControlStore.js) | 0 | ||||
-rw-r--r-- | src/store/modules/Operations/PowerPolicyStore.js (renamed from src/store/modules/Control/PowerPolicyStore.js) | 0 | ||||
-rw-r--r-- | src/store/modules/Operations/VirtualMediaStore.js (renamed from src/store/modules/Control/VirtualMediaStore.js) | 0 | ||||
-rw-r--r-- | src/views/Control/ServerLed/ServerLed.vue | 71 | ||||
-rw-r--r-- | src/views/Control/ServerLed/index.js | 2 | ||||
-rw-r--r-- | src/views/Operations/FactoryReset/FactoryReset.vue (renamed from src/views/Control/FactoryReset/FactoryReset.vue) | 0 | ||||
-rw-r--r-- | src/views/Operations/FactoryReset/FactoryResetModal.vue (renamed from src/views/Control/FactoryReset/FactoryResetModal.vue) | 0 | ||||
-rw-r--r-- | src/views/Operations/FactoryReset/index.js (renamed from src/views/Control/FactoryReset/index.js) | 0 | ||||
-rw-r--r-- | src/views/Operations/Firmware/Firmware.vue (renamed from src/views/Configuration/Firmware/Firmware.vue) | 0 | ||||
-rw-r--r-- | src/views/Operations/Firmware/FirmwareAlertServerPower.vue (renamed from src/views/Configuration/Firmware/FirmwareAlertServerPower.vue) | 0 | ||||
-rw-r--r-- | src/views/Operations/Firmware/FirmwareCardsBmc.vue (renamed from src/views/Configuration/Firmware/FirmwareCardsBmc.vue) | 0 | ||||
-rw-r--r-- | src/views/Operations/Firmware/FirmwareCardsHost.vue (renamed from src/views/Configuration/Firmware/FirmwareCardsHost.vue) | 0 | ||||
-rw-r--r-- | src/views/Operations/Firmware/FirmwareFormUpdate.vue (renamed from src/views/Configuration/Firmware/FirmwareFormUpdate.vue) | 0 | ||||
-rw-r--r-- | src/views/Operations/Firmware/FirmwareModalSwitchToRunning.vue (renamed from src/views/Configuration/Firmware/FirmwareModalSwitchToRunning.vue) | 0 | ||||
-rw-r--r-- | src/views/Operations/Firmware/FirmwareModalUpdateFirmware.vue (renamed from src/views/Configuration/Firmware/FirmwareModalUpdateFirmware.vue) | 0 | ||||
-rw-r--r-- | src/views/Operations/Firmware/index.js (renamed from src/views/Configuration/Firmware/index.js) | 0 | ||||
-rw-r--r-- | src/views/Operations/Kvm/Kvm.vue (renamed from src/views/Control/Kvm/Kvm.vue) | 0 | ||||
-rw-r--r-- | src/views/Operations/Kvm/KvmConsole.vue (renamed from src/views/Control/Kvm/KvmConsole.vue) | 0 | ||||
-rw-r--r-- | src/views/Operations/Kvm/index.js (renamed from src/views/Control/Kvm/index.js) | 0 | ||||
-rw-r--r-- | src/views/Operations/ManagePowerUsage/ManagePowerUsage.vue (renamed from src/views/Control/ManagePowerUsage/ManagePowerUsage.vue) | 0 | ||||
-rw-r--r-- | src/views/Operations/ManagePowerUsage/index.js (renamed from src/views/Control/ManagePowerUsage/index.js) | 0 | ||||
-rw-r--r-- | src/views/Operations/PowerRestorePolicy/PowerRestorePolicy.vue (renamed from src/views/Control/PowerRestorePolicy/PowerRestorePolicy.vue) | 0 | ||||
-rw-r--r-- | src/views/Operations/PowerRestorePolicy/index.js (renamed from src/views/Control/PowerRestorePolicy/index.js) | 0 | ||||
-rw-r--r-- | src/views/Operations/RebootBmc/RebootBmc.vue (renamed from src/views/Control/RebootBmc/RebootBmc.vue) | 0 | ||||
-rw-r--r-- | src/views/Operations/RebootBmc/index.js (renamed from src/views/Control/RebootBmc/index.js) | 0 | ||||
-rw-r--r-- | src/views/Operations/SerialOverLan/SerialOverLan.vue (renamed from src/views/Control/SerialOverLan/SerialOverLan.vue) | 0 | ||||
-rw-r--r-- | src/views/Operations/SerialOverLan/SerialOverLanConsole.vue (renamed from src/views/Control/SerialOverLan/SerialOverLanConsole.vue) | 0 | ||||
-rw-r--r-- | src/views/Operations/SerialOverLan/index.js (renamed from src/views/Control/SerialOverLan/index.js) | 0 | ||||
-rw-r--r-- | src/views/Operations/ServerPowerOperations/BootSettings.vue (renamed from src/views/Control/ServerPowerOperations/BootSettings.vue) | 0 | ||||
-rw-r--r-- | src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue (renamed from src/views/Control/ServerPowerOperations/ServerPowerOperations.vue) | 0 | ||||
-rw-r--r-- | src/views/Operations/ServerPowerOperations/index.js (renamed from src/views/Control/ServerPowerOperations/index.js) | 0 | ||||
-rw-r--r-- | src/views/Operations/VirtualMedia/ModalConfigureConnection.vue (renamed from src/views/Control/VirtualMedia/ModalConfigureConnection.vue) | 0 | ||||
-rw-r--r-- | src/views/Operations/VirtualMedia/VirtualMedia.vue (renamed from src/views/Control/VirtualMedia/VirtualMedia.vue) | 0 | ||||
-rw-r--r-- | src/views/Operations/VirtualMedia/index.js (renamed from src/views/Control/VirtualMedia/index.js) | 0 | ||||
-rw-r--r-- | src/views/Overview/OverviewQuickLinks.vue | 3 |
49 files changed, 121 insertions, 252 deletions
diff --git a/src/components/AppHeader/AppHeader.vue b/src/components/AppHeader/AppHeader.vue index df6acbf7..26f4a683 100644 --- a/src/components/AppHeader/AppHeader.vue +++ b/src/components/AppHeader/AppHeader.vue @@ -56,7 +56,7 @@ {{ $t('appHeader.health') }} </b-nav-item> <b-nav-item - to="/control/server-power-operations" + to="/operations/server-power-operations" data-test-id="appHeader-container-power" > <status-icon :status="serverStatusIcon" /> diff --git a/src/components/AppNavigation/AppNavigationMixin.js b/src/components/AppNavigation/AppNavigationMixin.js index 10ca5f83..935bd7e7 100644 --- a/src/components/AppNavigation/AppNavigationMixin.js +++ b/src/components/AppNavigation/AppNavigationMixin.js @@ -60,54 +60,54 @@ const AppNavigationMixin = { ], }, { - id: 'control', - label: this.$t('appNavigation.control'), + id: 'operations', + label: this.$t('appNavigation.operations'), icon: 'iconControl', children: [ { id: 'factory-reset', label: this.$t('appNavigation.factoryReset'), - route: '/control/factory-reset', + route: '/operations/factory-reset', }, { id: 'kvm', label: this.$t('appNavigation.kvm'), - route: '/control/kvm', + route: '/operations/kvm', + }, + { + id: 'firmware', + label: this.$t('appNavigation.firmware'), + route: '/operations/firmware', }, { id: 'manage-power-usage', label: this.$t('appNavigation.managePowerUsage'), - route: '/control/manage-power-usage', + route: '/operations/manage-power-usage', }, { id: 'power-restore-policy', label: this.$t('appNavigation.powerRestorePolicy'), - route: '/control/power-restore-policy', + route: '/operations/power-restore-policy', }, { id: 'reboot-bmc', label: this.$t('appNavigation.rebootBmc'), - route: '/control/reboot-bmc', + route: '/operations/reboot-bmc', }, { id: 'serial-over-lan', label: this.$t('appNavigation.serialOverLan'), - route: '/control/serial-over-lan', - }, - { - id: 'server-led', - label: this.$t('appNavigation.serverLed'), - route: '/control/server-led', + route: '/operations/serial-over-lan', }, { id: 'server-power-operations', label: this.$t('appNavigation.serverPowerOperations'), - route: '/control/server-power-operations', + route: '/operations/server-power-operations', }, { id: 'virtual-media', label: this.$t('appNavigation.virtualMedia'), - route: '/control/virtual-media', + route: '/operations/virtual-media', }, ], }, @@ -122,11 +122,6 @@ const AppNavigationMixin = { route: '/configuration/date-time-settings', }, { - id: 'firmware', - label: this.$t('appNavigation.firmware'), - route: '/configuration/firmware', - }, - { id: 'network-settings', label: this.$t('appNavigation.networkSettings'), route: '/configuration/network-settings', diff --git a/src/env/components/AppNavigation/ibm.js b/src/env/components/AppNavigation/ibm.js index 0128d749..fa3891ea 100644 --- a/src/env/components/AppNavigation/ibm.js +++ b/src/env/components/AppNavigation/ibm.js @@ -65,44 +65,44 @@ const AppNavigationMixin = { ], }, { - id: 'control', - label: this.$t('appNavigation.control'), + id: 'operations', + label: this.$t('appNavigation.operations'), icon: 'iconControl', children: [ { id: 'factory-reset', label: this.$t('appNavigation.factoryReset'), - route: '/control/factory-reset', + route: '/operations/factory-reset', + }, + { + id: 'firmware', + label: this.$t('appNavigation.firmware'), + route: '/operations/firmware', }, { id: 'manage-power-usage', label: this.$t('appNavigation.managePowerUsage'), - route: '/control/manage-power-usage', + route: '/operations/manage-power-usage', }, { id: 'power-restore-policy', label: this.$t('appNavigation.powerRestorePolicy'), - route: '/control/power-restore-policy', + route: '/operations/power-restore-policy', }, { id: 'reboot-bmc', label: this.$t('appNavigation.rebootBmc'), - route: '/control/reboot-bmc', + route: '/operations/reboot-bmc', }, { id: 'serial-over-lan', label: this.$t('appNavigation.serialOverLan'), - route: '/control/serial-over-lan', - }, - { - id: 'server-led', - label: this.$t('appNavigation.serverLed'), - route: '/control/server-led', + route: '/operations/serial-over-lan', }, { id: 'server-power-operations', label: this.$t('appNavigation.serverPowerOperations'), - route: '/control/server-power-operations', + route: '/operations/server-power-operations', }, ], }, @@ -117,11 +117,6 @@ const AppNavigationMixin = { route: '/configuration/date-time-settings', }, { - id: 'firmware', - label: this.$t('appNavigation.firmware'), - route: '/configuration/firmware', - }, - { id: 'network-settings', label: this.$t('appNavigation.networkSettings'), route: '/configuration/network-settings', diff --git a/src/env/components/AppNavigation/intel.js b/src/env/components/AppNavigation/intel.js index 68557c1b..2c4188cc 100644 --- a/src/env/components/AppNavigation/intel.js +++ b/src/env/components/AppNavigation/intel.js @@ -55,44 +55,44 @@ const AppNavigationMixin = { ], }, { - id: 'control', - label: this.$t('appNavigation.control'), + id: 'operations', + label: this.$t('appNavigation.operations'), icon: 'iconControl', children: [ { id: 'kvm', label: this.$t('appNavigation.kvm'), - route: '/control/kvm', + route: '/operations/kvm', + }, + { + id: 'firmware', + label: this.$t('appNavigation.firmware'), + route: '/operations/firmware', }, { id: 'manage-power-usage', label: this.$t('appNavigation.managePowerUsage'), - route: '/control/manage-power-usage', + route: '/operations/manage-power-usage', }, { id: 'reboot-bmc', label: this.$t('appNavigation.rebootBmc'), - route: '/control/reboot-bmc', + route: '/operations/reboot-bmc', }, { id: 'serial-over-lan', label: this.$t('appNavigation.serialOverLan'), - route: '/control/serial-over-lan', - }, - { - id: 'server-led', - label: this.$t('appNavigation.serverLed'), - route: '/control/server-led', + route: '/operations/serial-over-lan', }, { id: 'server-power-operations', label: this.$t('appNavigation.serverPowerOperations'), - route: '/control/server-power-operations', + route: '/operations/server-power-operations', }, { id: 'virtual-media', label: this.$t('appNavigation.virtualMedia'), - route: '/control/virtual-media', + route: '/operations/virtual-media', }, ], }, @@ -107,11 +107,6 @@ const AppNavigationMixin = { route: '/configuration/date-time-settings', }, { - id: 'firmware', - label: this.$t('appNavigation.firmware'), - route: '/configuration/firmware', - }, - { id: 'network-settings', label: this.$t('appNavigation.networkSettings'), route: '/configuration/network-settings', diff --git a/src/env/router/ibm.js b/src/env/router/ibm.js index 208cd976..b0129ea2 100644 --- a/src/env/router/ibm.js +++ b/src/env/router/ibm.js @@ -4,27 +4,26 @@ import ClientSessions from '@/views/AccessControl/ClientSessions'; import ConsoleLayout from '@/layouts/ConsoleLayout.vue'; import DateTimeSettings from '@/views/Configuration/DateTimeSettings'; import EventLogs from '@/views/Logs/EventLogs'; -import FactoryReset from '@/views/Control/FactoryReset'; -import Firmware from '@/views/Configuration/Firmware'; +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 Login from '@/views/Login'; import LoginLayout from '@/layouts/LoginLayout'; -import ManagePowerUsage from '@/views/Control/ManagePowerUsage'; +import ManagePowerUsage from '@/views/Operations/ManagePowerUsage'; import NetworkSettings from '@/views/Configuration/NetworkSettings'; import Overview from '@/views/Overview'; import PageNotFound from '@/views/PageNotFound'; import PostCodeLogs from '@/views/Logs/PostCodeLogs'; -import PowerRestorePolicy from '@/views/Control/PowerRestorePolicy'; +import PowerRestorePolicy from '@/views/Operations/PowerRestorePolicy'; import ProfileSettings from '@/views/ProfileSettings'; -import RebootBmc from '@/views/Control/RebootBmc'; +import RebootBmc from '@/views/Operations/RebootBmc'; import SecuritySettings from '@/views/Configuration/SecuritySettings'; import Sensors from '@/views/HardwareStatus/Sensors'; -import SerialOverLan from '@/views/Control/SerialOverLan'; -import SerialOverLanConsole from '@/views/Control/SerialOverLan/SerialOverLanConsole'; -import ServerLed from '@/views/Control/ServerLed'; -import ServerPowerOperations from '@/views/Control/ServerPowerOperations'; +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 i18n from '@/i18n'; @@ -176,7 +175,7 @@ const routes = [ }, }, { - path: '/configuration/firmware', + path: '/operations/firmware', name: 'firmware', component: Firmware, meta: { @@ -184,7 +183,7 @@ const routes = [ }, }, { - path: '/control/manage-power-usage', + path: '/operations/manage-power-usage', name: 'manage-power-usage', component: ManagePowerUsage, meta: { @@ -192,7 +191,7 @@ const routes = [ }, }, { - path: '/control/power-restore-policy', + path: '/operations/power-restore-policy', name: 'power-restore-policy', component: PowerRestorePolicy, meta: { @@ -216,7 +215,7 @@ const routes = [ }, }, { - path: '/control/factory-reset', + path: '/operations/factory-reset', name: 'factory-reset', component: FactoryReset, meta: { @@ -224,7 +223,7 @@ const routes = [ }, }, { - path: '/control/reboot-bmc', + path: '/operations/reboot-bmc', name: 'reboot-bmc', component: RebootBmc, meta: { @@ -232,15 +231,7 @@ const routes = [ }, }, { - path: '/control/server-led', - name: 'server-led', - component: ServerLed, - meta: { - title: i18n.t('appPageTitle.serverLed'), - }, - }, - { - path: '/control/serial-over-lan', + path: '/operations/serial-over-lan', name: 'serial-over-lan', component: SerialOverLan, meta: { @@ -248,7 +239,7 @@ const routes = [ }, }, { - path: '/control/server-power-operations', + path: '/operations/server-power-operations', name: 'server-power-operations', component: ServerPowerOperations, meta: { diff --git a/src/env/router/intel.js b/src/env/router/intel.js index 53ae5d44..04fc0eff 100644 --- a/src/env/router/intel.js +++ b/src/env/router/intel.js @@ -4,27 +4,26 @@ import ClientSessions from '@/views/AccessControl/ClientSessions'; import ConsoleLayout from '@/layouts/ConsoleLayout.vue'; import DateTimeSettings from '@/views/Configuration/DateTimeSettings'; import EventLogs from '@/views/Logs/EventLogs'; -import Firmware from '@/views/Configuration/Firmware'; +import Firmware from '@/views/Operations/Firmware'; import Inventory from '@/views/HardwareStatus/Inventory'; -import Kvm from '@/views/Control/Kvm'; -import KvmConsole from '@/views/Control/Kvm/KvmConsole'; +import Kvm from '@/views/Operations/Kvm'; +import KvmConsole from '@/views/Operations/Kvm/KvmConsole'; import LocalUserManagement from '@/views/AccessControl/LocalUserManagement'; import Login from '@/views/Login'; import LoginLayout from '@/layouts/LoginLayout'; -import ManagePowerUsage from '@/views/Control/ManagePowerUsage'; +import ManagePowerUsage from '@/views/Operations/ManagePowerUsage'; import NetworkSettings from '@/views/Configuration/NetworkSettings'; import Overview from '@/views/Overview'; import PageNotFound from '@/views/PageNotFound'; import ProfileSettings from '@/views/ProfileSettings'; -import RebootBmc from '@/views/Control/RebootBmc'; +import RebootBmc from '@/views/Operations/RebootBmc'; import SecuritySettings from '@/views/Configuration/SecuritySettings'; import Sensors from '@/views/HardwareStatus/Sensors'; -import SerialOverLan from '@/views/Control/SerialOverLan'; -import SerialOverLanConsole from '@/views/Control/SerialOverLan/SerialOverLanConsole'; -import ServerLed from '@/views/Control/ServerLed'; -import ServerPowerOperations from '@/views/Control/ServerPowerOperations'; +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 VirtualMedia from '@/views/Control/VirtualMedia'; +import VirtualMedia from '@/views/Operations/VirtualMedia'; import i18n from '@/i18n'; const routes = [ @@ -156,23 +155,23 @@ const routes = [ }, }, { - path: '/configuration/firmware', - name: 'firmware', - component: Firmware, + path: '/operations/kvm', + name: 'kvm', + component: Kvm, meta: { - title: i18n.t('appPageTitle.firmware'), + title: i18n.t('appPageTitle.kvm'), }, }, { - path: '/control/kvm', - name: 'kvm', - component: Kvm, + path: '/operations/firmware', + name: 'firmware', + component: Firmware, meta: { - title: i18n.t('appPageTitle.kvm'), + title: i18n.t('appPageTitle.firmware'), }, }, { - path: '/control/manage-power-usage', + path: '/operations/manage-power-usage', name: 'manage-power-usage', component: ManagePowerUsage, meta: { @@ -196,7 +195,7 @@ const routes = [ }, }, { - path: '/control/reboot-bmc', + path: '/operations/reboot-bmc', name: 'reboot-bmc', component: RebootBmc, meta: { @@ -204,15 +203,7 @@ const routes = [ }, }, { - path: '/control/server-led', - name: 'server-led', - component: ServerLed, - meta: { - title: i18n.t('appPageTitle.serverLed'), - }, - }, - { - path: '/control/serial-over-lan', + path: '/operations/serial-over-lan', name: 'serial-over-lan', component: SerialOverLan, meta: { @@ -220,7 +211,7 @@ const routes = [ }, }, { - path: '/control/server-power-operations', + path: '/operations/server-power-operations', name: 'server-power-operations', component: ServerPowerOperations, meta: { @@ -228,7 +219,7 @@ const routes = [ }, }, { - path: '/control/virtual-media', + path: '/operations/virtual-media', name: 'virtual-media', component: VirtualMedia, meta: { diff --git a/src/locales/en-US.json b/src/locales/en-US.json index ee1f6146..856edb8b 100644 --- a/src/locales/en-US.json +++ b/src/locales/en-US.json @@ -101,7 +101,7 @@ "accessControl": "Access control", "clientSessions": "@:appPageTitle.clientSessions", "configuration": "Configuration", - "control": "Control", + "operations": "Operations", "dateTimeSettings": "@:appPageTitle.dateTimeSettings", "dumps": "@:appPageTitle.dumps", "eventLogs": "@:appPageTitle.eventLogs", @@ -123,7 +123,6 @@ "securitySettings": "@:appPageTitle.securitySettings", "sensors": "@:appPageTitle.sensors", "serialOverLan": "SOL console", - "serverLed": "@:appPageTitle.serverLed", "serverPowerOperations": "@:appPageTitle.serverPowerOperations", "snmpSettings": "SNMP settings", "sslCertificates": "@:appPageTitle.sslCertificates", @@ -153,7 +152,6 @@ "securitySettings": "Security settings", "sensors": "Sensors", "serialOverLan": "Serial over LAN (SOL) console", - "serverLed": "Server LED", "serverPowerOperations": "Server power operations", "sslCertificates": "SSL certificates", "virtualMedia": "Virtual media" @@ -734,16 +732,6 @@ "status": "Status", "subTitle": "SOL console redirects the server's serial port output to this window." }, - "pageServerLed": { - "serverLedSubTitle": "Server indicator LED", - "serverLedTitle": "LED light control", - "toast": { - "errorServerLedOff": "Error turning LED off.", - "errorServerLedOn": "Error turning LED on.", - "successServerLedOff": "Server LED successfully turned off.", - "successServerLedOn": "Server LED successfully turned on." - } - }, "pageServerPowerOperations": { "currentStatus": "Current status", "serverBootSettings": "Boot settings", diff --git a/src/router/routes.js b/src/router/routes.js index 3cf10c54..f8461f39 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -3,32 +3,31 @@ import ChangePassword from '@/views/ChangePassword'; import ConsoleLayout from '@/layouts/ConsoleLayout.vue'; import DateTimeSettings from '@/views/Configuration/DateTimeSettings'; import EventLogs from '@/views/Logs/EventLogs'; -import FactoryReset from '@/views/Control/FactoryReset'; -import Firmware from '@/views/Configuration/Firmware'; +import FactoryReset from '@/views/Operations/FactoryReset'; +import Firmware from '@/views/Operations/Firmware'; import Inventory from '@/views/HardwareStatus/Inventory'; -import Kvm from '@/views/Control/Kvm'; -import KvmConsole from '@/views/Control/Kvm/KvmConsole'; +import Kvm from '@/views/Operations/Kvm'; +import KvmConsole from '@/views/Operations/Kvm/KvmConsole'; import ClientSessions from '../views/AccessControl/ClientSessions'; import Ldap from '@/views/AccessControl/Ldap'; import LocalUserManagement from '@/views/AccessControl/LocalUserManagement'; import Login from '@/views/Login'; import LoginLayout from '@/layouts/LoginLayout'; -import ManagePowerUsage from '@/views/Control/ManagePowerUsage'; +import ManagePowerUsage from '@/views/Operations/ManagePowerUsage'; import NetworkSettings from '@/views/Configuration/NetworkSettings'; import Overview from '@/views/Overview'; import PageNotFound from '@/views/PageNotFound'; import PostCodeLogs from '@/views/Logs/PostCodeLogs'; -import PowerRestorePolicy from '@/views/Control/PowerRestorePolicy'; +import PowerRestorePolicy from '@/views/Operations/PowerRestorePolicy'; import ProfileSettings from '@/views/ProfileSettings'; -import RebootBmc from '@/views/Control/RebootBmc'; +import RebootBmc from '@/views/Operations/RebootBmc'; import SecuritySettings from '@/views/Configuration/SecuritySettings'; import Sensors from '@/views/HardwareStatus/Sensors'; -import SerialOverLan from '@/views/Control/SerialOverLan'; -import SerialOverLanConsole from '@/views/Control/SerialOverLan/SerialOverLanConsole'; -import ServerLed from '@/views/Control/ServerLed'; -import ServerPowerOperations from '@/views/Control/ServerPowerOperations'; +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 VirtualMedia from '@/views/Control/VirtualMedia'; +import VirtualMedia from '@/views/Operations/VirtualMedia'; import i18n from '@/i18n'; const routes = [ @@ -176,14 +175,6 @@ const routes = [ }, }, { - path: '/configuration/firmware', - name: 'firmware', - component: Firmware, - meta: { - title: i18n.t('appPageTitle.firmware'), - }, - }, - { path: '/configuration/security-settings', name: 'security-settings', component: SecuritySettings, @@ -192,7 +183,7 @@ const routes = [ }, }, { - path: '/control/factory-reset', + path: '/operations/factory-reset', name: 'factory-reset', component: FactoryReset, meta: { @@ -200,7 +191,7 @@ const routes = [ }, }, { - path: '/control/kvm', + path: '/operations/kvm', name: 'kvm', component: Kvm, meta: { @@ -208,7 +199,15 @@ const routes = [ }, }, { - path: '/control/manage-power-usage', + path: '/operations/firmware', + name: 'firmware', + component: Firmware, + meta: { + title: i18n.t('appPageTitle.firmware'), + }, + }, + { + path: '/operations/manage-power-usage', name: 'manage-power-usage', component: ManagePowerUsage, meta: { @@ -216,7 +215,7 @@ const routes = [ }, }, { - path: '/control/power-restore-policy', + path: '/operations/power-restore-policy', name: 'power-restore-policy', component: PowerRestorePolicy, meta: { @@ -232,7 +231,7 @@ const routes = [ }, }, { - path: '/control/reboot-bmc', + path: '/operations/reboot-bmc', name: 'reboot-bmc', component: RebootBmc, meta: { @@ -240,15 +239,7 @@ const routes = [ }, }, { - path: '/control/server-led', - name: 'server-led', - component: ServerLed, - meta: { - title: i18n.t('appPageTitle.serverLed'), - }, - }, - { - path: '/control/serial-over-lan', + path: '/operations/serial-over-lan', name: 'serial-over-lan', component: SerialOverLan, meta: { @@ -256,7 +247,7 @@ const routes = [ }, }, { - path: '/control/server-power-operations', + path: '/operations/server-power-operations', name: 'server-power-operations', component: ServerPowerOperations, meta: { @@ -264,7 +255,7 @@ const routes = [ }, }, { - path: '/control/virtual-media', + path: '/operations/virtual-media', name: 'virtual-media', component: VirtualMedia, meta: { diff --git a/src/store/index.js b/src/store/index.js index 3ea4c5ab..fcfac59f 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -7,11 +7,11 @@ import ClientSessions from './modules/AccessControl/ClientSessionsStore'; import LdapStore from './modules/AccessControl/LdapStore'; import LocalUserManagementStore from './modules/AccessControl/LocalUserMangementStore'; import SslCertificatesStore from './modules/AccessControl/SslCertificatesStore'; -import FirmwareStore from './modules/Configuration/FirmwareStore'; -import BootSettingsStore from './modules/Control/BootSettingsStore'; -import ControlStore from './modules/Control/ControlStore'; -import PowerControlStore from './modules/Control/PowerControlStore'; -import PowerPolicyStore from './modules/Control/PowerPolicyStore'; +import FirmwareStore from './modules/Operations/FirmwareStore'; +import BootSettingsStore from './modules/Operations/BootSettingsStore'; +import ControlStore from './modules/Operations/ControlStore'; +import PowerControlStore from './modules/Operations/PowerControlStore'; +import PowerPolicyStore from './modules/Operations/PowerPolicyStore'; import NetworkSettingStore from './modules/Configuration/NetworkSettingsStore'; import EventLogStore from './modules/Logs/EventLogStore'; import SensorsStore from './modules/HardwareStatus/SensorsStore'; @@ -25,11 +25,11 @@ import BmcStore from './modules/HardwareStatus/BmcStore'; import ProcessorStore from './modules/HardwareStatus/ProcessorStore'; import PostCodeLogsStore from './modules/Logs/PostCodeLogsStore'; import SecuritySettingsStore from './modules/Configuration/SecuritySettingsStore'; -import FactoryResetStore from './modules/Control/FactoryResetStore'; +import FactoryResetStore from './modules/Operations/FactoryResetStore'; import WebSocketPlugin from './plugins/WebSocketPlugin'; import DateTimeStore from './modules/Configuration/DateTimeSettingsStore'; -import VirtualMediaStore from './modules/Control/VirtualMediaStore'; +import VirtualMediaStore from './modules/Operations/VirtualMediaStore'; Vue.use(Vuex); diff --git a/src/store/modules/HardwareStatus/ServerLedStore.js b/src/store/modules/HardwareStatus/ServerLedStore.js index a8903e2a..028a6f70 100644 --- a/src/store/modules/HardwareStatus/ServerLedStore.js +++ b/src/store/modules/HardwareStatus/ServerLedStore.js @@ -32,20 +32,17 @@ const ServerLedStore = { .patch('/redfish/v1/Systems/system', { LocationIndicatorActive: payload, }) - .then(() => { - if (payload) { - return i18n.t('pageServerLed.toast.successServerLedOn'); - } else { - return i18n.t('pageServerLed.toast.successServerLedOff'); - } - }) .catch((error) => { console.log(error); commit('setIndicatorLedActiveState', !payload); if (payload) { - throw new Error(i18n.t('pageServerLed.toast.errorServerLedOn')); + throw new Error( + i18n.t('pageInventory.toast.errorEnableIdentifyLed') + ); } else { - throw new Error(i18n.t('pageServerLed.toast.errorServerLedOff')); + throw new Error( + i18n.t('pageInventory.toast.errorDisableIdentifyLed') + ); } }); }, diff --git a/src/store/modules/Control/BootSettingsStore.js b/src/store/modules/Operations/BootSettingsStore.js index 7a36dd84..7a36dd84 100644 --- a/src/store/modules/Control/BootSettingsStore.js +++ b/src/store/modules/Operations/BootSettingsStore.js diff --git a/src/store/modules/Control/ControlStore.js b/src/store/modules/Operations/ControlStore.js index 9b8bf73d..9b8bf73d 100644 --- a/src/store/modules/Control/ControlStore.js +++ b/src/store/modules/Operations/ControlStore.js diff --git a/src/store/modules/Control/FactoryResetStore.js b/src/store/modules/Operations/FactoryResetStore.js index 8118cf7f..8118cf7f 100644 --- a/src/store/modules/Control/FactoryResetStore.js +++ b/src/store/modules/Operations/FactoryResetStore.js diff --git a/src/store/modules/Configuration/FirmwareStore.js b/src/store/modules/Operations/FirmwareStore.js index c6639ff7..c6639ff7 100644 --- a/src/store/modules/Configuration/FirmwareStore.js +++ b/src/store/modules/Operations/FirmwareStore.js diff --git a/src/store/modules/Control/PowerControlStore.js b/src/store/modules/Operations/PowerControlStore.js index 9dbddf05..9dbddf05 100644 --- a/src/store/modules/Control/PowerControlStore.js +++ b/src/store/modules/Operations/PowerControlStore.js diff --git a/src/store/modules/Control/PowerPolicyStore.js b/src/store/modules/Operations/PowerPolicyStore.js index 4e76cdfe..4e76cdfe 100644 --- a/src/store/modules/Control/PowerPolicyStore.js +++ b/src/store/modules/Operations/PowerPolicyStore.js diff --git a/src/store/modules/Control/VirtualMediaStore.js b/src/store/modules/Operations/VirtualMediaStore.js index 7c183b0e..7c183b0e 100644 --- a/src/store/modules/Control/VirtualMediaStore.js +++ b/src/store/modules/Operations/VirtualMediaStore.js diff --git a/src/views/Control/ServerLed/ServerLed.vue b/src/views/Control/ServerLed/ServerLed.vue deleted file mode 100644 index 72726bab..00000000 --- a/src/views/Control/ServerLed/ServerLed.vue +++ /dev/null @@ -1,71 +0,0 @@ -<template> - <b-container fluid="xl"> - <page-title /> - <b-row> - <b-col md="12"> - <page-section :section-title="$t('pageServerLed.serverLedTitle')"> - <b-form-group :label="$t('pageServerLed.serverLedSubTitle')"> - <b-form-checkbox - v-model="indicatorLedActiveState" - data-test-id="serverLed-checkbox-switchIndicatorLed" - name="check-button" - switch - @change="changeLedValue" - > - <span v-if="indicatorLedActiveState"> - {{ $t('global.status.on') }} - </span> - <span v-else> - {{ $t('global.status.off') }} - </span> - </b-form-checkbox> - </b-form-group> - </page-section> - </b-col> - </b-row> - </b-container> -</template> - -<script> -import PageTitle from '@/components/Global/PageTitle'; -import PageSection from '@/components/Global/PageSection'; -import BVToastMixin from '@/components/Mixins/BVToastMixin'; -import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin'; - -export default { - name: 'ServerLed', - components: { PageTitle, PageSection }, - mixins: [LoadingBarMixin, BVToastMixin], - beforeRouteLeave(to, from, next) { - this.hideLoader(); - next(); - }, - computed: { - indicatorLedActiveState: { - get() { - return this.$store.getters['serverLed/getIndicatorLedActiveState']; - }, - set(newValue) { - return newValue; - }, - }, - }, - created() { - this.startLoader(); - this.$store - .dispatch('serverLed/getIndicatorLedActiveState') - .finally(() => this.endLoader()); - }, - methods: { - changeLedValue(indicatorLedActiveState) { - this.$store - .dispatch( - 'serverLed/saveIndicatorLedActiveState', - indicatorLedActiveState - ) - .then((message) => this.successToast(message)) - .catch(({ message }) => this.errorToast(message)); - }, - }, -}; -</script> diff --git a/src/views/Control/ServerLed/index.js b/src/views/Control/ServerLed/index.js deleted file mode 100644 index 1926dae8..00000000 --- a/src/views/Control/ServerLed/index.js +++ /dev/null @@ -1,2 +0,0 @@ -import ServerLed from './ServerLed.vue'; -export default ServerLed; diff --git a/src/views/Control/FactoryReset/FactoryReset.vue b/src/views/Operations/FactoryReset/FactoryReset.vue index 897348fc..897348fc 100644 --- a/src/views/Control/FactoryReset/FactoryReset.vue +++ b/src/views/Operations/FactoryReset/FactoryReset.vue diff --git a/src/views/Control/FactoryReset/FactoryResetModal.vue b/src/views/Operations/FactoryReset/FactoryResetModal.vue index 170bf284..170bf284 100644 --- a/src/views/Control/FactoryReset/FactoryResetModal.vue +++ b/src/views/Operations/FactoryReset/FactoryResetModal.vue diff --git a/src/views/Control/FactoryReset/index.js b/src/views/Operations/FactoryReset/index.js index eae747e0..eae747e0 100644 --- a/src/views/Control/FactoryReset/index.js +++ b/src/views/Operations/FactoryReset/index.js diff --git a/src/views/Configuration/Firmware/Firmware.vue b/src/views/Operations/Firmware/Firmware.vue index a2acb9b0..a2acb9b0 100644 --- a/src/views/Configuration/Firmware/Firmware.vue +++ b/src/views/Operations/Firmware/Firmware.vue diff --git a/src/views/Configuration/Firmware/FirmwareAlertServerPower.vue b/src/views/Operations/Firmware/FirmwareAlertServerPower.vue index 2a3bcba1..2a3bcba1 100644 --- a/src/views/Configuration/Firmware/FirmwareAlertServerPower.vue +++ b/src/views/Operations/Firmware/FirmwareAlertServerPower.vue diff --git a/src/views/Configuration/Firmware/FirmwareCardsBmc.vue b/src/views/Operations/Firmware/FirmwareCardsBmc.vue index d79a8769..d79a8769 100644 --- a/src/views/Configuration/Firmware/FirmwareCardsBmc.vue +++ b/src/views/Operations/Firmware/FirmwareCardsBmc.vue diff --git a/src/views/Configuration/Firmware/FirmwareCardsHost.vue b/src/views/Operations/Firmware/FirmwareCardsHost.vue index b4a8e90d..b4a8e90d 100644 --- a/src/views/Configuration/Firmware/FirmwareCardsHost.vue +++ b/src/views/Operations/Firmware/FirmwareCardsHost.vue diff --git a/src/views/Configuration/Firmware/FirmwareFormUpdate.vue b/src/views/Operations/Firmware/FirmwareFormUpdate.vue index 04b28a5c..04b28a5c 100644 --- a/src/views/Configuration/Firmware/FirmwareFormUpdate.vue +++ b/src/views/Operations/Firmware/FirmwareFormUpdate.vue diff --git a/src/views/Configuration/Firmware/FirmwareModalSwitchToRunning.vue b/src/views/Operations/Firmware/FirmwareModalSwitchToRunning.vue index dc4a4973..dc4a4973 100644 --- a/src/views/Configuration/Firmware/FirmwareModalSwitchToRunning.vue +++ b/src/views/Operations/Firmware/FirmwareModalSwitchToRunning.vue diff --git a/src/views/Configuration/Firmware/FirmwareModalUpdateFirmware.vue b/src/views/Operations/Firmware/FirmwareModalUpdateFirmware.vue index 18355217..18355217 100644 --- a/src/views/Configuration/Firmware/FirmwareModalUpdateFirmware.vue +++ b/src/views/Operations/Firmware/FirmwareModalUpdateFirmware.vue diff --git a/src/views/Configuration/Firmware/index.js b/src/views/Operations/Firmware/index.js index ad15cc03..ad15cc03 100644 --- a/src/views/Configuration/Firmware/index.js +++ b/src/views/Operations/Firmware/index.js diff --git a/src/views/Control/Kvm/Kvm.vue b/src/views/Operations/Kvm/Kvm.vue index 1a41baaf..1a41baaf 100644 --- a/src/views/Control/Kvm/Kvm.vue +++ b/src/views/Operations/Kvm/Kvm.vue diff --git a/src/views/Control/Kvm/KvmConsole.vue b/src/views/Operations/Kvm/KvmConsole.vue index c028a9fc..c028a9fc 100644 --- a/src/views/Control/Kvm/KvmConsole.vue +++ b/src/views/Operations/Kvm/KvmConsole.vue diff --git a/src/views/Control/Kvm/index.js b/src/views/Operations/Kvm/index.js index ac4f9667..ac4f9667 100644 --- a/src/views/Control/Kvm/index.js +++ b/src/views/Operations/Kvm/index.js diff --git a/src/views/Control/ManagePowerUsage/ManagePowerUsage.vue b/src/views/Operations/ManagePowerUsage/ManagePowerUsage.vue index 38dbf0b8..38dbf0b8 100644 --- a/src/views/Control/ManagePowerUsage/ManagePowerUsage.vue +++ b/src/views/Operations/ManagePowerUsage/ManagePowerUsage.vue diff --git a/src/views/Control/ManagePowerUsage/index.js b/src/views/Operations/ManagePowerUsage/index.js index f3e95ac1..f3e95ac1 100644 --- a/src/views/Control/ManagePowerUsage/index.js +++ b/src/views/Operations/ManagePowerUsage/index.js diff --git a/src/views/Control/PowerRestorePolicy/PowerRestorePolicy.vue b/src/views/Operations/PowerRestorePolicy/PowerRestorePolicy.vue index 8589aed3..8589aed3 100644 --- a/src/views/Control/PowerRestorePolicy/PowerRestorePolicy.vue +++ b/src/views/Operations/PowerRestorePolicy/PowerRestorePolicy.vue diff --git a/src/views/Control/PowerRestorePolicy/index.js b/src/views/Operations/PowerRestorePolicy/index.js index fab0d477..fab0d477 100644 --- a/src/views/Control/PowerRestorePolicy/index.js +++ b/src/views/Operations/PowerRestorePolicy/index.js diff --git a/src/views/Control/RebootBmc/RebootBmc.vue b/src/views/Operations/RebootBmc/RebootBmc.vue index 900619cd..900619cd 100644 --- a/src/views/Control/RebootBmc/RebootBmc.vue +++ b/src/views/Operations/RebootBmc/RebootBmc.vue diff --git a/src/views/Control/RebootBmc/index.js b/src/views/Operations/RebootBmc/index.js index ac31417e..ac31417e 100644 --- a/src/views/Control/RebootBmc/index.js +++ b/src/views/Operations/RebootBmc/index.js diff --git a/src/views/Control/SerialOverLan/SerialOverLan.vue b/src/views/Operations/SerialOverLan/SerialOverLan.vue index 48a68345..48a68345 100644 --- a/src/views/Control/SerialOverLan/SerialOverLan.vue +++ b/src/views/Operations/SerialOverLan/SerialOverLan.vue diff --git a/src/views/Control/SerialOverLan/SerialOverLanConsole.vue b/src/views/Operations/SerialOverLan/SerialOverLanConsole.vue index 0bda43db..0bda43db 100644 --- a/src/views/Control/SerialOverLan/SerialOverLanConsole.vue +++ b/src/views/Operations/SerialOverLan/SerialOverLanConsole.vue diff --git a/src/views/Control/SerialOverLan/index.js b/src/views/Operations/SerialOverLan/index.js index 7c8bc7c0..7c8bc7c0 100644 --- a/src/views/Control/SerialOverLan/index.js +++ b/src/views/Operations/SerialOverLan/index.js diff --git a/src/views/Control/ServerPowerOperations/BootSettings.vue b/src/views/Operations/ServerPowerOperations/BootSettings.vue index efd8d347..efd8d347 100644 --- a/src/views/Control/ServerPowerOperations/BootSettings.vue +++ b/src/views/Operations/ServerPowerOperations/BootSettings.vue diff --git a/src/views/Control/ServerPowerOperations/ServerPowerOperations.vue b/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue index 9e030837..9e030837 100644 --- a/src/views/Control/ServerPowerOperations/ServerPowerOperations.vue +++ b/src/views/Operations/ServerPowerOperations/ServerPowerOperations.vue diff --git a/src/views/Control/ServerPowerOperations/index.js b/src/views/Operations/ServerPowerOperations/index.js index 10430047..10430047 100644 --- a/src/views/Control/ServerPowerOperations/index.js +++ b/src/views/Operations/ServerPowerOperations/index.js diff --git a/src/views/Control/VirtualMedia/ModalConfigureConnection.vue b/src/views/Operations/VirtualMedia/ModalConfigureConnection.vue index b0bcfb2b..b0bcfb2b 100644 --- a/src/views/Control/VirtualMedia/ModalConfigureConnection.vue +++ b/src/views/Operations/VirtualMedia/ModalConfigureConnection.vue diff --git a/src/views/Control/VirtualMedia/VirtualMedia.vue b/src/views/Operations/VirtualMedia/VirtualMedia.vue index 8a3d5add..8a3d5add 100644 --- a/src/views/Control/VirtualMedia/VirtualMedia.vue +++ b/src/views/Operations/VirtualMedia/VirtualMedia.vue diff --git a/src/views/Control/VirtualMedia/index.js b/src/views/Operations/VirtualMedia/index.js index 4573e865..4573e865 100644 --- a/src/views/Control/VirtualMedia/index.js +++ b/src/views/Operations/VirtualMedia/index.js diff --git a/src/views/Overview/OverviewQuickLinks.vue b/src/views/Overview/OverviewQuickLinks.vue index 7e2602e1..9392c56c 100644 --- a/src/views/Overview/OverviewQuickLinks.vue +++ b/src/views/Overview/OverviewQuickLinks.vue @@ -41,7 +41,7 @@ </div> <div> <b-button - to="/control/serial-over-lan" + to="/operations/serial-over-lan" variant="secondary" data-test-id="overviewQuickLinks-button-solConsole" class="d-flex justify-content-between align-items-center" @@ -91,7 +91,6 @@ export default { 'serverLed/saveIndicatorLedActiveState', indicatorLedActiveState ) - .then((message) => this.successToast(message)) .catch(({ message }) => this.errorToast(message)); }, }, |