fix(core): Display latest template in pipeline template list (#7145)

spinnaker/spinnaker#4561
spinnaker · Jun 25, 2019 · 745f0a1 · 745f0a1
1 parent 456172b
commit 745f0a1
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/app/scripts/modules/core/src/domain/IPipelineTemplateV2.ts b/app/scripts/modules/core/src/domain/IPipelineTemplateV2.ts
@@ -11,6 +11,7 @@ export interface IPipelineTemplateV2 {
   version?: string;
   updateTs?: string;
   digest?: string;
+  tag?: string;
 }
 
 interface IPipelineTemplateMetadataV2 {

diff --git a/app/scripts/modules/core/src/pipeline/config/templates/PipelineTemplateReader.ts b/app/scripts/modules/core/src/pipeline/config/templates/PipelineTemplateReader.ts
@@ -146,7 +146,10 @@ export class PipelineTemplateReader {
     return API.one('pipelineTemplates')
       .get()
       .then((templates: IPipelineTemplateV2[]) => {
-        return templates.filter(({ schema }) => schema === 'v2');
+        return templates.filter(
+          ({ digest, schema, tag }) =>
+            schema === 'v2' && tag === PipelineTemplateV2Service.defaultTag && typeof digest === 'undefined',
+        );
       });
   }
 }
diff --git a/app/scripts/modules/core/src/pipeline/config/templates/v2/pipelineTemplateV2.service.ts b/app/scripts/modules/core/src/pipeline/config/templates/v2/pipelineTemplateV2.service.ts
@@ -77,6 +77,7 @@ export class PipelineTemplateV2Service {
   }
 
   private static schema = 'v2';
+  public static defaultTag = 'latest';
 
   public static inheritedKeys: Set<InheritedItem> = new Set([
     InheritedItem.Triggers,

diff --git a/app/scripts/modules/core/src/pipeline/create/CreatePipelineModal.tsx b/app/scripts/modules/core/src/pipeline/create/CreatePipelineModal.tsx
@@ -166,7 +166,9 @@ export class CreatePipelineModal extends React.Component<ICreatePipelineModalPro
     const config = {
       ...pipelineConfig,
       ...(preselectedTemplate
-        ? PipelineTemplateV2Service.getPipelineTemplateConfigV2(preselectedTemplate.id)
+        ? PipelineTemplateV2Service.getPipelineTemplateConfigV2(
+            `${preselectedTemplate.id}:${PipelineTemplateV2Service.defaultTag}`,
+          )
         : PipelineTemplateReader.getPipelineTemplateConfig({
             name: command.name,
             application: application.name,