From 05857a7d7ee4cd000c27978f9ca3df0dad8504af Mon Sep 17 00:00:00 2001 From: mikolaj widla Date: Thu, 23 Feb 2023 09:02:17 +0100 Subject: [PATCH 01/13] Added clear button for XPath, XSD and XSLT --- Frontend/assets/scripts/tools/scripts.js | 5 +++++ Frontend/tools/xpath.html | 8 ++++++-- Frontend/tools/xsd.html | 6 +++++- Frontend/tools/xslt.html | 6 +++++- 4 files changed, 21 insertions(+), 4 deletions(-) diff --git a/Frontend/assets/scripts/tools/scripts.js b/Frontend/assets/scripts/tools/scripts.js index 6becf43..d44f732 100644 --- a/Frontend/assets/scripts/tools/scripts.js +++ b/Frontend/assets/scripts/tools/scripts.js @@ -11,6 +11,11 @@ function clearDefaultContent(element, text) { } } +function clearDataField(){ + document.getElementById("xmlArea").value = ""; + document.getElementById("transformArea").value = ""; +} + function fillDefaultXML(element) { if(element.classList.contains("active")){ const serverAddress = window.location.protocol + "//" + window.location.hostname + ":8086"; diff --git a/Frontend/tools/xpath.html b/Frontend/tools/xpath.html index 14deda7..9c4d1b0 100644 --- a/Frontend/tools/xpath.html +++ b/Frontend/tools/xpath.html @@ -36,8 +36,12 @@ - +
+ + +
diff --git a/Frontend/tools/xsd.html b/Frontend/tools/xsd.html index 47e6505..0716de3 100644 --- a/Frontend/tools/xsd.html +++ b/Frontend/tools/xsd.html @@ -25,8 +25,12 @@ - + + diff --git a/Frontend/tools/xslt.html b/Frontend/tools/xslt.html index 61319fe..b4a465f 100644 --- a/Frontend/tools/xslt.html +++ b/Frontend/tools/xslt.html @@ -25,8 +25,12 @@ - + + procInfo
From ac908e49e603f5ef76644baa8c5438eabe4ca608 Mon Sep 17 00:00:00 2001 From: mikolaj widla Date: Thu, 23 Feb 2023 09:15:47 +0100 Subject: [PATCH 02/13] Disabled resultArea for XMLTools --- Frontend/tools/xpath.html | 2 +- Frontend/tools/xsd.html | 2 +- Frontend/tools/xslt.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Frontend/tools/xpath.html b/Frontend/tools/xpath.html index 14deda7..3cf6f71 100644 --- a/Frontend/tools/xpath.html +++ b/Frontend/tools/xpath.html @@ -57,7 +57,7 @@ expression

- diff --git a/Frontend/tools/xsd.html b/Frontend/tools/xsd.html index 47e6505..95c7a96 100644 --- a/Frontend/tools/xsd.html +++ b/Frontend/tools/xsd.html @@ -49,7 +49,7 @@

- diff --git a/Frontend/tools/xslt.html b/Frontend/tools/xslt.html index 61319fe..84ae190 100644 --- a/Frontend/tools/xslt.html +++ b/Frontend/tools/xslt.html @@ -50,7 +50,7 @@

- From 8083d7fa6320dba5175808753fae89863f2430eb Mon Sep 17 00:00:00 2001 From: Adam Bem Date: Thu, 23 Feb 2023 09:58:00 +0100 Subject: [PATCH 03/13] Added comments to Parser.py --- Backend-libXML/Parser.py | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Backend-libXML/Parser.py b/Backend-libXML/Parser.py index 295b924..66901a6 100644 --- a/Backend-libXML/Parser.py +++ b/Backend-libXML/Parser.py @@ -2,10 +2,20 @@ from lxml import etree def prettify(source: str) -> str: + """Method used to pretty format given XML + + :param source: XML + :return: prettified XML + """ xml = etree.XML(source) return etree.tostring(xml, pretty_print=True).decode() def minimize(source: str) -> str: + """Method used to minimize XML by deleting not needed whitespaces. + + :param source: XML + :return: minimized XML + """ result = source to_remove = [" ", " ", "\t", "\n"] From a95c745ae24c53d1cd77e9b832e5d55d49ca179f Mon Sep 17 00:00:00 2001 From: Adam Bem Date: Thu, 23 Feb 2023 10:42:10 +0100 Subject: [PATCH 04/13] Formatter now accepts XMLs with prologs --- Backend-libXML/Parser.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/Backend-libXML/Parser.py b/Backend-libXML/Parser.py index 66901a6..827b356 100644 --- a/Backend-libXML/Parser.py +++ b/Backend-libXML/Parser.py @@ -7,8 +7,15 @@ def prettify(source: str) -> str: :param source: XML :return: prettified XML """ + prolog = "" + prolog_start = source.find("") + 2 + prolog = source[prolog_start:prolog_end] + "\n" + source = source[prolog_end: ] xml = etree.XML(source) - return etree.tostring(xml, pretty_print=True).decode() + return prolog + etree.tostring(xml, pretty_print=True).decode() def minimize(source: str) -> str: """Method used to minimize XML by deleting not needed whitespaces. From d9a413f88df602fcdfd47a4aad752f76f5c4cc13 Mon Sep 17 00:00:00 2001 From: mikolaj widla Date: Thu, 23 Feb 2023 13:05:44 +0100 Subject: [PATCH 05/13] Added tooltips for add new message, and message list elements --- .../src/main/resources/static/html/mock.html | 14 +++++++++++++- .../src/main/resources/static/js/uianimation.js | 12 +++++++++++- 2 files changed, 24 insertions(+), 2 deletions(-) diff --git a/Backend/mocked-services/src/main/resources/static/html/mock.html b/Backend/mocked-services/src/main/resources/static/html/mock.html index a908ea5..6f0abf8 100644 --- a/Backend/mocked-services/src/main/resources/static/html/mock.html +++ b/Backend/mocked-services/src/main/resources/static/html/mock.html @@ -167,7 +167,7 @@ --> -
+
@@ -190,6 +190,18 @@

To save message, the message must be changed!

+
+
+

Add new message

+

This button adds new message.

+
+
+
+
+

Message

+

This is saved messages, with unique id.

+
+

Http Status

diff --git a/Backend/mocked-services/src/main/resources/static/js/uianimation.js b/Backend/mocked-services/src/main/resources/static/js/uianimation.js index e375856..d80f6db 100644 --- a/Backend/mocked-services/src/main/resources/static/js/uianimation.js +++ b/Backend/mocked-services/src/main/resources/static/js/uianimation.js @@ -118,4 +118,14 @@ $('#headerValueInput').focusout(function(){focusOutTip('newHeaderTip')}); $('#btnSave').mouseover(function(){showTip('btnSaveTip');}); $('#btnSave').focusin(function(){focusInTip('btnSaveTip')}); $('#btnSave').mouseleave(function(){hidTip('btnSaveTip')}); -$('#btnSave').focusout(function(){focusOutTip('btnSaveTip')}); \ No newline at end of file +$('#btnSave').focusout(function(){focusOutTip('btnSaveTip')}); + +$('#new-tile').mouseover(function(){showTip('btn-newTileTip');}); +$('#new-tile').focusin(function(){focusInTip('btn-newTileTip')}); +$('#new-tile').mouseleave(function(){hidTip('btn-newTileTip')}); +$('#new-tile').focusout(function(){focusOutTip('btn-newTileTip')}); + +$('#listItems').mouseover(function(){showTip('messagesTip');}); +$('#listItems').focusin(function(){focusInTip('messagesTip')}); +$('#listItems').mouseleave(function(){hidTip('messagesTip')}); +$('#listItems').focusout(function(){focusOutTip('messagesTip')}); \ No newline at end of file From 5db10ab1c14f3f233bea91030381a10bf8609944 Mon Sep 17 00:00:00 2001 From: Adam Bem Date: Thu, 23 Feb 2023 13:17:50 +0100 Subject: [PATCH 06/13] Refactored code used to sending requests to backends --- Frontend/assets/scripts/tools/scripts.js | 41 ++++++++++++++---------- 1 file changed, 24 insertions(+), 17 deletions(-) diff --git a/Frontend/assets/scripts/tools/scripts.js b/Frontend/assets/scripts/tools/scripts.js index d44f732..adf9188 100644 --- a/Frontend/assets/scripts/tools/scripts.js +++ b/Frontend/assets/scripts/tools/scripts.js @@ -111,7 +111,16 @@ function performRequest(endpoint, checkXML, checkTransform){ empty = true; } if (!empty) { - restRequest(endpoint, xmlData, transformData); + restRequest(endpoint, xmlData, transformData).then(function(result) { + document.getElementById("resultArea").value = result.result; + document.getElementById("procinfo").innerText = ' Computed using '.concat(" ", result.processor); + if (result.status = "OK") { + document.getElementById("procinfo").innerText = document.getElementById("procinfo").innerText.concat(" in ", result.time, "ms"); + procinfo.style.color = "#30aa58"; + } else { + procinfo.style.color = "#aa3030"; + } + }); }else{ document.getElementById("resultArea").value = "No data provided!"; return false; @@ -129,7 +138,15 @@ function performFormatRequest(endpoint, checkXML){ empty = true; } if (!empty) { - restRequest(endpoint, xmlData, null); + 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"; + } }else{ document.getElementById("resultArea").value = "No data provided!"; return false; @@ -172,21 +189,11 @@ async function restRequest(endpoint, xmlData, transformData) { var request = new Request(addr, init); - - await fetch(request).then(response => { - console.log(response.status); - response.text().then(function (text) { - console.log(text); - var result = JSON.parse(text); - 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"; - } + var result = await fetch(request).then(response => { + return response.text().then(function(text) { + return JSON.parse(text); }); - + }); + return result; } From 9bc3370f3b27640cea5d7085d36ef6d73011636b Mon Sep 17 00:00:00 2001 From: Adam Bem Date: Thu, 23 Feb 2023 13:39:57 +0100 Subject: [PATCH 07/13] 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');">

+ onclick="performFormatRequest('prettifypost', true, 'xmlArea', 'resultArea')">Prettify XML + onclick="performFormatRequest('minimizepost', true, 'xmlArea', 'resultArea')">Minimize XML

From 1e56b2885ab5448116f6b3ebc41275d7c52d9258 Mon Sep 17 00:00:00 2001 From: Adam Bem Date: Thu, 23 Feb 2023 13:46:30 +0100 Subject: [PATCH 08/13] Simplified formatter --- Frontend/assets/css/tools/r11form.css | 4 ++++ Frontend/tools/formatter.html | 13 ++++--------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/Frontend/assets/css/tools/r11form.css b/Frontend/assets/css/tools/r11form.css index 6eb8ab9..e54e151 100644 --- a/Frontend/assets/css/tools/r11form.css +++ b/Frontend/assets/css/tools/r11form.css @@ -330,6 +330,10 @@ height: 300px; } +.textarea-800 { + height: 800px; +} + .centered-content { display: flex; justify-content: center; diff --git a/Frontend/tools/formatter.html b/Frontend/tools/formatter.html index b58249a..9803e0f 100644 --- a/Frontend/tools/formatter.html +++ b/Frontend/tools/formatter.html @@ -24,20 +24,15 @@

+ onclick="performFormatRequest('prettifypost', true, 'xmlArea', 'xmlArea')">Prettify XML -

- - - - + onclick="performFormatRequest('minimizepost', true, 'xmlArea', 'xmlArea')">Minimize XML +
From c7d34ed05f946542f8221cb2e8ebd8077f80ffed Mon Sep 17 00:00:00 2001 From: Adam Bem Date: Thu, 23 Feb 2023 13:57:57 +0100 Subject: [PATCH 09/13] Fixed bug with choosing ports --- Frontend/assets/scripts/tools/scripts.js | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Frontend/assets/scripts/tools/scripts.js b/Frontend/assets/scripts/tools/scripts.js index d55ea46..d464330 100644 --- a/Frontend/assets/scripts/tools/scripts.js +++ b/Frontend/assets/scripts/tools/scripts.js @@ -102,6 +102,11 @@ function performRequest(endpoint, checkXML, checkTransform){ var xmlData = document.getElementById(sourceId).value.trim(); var transformData = document.getElementById(targetId).value.trim(); + var port = 8081 + if (getProcessor() == "libxml") { + port = 8082 + } + var empty = false; if (defaultStrings.includes(xmlData) && checkXML) { document.getElementById(sourceId).style.backgroundColor = color_red; @@ -113,7 +118,7 @@ function performRequest(endpoint, checkXML, checkTransform){ empty = true; } if (!empty) { - restRequest(endpoint, xmlData, transformData).then(function(result) { + restRequest(port, endpoint, xmlData, transformData).then(function(result) { document.getElementById("resultArea").value = result.result; document.getElementById("procinfo").innerText = ' Computed using '.concat(" ", result.processor); if (result.status = "OK") { @@ -131,6 +136,7 @@ function performRequest(endpoint, checkXML, checkTransform){ } function performFormatRequest(endpoint, checkXML, sourceId, targetId){ + const port = 8082; var xmlData = document.getElementById(sourceId).value.trim(); var empty = false; @@ -141,7 +147,7 @@ function performFormatRequest(endpoint, checkXML, sourceId, targetId){ } if (!empty) { - restRequest(endpoint, xmlData, "").then(function(result) { + restRequest(port, endpoint, xmlData, "").then(function(result) { document.getElementById(targetId).value = result.result; }); @@ -154,13 +160,10 @@ function performFormatRequest(endpoint, checkXML, sourceId, targetId){ //Form REST request, send and return received data -async function restRequest(endpoint, xmlData, transformData) { +async function restRequest(port, endpoint, xmlData, transformData) { const escapeChar = "specialEscapeChar"; - var port = ":8081/" - if (getProcessor() == "libxml") { - port = ":8082/" - } - const addr = window.location.protocol + "//" + window.location.hostname + port + endpoint; + + const addr = window.location.protocol + "//" + window.location.hostname + ":" + port + "/" + endpoint; if(defaultStrings.includes(xmlData)){ xmlData = ""; From 15830d7adf70a56f7b511e69224e4c1d2508f6f8 Mon Sep 17 00:00:00 2001 From: Adam Bem Date: Thu, 23 Feb 2023 13:59:08 +0100 Subject: [PATCH 10/13] Implemented Format XML button --- Frontend/tools/xpath.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Frontend/tools/xpath.html b/Frontend/tools/xpath.html index 2a0bcdd..67b8aec 100644 --- a/Frontend/tools/xpath.html +++ b/Frontend/tools/xpath.html @@ -37,8 +37,10 @@
- +
From 7042959ee3988cf841c30971de35b1a85f5df13c Mon Sep 17 00:00:00 2001 From: Adam Bem Date: Thu, 23 Feb 2023 14:11:18 +0100 Subject: [PATCH 11/13] Added Format XML button in XSLT and XSD tools --- Frontend/tools/xsd.html | 4 +++- Frontend/tools/xslt.html | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/Frontend/tools/xsd.html b/Frontend/tools/xsd.html index 95de619..dd74623 100644 --- a/Frontend/tools/xsd.html +++ b/Frontend/tools/xsd.html @@ -26,8 +26,10 @@
- +
diff --git a/Frontend/tools/xslt.html b/Frontend/tools/xslt.html index 5128300..3751237 100644 --- a/Frontend/tools/xslt.html +++ b/Frontend/tools/xslt.html @@ -26,8 +26,10 @@
- +
From f96f8270ce54dbec8aba405836cdd6bd44c29a41 Mon Sep 17 00:00:00 2001 From: Adam Bem Date: Tue, 28 Feb 2023 11:45:39 +0100 Subject: [PATCH 12/13] Automated version generation (ticket #36) Co-authored-by: Adam Bem Reviewed-on: https://gitea.release11.com/R11/release11-tools-web/pulls/80 --- Frontend/Dockerfile | 12 ++++++++---- Frontend/index.html | 10 +++++----- Frontend/insert_version.sh | 5 +++++ Frontend/tools/xpath.html | 2 +- Frontend/tools/xsd.html | 3 +-- Frontend/tools/xslt.html | 2 +- 6 files changed, 21 insertions(+), 13 deletions(-) create mode 100644 Frontend/insert_version.sh diff --git a/Frontend/Dockerfile b/Frontend/Dockerfile index aed3064..febd991 100644 --- a/Frontend/Dockerfile +++ b/Frontend/Dockerfile @@ -3,9 +3,13 @@ FROM nginx:stable-alpine COPY ./tools/ /usr/share/nginx/html/tools/ COPY ./assets/ /usr/share/nginx/html/assets/ COPY ./index.html /usr/share/nginx/html -#COPY ./logo.png /usr/share/nginx/html -#COPY ./styles.css /usr/share/nginx/html -#COPY ./common.css /usr/share/nginx/html -#COPY ./favicon.ico /usr/share/nginx/html + +RUN mkdir -p /scripts +COPY insert_version.sh /scripts/ +WORKDIR /scripts + +RUN chmod +x insert_version.sh +RUN ./insert_version.sh + EXPOSE 80 diff --git a/Frontend/index.html b/Frontend/index.html index d9d0cd2..bcee87d 100644 --- a/Frontend/index.html +++ b/Frontend/index.html @@ -27,15 +27,15 @@
  • XSD
  • Formatter
    • - + - - diff --git a/Frontend/insert_version.sh b/Frontend/insert_version.sh new file mode 100644 index 0000000..9962202 --- /dev/null +++ b/Frontend/insert_version.sh @@ -0,0 +1,5 @@ +#!/bin/sh + +input="$(date +'%Y-%m-%d %H:%M')" + +sed -i "s/\[\:VERSION\:\]/$input/g" /usr/share/nginx/html/index.html \ No newline at end of file diff --git a/Frontend/tools/xpath.html b/Frontend/tools/xpath.html index 67b8aec..ad29e18 100644 --- a/Frontend/tools/xpath.html +++ b/Frontend/tools/xpath.html @@ -17,7 +17,7 @@
    -

    Online XPath tester v0.4

    +

    Online XPath tester

    diff --git a/Frontend/tools/xsd.html b/Frontend/tools/xsd.html index dd74623..749021e 100644 --- a/Frontend/tools/xsd.html +++ b/Frontend/tools/xsd.html @@ -14,8 +14,7 @@
    -

    Online XSD tester v0.4 BETA -

    +

    Online XSD tester

    diff --git a/Frontend/tools/xslt.html b/Frontend/tools/xslt.html index 3751237..83721d5 100644 --- a/Frontend/tools/xslt.html +++ b/Frontend/tools/xslt.html @@ -14,7 +14,7 @@
    -

    Online XSLT tester v0.4

    +

    Online XSLT tester

    From 28e76b23744a73e23f4a76387c8c3d14e77b0630 Mon Sep 17 00:00:00 2001 From: Adam Bem Date: Tue, 28 Feb 2023 14:18:54 +0100 Subject: [PATCH 13/13] Fixed bugs mentioned in comments for #35 Co-authored-by: Adam Bem Reviewed-on: https://gitea.release11.com/R11/release11-tools-web/pulls/85 --- Frontend/assets/scripts/tools/scripts.js | 27 ++++++++++++++++-------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/Frontend/assets/scripts/tools/scripts.js b/Frontend/assets/scripts/tools/scripts.js index d464330..9f10a53 100644 --- a/Frontend/assets/scripts/tools/scripts.js +++ b/Frontend/assets/scripts/tools/scripts.js @@ -13,7 +13,12 @@ function clearDefaultContent(element, text) { function clearDataField(){ document.getElementById("xmlArea").value = ""; + document.getElementById("xmlArea").style.color = null; + document.getElementById("xmlArea").style.backgroundColor = null; + document.getElementById("transformArea").value = ""; + document.getElementById("transformArea").style.color = null; + document.getElementById("transformArea").style.backgroundColor = null; } function fillDefaultXML(element) { @@ -29,7 +34,7 @@ function fillDefaultXML(element) { } //Set default text in grey -function setDefaultContent(element, text) { +function setDefaultContent(element, text) {6543 if (element.value == "") { var id = element.getAttribute('id'); if (!defaultStrings.includes(text)) { @@ -99,12 +104,14 @@ function refreshTooltip() { function performRequest(endpoint, checkXML, checkTransform){ + const sourceId = "xmlArea"; + const transformId = "transformArea"; var xmlData = document.getElementById(sourceId).value.trim(); - var transformData = document.getElementById(targetId).value.trim(); + var transformData = document.getElementById(transformId).value.trim(); - var port = 8081 + var port = 8081; if (getProcessor() == "libxml") { - port = 8082 + port = 8082; } var empty = false; @@ -114,11 +121,14 @@ function performRequest(endpoint, checkXML, checkTransform){ empty = true; } if (defaultStrings.includes(transformData) && checkTransform) { - document.getElementById(targetId).style.backgroundColor = color_red; + document.getElementById(transformId).style.backgroundColor = color_red; empty = true; } if (!empty) { restRequest(port, endpoint, xmlData, transformData).then(function(result) { + console.log(xmlData); + console.log(transformData); + document.getElementById("resultArea").value = result.result; document.getElementById("procinfo").innerText = ' Computed using '.concat(" ", result.processor); if (result.status = "OK") { @@ -148,12 +158,11 @@ function performFormatRequest(endpoint, checkXML, sourceId, targetId){ if (!empty) { restRequest(port, endpoint, xmlData, "").then(function(result) { - document.getElementById(targetId).value = result.result; + if (result.status == "OK") { + document.getElementById(targetId).value = result.result; + } }); - }else{ - document.getElementById(targetId).value = "No data provided!"; - return false; } }