From 30af9d31ecd9ad0badd2481502e43ff24b6c39ae Mon Sep 17 00:00:00 2001
From: Erki Aas <eaas@k-space.ee>
Date: Mon, 7 Nov 2022 16:41:23 +0200
Subject: [PATCH] Store query as object not array

---
 src/components/LogViewer.vue | 17 +++++++----------
 src/stores/index.js          |  7 ++++++-
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/components/LogViewer.vue b/src/components/LogViewer.vue
index ade154c..7b4568b 100644
--- a/src/components/LogViewer.vue
+++ b/src/components/LogViewer.vue
@@ -26,7 +26,7 @@ import ExamineLogModal from "./Modal/ExamineLogModal.vue";
 import ComboboxFilter from "./Filter/ComboboxFilter.js";
 import flattenObj from "../helpers/flattenObj";
 import parseEventData from "../helpers/parseEventData";
-import { mapActions } from 'vuex';
+import {mapActions, mapGetters} from 'vuex';
 import config from "./Grid/Main/config";
 
 export default {
@@ -57,7 +57,7 @@ export default {
   },
   created() {
     // TODO: monitor actual URL
-    this.setFilterQuery([])
+    this.setFilterQuery({})
   },
   methods: {
     ...mapActions({
@@ -67,9 +67,9 @@ export default {
     setupStream() {
       this.es && this.es.close();
       let url = new URL('/events', window.location.href);
-      this.filterQuery.map((e) => {
-        url.searchParams.append(e.key, e.value);
-      })
+      for (const key in this.filterQuery) {
+        url.searchParams.append(key, this.filterQuery[key]);
+      }
       let es = new EventSource(url.toString());
       es.onmessage = (e) => this.handleReceiveMessage(e)
       es.addEventListener("filters", (e) => this.handleReceiveFilters(e))
@@ -88,7 +88,7 @@ export default {
       this.gridApi.addGlobalListener((type, event) => {
         if (type === 'filterChanged') {
           let changedColumn = event.columns[0] ? (event.columns[0].colId) : null
-          let query = []
+          let query = {}
           let gridColumns = event.columnApi.columnModel.gridColumns
           gridColumns.map((column) => {
             // Reset child column filter if parent changed
@@ -100,10 +100,7 @@ export default {
               this.gridApi.onFilterChanged();
             }
             if (column.filterActive) {
-              query.push({
-                key: column.colId,
-                value: column.filterActive
-              })
+              query[column.colId] = column.filterActive
             }
           })
           this.setFilterQuery(query)
diff --git a/src/stores/index.js b/src/stores/index.js
index 50c5422..c9737d8 100644
--- a/src/stores/index.js
+++ b/src/stores/index.js
@@ -3,7 +3,12 @@ import { createStore } from "vuex"
 const store = createStore({
   state: {
     filterOptions: {},
-    filterQuery: []
+    filterQuery: {}
+  },
+  getters: {
+    filterQuery (state) {
+      return state.filterQuery
+    }
   },
   actions: {
     setFilterOptions(context, payload) {