fix: Fix the bug when editing the pipeline and add sortBy in the cred…

…ential

Signed-off-by: harrisonliu5 harrisonliu_5@163.com

src/components/Forms/CICDs/AdvanceSettings/index.jsx

@@ -94,10 +94,10 @@ export default class AdvanceSettings extends React.Component {
   }
 
   componentDidMount() {
-    const { project_name, cluster } = this.props.formTemplate
-
+    const { project_name, cluster, devops } = this.props.formTemplate
     this.pipelineStore.fetchList({
-      project_name,
+      devopsName: project_name,
+      devops,
       cluster,
       filter: 'no-multi-branch-job',
     })
@@ -152,16 +152,17 @@ export default class AdvanceSettings extends React.Component {
   }
 
   handleScrollToBottom = () => {
-    const { project_name, cluster } = this.props.formTemplate
+    const { project_name, cluster, devops } = this.props.formTemplate
     const { total, page, limit } = this.pipelineStore.list
 
     if (total <= limit * page) {
       return
     }
 
     this.pipelineStore.fetchList({
-      project_name,
+      devopsName: project_name,
       cluster,
+      devops,
       filter: 'no-multi-branch-job',
       page: page + 1,
     })

src/components/Forms/CICDs/BaseInfo/index.jsx

@@ -73,7 +73,7 @@ export default class BaseInfo extends React.Component {
       .checkPipelineName({
         name: value,
         cluster: this.props.cluster,
-        project_name: this.props.formTemplate.project_name,
+        devops: this.props.devops,
       })
       .then(resp => {
         if (resp.exist) {

src/components/Forms/CICDs/RepoSelect/BitBucketForm/index.jsx

@@ -29,6 +29,10 @@ import styles from './index.scss'
 
 @observer
 export default class BitBucketForm extends GitHubForm {
+  state = {
+    isLoading: false,
+  }
+
   get scmType() {
     return 'bitbucket_server'
   }

src/pages/devops/containers/Credential/index.jsx

@@ -165,7 +165,7 @@ class Credential extends React.Component {
       : null
 
     const isEmptyList = isLoading === false && total === 0 && data.length <= 0
-    const omitFilters = omit(filters, ['page', 'limit'])
+    const omitFilters = omit(filters, ['page', 'limit', 'sortBy'])
 
     if (isEmptyList) {
       return (

src/pages/devops/containers/Pipelines/Modals/editPipelineConfigModal.jsx

@@ -114,6 +114,7 @@ export default class EditPipelineConfig extends React.Component {
           type="edit"
           formRef={this.formRef}
           formTemplate={this.state.formTemplate}
+          devops={this.props.devops}
         />
       </Modal>
     )

src/pages/devops/containers/Pipelines/index.jsx

@@ -66,6 +66,7 @@ class CICDs extends React.Component {
     this.formTemplate = {
       project_name: this.props.devopsStore.devopsName,
       cluster: this.cluster,
+      devops: this.devops,
       enable_timer_trigger: true,
       enable_discarder: true,
     }
@@ -256,7 +257,12 @@ class CICDs extends React.Component {
   }
 
   showEditConfig = async name => {
-    await this.store.fetchDetail({ cluster: this.cluster, name })
+    await this.store.fetchDetail({
+      cluster: this.cluster,
+      name,
+      devops: this.devops,
+    })
+
     const formData = this.store.getPipeLineConfig()
     formData.devops = this.devops
 

src/stores/devops/credential.js

@@ -81,6 +81,8 @@ export default class CredentialStore extends BaseStore {
       filters.limit = filters.limit || 10
     }
 
+    filters.sortBy = filters.sortBy || 'createTime'
+
     const result = await this.request.get(
       this.getResourceUrl({ devops, cluster }),
       {

src/stores/devops/pipelines.js

@@ -194,9 +194,9 @@ export default class PipelineStore extends BaseStore {
   }
 
   @action
-  async checkPipelineName({ name, cluster, project_name }) {
+  async checkPipelineName({ name, cluster, devops }) {
     return await this.request.get(
-      `${this.getDevOpsUrl({ cluster })}/${project_name}/pipelines/${name}`,
+      `${this.getDevOpsUrl({ cluster })}/${devops}/pipelines/${name}`,
       {},
       {
         headers: { 'x-check-exist': true },