fix: Fix workspace create error

kubesphere · May 19, 2020 · 4320f89 · 4320f89
1 parent fb078c3
commit 4320f89
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 3 deletions.
diff --git a/src/actions/resource.delete.js b/src/actions/resource.delete.js
@@ -69,6 +69,7 @@ export default {
           Modal.close(modal)
           Notify.success({ content: `${t('Deleted Successfully')}!` })
           store.setSelectRowKeys([])
+          success && success()
         },
         resource: selectNames.join(', '),
         modal: DeleteModal,

diff --git a/src/pages/access/containers/Workspaces/index.jsx b/src/pages/access/containers/Workspaces/index.jsx
@@ -46,7 +46,11 @@ export default class Workspaces extends React.Component {
         text: t('Edit'),
         action: 'edit',
         show: this.showAction,
-        onClick: item => trigger('resource.baseinfo.edit', { detail: item }),
+        onClick: item =>
+          trigger('resource.baseinfo.edit', {
+            detail: item,
+            success: routing.query,
+          }),
       },
       {
         key: 'delete',
@@ -117,9 +121,10 @@ export default class Workspaces extends React.Component {
   }
 
   showCreate = () => {
-    const { module } = this.props
+    const { module, getData } = this.props
     return this.props.trigger('workspace.create', {
       module,
+      success: getData,
     })
   }
 

diff --git a/src/pages/clusters/components/ResourceTable/ProjectSelect/index.jsx b/src/pages/clusters/components/ResourceTable/ProjectSelect/index.jsx
@@ -34,6 +34,8 @@ export default class ProjectSelect extends Component {
     ]
   }
 
+  valueRenderer = option => `${t('Project')}: ${option.label}`
+
   render() {
     const { namespace = '', store, onChange, onFetch } = this.props
 
@@ -47,6 +49,7 @@ export default class ProjectSelect extends Component {
         total={store.list.total}
         currentLength={store.list.data.length}
         isLoading={store.list.isLoading}
+        valueRenderer={this.valueRenderer}
         onFetch={onFetch}
       />
     )

diff --git a/src/pages/workspaces/components/Modals/WorkspaceCreate/ClusterSettings/index.jsx b/src/pages/workspaces/components/Modals/WorkspaceCreate/ClusterSettings/index.jsx
@@ -35,7 +35,7 @@ export default class BaseInfo extends React.Component {
         </div>
         <Form data={formTemplate} ref={formRef}>
           <Form.Item label={t('Available Clusters')}>
-            <ClusterSelect name="clusters" />
+            <ClusterSelect name="clusters" defaultValue={[]} />
           </Form.Item>
         </Form>
       </div>

diff --git a/src/pages/workspaces/components/ResourceTable/ClusterSelect/index.jsx b/src/pages/workspaces/components/ResourceTable/ClusterSelect/index.jsx
@@ -66,6 +66,8 @@ export default class ClusterSelect extends Component {
     )
   }
 
+  valueRenderer = option => `${t('Cluster')}: ${option.label}`
+
   render() {
     const { cluster = this.hostCluster } = this.props
 
@@ -75,6 +77,7 @@ export default class ClusterSelect extends Component {
         value={cluster}
         onChange={this.handleChange}
         options={this.clusters}
+        valueRenderer={this.valueRenderer}
         page={this.workspaceStore.clusters.page}
         total={this.workspaceStore.clusters.total}
         currentLength={this.workspaceStore.clusters.data.length}