Merge pull request #2081 from kubesphere/revert-2077-cherry-pick-2004…

…-to-release-3.1

Revert "[release-3.1] feat: Add scan repo trigger in GitLab"

locales/en/pipeline.js

@@ -107,7 +107,7 @@ module.exports = {
   'Discard old builds': 'Discard old builds',
   'Discover Tag Branches': 'Discover Tag Branches',
   'Discover Branches': 'Discover Branches',
-  'Discover branches from repository': 'Discover branches from repository',
+  'Discover branches from repoitory': 'Discover branches from repoitory',
   'Discover PR from Forks': 'Discover PR from Forks',
   'Discover PR from Origin': 'Discover PR from Origin',
   'Discover pull requests from forks': 'Discover pull requests from forks',
@@ -131,7 +131,7 @@ module.exports = {
     'Enable Variable Substitution in Config',
   enableConfigSubstitution: 'enableConfigSubstitution',
   'Enter an expression': 'Enter an expression',
-  'Environment name': 'Environment name',
+  'Enviroment name': 'Enviroment name',
   'Exclude branches that are also filed as PRs':
     'Exclude branches that are also filed as PRs',
   'Executes the code inside the block with a determined time out limit.':
@@ -247,7 +247,7 @@ module.exports = {
   'Logs Scanned Successfully': 'Logs Scanned Successfully',
   'Repo Scanned Successfully': 'Repo Scanned Successfully',
   'Scan Repo Trigger': 'Scan Repo Trigger',
-  'Scan Repository Logs': 'Scan Repository Logs',
+  'Scan Reponsitory Logs': 'Scan Reponsitory Logs',
   'Scan Repository': 'Scan Repository',
   Schedule: 'Schedule',
   'Scheduled build': 'Scheduled build',
@@ -477,7 +477,7 @@ module.exports = {
   pipeline_conditions: 'Conditions',
   PARAMS_STRING: 'String',
   PARAMS_TEXT: 'Text',
-  PARAMS_BOOLEAN: 'Boolean',
+  PRARMS_BOOLEAN: 'Boolean',
   PARAMS_CHOICE: 'Choice',
   PARAMS_PASSWORD: 'Password',
   CODE_SMELL: 'Code Smell',
@@ -539,9 +539,9 @@ module.exports = {
   PIPELINES_FOOTER_SEE_MORE: 'Go to the branch details page to see more.',
   CRON_DESC: 'Would last have run at {lastTime}; would next run at {nextTime}',
   JENKINS_LINS_ERROR: 'has syntax error at line {line}.',
-  WHEN_DELETE_PIPELINE_DESC:
+  WHEN_DELETE_PIEPLINE_DESC:
     'When a pipeline is deleted, the tasks in the specified pipeline are automatically triggered.',
-  WHEN_CREATE_PIPELINE_DESC:
+  WHEN_CHRETE_PIEPLINE_DESC:
     'When a new pipeline is created, the tasks in the specified pipeline are automatically triggered.',
   'Started By {name}': 'Started By {name}',
   'Credential ID exists': 'Credential ID exists',

locales/es/pipeline.js

@@ -107,7 +107,7 @@ module.exports = {
   'Discard old builds': 'Descartar builds antiguas',
   'Discover Tag Branches': 'Descubrir Tag ramas',
   'Discover Branches': 'Descubrir ramas',
-  'Discover branches from repository': 'Descubrir ramas desde el repositorio',
+  'Discover branches from repoitory': 'Descubrir ramas desde el repositorio',
   'Discover PR from Forks': 'Descubrir PR desde Forks',
   'Discover PR from Origin': 'Descubrir PR desde Origin',
   'Discover pull requests from forks': 'Descubrir las PR desde forks',
@@ -131,7 +131,7 @@ module.exports = {
     'Habilitar la sustitución de variables en la configuración',
   enableConfigSubstitution: 'enableConfigSubstitution',
   'Enter an expression': 'Introdir una expresión',
-  'Environment name': 'Nombre del entorno',
+  'Enviroment name': 'Nombre del entorno',
   'Exclude branches that are also filed as PRs':
     'Excluir las ramas que también se presentan como PRs',
   'Executes the code inside the block with a determined time out limit.':
@@ -252,7 +252,7 @@ module.exports = {
   'Scan Logs Success': 'Escanear registros correctos',
   'Scan repo success': 'Escanear el repositorio correcto',
   'Scan Repo Trigger': 'Escanear el disparador del Repo',
-  'Scan Repository Logs': 'Escanear logs de repositorio',
+  'Scan Reponsitory Logs': 'Escanear logs de repositorio',
   'Scan Repository': 'Escanear repositorio',
   Schedule: 'Programador',
   'Scheduled build': 'Build programada',
@@ -424,7 +424,7 @@ module.exports = {
   pipeline_conditions: 'Condiciones',
   PARAMS_STRING: 'Cuerda',
   PARAMS_TEXT: 'Texto',
-  PARAMS_BOOLEAN: 'Booleano',
+  PRARMS_BOOLEAN: 'Booleano',
   PARAMS_CHOICE: 'Elección',
   PARAMS_PASSWORD: 'Contraseña',
   CODE_SMELL: 'Olor de código',
@@ -487,9 +487,9 @@ module.exports = {
   CRON_DESC:
     'Habría corrido por última vez en {lastTime}; se ejecutará a las {nextTime}',
   JENKINS_LINS_ERROR: 'tiene un error de sintaxis en la línea {line}.',
-  WHEN_DELETE_PIPELINE_DESC:
+  WHEN_DELETE_PIEPLINE_DESC:
     'Cuando se elimina una pipeline, las tareas en la pipeline especificada se activan automáticamente.',
-  WHEN_CREATE_PIPELINE_DESC:
+  WHEN_CHRETE_PIEPLINE_DESC:
     'Cuando se crea una nueva pipeline, las tareas en la pipeline especificada se activan automáticamente.',
   'Started By {name}': 'Comenzado por {name}',
   'Credential ID exists': 'El ID de credencial ya existe',

locales/tc/pipeline.js

@@ -17,7 +17,7 @@
  */
 
 module.exports = {
-  'Discover branches from repository': '發現存儲庫上的分支',
+  'Discover branches from repoitory': '發現存儲庫上的分支',
   'Discover pull requests from origin': '發現原始儲存庫與目標儲存庫相同的 PR',
   'Discover pull requests from forks': '發現 Fork 儲存庫與目標儲存庫相同的 PR',
   'User types that can trigger builds': '可以觸發構建的用戶類型',
@@ -152,7 +152,7 @@ module.exports = {
   'Sub-healthy': '亞健康',
   Schedule: '行程表',
   'Stop Job Successfully, Status updated later': '任務已停止，狀態稍後更新',
-  'Scan Repository Logs': '掃描倉庫紀錄',
+  'Scan Reponsitory Logs': '掃描倉庫紀錄',
   'Started By': '實施者',
   Rescan: '重新掃描',
   'Logs Scanned Successfully': '掃描紀錄成功',
@@ -338,11 +338,11 @@ module.exports = {
   'Internal nesting conditions must be matched': '内部嵌套的條件需全部滿足',
   'Internal nested conditions only need to satisfy one':
     '内部嵌套的條件只需符合一個',
-  'Environment name': '環境變量名稱',
+  'Enviroment name': '環境變量名稱',
   expression: '表達式',
   PARAMS_STRING: '字符串參數 (String) ',
   PARAMS_TEXT: '文本 (Text) ',
-  PARAMS_BOOLEAN: '布林值 (Boolean) ',
+  PRARMS_BOOLEAN: '布林值 (Boolean) ',
   PARAMS_CHOICE: '選項參數 (Choice) ',
   PARAMS_PASSWORD: '密碼參數 (Password) ',
   critical: '嚴重',
@@ -461,9 +461,9 @@ module.exports = {
   'Pipeline event trigger': '流水線事件觸發',
   'When Create Pipeline': '創建流水線',
   'When Delete Pipeline': '當刪除流水線',
-  WHEN_DELETE_PIPELINE_DESC:
+  WHEN_DELETE_PIEPLINE_DESC:
     '當有流水線被刪除時，將自動觸發指定流水線中的任務。',
-  WHEN_CREATE_PIPELINE_DESC:
+  WHEN_CHRETE_PIEPLINE_DESC:
     '當有創建新的流水線時，將自動觸發指定流水線中的任務。',
   'select a pipeline': '選擇一個流水線',
   timer: '定時器',

locales/zh/pipeline.js

@@ -17,7 +17,7 @@
  */
 
 module.exports = {
-  'Discover branches from repository': '发现存储库上的分支',
+  'Discover branches from repoitory': '发现存储库上的分支',
   'Discover pull requests from origin': '发现原始存储库与目标存储库相同的 PR',
   'Discover pull requests from forks': '发现 Fork 存储库与目标存储库相同的 PR',
   'User types that can trigger builds': '可以触发构建的用户类型',
@@ -152,7 +152,7 @@ module.exports = {
   'Sub-healthy': '亚健康',
   Schedule: '日程表',
   'Stop Job Successfully, Status updated later': '任务已停止，状态稍后更新',
-  'Scan Repository Logs': '扫描仓库日志',
+  'Scan Reponsitory Logs': '扫描仓库日志',
   'Started By': '实施者',
   Rescan: '重新扫描',
   'Logs Scanned Successfully': '扫描日志成功',
@@ -338,11 +338,11 @@ module.exports = {
   'Internal nesting conditions must be matched': '内部嵌套的条件需全部满足',
   'Internal nested conditions only need to satisfy one':
     '内部嵌套的条件只需符合一个',
-  'Environment name': '环境变量名',
+  'Enviroment name': '环境变量名',
   expression: '表达式',
   PARAMS_STRING: '字符串参数 (String) ',
   PARAMS_TEXT: '文本 (Text) ',
-  PARAMS_BOOLEAN: '布尔值 (Boolean) ',
+  PRARMS_BOOLEAN: '布尔值 (Boolean) ',
   PARAMS_CHOICE: '选项参数 (Choice) ',
   PARAMS_PASSWORD: '密码参数 (Password) ',
   critical: '严重',
@@ -461,9 +461,9 @@ module.exports = {
   'Pipeline event trigger': '流水线事件触发',
   'When Create Pipeline': '当创建流水线',
   'When Delete Pipeline': '当删除流水线',
-  WHEN_DELETE_PIPELINE_DESC:
+  WHEN_DELETE_PIEPLINE_DESC:
     '当有流水线被删除时，将自动触发指定流水线中的任务。',
-  WHEN_CREATE_PIPELINE_DESC:
+  WHEN_CHRETE_PIEPLINE_DESC:
     '当有创建新的流水线时，将自动触发指定流水线中的任务。',
   'select a pipeline': '选择一个流水线',
   timer: '定时器',

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

@@ -362,13 +362,6 @@ export default class AdvanceSettings extends React.Component {
       source_type
     )
 
-    const isShowRepoTrigger = [
-      'git',
-      'github',
-      'bitbucket_server',
-      'gitlab',
-    ].includes(source_type)
-
     return (
       <div>
         {source_type !== 'git' && source_type !== 'svn' ? (
@@ -395,7 +388,7 @@ export default class AdvanceSettings extends React.Component {
           />
         </Form.Item>
         <div className="h6">{t('Scan Repo Trigger')}</div>
-        {isShowRepoTrigger ? this.renderRegFilter() : null}
+        {hasWebhook ? this.renderRegFilter() : null}
         <Form.Item>
           <Checkbox
             checked={enable_timer_trigger}
@@ -437,7 +430,7 @@ export default class AdvanceSettings extends React.Component {
               <Column>
                 <Form.Item
                   label={t('When Create Pipeline')}
-                  desc={t('WHEN_CREATE_PIPELINE_DESC')}
+                  desc={t('WHEN_CHRETE_PIEPLINE_DESC')}
                 >
                   <Select
                     name={`${this.prefix}.multibranch_job_trigger.create_action_job_to_trigger`}
@@ -452,7 +445,7 @@ export default class AdvanceSettings extends React.Component {
               <Column>
                 <Form.Item
                   label={t('When Delete Pipeline')}
-                  desc={t('WHEN_DELETE_PIPELINE_DESC')}
+                  desc={t('WHEN_DELETE_PIEPLINE_DESC')}
                 >
                   <Select
                     name={`${this.prefix}.multibranch_job_trigger.delete_action_job_to_trigger`}
@@ -547,7 +540,6 @@ export default class AdvanceSettings extends React.Component {
     const { formRef, formTemplate } = this.props
 
     const multi_branch_pipeline = get(formTemplate, 'multi_branch_pipeline')
-
     return (
       <div className={styles.advance}>
         <Form data={formTemplate} ref={formRef}>

src/components/Modals/Pipelines/ScanRepositoryLogs/index.jsx

@@ -128,7 +128,7 @@ export default class ScanRepositoryLogs extends React.Component {
         onCancel={onCancel}
         visible={visible}
         closable={false}
-        title={t('Scan Repository Logs')}
+        title={t('Scan Reponsitory Logs')}
       >
         <div className={styles.content}>
           <div className={styles.btn_group}>

src/pages/devops/components/Pipeline/StepModals/environment.jsx

@@ -80,7 +80,7 @@ export default class Enviroment extends React.Component {
         title={t('environment')}
       >
         <Form data={this.state.formData} ref={this.formRef}>
-          <Form.Item label={t('Environment name')}>
+          <Form.Item label={t('Enviroment name')}>
             <Input name="name" />
           </Form.Item>
           <Form.Item label={t('Value')}>

src/pages/devops/containers/Pipelines/Detail/Layout/pipeline.jsx

@@ -166,7 +166,7 @@ export default class PipelineDetailLayout extends React.Component {
             },
             {
               key: 'scanLogs',
-              text: t('Scan Repository Logs'),
+              text: t('Scan Reponsitory Logs'),
               action: 'edit',
               onClick: () => {
                 this.trigger('pipeline.scanRepositoryLogs', {

src/utils/constants.js

@@ -364,7 +364,7 @@ export const REPO_KEY_MAP = {
 export const PIPELINE_PARAMS_TYPES = {
   string: 'PARAMS_STRING',
   text: 'PARAMS_TEXT',
-  boolean: 'PARAMS_BOOLEAN',
+  boolean: 'PRARMS_BOOLEAN',
   choice: 'PARAMS_CHOICE',
   password: 'PARAMS_PASSWORD',
 }