diff options
author | Einat Vinouze <einat.vinouze@intl.att.com> | 2019-08-27 16:01:01 +0300 |
---|---|---|
committer | Ittay Stern <ittay.stern@att.com> | 2019-09-09 07:01:36 +0000 |
commit | e1f7974f0badbd4440d5b7ea5f1b1cb2d4973818 (patch) | |
tree | 46be9cdc44cbb475527bc3c43df23d16f7579d29 /vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header | |
parent | e25b88b5a7a0f3bf63ca7160a441b53145484bcc (diff) |
Adding feature: Replace vfmodule
Issue-ID: VID-603
Change-Id: I59068a0979d6fb733e4243c8f78921f396dc9d17
Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com>
Signed-off-by: Amichai Hemli <amichai.hemli@intl.att.com>
Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header')
3 files changed, 45 insertions, 5 deletions
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.component.html b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.component.html index 46807607d..7a18bce89 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.component.html +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.component.html @@ -7,7 +7,7 @@ [testId]="'backBtn'" [size]="'large'" [name]="'navigation-arrow-back'"> - </svg-icon> + </svg-icon> </span> <div class="header-col middleDetails" style="padding-top: 7px;padding-left: 13px;line-height: 100%;" *ngIf="isServiceFailed"> @@ -38,10 +38,13 @@ <span [attr.data-tests-id]="'isViewOnly-status-test'" class="service-instance-label purple">{{getModeName()}}</span> </div> - <div class="right-header"> - <span class="action-status-type-header delete" [attr.data-tests-id]="'delete-status-type-header'" *ngIf="isDeleted === true">Delete</span> - <span class="action-status-type-header resume" [attr.data-tests-id]="'resume-status-type-header'" *ngIf="isResume === true">Resume</span> + <span + *ngIf = "isUpgrade || isDeleted || isResume" + [ngClass] = "isDeleted===true ? 'action-status-type-header delete' : 'action-status-type-header resume'" + [attr.data-tests-id]="determineDataTestId()"> + {{getAction()}} + </span> <span class="menu-container notShowOnViewMode notShowOnRetryMode"> <span [attr.data-tests-id]="'openMenuBtn'" class="icon-browse" (click)="onContextMenu($event)"></span> <context-menu> diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.component.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.component.ts index 51f90534b..7923313bf 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.component.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.component.ts @@ -39,12 +39,16 @@ export class DrawingBoardHeader { mode : DrawingBoardModes = DrawingBoardModes.CREATE; serviceOrchStatus: string; isDeleted: boolean = false; + isUpgrade: boolean = false; isResume: boolean = false; store : NgRedux<AppState>; drawingBoardPermissions : DrawingBoardPermissions; drawingBoardHeaderService : DrawingBoardHeaderService; isServiceFailed: boolean; serviceStatusMessage: string; + private readonly action: string; + private presentedAction: string; + constructor(private _contextMenuService: ContextMenuService, private dialogService: DialogService, private _iframeService : IframeService, private route: ActivatedRoute, private msoService: MsoService, @@ -68,6 +72,11 @@ export class DrawingBoardHeader { }); } }); + if (!_.isNil(this.store.getState().service.serviceInstance[this.serviceModelId].action)){ + if (this.store.getState().service.serviceInstance[this.serviceModelId].action.includes("Upgrade")) { + this.isUpgrade = true; + } + } } @@ -114,6 +123,7 @@ export class DrawingBoardHeader { this.serviceOrchStatus = serviceInstance.orchStatus || ""; this.isServiceFailed = serviceInstance.isFailed; this.serviceStatusMessage = serviceInstance.statusMessage; + this.isUpgrade = serviceInstance.isUpgraded; } } @@ -131,12 +141,25 @@ export class DrawingBoardHeader { }); } + + onDeleteUndoDeleteClick(){ this.cancelResume(this.serviceModelId); this.isDeleted = !this.isDeleted; this._drawingBoardHeaderService.deleteService(this.serviceModelId, this.isDeleted) } + determineDataTestId() :string { + switch(true) { + case this.isResume: + return'resume-status-type-header'; + case this.isDeleted: + return 'delete-status-type-header'; + case this.isUpgrade: + return 'upgrade-status-type-header'; + } + } + onResumeUndoResumeClick(){ this.cancelDelete(this.serviceModelId); this.isResume = !this.isResume; @@ -174,9 +197,14 @@ export class DrawingBoardHeader { instanceFields.subscriberName = this.store.getState().service.subscribers.find(sub => sub.id === instanceFields.globalSubscriberId).name; instanceFields.owningEntityName = this.extractOwningEntityNameAccordingtoId(instanceFields.owningEntityId); } - return _.omit(instanceFields,'optionalGroupMembersMap'); + return _.omit(instanceFields,['optionalGroupMembersMap', 'upgradedVFMSonsCounter', 'isUpgraded', 'latestAvailableVersion']); } + private getAction(): string { + if(!_.isNil(this.store.getState().service.serviceInstance[this.serviceModelId].action)) + return this.store.getState().service.serviceInstance[this.serviceModelId].action.split('_').pop(); + return; + } public deployService(): void { let instanceFields = this.extractServiceFields(); diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.service.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.service.ts index 7df2f3a3f..1b71d9098 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.service.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/drawing-board-header/drawing-board-header.service.ts @@ -36,6 +36,15 @@ export class DrawingBoardHeaderService{ } } + upgradeService(serviceModelId: string, isUpgraded: boolean ) { + if(isUpgraded){ + this.store.dispatch(addServiceAction(serviceModelId, ServiceInstanceActions.Upgrade)); + } + else{ + this.store.dispatch(addServiceAction(serviceModelId, ServiceInstanceActions.None)); + } + } + showAuditInfo(serviceModelId) : void { let instance: ServiceInstance = this.store.getState().service.serviceInstance[serviceModelId]; let model = new ServiceModel(this.store.getState().service.serviceHierarchy[serviceModelId]); |