From f12e602ab84f2a4ae28a064ed2058f57b9cf9bc3 Mon Sep 17 00:00:00 2001
From: Anna Tsyganova <ATSyganova@IBS.RU>
Date: Fri, 8 Jul 2022 11:32:33 +0300
Subject: Fix a little global components Issue: SILABMC-191

---
 src/env/components/AppNavigation/sila.js | 33 +++++++++----------
 src/env/router/sila.js                   | 54 ++++++++++++++++----------------
 2 files changed, 44 insertions(+), 43 deletions(-)

(limited to 'src/env')

diff --git a/src/env/components/AppNavigation/sila.js b/src/env/components/AppNavigation/sila.js
index bbbbb1ee..72008186 100644
--- a/src/env/components/AppNavigation/sila.js
+++ b/src/env/components/AppNavigation/sila.js
@@ -24,8 +24,24 @@ const AppNavigationMixin = {
         {
           id: 'overview',
           label: this.$t('appNavigation.overview'),
-          route: '/',
           icon: 'iconOverview',
+          children: [
+            {
+              id: 'inventory',
+              label: this.$t('appNavigation.inventory'),
+              route: '/hardware-inventory',
+            },
+            {
+              id: 'network',
+              label: this.$t('appNavigation.network'),
+              route: '/network',
+            },
+            {
+              id: 'date-time',
+              label: this.$t('appNavigation.dateTime'),
+              route: '/date-time',
+            },
+          ],
         },
         {
           id: 'logs',
@@ -49,11 +65,6 @@ const AppNavigationMixin = {
           label: this.$t('appNavigation.hardwareStatus'),
           icon: 'iconHealth',
           children: [
-            {
-              id: 'inventory',
-              label: this.$t('appNavigation.inventory'),
-              route: '/hardware-status/inventory',
-            },
             {
               id: 'sensors',
               label: this.$t('appNavigation.sensors'),
@@ -113,16 +124,6 @@ const AppNavigationMixin = {
           label: this.$t('appNavigation.settings'),
           icon: 'iconSettings',
           children: [
-            {
-              id: 'date-time',
-              label: this.$t('appNavigation.dateTime'),
-              route: '/settings/date-time',
-            },
-            {
-              id: 'network',
-              label: this.$t('appNavigation.network'),
-              route: '/settings/network',
-            },
             {
               id: 'power-restore-policy',
               label: this.$t('appNavigation.powerRestorePolicy'),
diff --git a/src/env/router/sila.js b/src/env/router/sila.js
index 39590cfa..a622a436 100644
--- a/src/env/router/sila.js
+++ b/src/env/router/sila.js
@@ -2,18 +2,18 @@ import AppLayout from '@/layouts/_sila/AppLayout.vue';
 import ChangePassword from '@/views/_sila/ChangePassword';
 import Sessions from '@/views/_sila/SecurityAndAccess/Sessions';
 import ConsoleLayout from '@/layouts/_sila/ConsoleLayout.vue';
-import DateTime from '@/views/_sila/Settings/DateTime';
+import DateTime from '@/views/_sila/Overview/DateTime';
 import EventLogs from '@/views/_sila/Logs/EventLogs';
 import Firmware from '@/views/_sila/Operations/Firmware';
 import FactoryReset from '@/views/_sila/Operations/FactoryReset';
-import Inventory from '@/views/_sila/HardwareStatus/Inventory';
+import Inventory from '@/views/_sila/Overview/Inventory';
 import Kvm from '@/views/_sila/Operations/Kvm';
 import KvmConsole from '@/views/_sila/Operations/Kvm/KvmConsole';
 import Ldap from '@/views/_sila/SecurityAndAccess/Ldap';
 import UserManagement from '@/views/_sila/SecurityAndAccess/UserManagement';
 import Login from '@/views/_sila/Login';
 import LoginLayout from '@/layouts/_sila/LoginLayout';
-import Network from '@/views/_sila/Settings/Network';
+import Network from '@/views/_sila/Overview/Network';
 import Overview from '@/views/_sila/Overview';
 import PageNotFound from '@/views/_sila/PageNotFound';
 import PostCodeLogs from '@/views/_sila/Logs/PostCodeLogs';
@@ -95,6 +95,30 @@ const routes = [
           title: i18n.t('appPageTitle.overview'),
         },
       },
+      {
+        path: '/network',
+        name: 'network',
+        component: Network,
+        meta: {
+          title: i18n.t('appPageTitle.network'),
+        },
+      },
+      {
+        path: '/date-time',
+        name: 'date-time',
+        component: DateTime,
+        meta: {
+          title: i18n.t('appPageTitle.dateTime'),
+        },
+      },
+      {
+        path: '/hardware-inventory',
+        name: 'inventory',
+        component: Inventory,
+        meta: {
+          title: i18n.t('appPageTitle.inventory'),
+        },
+      },
       {
         path: '/profile-settings',
         name: 'profile-settings',
@@ -119,14 +143,6 @@ const routes = [
           title: i18n.t('appPageTitle.postCodeLogs'),
         },
       },
-      {
-        path: '/hardware-status/inventory',
-        name: 'inventory',
-        component: Inventory,
-        meta: {
-          title: i18n.t('appPageTitle.inventory'),
-        },
-      },
       {
         path: '/hardware-status/sensors',
         name: 'sensors',
@@ -175,14 +191,6 @@ const routes = [
           title: i18n.t('appPageTitle.certificates'),
         },
       },
-      {
-        path: '/settings/date-time',
-        name: 'date-time',
-        component: DateTime,
-        meta: {
-          title: i18n.t('appPageTitle.dateTime'),
-        },
-      },
       {
         path: '/operations/kvm',
         name: 'kvm',
@@ -199,14 +207,6 @@ const routes = [
           title: i18n.t('appPageTitle.firmware'),
         },
       },
-      {
-        path: '/settings/network',
-        name: 'network',
-        component: Network,
-        meta: {
-          title: i18n.t('appPageTitle.network'),
-        },
-      },
       {
         path: '/settings/power-restore-policy',
         name: 'power-restore-policy',
-- 
cgit v1.2.3