Fixes duplicate isolation policy addition (#256)

Fixes https://github.com/contiv/ccn/issues/137
contiv · Jan 13, 2017 · 152f370 · 152f370
1 parent 6c54e61
commit 152f370
Show file tree

Hide file tree

Showing 3 changed files with 97 additions and 125 deletions.
diff --git a/app/applicationgroups/isolationpolicydirective.ts b/app/applicationgroups/isolationpolicydirective.ts
@@ -16,7 +16,6 @@ export class IsolationPolicySelectionComponent implements OnChanges {
 
     incomingRules:any[] = [];
     outgoingRules:any[] = [];
-    selectedPolicies:any[] = [];           // To Store policies selected by user to display
     isolationPolicies:any[] = [];          // To Get all isolation policies of tenant
     isolationPolicySearchText:string = '';
 
@@ -77,9 +76,11 @@ export class IsolationPolicySelectionComponent implements OnChanges {
         var component = this;
         var currentPolicyName = policyName;
 
-        if (currentPolicyName !== undefined && _.includes(component.selectedPolicies, currentPolicyName) == false) {
+        if (currentPolicyName !== undefined && _.includes(component.applicationgroup.policies, currentPolicyName) == false) {
             //To display selected policies
-            component.selectedPolicies.push(currentPolicyName);
+            //To be added to application group and saved to the server
+            component.applicationgroup.policies
+                .push(currentPolicyName);
 
             //To display rules of selected policies
             component.rulesModel.getIncomingRules(currentPolicyName, component.applicationgroup.tenantName)
@@ -91,19 +92,13 @@ export class IsolationPolicySelectionComponent implements OnChanges {
                     Array.prototype.push.apply(component.outgoingRules, rules);
                 });
 
-            //To be added to application group and saved to the server
-            component.applicationgroup.policies
-                .push(currentPolicyName);
         }
     };
 
     /**
      * Remove policy from application group
      */
     removeIsolationPolicy(policyName) {
-        _.remove(this.selectedPolicies, function (policy) {
-            return policy === policyName;
-        });
         _.remove(this.applicationgroup.policies, function (policy) {
             return policy === policyName;
         });

diff --git a/app/main.bundle.js b/app/main.bundle.js
@@ -2509,7 +2509,8 @@ webpackJsonp([2],[
 	  if (value == null) {
 	    return value === undefined ? undefinedTag : nullTag;
 	  }
-	  return (symToStringTag && symToStringTag in Object(value))
+	  value = Object(value);
+	  return (symToStringTag && symToStringTag in value)
 	    ? getRawTag(value)
 	    : objectToString(value);
 	}
@@ -7953,7 +7954,6 @@ webpackJsonp([2],[
 	        this.rulesModel = rulesModel;
 	        this.incomingRules = [];
 	        this.outgoingRules = [];
-	        this.selectedPolicies = []; // To Store policies selected by user to display
 	        this.isolationPolicies = []; // To Get all isolation policies of tenant
 	        this.isolationPolicySearchText = '';
 	    }
@@ -8004,9 +8004,11 @@ webpackJsonp([2],[
 	    IsolationPolicySelectionComponent.prototype.addIsolationPolicy = function (policyName) {
 	        var component = this;
 	        var currentPolicyName = policyName;
-	        if (currentPolicyName !== undefined && _.includes(component.selectedPolicies, currentPolicyName) == false) {
+	        if (currentPolicyName !== undefined && _.includes(component.applicationgroup.policies, currentPolicyName) == false) {
 	            //To display selected policies
-	            component.selectedPolicies.push(currentPolicyName);
+	            //To be added to application group and saved to the server
+	            component.applicationgroup.policies
+	                .push(currentPolicyName);
 	            //To display rules of selected policies
 	            component.rulesModel.getIncomingRules(currentPolicyName, component.applicationgroup.tenantName)
 	                .then(function (rules) {
@@ -8016,19 +8018,13 @@ webpackJsonp([2],[
 	                .then(function (rules) {
 	                Array.prototype.push.apply(component.outgoingRules, rules);
 	            });
-	            //To be added to application group and saved to the server
-	            component.applicationgroup.policies
-	                .push(currentPolicyName);
 	        }
 	    };
 	    ;
 	    /**
 	     * Remove policy from application group
 	     */
 	    IsolationPolicySelectionComponent.prototype.removeIsolationPolicy = function (policyName) {
-	        _.remove(this.selectedPolicies, function (policy) {
-	            return policy === policyName;
-	        });
 	        _.remove(this.applicationgroup.policies, function (policy) {
 	            return policy === policyName;
 	        });