diff options
| author |   Idan Amit <ia096e@intl.att.com> | 2018-03-13 19:59:46 +0200 |
|---|---|---|
| committer | Idan Amit <ia096e@intl.att.com> | 2018-03-13 20:02:12 +0200 |
| commit | fad1d735d7ac3896e28277c733920d15e105db6e (patch) | |
| tree | 22dabd78b1383707776fc06ccd1c8b5814461131 /catalog-ui/src/app/services | |
| parent | 0f3a80869bf57fc909ec5908601ba04271d92d97 (diff) | |
Fixed merge issues
Fixed merge issues that broke the behavior of the plugins development
Change-Id: I6333944939628f745eb36c4619be33780881d27d
Issue-ID: SDC-1126
Signed-off-by: Idan Amit <ia096e@intl.att.com>
Diffstat (limited to 'catalog-ui/src/app/services')
| -rw-r--r-- | catalog-ui/src/app/services/components/component-service.ts | 4 | ||||
| -rw-r--r-- | catalog-ui/src/app/services/components/service-service.ts | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/catalog-ui/src/app/services/components/component-service.ts b/catalog-ui/src/app/services/components/component-service.ts index 74166a0c9f..8331bdbfb6 100644 --- a/catalog-ui/src/app/services/components/component-service.ts +++ b/catalog-ui/src/app/services/components/component-service.ts @@ -232,10 +232,10 @@ export class ComponentService implements IComponentService { // Notifying about events before executing the actual actions switch (state) { - case "checkIn": + case "lifecycleState/CHECKIN": this.eventBusService.notify("CHECK_IN"); break; - case "submitForTesting": + case "lifecycleState/certificationRequest": this.eventBusService.notify("SUBMIT_FOR_TESTING"); break; } diff --git a/catalog-ui/src/app/services/components/service-service.ts b/catalog-ui/src/app/services/components/service-service.ts index d55cae75ce..ee3a02371a 100644 --- a/catalog-ui/src/app/services/components/service-service.ts +++ b/catalog-ui/src/app/services/components/service-service.ts @@ -42,7 +42,8 @@ export class ServiceService extends ComponentService implements IServiceService 'sdcConfig', 'Sdc.Services.SharingService', '$q', - '$base64' + '$base64', + 'EventBusService' ]; public distribution:string = "distribution"; |