diff options
Diffstat (limited to 'vid-webpack-master/src/app/shared/components')
3 files changed, 10 insertions, 18 deletions
diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.modal.component.html b/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.modal.component.html index 84783c273..39c6da4f4 100644 --- a/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.modal.component.html +++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.modal.component.html @@ -56,7 +56,6 @@ <th class="header-title" id="header-summary">Summary</th> <th class="header-title" id="header-region">Region</th> <th class="header-title" id="header-tenant">Tenant</th> - <th class="header-title" id="header-aicZone">AIC Zone</th> </tr> </thead> <tbody> @@ -139,16 +138,6 @@ </custom-ellipsis> </div> </td> - <td> - <div> - <custom-ellipsis - [dataTestId]="'aicZone-' + item.jobId" - [id]="item.aicZone" - [value]="item.aicZone" - [breakWord]="true"> - </custom-ellipsis> - </div> - </td> </tr> </tbody> </table> diff --git a/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.modal.service.spec.ts b/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.modal.service.spec.ts index 78614c0f8..a479e0cbf 100644 --- a/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.modal.service.spec.ts +++ b/vid-webpack-master/src/app/shared/components/genericFormPopup/instantiationTemplatesModal/instantiation.templates.modal.service.spec.ts @@ -17,9 +17,6 @@ class ActivatedRouteMock<T> { } } -// - - class MockAppStore {} describe('instantiation templates modal service', () => { @@ -123,7 +120,6 @@ describe('instantiation templates modal service', () => { expect(tableRows[0].instantiationStatus).toEqual('FAILED'); expect(tableRows[0].region).toEqual('hvf6 (AAA1)'); expect(tableRows[0].tenant).toEqual('AIN Web Tool-15-D-SSPtestcustome'); - expect(tableRows[0].aicZone).toEqual('VSDKYUTP-BAN1'); expect(tableRows[0].jobId).toEqual('9f88fdb5-bb47-4bf3-8c5f-98f1ad0ec87c'); }); @@ -136,6 +132,14 @@ describe('instantiation templates modal service', () => { expect(result.region).toEqual('regionId (OWNER)'); }); + test('getRegion if null should return empty string', () => { + let result: InstantiationTemplatesRowModel = new InstantiationTemplatesRowModel({ + owningEntityName: 'att-owner', + regionId: null + }); + expect(result.region).toEqual('(OWNER)'); + }); + test('getCloudOwner should not return owningEntityName if not exist', () => { let result: InstantiationTemplatesRowModel = new InstantiationTemplatesRowModel({owningEntityName: null, regionId: 'regionId'}); expect(result.region).toEqual('regionId'); 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 f2eda9df3..56f76b32f 100644 --- 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(); }; |