From fad1d735d7ac3896e28277c733920d15e105db6e Mon Sep 17 00:00:00 2001 From: Idan Amit Date: Tue, 13 Mar 2018 19:59:46 +0200 Subject: 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 --- catalog-ui/src/app/services/components/component-service.ts | 4 ++-- catalog-ui/src/app/services/components/service-service.ts | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) (limited to 'catalog-ui/src/app/services') 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"; -- cgit 1.2.3-korg