Merge pull request #1136 from harrisonliu5/fix-issues

fix: Fix the name's length limitation and the description don't displayed in pipeline.
kubesphere · Aug 10, 2020 · 8ed527e · 8ed527e
2 parents b9d299c + f06b8e2
commit 8ed527e
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 35 deletions.
diff --git a/src/components/Forms/CICDs/BaseInfo/index.jsx b/src/components/Forms/CICDs/BaseInfo/index.jsx
@@ -130,10 +130,10 @@ export default class BaseInfo extends React.Component {
                   { validator: this.validator },
                 ]}
               >
-                <Input name="name" />
+                <Input name="name" maxLength={63} />
               </Form.Item>
-              <Form.Item label={t('Description')}>
-                <TextArea name="desc" />
+              <Form.Item label={t('Description')} desc={t('DESCRIPTION_DESC')}>
+                <TextArea name="desc" maxLength={256} />
               </Form.Item>
             </Column>
             <Column>

diff --git a/src/pages/devops/containers/Pipelines/Detail/Sider/pipeline-sider.jsx b/src/pages/devops/containers/Pipelines/Detail/Sider/pipeline-sider.jsx
@@ -20,7 +20,7 @@ import React from 'react'
 import { toJS } from 'mobx'
 import { observer, inject } from 'mobx-react'
 import moment from 'moment-mini'
-import { get, isEmpty } from 'lodash'
+import { get, isEmpty, has } from 'lodash'
 import { Loading } from '@pitrix/lego-ui'
 
 import { ICON_TYPES } from 'utils/constants'
@@ -124,6 +124,16 @@ export default class PipelineDetail extends Base {
     } else {
       this.sonarqubeStore.fetchDetail(params)
     }
+
+    this.getPipeLineConfig()
+  }
+
+  getPipeLineConfig = async () => {
+    const { params } = this.props.match
+    const pipeLineConfig = await this.store.getPipeLineConfig()
+    pipeLineConfig.devops = params.devops
+    pipeLineConfig.cluster = params.cluster
+    this.setState({ formTemplate: pipeLineConfig })
   }
 
   getSonarqube = () => {
@@ -222,12 +232,8 @@ export default class PipelineDetail extends Base {
   }
 
   showEditModal = async type => {
-    const { params } = this.props.match
-
-    const pipeLineConfig = await this.store.getPipeLineConfig()
-
-    pipeLineConfig.devops = params.devops
-    this.setState({ [type]: true, formTemplate: pipeLineConfig })
+    this.getPipeLineConfig()
+    this.setState({ [type]: true })
   }
 
   hideEditModal = () => {
@@ -306,9 +312,14 @@ export default class PipelineDetail extends Base {
 
   renderSider() {
     const { detail } = toJS(this.store)
+    const { formTemplate } = this.state
     const operations = this.getOperations().filter(item =>
       this.enabledActions.includes(item.action)
     )
+    const keyPath = has(formTemplate, 'pipeline')
+      ? 'pipeline.description'
+      : 'multi_branch_pipeline.description'
+    const desc = get(formTemplate, keyPath, '-')
 
     return (
       <BaseInfo
@@ -318,6 +329,7 @@ export default class PipelineDetail extends Base {
         operations={operations}
         labels={detail.labels}
         attrs={this.getAttrs()}
+        desc={desc}
       />
     )
   }
@@ -333,7 +345,6 @@ export default class PipelineDetail extends Base {
       showEditConfig,
       deleteLoading,
     } = this.state
-
     return (
       <div>
         <BaseInfoModal

diff --git a/src/pages/devops/containers/Pipelines/index.jsx b/src/pages/devops/containers/Pipelines/index.jsx
@@ -22,12 +22,14 @@ import { Link } from 'react-router-dom'
 import { toJS } from 'mobx'
 import { parse } from 'qs'
 import { get, omit } from 'lodash'
+import { Button } from 'components/Base'
+
 import { Menu, Dropdown, Column, Icon } from '@pitrix/lego-ui'
 import { trigger } from 'utils/action'
 
 import { JOB_STATUS } from 'utils/constants'
 import { updatePipelineParams, updatePipelineParamsInSpec } from 'utils/devops'
-import { Button } from 'components/Base'
+
 import Health from 'projects/components/Health'
 import EmptyTable from 'components/Cards/EmptyTable'
 import DeleteModal from 'components/Modals/Delete'
@@ -265,6 +267,7 @@ class CICDs extends React.Component {
 
     const formData = this.store.getPipeLineConfig()
     formData.devops = this.devops
+    formData.cluster = this.cluster
 
     this.setState({
       showEditConfig: true,
@@ -390,25 +393,13 @@ class CICDs extends React.Component {
       dataIndex: 'name',
       width: '20%',
       render: (name, record) => {
-        if (record.numberOfFailingBranches !== undefined) {
-          return (
-            <Link
-              className="item-name"
-              to={`/${this.workspace}/clusters/${this.cluster}/devops/${
-                this.devops
-              }/pipelines/${encodeURIComponent(record.name)}/activity`}
-            >
-              {name}
-            </Link>
-          )
-        }
+        const url = `/${this.workspace}/clusters/${this.cluster}/devops/${
+          this.devops
+        }/pipelines/${encodeURIComponent(record.name)}${
+          record.numberOfFailingBranches !== undefined ? '/activity' : ''
+        }`
         return (
-          <Link
-            className="item-name"
-            to={`/${this.workspace}/clusters/${this.cluster}/devops/${
-              this.devops
-            }/pipelines/${encodeURIComponent(record.name)}`}
-          >
+          <Link className="item-name" to={url}>
             {name}
           </Link>
         )

diff --git a/src/stores/devops.js b/src/stores/devops.js
@@ -109,9 +109,7 @@ export default class DevOpsStore extends Base {
 
     const result = await request.get(
       this.getBaseUrlV3({ cluster, workspace }),
-      params,
-      null,
-      () => {}
+      params
     )
 
     const items = Array.isArray(get(result, 'items'))

diff --git a/src/stores/devops/pipelines.js b/src/stores/devops/pipelines.js
@@ -16,7 +16,7 @@
  * along with KubeSphere Console.  If not, see <https://www.gnu.org/licenses/>.
  */
 
-import { omit, isArray, get, set, isEmpty } from 'lodash'
+import { omit, isArray, get, set, isEmpty, cloneDeep } from 'lodash'
 import { saveAs } from 'file-saver'
 import { action, observable, toJS } from 'mobx'
 import BaseStore from './base'
@@ -414,7 +414,7 @@ export default class PipelineStore extends BaseStore {
 
   @action
   getPipeLineConfig() {
-    let detail = JSON.parse(JSON.stringify(this.pipelineConfig))
+    let detail = cloneDeep(this.pipelineConfig)
     detail = { ...toJS(detail.spec), ...toJS(detail) }
 
     delete detail.spec