From 2183b636b4e3708c58f76bda60fc4d4348160d8e Mon Sep 17 00:00:00 2001
From: miriame <miriam.eini@amdocs.com>
Date: Tue, 4 Jun 2019 08:54:47 +0300
Subject: 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>
---
 .../service-dependencies.component.ts               | 21 +++++++++++++++------
 .../service-dependencies-editor.component.ts        |  6 +++---
 2 files changed, 18 insertions(+), 9 deletions(-)

(limited to 'catalog-ui')

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
             }
diff --git a/catalog-ui/src/app/ng2/pages/service-dependencies-editor/service-dependencies-editor.component.ts b/catalog-ui/src/app/ng2/pages/service-dependencies-editor/service-dependencies-editor.component.ts
index cdef018b84..271dd4ada0 100644
--- a/catalog-ui/src/app/ng2/pages/service-dependencies-editor/service-dependencies-editor.component.ts
+++ b/catalog-ui/src/app/ng2/pages/service-dependencies-editor/service-dependencies-editor.component.ts
@@ -16,7 +16,7 @@
 import { Component } from '@angular/core';
 import {ServiceServiceNg2} from "app/ng2/services/component-services/service.service";
 import {ConstraintObjectUI, OPERATOR_TYPES} from 'app/ng2/components/logic/service-dependencies/service-dependencies.component';
-import {ServiceInstanceObject, PropertyBEModel} from 'app/models';
+import {ServiceInstanceObject, PropertyBEModel, InputBEModel} from 'app/models';
 import { PROPERTY_DATA } from 'app/utils';
 import {DropdownValue} from 'app/ng2/components/ui/form-components/dropdown/ui-element-dropdown.component';
 
@@ -50,7 +50,7 @@ export class ServiceDependenciesEditorComponent {
         serviceRules: Array<ConstraintObjectUI>,
         compositeServiceName: string,
         currentServiceName: string,
-        compositeServiceProperties: Array<PropertyBEModel>,
+        parentServiceInputs: Array<InputBEModel>,
         selectedInstanceProperties: Array<PropertyBEModel>,
         operatorTypes: Array<DropdownValue>,
         selectedInstanceSiblings: Array<ServiceInstanceObject>
@@ -98,7 +98,7 @@ export class ServiceDependenciesEditorComponent {
             value: this.input.compositeServiceName,
             assignedLabel: this.SOURCE_TYPES.SERVICE_PROPERTY.label,
             type: this.SOURCE_TYPES.SERVICE_PROPERTY.value,
-            options: this.input.compositeServiceProperties
+            options: this.input.parentServiceInputs
         });
         _.forEach(this.input.selectedInstanceSiblings, sib =>
             this.sourceTypes.push({
-- 
cgit 1.2.3-korg