From aabae2a75c606a8f44fd5e0b38d840bf8cd767dc Mon Sep 17 00:00:00 2001
From: mkidd <michael.kidd@est.tech>
Date: Wed, 24 Mar 2021 12:26:31 +0000
Subject: 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>
---
 .../src/main/resources/webapp/js/ApexEventEditForm.js | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'gui-editors/gui-editor-apex/src/main/resources/webapp/js/ApexEventEditForm.js')

diff --git a/gui-editors/gui-editor-apex/src/main/resources/webapp/js/ApexEventEditForm.js b/gui-editors/gui-editor-apex/src/main/resources/webapp/js/ApexEventEditForm.js
index 58c9b26..ea23895 100644
--- a/gui-editors/gui-editor-apex/src/main/resources/webapp/js/ApexEventEditForm.js
+++ b/gui-editors/gui-editor-apex/src/main/resources/webapp/js/ApexEventEditForm.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.
@@ -69,7 +69,7 @@ function editEventForm_editEvent_inner(formParent, name, version, viewOrEdit) {
     var requestURL = window.restRootURL + "/Event/Get?name=" + name + "&version=" + version;
     ajax_getWithKeyInfo(requestURL, "apexEvent", function(event) {
         // Get all contextSchemas too for event params
-        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++) {
@@ -96,19 +96,14 @@ function editEventForm_activate(parent, operation, event, contextSchemas) {
     }
     apexUtils_emptyElement(parent);
 
-    var isedit = false;
     var createEditOrView = "";
     if (!operation) {
         console.warn("No operation specified for EventForm form")
     } else {
         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 (!event) {
             console.warn("Invalid value (\"" + event + "\") passed as a value for \"event\" for EventForm form.");
@@ -559,15 +554,17 @@ function editEventForm_submitPressed() {
     }
     var jsonString = JSON.stringify(eventbean);
 
+    var requestURL;
+
     if (createEditOrView == "CREATE") {
-        var requestURL = window.restRootURL + "/Event/Create";
+        requestURL = window.restRootURL + "/Event/Create";
         ajax_post(requestURL, jsonString, function(resultData) {
             apexUtils_removeElement("editEventFormDiv");
             eventTab_reset();
             keyInformationTab_reset()
         });
     } else if (createEditOrView == "EDIT") {
-        var requestURL = window.restRootURL + "/Event/Update";
+        requestURL = window.restRootURL + "/Event/Update";
         ajax_put(requestURL, jsonString, function(resultData) {
             apexUtils_removeElement("editEventFormDiv");
             eventTab_reset();
-- 
cgit 1.2.3-korg