2 files changed, 29 insertions, 2 deletions

diff --git a/catalog-ui/src/app/models/graph/match-relation.ts b/catalog-ui/src/app/models/graph/match-relation.ts
index 2a1b2146b9..3da6775650 100644
--- a/catalog-ui/src/app/models/graph/match-relation.ts
+++ b/catalog-ui/src/app/models/graph/match-relation.ts
@@ -21,7 +21,7 @@
 import {Requirement} from "../requirement";
 import {Capability} from "../capability";
 import {Relationship, RelationshipModel} from "./relationship";
-import {PropertyModel} from "../properties";
+import {Operation} from "../../ng2/pages/composition/graph/connection-wizard/create-interface-operation/model/operation";
 
 export class Match {
     requirement:Requirement;
@@ -29,6 +29,7 @@ export class Match {
     isFromTo:boolean;
     fromNode:string;
     toNode:string;
+    operations?:Array<Operation>;
     private _relationship:Relationship;
 
     constructor(requirement:Requirement, capability:Capability, isFromTo:boolean, fromNode:string, toNode:string) {
@@ -54,6 +55,7 @@ export class Match {
     public matchToRelation = ():Relationship => {
         const relationship:Relationship = new Relationship();
         relationship.setRelationProperties(this.capability, this.requirement);
+        relationship.operations = this.operations;
         return relationship;
     };
 
@@ -74,5 +76,22 @@ export class Match {
         relationshipModel.setRelationshipModelParams(this.fromNode, this.toNode, [relationship]);
         return relationshipModel;
     };
+
+    public addToOperations(operation: Operation): void {
+        if (!this.operations) {
+            this.operations = new Array<Operation>();
+        }
+        this.operations.push(operation);
+    }
+
+    public removeFromOperations(operation: Operation): void {
+        if (!this.operations) {
+            return;
+        }
+        const index = this.operations.indexOf(operation);
+        if (index > -1) {
+            this.operations.splice(index, 1);
+        }
+    }
 }
 
diff --git a/catalog-ui/src/app/models/graph/relationship.ts b/catalog-ui/src/app/models/graph/relationship.ts
index 13a1bd13e0..e39521a66a 100644
--- a/catalog-ui/src/app/models/graph/relationship.ts
+++ b/catalog-ui/src/app/models/graph/relationship.ts
@@ -21,6 +21,7 @@
 import * as _ from "lodash";
 import {Capability} from "../capability";
 import {Requirement} from "../requirement";
+import {Operation} from "../../ng2/pages/composition/graph/connection-wizard/create-interface-operation/model/operation";
 
 export class RelationshipModel {
     fromNode:string;
@@ -103,12 +104,19 @@ export class Relationship {
     relation: RelationshipType;
     capability?: Capability;
     requirement?: Requirement;
+    operations?:Array<Operation>;
 
     constructor(fullRelationship?:Relationship) {
         if (fullRelationship) {
             this.relation = new RelationshipType(fullRelationship.relation);
             this.capability = fullRelationship.capability && new Capability(fullRelationship.capability);
             this.requirement = fullRelationship.requirement && new Requirement(fullRelationship.requirement);
+            if (fullRelationship.operations) {
+                this.operations = new Array<Operation>();
+                fullRelationship.operations.forEach(operation => {
+                    this.operations.push(new Operation(operation));
+                });
+            }
         } else {
             this.relation = new RelationshipType();
         }
@@ -118,7 +126,7 @@ export class Relationship {
         this.relation.setRelationProperties(capability, requirement);
         this.capability = capability;
         this.requirement = requirement;
-    };
+    }
 
     public toJSON = ():any => {
         let temp = angular.copy(this);