fix query parameter parsing for info pages

matt-deboer · Oct 31, 2017 · 268382e · 268382e
1 parent 9bef496
commit 268382e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/pkg/ui/src/containers/AccessControlsInfo.js b/pkg/ui/src/containers/AccessControlsInfo.js
@@ -180,6 +180,8 @@ class AccessControlsInfo extends React.Component {
     let fetching = Object.keys(props.fetching).length > 0
     let resourceInfoPage = null
     let resourceNotFound = null
+    let query = queryString.parse(this.props.location.search)
+    let activeTab = query.view || 'config'
 
     if (!!this.state.resource) {
       if (this.state.resource.notFound && !fetching) {
@@ -196,7 +198,7 @@ class AccessControlsInfo extends React.Component {
             resourceGroup={'access'}
             resource={this.state.resource}
             events={events}
-            activeTab={(this.props.location.search || 'config').replace('?view=','')}
+            activeTab={activeTab}
             />
       }
     }

diff --git a/pkg/ui/src/containers/ClusterInfo.js b/pkg/ui/src/containers/ClusterInfo.js
@@ -8,6 +8,7 @@ import { withRouter } from 'react-router-dom'
 import ResourceInfoPage from '../components/ResourceInfoPage'
 import LoadingSpinner from '../components/LoadingSpinner'
 import LogFollower from '../utils/LogFollower'
+import queryString from 'query-string'
 import ResourceNotFoundPage from '../components/ResourceNotFoundPage'
 import { sameResourceVersion, sameResource, resourceMatchesParams } from '../utils/resource-utils'
 import Loadable from 'react-loadable'
@@ -157,6 +158,8 @@ class ClusterInfo extends React.Component {
     let fetching = Object.keys(props.fetching).length > 0
     let resourceInfoPage = null
     let resourceNotFound = null
+    let query = queryString.parse(this.props.location.search)
+    let activeTab = query.view || 'config'
 
     if (!!this.state.resource) {
       if (this.state.resource.notFound && !fetching) {
@@ -175,7 +178,7 @@ class ClusterInfo extends React.Component {
             logs={logs}
             events={events}
             onLogsActivated={this.onLogsActivated.bind(this)}
-            activeTab={(props.location.search || 'config').replace('?view=','')}
+            activeTab={activeTab}
             />
       }
     }

diff --git a/pkg/ui/src/containers/WorkloadInfo.js b/pkg/ui/src/containers/WorkloadInfo.js
@@ -231,6 +231,8 @@ class WorkloadInfo extends React.Component {
     let fetching = Object.keys(props.fetching).length > 0
     let resourceInfoPage = null
     let resourceNotFound = null
+    let query = queryString.parse(this.props.location.search)
+    let activeTab = query.view || 'config'
 
     if (!!this.state.resource) {
       if (this.state.resource.notFound && !fetching) {
@@ -249,7 +251,7 @@ class WorkloadInfo extends React.Component {
             logs={logs}
             events={events}
             onLogsActivated={this.onLogsActivated.bind(this)}
-            activeTab={(this.props.location.search || 'config').replace('?view=','')}
+            activeTab={activeTab}
             />
       }
     }

diff --git a/pkg/ui/src/state/actions/resources.js b/pkg/ui/src/state/actions/resources.js
@@ -192,8 +192,12 @@ function updateFilterUrl(dispatch, getState) {
   newFilterNames && newFilterNames.sort()
 
   if (!arraysEqual(newFilterNames, currentFilterNames)) {
-    query.filters = newFilterNames
-    let filterQuery = newFilterNames && newFilterNames.length > 0 ? 
+    if (newFilterNames.length > 0) {
+      query.filters = newFilterNames
+    } else {
+      delete query.filters
+    }
+    let filterQuery = Object.keys(query).length > 0 ? 
       `?${queryString.stringify(query)}` :
       ''
     dispatch(routerActions.push(`${path}${filterQuery}`))