fix: edit single_svn bug

kubesphere · Feb 5, 2020 · 650fe76 · 650fe76
1 parent 70a944b
commit 650fe76
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 7 deletions.
diff --git a/src/components/Forms/CICDs/BaseInfo/index.jsx b/src/components/Forms/CICDs/BaseInfo/index.jsx
@@ -90,7 +90,7 @@ export default class BaseInfo extends React.Component {
 
     return (
       <RepoSelectForm
-        sourceData={formTemplate['multi-branch-pipeline']}
+        sourceData={formTemplate['multi_branch_pipeline']}
         project_id={formTemplate.project_id}
         name={formTemplate.name}
         onSave={this.handleRepoChange}

diff --git a/src/components/Forms/CICDs/RepoSelect/subForm.jsx b/src/components/Forms/CICDs/RepoSelect/subForm.jsx
@@ -87,6 +87,15 @@ export default class RepoSelectForm extends React.Component {
           (value, key) => key && key.startsWith('discover') && isEmpty(value)
         ),
       }
+      // initial single_svn type in edit
+      if (this.source_type === 'single_svn') {
+        this.store.formData = {
+          svn_source: {
+            type: 'single_svn',
+            ...this.store.formData.single_svn_source,
+          },
+        }
+      }
     }
   }
 
@@ -157,23 +166,23 @@ export default class RepoSelectForm extends React.Component {
 
   renderTypes() {
     const { enableTypeChange } = this.props
-
+    const sourceType =
+      this.source_type === 'single_svn' ? 'svn' : this.source_type
     return (
       <ul className={styles.repoTypes}>
         {REPO_TYPES.map(type => (
           <li
             className={classNames({
-              [styles.selectType]: type.value === this.source_type,
-              [styles.disabled]:
-                !enableTypeChange && this.source_type !== type.value,
+              [styles.selectType]: type.value === sourceType,
+              [styles.disabled]: !enableTypeChange && sourceType !== type.value,
             })}
             key={type.value}
             data-type={type.value}
             onClick={this.handleTypeChange}
           >
             <Icon
               name={type.icon}
-              type={type.value === this.source_type ? 'light' : 'dark'}
+              type={type.value === sourceType ? 'light' : 'dark'}
               size={32}
             />
             <span>{type.name}</span>

diff --git a/src/utils/devops.js b/src/utils/devops.js
@@ -33,7 +33,7 @@ export const updatePipelineParams = data => {
   const { multi_branch_pipeline, pipeline, type, ...rest } = data
   if (multi_branch_pipeline) {
     rest && Object.assign(data.multi_branch_pipeline, rest)
-    data.type = 'multi-branch-pipeline'
+    data.type = 'multi_branch_pipeline'
     deleteUnenableAttrs(data.multi_branch_pipeline)
   } else {
     if (data.pipeline) {