Merge pull request #352 from leoendless/hotfix/linkErrors

fix: Fix some link errors

src/components/Cards/Containers/Item.jsx

@@ -55,7 +55,7 @@ export default class ContainerItem extends React.Component {
     const { cluster, podName } = this.props
     const { namespace, name } = this.props.detail
 
-    const terminalUrl = `/terminal/clusters/${cluster}/projects/${namespace}/pods/${podName}/containers/${name}`
+    const terminalUrl = `/terminal/cluster/${cluster}/projects/${namespace}/pods/${podName}/containers/${name}`
     window.open(
       terminalUrl,
       `Connecting ${name}`,

src/core/global.js

@@ -230,6 +230,10 @@ export default class GlobalValue {
   }
 
   getClusterNavs(cluster) {
+    if (!get(globals.user, `clusterRules[${cluster}]`)) {
+      return []
+    }
+
     if (!this._cache_[`cluster_${cluster}_navs`]) {
       const navs = []
 
@@ -274,6 +278,10 @@ export default class GlobalValue {
   }
 
   getWorkspaceNavs(workspace) {
+    if (!get(globals.user, `workspaceRules[${workspace}]`)) {
+      return []
+    }
+
     if (!this._cache_[`workspace_${workspace}_navs`]) {
       const navs = []
 
@@ -300,6 +308,10 @@ export default class GlobalValue {
   }
 
   getProjectNavs({ cluster, workspace, project }) {
+    if (!get(globals.user, `projectRules[${cluster}][${project}]`)) {
+      return []
+    }
+
     if (!this._cache_[`project_${cluster}_${project}_navs`]) {
       const navs = []
 
@@ -322,6 +334,10 @@ export default class GlobalValue {
   }
 
   getDevOpsNavs({ cluster, workspace, devops }) {
+    if (!get(globals.user, `devopsRules[${cluster}][${devops}]`)) {
+      return []
+    }
+
     if (!this._cache_[`devops_${cluster}_${devops}_navs`]) {
       const navs = []
 

src/locales/en/base.js

@@ -91,6 +91,7 @@ export default {
   CANCEL: 'Cancel',
   NO_RESULTS_FOUND: 'No result found',
   REACH_BOTTOM: 'Reach bottom',
+  CLEAR_VALUE: 'Clear',
   QUOTA_LIMIT_TIP:
     'The configuration here refers to Limits in Kubernetes resource management, which is mainly used to limit the maximum value of resources used by each container.',
 

src/locales/zh/base.js

@@ -348,6 +348,7 @@ export default {
   CANCEL: '取消',
   NO_RESULTS_FOUND: '暂无结果',
   REACH_BOTTOM: '已到底部',
+  CLEAR_VALUE: '清除',
 
   'Edit Mode': '编辑模式',
   'Load More': '加载更多',

src/pages/clusters/containers/Projects/Detail/Overview/index.jsx

@@ -17,10 +17,15 @@
  */
 
 import React from 'react'
+import { inject } from 'mobx-react'
 import ResourceUsage from 'projects/containers/Overview/ResourceUsage'
 
+@inject('detailStore')
 export default class Overview extends React.Component {
   render() {
-    return <ResourceUsage match={this.props.match} />
+    const { detail } = this.props.detailStore
+    return (
+      <ResourceUsage match={this.props.match} workspace={detail.workspace} />
+    )
   }
 }

src/pages/console/routes/index.js

@@ -33,7 +33,7 @@ export default [
   { path: '/auditingsearch', exact: true, component: AuditingSearch },
   {
     path:
-      '/terminal/clusters/:cluster/projects/:namespace/pods/:podName/containers/:containerName',
+      '/terminal/cluster/:cluster/projects/:namespace/pods/:podName/containers/:containerName',
     component: ContainerTerminal,
   },
   {

src/pages/projects/containers/Overview/ResourceUsage/AppResourceItem/index.jsx

@@ -58,30 +58,47 @@ export default class ResourceCard extends React.Component {
     return this.props.rootStore.routing
   }
 
-  get prefix() {
-    const { workspace, namespace, cluster } = this.props
-    return `/${workspace}/clusters/${cluster}/projects/${namespace}`
-  }
-
   handleClick = () => {
-    const { onClick, name, routeName } = this.props
+    const {
+      onClick,
+      name,
+      routeName,
+      workspace,
+      namespace,
+      cluster,
+    } = this.props
     if (isFunction(onClick)) {
       onClick(name)
     } else if (routeName) {
-      this.routing.push(`${this.prefix}/${routeName}`)
+      this.routing.push(
+        workspace
+          ? `/${workspace}/clusters/${cluster}/projects/${namespace}/${routeName}`
+          : `/clusters/${cluster}/${routeName}?namespace=${namespace}`
+      )
     }
   }
 
   handleWarnClick = e => {
     e.stopPropagation()
 
-    const { routeName, onClick, name } = this.props
+    const {
+      routeName,
+      onClick,
+      name,
+      workspace,
+      namespace,
+      cluster,
+    } = this.props
     const status = routeName === 'volumes' ? 'pending' : 'updating'
 
     if (isFunction(onClick)) {
       onClick(name, status)
     } else if (routeName) {
-      this.routing.push(`${this.prefix}/${routeName}?status=${status}`)
+      this.routing.push(
+        workspace
+          ? `/${workspace}/clusters/${cluster}/projects/${namespace}/${routeName}?status=${status}`
+          : `/clusters/${cluster}/${routeName}?namespace=${namespace}&status=${status}`
+      )
     }
   }
 

src/pages/projects/containers/Overview/ResourceUsage/index.jsx

@@ -190,7 +190,9 @@ class ResourceUsage extends React.Component {
         routeName: 's2ibuilders',
         num: used['count/s2ibuilders.devops.kubesphere.io'],
         metric: 'namespace_s2ibuilder_count',
-        disabled: !globals.app.hasKSModule('devops'),
+        disabled:
+          !globals.app.hasKSModule('devops') ||
+          !this.props.match.params.workspace,
       },
       {
         key: 'jobs',

src/pages/projects/containers/Overview/UsageRanking/index.jsx

@@ -65,7 +65,7 @@ class UsageRanking extends React.Component {
     const { workspace, cluster, namespace } = this.props.match.params
     const prefix = `${
       workspace ? `/${workspace}` : ''
-    }/clustes/${cluster}/projects/${namespace}`
+    }/clusters/${cluster}/projects/${namespace}`
     const LINK_MAP = {
       Deployment: `${prefix}/deployments/${workloadName}`,
       StatefulSet: `${prefix}/statefulsets/${workloadName}`,

src/pages/projects/containers/Volumes/Detail/index.jsx

@@ -38,7 +38,9 @@ import getRoutes from './routes'
 @trigger
 export default class VolumeDetail extends React.Component {
   store = new Volume()
+
   storageclass = new StorageClass()
+
   storageclasscapabilities = new StorageClassCapability()
 
   componentDidMount() {
@@ -49,6 +51,10 @@ export default class VolumeDetail extends React.Component {
     return 'Volume'
   }
 
+  get module() {
+    return 'volumes'
+  }
+
   get authKey() {
     return 'volumes'
   }