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>
(cherry picked from commit 32d9ca08e62acee4239a2b02464bc332bebbaf32)

2 files changed, 5 insertions, 4 deletions

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 d53a9198e..5a3c62e3c 100644
--- 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 cbd011f2e..cdeaefdea 100644
--- 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]);