fix: Fix some issues about alias, get the pipeline data and the build…

… mirror restart Signed-off-by: harrisonliu5 <harrisonliu_5@163.com>
kubesphere · Aug 6, 2020 · 38f2c18 · 38f2c18
1 parent a7206bf
commit 38f2c18
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 13 deletions.
diff --git a/src/actions/imagebuilder.js b/src/actions/imagebuilder.js
@@ -76,7 +76,6 @@ export default {
         onOk: data => {
           const environment = filterImageEnv(data, v => !isEmpty(v))
           set(data, 'spec.config.environment', environment)
-
           store.updateBuilder(data, detail).then(() => {
             Modal.close(modal)
             success && success()
@@ -85,6 +84,7 @@ export default {
         detail: toJS(detail._originData),
         modal: RerunModal,
         cluster: detail.cluster,
+        namespace: detail.namespace,
         store,
         ...props,
       })

diff --git a/src/components/Forms/AlertingPolicy/BaseInfo/index.jsx b/src/components/Forms/AlertingPolicy/BaseInfo/index.jsx
@@ -83,7 +83,7 @@ export default class BaseInfo extends React.Component {
           </Column>
           <Column>
             <Form.Item label={t('Alias')} desc={t('ALIAS_DESC')}>
-              <Input name="policy.policy_name" />
+              <Input name="policy.policy_name" maxLength={63} />
             </Form.Item>
           </Column>
         </Columns>

diff --git a/src/components/Forms/ImageBuilder/RerunForm/index.jsx b/src/components/Forms/ImageBuilder/RerunForm/index.jsx
@@ -94,7 +94,14 @@ export default class RerunForm extends React.Component {
   }
 
   render() {
-    const { visible, isSubmitting, onCancel, cluster, detail } = this.props
+    const {
+      visible,
+      isSubmitting,
+      onCancel,
+      cluster,
+      detail,
+      namespace,
+    } = this.props
     const isB2i = get(detail, 'spec.config.isBinaryURL')
 
     return (
@@ -115,13 +122,15 @@ export default class RerunForm extends React.Component {
             formTemplate={detail}
             formRef={this.content}
             cluster={cluster}
+            namespace={namespace}
             mode="edit"
           />
         ) : (
           <S2iForm
             formTemplate={detail}
             formRef={this.content}
             cluster={cluster}
+            namespace={namespace}
             mode="edit"
           />
         )}

diff --git a/src/components/Modals/DevOpsEdit/index.jsx b/src/components/Modals/DevOpsEdit/index.jsx
@@ -112,7 +112,7 @@ export default class DevOpsEditModal extends React.Component {
           <Select name="creator" options={this.getMembersOptions()} disabled />
         </Form.Item>
         <Form.Item label={t('Alias')} desc={t('ALIAS_DESC')}>
-          <Input name="aliasName" />
+          <Input name="aliasName" maxLength={63} />
         </Form.Item>
         <Form.Item label={t('Description')} desc={t('DESCRIPTION_DESC')}>
           <TextArea maxLength={256} name="description" />

diff --git a/src/pages/devops/components/Modals/DevOpsEdit/index.jsx b/src/pages/devops/components/Modals/DevOpsEdit/index.jsx
@@ -101,7 +101,7 @@ export default class DevOpsEditModal extends React.Component {
           <Input name="creator" disabled />
         </Form.Item>
         <Form.Item label={t('Alias')} desc={t('ALIAS_DESC')}>
-          <Input name="aliasName" />
+          <Input name="aliasName" maxLength={63} />
         </Form.Item>
         <Form.Item label={t('Description')} desc={t('DESCRIPTION_DESC')}>
           <TextArea maxLength={256} name="description" />

diff --git a/src/pages/devops/containers/Pipelines/index.jsx b/src/pages/devops/containers/Pipelines/index.jsx
@@ -316,9 +316,11 @@ class CICDs extends React.Component {
         cluster: this.cluster,
       })
       .finally(() => {
-        this.setState({ isSubmitting: false, showCreate: false }, () => {
-          this.getData()
-        })
+        setTimeout(() => {
+          this.setState({ isSubmitting: false, showCreate: false }, () => {
+            this.getData()
+          })
+        }, 1000)
       })
 
     if (!result) {
@@ -369,11 +371,10 @@ class CICDs extends React.Component {
     await this.store
       .deletePipeline(name, this.devops, this.cluster)
       .finally(() => {
-        this.setState({ isSubmitting: false })
+        this.setState({ isSubmitting: false, showDelete: false }, () => {
+          this.handleFetch()
+        })
       })
-
-    this.setState({ showDelete: false })
-    this.handleFetch()
   }
 
   getStatus() {
@@ -507,7 +508,11 @@ class CICDs extends React.Component {
               rowKey: 'name',
               devops: this.devops,
               cluster: this.cluster,
-              success: this.routing.query,
+              success: () => {
+                setTimeout(() => {
+                  this.handleFetch()
+                }, 1000)
+              },
             }),
         },
       ],