Fix issue with rendering 'identity' key in GUI

Modified the java code to check dataOrderInfo format when getting data from
model stored in the db table.

Modified js code to check for type string when replacing 'equal-sign'
with '=' in enum value list

Change-Id: Iac804bc59da756f03073266703a684382d4afaff
Issue-ID: POLICY-1243
Signed-off-by: Michael Mokry <michael.mokry@att.com>

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java
index c4c8220..e7ed57a 100644 (file)
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateDcaeMicroServiceController.java
@@ -582,7 +582,11 @@ public class CreateDcaeMicroServiceController extends RestrictedBaseController {
                
                //Get element order info 
                String dataOrderInfo = returnModel.getDataOrderInfo();
-               
+        if(dataOrderInfo != null && !dataOrderInfo.startsWith("\"")){
+            dataOrderInfo = "\"" + dataOrderInfo + "\"";
+        }
+        LOGGER.info("dataOrderInfo : " + dataOrderInfo);
+        
                String allManyTrueKeys = "";
                if(allkeys != null){
                        allManyTrueKeys = allkeys.toString();

diff --git a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateOptimizationController.java b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateOptimizationController.java
index a45bfed..e3ce878 100644 (file)
--- a/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateOptimizationController.java
+++ b/POLICY-SDK-APP/src/main/java/org/onap/policy/controller/CreateOptimizationController.java
@@ -234,6 +234,10 @@ public class CreateOptimizationController extends RestrictedBaseController {
                
                //Get element order info 
                String dataOrderInfo = returnModel.getDataOrderInfo();
+               if(dataOrderInfo != null && !dataOrderInfo.startsWith("\"")){
+                   dataOrderInfo = "\"" + dataOrderInfo + "\"";
+               }
+               
                String nameOfTrueKeys = "";
                if(allkeys != null){
                        nameOfTrueKeys = allkeys.toString();

diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DCAEMicroServicePolicyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DCAEMicroServicePolicyController.js
index d53a919..5a3c62e 100644 (file)
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DCAEMicroServicePolicyController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DCAEMicroServicePolicyController.js
@@ -1381,9 +1381,10 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                        }
                        
                        for (i=0; i < listemunerateValues.length; i += 1) {
-                               if(listemunerateValues[i].includes("equal-sign")){
+                               if(typeof listemunerateValues[i] == "string" && listemunerateValues[i].includes("equal-sign")){
                                        listemunerateValues[i] = listemunerateValues[i].replace('equal-sign','=');
                                }
+                               
                            option = document.createElement('option');
                            option.setAttribute('value', listemunerateValues[i]);
                            option.appendChild(document.createTextNode(listemunerateValues[i]));

diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/OptimizationPolicyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/OptimizationPolicyController.js
index cbd011f..cdeaefd 100644 (file)
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/OptimizationPolicyController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/OptimizationPolicyController.js
@@ -1159,11 +1159,11 @@ angular.module('abs').controller('optimizationController', ['$scope', '$window',
                        listField.appendChild(optionFirst);     
                }
                
-               for (i=0; i < listemunerateValues.length; i += 1) {
-                       if(listemunerateValues[i].includes("equal-sign")){
+               for (var i=0; i < listemunerateValues.length; i += 1) {
+                       if(typeof listemunerateValues[i] == "string" && listemunerateValues[i].includes("equal-sign")){
                                listemunerateValues[i] = listemunerateValues[i].replace('equal-sign','=');
                        }
-                   option = document.createElement('option');
+                   var option = document.createElement('option');
                    option.setAttribute('value', listemunerateValues[i]);
                    option.appendChild(document.createTextNode(listemunerateValues[i]));
                    option.setAttribute('value', listemunerateValues[i]);