Merge branch 'sila' into sila-smnp

4 files changed, 18 insertions, 20 deletions

diff --git a/src/components/_sila/Mixins/TableFilterMixin.js b/src/components/_sila/Mixins/TableFilterMixin.js
index 7a2cc540..295ca7e5 100644
--- a/src/components/_sila/Mixins/TableFilterMixin.js
+++ b/src/components/_sila/Mixins/TableFilterMixin.js
@@ -1,5 +1,3 @@
-import { includes } from 'lodash';
-
 const TableFilterMixin = {
   methods: {
     getFilteredTableData(tableData = [], filters = []) {
@@ -9,19 +7,19 @@ const TableFilterMixin = {
       // If no filters are active, then return all table data
       if (filterItems.length === 0) return tableData;
 
-      // Check if row property value is included in list of
-      // active filters
-      return tableData.filter((row) => {
-        let returnRow = false;
-        for (const { key, values } of filters) {
-          const rowProperty = row[key];
-          if (rowProperty && includes(values, rowProperty)) {
-            returnRow = true;
-            break;
-          }
-        }
-        return returnRow;
+      // remove empty filters
+      filters = filters.filter((filter) => {
+        return filter.values && filter.values.length > 0;
       });
+
+      let result = tableData;
+      filters.forEach((filter) => {
+        result = result.filter((row) =>
+          filter.values.includes(row[filter.key])
+        );
+      });
+
+      return result;
     },
     getFilteredTableDataByDate(
       tableData = [],
diff --git a/src/env/components/AppNavigation/sila.js b/src/env/components/AppNavigation/sila.js
index cf30f77e..69c2d477 100644
--- a/src/env/components/AppNavigation/sila.js
+++ b/src/env/components/AppNavigation/sila.js
@@ -58,11 +58,11 @@ const AppNavigationMixin = {
               label: this.$t('appNavigation.kvm'),
               route: '/operations/kvm',
             },
-            {
+            /*{
               id: 'key-clear',
               label: this.$t('appNavigation.keyClear'),
               route: '/operations/key-clear',
-            },
+            },*/
             {
               id: 'firmware',
               label: this.$t('appNavigation.firmware'),
diff --git a/src/env/router/sila.js b/src/env/router/sila.js
index eb1ac1e7..8ba9585f 100644
--- a/src/env/router/sila.js
+++ b/src/env/router/sila.js
@@ -25,7 +25,7 @@ import Sensors from '@/views/_sila/HardwareStatus/Sensors';
 import SerialOverLan from '@/views/_sila/Operations/SerialOverLan';
 import SerialOverLanConsole from '@/views/_sila/Operations/SerialOverLan/SerialOverLanConsole';
 import ServerPowerOperations from '@/views/_sila/Operations/ServerPowerOperations';
-import KeyClear from '@/views/_sila/Operations/KeyClear';
+//import KeyClear from '@/views/_sila/Operations/KeyClear';
 import Certificates from '@/views/_sila/SecurityAndAccess/Certificates';
 import VirtualMedia from '@/views/_sila/Operations/VirtualMedia';
 import Power from '@/views/_sila/ResourceManagement/Power';
@@ -304,14 +304,14 @@ const routes = [
           title: i18n.t('appPageTitle.factoryReset'),
         },
       },
-      {
+      /*{
         path: '/operations/key-clear',
         name: 'key-clear',
         component: KeyClear,
         meta: {
           title: i18n.t('appPageTitle.keyClear'),
         },
-      },
+      },*/
       {
         path: '/operations/reboot-bmc',
         name: 'reboot-bmc',
diff --git a/src/store/plugins/WebSocketPlugin.js b/src/store/plugins/WebSocketPlugin.js
index 29a98c20..a635bf34 100644
--- a/src/store/plugins/WebSocketPlugin.js
+++ b/src/store/plugins/WebSocketPlugin.js
@@ -42,7 +42,7 @@ const WebSocketPlugin = (store) => {
           store.dispatch('global/changeServerStatus', CurrentHostState);
         }
       } else if (path === '/xyz/openbmc_project/logging') {
-        store.dispatch('eventLog/getEventLogData');
+        // store.dispatch('eventLog/getEventLogData');
       }
     };
   };