fix: Fix project overview redirect in cluster management

Signed-off-by: leoliu <leoliu@yunify.com>
kubesphere · Jul 21, 2020 · 95512b3 · 95512b3
1 parent 7d041f3
commit 95512b3
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/src/pages/clusters/components/ResourceTable/index.jsx b/src/pages/clusters/components/ResourceTable/index.jsx
@@ -19,6 +19,7 @@
 import React from 'react'
 import { observer, inject } from 'mobx-react'
 import { isEmpty } from 'lodash'
+import { parse } from 'qs'
 
 import {
   Dropdown,
@@ -36,6 +37,17 @@ import ProjectSelect from './ProjectSelect'
 class ResourceTable extends BaseTable {
   routing = this.props.rootStore.routing
 
+  componentDidMount() {
+    super.componentDidMount()
+    const params = parse(location.search.slice(1))
+    if (
+      params.namespace &&
+      this.props.clusterStore.project !== params.namespace
+    ) {
+      this.props.clusterStore.setProject(params.namespace)
+    }
+  }
+
   get showEmpty() {
     const { data, isLoading, filters, clusterStore } = this.props
     return (

diff --git a/src/pages/projects/containers/Overview/ResourceUsage/AppResourceItem/index.jsx b/src/pages/projects/containers/Overview/ResourceUsage/AppResourceItem/index.jsx
@@ -73,7 +73,7 @@ export default class ResourceCard extends React.Component {
       this.routing.push(
         workspace
           ? `/${workspace}/clusters/${cluster}/projects/${namespace}/${routeName}`
-          : `/clusters/${cluster}/${routeName}`
+          : `/clusters/${cluster}/${routeName}?namespace=${namespace}`
       )
     }
   }