From 5534413b3a3e6e783310be8147ac8340d3098a7e Mon Sep 17 00:00:00 2001
From: Emiliano Ciavatta
Date: Fri, 16 Oct 2020 15:09:05 +0200
Subject: Fix tests. General refactor

---
 frontend/src/components/filters/AdvancedFilters.js         |  2 +-
 frontend/src/components/filters/RulesConnectionsFilter.js  | 14 +++++++-------
 frontend/src/components/filters/StringConnectionsFilter.js |  8 ++++----
 3 files changed, 12 insertions(+), 12 deletions(-)

(limited to 'frontend/src/components/filters')

diff --git a/frontend/src/components/filters/AdvancedFilters.js b/frontend/src/components/filters/AdvancedFilters.js
index 2b479ed..15667a5 100644
--- a/frontend/src/components/filters/AdvancedFilters.js
+++ b/frontend/src/components/filters/AdvancedFilters.js
@@ -33,7 +33,7 @@ class AdvancedFilters extends Component {
             const active = ["client_address", "client_port", "min_duration", "max_duration", "min_bytes", "max_bytes"]
                 .some(f => this.urlParams.has(f));
             if (this.state.active !== active) {
-                this.setState({active: active});
+                this.setState({active});
             }
         };
         dispatcher.register("connections_filters", this.connectionsFiltersCallback);
diff --git a/frontend/src/components/filters/RulesConnectionsFilter.js b/frontend/src/components/filters/RulesConnectionsFilter.js
index 86eae7e..37d36b7 100644
--- a/frontend/src/components/filters/RulesConnectionsFilter.js
+++ b/frontend/src/components/filters/RulesConnectionsFilter.js
@@ -35,17 +35,17 @@ class RulesConnectionsFilter extends Component {
         const params = new URLSearchParams(this.props.location.search);
         let activeRules = params.getAll("matched_rules") || [];
 
-        backend.get("/api/rules").then(res => {
-            let rules = res.json.flatMap(rule => rule.enabled ? [{id: rule.id, name: rule.name}] : []);
-            activeRules = rules.filter(rule => activeRules.some(id => rule.id === id));
+        backend.get("/api/rules").then((res) => {
+            let rules = res.json.flatMap((rule) => rule.enabled ? [{id: rule.id, name: rule.name}] : []);
+            activeRules = rules.filter((rule) => activeRules.some(id => rule.id === id));
             this.setState({rules, activeRules});
         });
 
-        this.connectionsFiltersCallback = payload => {
+        this.connectionsFiltersCallback = (payload) => {
             if ("matched_rules" in payload && !_.isEqual(payload["matched_rules"].sort(), this.state.activeRules.sort())) {
-                const newRules = this.state.rules.filter(r => payload["matched_rules"].includes(r.id));
+                const newRules = this.state.rules.filter((r) => payload["matched_rules"].includes(r.id));
                 this.setState({
-                    activeRules: newRules.map(r => {
+                    activeRules: newRules.map((r) => {
                         return {id: r.id, name: r.name};
                     })
                 });
@@ -61,7 +61,7 @@ class RulesConnectionsFilter extends Component {
     onChange = (activeRules) => {
         if (!_.isEqual(activeRules.sort(), this.state.activeRules.sort())) {
             this.setState({activeRules});
-            dispatcher.dispatch("connections_filters", {"matched_rules": activeRules.map(r => r.id)});
+            dispatcher.dispatch("connections_filters", {"matched_rules": activeRules.map((r) => r.id)});
         }
     };
 
diff --git a/frontend/src/components/filters/StringConnectionsFilter.js b/frontend/src/components/filters/StringConnectionsFilter.js
index c3c5925..c5d7075 100644
--- a/frontend/src/components/filters/StringConnectionsFilter.js
+++ b/frontend/src/components/filters/StringConnectionsFilter.js
@@ -33,7 +33,7 @@ class StringConnectionsFilter extends Component {
         let params = new URLSearchParams(this.props.location.search);
         this.updateStateFromFilterValue(params.get(this.props.filterName));
 
-        this.connectionsFiltersCallback = payload => {
+        this.connectionsFiltersCallback = (payload) => {
             const name = this.props.filterName;
             if (name in payload && this.state.filterValue !== payload[name]) {
                 this.updateStateFromFilterValue(payload[name]);
@@ -56,7 +56,7 @@ class StringConnectionsFilter extends Component {
                 fieldValue = this.props.replaceFunc(fieldValue);
             }
             if (this.isValueValid(fieldValue)) {
-                this.setState({fieldValue, filterValue: filterValue});
+                this.setState({fieldValue, filterValue});
             } else {
                 this.setState({fieldValue, invalidValue: true});
             }
@@ -98,9 +98,9 @@ class StringConnectionsFilter extends Component {
             }
 
             this.setState({
-                fieldValue: fieldValue,
+                fieldValue,
                 timeoutHandle: setTimeout(() => {
-                    this.setState({filterValue: filterValue});
+                    this.setState({filterValue});
                     this.changeFilterValue(filterValue);
                 }, 500),
                 invalidValue: false
-- 
cgit v1.2.3-70-g09d2