From f97bae33631c3f5ef06574e9d21620c8dfff8f62 Mon Sep 17 00:00:00 2001 From: Idan Amit Date: Tue, 6 Mar 2018 13:52:58 +0200 Subject: Add events hub notify calls Added events hub notify calls. Fixed issues raised by development across the publish subscribe mechanism development Change-Id: I0768bdcb2d89f99634cdb6bc7cb75e20263f5c00 Issue-ID: SDC-1029 Signed-off-by: Idan Amit --- .../app/services/components/component-service.ts | 22 ++++++++++++++++++---- .../app/services/components/resource-service.ts | 13 ++++++++----- .../src/app/services/components/service-service.ts | 10 ++++++---- 3 files changed, 32 insertions(+), 13 deletions(-) (limited to 'catalog-ui/src/app/services/components') diff --git a/catalog-ui/src/app/services/components/component-service.ts b/catalog-ui/src/app/services/components/component-service.ts index 90ae850899..1b2b9f2fa1 100644 --- a/catalog-ui/src/app/services/components/component-service.ts +++ b/catalog-ui/src/app/services/components/component-service.ts @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -23,6 +23,7 @@ import {ArtifactModel, IFileDownload, InstancesInputsPropertiesMap, InputModel, import {ComponentInstanceFactory, CommonUtils} from "app/utils"; import {SharingService} from "../sharing-service"; import {ComponentMetadata} from "../../models/component-metadata"; +import {EventBusService} from "../../ng2/services/event-bus.service"; export interface IComponentService { @@ -79,14 +80,16 @@ export class ComponentService implements IComponentService { 'sdcConfig', 'Sdc.Services.SharingService', '$q', - '$base64' + '$base64', + 'EventBusService' ]; constructor(protected restangular:restangular.IElement, protected sdcConfig:IAppConfigurtaion, protected sharingService:SharingService, protected $q:ng.IQService, - protected $base64:any + protected $base64:any, + protected eventBusService:EventBusService ) { this.restangular.setBaseUrl(sdcConfig.api.root + sdcConfig.api.component_api_root); @@ -224,6 +227,17 @@ export class ComponentService implements IComponentService { }, (err)=> { deferred.reject(err); }); + + // Notifying about events before executing the actual actions + switch (state) { + case "checkIn": + this.eventBusService.notify("CHECK_IN"); + break; + case "submitForTesting": + this.eventBusService.notify("SUBMIT_FOR_TESTING"); + break; + } + return deferred.promise; }; diff --git a/catalog-ui/src/app/services/components/resource-service.ts b/catalog-ui/src/app/services/components/resource-service.ts index 472775e50d..641d7cba48 100644 --- a/catalog-ui/src/app/services/components/resource-service.ts +++ b/catalog-ui/src/app/services/components/resource-service.ts @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,6 +25,7 @@ import {IComponentService, ComponentService} from "./component-service"; import {PropertyModel, IAppConfigurtaion, Resource, Component} from "../../models"; import {SharingService} from "../sharing-service"; +import {EventBusService} from "../../ng2/services/event-bus.service"; export interface IResourceService extends IComponentService { updateResourceGroupProperties(uniqueId:string, groupId:string, properties:Array):ng.IPromise> @@ -37,16 +38,18 @@ export class ResourceService extends ComponentService implements IResourceServic 'sdcConfig', 'Sdc.Services.SharingService', '$q', - '$base64' + '$base64', + 'EventBusService' ]; constructor(protected restangular:restangular.IElement, protected sdcConfig:IAppConfigurtaion, protected sharingService:SharingService, protected $q:ng.IQService, - protected $base64:any + protected $base64:any, + protected eventBusService:EventBusService ) { - super(restangular, sdcConfig, sharingService, $q, $base64); + super(restangular, sdcConfig, sharingService, $q, $base64, eventBusService); this.restangular = restangular.one("resources"); } diff --git a/catalog-ui/src/app/services/components/service-service.ts b/catalog-ui/src/app/services/components/service-service.ts index f92f5699dc..4229c4aa2a 100644 --- a/catalog-ui/src/app/services/components/service-service.ts +++ b/catalog-ui/src/app/services/components/service-service.ts @@ -7,9 +7,9 @@ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -25,6 +25,7 @@ import {IComponentService, ComponentService} from "./component-service"; import {Distribution, DistributionComponent, Service, PropertyModel, Component, IAppConfigurtaion} from "app/models"; import {SharingService} from "../sharing-service"; +import {EventBusService} from "../../ng2/services/event-bus.service"; export interface IServiceService extends IComponentService { getDistributionsList(uuid:string):ng.IPromise>; @@ -49,8 +50,9 @@ export class ServiceService extends ComponentService implements IServiceService protected sdcConfig:IAppConfigurtaion, protected sharingService:SharingService, protected $q:ng.IQService, - protected $base64:any) { - super(restangular, sdcConfig, sharingService, $q, $base64); + protected $base64:any, + protected eventBusService:EventBusService) { + super(restangular, sdcConfig, sharingService, $q, $base64, eventBusService); this.restangular = restangular.one("services"); } -- cgit 1.2.3-korg