fix: Fix permission extend

Signed-off-by: leoliu <leoliu@yunify.com>
kubesphere · Jul 23, 2020 · eb47d19 · eb47d19
1 parent 64cd31a
commit eb47d19
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 21 deletions.
diff --git a/src/core/global.js b/src/core/global.js
@@ -51,13 +51,14 @@ export default class GlobalValue {
         `projectRules[${cluster}][${project}]._`,
         this.getActions({ cluster, module })
       )
-      return adapter(
-        get(
+      return adapter([
+        ...get(
           globals.user,
           `projectRules[${cluster}][${project}][${module}]`,
-          defaultActions
-        )
-      )
+          []
+        ),
+        ...defaultActions,
+      ])
     }
 
     if (devops) {
@@ -66,13 +67,14 @@ export default class GlobalValue {
         `devopsRules[${cluster}][${devops}]._`,
         []
       )
-      return adapter(
-        get(
+      return adapter([
+        ...get(
           globals.user,
           `devopsRules[${cluster}][${devops}][${module}]`,
-          defaultActions
-        )
-      )
+          []
+        ),
+        ...defaultActions,
+      ])
     }
 
     if (workspace) {
@@ -81,20 +83,18 @@ export default class GlobalValue {
         `workspaceRules[${workspace}]._`,
         []
       )
-      return adapter(
-        get(
-          globals.user,
-          `workspaceRules[${workspace}][${module}]`,
-          defaultActions
-        )
-      )
+      return adapter([
+        ...get(globals.user, `workspaceRules[${workspace}][${module}]`, []),
+        ...defaultActions,
+      ])
     }
 
     if (cluster) {
       const defaultActions = get(globals.user, `clusterRules[${cluster}]._`, [])
-      return adapter(
-        get(globals.user, `clusterRules[${cluster}][${module}]`, defaultActions)
-      )
+      return adapter([
+        ...get(globals.user, `clusterRules[${cluster}][${module}]`, []),
+        ...defaultActions,
+      ])
     }
 
     return adapter(get(globals.user, `globalRules[${module}]`, []))

diff --git a/src/pages/projects/App.jsx b/src/pages/projects/App.jsx
@@ -41,7 +41,8 @@ class ProjectLayout extends Component {
   }
 
   componentDidUpdate(prevProps) {
-    if (this.project !== prevProps.match.params.namespace) {
+    const { namespace, cluster } = prevProps.match.params
+    if (this.project !== namespace || this.cluster !== cluster) {
       this.init(this.props.match.params)
     }
   }
@@ -82,6 +83,10 @@ class ProjectLayout extends Component {
     return this.props.match.params.namespace
   }
 
+  get cluster() {
+    return this.props.match.params.cluster
+  }
+
   render() {
     const { initializing } = this.store