feat(displayName): Adding display name property for the bakery baseOS…

… options (#7464)
spinnaker · Sep 30, 2019 · 564af88 · 564af88
1 parent e0c57af
commit 564af88
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/app/scripts/modules/core/src/pipeline/config/stages/bake/BakeryReader.ts b/app/scripts/modules/core/src/pipeline/config/stages/bake/BakeryReader.ts
@@ -11,6 +11,7 @@ export interface IBaseImage {
   shortDescription: string;
   detailedDescription: string;
   packageType: string;
+  displayName: string;
 }
 
 export interface IBaseOsOptions {

diff --git a/app/scripts/modules/core/src/pipeline/config/stages/bake/bakeStageChooseOs.component.ts b/app/scripts/modules/core/src/pipeline/config/stages/bake/bakeStageChooseOs.component.ts
@@ -1,10 +1,12 @@
 import { IController, IComponentOptions, module } from 'angular';
+import { isEmpty } from 'lodash';
 
 export interface IBaseOsOption {
   id: string;
   shortDescription?: string;
   detailedDescription: string;
   isImageFamily?: boolean;
+  displayName?: string;
 }
 
 export class BakeStageChooseOSController implements IController {
@@ -19,9 +21,9 @@ export class BakeStageChooseOSController implements IController {
   }
 
   public getBaseOsDescription(baseOsOption: IBaseOsOption): string {
-    return baseOsOption.id + (baseOsOption.shortDescription ? ' (' + baseOsOption.shortDescription + ')' : '');
+    const baseOsName = isEmpty(baseOsOption.displayName) ? baseOsOption.id : baseOsOption.displayName;
+    return baseOsName + (baseOsOption.shortDescription ? ' (' + baseOsOption.shortDescription + ')' : '');
   }
-
   public getBaseOsDetailedDescription(baseOsOption: IBaseOsOption): string {
     return baseOsOption.detailedDescription + (baseOsOption.isImageFamily ? ' (family)' : '');
   }