summaryrefslogtreecommitdiffstats
path: root/catalog-ui/src/app/services/components
diff options
context:
space:
mode:
authorIdan Amit <ia096e@intl.att.com>2018-04-15 19:19:08 +0300
committerIdan Amit <ia096e@intl.att.com>2018-04-15 19:19:08 +0300
commit6187c942bedebeb2f452ed0856652f90cd5c5772 (patch)
tree9c3463873e34d9097f2119b9ed35900f6ecab733 /catalog-ui/src/app/services/components
parent821b76c6b81ebf96e8fd8340ac5f6ed79f8ed22a (diff)
New observable notify design in pubsub
Implemented the new subscription mechanism for the pub sub notify function Change-Id: I5e6484adf1a0413d48b54b55048cda1a59b387ee Issue-ID: SDC-1178 Signed-off-by: Idan Amit <ia096e@intl.att.com>
Diffstat (limited to 'catalog-ui/src/app/services/components')
-rw-r--r--catalog-ui/src/app/services/components/component-service.ts17
-rw-r--r--catalog-ui/src/app/services/components/resource-service.ts9
-rw-r--r--catalog-ui/src/app/services/components/service-service.ts9
3 files changed, 8 insertions, 27 deletions
diff --git a/catalog-ui/src/app/services/components/component-service.ts b/catalog-ui/src/app/services/components/component-service.ts
index 8331bdbfb6..0b68c8be30 100644
--- a/catalog-ui/src/app/services/components/component-service.ts
+++ b/catalog-ui/src/app/services/components/component-service.ts
@@ -24,7 +24,6 @@ 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 {
@@ -82,16 +81,14 @@ export class ComponentService implements IComponentService {
'sdcConfig',
'Sdc.Services.SharingService',
'$q',
- '$base64',
- 'EventBusService'
+ '$base64'
];
constructor(protected restangular:restangular.IElement,
protected sdcConfig:IAppConfigurtaion,
protected sharingService:SharingService,
protected $q:ng.IQService,
- protected $base64:any,
- protected eventBusService:EventBusService
+ protected $base64:any
) {
this.restangular.setBaseUrl(sdcConfig.api.root + sdcConfig.api.component_api_root);
@@ -230,16 +227,6 @@ export class ComponentService implements IComponentService {
deferred.reject(err);
});
- // Notifying about events before executing the actual actions
- switch (state) {
- case "lifecycleState/CHECKIN":
- this.eventBusService.notify("CHECK_IN");
- break;
- case "lifecycleState/certificationRequest":
- 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 aabc14f8bd..15ef51e475 100644
--- a/catalog-ui/src/app/services/components/resource-service.ts
+++ b/catalog-ui/src/app/services/components/resource-service.ts
@@ -26,7 +26,6 @@ import * as _ from "lodash";
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<PropertyModel>):ng.IPromise<Array<PropertyModel>>
@@ -39,18 +38,16 @@ export class ResourceService extends ComponentService implements IResourceServic
'sdcConfig',
'Sdc.Services.SharingService',
'$q',
- '$base64',
- 'EventBusService'
+ '$base64'
];
constructor(protected restangular:restangular.IElement,
protected sdcConfig:IAppConfigurtaion,
protected sharingService:SharingService,
protected $q:ng.IQService,
- protected $base64:any,
- protected eventBusService:EventBusService
+ protected $base64:any
) {
- super(restangular, sdcConfig, sharingService, $q, $base64, eventBusService);
+ super(restangular, sdcConfig, sharingService, $q, $base64);
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 ee3a02371a..cce0759613 100644
--- a/catalog-ui/src/app/services/components/service-service.ts
+++ b/catalog-ui/src/app/services/components/service-service.ts
@@ -26,7 +26,6 @@ import * as _ from "lodash";
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<Array<Distribution>>;
@@ -42,8 +41,7 @@ export class ServiceService extends ComponentService implements IServiceService
'sdcConfig',
'Sdc.Services.SharingService',
'$q',
- '$base64',
- 'EventBusService'
+ '$base64'
];
public distribution:string = "distribution";
@@ -52,9 +50,8 @@ export class ServiceService extends ComponentService implements IServiceService
protected sdcConfig:IAppConfigurtaion,
protected sharingService:SharingService,
protected $q:ng.IQService,
- protected $base64:any,
- protected eventBusService:EventBusService) {
- super(restangular, sdcConfig, sharingService, $q, $base64, eventBusService);
+ protected $base64:any) {
+ super(restangular, sdcConfig, sharingService, $q, $base64);
this.restangular = restangular.one("services");
}