Merge "Prevent adding same type of Op policy"
authorSébastien Determe <sebastien.determe@intl.att.com>
Tue, 21 Apr 2020 12:27:17 +0000 (12:27 +0000)
committerGerrit Code Review <gerrit@onap.org>
Tue, 21 Apr 2020 12:27:17 +0000 (12:27 +0000)
1  2 
src/main/java/org/onap/clamp/loop/LoopService.java
ui-react/src/api/LoopService.js
ui-react/src/components/dialogs/Loop/ModifyLoopModal.js

@@@ -230,18 -230,17 +230,17 @@@ export default class LoopService 
                                if (response.ok) {
                                        return response.json();
                                } else {
-                                       console.error("Add Operational Policy query failed");
-                                       return {};
+                                       return response.text();
                                }
                        })
-                       .catch(function (error) {
-                               console.error("Add Operational Policy error received", error);
-                               return {};
-                       });
+                       .then(function (object) {
+                               console.error("Add Operational Policy query failed");
+                               throw new Error(object);
+                       })
        }
  
 -      static removeOperationalPolicyType(loopName, policyType, policyVersion) {
 -              return fetch('/restservices/clds/v2/loop/removeOperationaPolicy/' + loopName + '/policyModel/' + policyType +'/' + policyVersion , {
 +      static removeOperationalPolicyType(loopName, policyType, policyVersion, policyName) {
 +              return fetch('/restservices/clds/v2/loop/removeOperationaPolicy/' + loopName + '/policyModel/' + policyType +'/' + policyVersion + '/' + policyName , {
                        method: 'PUT',
                        headers: {
                                "Content-Type": "application/json"