From 9bc3370f3b27640cea5d7085d36ef6d73011636b Mon Sep 17 00:00:00 2001
From: Adam Bem <adam.bem@zoho.eu>
Date: Thu, 23 Feb 2023 13:39:57 +0100
Subject: [PATCH] Format function now allows to choose source and target IDs

---
 Frontend/assets/scripts/tools/scripts.js | 34 +++++++++++-------------
 Frontend/tools/formatter.html            |  4 +--
 2 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/Frontend/assets/scripts/tools/scripts.js b/Frontend/assets/scripts/tools/scripts.js
index adf9188..d55ea46 100644
--- a/Frontend/assets/scripts/tools/scripts.js
+++ b/Frontend/assets/scripts/tools/scripts.js
@@ -96,18 +96,20 @@ function refreshTooltip() {
     document.getElementById("xsltelementsheader").innerText = XSLTheader;
 }
 
+
+
 function performRequest(endpoint, checkXML, checkTransform){
-    var xmlData = document.getElementById("xmlArea").value.trim();
-    var transformData = document.getElementById("transformArea").value.trim();
+    var xmlData = document.getElementById(sourceId).value.trim();
+    var transformData = document.getElementById(targetId).value.trim();
     
     var empty = false;
     if (defaultStrings.includes(xmlData) && checkXML) {
-            document.getElementById("xmlArea").style.backgroundColor = color_red;
+            document.getElementById(sourceId).style.backgroundColor = color_red;
             xmlData = "";
             empty = true;
     }
     if (defaultStrings.includes(transformData) && checkTransform) {
-        document.getElementById("transformArea").style.backgroundColor = color_red;
+        document.getElementById(targetId).style.backgroundColor = color_red;
         empty = true;
     }
     if (!empty) {
@@ -128,34 +130,30 @@ function performRequest(endpoint, checkXML, checkTransform){
     
 }
 
-function performFormatRequest(endpoint, checkXML){
-    var xmlData = document.getElementById("xmlArea").value.trim();
+function performFormatRequest(endpoint, checkXML, sourceId, targetId){
+    var xmlData = document.getElementById(sourceId).value.trim();
     
     var empty = false;
     if (defaultStrings.includes(xmlData) && checkXML) {
-            document.getElementById("xmlArea").style.backgroundColor = color_red;
+            document.getElementById(sourceId).style.backgroundColor = color_red;
             xmlData = "";
             empty = true;
     }
+
     if (!empty) {
-        var result = restRequest(endpoint, xmlData, null);
-        document.getElementById("resultArea").value = result.result;
-        document.getElementById("procinfo").innerText = ' Computed using '.concat(" ", result.processor);
-        if (response.ok) {
-            document.getElementById("procinfo").innerText = document.getElementById("procinfo").innerText.concat(" in ", result.time, "ms");
-            procinfo.style.color = "#30aa58";
-        } else {
-            procinfo.style.color = "#aa3030";
-        }
+        restRequest(endpoint, xmlData, "").then(function(result) {
+            document.getElementById(targetId).value = result.result;
+            
+        });
     }else{
-        document.getElementById("resultArea").value = "No data provided!";
+        document.getElementById(targetId).value = "No data provided!";
         return false;
     }
     
 }
 
 
-//Form REST request, send, receive and display in resultArea
+//Form REST request, send and return received data
 async function restRequest(endpoint, xmlData, transformData) {
     const escapeChar = "specialEscapeChar";
     var port = ":8081/"
diff --git a/Frontend/tools/formatter.html b/Frontend/tools/formatter.html
index c5d88f6..b58249a 100644
--- a/Frontend/tools/formatter.html
+++ b/Frontend/tools/formatter.html
@@ -29,9 +29,9 @@
                     onfocus="clearDefaultContent(this, 'Insert XML here');"></textarea>
                 <br><br>
                 <button id="requestButton" class="max-width block-label action-button active"
-                    onclick="performFormatRequest('prettifypost', true)">Prettify XML</button>
+                    onclick="performFormatRequest('prettifypost', true, 'xmlArea', 'resultArea')">Prettify XML</button>
                 <button id="requestButton" class="max-width block-label action-button active"
-                    onclick="performFormatRequest('minimizepost', true)">Minimize XML</button>
+                    onclick="performFormatRequest('minimizepost', true, 'xmlArea', 'resultArea')">Minimize XML</button>
                 <br><br>
 
                 <label for="resultArea"><b>Result:<span id="procinfo"></span></b></label>