From 2183b636b4e3708c58f76bda60fc4d4348160d8e Mon Sep 17 00:00:00 2001 From: miriame 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 --- .../service-dependencies-editor.component.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'catalog-ui/src/app/ng2/pages') 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, compositeServiceName: string, currentServiceName: string, - compositeServiceProperties: Array, + parentServiceInputs: Array, selectedInstanceProperties: Array, operatorTypes: Array, selectedInstanceSiblings: Array @@ -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