fix(core): fix NPE in getBaseOsDescription (#8099)

spinnaker · Mar 26, 2020 · e948f29 · e948f29
1 parent 43c8075
commit e948f29
Showing 1 changed file with 5 additions and 3 deletions.
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,5 +1,4 @@
 import { IController, IComponentOptions, module } from 'angular';
-import { isEmpty } from 'lodash';
 
 export interface IBaseOsOption {
   id: string;
@@ -21,8 +20,11 @@ export class BakeStageChooseOSController implements IController {
   }
 
   public getBaseOsDescription(baseOsOption: IBaseOsOption): string {
-    const baseOsName = isEmpty(baseOsOption.displayName) ? baseOsOption.id : baseOsOption.displayName;
-    return baseOsName + (baseOsOption.shortDescription ? ' (' + baseOsOption.shortDescription + ')' : '');
+    const baseOsName = baseOsOption?.displayName || baseOsOption?.id || '';
+    if (baseOsOption?.shortDescription) {
+      return `${baseOsName} (${baseOsOption.shortDescription})`;
+    }
+    return baseOsName;
   }
   public getBaseOsDetailedDescription(baseOsOption: IBaseOsOption): string {
     return baseOsOption.detailedDescription + (baseOsOption.isImageFamily ? ' (family)' : '');