diff options
5 files changed, 20 insertions, 6 deletions
diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.ts index 80b2a4b52..72b3c398e 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/models/vfModule/vfModule.model.info.ts @@ -396,8 +396,8 @@ export class VFModuleModelInfo implements ILevelNodeInfo { method: (node, serviceModelId) => { this._store.dispatch(pauseActionVFModuleInstance(node.data.dynamicModelName, node.parent.data.vnfStoreKey, serviceModelId, node.data.modelName)); }, - visible: () => this._sharedTreeService.shouldShowPauseInstantiation(node), - enable: () => true, + visible: () => (this._sharedTreeService.shouldShowPauseInstantiation(node) && this._sharedTreeService.showPauseWithOrchStatus(node)), + enable: () => this._sharedTreeService.showPauseWithOrchStatus(node), }, removePause: { method: (node, serviceModelId) => { diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.spec.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.spec.ts index 9a35d4883..c82850eb8 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.spec.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.spec.ts @@ -536,6 +536,13 @@ describe('Shared Tree Service', () => { }); + + test("showPauseWithOrchStatus test", () => { + const node = { + "orchStatus":"Active" + }; + expect(service.showPauseWithOrchStatus(node)).toEqual(false); + }); }); diff --git a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.ts b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.ts index 51fcf52a1..0ba90c20a 100644 --- a/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.ts +++ b/vid-webpack-master/src/app/drawingBoard/service-planning/objectsToTree/shared.tree.service.ts @@ -228,6 +228,13 @@ export class SharedTreeService { } return false; } + + showPauseWithOrchStatus(node): boolean { + if(node.orchStatus == "Active"){ + return false; + } + return true; + } shouldShowPauseInstantiation(node): boolean { if(FeatureFlagsService.getFlagState(Features.FLAG_2008_REMOVE_PAUSE_INSTANTIATION, this._store)){ diff --git a/vid-webpack-master/src/app/shared/components/auditInfoModal/auditInfoModal.component.html b/vid-webpack-master/src/app/shared/components/auditInfoModal/auditInfoModal.component.html index 038477d25..1fc1f4d82 100644 --- a/vid-webpack-master/src/app/shared/components/auditInfoModal/auditInfoModal.component.html +++ b/vid-webpack-master/src/app/shared/components/auditInfoModal/auditInfoModal.component.html @@ -49,10 +49,10 @@ </thead> <tbody> <tr class="row" *ngFor="let data of msoInfoData"> - <td id="msoRequestId" class="col-md-2" style="width: 22%"> + <td id="msoRequestId" style="width: 22%"> <custom-ellipsis [id]="data?.requestId" [value]="data?.requestId" [attr.data-tests-id]="'requestId'"></custom-ellipsis> </td> - <td *ngIf="isAlaCarte && isALaCarteFlagOn" class="msoInstanceName col-md-2" style="width: 10%"> + <td *ngIf="isAlaCarte && isALaCarteFlagOn" class="msoInstanceName" style="width: 10%"> <custom-ellipsis [id]="data?.instanceName" [value]="data?.instanceName"></custom-ellipsis> </td> <td id="msoModelType" style="width: 7%"> diff --git a/vid-webpack-master/src/app/shared/components/auditInfoModal/auditInfoModal.component.scss b/vid-webpack-master/src/app/shared/components/auditInfoModal/auditInfoModal.component.scss index 6b1a70486..237184283 100644 --- a/vid-webpack-master/src/app/shared/components/auditInfoModal/auditInfoModal.component.scss +++ b/vid-webpack-master/src/app/shared/components/auditInfoModal/auditInfoModal.component.scss @@ -96,8 +96,8 @@ mwlResizable { .table-bordered { margin-top: 10px; - font-family: OpenSans-Semibold; - font-size: 12px; + font-family: inherit; + font-size: 13px; overflow-x: auto; overflow-y: auto; //display: block; |