Added auto-update search + fixed minor bug with label selection

metrico · Mar 1, 2022 · 6071816 · 6071816
1 parent 3723519
commit 6071816
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 9 deletions.
diff --git a/src/actions/LoadLabels.js b/src/actions/LoadLabels.js
@@ -39,7 +39,6 @@ export default function loadLabels(apiUrl) {
                     hidden: false,
                     facets: 0,
                 }));
-               console.log(labels)
                 dispatch(setLabels(labels || []));
 
                 dispatch(setApiError(''))

diff --git a/src/actions/loadLabelValues.js b/src/actions/loadLabelValues.js
@@ -39,6 +39,7 @@ export default function loadLabelValues(label, labelList, apiUrl) {
                         selected: false,
                         loading: false,
                         hidden: false,
+                        inverted: false
                     }));
 
                     const lsList = [...labelList];

diff --git a/src/components/LabelBrowser/ValuesList.js b/src/components/LabelBrowser/ValuesList.js
@@ -94,6 +94,7 @@ export const ValuesList = (props) => {
     const onLabelValueClick = (e, value) => {
         e.preventDefault()
         value.selected = !value.selected;
+        value.inverted = false;
         onLabelValueChange();
     };
 

diff --git a/src/components/LogView.js b/src/components/LogView.js
@@ -1,15 +1,15 @@
+import { ZoomIn, ZoomOut } from "@mui/icons-material/";
+import { CircularProgress, IconButton } from "@mui/material";
+import * as moment from "moment";
 import React, { Component } from "react";
 import { connect } from "react-redux";
-import { CircularProgress } from "@mui/material";
-import * as moment from "moment";
-import store from "../store/store"
-import { IconButton } from "@mui/material";
-import { ZoomIn, ZoomOut } from "@mui/icons-material/";
 import { setLabels } from "../actions";
-import { queryBuilderWithLabels } from "./LabelBrowser/helpers/querybuilder";
 import loadLabelValues from '../actions/loadLabelValues';
 import ClokiChart from "../plugins/charts";
+import store from "../store/store";
+import { queryBuilderWithLabels } from "./LabelBrowser/helpers/querybuilder";
 
+import loadLogs from "../actions/loadLogs"
 const TAGS_LEVEL = {
     critical: ['emerg', 'fatal', 'alert', 'crit', 'critical'],
     error: ['err', 'eror', 'error', 'warning'],
@@ -31,7 +31,6 @@ export const ValueTags = (props) => {
                 labelValue.inverted = !labelValue.inverted && isInverted;
                 label.selected = label.values.some(value => value.selected);
                 store.dispatch(setLabels(labels));
-                queryBuilderWithLabels()
             } else {
                 await store.dispatch(loadLabelValues(label,labels,apiUrl));
                 const updatedLabels = store.getState().labels;
@@ -41,8 +40,9 @@ export const ValueTags = (props) => {
                 labelValue.inverted = !labelValue.inverted && isInverted;
                 updatedLabel.selected = updatedLabel.values.some(value => value.selected);
                 store.dispatch(setLabels(updatedLabels));
-                queryBuilderWithLabels()
             }
+            queryBuilderWithLabels()
+            store.dispatch(loadLogs())
         }
     }
     const getTags = (tags) => {

diff --git a/src/components/UpdateStateFromQueryParams.js b/src/components/UpdateStateFromQueryParams.js
@@ -247,6 +247,7 @@ async function decodeQuery(query, apiUrl) {
             return i.name !== a[k - 1]?.name})
         .filter((i) => !!i);
         labelWithValues.values = values;
+        labelWithValues.selected = true;
         store.dispatch(setLabels(labelsWithValues))
     })