fix: Fix user permission

Signed-off-by: leoliu <leoliu@yunify.com>
kubesphere · Jul 23, 2020 · 7ac7239 · 7ac7239
1 parent 1244ac8
commit 7ac7239
Show file tree

Hide file tree

Showing 14 changed files with 122 additions and 64 deletions.
diff --git a/server/config.yaml b/server/config.yaml
@@ -228,7 +228,7 @@ client:
   workspaceNavs:
     - cate: 'workspace'
       items:
-        - { name: overview, title: Overview, icon: dashboard, skipAuth: true }
+        - { name: overview, title: Overview, icon: dashboard, authKey: 'projects' }
         - name: projects
           title: NAV_PROJECTS
           icon: project

diff --git a/src/components/Modals/CustomMonitoring/index.jsx b/src/components/Modals/CustomMonitoring/index.jsx
@@ -78,10 +78,12 @@ export default class CustomMonitoringModal extends React.Component {
               <ThemeSwitchButton />
               <TimeRangeSelect />
               <RefreshIntervalSelector />
-              <SwitchButton
-                onSaveClick={this.props.onSave}
-                isSubmitting={this.props.isSubmitting}
-              />
+              {!this.props.readOnly && (
+                <SwitchButton
+                  onSaveClick={this.props.onSave}
+                  isSubmitting={this.props.isSubmitting}
+                />
+              )}
             </>
           }
         >

diff --git a/src/components/Modals/EditAuthorization/index.jsx b/src/components/Modals/EditAuthorization/index.jsx
@@ -80,7 +80,7 @@ export default class EditAuthorizationModal extends React.Component {
   }
 
   handleOk = () => {
-    this.props.onOk(this.state.roleTemplates)
+    this.props.onOk([...this.state.roleTemplates, 'role-template-view-basic'])
   }
 
   handleTabChange = e => {

diff --git a/src/components/Modals/ProjectSelect/index.jsx b/src/components/Modals/ProjectSelect/index.jsx
@@ -159,7 +159,7 @@ export default class ProjectSelectModal extends React.Component {
 
   handleEnterWorkspace = () => {
     const { workspace, onChange } = this.props
-    return onChange(`/workspaces/${workspace}/overview`)
+    return onChange(`/workspaces/${workspace}`)
   }
 
   handleOnEnter = item => {

diff --git a/src/pages/fedprojects/containers/Overview/BaseInfo/index.jsx b/src/pages/fedprojects/containers/Overview/BaseInfo/index.jsx
@@ -40,9 +40,7 @@ export default class BaseInfo extends React.Component {
         </div>
         <div className={styles.content}>
           <Text
-            title={
-              <Link to={`/workspaces/${workspace}/overview`}>{workspace}</Link>
-            }
+            title={<Link to={`/workspaces/${workspace}`}>{workspace}</Link>}
             description={t('Workspace')}
           />
           <Text title={detail.creator || '-'} description={t('Creator')} />

diff --git a/src/pages/fedprojects/containers/Overview/ResourceUsage/index.jsx b/src/pages/fedprojects/containers/Overview/ResourceUsage/index.jsx
@@ -201,10 +201,10 @@ class ResourceUsage extends React.Component {
         metric: 'namespace_service_count',
       },
       {
-        key: 'routes',
+        key: 'ingresses',
         icon: ICON_TYPES['ingresses'],
         name: 'Routes',
-        routeName: 'routes',
+        routeName: 'ingresses',
         num: used['count/ingresses.extensions'],
         metric: 'namespace_ingresses_extensions_count',
       },

diff --git a/src/pages/projects/containers/CustomMonitoring/EditDashborad/index.jsx b/src/pages/projects/containers/CustomMonitoring/EditDashborad/index.jsx
@@ -74,6 +74,7 @@ export default class CrateDashboardModalContainer extends React.Component {
         isSaving={this.props.isSubmitting}
         onCancel={this.props.onCancel}
         onSave={this.onSave}
+        readOnly={this.props.readOnly}
       />
     )
   }

diff --git a/src/pages/projects/containers/CustomMonitoring/index.jsx b/src/pages/projects/containers/CustomMonitoring/index.jsx
@@ -188,6 +188,7 @@ export default class CustomMonitoringDashboards extends React.Component {
             isSaving={this.props.store.isSubmitting}
             onCancel={this.hideEditModal}
             onSave={this.editDashboard}
+            readOnly={!tableProps.enabledActions.includes('edit')}
           />
         )}
       </div>

diff --git a/src/pages/projects/containers/Network/Policies/IsolateInfo/index.jsx b/src/pages/projects/containers/Network/Policies/IsolateInfo/index.jsx
@@ -29,16 +29,18 @@ export default class IsolateInfo extends React.Component {
       opened: props.networkIsolate,
     }
   }
+
   toggle = () => {
     const { opened } = this.state
     this.props.onEdit(!opened)
     this.setState({
       opened: !opened,
     })
   }
+
   render() {
     const { opened } = this.state
-    const { module } = this.props
+    const { module, canEdit } = this.props
     return (
       <div className={styles.wrapper}>
         <div className={styles.left}>
@@ -55,13 +57,15 @@ export default class IsolateInfo extends React.Component {
             <div>{t('NETWORK_POLICY_STATUS')}</div>
           </div>
         </div>
-        <div
-          className={classNames(styles.toggle, opened ? '' : styles.closed)}
-          onClick={this.toggle}
-        >
-          <span>{opened ? t('On') : t('Close')}</span>
-          <label className={styles.toggleop} />
-        </div>
+        {canEdit && (
+          <div
+            className={classNames(styles.toggle, opened ? '' : styles.closed)}
+            onClick={this.toggle}
+          >
+            <span>{opened ? t('On') : t('Close')}</span>
+            <label className={styles.toggleop} />
+          </div>
+        )}
       </div>
     )
   }

diff --git a/src/pages/projects/containers/Network/Policies/RuleInfo/index.jsx b/src/pages/projects/containers/Network/Policies/RuleInfo/index.jsx
@@ -193,13 +193,15 @@ export default class RuleInfo extends React.Component {
               )
             })}
           </div>
-          <Icon
-            name="trash"
-            changeable
-            onClick={() => {
-              this.handleDelete(get(item, 'metadata.name'))
-            }}
-          />
+          {this.props.canEdit && (
+            <Icon
+              name="trash"
+              changeable
+              onClick={() => {
+                this.handleDelete(get(item, 'metadata.name'))
+              }}
+            />
+          )}
         </div>
       ))}
     </>
@@ -233,19 +235,22 @@ export default class RuleInfo extends React.Component {
               )
             })}
           </div>
-          <Icon
-            name="trash"
-            changeable
-            onClick={() => {
-              this.handleDelete(get(item, 'metadata.name'))
-            }}
-          />
+          {this.props.canEdit && (
+            <Icon
+              name="trash"
+              changeable
+              onClick={() => {
+                this.handleDelete(get(item, 'metadata.name'))
+              }}
+            />
+          )}
         </div>
       ))}
     </>
   )
 
   renderInner() {
+    const { canEdit } = this.props
     const { list } = this.store
     const { curTab } = this.state
     const innerEgressData = []
@@ -285,9 +290,11 @@ export default class RuleInfo extends React.Component {
         <div className={classNames({ hide: curTab === 'outer' })}>
           <div className={styles.rulemenu}>
             <div>{t('NETWORK_POLICY_R1_DESC1')}</div>
-            <Button onClick={this.addAllowList} className={styles.addBtn}>
-              {t('Add Allowlist')}
-            </Button>
+            {canEdit && (
+              <Button onClick={this.addAllowList} className={styles.addBtn}>
+                {t('Add Allowlist')}
+              </Button>
+            )}
           </div>
           <div className={styles.rulebody}>
             <div
@@ -313,9 +320,11 @@ export default class RuleInfo extends React.Component {
         <div className={classNames({ hide: curTab === 'inner' })}>
           <div className={styles.rulemenu}>
             <div>{t('NETWORK_POLICY_R2_DESC1')}</div>
-            <Button onClick={this.addIpBlock} className={styles.addBtn}>
-              {t('Add Rule')}
-            </Button>
+            {canEdit && (
+              <Button onClick={this.addIpBlock} className={styles.addBtn}>
+                {t('Add Rule')}
+              </Button>
+            )}
           </div>
           <div className={styles.rulebody}>
             <div

diff --git a/src/pages/projects/containers/Network/Policies/index.jsx b/src/pages/projects/containers/Network/Policies/index.jsx
@@ -66,6 +66,14 @@ export default class Policies extends React.Component {
     return get(this.projectStore, 'detail.workspace', '')
   }
 
+  get enabledActions() {
+    return globals.app.getActions({
+      module: 'project-settings',
+      ...this.params,
+      project: this.params.namespace,
+    })
+  }
+
   toggleNetworkIsolate = (flag = true) => {
     const data = {}
     set(
@@ -93,6 +101,8 @@ export default class Policies extends React.Component {
         'detail.annotations["kubesphere.io/network-isolate"]'
       ) === 'enabled'
 
+    const canEdit = this.enabledActions.includes('edit')
+
     return (
       <div>
         <Banner
@@ -110,13 +120,15 @@ export default class Policies extends React.Component {
             desc={t('NETWORK_POLICY_EMP_DESC')}
             className={styles.eplist}
             actions={
-              <Button
-                type="control"
-                loading={isSubmitting}
-                onClick={this.toggleNetworkIsolate}
-              >
-                {t('On')}
-              </Button>
+              canEdit && (
+                <Button
+                  type="control"
+                  loading={isSubmitting}
+                  onClick={this.toggleNetworkIsolate}
+                >
+                  {t('On')}
+                </Button>
+              )
             }
           />
         ) : (
@@ -125,12 +137,14 @@ export default class Policies extends React.Component {
               module={module}
               networkIsolate={networkIsolate}
               onEdit={this.handleEditNetworkIsolate}
+              canEdit={canEdit}
             />
             <RuleInfo
               module={module}
               namespace={namespace}
               cluster={cluster}
               workspace={workspace}
+              canEdit={canEdit}
             />
           </Panel>
         )}

diff --git a/src/pages/workspaces/containers/Base/List/index.jsx b/src/pages/workspaces/containers/Base/List/index.jsx
@@ -16,7 +16,6 @@
  * along with KubeSphere Console.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-// import { get } from 'lodash'
 import React, { Component } from 'react'
 import { inject, observer } from 'mobx-react'
 
@@ -36,11 +35,31 @@ class WorkspaceLayout extends Component {
     return this.props.rootStore.routing
   }
 
+  get canViewOverview() {
+    return globals.app.hasPermission({
+      workspace: this.workspace,
+      module: 'projects',
+      action: 'view',
+    })
+  }
+
+  getRoutes() {
+    const { routes, path } = this.props.route
+    if (routes && !this.canViewOverview) {
+      routes.forEach(route => {
+        if (route.path === path && route.redirect) {
+          route.redirect.to = `${path}/projects`
+        }
+      })
+    }
+    return routes
+  }
+
   enterWorkspace = async workspace =>
     this.routing.push(`/workspaces/${workspace}/overview`)
 
   render() {
-    const { match, route, location } = this.props
+    const { match, location } = this.props
     const { detail } = this.props.workspaceStore
     return (
       <div className="ks-page">
@@ -57,7 +76,7 @@ class WorkspaceLayout extends Component {
             match={match}
           />
         </div>
-        <div className="ks-page-main">{renderRoutes(route.routes)}</div>
+        <div className="ks-page-main">{renderRoutes(this.getRoutes())}</div>
       </div>
     )
   }

diff --git a/src/pages/workspaces/containers/BaseInfo/index.jsx b/src/pages/workspaces/containers/BaseInfo/index.jsx
@@ -44,7 +44,7 @@ class BaseInfo extends React.Component {
   }
 
   componentDidMount() {
-    this.fetchMetrics()
+    this.canViewWorkspaceProjects && this.fetchMetrics()
   }
 
   get store() {
@@ -83,6 +83,14 @@ class BaseInfo extends React.Component {
     })
   }
 
+  get canViewWorkspaceProjects() {
+    return globals.app.hasPermission({
+      module: 'projects',
+      action: 'view',
+      workspace: this.workspace,
+    })
+  }
+
   getMetrics = () => {
     const data = toJS(this.monitorStore.statistics.data)
     const metrics = {}
@@ -214,18 +222,20 @@ class BaseInfo extends React.Component {
             </Button>
           )}
         </div>
-        <div className={styles.content}>
-          {options
-            .filter(option => !option.hidden)
-            .map(option => (
-              <Text
-                key={option.name}
-                icon={option.icon}
-                title={option.value}
-                description={t(option.name)}
-              />
-            ))}
-        </div>
+        {this.canViewWorkspaceProjects && (
+          <div className={styles.content}>
+            {options
+              .filter(option => !option.hidden)
+              .map(option => (
+                <Text
+                  key={option.name}
+                  icon={option.icon}
+                  title={option.value}
+                  description={t(option.name)}
+                />
+              ))}
+          </div>
+        )}
       </Panel>
     )
   }

diff --git a/src/pages/workspaces/containers/Members/Detail/index.jsx b/src/pages/workspaces/containers/Members/Detail/index.jsx
@@ -129,7 +129,7 @@ export default class MemberDetail extends React.Component {
       attrs: this.getAttrs(),
       breadcrumbs: [
         {
-          label: t('Workspace Roles'),
+          label: t('Workspace Members'),
           url: this.listUrl,
         },
       ],