Add pause icon to the instantiationStatus table

Issue-ID: VID-821
Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com>
Change-Id: Idbe53b0d0f3515e5c5321f4631ff45ac459377c6
Signed-off-by: Einat Vinouze <einat.vinouze@intl.att.com>

diff --git a/vid-webpack-master/src/app/instantiationStatus/instantiationStatus.component.service.spec.ts b/vid-webpack-master/src/app/instantiationStatus/instantiationStatus.component.service.spec.ts
index eedd46d..5d7d898 100644 (file)
--- a/vid-webpack-master/src/app/instantiationStatus/instantiationStatus.component.service.spec.ts
+++ b/vid-webpack-master/src/app/instantiationStatus/instantiationStatus.component.service.spec.ts
@@ -1,5 +1,17 @@
 import {getTestBed, TestBed} from '@angular/core/testing';
-import {COMPLETED_WITH_ERRORS, INPROGRESS, InstantiationStatusComponentService, PAUSE, PENDING, ServiceStatus, STOPPED, SUCCESS_CIRCLE, UNKNOWN, X_O} from './instantiationStatus.component.service';
+import {
+  COMPLETED_WITH_ERRORS,
+  INPROGRESS,
+  InstantiationStatusComponentService,
+  PAUSE,
+  PAUSE_UPON_COMPLETION,
+  PENDING,
+  ServiceStatus,
+  STOPPED,
+  SUCCESS_CIRCLE,
+  UNKNOWN,
+  X_O
+} from './instantiationStatus.component.service';
 import {ServiceInfoModel} from '../shared/server/serviceInfo/serviceInfo.model';
 import {AaiService} from "../shared/services/aaiService/aai.service";
 import {MsoService} from "../shared/services/msoService/mso.service";
@@ -137,6 +149,7 @@ describe('Instantiation Status Service', () => {
     'StOpPeD': 'Stopped: Due to previous failure, will not be instantiated.',
     'COMPLETED_WITH_ERRORS': 'Completed with errors: some of the planned actions where successfully committed while other have not.\n Open the service to check it out.',
     'UNEXPECTED_RANDOM_STATUS': 'Unexpected status: "UNEXPECTED_RANDOM_STATUS"',
+    'COMPLETED_AND_PAUSED': 'Pause upon completion. you may resume the instantiation.\n Open the service to check it out.',
   })) {
 
     test(`getStatusTooltip should return status popover: status=${status}`, () => {
@@ -197,6 +210,9 @@ describe('Instantiation Status Service', () => {
     result = service.getStatus('UNEXPECTED_RANDOM_STATUS');
     expect(result.iconClassName).toEqual(UNKNOWN);
 
+    result = service.getStatus('COMPLETED_AND_PAUSED');
+    expect(result.iconClassName).toEqual(PAUSE_UPON_COMPLETION);
+
     result = service.getStatus(undefined);
     expect(result.iconClassName).toEqual(UNKNOWN);
   });

diff --git a/vid-webpack-master/src/app/instantiationStatus/instantiationStatus.component.service.ts b/vid-webpack-master/src/app/instantiationStatus/instantiationStatus.component.service.ts
index a644519..e59c16a 100644 (file)
--- a/vid-webpack-master/src/app/instantiationStatus/instantiationStatus.component.service.ts
+++ b/vid-webpack-master/src/app/instantiationStatus/instantiationStatus.component.service.ts
@@ -22,6 +22,7 @@ export let X_O : string = "x-circle-o";
 export let SUCCESS_CIRCLE : string = "success-circle-o";
 export let STOPPED : string = "stop";
 export let COMPLETED_WITH_ERRORS : string = "success_with_warning";
+export let PAUSE_UPON_COMPLETION : string = "stopped-upon-success";
 export let UNKNOWN : string = "question-mark-circle-o";
 
 
@@ -168,7 +169,8 @@ export class InstantiationStatusComponentService {
         return new ServiceStatus(STOPPED, 'error', 'Stopped: Due to previous failure, will not be instantiated.');
       case  'COMPLETED_WITH_ERRORS' :
         return new ServiceStatus(COMPLETED_WITH_ERRORS, 'success', 'Completed with errors: some of the planned actions where successfully committed while other have not.\n Open the service to check it out.');
-
+      case  'COMPLETED_AND_PAUSED' :
+        return new ServiceStatus(PAUSE_UPON_COMPLETION, 'default','Pause upon completion. you may resume the instantiation.\n Open the service to check it out.' );
       default:
         return new ServiceStatus(UNKNOWN, 'primary', `Unexpected status: "${status}"`);
     }

diff --git a/vid-webpack-master/src/app/shared/models/serviceInstanceActions.ts b/vid-webpack-master/src/app/shared/models/serviceInstanceActions.ts
index 808c3df..e029f48 100644 (file)
--- a/vid-webpack-master/src/app/shared/models/serviceInstanceActions.ts
+++ b/vid-webpack-master/src/app/shared/models/serviceInstanceActions.ts
@@ -24,7 +24,8 @@ export enum JobStatus {
   PENDING = 'PENDING',
   STOPPED = 'STOPPED',
   COMPLETED_WITH_ERRORS = 'COMPLETED_WITH_ERRORS',
-  CREATING = 'CREATING'
+  CREATING = 'CREATING',
+  PAUSE_UPON_COMPLETION = 'PAUSE_UPON_COMPLETION'
 }
 export enum PauseStatus {
   AFTER_COMPLETION = 'afterCompletion',