summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/components/AppNavigation/AppNavigationMixin.js22
-rw-r--r--src/env/components/AppNavigation/ibm.js22
-rw-r--r--src/env/components/AppNavigation/intel.js12
-rw-r--r--src/env/router/ibm.js24
-rw-r--r--src/env/router/intel.js14
-rw-r--r--src/locales/en-US.json8
-rw-r--r--src/router/routes.js24
-rw-r--r--src/store/index.js20
-rw-r--r--src/store/modules/HardwareStatus/BmcStore.js (renamed from src/store/modules/Health/BmcStore.js)4
-rw-r--r--src/store/modules/HardwareStatus/ChassisStore.js (renamed from src/store/modules/Health/ChassisStore.js)4
-rw-r--r--src/store/modules/HardwareStatus/FanStore.js (renamed from src/store/modules/Health/FanStore.js)0
-rw-r--r--src/store/modules/HardwareStatus/MemoryStore.js (renamed from src/store/modules/Health/MemoryStore.js)0
-rw-r--r--src/store/modules/HardwareStatus/PowerSupplyStore.js (renamed from src/store/modules/Health/PowerSupplyStore.js)0
-rw-r--r--src/store/modules/HardwareStatus/ProcessorStore.js (renamed from src/store/modules/Health/ProcessorStore.js)4
-rw-r--r--src/store/modules/HardwareStatus/SensorsStore.js (renamed from src/store/modules/Health/SensorsStore.js)0
-rw-r--r--src/store/modules/HardwareStatus/ServerLedStore.js (renamed from src/store/modules/Control/ServerLedStore.js)0
-rw-r--r--src/store/modules/HardwareStatus/SystemStore.js (renamed from src/store/modules/Health/SystemStore.js)0
-rw-r--r--src/store/modules/Logs/PostCodeLogsStore.js (renamed from src/store/modules/Health/PostCodeLogsStore.js)0
-rw-r--r--src/views/HardwareStatus/Inventory/Inventory.vue (renamed from src/views/Health/HardwareStatus/HardwareStatus.vue)36
-rw-r--r--src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue (renamed from src/views/Health/HardwareStatus/HardwareStatusTableBmcManager.vue)56
-rw-r--r--src/views/HardwareStatus/Inventory/InventoryTableChassis.vue (renamed from src/views/Health/HardwareStatus/HardwareStatusTableChassis.vue)34
-rw-r--r--src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue (renamed from src/views/Health/HardwareStatus/HardwareStatusTableDimmSlot.vue)12
-rw-r--r--src/views/HardwareStatus/Inventory/InventoryTableFans.vue (renamed from src/views/Health/HardwareStatus/HardwareStatusTableFans.vue)28
-rw-r--r--src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue (renamed from src/views/Health/HardwareStatus/HardwareStatusTablePowerSupplies.vue)34
-rw-r--r--src/views/HardwareStatus/Inventory/InventoryTableProcessors.vue (renamed from src/views/Health/HardwareStatus/HardwareStatusTableProcessors.vue)46
-rw-r--r--src/views/HardwareStatus/Inventory/InventoryTableSystem.vue (renamed from src/views/Health/HardwareStatus/HardwareStatusTableStystem.vue)50
-rw-r--r--src/views/HardwareStatus/Inventory/index.js2
-rw-r--r--src/views/HardwareStatus/Sensors/Sensors.vue (renamed from src/views/Health/Sensors/Sensors.vue)0
-rw-r--r--src/views/HardwareStatus/Sensors/index.js (renamed from src/views/Health/Sensors/index.js)0
-rw-r--r--src/views/Health/HardwareStatus/index.js2
-rw-r--r--src/views/Logs/PostCodeLogs/PostCodeLogs.vue (renamed from src/views/Health/PostCodeLogs/PostCodeLogs.vue)0
-rw-r--r--src/views/Logs/PostCodeLogs/index.js (renamed from src/views/Health/PostCodeLogs/index.js)0
-rw-r--r--tests/unit/__snapshots__/AppNavigation.spec.js.snap68
33 files changed, 261 insertions, 265 deletions
diff --git a/src/components/AppNavigation/AppNavigationMixin.js b/src/components/AppNavigation/AppNavigationMixin.js
index 42552da5..10ca5f83 100644
--- a/src/components/AppNavigation/AppNavigationMixin.js
+++ b/src/components/AppNavigation/AppNavigationMixin.js
@@ -35,27 +35,27 @@ const AppNavigationMixin = {
label: this.$t('appNavigation.eventLogs'),
route: '/logs/event-logs',
},
+ {
+ id: 'post-code-logs',
+ label: this.$t('appNavigation.postCodeLogs'),
+ route: '/logs/post-code-logs',
+ },
],
},
{
- id: 'health',
- label: this.$t('appNavigation.health'),
+ id: 'hardware-status',
+ label: this.$t('appNavigation.hardwareStatus'),
icon: 'iconHealth',
children: [
{
- id: 'hardware-status',
- label: this.$t('appNavigation.hardwareStatus'),
- route: '/health/hardware-status',
- },
- {
- id: 'post-code-logs',
- label: this.$t('appNavigation.postCodeLogs'),
- route: '/health/post-code-logs',
+ id: 'inventory',
+ label: this.$t('appNavigation.inventory'),
+ route: '/hardware-status/inventory',
},
{
id: 'sensors',
label: this.$t('appNavigation.sensors'),
- route: '/health/sensors',
+ route: '/hardware-status/sensors',
},
],
},
diff --git a/src/env/components/AppNavigation/ibm.js b/src/env/components/AppNavigation/ibm.js
index 8792ccc8..0128d749 100644
--- a/src/env/components/AppNavigation/ibm.js
+++ b/src/env/components/AppNavigation/ibm.js
@@ -40,27 +40,27 @@ const AppNavigationMixin = {
label: this.$t('appNavigation.eventLogs'),
route: '/logs/event-logs',
},
+ {
+ id: 'post-code-logs',
+ label: this.$t('appNavigation.postCodeLogs'),
+ route: '/logs/post-code-logs',
+ },
],
},
{
- id: 'health',
- label: this.$t('appNavigation.health'),
+ id: 'hardware-status',
+ label: this.$t('appNavigation.hardwareStatus'),
icon: 'iconHealth',
children: [
{
- id: 'hardware-status',
- label: this.$t('appNavigation.hardwareStatus'),
- route: '/health/hardware-status',
- },
- {
- id: 'post-code-logs',
- label: this.$t('appNavigation.postCodeLogs'),
- route: '/health/post-code-logs',
+ id: 'inventory',
+ label: this.$t('appNavigation.inventory'),
+ route: '/hardware-status/inventory',
},
{
id: 'sensors',
label: this.$t('appNavigation.sensors'),
- route: '/health/sensors',
+ route: '/hardware-status/sensors',
},
],
},
diff --git a/src/env/components/AppNavigation/intel.js b/src/env/components/AppNavigation/intel.js
index 9c3591f5..68557c1b 100644
--- a/src/env/components/AppNavigation/intel.js
+++ b/src/env/components/AppNavigation/intel.js
@@ -38,19 +38,19 @@ const AppNavigationMixin = {
],
},
{
- id: 'health',
- label: this.$t('appNavigation.health'),
+ id: 'hardware-status',
+ label: this.$t('appNavigation.hardwareStatus'),
icon: 'iconHealth',
children: [
{
- id: 'hardware-status',
- label: this.$t('appNavigation.hardwareStatus'),
- route: '/health/hardware-status',
+ id: 'inventory',
+ label: this.$t('appNavigation.inventory'),
+ route: '/hardware-status/inventory',
},
{
id: 'sensors',
label: this.$t('appNavigation.sensors'),
- route: '/health/sensors',
+ route: '/hardware-status/sensors',
},
],
},
diff --git a/src/env/router/ibm.js b/src/env/router/ibm.js
index 8b94cf78..208cd976 100644
--- a/src/env/router/ibm.js
+++ b/src/env/router/ibm.js
@@ -6,7 +6,7 @@ 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 HardwareStatus from '@/views/Health/HardwareStatus';
+import Inventory from '@/views/HardwareStatus/Inventory';
import Ldap from '@/views/AccessControl/Ldap';
import LocalUserManagement from '@/views/AccessControl/LocalUserManagement';
import Login from '@/views/Login';
@@ -15,12 +15,12 @@ import ManagePowerUsage from '@/views/Control/ManagePowerUsage';
import NetworkSettings from '@/views/Configuration/NetworkSettings';
import Overview from '@/views/Overview';
import PageNotFound from '@/views/PageNotFound';
-import PostCodeLogs from '@/views/Health/PostCodeLogs';
+import PostCodeLogs from '@/views/Logs/PostCodeLogs';
import PowerRestorePolicy from '@/views/Control/PowerRestorePolicy';
import ProfileSettings from '@/views/ProfileSettings';
import RebootBmc from '@/views/Control/RebootBmc';
import SecuritySettings from '@/views/Configuration/SecuritySettings';
-import Sensors from '@/views/Health/Sensors';
+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';
@@ -112,23 +112,23 @@ const routes = [
},
},
{
- path: '/health/hardware-status',
- name: 'hardware-status',
- component: HardwareStatus,
+ path: '/logs/post-code-logs',
+ name: 'post-code-logs',
+ component: PostCodeLogs,
meta: {
- title: i18n.t('appPageTitle.hardwareStatus'),
+ title: i18n.t('appPageTitle.postCodeLogs'),
},
},
{
- path: '/health/post-code-logs',
- name: 'post-code-logs',
- component: PostCodeLogs,
+ path: '/hardware-status/inventory',
+ name: 'inventory',
+ component: Inventory,
meta: {
- title: i18n.t('appPageTitle.postCodeLogs'),
+ title: i18n.t('appPageTitle.inventory'),
},
},
{
- path: '/health/sensors',
+ path: '/hardware-status/sensors',
name: 'sensors',
component: Sensors,
meta: {
diff --git a/src/env/router/intel.js b/src/env/router/intel.js
index 3e3349d0..53ae5d44 100644
--- a/src/env/router/intel.js
+++ b/src/env/router/intel.js
@@ -5,7 +5,7 @@ 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 HardwareStatus from '@/views/Health/HardwareStatus';
+import Inventory from '@/views/HardwareStatus/Inventory';
import Kvm from '@/views/Control/Kvm';
import KvmConsole from '@/views/Control/Kvm/KvmConsole';
import LocalUserManagement from '@/views/AccessControl/LocalUserManagement';
@@ -18,7 +18,7 @@ import PageNotFound from '@/views/PageNotFound';
import ProfileSettings from '@/views/ProfileSettings';
import RebootBmc from '@/views/Control/RebootBmc';
import SecuritySettings from '@/views/Configuration/SecuritySettings';
-import Sensors from '@/views/Health/Sensors';
+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';
@@ -108,15 +108,15 @@ const routes = [
},
},
{
- path: '/health/hardware-status',
- name: 'hardware-status',
- component: HardwareStatus,
+ path: '/hardware-status/inventory',
+ name: 'inventory',
+ component: Inventory,
meta: {
- title: i18n.t('appPageTitle.hardwareStatus'),
+ title: i18n.t('appPageTitle.Inventory'),
},
},
{
- path: '/health/sensors',
+ path: '/hardware-status/sensors',
name: 'sensors',
component: Sensors,
meta: {
diff --git a/src/locales/en-US.json b/src/locales/en-US.json
index a5fd8202..ee1f6146 100644
--- a/src/locales/en-US.json
+++ b/src/locales/en-US.json
@@ -107,8 +107,8 @@
"eventLogs": "@:appPageTitle.eventLogs",
"factoryReset": "@:appPageTitle.factoryReset",
"firmware": "@:appPageTitle.firmware",
- "hardwareStatus": "@:appPageTitle.hardwareStatus",
- "health": "Health",
+ "hardwareStatus": "Hardware status",
+ "inventory": "@:appPageTitle.inventory",
"kvm": "@:appPageTitle.kvm",
"ldap": "@:appPageTitle.ldap",
"logs": "Logs",
@@ -137,7 +137,7 @@
"eventLogs": "Event logs",
"factoryReset": "Factory reset",
"firmware": "Firmware",
- "hardwareStatus": "Hardware status",
+ "inventory": "Inventory and LEDs",
"kvm": "KVM",
"ldap": "LDAP",
"localUserManagement": "Local user management",
@@ -367,7 +367,7 @@
"verifyUpdateMessage": "Refresh the application to verify firmware updated successfully"
}
},
- "pageHardwareStatus": {
+ "pageInventory": {
"dimmSlot": "DIMM slot",
"fans": "Fans",
"powerSupplies": "Power supplies",
diff --git a/src/router/routes.js b/src/router/routes.js
index 1c5d57b1..3cf10c54 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -5,7 +5,7 @@ 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 HardwareStatus from '@/views/Health/HardwareStatus';
+import Inventory from '@/views/HardwareStatus/Inventory';
import Kvm from '@/views/Control/Kvm';
import KvmConsole from '@/views/Control/Kvm/KvmConsole';
import ClientSessions from '../views/AccessControl/ClientSessions';
@@ -17,12 +17,12 @@ import ManagePowerUsage from '@/views/Control/ManagePowerUsage';
import NetworkSettings from '@/views/Configuration/NetworkSettings';
import Overview from '@/views/Overview';
import PageNotFound from '@/views/PageNotFound';
-import PostCodeLogs from '@/views/Health/PostCodeLogs';
+import PostCodeLogs from '@/views/Logs/PostCodeLogs';
import PowerRestorePolicy from '@/views/Control/PowerRestorePolicy';
import ProfileSettings from '@/views/ProfileSettings';
import RebootBmc from '@/views/Control/RebootBmc';
import SecuritySettings from '@/views/Configuration/SecuritySettings';
-import Sensors from '@/views/Health/Sensors';
+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';
@@ -112,23 +112,23 @@ const routes = [
},
},
{
- path: '/health/hardware-status',
- name: 'hardware-status',
- component: HardwareStatus,
+ path: '/logs/post-code-logs',
+ name: 'post-code-logs',
+ component: PostCodeLogs,
meta: {
- title: i18n.t('appPageTitle.hardwareStatus'),
+ title: i18n.t('appPageTitle.postCodeLogs'),
},
},
{
- path: '/health/post-code-logs',
- name: 'post-code-logs',
- component: PostCodeLogs,
+ path: '/hardware-status/inventory',
+ name: 'inventory',
+ component: Inventory,
meta: {
- title: i18n.t('appPageTitle.postCodeLogs'),
+ title: i18n.t('appPageTitle.inventory'),
},
},
{
- path: '/health/sensors',
+ path: '/hardware-status/sensors',
name: 'sensors',
component: Sensors,
meta: {
diff --git a/src/store/index.js b/src/store/index.js
index 5aba4663..3ea4c5ab 100644
--- a/src/store/index.js
+++ b/src/store/index.js
@@ -14,16 +14,16 @@ import PowerControlStore from './modules/Control/PowerControlStore';
import PowerPolicyStore from './modules/Control/PowerPolicyStore';
import NetworkSettingStore from './modules/Configuration/NetworkSettingsStore';
import EventLogStore from './modules/Logs/EventLogStore';
-import SensorsStore from './modules/Health/SensorsStore';
-import ServerLedStore from './modules/Control/ServerLedStore';
-import SystemStore from './modules/Health/SystemStore';
-import PowerSupplyStore from './modules/Health/PowerSupplyStore';
-import MemoryStore from './modules/Health/MemoryStore';
-import FanStore from './modules/Health/FanStore';
-import ChassisStore from './modules/Health/ChassisStore';
-import BmcStore from './modules/Health/BmcStore';
-import ProcessorStore from './modules/Health/ProcessorStore';
-import PostCodeLogsStore from './modules/Health/PostCodeLogsStore';
+import SensorsStore from './modules/HardwareStatus/SensorsStore';
+import ServerLedStore from './modules/HardwareStatus/ServerLedStore';
+import SystemStore from './modules/HardwareStatus/SystemStore';
+import PowerSupplyStore from './modules/HardwareStatus/PowerSupplyStore';
+import MemoryStore from './modules/HardwareStatus/MemoryStore';
+import FanStore from './modules/HardwareStatus/FanStore';
+import ChassisStore from './modules/HardwareStatus/ChassisStore';
+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';
diff --git a/src/store/modules/Health/BmcStore.js b/src/store/modules/HardwareStatus/BmcStore.js
index bbe157eb..f58dc635 100644
--- a/src/store/modules/Health/BmcStore.js
+++ b/src/store/modules/HardwareStatus/BmcStore.js
@@ -64,11 +64,11 @@ const BmcStore = {
console.log('error', error);
if (led.identifyLed) {
throw new Error(
- i18n.t('pageHardwareStatus.toast.errorEnableIdentifyLed')
+ i18n.t('pageInventory.toast.errorEnableIdentifyLed')
);
} else {
throw new Error(
- i18n.t('pageHardwareStatus.toast.errorDisableIdentifyLed')
+ i18n.t('pageInventory.toast.errorDisableIdentifyLed')
);
}
});
diff --git a/src/store/modules/Health/ChassisStore.js b/src/store/modules/HardwareStatus/ChassisStore.js
index 2faddfbf..b5edef56 100644
--- a/src/store/modules/Health/ChassisStore.js
+++ b/src/store/modules/HardwareStatus/ChassisStore.js
@@ -74,11 +74,11 @@ const ChassisStore = {
console.log('error', error);
if (led.identifyLed) {
throw new Error(
- i18n.t('pageHardwareStatus.toast.errorEnableIdentifyLed')
+ i18n.t('pageInventory.toast.errorEnableIdentifyLed')
);
} else {
throw new Error(
- i18n.t('pageHardwareStatus.toast.errorDisableIdentifyLed')
+ i18n.t('pageInventory.toast.errorDisableIdentifyLed')
);
}
});
diff --git a/src/store/modules/Health/FanStore.js b/src/store/modules/HardwareStatus/FanStore.js
index fca1f326..fca1f326 100644
--- a/src/store/modules/Health/FanStore.js
+++ b/src/store/modules/HardwareStatus/FanStore.js
diff --git a/src/store/modules/Health/MemoryStore.js b/src/store/modules/HardwareStatus/MemoryStore.js
index cd2478de..cd2478de 100644
--- a/src/store/modules/Health/MemoryStore.js
+++ b/src/store/modules/HardwareStatus/MemoryStore.js
diff --git a/src/store/modules/Health/PowerSupplyStore.js b/src/store/modules/HardwareStatus/PowerSupplyStore.js
index f7be2809..f7be2809 100644
--- a/src/store/modules/Health/PowerSupplyStore.js
+++ b/src/store/modules/HardwareStatus/PowerSupplyStore.js
diff --git a/src/store/modules/Health/ProcessorStore.js b/src/store/modules/HardwareStatus/ProcessorStore.js
index 15314663..c7cbbeea 100644
--- a/src/store/modules/Health/ProcessorStore.js
+++ b/src/store/modules/HardwareStatus/ProcessorStore.js
@@ -89,11 +89,11 @@ const ProcessorStore = {
console.log('error', error);
if (led.identifyLed) {
throw new Error(
- i18n.t('pageHardwareStatus.toast.errorEnableIdentifyLed')
+ i18n.t('pageInventory.toast.errorEnableIdentifyLed')
);
} else {
throw new Error(
- i18n.t('pageHardwareStatus.toast.errorDisableIdentifyLed')
+ i18n.t('pageInventory.toast.errorDisableIdentifyLed')
);
}
});
diff --git a/src/store/modules/Health/SensorsStore.js b/src/store/modules/HardwareStatus/SensorsStore.js
index 0af2a95b..0af2a95b 100644
--- a/src/store/modules/Health/SensorsStore.js
+++ b/src/store/modules/HardwareStatus/SensorsStore.js
diff --git a/src/store/modules/Control/ServerLedStore.js b/src/store/modules/HardwareStatus/ServerLedStore.js
index a8903e2a..a8903e2a 100644
--- a/src/store/modules/Control/ServerLedStore.js
+++ b/src/store/modules/HardwareStatus/ServerLedStore.js
diff --git a/src/store/modules/Health/SystemStore.js b/src/store/modules/HardwareStatus/SystemStore.js
index 55f37542..55f37542 100644
--- a/src/store/modules/Health/SystemStore.js
+++ b/src/store/modules/HardwareStatus/SystemStore.js
diff --git a/src/store/modules/Health/PostCodeLogsStore.js b/src/store/modules/Logs/PostCodeLogsStore.js
index ac470ece..ac470ece 100644
--- a/src/store/modules/Health/PostCodeLogsStore.js
+++ b/src/store/modules/Logs/PostCodeLogsStore.js
diff --git a/src/views/Health/HardwareStatus/HardwareStatus.vue b/src/views/HardwareStatus/Inventory/Inventory.vue
index 3da79dce..d8b46b25 100644
--- a/src/views/Health/HardwareStatus/HardwareStatus.vue
+++ b/src/views/HardwareStatus/Inventory/Inventory.vue
@@ -3,7 +3,7 @@
<page-title />
<!-- Quicklinks section -->
- <page-section :section-title="$t('pageHardwareStatus.quicklinkTitle')">
+ <page-section :section-title="$t('pageInventory.quicklinkTitle')">
<b-row class="w-75">
<b-col v-for="column in quicklinkColumns" :key="column.id" xl="4">
<div v-for="item in column" :key="item.id">
@@ -44,13 +44,13 @@
<script>
import PageTitle from '@/components/Global/PageTitle';
-import TableSystem from './HardwareStatusTableStystem';
-import TablePowerSupplies from './HardwareStatusTablePowerSupplies';
-import TableDimmSlot from './HardwareStatusTableDimmSlot';
-import TableFans from './HardwareStatusTableFans';
-import TableBmcManager from './HardwareStatusTableBmcManager';
-import TableChassis from './HardwareStatusTableChassis';
-import TableProcessors from './HardwareStatusTableProcessors';
+import TableSystem from './InventoryTableSystem';
+import TablePowerSupplies from './InventoryTablePowerSupplies';
+import TableDimmSlot from './InventoryTableDimmSlot';
+import TableFans from './InventoryTableFans';
+import TableBmcManager from './InventoryTableBmcManager';
+import TableChassis from './InventoryTableChassis';
+import TableProcessors from './InventoryTableProcessors';
import LoadingBarMixin from '@/components/Mixins/LoadingBarMixin';
import PageSection from '@/components/Global/PageSection';
import JumpLink16 from '@carbon/icons-vue/es/jump-link/16';
@@ -86,43 +86,49 @@ export default {
id: 'system',
dataRef: 'system',
href: '#system',
- linkText: this.$t('pageHardwareStatus.system'),
+ linkText: this.$t('pageInventory.system'),
},
{
id: 'bmc',
dataRef: 'bmc',
href: '#bmc',
- linkText: this.$t('pageHardwareStatus.bmcManager'),
+ linkText: this.$t('pageInventory.bmcManager'),
},
{
id: 'chassis',
dataRef: 'chassis',
href: '#chassis',
- linkText: this.$t('pageHardwareStatus.chassis'),
+ linkText: this.$t('pageInventory.chassis'),
},
{
id: 'dimms',
dataRef: 'dimms',
href: '#dimms',
- linkText: this.$t('pageHardwareStatus.dimmSlot'),
+ linkText: this.$t('pageInventory.dimmSlot'),
},
{
id: 'fans',
dataRef: 'fans',
href: '#fans',
- linkText: this.$t('pageHardwareStatus.fans'),
+ linkText: this.$t('pageInventory.fans'),
},
{
id: 'powerSupply',
dataRef: 'powerSupply',
href: '#powerSupply',
- linkText: this.$t('pageHardwareStatus.powerSupplies'),
+ linkText: this.$t('pageInventory.powerSupplies'),
},
{
id: 'processors',
dataRef: 'processors',
href: '#processors',
- linkText: this.$t('pageHardwareStatus.processors'),
+ linkText: this.$t('pageInventory.processors'),
+ },
+ {
+ id: 'system',
+ dataRef: 'system',
+ href: '#system',
+ linkText: this.$t('pageInventory.system'),
},
],
};
diff --git a/src/views/Health/HardwareStatus/HardwareStatusTableBmcManager.vue b/src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue
index 07157448..6533fd90 100644
--- a/src/views/Health/HardwareStatus/HardwareStatusTableBmcManager.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableBmcManager.vue
@@ -1,5 +1,5 @@
<template>
- <page-section :section-title="$t('pageHardwareStatus.bmcManager')">
+ <page-section :section-title="$t('pageInventory.bmcManager')">
<b-table
responsive="md"
hover
@@ -51,49 +51,47 @@
<b-col class="mt-2" sm="6" xl="6">
<dl>
<!-- Name -->
- <dt>{{ $t('pageHardwareStatus.table.name') }}:</dt>
+ <dt>{{ $t('pageInventory.table.name') }}:</dt>
<dd>{{ tableFormatter(item.name) }}</dd>
<!-- Part number -->
- <dt>{{ $t('pageHardwareStatus.table.partNumber') }}:</dt>
+ <dt>{{ $t('pageInventory.table.partNumber') }}:</dt>
<dd>{{ tableFormatter(item.partNumber) }}</dd>
<!-- Serial number -->
- <dt>{{ $t('pageHardwareStatus.table.serialNumber') }}:</dt>
+ <dt>{{ $t('pageInventory.table.serialNumber') }}:</dt>
<dd>{{ tableFormatter(item.serialNumber) }}</dd>
<!-- Spare part number -->
- <dt>{{ $t('pageHardwareStatus.table.sparePartNumber') }}:</dt>
+ <dt>{{ $t('pageInventory.table.sparePartNumber') }}:</dt>
<dd>{{ tableFormatter(item.sparePartNumber) }}</dd>
<!-- Model -->
- <dt>{{ $t('pageHardwareStatus.table.model') }}:</dt>
+ <dt>{{ $t('pageInventory.table.model') }}:</dt>
<dd>{{ tableFormatter(item.model) }}</dd>
<!-- UUID -->
- <dt>{{ $t('pageHardwareStatus.table.uuid') }}:</dt>
+ <dt>{{ $t('pageInventory.table.uuid') }}:</dt>
<dd>{{ tableFormatter(item.uuid) }}</dd>
<!-- Service entry point UUID -->
- <dt>
- {{ $t('pageHardwareStatus.table.serviceEntryPointUuid') }}:
- </dt>
+ <dt>{{ $t('pageInventory.table.serviceEntryPointUuid') }}:</dt>
<dd>{{ tableFormatter(item.serviceEntryPointUuid) }}</dd>
</dl>
</b-col>
<b-col class="mt-2" sm="6" xl="6">
<dl>
<!-- Status state -->
- <dt>{{ $t('pageHardwareStatus.table.statusState') }}:</dt>
+ <dt>{{ $t('pageInventory.table.statusState') }}:</dt>
<dd>{{ tableFormatter(item.statusState) }}</dd>
<!-- Power state -->
- <dt>{{ $t('pageHardwareStatus.table.power') }}:</dt>
+ <dt>{{ $t('pageInventory.table.power') }}:</dt>
<dd>{{ tableFormatter(item.powerState) }}</dd>
<!-- Health rollup -->
- <dt>{{ $t('pageHardwareStatus.table.healthRollup') }}:</dt>
+ <dt>{{ $t('pageInventory.table.healthRollup') }}:</dt>
<dd>{{ tableFormatter(item.healthRollup) }}</dd>
<!-- BMC date and time -->
- <dt>{{ $t('pageHardwareStatus.table.bmcDateTime') }}:</dt>
+ <dt>{{ $t('pageInventory.table.bmcDateTime') }}:</dt>
<dd>
{{ item.dateTime | formatDate }}
{{ item.dateTime | formatTime }}
</dd>
<!-- Reset date and time -->
- <dt>{{ $t('pageHardwareStatus.table.lastResetTime') }}:</dt>
+ <dt>{{ $t('pageInventory.table.lastResetTime') }}:</dt>
<dd>
{{ item.lastResetTime | formatDate }}
{{ item.lastResetTime | formatTime }}
@@ -106,13 +104,13 @@
<b-col class="mt-2" sm="6" xl="6">
<dl>
<!-- Manufacturer -->
- <dt>{{ $t('pageHardwareStatus.table.manufacturer') }}:</dt>
+ <dt>{{ $t('pageInventory.table.manufacturer') }}:</dt>
<dd>{{ tableFormatter(item.manufacturer) }}</dd>
<!-- Description -->
- <dt>{{ $t('pageHardwareStatus.table.description') }}:</dt>
+ <dt>{{ $t('pageInventory.table.description') }}:</dt>
<dd>{{ tableFormatter(item.description) }}</dd>
<!-- Manager type -->
- <dt>{{ $t('pageHardwareStatus.table.managerType') }}:</dt>
+ <dt>{{ $t('pageInventory.table.managerType') }}:</dt>
<dd>{{ tableFormatter(item.managerType) }}</dd>
</dl>
</b-col>
@@ -130,16 +128,15 @@
<dt>
{{ $t('pageHardwareStatus.table.connectTypesSupported') }}:
</dt>
+ <dt>{{ $t('pageInventory.table.connectTypesSupported') }}:</dt>
<dd>
{{ tableFormatterArray(item.graphicalConsoleConnectTypes) }}
</dd>
- <dt>
- {{ $t('pageHardwareStatus.table.maxConcurrentSessions') }}:
- </dt>
+ <dt>{{ $t('pageInventory.table.maxConcurrentSessions') }}:</dt>
<dd>
{{ tableFormatter(item.graphicalConsoleMaxSessions) }}
</dd>
- <dt>{{ $t('pageHardwareStatus.table.serviceEnabled') }}:</dt>
+ <dt>{{ $t('pageInventory.table.serviceEnabled') }}:</dt>
<dd>
{{ tableFormatter(item.graphicalConsoleEnabled) }}
</dd>
@@ -152,14 +149,13 @@
<dt>
{{ $t('pageHardwareStatus.table.connectTypesSupported') }}:
</dt>
+ <dt>{{ $t('pageInventory.table.connectTypesSupported') }}:</dt>
<dd>
{{ tableFormatterArray(item.serialConsoleConnectTypes) }}
</dd>
- <dt>
- {{ $t('pageHardwareStatus.table.maxConcurrentSessions') }}:
- </dt>
+ <dt>{{ $t('pageInventory.table.maxConcurrentSessions') }}:</dt>
<dd>{{ tableFormatter(item.serialConsoleMaxSessions) }}</dd>
- <dt>{{ $t('pageHardwareStatus.table.serviceEnabled') }}:</dt>
+ <dt>{{ $t('pageInventory.table.serviceEnabled') }}:</dt>
<dd>{{ tableFormatter(item.serialConsoleEnabled) }}</dd>
</dl>
</b-col>
@@ -193,22 +189,22 @@ export default {
},
{
key: 'id',
- label: this.$t('pageHardwareStatus.table.id'),
+ label: this.$t('pageInventory.table.id'),
formatter: this.tableFormatter,
},
{
key: 'health',
- label: this.$t('pageHardwareStatus.table.health'),
+ label: this.$t('pageInventory.table.health'),
formatter: this.tableFormatter,
},
{
key: 'locationNumber',
- label: this.$t('pageHardwareStatus.table.locationNumber'),
+ label: this.$t('pageInventory.table.locationNumber'),
formatter: this.tableFormatter,
},
{
key: 'identifyLed',
- label: this.$t('pageHardwareStatus.table.identifyLed'),
+ label: this.$t('pageInventory.table.identifyLed'),
formatter: this.tableFormatter,
},
],
diff --git a/src/views/Health/HardwareStatus/HardwareStatusTableChassis.vue b/src/views/HardwareStatus/Inventory/InventoryTableChassis.vue
index 6b783c0f..0d535027 100644
--- a/src/views/Health/HardwareStatus/HardwareStatusTableChassis.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableChassis.vue
@@ -1,5 +1,5 @@
<template>
- <page-section :section-title="$t('pageHardwareStatus.chassis')">
+ <page-section :section-title="$t('pageInventory.chassis')">
<b-table
responsive="md"
hover
@@ -49,21 +49,21 @@
<b-col class="mt-2" sm="6" xl="6">
<dl>
<!-- Name -->
- <dt>{{ $t('pageHardwareStatus.table.name') }}:</dt>
+ <dt>{{ $t('pageInventory.table.name') }}:</dt>
<dd>{{ tableFormatter(item.name) }}</dd>
<!-- Part number -->
- <dt>{{ $t('pageHardwareStatus.table.partNumber') }}:</dt>
+ <dt>{{ $t('pageInventory.table.partNumber') }}:</dt>
<dd>{{ tableFormatter(item.partNumber) }}</dd>
<!-- Serial Number -->
- <dt>{{ $t('pageHardwareStatus.table.serialNumber') }}:</dt>
+ <dt>{{ $t('pageInventory.table.serialNumber') }}:</dt>
<dd>{{ tableFormatter(item.serialNumber) }}</dd>
<!-- Model -->
- <dt>{{ $t('pageHardwareStatus.table.model') }}:</dt>
+ <dt>{{ $t('pageInventory.table.model') }}:</dt>
<dd class="mb-2">
{{ tableFormatter(item.model) }}
</dd>
<!-- Asset tag -->
- <dt>{{ $t('pageHardwareStatus.table.assetTag') }}:</dt>
+ <dt>{{ $t('pageInventory.table.assetTag') }}:</dt>
<dd class="mb-2">
{{ tableFormatter(item.assetTag) }}
</dd>
@@ -72,13 +72,13 @@
<b-col class="mt-2" sm="6" xl="6">
<dl>
<!-- Status state -->
- <dt>{{ $t('pageHardwareStatus.table.statusState') }}:</dt>
+ <dt>{{ $t('pageInventory.table.statusState') }}:</dt>
<dd>{{ tableFormatter(item.statusState) }}</dd>
<!-- Power state -->
- <dt>{{ $t('pageHardwareStatus.table.power') }}:</dt>
+ <dt>{{ $t('pageInventory.table.power') }}:</dt>
<dd>{{ tableFormatter(item.power) }}</dd>
<!-- Health rollup -->
- <dt>{{ $t('pageHardwareStatus.table.healthRollup') }}:</dt>
+ <dt>{{ $t('pageInventory.table.healthRollup') }}:</dt>
<dd>{{ tableFormatter(item.healthRollup) }}</dd>
</dl>
</b-col>
@@ -88,20 +88,20 @@
<b-col class="mt-2" sm="6" xl="6">
<dl>
<!-- Manufacturer -->
- <dt>{{ $t('pageHardwareStatus.table.manufacturer') }}:</dt>
+ <dt>{{ $t('pageInventory.table.manufacturer') }}:</dt>
<dd>{{ tableFormatter(item.manufacturer) }}</dd>
<!-- Chassis Type -->
- <dt>{{ $t('pageHardwareStatus.table.chassisType') }}:</dt>
+ <dt>{{ $t('pageInventory.table.chassisType') }}:</dt>
<dd>{{ tableFormatter(item.chassisType) }}</dd>
</dl>
</b-col>
<b-col class="mt-2" sm="6" xl="6">
<dl>
<!-- Min power -->
- <dt>{{ $t('pageHardwareStatus.table.minPowerWatts') }}:</dt>
+ <dt>{{ $t('pageInventory.table.minPowerWatts') }}:</dt>
<dd>{{ tableFormatter(item.minPowerWatts) }}</dd>
<!-- Max power -->
- <dt>{{ $t('pageHardwareStatus.table.maxPowerWatts') }}:</dt>
+ <dt>{{ $t('pageInventory.table.maxPowerWatts') }}:</dt>
<dd>{{ tableFormatter(item.maxPowerWatts) }}</dd>
</dl>
</b-col>
@@ -136,23 +136,23 @@ export default {
},
{
key: 'id',
- label: this.$t('pageHardwareStatus.table.id'),
+ label: this.$t('pageInventory.table.id'),
formatter: this.tableFormatter,
},
{
key: 'health',
- label: this.$t('pageHardwareStatus.table.health'),
+ label: this.$t('pageInventory.table.health'),
formatter: this.tableFormatter,
tdClass: 'text-nowrap',
},
{
key: 'locationNumber',
- label: this.$t('pageHardwareStatus.table.locationNumber'),
+ label: this.$t('pageInventory.table.locationNumber'),
formatter: this.tableFormatter,
},
{
key: 'identifyLed',
- label: this.$t('pageHardwareStatus.table.identifyLed'),
+ label: this.$t('pageInventory.table.identifyLed'),
formatter: this.tableFormatter,
},
],
diff --git a/src/views/Health/HardwareStatus/HardwareStatusTableDimmSlot.vue b/src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue
index ca9e949c..ed370b53 100644
--- a/src/views/Health/HardwareStatus/HardwareStatusTableDimmSlot.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableDimmSlot.vue
@@ -1,5 +1,5 @@
<template>
- <page-section :section-title="$t('pageHardwareStatus.dimmSlot')">
+ <page-section :section-title="$t('pageInventory.dimmSlot')">
<b-row class="align-items-end">
<b-col sm="6" md="5" xl="4">
<search
@@ -56,7 +56,7 @@
<b-col sm="6" xl="4">
<dl>
<!-- Status state -->
- <dt>{{ $t('pageHardwareStatus.table.statusState') }}:</dt>
+ <dt>{{ $t('pageInventory.table.statusState') }}:</dt>
<dd>{{ tableFormatter(item.statusState) }}</dd>
</dl>
</b-col>
@@ -103,26 +103,26 @@ export default {
},
{
key: 'id',
- label: this.$t('pageHardwareStatus.table.id'),
+ label: this.$t('pageInventory.table.id'),
formatter: this.tableFormatter,
sortable: true,
},
{
key: 'health',
- label: this.$t('pageHardwareStatus.table.health'),
+ label: this.$t('pageInventory.table.health'),
formatter: this.tableFormatter,
sortable: true,
tdClass: 'text-nowrap',
},
{
key: 'partNumber',
- label: this.$t('pageHardwareStatus.table.partNumber'),
+ label: this.$t('pageInventory.table.partNumber'),
formatter: this.tableFormatter,
sortable: true,
},
{
key: 'serialNumber',
- label: this.$t('pageHardwareStatus.table.serialNumber'),
+ label: this.$t('pageInventory.table.serialNumber'),
formatter: this.tableFormatter,
sortable: true,
},
diff --git a/src/views/Health/HardwareStatus/HardwareStatusTableFans.vue b/src/views/HardwareStatus/Inventory/InventoryTableFans.vue
index fb998a38..8f1003fe 100644
--- a/src/views/Health/HardwareStatus/HardwareStatusTableFans.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableFans.vue
@@ -1,5 +1,5 @@
<template>
- <page-section :section-title="$t('pageHardwareStatus.fans')">
+ <page-section :section-title="$t('pageInventory.fans')">
<b-row class="align-items-end">
<b-col sm="6" md="5" xl="4">
<search
@@ -56,36 +56,34 @@
<b-col sm="6" xl="4">
<dl>
<!-- Name -->
- <dt>{{ $t('pageHardwareStatus.table.name') }}:</dt>
+ <dt>{{ $t('pageInventory.table.name') }}:</dt>
<dd>{{ tableFormatter(item.name) }}</dd>
</dl>
<dl>
<!-- Serial number -->
- <dt>{{ $t('pageHardwareStatus.table.serialNumber') }}:</dt>
+ <dt>{{ $t('pageInventory.table.serialNumber') }}:</dt>
<dd>{{ tableFormatter(item.serialNumber) }}</dd>
</dl>
<dl>
<!-- Part number -->
- <dt>{{ $t('pageHardwareStatus.table.partNumber') }}:</dt>
+ <dt>{{ $t('pageInventory.table.partNumber') }}:</dt>
<dd>{{ tableFormatter(item.partNumber) }}</dd>
</dl>
<dl>
<!-- Fan speed -->
- <dt>{{ $t('pageHardwareStatus.table.fanSpeed') }}:</dt>
+ <dt>{{ $t('pageInventory.table.fanSpeed') }}:</dt>
<dd>{{ tableFormatter(item.speed) }}</dd>
</dl>
</b-col>
<b-col sm="6" xl="4">
<dl>
<!-- Status state -->
- <dt>{{ $t('pageHardwareStatus.table.statusState') }}:</dt>
+ <dt>{{ $t('pageInventory.table.statusState') }}:</dt>
<dd>{{ tableFormatter(item.statusState) }}</dd>
</dl>
<dl>
<!-- Health Rollup state -->
- <dt>
- {{ $t('pageHardwareStatus.table.statusHealthRollup') }}:
- </dt>
+ <dt>{{ $t('pageInventory.table.statusHealthRollup') }}:</dt>
<dd>{{ tableFormatter(item.healthRollup) }}</dd>
</dl>
</b-col>
@@ -131,26 +129,26 @@ export default {
},
{
key: 'id',
- label: this.$t('pageHardwareStatus.table.id'),
+ label: this.$t('pageInventory.table.id'),
formatter: this.tableFormatter,
sortable: true,
},
{
key: 'health',
- label: this.$t('pageHardwareStatus.table.health'),
+ label: this.$t('pageInventory.table.health'),
formatter: this.tableFormatter,
sortable: true,
tdClass: 'text-nowrap',
},
{
- key: 'locationNumber',
- label: this.$t('pageHardwareStatus.table.locationNumber'),
+ key: 'partNumber',
+ label: this.$t('pageInventory.table.partNumber'),
formatter: this.tableFormatter,
sortable: true,
},
{
- key: 'identifyLed',
- label: this.$t('pageHardwareStatus.table.identifyLed'),
+ key: 'serialNumber',
+ label: this.$t('pageInventory.table.serialNumber'),
formatter: this.tableFormatter,
},
],
diff --git a/src/views/Health/HardwareStatus/HardwareStatusTablePowerSupplies.vue b/src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue
index a3d07655..1ef5aa71 100644
--- a/src/views/Health/HardwareStatus/HardwareStatusTablePowerSupplies.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTablePowerSupplies.vue
@@ -1,5 +1,5 @@
<template>
- <page-section :section-title="$t('pageHardwareStatus.powerSupplies')">
+ <page-section :section-title="$t('pageInventory.powerSupplies')">
<b-row class="align-items-end">
<b-col sm="6" md="5" xl="4">
<search
@@ -56,37 +56,35 @@
<b-col sm="6" xl="4">
<dl>
<!-- Name -->
- <dt>{{ $t('pageHardwareStatus.table.name') }}:</dt>
+ <dt>{{ $t('pageInventory.table.name') }}:</dt>
<dd>{{ tableFormatter(item.name) }}</dd>
<!-- Part number -->
- <dt>{{ $t('pageHardwareStatus.table.partNumber') }}:</dt>
+ <dt>{{ $t('pageInventory.table.partNumber') }}:</dt>
<dd>{{ tableFormatter(item.partNumber) }}</dd>
<!-- Serial number -->
- <dt>{{ $t('pageHardwareStatus.table.serialNumber') }}:</dt>
+ <dt>{{ $t('pageInventory.table.serialNumber') }}:</dt>
<dd>{{ tableFormatter(item.serialNumber) }}</dd>
<!-- Spare part number -->
- <dt>{{ $t('pageHardwareStatus.table.sparePartNumber') }}:</dt>
+ <dt>{{ $t('pageInventory.table.sparePartNumber') }}:</dt>
<dd>{{ tableFormatter(item.sparePartNumber) }}</dd>
<!-- Model -->
- <dt>{{ $t('pageHardwareStatus.table.model') }}:</dt>
+ <dt>{{ $t('pageInventory.table.model') }}:</dt>
<dd>{{ tableFormatter(item.model) }}</dd>
</dl>
</b-col>
<b-col sm="6" xl="4">
<dl>
<!-- Status state -->
- <dt>{{ $t('pageHardwareStatus.table.statusState') }}:</dt>
+ <dt>{{ $t('pageInventory.table.statusState') }}:</dt>
<dd>{{ tableFormatter(item.statusState) }}</dd>
<!-- Status Health rollup state -->
- <dt>
- {{ $t('pageHardwareStatus.table.statusHealthRollup') }}:
- </dt>
+ <dt>{{ $t('pageInventory.table.statusHealthRollup') }}:</dt>
<dd>{{ tableFormatter(item.statusHealth) }}</dd>
<!-- Efficiency percent -->
- <dt>{{ $t('pageHardwareStatus.table.efficiencyPercent') }}:</dt>
+ <dt>{{ $t('pageInventory.table.efficiencyPercent') }}:</dt>
<dd>{{ tableFormatter(item.efficiencyPercent) }}</dd>
<!-- Power input watts -->
- <dt>{{ $t('pageHardwareStatus.table.powerInputWatts') }}:</dt>
+ <dt>{{ $t('pageInventory.table.powerInputWatts') }}:</dt>
<dd>{{ tableFormatter(item.powerInputWatts) }}</dd>
</dl>
</b-col>
@@ -96,14 +94,14 @@
<b-col sm="6" xl="4">
<dl>
<!-- Manufacturer -->
- <dt>{{ $t('pageHardwareStatus.table.manufacturer') }}:</dt>
+ <dt>{{ $t('pageInventory.table.manufacturer') }}:</dt>
<dd>{{ tableFormatter(item.manufacturer) }}</dd>
</dl>
</b-col>
<b-col sm="6" xl="4">
<dl>
<!-- Firmware version -->
- <dt>{{ $t('pageHardwareStatus.table.firmwareVersion') }}:</dt>
+ <dt>{{ $t('pageInventory.table.firmwareVersion') }}:</dt>
<dd>{{ tableFormatter(item.firmwareVersion) }}</dd>
</dl>
</b-col>
@@ -149,26 +147,26 @@ export default {
},
{
key: 'id',
- label: this.$t('pageHardwareStatus.table.id'),
+ label: this.$t('pageInventory.table.id'),
formatter: this.tableFormatter,
sortable: true,
},
{
key: 'health',
- label: this.$t('pageHardwareStatus.table.health'),
+ label: this.$t('pageInventory.table.health'),
formatter: this.tableFormatter,
sortable: true,
tdClass: 'text-nowrap',
},
{
key: 'locationNumber',
- label: this.$t('pageHardwareStatus.table.locationNumber'),
+ label: this.$t('pageInventory.table.locationNumber'),
formatter: this.tableFormatter,
sortable: true,
},
{
key: 'identifyLed',
- label: this.$t('pageHardwareStatus.table.identifyLed'),
+ label: this.$t('pageInventory.table.identifyLed'),
formatter: this.tableFormatter,
},
],
diff --git a/src/views/Health/HardwareStatus/HardwareStatusTableProcessors.vue b/src/views/HardwareStatus/Inventory/InventoryTableProcessors.vue
index e3b5735d..85f12723 100644
--- a/src/views/Health/HardwareStatus/HardwareStatusTableProcessors.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableProcessors.vue
@@ -1,5 +1,5 @@
<template>
- <page-section :section-title="$t('pageHardwareStatus.processors')">
+ <page-section :section-title="$t('pageInventory.processors')">
<!-- Search -->
<b-row class="align-items-end">
<b-col sm="6" md="5" xl="4">
@@ -71,32 +71,32 @@
<b-col class="mt-2" sm="6" xl="6">
<dl>
<!-- Name -->
- <dt>{{ $t('pageHardwareStatus.table.name') }}:</dt>
+ <dt>{{ $t('pageInventory.table.name') }}:</dt>
<dd>{{ tableFormatter(item.name) }}</dd>
<!-- Part Number -->
- <dt>{{ $t('pageHardwareStatus.table.partNumber') }}:</dt>
+ <dt>{{ $t('pageInventory.table.partNumber') }}:</dt>
<dd>{{ tableFormatter(item.partNumber) }}</dd>
<!-- Serial Number -->
- <dt>{{ $t('pageHardwareStatus.table.serialNumber') }}:</dt>
+ <dt>{{ $t('pageInventory.table.serialNumber') }}:</dt>
<dd>{{ tableFormatter(item.serialNumber) }}</dd>
<!-- Spare Part Number -->
- <dt>{{ $t('pageHardwareStatus.table.sparePartNumber') }}:</dt>
+ <dt>{{ $t('pageInventory.table.sparePartNumber') }}:</dt>
<dd>{{ tableFormatter(item.sparePartNumber) }}</dd>
<!-- Model -->
- <dt>{{ $t('pageHardwareStatus.table.model') }}:</dt>
+ <dt>{{ $t('pageInventory.table.model') }}:</dt>
<dd>{{ tableFormatter(item.model) }}</dd>
<!-- Asset Tag -->
- <dt>{{ $t('pageHardwareStatus.table.assetTag') }}:</dt>
+ <dt>{{ $t('pageInventory.table.assetTag') }}:</dt>
<dd>{{ tableFormatter(item.assetTag) }}</dd>
</dl>
</b-col>
<b-col class="mt-2" sm="6" xl="6">
<dl>
<!-- Status state -->
- <dt>{{ $t('pageHardwareStatus.table.statusState') }}:</dt>
+ <dt>{{ $t('pageInventory.table.statusState') }}:</dt>
<dd>{{ tableFormatter(item.statusState) }}</dd>
<!-- Health Rollup -->
- <dt>{{ $t('pageHardwareStatus.table.healthRollup') }}:</dt>
+ <dt>{{ $t('pageInventory.table.healthRollup') }}:</dt>
<dd>{{ tableFormatter(item.healthRollup) }}</dd>
</dl>
</b-col>
@@ -106,37 +106,35 @@
<b-col class="mt-1" sm="6" xl="6">
<dl>
<!-- Manufacturer -->
- <dt>{{ $t('pageHardwareStatus.table.manufacturer') }}:</dt>
+ <dt>{{ $t('pageInventory.table.manufacturer') }}:</dt>
<dd>{{ tableFormatter(item.manufacturer) }}</dd>
<!-- Processor Type -->
- <dt>{{ $t('pageHardwareStatus.table.processorType') }}:</dt>
+ <dt>{{ $t('pageInventory.table.processorType') }}:</dt>
<dd>{{ tableFormatter(item.processorType) }}</dd>
<!-- Processor Architecture -->
- <dt>
- {{ $t('pageHardwareStatus.table.processorArchitecture') }}:
- </dt>
+ <dt>{{ $t('pageInventory.table.processorArchitecture') }}:</dt>
<dd>{{ tableFormatter(item.processorArchitecture) }}</dd>
<!-- Instruction Set -->
- <dt>{{ $t('pageHardwareStatus.table.instructionSet') }}:</dt>
+ <dt>{{ $t('pageInventory.table.instructionSet') }}:</dt>
<dd>{{ tableFormatter(item.instructionSet) }}</dd>
<!-- Version -->
- <dt>{{ $t('pageHardwareStatus.table.version') }}:</dt>
+ <dt>{{ $t('pageInventory.table.version') }}:</dt>
<dd>{{ tableFormatter(item.version) }}</dd>
</dl>
</b-col>
<b-col class="mt-1" sm="6" xl="6">
<dl>
<!-- Min Speed MHz -->
- <dt>{{ $t('pageHardwareStatus.table.minSpeedMHz') }}:</dt>
+ <dt>{{ $t('pageInventory.table.minSpeedMHz') }}:</dt>
<dd>{{ tableFormatter(item.minSpeedMHz) }}</dd>
<!-- Max Speed MHz -->
- <dt>{{ $t('pageHardwareStatus.table.maxSpeedMHz') }}:</dt>
+ <dt>{{ $t('pageInventory.table.maxSpeedMHz') }}:</dt>
<dd>{{ tableFormatter(item.maxSpeedMHz) }}</dd>
<!-- Total Cores -->
- <dt>{{ $t('pageHardwareStatus.table.totalCores') }}:</dt>
+ <dt>{{ $t('pageInventory.table.totalCores') }}:</dt>
<dd>{{ tableFormatter(item.totalCores) }}</dd>
<!-- Total Threads -->
- <dt>{{ $t('pageHardwareStatus.table.totalThreads') }}:</dt>
+ <dt>{{ $t('pageInventory.table.totalThreads') }}:</dt>
<dd>{{ tableFormatter(item.totalThreads) }}</dd>
</dl>
</b-col>
@@ -183,26 +181,26 @@ export default {
},
{
key: 'id',
- label: this.$t('pageHardwareStatus.table.id'),
+ label: this.$t('pageInventory.table.id'),
formatter: this.tableFormatter,
sortable: true,
},
{
key: 'health',
- label: this.$t('pageHardwareStatus.table.health'),
+ label: this.$t('pageInventory.table.health'),
formatter: this.tableFormatter,
sortable: true,
tdClass: 'text-nowrap',
},
{
key: 'locationNumber',
- label: this.$t('pageHardwareStatus.table.locationNumber'),
+ label: this.$t('pageInventory.table.locationNumber'),
formatter: this.tableFormatter,
sortable: true,
},
{
key: 'identifyLed',
- label: this.$t('pageHardwareStatus.table.identifyLed'),
+ label: this.$t('pageInventory.table.identifyLed'),
formatter: this.tableFormatter,
sortable: false,
},
diff --git a/src/views/Health/HardwareStatus/HardwareStatusTableStystem.vue b/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue
index 1dccd51c..54129d1f 100644
--- a/src/views/Health/HardwareStatus/HardwareStatusTableStystem.vue
+++ b/src/views/HardwareStatus/Inventory/InventoryTableSystem.vue
@@ -1,5 +1,5 @@
<template>
- <page-section :section-title="$t('pageHardwareStatus.system')">
+ <page-section :section-title="$t('pageInventory.system')">
<b-table
responsive="md"
hover
@@ -45,13 +45,13 @@
<b-col class="mt-2" sm="6">
<dl>
<!-- Serial number -->
- <dt>{{ $t('pageHardwareStatus.table.serialNumber') }}:</dt>
+ <dt>{{ $t('pageInventory.table.serialNumber') }}:</dt>
<dd>{{ tableFormatter(item.serialNumber) }}</dd>
<!-- Model -->
- <dt>{{ $t('pageHardwareStatus.table.model') }}:</dt>
+ <dt>{{ $t('pageInventory.table.model') }}:</dt>
<dd>{{ tableFormatter(item.model) }}</dd>
<!-- Asset tag -->
- <dt>{{ $t('pageHardwareStatus.table.assetTag') }}:</dt>
+ <dt>{{ $t('pageInventory.table.assetTag') }}:</dt>
<dd class="mb-2">
{{ tableFormatter(item.assetTag) }}
</dd>
@@ -60,13 +60,13 @@
<b-col class="mt-2" sm="6">
<dl>
<!-- Status state -->
- <dt>{{ $t('pageHardwareStatus.table.statusState') }}:</dt>
+ <dt>{{ $t('pageInventory.table.statusState') }}:</dt>
<dd>{{ tableFormatter(item.statusState) }}</dd>
<!-- Power state -->
- <dt>{{ $t('pageHardwareStatus.table.power') }}:</dt>
+ <dt>{{ $t('pageInventory.table.power') }}:</dt>
<dd>{{ tableFormatter(item.powerState) }}</dd>
<!-- Health rollup -->
- <dt>{{ $t('pageHardwareStatus.table.healthRollup') }}:</dt>
+ <dt>{{ $t('pageInventory.table.healthRollup') }}:</dt>
<dd>{{ tableFormatter(item.healthRollup) }}</dd>
</dl>
</b-col>
@@ -76,18 +76,18 @@
<b-col class="mt-1" sm="6">
<dl>
<!-- Manufacturer -->
- <dt>{{ $t('pageHardwareStatus.table.manufacturer') }}:</dt>
+ <dt>{{ $t('pageInventory.table.manufacturer') }}:</dt>
<dd>{{ tableFormatter(item.assetTag) }}</dd>
<!-- Description -->
- <dt>{{ $t('pageHardwareStatus.table.description') }}:</dt>
+ <dt>{{ $t('pageInventory.table.description') }}:</dt>
<dd>{{ tableFormatter(item.description) }}</dd>
<!-- Sub Model -->
- <dt>{{ $t('pageHardwareStatus.table.subModel') }}:</dt>
+ <dt>{{ $t('pageInventory.table.subModel') }}:</dt>
<dd>
{{ tableFormatter(item.subModel) }}
</dd>
<!-- System Type -->
- <dt>{{ $t('pageHardwareStatus.table.systemType') }}:</dt>
+ <dt>{{ $t('pageInventory.table.systemType') }}:</dt>
<dd>
{{ tableFormatter(item.systemType) }}
</dd>
@@ -97,33 +97,33 @@
<dl>
<!-- Memory Summary -->
<dt class="mt-1 mb-2 font-weight-bold float-none">
- {{ $t('pageHardwareStatus.table.memorySummary') }}
+ {{ $t('pageInventory.table.memorySummary') }}
</dt>
<!-- Status state -->
- <dt>{{ $t('pageHardwareStatus.table.statusState') }}:</dt>
+ <dt>{{ $t('pageInventory.table.statusState') }}:</dt>
<dd>{{ tableFormatter(item.memorySummaryState) }}</dd>
<!-- Health -->
- <dt>{{ $t('pageHardwareStatus.table.health') }}:</dt>
+ <dt>{{ $t('pageInventory.table.health') }}:</dt>
<dd>{{ tableFormatter(item.memorySummaryHealth) }}</dd>
<!-- Health Roll -->
- <dt>{{ $t('pageHardwareStatus.table.healthRollup') }}:</dt>
+ <dt>{{ $t('pageInventory.table.healthRollup') }}:</dt>
<dd>{{ tableFormatter(item.memorySummaryHealthRoll) }}</dd>
<!-- Processor Summary -->
<dt class="mt-1 mb-2 font-weight-bold float-none">
- {{ $t('pageHardwareStatus.table.processorSummary') }}
+ {{ $t('pageInventory.table.processorSummary') }}
</dt>
<!-- Status state -->
- <dt>{{ $t('pageHardwareStatus.table.statusState') }}:</dt>
+ <dt>{{ $t('pageInventory.table.statusState') }}:</dt>
<dd>{{ tableFormatter(item.processorSummaryState) }}</dd>
<!-- Health -->
- <dt>{{ $t('pageHardwareStatus.table.health') }}:</dt>
+ <dt>{{ $t('pageInventory.table.health') }}:</dt>
<dd>{{ tableFormatter(item.processorSummaryHealth) }}</dd>
<!-- Health Rollup -->
- <dt>{{ $t('pageHardwareStatus.table.healthRollup') }}:</dt>
+ <dt>{{ $t('pageInventory.table.healthRollup') }}:</dt>
<dd>{{ tableFormatter(item.processorSummaryHealthRoll) }}</dd>
<!-- Count -->
- <dt>{{ $t('pageHardwareStatus.table.count') }}:</dt>
+ <dt>{{ $t('pageInventory.table.count') }}:</dt>
<dd>{{ tableFormatter(item.processorSummaryCount) }}</dd>
</dl>
</b-col>
@@ -159,29 +159,29 @@ export default {
},
{
key: 'id',
- label: this.$t('pageHardwareStatus.table.id'),
+ label: this.$t('pageInventory.table.id'),
formatter: this.tableFormatter,
},
{
key: 'hardwareType',
- label: this.$t('pageHardwareStatus.table.hardwareType'),
+ label: this.$t('pageInventory.table.hardwareType'),
formatter: this.tableFormatter,
tdClass: 'text-nowrap',
},
{
key: 'health',
- label: this.$t('pageHardwareStatus.table.health'),
+ label: this.$t('pageInventory.table.health'),
formatter: this.tableFormatter,
tdClass: 'text-nowrap',
},
{
key: 'locationNumber',
- label: this.$t('pageHardwareStatus.table.locationNumber'),
+ label: this.$t('pageInventory.table.locationNumber'),
formatter: this.tableFormatter,
},
{
key: 'locationIndicatorActive',
- label: this.$t('pageHardwareStatus.table.identifyLed'),
+ label: this.$t('pageInventory.table.identifyLed'),
formatter: this.tableFormatter,
},
],
diff --git a/src/views/HardwareStatus/Inventory/index.js b/src/views/HardwareStatus/Inventory/index.js
new file mode 100644
index 00000000..c9fde8d2
--- /dev/null
+++ b/src/views/HardwareStatus/Inventory/index.js
@@ -0,0 +1,2 @@
+import Inventory from './Inventory.vue';
+export default Inventory;
diff --git a/src/views/Health/Sensors/Sensors.vue b/src/views/HardwareStatus/Sensors/Sensors.vue
index c69532a6..c69532a6 100644
--- a/src/views/Health/Sensors/Sensors.vue
+++ b/src/views/HardwareStatus/Sensors/Sensors.vue
diff --git a/src/views/Health/Sensors/index.js b/src/views/HardwareStatus/Sensors/index.js
index fc71b611..fc71b611 100644
--- a/src/views/Health/Sensors/index.js
+++ b/src/views/HardwareStatus/Sensors/index.js
diff --git a/src/views/Health/HardwareStatus/index.js b/src/views/Health/HardwareStatus/index.js
deleted file mode 100644
index 25d4551c..00000000
--- a/src/views/Health/HardwareStatus/index.js
+++ /dev/null
@@ -1,2 +0,0 @@
-import HardwareStatus from './HardwareStatus.vue';
-export default HardwareStatus;
diff --git a/src/views/Health/PostCodeLogs/PostCodeLogs.vue b/src/views/Logs/PostCodeLogs/PostCodeLogs.vue
index 1154cbff..1154cbff 100644
--- a/src/views/Health/PostCodeLogs/PostCodeLogs.vue
+++ b/src/views/Logs/PostCodeLogs/PostCodeLogs.vue
diff --git a/src/views/Health/PostCodeLogs/index.js b/src/views/Logs/PostCodeLogs/index.js
index ab591124..ab591124 100644
--- a/src/views/Health/PostCodeLogs/index.js
+++ b/src/views/Logs/PostCodeLogs/index.js
diff --git a/tests/unit/__snapshots__/AppNavigation.spec.js.snap b/tests/unit/__snapshots__/AppNavigation.spec.js.snap
index 04410ca9..92f69509 100644
--- a/tests/unit/__snapshots__/AppNavigation.spec.js.snap
+++ b/tests/unit/__snapshots__/AppNavigation.spec.js.snap
@@ -117,6 +117,15 @@ exports[`AppNavigation.vue should render correctly 1`] = `
appNavigation.eventLogs
</a>
+ <a
+ class="nav-link"
+ data-test-id="nav-item-post-code-logs"
+ href="#/logs/post-code-logs"
+ >
+
+ appNavigation.postCodeLogs
+
+ </a>
</li>
</ul>
</transition-stub>
@@ -125,10 +134,10 @@ exports[`AppNavigation.vue should render correctly 1`] = `
class="nav-item"
>
<button
- aria-controls="health"
+ aria-controls="hardware-status"
aria-expanded="false"
class="btn btn-link collapsed"
- data-test-id="nav-button-health"
+ data-test-id="nav-button-hardware-status"
type="button"
>
<svg
@@ -164,7 +173,7 @@ exports[`AppNavigation.vue should render correctly 1`] = `
/>
</svg>
- appNavigation.health
+ appNavigation.hardwareStatus
<svg
aria-hidden="true"
@@ -195,7 +204,7 @@ exports[`AppNavigation.vue should render correctly 1`] = `
>
<ul
class="collapse"
- id="health"
+ id="hardware-status"
style="display: none;"
>
<li
@@ -203,26 +212,17 @@ exports[`AppNavigation.vue should render correctly 1`] = `
>
<a
class="nav-link"
- data-test-id="nav-item-hardware-status"
- href="#/health/hardware-status"
+ data-test-id="nav-item-inventory"
+ href="#/hardware-status/inventory"
>
- appNavigation.hardwareStatus
-
- </a>
- <a
- class="nav-link"
- data-test-id="nav-item-post-code-logs"
- href="#/health/post-code-logs"
- >
-
- appNavigation.postCodeLogs
+ appNavigation.inventory
</a>
<a
class="nav-link"
data-test-id="nav-item-sensors"
- href="#/health/sensors"
+ href="#/hardware-status/sensors"
>
appNavigation.sensors
@@ -729,6 +729,15 @@ exports[`AppNavigation.vue should render with nav-container open 1`] = `
appNavigation.eventLogs
</a>
+ <a
+ class="nav-link"
+ data-test-id="nav-item-post-code-logs"
+ href="#/logs/post-code-logs"
+ >
+
+ appNavigation.postCodeLogs
+
+ </a>
</li>
</ul>
</transition-stub>
@@ -737,10 +746,10 @@ exports[`AppNavigation.vue should render with nav-container open 1`] = `
class="nav-item"
>
<button
- aria-controls="health"
+ aria-controls="hardware-status"
aria-expanded="false"
class="btn btn-link collapsed"
- data-test-id="nav-button-health"
+ data-test-id="nav-button-hardware-status"
type="button"
>
<svg
@@ -776,7 +785,7 @@ exports[`AppNavigation.vue should render with nav-container open 1`] = `
/>
</svg>
- appNavigation.health
+ appNavigation.hardwareStatus
<svg
aria-hidden="true"
@@ -807,7 +816,7 @@ exports[`AppNavigation.vue should render with nav-container open 1`] = `
>
<ul
class="collapse"
- id="health"
+ id="hardware-status"
style="display: none;"
>
<li
@@ -815,26 +824,17 @@ exports[`AppNavigation.vue should render with nav-container open 1`] = `
>
<a
class="nav-link"
- data-test-id="nav-item-hardware-status"
- href="#/health/hardware-status"
+ data-test-id="nav-item-inventory"
+ href="#/hardware-status/inventory"
>
- appNavigation.hardwareStatus
-
- </a>
- <a
- class="nav-link"
- data-test-id="nav-item-post-code-logs"
- href="#/health/post-code-logs"
- >
-
- appNavigation.postCodeLogs
+ appNavigation.inventory
</a>
<a
class="nav-link"
data-test-id="nav-item-sensors"
- href="#/health/sensors"
+ href="#/hardware-status/sensors"
>
appNavigation.sensors
generated by cgit v1.2.3 (git 2.39.0) at 2024-06-02 06:25:30 +0300