fix: Fix devops and pipiline check api (#1430) (#4151)

fix: fix devops and pipiline check api (#1430) Signed-off-by: yazhou <yazhouhu@yunify.com>
kubesphere · Jun 25, 2023 · e58ecf0 · e58ecf0
1 parent 742b8e3
commit e58ecf0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 12 deletions.
diff --git a/src/components/Forms/Pipelines/BaseInfo/index.jsx b/src/components/Forms/Pipelines/BaseInfo/index.jsx
@@ -88,7 +88,7 @@ export default class BaseInfo extends React.Component {
                   pattern: PATTERN_NAME,
                   message: t('INVALID_NAME_DESC'),
                 },
-                // { validator: this.validator },
+                { validator: this.validator },
               ]}
             >
               <Input name="name" maxLength={63} />

diff --git a/src/pages/devops/version b/src/pages/devops/version
@@ -1 +1 @@
-1686562525
+1686647106
diff --git a/src/stores/devops.js b/src/stores/devops.js
@@ -16,7 +16,7 @@
  * along with KubeSphere Console.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { cloneDeep, get, isArray, pick, omit, set } from 'lodash'
+import { cloneDeep, get, isArray, omit, set } from 'lodash'
 import { action, observable } from 'mobx'
 
 import Base from 'stores/base'
@@ -154,9 +154,7 @@ export default class DevOpsStore extends Base {
   @action
   checkNewName(params, query) {
     return request.get(
-      `/kapis/devops.kubesphere.io/v1alpha3${this.getPath(
-        params
-      )}/devops/checkDevopsName`,
+      `/kapis/devops.kubesphere.io/v1alpha3${this.getPath(params)}`,
       { ...query }
     )
   }
@@ -173,10 +171,17 @@ export default class DevOpsStore extends Base {
         }
       )
     }
-    return this.checkNewName(pick(params, ['cluster', 'workspace']), {
-      devopsName: params.name,
-      generateName: true,
-    })
+    return this.checkNewName(
+      {
+        ...params,
+        devops: params.name,
+      },
+      {
+        // devopsName: params.name,
+        check: true,
+        generateName: true,
+      }
+    )
   }
 
   @action

diff --git a/src/stores/devops/pipelines.js b/src/stores/devops/pipelines.js
@@ -254,9 +254,9 @@ export default class PipelineStore extends BaseStore {
       `/kapis/devops.kubesphere.io/v1alpha2${this.getPath({
         cluster,
         devops,
-      })}/checkPipelineName`,
+      })}/pipelines/${name}`,
       {
-        value: name,
+        check: true,
       }
     )
   }