fix(core): provide formatLabel option for all trigger types (#7007)

spinnaker · May 15, 2019 · 7639f80 · 7639f80
1 parent 83bc152
commit 7639f80
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 1 deletion.
diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/concourse/ConcourseTriggerTemplate.tsx b/app/scripts/modules/core/src/pipeline/config/triggers/concourse/ConcourseTriggerTemplate.tsx
@@ -17,6 +17,8 @@ export class ConcourseTriggerTemplate extends React.Component<ITriggerTemplateCo
     );
   };
 
+  public static formatLabel = BaseBuildTriggerTemplate.formatLabel;
+
   public render() {
     return (
       <BaseBuildTriggerTemplate

diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/jenkins/JenkinsTriggerTemplate.tsx b/app/scripts/modules/core/src/pipeline/config/triggers/jenkins/JenkinsTriggerTemplate.tsx
@@ -5,6 +5,8 @@ import { BuildServiceType } from 'core/ci';
 import { ITriggerTemplateComponentProps } from 'core/pipeline/manualExecution/TriggerTemplate';
 
 export class JenkinsTriggerTemplate extends React.Component<ITriggerTemplateComponentProps> {
+  public static formatLabel = BaseBuildTriggerTemplate.formatLabel;
+
   public render() {
     return <BaseBuildTriggerTemplate {...this.props} buildTriggerType={BuildServiceType.Jenkins} />;
   }

diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/pipeline/PipelineTrigger.tsx b/app/scripts/modules/core/src/pipeline/config/triggers/pipeline/PipelineTrigger.tsx
@@ -115,7 +115,7 @@ export class PipelineTrigger extends React.Component<IPipelineTriggerConfigProps
                 <Select
                   className="form-control input-sm"
                   onChange={(option: Option<string>) => this.onUpdateTrigger({ pipeline: option.value })}
-                  options={pipelines.map(p => ({ label: p.id, value: p.id }))}
+                  options={pipelines.map(p => ({ label: p.name, value: p.id }))}
                   placeholder={'Select a pipeline...'}
                   value={pipeline}
                 />

diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/travis/TravisTriggerTemplate.tsx b/app/scripts/modules/core/src/pipeline/config/triggers/travis/TravisTriggerTemplate.tsx
@@ -5,6 +5,8 @@ import { BuildServiceType } from 'core/ci';
 import { ITriggerTemplateComponentProps } from 'core/pipeline/manualExecution/TriggerTemplate';
 
 export class TravisTriggerTemplate extends React.Component<ITriggerTemplateComponentProps> {
+  public static formatLabel = BaseBuildTriggerTemplate.formatLabel;
+
   public render() {
     return <BaseBuildTriggerTemplate {...this.props} buildTriggerType={BuildServiceType.Travis} />;
   }

diff --git a/app/scripts/modules/core/src/pipeline/config/triggers/wercker/WerckerTriggerTemplate.tsx b/app/scripts/modules/core/src/pipeline/config/triggers/wercker/WerckerTriggerTemplate.tsx
@@ -5,6 +5,8 @@ import { BuildServiceType } from 'core/ci';
 import { ITriggerTemplateComponentProps } from 'core/pipeline/manualExecution/TriggerTemplate';
 
 export class WerckerTriggerTemplate extends React.Component<ITriggerTemplateComponentProps> {
+  public static formatLabel = BaseBuildTriggerTemplate.formatLabel;
+
   public render() {
     return <BaseBuildTriggerTemplate {...this.props} buildTriggerType={BuildServiceType.Wercker} />;
   }