diff options
author | Derick Montague <derick.montague@ibm.com> | 2021-06-28 23:52:22 +0300 |
---|---|---|
committer | Derick Montague <derick.montague@ibm.com> | 2021-08-10 22:20:42 +0300 |
commit | 828dda9b187684902710bb11621eca27bf0c6eec (patch) | |
tree | 322a9511f7df3317ae23ab55b08c9b3730dfd810 /src | |
parent | 03dc2b7b9f0672aac84349fbc77aab55403447e0 (diff) | |
download | webui-vue-828dda9b187684902710bb11621eca27bf0c6eec.tar.xz |
IA update: Add logs and update overview icon
This is the first patchset of the information architecture changes.
These changes are the result of several months of design research with
users to improve the existing information architecture (IA). More
information can we found in the Github story.
This patchset will add a Logs section and move event logs and dumps from
the Health section to the new Logs section. It will also update the icon
used for the Overview page.
Github story: https://github.com/openbmc/webui-vue/issues/56
Testing:
1. IBM build:
- Logs contained Event logs and dumps
- Both pages rendered when clicking link
2. Intel build
- Logs contained Event logs only
- Logs page rendered when clicking link
3. Tested default build
- Logs contained Event logs only
- Logs page rendered when clicking link
Signed-off-by: Derick Montague <derick.montague@ibm.com>
Change-Id: I4621837202cf5ad3469d6ea460d9a5bdc79c8816
Diffstat (limited to 'src')
-rw-r--r-- | src/components/AppHeader/AppHeader.vue | 2 | ||||
-rw-r--r-- | src/components/AppNavigation/AppNavigationMixin.js | 21 | ||||
-rw-r--r-- | src/env/components/AppNavigation/ibm.js | 23 | ||||
-rw-r--r-- | src/env/components/AppNavigation/intel.js | 21 | ||||
-rw-r--r-- | src/env/router/ibm.js | 8 | ||||
-rw-r--r-- | src/env/router/intel.js | 4 | ||||
-rw-r--r-- | src/env/store/ibm.js | 2 | ||||
-rw-r--r-- | src/locales/en-US.json | 1 | ||||
-rw-r--r-- | src/router/routes.js | 4 | ||||
-rw-r--r-- | src/store/index.js | 2 | ||||
-rw-r--r-- | src/store/modules/Logs/DumpsStore.js (renamed from src/store/modules/Health/DumpsStore.js) | 0 | ||||
-rw-r--r-- | src/store/modules/Logs/EventLogStore.js (renamed from src/store/modules/Health/EventLogStore.js) | 0 | ||||
-rw-r--r-- | src/views/Logs/Dumps/Dumps.vue (renamed from src/views/Health/Dumps/Dumps.vue) | 0 | ||||
-rw-r--r-- | src/views/Logs/Dumps/DumpsForm.vue (renamed from src/views/Health/Dumps/DumpsForm.vue) | 0 | ||||
-rw-r--r-- | src/views/Logs/Dumps/DumpsModalConfirmation.vue (renamed from src/views/Health/Dumps/DumpsModalConfirmation.vue) | 0 | ||||
-rw-r--r-- | src/views/Logs/Dumps/index.js (renamed from src/views/Health/Dumps/index.js) | 0 | ||||
-rw-r--r-- | src/views/Logs/EventLogs/EventLogs.vue (renamed from src/views/Health/EventLogs/EventLogs.vue) | 0 | ||||
-rw-r--r-- | src/views/Logs/EventLogs/index.js (renamed from src/views/Health/EventLogs/index.js) | 0 | ||||
-rw-r--r-- | src/views/Overview/OverviewEvents.vue | 2 |
19 files changed, 59 insertions, 31 deletions
diff --git a/src/components/AppHeader/AppHeader.vue b/src/components/AppHeader/AppHeader.vue index f7989d2e..df6acbf7 100644 --- a/src/components/AppHeader/AppHeader.vue +++ b/src/components/AppHeader/AppHeader.vue @@ -49,7 +49,7 @@ <!-- Right aligned nav items --> <b-navbar-nav class="ml-auto helper-menu"> <b-nav-item - to="/health/event-logs" + to="/logs/event-logs" data-test-id="appHeader-container-health" > <status-icon :status="healthStatusIcon" /> diff --git a/src/components/AppNavigation/AppNavigationMixin.js b/src/components/AppNavigation/AppNavigationMixin.js index f9ba0776..42552da5 100644 --- a/src/components/AppNavigation/AppNavigationMixin.js +++ b/src/components/AppNavigation/AppNavigationMixin.js @@ -1,4 +1,5 @@ -import IconAnalytics from '@carbon/icons-vue/es/analytics/16'; +import IconDashboard from '@carbon/icons-vue/es/dashboard/16'; +import IconTextLinkAnalysis from '@carbon/icons-vue/es/text-link--analysis/16'; import IconDataCheck from '@carbon/icons-vue/es/data--check/16'; import IconSettingsAdjust from '@carbon/icons-vue/es/settings--adjust/16'; import IconSettings from '@carbon/icons-vue/es/settings/16'; @@ -7,7 +8,8 @@ import IconChevronUp from '@carbon/icons-vue/es/chevron--up/16'; const AppNavigationMixin = { components: { - iconOverview: IconAnalytics, + iconOverview: IconDashboard, + iconLogs: IconTextLinkAnalysis, iconHealth: IconDataCheck, iconControl: IconSettingsAdjust, iconConfiguration: IconSettings, @@ -24,15 +26,22 @@ const AppNavigationMixin = { icon: 'iconOverview', }, { - id: 'health', - label: this.$t('appNavigation.health'), - icon: 'iconHealth', + id: 'logs', + label: this.$t('appNavigation.logs'), + icon: 'iconLogs', children: [ { id: 'event-logs', label: this.$t('appNavigation.eventLogs'), - route: '/health/event-logs', + route: '/logs/event-logs', }, + ], + }, + { + id: 'health', + label: this.$t('appNavigation.health'), + icon: 'iconHealth', + children: [ { id: 'hardware-status', label: this.$t('appNavigation.hardwareStatus'), diff --git a/src/env/components/AppNavigation/ibm.js b/src/env/components/AppNavigation/ibm.js index b8186a44..8792ccc8 100644 --- a/src/env/components/AppNavigation/ibm.js +++ b/src/env/components/AppNavigation/ibm.js @@ -1,4 +1,5 @@ -import IconAnalytics from '@carbon/icons-vue/es/analytics/16'; +import IconDashboard from '@carbon/icons-vue/es/dashboard/16'; +import IconTextLinkAnalysis from '@carbon/icons-vue/es/text-link--analysis/16'; import IconDataCheck from '@carbon/icons-vue/es/data--check/16'; import IconSettingsAdjust from '@carbon/icons-vue/es/settings--adjust/16'; import IconSettings from '@carbon/icons-vue/es/settings/16'; @@ -7,7 +8,8 @@ import IconChevronUp from '@carbon/icons-vue/es/chevron--up/16'; const AppNavigationMixin = { components: { - iconOverview: IconAnalytics, + iconOverview: IconDashboard, + iconLogs: IconTextLinkAnalysis, iconHealth: IconDataCheck, iconControl: IconSettingsAdjust, iconConfiguration: IconSettings, @@ -24,20 +26,27 @@ const AppNavigationMixin = { icon: 'iconOverview', }, { - id: 'health', - label: this.$t('appNavigation.health'), - icon: 'iconHealth', + id: 'logs', + label: this.$t('appNavigation.logs'), + icon: 'iconLogs', children: [ { id: 'dumps', label: this.$t('appNavigation.dumps'), - route: '/health/dumps', + route: '/logs/dumps', }, { id: 'event-logs', label: this.$t('appNavigation.eventLogs'), - route: '/health/event-logs', + route: '/logs/event-logs', }, + ], + }, + { + id: 'health', + label: this.$t('appNavigation.health'), + icon: 'iconHealth', + children: [ { id: 'hardware-status', label: this.$t('appNavigation.hardwareStatus'), diff --git a/src/env/components/AppNavigation/intel.js b/src/env/components/AppNavigation/intel.js index 7144487b..9c3591f5 100644 --- a/src/env/components/AppNavigation/intel.js +++ b/src/env/components/AppNavigation/intel.js @@ -1,4 +1,5 @@ -import IconAnalytics from '@carbon/icons-vue/es/analytics/16'; +import IconDashboard from '@carbon/icons-vue/es/dashboard/16'; +import IconTextLinkAnalysis from '@carbon/icons-vue/es/text-link--analysis/16'; import IconDataCheck from '@carbon/icons-vue/es/data--check/16'; import IconSettingsAdjust from '@carbon/icons-vue/es/settings--adjust/16'; import IconSettings from '@carbon/icons-vue/es/settings/16'; @@ -7,7 +8,8 @@ import IconChevronUp from '@carbon/icons-vue/es/chevron--up/16'; const AppNavigationMixin = { components: { - iconOverview: IconAnalytics, + iconOverview: IconDashboard, + iconLogs: IconTextLinkAnalysis, iconHealth: IconDataCheck, iconControl: IconSettingsAdjust, iconConfiguration: IconSettings, @@ -24,15 +26,22 @@ const AppNavigationMixin = { icon: 'iconOverview', }, { - id: 'health', - label: this.$t('appNavigation.health'), - icon: 'iconHealth', + id: 'logs', + label: this.$t('appNavigation.logs'), + icon: 'iconLogs', children: [ { id: 'event-logs', label: this.$t('appNavigation.eventLogs'), - route: '/health/event-logs', + route: '/logs/event-logs', }, + ], + }, + { + id: 'health', + label: this.$t('appNavigation.health'), + icon: 'iconHealth', + children: [ { id: 'hardware-status', label: this.$t('appNavigation.hardwareStatus'), diff --git a/src/env/router/ibm.js b/src/env/router/ibm.js index 91b70a70..8b94cf78 100644 --- a/src/env/router/ibm.js +++ b/src/env/router/ibm.js @@ -3,7 +3,7 @@ import ChangePassword from '@/views/ChangePassword'; import ClientSessions from '@/views/AccessControl/ClientSessions'; import ConsoleLayout from '@/layouts/ConsoleLayout.vue'; import DateTimeSettings from '@/views/Configuration/DateTimeSettings'; -import EventLogs from '@/views/Health/EventLogs'; +import EventLogs from '@/views/Logs/EventLogs'; import FactoryReset from '@/views/Control/FactoryReset'; import Firmware from '@/views/Configuration/Firmware'; import HardwareStatus from '@/views/Health/HardwareStatus'; @@ -29,7 +29,7 @@ import SslCertificates from '@/views/AccessControl/SslCertificates'; import i18n from '@/i18n'; // Custom components -import Dumps from '@/views/Health/Dumps'; +import Dumps from '@/views/Logs/Dumps'; const routes = [ { @@ -96,7 +96,7 @@ const routes = [ }, }, { - path: '/health/dumps', + path: '/logs/dumps', name: 'dumps', component: Dumps, meta: { @@ -104,7 +104,7 @@ const routes = [ }, }, { - path: '/health/event-logs', + path: '/logs/event-logs', name: 'event-logs', component: EventLogs, meta: { diff --git a/src/env/router/intel.js b/src/env/router/intel.js index 53f6154e..3e3349d0 100644 --- a/src/env/router/intel.js +++ b/src/env/router/intel.js @@ -3,7 +3,7 @@ import ChangePassword from '@/views/ChangePassword'; import ClientSessions from '@/views/AccessControl/ClientSessions'; import ConsoleLayout from '@/layouts/ConsoleLayout.vue'; import DateTimeSettings from '@/views/Configuration/DateTimeSettings'; -import EventLogs from '@/views/Health/EventLogs'; +import EventLogs from '@/views/Logs/EventLogs'; import Firmware from '@/views/Configuration/Firmware'; import HardwareStatus from '@/views/Health/HardwareStatus'; import Kvm from '@/views/Control/Kvm'; @@ -100,7 +100,7 @@ const routes = [ }, }, { - path: '/health/event-logs', + path: '/logs/event-logs', name: 'event-logs', component: EventLogs, meta: { diff --git a/src/env/store/ibm.js b/src/env/store/ibm.js index ff20b9cf..787f8975 100644 --- a/src/env/store/ibm.js +++ b/src/env/store/ibm.js @@ -1,5 +1,5 @@ import store from '@/store'; -import DumpsStore from '@/store/modules/Health/DumpsStore'; +import DumpsStore from '@/store/modules/Logs/DumpsStore'; store.unregisterModule('virtualMedia'); diff --git a/src/locales/en-US.json b/src/locales/en-US.json index eccd302a..a5fd8202 100644 --- a/src/locales/en-US.json +++ b/src/locales/en-US.json @@ -111,6 +111,7 @@ "health": "Health", "kvm": "@:appPageTitle.kvm", "ldap": "@:appPageTitle.ldap", + "logs": "Logs", "localUserManagement": "@:appPageTitle.localUserManagement", "managePowerUsage": "@:appPageTitle.managePowerUsage", "networkSettings": "@:appPageTitle.networkSettings", diff --git a/src/router/routes.js b/src/router/routes.js index 7501073a..1c5d57b1 100644 --- a/src/router/routes.js +++ b/src/router/routes.js @@ -2,7 +2,7 @@ import AppLayout from '@/layouts/AppLayout.vue'; import ChangePassword from '@/views/ChangePassword'; import ConsoleLayout from '@/layouts/ConsoleLayout.vue'; import DateTimeSettings from '@/views/Configuration/DateTimeSettings'; -import EventLogs from '@/views/Health/EventLogs'; +import EventLogs from '@/views/Logs/EventLogs'; import FactoryReset from '@/views/Control/FactoryReset'; import Firmware from '@/views/Configuration/Firmware'; import HardwareStatus from '@/views/Health/HardwareStatus'; @@ -104,7 +104,7 @@ const routes = [ }, }, { - path: '/health/event-logs', + path: '/logs/event-logs', name: 'event-logs', component: EventLogs, meta: { diff --git a/src/store/index.js b/src/store/index.js index 29dfe4fc..5aba4663 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -13,7 +13,7 @@ import ControlStore from './modules/Control/ControlStore'; import PowerControlStore from './modules/Control/PowerControlStore'; import PowerPolicyStore from './modules/Control/PowerPolicyStore'; import NetworkSettingStore from './modules/Configuration/NetworkSettingsStore'; -import EventLogStore from './modules/Health/EventLogStore'; +import EventLogStore from './modules/Logs/EventLogStore'; import SensorsStore from './modules/Health/SensorsStore'; import ServerLedStore from './modules/Control/ServerLedStore'; import SystemStore from './modules/Health/SystemStore'; diff --git a/src/store/modules/Health/DumpsStore.js b/src/store/modules/Logs/DumpsStore.js index 3b91354b..3b91354b 100644 --- a/src/store/modules/Health/DumpsStore.js +++ b/src/store/modules/Logs/DumpsStore.js diff --git a/src/store/modules/Health/EventLogStore.js b/src/store/modules/Logs/EventLogStore.js index c9bd82fd..c9bd82fd 100644 --- a/src/store/modules/Health/EventLogStore.js +++ b/src/store/modules/Logs/EventLogStore.js diff --git a/src/views/Health/Dumps/Dumps.vue b/src/views/Logs/Dumps/Dumps.vue index 4538b305..4538b305 100644 --- a/src/views/Health/Dumps/Dumps.vue +++ b/src/views/Logs/Dumps/Dumps.vue diff --git a/src/views/Health/Dumps/DumpsForm.vue b/src/views/Logs/Dumps/DumpsForm.vue index 02ec1864..02ec1864 100644 --- a/src/views/Health/Dumps/DumpsForm.vue +++ b/src/views/Logs/Dumps/DumpsForm.vue diff --git a/src/views/Health/Dumps/DumpsModalConfirmation.vue b/src/views/Logs/Dumps/DumpsModalConfirmation.vue index f8e20cfd..f8e20cfd 100644 --- a/src/views/Health/Dumps/DumpsModalConfirmation.vue +++ b/src/views/Logs/Dumps/DumpsModalConfirmation.vue diff --git a/src/views/Health/Dumps/index.js b/src/views/Logs/Dumps/index.js index 65525fb0..65525fb0 100644 --- a/src/views/Health/Dumps/index.js +++ b/src/views/Logs/Dumps/index.js diff --git a/src/views/Health/EventLogs/EventLogs.vue b/src/views/Logs/EventLogs/EventLogs.vue index fa3f43cb..fa3f43cb 100644 --- a/src/views/Health/EventLogs/EventLogs.vue +++ b/src/views/Logs/EventLogs/EventLogs.vue diff --git a/src/views/Health/EventLogs/index.js b/src/views/Logs/EventLogs/index.js index 521efde4..521efde4 100644 --- a/src/views/Health/EventLogs/index.js +++ b/src/views/Logs/EventLogs/index.js diff --git a/src/views/Overview/OverviewEvents.vue b/src/views/Overview/OverviewEvents.vue index 885db07c..b8f876ac 100644 --- a/src/views/Overview/OverviewEvents.vue +++ b/src/views/Overview/OverviewEvents.vue @@ -2,7 +2,7 @@ <div> <b-button variant="link" - to="/health/event-logs" + to="/logs/event-logs" data-test-id="overviewEvents-button-eventLogs" class="float-md-right" > |