Fixed filters displaying when tab changed

c0rv4x · Mar 11, 2019 · de03196 · de03196
1 parent 2f676cc
commit de03196
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 3 deletions.
diff --git a/app/src/common/search/Search.jsx b/app/src/common/search/Search.jsx
@@ -5,16 +5,18 @@ import { Box, MaskedInput, Keyboard } from 'grommet'
 import { Close } from 'grommet-icons'
 
 
+
 class Search extends React.Component {
 	constructor(props) {
 		super(props);
 
 		this.state = {
 			currentEnteredValue: "",
-			currentValue: [],
+			currentValue: this.propsFiltersToCurrentValue(),
 			lastHighlighted: false
 		}
 
+		this.propsFiltersToCurrentValue = this.propsFiltersToCurrentValue.bind(this);
 		this.handleOnChange = this.handleOnChange.bind(this);
 		this.addOption = this.addOption.bind(this);
 		this.popOption = this.popOption.bind(this);
@@ -26,6 +28,20 @@ class Search extends React.Component {
 		return (!_.isEqual(nextProps, this.props) || !_.isEqual(nextState, this.state));
 	}
 
+	propsFiltersToCurrentValue() {
+		const { filters } = this.props;
+
+		let gatheredValue = [];
+
+		for (let key of Object.keys(filters)) {
+			for (let value of filters[key]) {
+				gatheredValue.push(key + ": " + value);
+			}
+		}
+
+		return gatheredValue;
+	}
+
 	handleOnChange(value) {
 		this.setState({ currentValue: value });
 	}

diff --git a/app/src/hosts_list/components/HostsTable.jsx b/app/src/hosts_list/components/HostsTable.jsx
@@ -74,7 +74,7 @@ class HostsTable extends React.Component {
 
 		return (
 			<div>
-				<Search applyFilters={applyFilters} />
+				<Search filters={hosts.filters} applyFilters={applyFilters} />
 				<br />
 				{hosts.data.length === 0 && hosts.loaded && 
 					<Heading level="2">No data found.</Heading>

diff --git a/app/src/ips_list/components/IPTable.jsx b/app/src/ips_list/components/IPTable.jsx
@@ -79,7 +79,7 @@ class IPTable extends React.Component {
 
 		return (
 			<div>
-				<Search applyFilters={applyFilters} />
+				<Search filters={ips.filters} applyFilters={applyFilters} />
 				<br />
 				{ipsList.length === 0 && ips.loaded && 
 					<Heading level="2">No data found.</Heading>