From a5445100050e49e83f73424198d73cd72d672a4d Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Sun, 4 Mar 2018 14:53:33 +0200 Subject: Sync Integ to Master Change-Id: I71e3acc26fa612127756ac04073a522b9cc6cd74 Issue-ID: SDC-977 Signed-off-by: Gitelman, Tal (tg851x) --- .../src/app/ng2/pages/connection-wizard/connection-wizard.service.ts | 1 + .../connection-wizard/from-node-step/from-node-step.component.html | 3 +-- .../connection-wizard/from-node-step/from-node-step.component.ts | 4 ---- .../connection-wizard/properties-step/properties-step.component.html | 2 +- .../connection-wizard/properties-step/properties-step.component.ts | 5 +++-- .../pages/connection-wizard/to-node-step/to-node-step.component.html | 3 +-- .../pages/connection-wizard/to-node-step/to-node-step.component.ts | 4 ---- 7 files changed, 7 insertions(+), 15 deletions(-) (limited to 'catalog-ui/src/app/ng2/pages/connection-wizard') diff --git a/catalog-ui/src/app/ng2/pages/connection-wizard/connection-wizard.service.ts b/catalog-ui/src/app/ng2/pages/connection-wizard/connection-wizard.service.ts index a097fb04ea..bf5ec4c4f6 100644 --- a/catalog-ui/src/app/ng2/pages/connection-wizard/connection-wizard.service.ts +++ b/catalog-ui/src/app/ng2/pages/connection-wizard/connection-wizard.service.ts @@ -1,3 +1,4 @@ +import * as _ from "lodash"; import {ConnectRelationModel} from "../../../models/graph/connectRelationModel"; import {Injectable} from "@angular/core"; import { Requirement, Capability} from "app/models"; diff --git a/catalog-ui/src/app/ng2/pages/connection-wizard/from-node-step/from-node-step.component.html b/catalog-ui/src/app/ng2/pages/connection-wizard/from-node-step/from-node-step.component.html index 0c9d9e6e26..a45f07b3e2 100644 --- a/catalog-ui/src/app/ng2/pages/connection-wizard/from-node-step/from-node-step.component.html +++ b/catalog-ui/src/app/ng2/pages/connection-wizard/from-node-step/from-node-step.component.html @@ -3,6 +3,5 @@ [selectedReqOrCapModel]="connectWizardService.selectedMatch && (connectWizardService.selectedMatch.isFromTo ? connectWizardService.selectedMatch.requirement : connectWizardService.selectedMatch.capability)" [currentComponent]="connectWizardService.currentComponent" [componentInstanceId]="connectWizardService.connectRelationModel.fromNode.componentInstance.uniqueId" - (updateSelectedReqOrCap)="updateSelectedReqOrCap($event)" - (updateCapabilityProperties)="onCapabilityPropertiesUpdate($event)"> + (updateSelectedReqOrCap)="updateSelectedReqOrCap($event)"> \ No newline at end of file diff --git a/catalog-ui/src/app/ng2/pages/connection-wizard/from-node-step/from-node-step.component.ts b/catalog-ui/src/app/ng2/pages/connection-wizard/from-node-step/from-node-step.component.ts index edbbf8a0a3..054d38b063 100644 --- a/catalog-ui/src/app/ng2/pages/connection-wizard/from-node-step/from-node-step.component.ts +++ b/catalog-ui/src/app/ng2/pages/connection-wizard/from-node-step/from-node-step.component.ts @@ -32,10 +32,6 @@ export class FromNodeStepComponent implements IStepComponent, OnInit{ return true; } - onCapabilityPropertiesUpdate(capabilityProperties:Array) { - this.connectWizardService.selectedMatch.capabilityProperties = capabilityProperties; - } - private updateSelectedReqOrCap = (selected:Requirement|Capability):void => { if(!selected){ this.connectWizardService.selectedMatch = null; diff --git a/catalog-ui/src/app/ng2/pages/connection-wizard/properties-step/properties-step.component.html b/catalog-ui/src/app/ng2/pages/connection-wizard/properties-step/properties-step.component.html index 9e34893272..9b1df69d77 100644 --- a/catalog-ui/src/app/ng2/pages/connection-wizard/properties-step/properties-step.component.html +++ b/catalog-ui/src/app/ng2/pages/connection-wizard/properties-step/properties-step.component.html @@ -5,7 +5,7 @@
diff --git a/catalog-ui/src/app/ng2/pages/connection-wizard/properties-step/properties-step.component.ts b/catalog-ui/src/app/ng2/pages/connection-wizard/properties-step/properties-step.component.ts index 3e48785a3c..946d1858dc 100644 --- a/catalog-ui/src/app/ng2/pages/connection-wizard/properties-step/properties-step.component.ts +++ b/catalog-ui/src/app/ng2/pages/connection-wizard/properties-step/properties-step.component.ts @@ -25,7 +25,7 @@ export class PropertiesStepComponent implements IStepComponent{ constructor(@Inject(forwardRef(() => ConnectionWizardService)) public connectWizardService: ConnectionWizardService, private componentInstanceServiceNg2:ComponentInstanceServiceNg2, private propertiesUtils:PropertiesUtils) { - this.capabilityPropertiesMap = this.propertiesUtils.convertPropertiesMapToFEAndCreateChildren({'capability' : connectWizardService.selectedMatch.capabilityProperties}, false); + this.capabilityPropertiesMap = this.propertiesUtils.convertPropertiesMapToFEAndCreateChildren({'capability' : connectWizardService.selectedMatch.capability.properties}, false); } ngOnInit() { @@ -42,7 +42,8 @@ export class PropertiesStepComponent implements IStepComponent{ propertyValueChanged = (property: PropertyFEModel) => { if (!property.isDeclared) { const propChangedIdx = this.connectWizardService.changedCapabilityProperties.indexOf(property); - if (this.componentInstanceServiceNg2.hasPropertyChanged(property)) { + if (property.hasValueObjChanged()) { + // if (this.componentInstanceServiceNg2.hasPropertyChanged(property)) { console.log("==>" + this.constructor.name + ": propertyValueChanged " + property); if (propChangedIdx === -1) { this.connectWizardService.changedCapabilityProperties.push(property); diff --git a/catalog-ui/src/app/ng2/pages/connection-wizard/to-node-step/to-node-step.component.html b/catalog-ui/src/app/ng2/pages/connection-wizard/to-node-step/to-node-step.component.html index 67bb12e6fc..a8343ce7e2 100644 --- a/catalog-ui/src/app/ng2/pages/connection-wizard/to-node-step/to-node-step.component.html +++ b/catalog-ui/src/app/ng2/pages/connection-wizard/to-node-step/to-node-step.component.html @@ -4,6 +4,5 @@ [selectedReqOrCapOption]="displayRequirementsOrCapabilities" [currentComponent]="connectWizardService.currentComponent" [componentInstanceId]="connectWizardService.connectRelationModel.toNode.componentInstance.uniqueId" - (updateSelectedReqOrCap)="updateSelectedReqOrCap($event)" - (updateCapabilityProperties)="onCapabilityPropertiesUpdate($event)"> + (updateSelectedReqOrCap)="updateSelectedReqOrCap($event)"> \ No newline at end of file diff --git a/catalog-ui/src/app/ng2/pages/connection-wizard/to-node-step/to-node-step.component.ts b/catalog-ui/src/app/ng2/pages/connection-wizard/to-node-step/to-node-step.component.ts index 9c7bf4dfe6..ea3b129c7b 100644 --- a/catalog-ui/src/app/ng2/pages/connection-wizard/to-node-step/to-node-step.component.ts +++ b/catalog-ui/src/app/ng2/pages/connection-wizard/to-node-step/to-node-step.component.ts @@ -43,10 +43,6 @@ export class ToNodeStepComponent implements IStepComponent{ return false; } - onCapabilityPropertiesUpdate(capabilityProperties:Array) { - this.connectWizardService.selectedMatch.capabilityProperties = capabilityProperties; - } - private updateSelectedReqOrCap = (selected:Requirement|Capability):void => { if (!selected) { if (this.connectWizardService.selectedMatch.isFromTo) { -- cgit 1.2.3-korg