Fix PolicyId

[clamp.git] / src / main / resources / META-INF / resources / designer / scripts / CldsModelService.js

diff --git a/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js b/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js
index 195886c..89197af 100644 (file)
--- a/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js
+++ b/src/main/resources/META-INF/resources/designer/scripts/CldsModelService.js
@@ -2,7 +2,7 @@
  * ============LICENSE_START=======================================================
  * ONAP CLAMP
  * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights
+ * Copyright (C) 2017-2018 AT&T Intellectual Property. All rights
  *                             reserved.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,7 +18,7 @@
  * limitations under the License.
  * ============LICENSE_END============================================
  * ===================================================================
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * 
  */
 
 app.service('cldsModelService', ['alertService', '$http', '$q', function(alertService, $http, $q) {
@@ -214,6 +214,7 @@ app.service('cldsModelService', ['alertService', '$http', '$q', function(alertSe
 
       })
       .error(function(data) {
+        def.resolve(data);
         alertService.alertMessage("Action Failure:" + uiAction, 2);
         //def         alertService.alertMessage("Action Successful:"+uiAction,1);
         def.reject(svcAction + " not successful");
@@ -273,7 +274,7 @@ app.service('cldsModelService', ['alertService', '$http', '$q', function(alertSe
     document.getElementById("modeler_name").textContent = headerText;
     document.getElementById("templa_name").textContent = ("Template Used - " + selected_template);
     setStatus(pars)
-    disableBPMNAddSVG(pars);
+    addSVG(pars);
     this.enableDisableMenuOptions(pars);
 
 
@@ -284,6 +285,7 @@ app.service('cldsModelService', ['alertService', '$http', '$q', function(alertSe
     deploymentId = pars.deploymentId;
     setStatus(pars);
     this.enableDisableMenuOptions(pars);
+    elementMap = JSON.parse(pars.propText);
   }
 
   function setStatus(pars) {
@@ -319,7 +321,7 @@ app.service('cldsModelService', ['alertService', '$http', '$q', function(alertSe
 
   }
 
-  function disableBPMNAddSVG(pars) {
+  function addSVG(pars) {
 
     var svg = pars.imageText.substring(pars.imageText.indexOf("<svg"))
     if ($("#svgContainer").length > 0)
@@ -340,22 +342,16 @@ app.service('cldsModelService', ['alertService', '$http', '$q', function(alertSe
       lastElementSelected = $($(event.target).parent()).attr("data-element-id")
       checkIfElementType(name)
 
-    })
-    $(".bjs-container").attr("hidden", "");
+    });
   }
   this.enableDisableMenuOptions = function(pars) {
 
     var permittedActionCd = pars.permittedActionCd;
 
     //dropdown options - always true
-    document.getElementById('Open Template').classList.remove('ThisLink');
     document.getElementById('Open CL').classList.remove('ThisLink');
-    document.getElementById('Save Template').classList.add('ThisLink');
-    document.getElementById('Template Properties').classList.add('ThisLink');
-    document.getElementById('Revert Template Changes').classList.add('ThisLink');
-    document.getElementById('Close Template').classList.add('ThisLink');
 
-    if (readOnly || readMOnly) {
+    if (readMOnly) {
       //enable model options
       document.getElementById('Properties CL').classList.remove('ThisLink');
       document.getElementById('Close Model').classList.remove('ThisLink');
@@ -377,11 +373,6 @@ app.service('cldsModelService', ['alertService', '$http', '$q', function(alertSe
       document.getElementById('Refresh Status').classList.remove('ThisLink');
       document.getElementById('Refresh ASDC').classList.remove('ThisLink');
     }
-    if (readTOnly) {
-      document.getElementById('Create Template').classList.add('ThisLink');
-    } else {
-      document.getElementById('Create Template').classList.remove('ThisLink');
-    }
 
     // enable/disable menu options based on permittedActionCd list
     this.checkPermittedActionCd(permittedActionCd, 'Validation Test', 'TEST');