Fix sonarqube code smells

Making changed regarding code smells. Some variables being declared twice while in scope.
renaming some modelFileName in ApexFiles.js that is being declared while there is a constant with the same name.
renamed some of the for loop control variables so that sonarqube doesnt see it as an issue
Made changes based on reviews

Issue-ID: POLICY-3095
Change-Id: If38934247a4e4ff9c48043feb3adde5505c46993
Signed-off-by: mkidd <michael.kidd@est.tech>

1 files changed, 23 insertions, 29 deletions

diff --git a/gui-editors/gui-editor-apex/src/main/resources/webapp/js/ApexTaskEditForm.js b/gui-editors/gui-editor-apex/src/main/resources/webapp/js/ApexTaskEditForm.js
index 56ba578..7ae7747 100644
--- a/gui-editors/gui-editor-apex/src/main/resources/webapp/js/ApexTaskEditForm.js
+++ b/gui-editors/gui-editor-apex/src/main/resources/webapp/js/ApexTaskEditForm.js
@@ -1,7 +1,7 @@
 /*
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2016-2018 Ericsson. All rights reserved.
- *  Modifications Copyright (C) 2020 Nordix Foundation.
+ *  Modifications Copyright (C) 2020-2021 Nordix Foundation.
  * ================================================================================
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,11 +42,11 @@ function editTaskForm_createTask(formParent) {
             contextSchemas.push(dt);
         }
         // Get all contextAlbums too for task context album references
-        var requestURL = window.restRootURL + "/ContextAlbum/Get?name=&version=";
+        requestURL = window.restRootURL + "/ContextAlbum/Get?name=&version=";
         var contextAlbums = new Array();
         ajax_get(requestURL, function(data3) {
-            for (var i = 0; i < data3.messages.message.length; i++) {
-                var contextAlbum = JSON.parse(data3.messages.message[i]).apexContextAlbum;
+            for (var y = 0; y < data3.messages.message.length; y++) {
+                var contextAlbum = JSON.parse(data3.messages.message[y]).apexContextAlbum;
                 var ca = {
                     "name" : contextAlbum.key.name,
                     "version" : contextAlbum.key.version,
@@ -84,7 +84,7 @@ function editTaskForm_editTask_inner(formParent, name, version, viewOrEdit) {
     var requestURL = window.restRootURL + "/Task/Get?name=" + name + "&version=" + version;
     ajax_getWithKeyInfo(requestURL, "apexTask", function(task) {
         // Get all contextSchemas too for task inputfields
-        var requestURL = window.restRootURL + "/ContextSchema/Get?name=&version=";
+        requestURL = window.restRootURL + "/ContextSchema/Get?name=&version=";
         var contextSchemas = new Array();
         ajax_get(requestURL, function(data2) {
             for (var i = 0; i < data2.messages.message.length; i++) {
@@ -97,11 +97,11 @@ function editTaskForm_editTask_inner(formParent, name, version, viewOrEdit) {
                 });
             }
             // Get all contextAlbums too for task context album references
-            var requestURL = window.restRootURL + "/ContextAlbum/Get?name=&version=";
+            requestURL = window.restRootURL + "/ContextAlbum/Get?name=&version=";
             var contextAlbums = new Array();
             ajax_get(requestURL, function(data3) {
-                for (var i = 0; i < data3.messages.message.length; i++) {
-                    var contextAlbum = JSON.parse(data3.messages.message[i]).apexContextAlbum;
+                for (var y = 0; y < data3.messages.message.length; y++) {
+                    var contextAlbum = JSON.parse(data3.messages.message[y]).apexContextAlbum;
                     var ca = {
                         "name" : contextAlbum.key.name,
                         "version" : contextAlbum.key.version,
@@ -126,7 +126,6 @@ function editTaskForm_activate(parent, operation, task, contextSchemas, contextA
     }
     apexUtils_emptyElement(parent);
 
-    var isedit = false;
     var createEditOrView = "";
 
     if (!operation) {
@@ -135,12 +134,7 @@ function editTaskForm_activate(parent, operation, task, contextSchemas, contextA
         createEditOrView = operation.toUpperCase();
     }
 
-    if (createEditOrView == "CREATE") {
-        isedit = true;
-    } else if (createEditOrView == "EDIT" || createEditOrView == "VIEW") {
-        if (createEditOrView == "EDIT") {
-            isedit = true;
-        }
+    if (createEditOrView == "EDIT" || createEditOrView == "VIEW") {
 
         if (!task) {
             console.warn("Invalid value (\"" + task + "\") passed as a value for \"task\" for TaskForm form.");
@@ -361,9 +355,9 @@ function editTaskForm_activate(parent, operation, task, contextSchemas, contextA
     outputfieldstable.appendChild(outputfieldstable_body);
     // Add the outputfields
     if (task && task.outputFields && task.outputFields.entry) {
-        for (var p = 0; p < task.outputFields.entry.length; p++) {
-            var outputfieldEntry = task.outputFields.entry[p];
-            var contextSchema = outputfieldEntry.value.fieldSchemaKey;
+        for (var y = 0; y < task.outputFields.entry.length; y++) {
+            var outputfieldEntry = task.outputFields.entry[y];
+            contextSchema = outputfieldEntry.value.fieldSchemaKey;
             contextSchema["displaytext"] = contextSchema.name + ":" + contextSchema.version;
             editTaskForm_addTaskOutputField(outputfieldstable_body, (createEditOrView == "VIEW"), outputfieldEntry.key,
                     outputfieldEntry.value.optional, contextSchema, contextSchemas);
@@ -453,8 +447,8 @@ function editTaskForm_activate(parent, operation, task, contextSchemas, contextA
     paramstable.appendChild(paramstable_body);
     // Add the params
     if (task && task.taskParameters && task.taskParameters.entry) {
-        for (var p = 0; p < task.taskParameters.entry.length; p++) {
-            var paramEntry = task.taskParameters.entry[p];
+        for (var k = 0; k < task.taskParameters.entry.length; k++) {
+            var paramEntry = task.taskParameters.entry[k];
             var paramName = paramEntry.key;
             var paramValue = paramEntry.value.defaultValue;
             editTaskForm_addTaskParameter(paramstable_body, (createEditOrView == "VIEW"), paramName, paramValue);
@@ -503,8 +497,8 @@ function editTaskForm_activate(parent, operation, task, contextSchemas, contextA
     contextstable.appendChild(contextstable_body);
     // Add the contexts
     if (task && task.contextAlbumReference && $.isArray(task.contextAlbumReference)) {
-        for (var p = 0; p < task.contextAlbumReference.length; p++) {
-            var contextEntry = task.contextAlbumReference[p];
+        for (var l = 0; l < task.contextAlbumReference.length; l++) {
+            var contextEntry = task.contextAlbumReference[l];
             var contextName = contextEntry.name + ":" + contextEntry.version;
             var ce = {
                 "name" : contextEntry.name,
@@ -887,8 +881,8 @@ function editTaskForm_submitPressed() {
     var outputfieldstablerows = document.getElementById("editTaskFormOutputFieldsTable").rows;
     if (outputfieldstablerows && outputfieldstablerows.length > 2) {
         taskbean_outputfields = new Object();
-        for (var i = 1; i < outputfieldstablerows.length - 1; i++) {
-            var outputfieldTR = outputfieldstablerows[i];
+        for (var g = 1; g < outputfieldstablerows.length - 1; g++) {
+            var outputfieldTR = outputfieldstablerows[g];
             if (outputfieldTR && outputfieldTR.getAttribute("outputfield_id")) {
                 var outputfield_id = outputfieldTR.getAttribute("outputfield_id");
                 var outputfieldname = document.getElementById("editTaskFormOutputFieldName" + "_" + outputfield_id).value;
@@ -933,8 +927,8 @@ function editTaskForm_submitPressed() {
     var paramstablerows = document.getElementById("editTaskFormParamsTable").rows;
     if (paramstablerows && paramstablerows.length > 2) {
         taskbean_parameters = new Object();
-        for (var i = 1; i < paramstablerows.length - 1; i++) {
-            var paramTR = paramstablerows[i];
+        for (var h = 1; h < paramstablerows.length - 1; h++) {
+            var paramTR = paramstablerows[h];
             if (paramTR && paramTR.getAttribute("param_id")) {
                 var param_id = paramTR.getAttribute("param_id");
                 var paramname = document.getElementById("editTaskFormParamName" + "_" + param_id).value;
@@ -955,8 +949,8 @@ function editTaskForm_submitPressed() {
     var contextstablerows = document.getElementById("editTaskFormContextsTable").rows;
     if (contextstablerows && contextstablerows.length > 2) {
         taskbean_context = new Array();
-        for (var i = 1; i < contextstablerows.length - 1; i++) {
-            var contextTR = contextstablerows[i];
+        for (var s = 1; s < contextstablerows.length - 1; s++) {
+            var contextTR = contextstablerows[s];
             if (contextTR && contextTR.getAttribute("context_id")) {
                 var context_id = contextTR.getAttribute("context_id");
                 var contextalbumvalue = document.getElementById("editTaskFormContextValue" + "_" + context_id
@@ -1004,7 +998,7 @@ function editTaskForm_submitPressed() {
             keyInformationTab_reset()
         });
     } else if (createEditOrView == "EDIT") {
-        var requestURL = window.restRootURL + "/Task/Update";
+        requestURL = window.restRootURL + "/Task/Update";
         ajax_put(requestURL, jsonString, function(resultData) {
             apexUtils_removeElement("editTaskFormDiv");
             taskTab_reset();