From 931c2cad0da1a84e3df0745b385ec06d29cc2634 Mon Sep 17 00:00:00 2001
From: Maksim Zakharov <m.zakharov@IBS.RU>
Date: Mon, 20 Jun 2022 11:52:15 +0300
Subject: fix Modals, Tables and Pages: event logs, inventoty, post logs,
 operttions, global styles

---
 src/components/AppNavigation/AppNavigation.vue     |  33 +-
 src/components/AppNavigation/AppNavigationMixin.js | 479 ++++++++++-----------
 2 files changed, 234 insertions(+), 278 deletions(-)

(limited to 'src/components/AppNavigation')

diff --git a/src/components/AppNavigation/AppNavigation.vue b/src/components/AppNavigation/AppNavigation.vue
index 1cdb7120..481818c3 100644
--- a/src/components/AppNavigation/AppNavigation.vue
+++ b/src/components/AppNavigation/AppNavigation.vue
@@ -1,33 +1,6 @@
 <template>
   <div>
     <div class="nav-container" :class="{ open: isNavigationOpen }">
-      <div class="navbar__search_select_container">
-        <div class="server-form">
-          <img
-            class="server__icon"
-            src="@/assets/images/sila-server-navbar-icon.svg"
-          />
-          <b-form-group class="server-pagination-select">
-            <b-form-select
-              v-model="server"
-              class="server-select"
-              :options="servers"
-            />
-          </b-form-group>
-        </div>
-        <div class="nav-line"></div>
-        <div class="form-control server-search">
-          <button class="search-button">
-            <img class="server__icon" src="@/assets/images/search-icon.svg" />
-          </button>
-          <b-form-input
-            type="text"
-            class="nav-search__input"
-            placeholder="Поиск по серверу"
-          >
-          </b-form-input>
-        </div>
-      </div>
       <nav ref="nav" :aria-label="$t('appNavigation.primaryNavigation')">
         <b-nav vertical>
           <template v-for="(navItem, index) in sideBar">
@@ -110,9 +83,9 @@ export default {
   computed: {
     sideBar() {
       if (
-        this.$route.path === '/console-settings' ||
-        this.$route.path === '/console/serial-over-lan' ||
-        this.$route.path === '/console/kvm'
+        this.$route.path === '/console/settings' ||
+        this.$route.path === '/operations/serial-over-lan' ||
+        this.$route.path === '/operations/kvm'
       ) {
         return this.kvmNavigationItems;
       } else {
diff --git a/src/components/AppNavigation/AppNavigationMixin.js b/src/components/AppNavigation/AppNavigationMixin.js
index 241a8f3b..c51636d5 100644
--- a/src/components/AppNavigation/AppNavigationMixin.js
+++ b/src/components/AppNavigation/AppNavigationMixin.js
@@ -15,33 +15,18 @@ export const AppNavigationMixin = {
             {
               id: 'info',
               label: this.$t('appNavigation.overviewInfo'),
-              route: '/',
+              route: '/hardware-status/inventory',
             },
             {
               id: 'network',
               label: this.$t('appNavigation.networkParametrs'),
-              route: '/network-parametrs',
-            },
-            {
-              id: 'event-logs',
-              label: this.$t('appNavigation.eventLogs'),
-              route: '/event-logs',
-            },
-            {
-              id: 'server-parametrs',
-              label: this.$t('appNavigation.serverParam'),
-              route: '/server-parametrs',
+              route: '/settings/network',
             },
             {
               id: 'date-time',
               label: this.$t('appNavigation.dateTime'),
               route: '/settings/date-time',
             },
-            {
-              id: 'server-power-operations',
-              label: this.$t('appNavigation.serverPowerOperations'),
-              route: '/operations/server-power-operations',
-            },
           ],
         },
         {
@@ -54,185 +39,185 @@ export const AppNavigationMixin = {
               label: this.$t('appNavigation.config'),
               route: '/bmc-configuration',
             },
-            {
-              id: 'bmc-firmware',
-              label: this.$t('appNavigation.deviceFirmware'),
-              route: '/bmc-firmware',
-            },
-            {
-              id: 'bmc-settings',
-              label: this.$t('appNavigation.broadcast'),
-              route: '/bmc-settings',
-            },
-          ],
-        },
-        {
-          id: 'analytical-panel',
-          label: this.$t('appNavigation.analyticalPanel'),
-          route: '/analytical-panel',
-        },
-        {
-          id: 'RAID',
-          label: this.$t('appNavigation.raidControllers'),
-          icon: 'iconChevronUp',
-          children: [
-            {
-              id: 'raid-specification',
-              label: this.$t('appNavigation.specification'),
-              route: '/raid-specification',
-            },
-            {
-              id: 'raid-settings',
-              label: this.$t('appNavigation.settings'),
-              route: '/raid-settings',
-            },
-            {
-              id: 'raid-cache',
-              label: this.$t('RAID.cache'),
-              route: '/raid-cache',
-            },
-          ],
-        },
-        {
-          id: 'processors',
-          label: this.$t('appNavigation.processors'),
-          icon: 'iconChevronUp',
-          children: [
-            {
-              id: 'processors-specification',
-              label: this.$t('appNavigation.specification'),
-              route: '/processors-specification',
-            },
-            {
-              id: 'processors-dynamic-info',
-              label: this.$t('appNavigation.analyticalPanel'),
-              route: '/processors-dynamic-info',
-            },
-          ],
-        },
-        {
-          id: 'power',
-          label: this.$t('appNavigation.powerSupplies'),
-          icon: 'iconChevronUp',
-          children: [
-            {
-              id: 'power-specification',
-              label: this.$t('appNavigation.specification'),
-              route: '/power-specification',
-            },
-            {
-              id: 'power-dynamic-info',
-              label: this.$t('appNavigation.analyticalPanel'),
-              route: '/power-dynamic-info',
-            },
-          ],
-        },
-        {
-          id: 'memory',
-          label: this.$t('appNavigation.memoryModules'),
-          icon: 'iconChevronUp',
-          children: [
-            {
-              id: 'memory-specification',
-              label: this.$t('appNavigation.specification'),
-              route: '/memory-specification',
-            },
-            {
-              id: 'memory-dynamic-info',
-              label: this.$t('appNavigation.analyticalPanel'),
-              route: '/memory-dynamic-info',
-            },
-          ],
-        },
-        {
-          id: 'fans',
-          label: this.$t('appNavigation.fans'),
-          icon: 'iconChevronUp',
-          children: [
-            {
-              id: 'fans-static',
-              label: this.$t('appNavigation.statisticInformation'),
-              route: '/fans-static',
-            },
-            {
-              id: 'fans',
-              label: this.$t('appNavigation.dynamicInformation'),
-              route: '/fans',
-            },
+            // {
+            //   id: 'bmc-firmware',
+            //   label: this.$t('appNavigation.deviceFirmware'),
+            //   route: '/bmc-firmware',
+            // },
+            // {
+            //   id: 'bmc-settings',
+            //   label: this.$t('appNavigation.broadcast'),
+            //   route: '/bmc-settings',
+            // },
           ],
         },
-        {
-          id: 'physical-drives',
-          label: this.$t('appNavigation.physicalDrives'),
-          icon: 'iconChevronUp',
-          children: [
-            {
-              id: 'drivers-static',
-              label: this.$t('appNavigation.statisticInformation'),
-              route: '/drivers-static',
-            },
-            {
-              id: 'drivers',
-              label: this.$t('appNavigation.analyticalPanel'),
-              route: '/drivers',
-            },
-          ],
-        },
-        {
-          id: 'virtual-drivers',
-          label: this.$t('appNavigation.virtualDrivers'),
-          route: '/virtual-drivers',
-        },
-        {
-          id: 'motherboard',
-          label: this.$t('appNavigation.motherboard'),
-          icon: 'iconChevronUp',
-          children: [
-            {
-              id: 'motherboard-specification',
-              label: this.$t('appNavigation.specification'),
-              route: '/motherboard-specification',
-            },
-            {
-              id: 'motherboard-dynamic-info',
-              label: this.$t('appNavigation.analyticalPanel'),
-              route: '/motherboard-dynamic-info',
-            },
-          ],
-        },
-        {
-          id: 'network-adapters',
-          label: this.$t('appNavigation.networkAdapters'),
-          icon: 'iconChevronUp',
-          children: [
-            {
-              id: 'network-adapters-ethernet',
-              label: this.$t('appNavigation.ethernetAdapters'),
-              route: '/network-adapters-ethernet',
-            },
-            {
-              id: 'network-adapters-fc-hba',
-              label: this.$t('appNavigation.fcHbaAdapters'),
-              route: '/network-adapters-fc-hba',
-            },
-            {
-              id: 'network-adapters-pannel',
-              label: this.$t('appNavigation.analyticalPanel'),
-              route: '/network-adapters-pannel',
-            },
-          ],
-        },
-        {
-          id: 'pci-devices',
-          label: this.$t('appNavigation.pciDevices'),
-          route: '/pci-devices',
-        },
+        // {
+        //   id: 'analytical-panel',
+        //   label: this.$t('appNavigation.analyticalPanel'),
+        //   route: '/analytical-panel',
+        // },
+        // {
+        //   id: 'RAID',
+        //   label: this.$t('appNavigation.raidControllers'),
+        //   icon: 'iconChevronUp',
+        //   children: [
+        //     {
+        //       id: 'raid-specification',
+        //       label: this.$t('appNavigation.specification'),
+        //       route: '/raid-specification',
+        //     },
+        //     {
+        //       id: 'raid-settings',
+        //       label: this.$t('appNavigation.settings'),
+        //       route: '/raid-settings',
+        //     },
+        //     {
+        //       id: 'raid-cache',
+        //       label: this.$t('RAID.cache'),
+        //       route: '/raid-cache',
+        //     },
+        //   ],
+        // },
+        // {
+        //   id: 'processors',
+        //   label: this.$t('appNavigation.processors'),
+        //   icon: 'iconChevronUp',
+        //   children: [
+        //     {
+        //       id: 'processors-specification',
+        //       label: this.$t('appNavigation.specification'),
+        //       route: '/processors-specification',
+        //     },
+        //     {
+        //       id: 'processors-dynamic-info',
+        //       label: this.$t('appNavigation.analyticalPanel'),
+        //       route: '/processors-dynamic-info',
+        //     },
+        //   ],
+        // },
+        // {
+        //   id: 'power',
+        //   label: this.$t('appNavigation.powerSupplies'),
+        //   icon: 'iconChevronUp',
+        //   children: [
+        //     {
+        //       id: 'power-specification',
+        //       label: this.$t('appNavigation.specification'),
+        //       route: '/power-specification',
+        //     },
+        //     {
+        //       id: 'power-dynamic-info',
+        //       label: this.$t('appNavigation.analyticalPanel'),
+        //       route: '/power-dynamic-info',
+        //     },
+        //   ],
+        // },
+        // {
+        //   id: 'memory',
+        //   label: this.$t('appNavigation.memoryModules'),
+        //   icon: 'iconChevronUp',
+        //   children: [
+        //     {
+        //       id: 'memory-specification',
+        //       label: this.$t('appNavigation.specification'),
+        //       route: '/memory-specification',
+        //     },
+        //     {
+        //       id: 'memory-dynamic-info',
+        //       label: this.$t('appNavigation.analyticalPanel'),
+        //       route: '/memory-dynamic-info',
+        //     },
+        //   ],
+        // },
+        // {
+        //   id: 'fans',
+        //   label: this.$t('appNavigation.fans'),
+        //   icon: 'iconChevronUp',
+        //   children: [
+        //     {
+        //       id: 'fans-static',
+        //       label: this.$t('appNavigation.statisticInformation'),
+        //       route: '/fans-static',
+        //     },
+        //     {
+        //       id: 'fans',
+        //       label: this.$t('appNavigation.dynamicInformation'),
+        //       route: '/fans',
+        //     },
+        //   ],
+        // },
+        // {
+        //   id: 'physical-drives',
+        //   label: this.$t('appNavigation.physicalDrives'),
+        //   icon: 'iconChevronUp',
+        //   children: [
+        //     {
+        //       id: 'drivers-static',
+        //       label: this.$t('appNavigation.statisticInformation'),
+        //       route: '/drivers-static',
+        //     },
+        //     {
+        //       id: 'drivers',
+        //       label: this.$t('appNavigation.analyticalPanel'),
+        //       route: '/drivers',
+        //     },
+        //   ],
+        // },
+        // {
+        //   id: 'virtual-drivers',
+        //   label: this.$t('appNavigation.virtualDrivers'),
+        //   route: '/virtual-drivers',
+        // },
+        // {
+        //   id: 'motherboard',
+        //   label: this.$t('appNavigation.motherboard'),
+        //   icon: 'iconChevronUp',
+        //   children: [
+        //     {
+        //       id: 'motherboard-specification',
+        //       label: this.$t('appNavigation.specification'),
+        //       route: '/motherboard-specification',
+        //     },
+        //     {
+        //       id: 'motherboard-dynamic-info',
+        //       label: this.$t('appNavigation.analyticalPanel'),
+        //       route: '/motherboard-dynamic-info',
+        //     },
+        //   ],
+        // },
+        // {
+        //   id: 'network-adapters',
+        //   label: this.$t('appNavigation.networkAdapters'),
+        //   icon: 'iconChevronUp',
+        //   children: [
+        //     {
+        //       id: 'network-adapters-ethernet',
+        //       label: this.$t('appNavigation.ethernetAdapters'),
+        //       route: '/network-adapters-ethernet',
+        //     },
+        //     {
+        //       id: 'network-adapters-fc-hba',
+        //       label: this.$t('appNavigation.fcHbaAdapters'),
+        //       route: '/network-adapters-fc-hba',
+        //     },
+        //     {
+        //       id: 'network-adapters-pannel',
+        //       label: this.$t('appNavigation.analyticalPanel'),
+        //       route: '/network-adapters-pannel',
+        //     },
+        //   ],
+        // },
+        // {
+        //   id: 'pci-devices',
+        //   label: this.$t('appNavigation.pciDevices'),
+        //   route: '/pci-devices',
+        // },
         ///////////////////////////old tabs
-        {
-          id: 'overview',
-          label: 'Обзор',
-          route: '/Info',
-        },
+        // {
+        //   id: 'overview',
+        //   label: 'Обзор',
+        //   route: '/Info',
+        // },
         {
           id: 'logs',
           label: this.$t('appNavigation.logs'),
@@ -241,7 +226,7 @@ export const AppNavigationMixin = {
             {
               id: 'event-logs',
               label: this.$t('appNavigation.eventLogs'),
-              route: '/logs/event-logs-old',
+              route: '/logs/event-logs',
             },
             {
               id: 'post-code-logs',
@@ -250,23 +235,18 @@ export const AppNavigationMixin = {
             },
           ],
         },
-        {
-          id: 'hardware-status',
-          label: this.$t('appNavigation.hardwareStatus'),
-          icon: 'iconChevronUp',
-          children: [
-            {
-              id: 'inventory',
-              label: this.$t('appNavigation.inventory'),
-              route: '/hardware-status/inventory',
-            },
-            {
-              id: 'sensors',
-              label: this.$t('appNavigation.sensors'),
-              route: '/hardware-status/sensors',
-            },
-          ],
-        },
+        // {
+        //   id: 'hardware-status',
+        //   label: this.$t('appNavigation.hardwareStatus'),
+        //   icon: 'iconChevronUp',
+        //   children: [
+        //     {
+        //       id: 'sensors',
+        //       label: this.$t('appNavigation.sensors'),
+        //       route: '/hardware-status/sensors',
+        //     },
+        //   ],
+        // },
         {
           id: 'operations',
           label: this.$t('appNavigation.operations'),
@@ -304,25 +284,27 @@ export const AppNavigationMixin = {
             },
           ],
         },
-        {
-          id: 'settings',
-          label: this.$t('appNavigation.settings'),
-          children: [
-            {
-              id: 'network',
-              label: this.$t('appNavigation.network'),
-              route: '/settings/network',
-            },
-            {
-              id: 'power-restore-policy',
-              label: this.$t('appNavigation.powerRestorePolicy'),
-              route: '/settings/power-restore-policy',
-            },
-          ],
-        },
+        // {
+        //   id: 'settings',
+        //   label: this.$t('appNavigation.settings'),
+        //   icon: 'iconChevronUp',
+        //   children: [
+        //     {
+        //       id: 'network',
+        //       label: this.$t('appNavigation.network'),
+        //       route: '/settings/network',
+        //     },
+        //     {
+        //       id: 'power-restore-policy',
+        //       label: this.$t('appNavigation.powerRestorePolicy'),
+        //       route: '/settings/power-restore-policy',
+        //     },
+        //   ],
+        // },
         {
           id: 'security-and-access',
           label: this.$t('appNavigation.securityAndAccess'),
+          icon: 'iconChevronUp',
           children: [
             {
               id: 'sessions',
@@ -351,17 +333,18 @@ export const AppNavigationMixin = {
             },
           ],
         },
-        {
-          id: 'resource-management',
-          label: this.$t('appNavigation.resourceManagement'),
-          children: [
-            {
-              id: 'power',
-              label: this.$t('appNavigation.power'),
-              route: '/resource-management/power',
-            },
-          ],
-        },
+        // {
+        //   id: 'resource-management',
+        //   label: this.$t('appNavigation.resourceManagement'),
+        //   icon: 'iconChevronUp',
+        //   children: [
+        //     {
+        //       id: 'power',
+        //       label: this.$t('appNavigation.power'),
+        //       route: '/resource-management/power',
+        //     },
+        //   ],
+        // },
       ],
     };
   },
@@ -371,20 +354,20 @@ export const KvmNavigationMixin = {
   data() {
     return {
       kvmNavigationItems: [
+        // {
+        //   id: 'console-settings',
+        //   label: this.$t('appPageTitle.consoleSettings'),
+        //   route: '/console/settings',
+        // },
         {
-          id: 'console-settings',
-          label: this.$t('kvmNavigation.ConsoleSettings'),
-          route: '/console-settings',
+          id: 'kvm',
+          label: this.$t('appNavigation.kvm'),
+          route: '/operations/kvm',
         },
         {
           id: 'serial-over-lan',
-          label: this.$t('kvmNavigation.serialOverLan'),
-          route: '/console/serial-over-lan',
-        },
-        {
-          id: 'kvm',
-          label: this.$t('kvmNavigation.kvm'),
-          route: '/console/kvm',
+          label: this.$t('appPageTitle.serialOverLan'),
+          route: '/operations/serial-over-lan',
         },
       ],
     };
-- 
cgit v1.2.3