summaryrefslogtreecommitdiffstats
path: root/catalog-ui/src/app/ng2/components
diff options
context:
space:
mode:
authormiriame <miriam.eini@amdocs.com>2019-06-04 08:54:47 +0300
committerAvi Gaffa <avi.gaffa@amdocs.com>2019-06-04 06:58:58 +0000
commit2183b636b4e3708c58f76bda60fc4d4348160d8e (patch)
tree2071e1390db840c041415277a634c51f9bd7a4e6 /catalog-ui/src/app/ng2/components
parent3f51f0186e99e1feabef9421ab30c4554f1921f9 (diff)
fix bug - Service dependency - Can't select parent inputs that came from other instances
Issue-ID: SDC-2349 Change-Id: Ief5d068e1dacbef1f70766f0e3b17c1a28a35344 Signed-off-by: miriame <miriam.eini@amdocs.com>
Diffstat (limited to 'catalog-ui/src/app/ng2/components')
-rw-r--r--catalog-ui/src/app/ng2/components/logic/service-dependencies/service-dependencies.component.ts21
1 files changed, 15 insertions, 6 deletions
diff --git a/catalog-ui/src/app/ng2/components/logic/service-dependencies/service-dependencies.component.ts b/catalog-ui/src/app/ng2/components/logic/service-dependencies/service-dependencies.component.ts
index ac87576540..bc3531dc58 100644
--- a/catalog-ui/src/app/ng2/components/logic/service-dependencies/service-dependencies.component.ts
+++ b/catalog-ui/src/app/ng2/components/logic/service-dependencies/service-dependencies.component.ts
@@ -15,11 +15,20 @@
*/
import {Component, Input, Output, EventEmitter, ComponentRef} from '@angular/core';
import {ModalService} from 'app/ng2/services/modal.service';
-import {Service, ComponentInstance, ModalModel, ButtonModel, PropertyBEModel, ServiceInstanceObject} from 'app/models';
+import {
+ Service,
+ ComponentInstance,
+ ModalModel,
+ ButtonModel,
+ PropertyBEModel,
+ InputBEModel,
+ ServiceInstanceObject
+} from 'app/models';
import {ServiceDependenciesEditorComponent} from 'app/ng2/pages/service-dependencies-editor/service-dependencies-editor.component';
import {ModalComponent} from 'app/ng2/components/ui/modal/modal.component';
import {ComponentServiceNg2} from 'app/ng2/services/component-services/component.service';
import {TranslateService} from 'app/ng2/shared/translator/translate.service';
+import {ComponentGenericResponse} from 'app/ng2/services/responses/component-generic-response';
export class ConstraintObject {
servicePropertyName: string;
@@ -106,7 +115,7 @@ export class ServiceDependenciesComponent {
modalInstance: ComponentRef<ModalComponent>;
isDependent: boolean;
isLoading: boolean;
- compositeServiceProperties: Array<PropertyBEModel> = [];
+ parentServiceInputs: Array<InputBEModel> = [];
rulesList: Array<ConstraintObject> = [];
operatorTypes: Array<any>;
@@ -131,8 +140,8 @@ export class ServiceDependenciesComponent {
{label: "<", value: OPERATOR_TYPES.LESS_THAN},
{label: "=", value: OPERATOR_TYPES.EQUAL}
];
- this.componentServiceNg2.getServiceProperties(this.compositeService).subscribe((properties: Array<PropertyBEModel>) => {
- this.compositeServiceProperties = properties;
+ this.componentServiceNg2.getComponentInputsWithProperties(this.compositeService).subscribe((result: ComponentGenericResponse) => {
+ this.parentServiceInputs = result.inputs;
});
this.loadRules();
this.translateService.languageChangedObservable.subscribe(lang => {
@@ -229,7 +238,7 @@ export class ServiceDependenciesComponent {
currentServiceName: this.currentServiceInstance.name,
operatorTypes: this.operatorTypes,
compositeServiceName: this.compositeService.name,
- compositeServiceProperties: this.compositeServiceProperties,
+ parentServiceInputs: this.parentServiceInputs,
selectedInstanceProperties: this.selectedInstanceProperties,
selectedInstanceSiblings: this.selectedInstanceSiblings
}
@@ -251,7 +260,7 @@ export class ServiceDependenciesComponent {
currentServiceName: this.currentServiceInstance.name,
operatorTypes: this.operatorTypes,
compositeServiceName: this.compositeService.name,
- compositeServiceProperties: this.compositeServiceProperties,
+ parentServiceInputs: this.parentServiceInputs,
selectedInstanceProperties: this.selectedInstanceProperties,
selectedInstanceSiblings: this.selectedInstanceSiblings
}