From e58ecf07ca973123ba27047ca1237c93d0201f39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=8F=A4=E6=9C=88?= Date: Sun, 25 Jun 2023 15:16:47 +0800 Subject: [PATCH] fix: Fix devops and pipiline check api (#1430) (#4151) fix: fix devops and pipiline check api (#1430) Signed-off-by: yazhou --- .../Forms/Pipelines/BaseInfo/index.jsx | 2 +- src/pages/devops/version | 2 +- src/stores/devops.js | 21 ++++++++++++------- src/stores/devops/pipelines.js | 4 ++-- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/src/components/Forms/Pipelines/BaseInfo/index.jsx b/src/components/Forms/Pipelines/BaseInfo/index.jsx index bfb0b72503d..50b4e7381e1 100644 --- 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 }, ]} > diff --git a/src/pages/devops/version b/src/pages/devops/version index 5d39ba328c0..abe4f0962dd 100644 --- a/src/pages/devops/version +++ b/src/pages/devops/version @@ -1 +1 @@ -1686562525 \ No newline at end of file +1686647106 \ No newline at end of file diff --git a/src/stores/devops.js b/src/stores/devops.js index 0bc3fc6c584..ef2d04f9797 100644 --- a/src/stores/devops.js +++ b/src/stores/devops.js @@ -16,7 +16,7 @@ * along with KubeSphere Console. If not, see . */ -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 index faeffd1d729..67370d2f1c2 100644 --- 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, } ) }