Templates popup: most of the columns are empty (AIC zone is redundant)

[vid.git] / vid-webpack-master / src / app / shared / components / genericFormPopup / instantiationTemplatesModal / instantiation.templates.row.model.ts

diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.row.model.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.row.model.ts
index f2eda9d..56f76b3 100644 (file)
--- a/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.row.model.ts
+++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.row.model.ts
@@ -10,7 +10,6 @@ export class InstantiationTemplatesRowModel extends InstantiationBase{
   readonly summary?: string;
   readonly region?: string;
   readonly tenant?: string;
-  readonly aicZone?: string;
 
   constructor(data) {
     super(data);
@@ -21,7 +20,6 @@ export class InstantiationTemplatesRowModel extends InstantiationBase{
     this.summary = this.convertRequestSummaryFromMapToString(data.requestSummary);
     this.region = this.getRegion(data.regionId, data.owningEntityName);
     this.tenant = !_.isNil(data.tenantName) ? data.tenantName : null;
-    this.aicZone = !_.isNil(data.aicZoneName) ? data.aicZoneName : null;
   }
 
 
@@ -36,7 +34,8 @@ export class InstantiationTemplatesRowModel extends InstantiationBase{
 
   getRegion = (regionId: string, owningEntityName: string): string => {
     const convertOwning = !_.isNil(owningEntityName) ? `(${this.getCloudOwner(owningEntityName)})` : '';
-    return `${regionId} ${convertOwning}`.trim();
+    const region = !_.isNil(regionId) ? regionId : '';
+    return `${region} ${convertOwning}`.trim();
   };