fix: Fix cluster visibility for public cluster

Signed-off-by: leoliu <leoliu@yunify.com>
kubesphere · Aug 6, 2020 · d64ef71 · d64ef71
1 parent 6705f16
commit d64ef71
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 56 deletions.
diff --git a/src/pages/clusters/actions/cluster.js b/src/pages/clusters/actions/cluster.js
@@ -46,31 +46,30 @@ export default {
           )
 
           const requests = []
-          if (data.public === false) {
-            if (data.addWorkspaces) {
-              data.addWorkspaces.forEach(item => {
-                const formData = {}
-                const clusters = item.clusters || []
-                set(
-                  formData,
-                  'spec.placement.clusters',
-                  uniqBy([...clusters, { name: cluster.name }], 'name')
-                )
-                requests.push(workspaceStore.patch(item, formData))
-              })
-            }
-            if (data.deleteWorkspaces) {
-              data.deleteWorkspaces.forEach(item => {
-                const formData = {}
-                const clusters = item.clusters || []
-                set(
-                  formData,
-                  'spec.placement.clusters',
-                  clusters.filter(({ name }) => name !== cluster.name)
-                )
-                requests.push(workspaceStore.patch(item, formData))
-              })
-            }
+
+          if (data.addWorkspaces) {
+            data.addWorkspaces.forEach(item => {
+              const formData = {}
+              const clusters = item.clusters || []
+              set(
+                formData,
+                'spec.placement.clusters',
+                uniqBy([...clusters, { name: cluster.name }], 'name')
+              )
+              requests.push(workspaceStore.patch(item, formData))
+            })
+          }
+          if (data.deleteWorkspaces) {
+            data.deleteWorkspaces.forEach(item => {
+              const formData = {}
+              const clusters = item.clusters || []
+              set(
+                formData,
+                'spec.placement.clusters',
+                clusters.filter(({ name }) => name !== cluster.name)
+              )
+              requests.push(workspaceStore.patch(item, formData))
+            })
           }
 
           await Promise.all(requests)

diff --git a/src/pages/clusters/components/Modals/ClusterVisibility/index.jsx b/src/pages/clusters/components/Modals/ClusterVisibility/index.jsx
@@ -211,9 +211,7 @@ export default class ClusterVisibility extends React.Component {
                       key={item.name}
                       data={item}
                       type="authed"
-                      disabled={
-                        isPublic || globals.config.systemWorkspace === item.name
-                      }
+                      disabled={globals.config.systemWorkspace === item.name}
                       onClick={this.handleWorkspaceUnAuth}
                     />
                   ))}

diff --git a/src/pages/clusters/containers/Visibility/index.jsx b/src/pages/clusters/containers/Visibility/index.jsx
@@ -20,7 +20,7 @@ import React from 'react'
 import { toJS } from 'mobx'
 import { observer, inject } from 'mobx-react'
 import Banner from 'components/Cards/Banner'
-import { Alert, Avatar, Button, Panel, Text } from 'components/Base'
+import { Avatar, Button, Panel, Text } from 'components/Base'
 import Table from 'components/Tables/Base'
 import { getLocalTime, getDisplayName } from 'utils'
 import { trigger } from 'utils/action'
@@ -36,9 +36,7 @@ export default class Overview extends React.Component {
   workspaceStore = new WorkspaceStore()
 
   componentDidMount() {
-    if (!this.isClusterPublicVisible) {
-      this.getData()
-    }
+    this.getData()
   }
 
   get cluster() {
@@ -80,9 +78,8 @@ export default class Overview extends React.Component {
   afterEdit = async () => {
     const { cluster } = this.props.match.params
     await this.cluster.fetchDetail({ name: cluster })
-    if (!this.isClusterPublicVisible) {
-      this.getData()
-    }
+
+    this.getData()
   }
 
   getColumns() {
@@ -121,16 +118,6 @@ export default class Overview extends React.Component {
     })
 
   renderVisibility() {
-    if (this.isClusterPublicVisible) {
-      return (
-        <Alert
-          className="margin-t12"
-          title={t('The current cluster is public')}
-          message={t('PUBLIC_CLUSTER_DESC')}
-        />
-      )
-    }
-
     const {
       data,
       total,

diff --git a/src/stores/cluster/index.js b/src/stores/cluster/index.js
@@ -50,9 +50,6 @@ export default class ClusterStore extends Base {
   getAgentUrl = ({ cluster }) =>
     `kapis/cluster.kubesphere.io/v1alpha1/clusters/${cluster}/agent/deployment`
 
-  getTenantUrl = (params = {}) =>
-    `kapis/tenant.kubesphere.io/v1alpha2${this.getPath(params)}/${this.module}`
-
   @action
   async fetchList({ cluster, workspace, namespace, more, ...params } = {}) {
     this.list.isLoading = true
@@ -71,16 +68,9 @@ export default class ClusterStore extends Base {
     let result
     if (!globals.app.isMultiCluster) {
       result = { items: [DEFAULT_CLUSTER] }
-    } else if (
-      globals.app.hasPermission({ module: 'clusters', action: 'view' })
-    ) {
-      result = await request.get(
-        this.getResourceUrl({ cluster, workspace, namespace }),
-        params
-      )
     } else {
       result = await request.get(
-        this.getTenantUrl({ cluster, workspace, namespace }),
+        this.getResourceUrl({ cluster, workspace, namespace }),
         params
       )
     }