finished_milestone (#279)

Co-authored-by: Adam Bem <adam.bem@zoho.eu>
Reviewed-on: #279
Co-authored-by: widlam <mikolaj.widla@gmail.com>
Co-committed-by: widlam <mikolaj.widla@gmail.com>

Backend/tools-services/pom.xml

@@ -84,14 +84,8 @@
     <dependency>
       <groupId>xalan</groupId>
       <artifactId>xalan</artifactId>
-      <version>2.7.3</version>
+      <version>2.7.2</version>
     </dependency>
-    <dependency>
-      <groupId>xerces</groupId>
-      <artifactId>xercesImpl</artifactId>
-      <version>2.12.2</version>
-    </dependency>
-
 
     <!-- Logging -->
     <dependency>

Backend/tools-services/src/main/java/com/r11/tools/controller/XmlController.java

@@ -1,26 +1,17 @@
 package com.r11.tools.controller;
 
 import com.google.gson.Gson;
-import com.r11.tools.controller.internal.GlobalControllerManifest;
+import com.r11.tools.controller.internal.*;
-import com.r11.tools.controller.internal.HandlerType;
-import com.r11.tools.controller.internal.RestController;
-import com.r11.tools.controller.internal.ScopedControllerManifest;
-import com.r11.tools.controller.internal.XmlJob;
-import com.r11.tools.controller.internal.XmlJobType;
 import com.r11.tools.model.XMLRequestBody;
 import com.r11.tools.model.XMLResponseBody;
 import com.r11.tools.model.XPathQueryResult;
-import com.r11.tools.model.XmlTools;
 import com.r11.tools.xml.XmlEngine;
 import org.apache.logging.log4j.Logger;
 import spark.Request;
 import spark.Response;
 
-import java.util.Objects;
-
 /**
  * Controller used to handle XML tools: XPath, XSD validation, XQuery and XSLT
- *
  * @author Adam Bem
  */
 @GlobalControllerManifest
@@ -31,15 +22,12 @@ public class XmlController implements RestController {
 
     private final XmlEngine saxon;
     private final XmlEngine xalan;
-    private final XmlTools tools;
 
     public XmlController(Gson gson, Logger logger, XmlEngine saxon, XmlEngine xalan) {
         this.gson = gson;
         this.logger = logger;
         this.saxon = saxon;
         this.xalan = xalan;
-        this.tools = new XmlTools();
-
     }
 
     @ScopedControllerManifest(method = HandlerType.POST, path = "/xpath")
@@ -60,16 +48,9 @@ public class XmlController implements RestController {
 
     @ScopedControllerManifest(method = HandlerType.POST, path = "/xslt")
     public void acceptRequestXslt(Request request, Response response) {
-        System.out.println("received xslt");
         acceptRequest(request, response, XmlJobType.XSLT);
     }
 
-    @ScopedControllerManifest(method = HandlerType.POST, path = "/xslt/param")
-    public void acceptRequestXsltAddParam(Request request, Response response) {
-        System.out.println("received param");
-        acceptRequest(request, response, XmlJobType.XSLT_PARAM);
-    }
-
     private void acceptRequest(Request request, Response response, XmlJobType xmlJobType) {
         XMLRequestBody requestBody;
         try {
@@ -79,22 +60,6 @@ public class XmlController implements RestController {
             return;
         }
 
-        if (requestBody.getType() != null) {
-            String status;
-            if (Objects.equals(requestBody.getType(), "add")) {
-                status = tools.createNewParam(requestBody.getParamName(), requestBody.getParamValue());
-            } else if (Objects.equals(requestBody.getType(), "remove")) {
-                status = tools.removeParam(requestBody.getParamName(), requestBody.getParamValue());
-            }else {
-                unknownOperationType(response);
-                return;
-            }
-
-            XMLResponseBody responseBody = new XMLResponseBody(status);
-            response.body(this.gson.toJson(responseBody));
-            return;
-        }
-
         if (requestBody.getProcessor() == null) {
             invalidEngineSelectedResponse(response);
             return;
@@ -126,6 +91,7 @@ public class XmlController implements RestController {
             responseBody.setDuration(duration);
 
             xmlJob.getResponse().status(200);
+
             this.logger.info("Request (" + xmlJob.getXmlJobType() + ", " +
                     xmlJob.getEngine().getVersion() +
                     ") processed in " + duration + " ms.");
@@ -175,10 +141,9 @@ public class XmlController implements RestController {
                         requestBody.getVersion());
                 break;
         }
-        return new XMLResponseBody(result, "OK", requestBody.getProcessorData());
+        return new XMLResponseBody(result, "OK", requestBody.getVersion());
     }
 
-
     private XMLResponseBody processingErrorResponse(Exception ex, XmlJob xmlJob) {
         XmlEngine engine = xmlJob.getEngine();
         XmlJobType xmlJobType = xmlJob.getXmlJobType();
@@ -199,12 +164,6 @@ public class XmlController implements RestController {
         response.body(this.gson.toJson(responseBody));
         response.status(400);
     }
-    private void unknownOperationType(Response response) {
-        XMLResponseBody responseBody =
-                new XMLResponseBody("You can only add and remove parameters", "ERR", "N/A", -1);
-        response.body(this.gson.toJson(responseBody));
-        response.status(400);
-    }
 
     private void requestErrorResponse(Response response, Exception ex) {
         XMLResponseBody responseBody = new XMLResponseBody(ex.getMessage(), "ERR", "N/A", -1);

Backend/tools-services/src/main/java/com/r11/tools/controller/internal/XmlJob.java

@@ -7,7 +7,7 @@ import spark.Response;
 public class XmlJob {
     private final Response response;
     private final XMLRequestBody requestBody;
-    private XmlEngine engine;
+    private final XmlEngine engine;
     private final XmlJobType xmlJobType;
 
     public XmlJob(Response response, XMLRequestBody requestBody, XmlEngine engine, XmlJobType xmlJobType) {
@@ -16,11 +16,7 @@ public class XmlJob {
         this.engine = engine;
         this.xmlJobType = xmlJobType;
     }
-    public XmlJob(Response response, XMLRequestBody requestBody, XmlJobType xmlJobType) {
+
-        this.response = response;
-        this.requestBody = requestBody;
-        this.xmlJobType = xmlJobType;
-    }
     public Response getResponse() {
         return response;
     }

Backend/tools-services/src/main/java/com/r11/tools/controller/internal/XmlJobType.java

@@ -1,7 +1,7 @@
 package com.r11.tools.controller.internal;
 
 public enum XmlJobType {
-    XPath("XPath"), XSD("XSD"), XQuery("XQuery"), XSLT("XSLT"), XSLT_PARAM("XSLT_PARAM");
+    XPath("XPath"), XSD("XSD"), XQuery("XQuery"), XSLT("XSLT");
 
     XmlJobType(String type) {
     }

Backend/tools-services/src/main/java/com/r11/tools/model/XMLRequestBody.java

@@ -15,20 +15,19 @@ public class XMLRequestBody {
     private String processor;
     @SerializedName("version")
     private String version;
-    @SerializedName("paramName")
-    private String paramName;
-    @SerializedName("paramValue")
-    private String paramValue;
 
     public String getData() {
         return data;
     }
-    public String getProcessorData() {return processorData;}
+
-    public String getParamName() {return paramName;}
+    public String getProcessorData() {
-    public String getParamValue() {return paramValue;}
+        return processorData;
+    }
+
     public String getProcessor() {
         return processor;
     }
+
     public String getVersion() {
         return version;
     }

Backend/tools-services/src/main/java/com/r11/tools/model/XMLResponseBody.java

@@ -10,10 +10,6 @@ public class XMLResponseBody {
     // Optional
     private String type;
 
-    public XMLResponseBody(String status){
-        this.status = status;
-    }
-
     public XMLResponseBody(String result, String status, String processor) {
         this.result = result;
         this.status = status;

Backend/tools-services/src/main/java/com/r11/tools/model/XmlTools.java

@@ -1,82 +0,0 @@
-package com.r11.tools.model;
-
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.xml.sax.SAXException;
-
-import javax.xml.parsers.DocumentBuilder;
-import javax.xml.parsers.DocumentBuilderFactory;
-import javax.xml.parsers.ParserConfigurationException;
-import javax.xml.transform.Transformer;
-import javax.xml.transform.TransformerException;
-import javax.xml.transform.TransformerFactory;
-import javax.xml.transform.dom.DOMSource;
-import javax.xml.transform.stream.StreamResult;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.nio.charset.StandardCharsets;
-import java.util.HashMap;
-import java.util.Map;
-
-public class XmlTools {
-    private final Map<String, String> createdParameters = new HashMap<>();
-    private final int paramsLimit = 1000;
-    private final String errorMessage = "ERR";
-    private final String succesMessage = "OK";
-
-    private final String parameter = "xsl:param";
-    private final String nameAttribute = "name";
-    private final String valueAttribute = "select";
-    private  void createNewNode(String paramName, String paramValue, Document doc) {
-
-        Element param = doc.createElement(parameter);
-        param.setAttribute(nameAttribute, paramName);
-        param.setAttribute(valueAttribute, "'" + paramValue + "'");
-        doc.getDocumentElement().appendChild(param);
-    }
-
-    public String addParams(String processorData ) {
-
-        try {
-            Document doc = addNode(processorData);
-            return docToString(doc);
-
-        } catch (ParserConfigurationException | SAXException | IOException | TransformerException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    public String createNewParam(String paramName, String paramValue) {
-        if(createdParameters.size()<paramsLimit){
-            createdParameters.put(paramName, paramValue);
-            return succesMessage;
-        }else {
-            return errorMessage;
-        }
-
-    }
-
-    private Document addNode(String processorData) throws ParserConfigurationException, SAXException, IOException {
-        DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
-        InputStream stream = new ByteArrayInputStream(processorData.getBytes(StandardCharsets.UTF_8));
-        Document doc = builder.parse(stream);
-        createdParameters.forEach((paramName, paramValue) -> createNewNode(paramName, paramValue, doc));
-        return doc;
-    }
-
-    private String docToString(Document doc) throws TransformerException {
-        TransformerFactory transformerFactory = TransformerFactory.newInstance();
-        Transformer transformer = transformerFactory.newTransformer();
-        DOMSource source = new DOMSource(doc);
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        StreamResult result = new StreamResult(outputStream);
-        transformer.transform(source, result);
-        return outputStream.toString();
-    }
-
-    public String removeParam(String paramName, String paramValue) {
-        return createdParameters.remove(paramName,paramValue) ? succesMessage : errorMessage;
-    }
-}

Backend/tools-services/src/main/java/com/r11/tools/xml/XmlEngine.java

@@ -9,6 +9,9 @@ public interface XmlEngine {
     XPathQueryResult processXPath(String data, String query, String version) throws Exception;
     String processXSLT(String data, String transform) throws Exception;
     String validate(String data, String xsd) throws Exception;
+
     String executeXQuery(String data, String xquery, String version) throws Exception;
+
     public String getVersion();
+
 }

Frontend/README.md

@@ -1,4 +1,4 @@
-# Modern frontend for Release 11 Tools
+# new-frontend
 
 This template should help get you started developing with Vue 3 in Vite.
 
@@ -44,46 +44,3 @@ npm run build
 ```sh
 npm run lint
 ```
-
-## Structure of Vuejs 3 components and views in this project
-
-For this document's needs components and views will be named "modules" even though this is not a correct term for these files officially.
-
-### Main structure
-
-- \<script\>
-- \<template\>
-- \<style\> - if really needed
-
-### Scripts
-
-#### Elements should be placed in this order:
- - Imports
- - Props - constant defined by defineProps function, named "props" in code
-This name allows to have readable code sending data to parent module: 
-```TS
-    props.exampleProp
-```
- - Emits - constant defined by defineEmits function, named "emit" in code. This name allows to have readable code sending data to parent module: 
-```TS
-    emit("update:modelValue", exampleVariable)
-```
- - Interfaces
- - Refs - constants defined by ref functions with appropriate values
- - Injects - variables assigned by "inject" function
- - Other variables/constants
- - onFunctions - functions like onBeforeUpdate
- - Other functions
-
-#### Rules regarding functions:
- - Functions ought to have descriptive name
- - Ought to do one thing. ie. function sendRequest should send request, but not prepare request body or process response data
- - In practice, if function has more than 10 SLoC, it probably should be split
- - DO NOT use "any" type. Just don't. *Optional
- - Function used in other function should be placed below it (if possible, as function can be called from many places in the code)
-
-#### Rules regarding variables and refs:
- - Variables ought to have descriptive name
-
-In cases not covered in this convention, TypeScript, VueJS 3 conventions and good programming practices are applied
-

Frontend/src/components/CodeEditorComponent.vue

@@ -0,0 +1,69 @@
+<script setup lang="ts">
+import { computed, ref } from 'vue'
+import { Codemirror } from 'vue-codemirror'
+import { oneDark } from '@codemirror/theme-one-dark'
+import {xml} from '@codemirror/lang-xml'
+import {json} from '@codemirror/lang-json'
+import {html} from '@codemirror/lang-html'
+
+
+
+  const props= defineProps({
+    code : {
+        type: String,
+        required: true
+    },
+    config: {
+        type: Object,
+        required: true
+      },
+  })
+
+  const emit = defineEmits(
+    [
+      'update:updatedCode'
+    ]
+  )
+
+  function dataUpdated(newData:String, viewUpdate : any){
+    emit('update:updatedCode',newData)
+  }
+
+  const extensions = computed( ()=> {
+    return  [
+        oneDark,
+        parseLanguage(props.config.language),
+    ]
+
+  } )
+
+  function parseLanguage(name: String){
+    switch(name.toUpperCase()){
+      case "JSON": {
+        return json();
+      }
+      case "HTML": {
+        return html();
+      }
+      default: {
+        return xml();
+      }
+    }
+  }
+
+
+</script>
+
+<template>
+  <div class="editor w-full max-w-full h-full overflow-scroll">
+    
+    <codemirror
+      style="height: 100%; width: 100%; padding:1rem ; border-radius: 1rem; font-size: large;"
+      :model-value="code"
+      @update:model-value="dataUpdated"
+      :extensions="extensions"
+      :disabled="config.disabled"
+      />
+    
+  </div>
+</template>

Frontend/src/components/XsltParamComponent.vue

@@ -1,126 +0,0 @@
-<script setup lang="ts">
-import {ref} from 'vue'
-
-const emit = defineEmits<{
-  (event: 'update-value', options: { name: string }[]): void;
-}>();
-
-const options = ref<{ name: string }[]>([
-  { name: "Add Param" }
-]);
-
-const sendToParent = () => {
-  options.value.forEach((value) => {console.log("KID" + value + options.value.indexOf(value))})
-  emit('update-value', options.value);
-};
-
-
-const nameInput = ref('')
-const valueInput = ref('')
-
-
-const selectedOption = ref(options.value[0].name)
-
-const selectedFunction = () => {
-  if (selectOption(selectedOption.value) === 'Add Param') {
-    options.value.push({name: nameInput.value + " = " + valueInput.value});
-
-  }
-  if (selectOption(selectedOption.value) === 'Remove Param') {
-    const currentIndex = options.value.indexOf(selectedOption.value)
-    options.value.splice(currentIndex, 1);
-    selectedOption.value= options.value[0].name
-    valueInput.value = ""
-    nameInput.value = ""
-  }
-  sendToParent()
-  /*
-
-    if(selectedOption.value === "Add Param") {
-      sendRequest("add");
-    }
-    else {
-      sendRequest("remove");
-      }
-  */
-}
-
-/*
-const sendRequest = (type:string) => {
-  console.log(type)
-  let request: Request = prepareRequest(type)
-  fetchRequest(request).then((body) => {
-
-    const {status} = body as any;
-    console.log(status)
-    if (status === "OK") {
-      options.value.push({ name: nameInput.value + " = " + valueInput.value });
-    }
-  });
-}
-*/
-function selectOption(option: string): string {
-  return option == "Add Param" ? "Add Param" : "Remove Param"
-}
-
-//
-// function prepareRequest(type :string): Request {
-//   let request = new Request(prepareURL(), {
-//     body: prepareRequestBody(type),
-//     method: "POST"
-//   });
-//   return request
-// }
-//
-// function prepareURL(): string {
-//   //const engineEndpoint = engine.value == "libxml" ? "libxml" : "java";
-//   return document.location.protocol + "//" + document.location.hostname + "/" + "java" + "/xslt/param";
-//   //return "http://localhost:8081/xslt/param";
-// }
-//
-// function prepareRequestBody(type: string): string {
-//   let requestBody = JSON.stringify({
-//     "paramName": nameInput.value,
-//     "paramValue": valueInput.value,
-//     "type": type
-//   });
-//   console.log(requestBody);
-//   return requestBody;
-// }
-//
-// async function fetchRequest(request: Request): Promise<JSON> {
-//   console.log(request)
-//   let responseBody = await fetch(request)
-//   return await responseBody.json()
-//      }
-
-</script>
-
-<template>
-  <select
-      v-model="selectedOption"
-      class="flex h-full px-3 rounded-full border border-slate-400 bg-white dark:text-slate-100 dark:bg-gray-600 w-48"
-  >
-    <option v-for="option in options" :value="option.name" :key="option.name">
-      {{ option.name }}
-    </option>
-  </select>
-  <input
-      v-if="selectedOption==='Add Param'"
-      id="NameTextInput"
-      v-model="nameInput"
-      class="text-input h-full px-3 rounded-full border border-slate-400 bg-white dark:text-slate-100 dark:bg-gray-600 w-1/3"
-      type="text"
-      placeholder="Name"
-  />
-  <input
-      v-if="selectedOption==='Add Param'"
-      id="ValueTextInput"
-      v-model="valueInput"
-      class="text-input h-full px-3 rounded-full border border-slate-400 bg-white dark:text-slate-100 dark:bg-gray-600 w-1/3"
-      type="text"
-      placeholder="Value"
-  />
-  <button class="tool-button" @click="selectedFunction">{{ selectOption(selectedOption) }}</button>
-</template>
-

Frontend/src/components/common/CodeEditorComponent.vue

@@ -7,6 +7,12 @@ import {xml} from '@codemirror/lang-xml'
 import {json} from '@codemirror/lang-json'
 import {html} from '@codemirror/lang-html'
 
+function isDarkModeSet(){
+  return localStorage.theme == "dark";
+}
+
+const theme : string = inject('theme')! ;
+
 const props= defineProps({
   code : {
       type: String,
@@ -24,25 +30,21 @@ const emit = defineEmits(
   ]
 )
 
-const theme : string = inject('theme')!;
-let extensions = parseExtensions();
-
-onBeforeUpdate( () => { extensions = parseExtensions(); } )
-
 function dataUpdated(newData:String){
   emit('update:updatedCode',newData)
 }
 
 function selectTheme() {
-  if (isDarkModeSet())
+  if (isDarkModeSet()) {
     return oneDark;
-  else
+  }
+  else {
     return espresso;
+  }
 }
 
-function isDarkModeSet(){
+let extensions = parseExtensions();
-  return localStorage.theme == "dark";
+
-}
 
 function parseExtensions(){
   return  [
@@ -66,7 +68,7 @@ function parseLanguage(name: String){
 }
 
 
-
+onBeforeUpdate( () => { extensions = parseExtensions(); } )
 
 </script>
 

Frontend/src/components/common/ThemeSwitcherComponent.vue

@@ -1,22 +1,30 @@
 <script setup lang="ts">
 
-const emit = defineEmits([
+import lightThemeIcon from '@/assets/light_theme.svg';
-    "theme",
+import darkThemeIcon from '@/assets/dark_theme.svg';
-]);
 
-function toDarkMode(){
+    const emit = defineEmits([
-    localStorage.theme = "dark";
+        "theme",
-    document.documentElement.classList.add('dark');
+    ]);
-    emit('theme',"dark");
 
-}
 
-function toLightMode(){
+    function toDarkMode(){
-    localStorage.theme = "light";
+        localStorage.theme = "dark";
-    document.documentElement.classList.remove('dark');
+        document.documentElement.classList.add('dark');
-    emit('theme',"light");
+        emit('theme',"dark");
+
+    }
+
+    function toLightMode(){
+        localStorage.theme = "light";
+        document.documentElement.classList.remove('dark');
+        emit('theme',"light");
+
+    }
+
+    
+
 
-}
 
 </script>
 

Frontend/src/components/formatter/HtmlButtonFormatterComponent.vue

@@ -21,8 +21,6 @@ const emit = defineEmits([
     'update:error'
 ])
 
-const fetchLink = document.location.protocol + "//" + document.location.hostname + "/libxml/html/" + chooseType(props.formatType);
-
 function chooseType(formatType: String){
     if (formatType == "HTML -> XML"){
         return "convert";
@@ -47,6 +45,8 @@ function createBody(){
     });
 }
 
+const fetchLink = document.location.protocol + "//" + document.location.hostname + "/libxml/html/" + chooseType(props.formatType);
+
 
 function process(){
     fetch(fetchLink, {body:createBody(), method: "POST"})

Frontend/src/components/landing/LandingComponent.vue

@@ -19,7 +19,7 @@
       <li><strong>XPath</strong> - This is tool that allows to parse XPath on selected XML</li>
       <li><strong>XQuery</strong> - Allows to execute XQuery on provided XML file.</li>
       <li><strong>XSD</strong> - Allows to validate XML against provided XSD schema.</li>
-      <li><strong>XSLT</strong> - Allows to transform XML using XSLT transform.</li>
+      <li><strong>XSLT</strong> - Allows to transformate XML using XSLT transformate.</li>
     </ul>
     
     <h2 class="text-xl mt-2">Formatter - Tools:</h2>
@@ -39,4 +39,3 @@
 </template>
 
 <style scoped></style>
-

Frontend/src/components/man/ElementDescription.vue

@@ -1,5 +1,9 @@
 <script setup lang="ts">
 
+import { ref } from 'vue'
+
+
+
 const props = defineProps(
     {
         name: {type: String, required: true}

Frontend/src/components/man/ImgMan.vue

@@ -1,5 +1,9 @@
 <script setup lang="ts">
 
+import { ref } from 'vue'
+
+
+
 const props = defineProps(
     {
         imgPath: {type: String, required: true},

Frontend/src/components/man/ManTooltipComponent.vue

@@ -1,6 +1,18 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 
+
+// const props = defineProps({
+//     version: {
+//         type: String,
+//         required: true
+//     },
+//     toolType: {
+//         type: String,
+//         required: true
+//     }
+// })
+
 const emit = defineEmits([
     "update:visible"
 ])

Frontend/src/components/mock/BodyDetailComponent.vue

@@ -14,5 +14,5 @@ const props = defineProps(
 </script>
 
 <template>
-    <CodeEditorComponent :code="props.data" :config='{disabled:false, language:props.contentType.replace("application/","")}' />
+    <CodeEditorComponent :code="props.data" :config='{disabled:true, language:props.contentType.replace("application/","")}' />
 </template>

Frontend/src/components/mock/HistoryRecords.vue

@@ -1,11 +1,6 @@
 <script setup lang="ts">
 import {ref, type Ref } from 'vue';
 
-const emit = defineEmits([
-    'click:showHeaders',
-    'click:showBody',
-])
-
 interface historyRecord {
     clientUUID : String,
     dateTimeStamp: String,
@@ -19,11 +14,15 @@ interface Headers {
     [propName: string]: any;
 }
 
+const emit = defineEmits([
+    'click:showHeaders',
+    'click:showBody',
+])
+
+
 const clientUUID = localStorage.getItem("clientUUID")
 const fetchLink = window.location.protocol + "//" + window.location.hostname + "/mock/api/event";
-const historyRecords : Ref<Array<historyRecord>> = ref([]);
+const historyRecords : Ref<Array<historyRecord>> = ref([])
-
-
 fetch(fetchLink+"/"+clientUUID).then(response => response.json()).then(data => { historyRecords.value = data });
 
 function parseTimeStamp(timestamp : String){

Frontend/src/components/mock/MockedMessageToastComponent.vue

@@ -1,4 +1,5 @@
 <script setup lang="ts">
+import { ref } from 'vue';
 
 const emit = defineEmits([
     'closed:toast_closed',

Frontend/src/components/mock/RestMockMessageComponent.vue

@@ -4,6 +4,10 @@ import HeadersComponent from './HeadersComponent.vue';
 import SaveComponent from './SaveComponent.vue';
 import CodeEditorComponent from '@/components/common/CodeEditorComponent.vue';
 
+const clientUUID = ref('');
+const host = window.location.protocol + "//" + window.location.hostname + "/mock";
+const mockMessageLink = ref("www.google.com");
+
 interface mockedMessageData {
   clientUUID: string;
   contentType: string;
@@ -12,10 +16,6 @@ interface mockedMessageData {
   httpStatus: number;
 }
 
-const clientUUID = ref('');
-const host = window.location.protocol + "//" + window.location.hostname + "/mock";
-const mockMessageLink = ref("www.google.com");
-
 const exampleData : mockedMessageData = {
   clientUUID : "exampleUUID",
   contentType: "application/json",
@@ -23,8 +23,8 @@ const exampleData : mockedMessageData = {
   httpHeaders: {Connection:"keep-alive"},
   httpStatus: 200,
 }
-let messageData : Ref<mockedMessageData> = ref(exampleData);
 
+let messageData : Ref<mockedMessageData> = ref(exampleData);
 if ( localStorage.clientUUID != undefined ){
     clientUUID.value = localStorage.clientUUID;
 }

Frontend/src/components/xml/XmlInputFieldComponent.vue

@@ -1,96 +1,69 @@
 <script setup lang="ts">
 import InsertTemplateComponent from '@components/common/InsertTemplateComponent.vue'
 import XMLButtonFormatterComponent from '@components/formatter/XMLButtonFormatterComponent.vue'
+import { ref } from 'vue'
 import CodeEditor from '@/components/common/CodeEditorComponent.vue'
-import XsltParamComponent from '@/components/XsltParamComponent.vue'
 
-import {ref} from 'vue'
+const props = defineProps(
-
+    {
-const props = defineProps<{
+        stylizedName: {type: String, required: true},
-  stylizedName: string;
+        data: {type: String},
-  data?: string;
+    }
-  params?: { name: string }[];
+)
-}>();
+const emit = defineEmits(['update:modelValue'])
-
-const emit = defineEmits(['update:modelValue','update:params'])
 
 const data = ref('')
 const inputFile = ref()
-const params = ref<{ name: string }[]>([]);
 
 function sendValue() {
-  emit('update:modelValue', data.value)
+    emit('update:modelValue', data.value)
 }
 
-function updateParams(newParams: { name: string }[]) {
-  emit('update:params', newParams);
-}
-
-
 function updateData(newData: string, clearFileSelector: boolean = true) {
-  data.value = newData
+    data.value = newData
-  if (clearFileSelector)
+    if (clearFileSelector)
-    inputFile.value.value = '';
+        inputFile.value.value = '';
-  sendValue()
+    sendValue()
 }
 
 function clear() {
-  updateData('')
+    updateData('')
 }
 
 function canBeFormatted() {
-  return props.stylizedName.toLowerCase() == 'xml' ||
+    return props.stylizedName.toLowerCase() == 'xml' || 
-      props.stylizedName.toLowerCase() == 'xsd' ||
+           props.stylizedName.toLowerCase() == 'xsd' || 
-      props.stylizedName.toLowerCase() == 'xslt'
+           props.stylizedName.toLowerCase() == 'xslt'
 }
 
-function addParameters() {
+function readFile(file : any) {
-  return props.stylizedName?.toLowerCase() == "xslt"
+    
+    const reader = new FileReader()
+    reader.onloadend = () => {
+        let result = reader.result?.toString()
+        if (typeof result == "string")
+            updateData(result, false);
+            
+    }
+    reader.readAsText(file.target.files[0])
 }
 
-function readFile(file: any) {
-
-  const reader = new FileReader()
-  reader.onloadend = () => {
-    let result = reader.result?.toString()
-    if (typeof result == "string")
-      updateData(result, false)
-
-  }
-  reader.readAsText(file.target.files[0])
-}
-
-const handleUpdateValue = (options: { name: string }[]) => {
-  console.log("from parent" +options.length)
-  params.value = options
-  updateParams(params)
-};
-
 </script>
 
 <template>
-  <div class="flex flex-col w-full h-1/2 lg:h-1/2 flex-none xl:pr-2 2xl:pr-4 pb-2">
+    <div class="flex flex-col w-full h-1/2 lg:h-1/2 flex-none xl:pr-2 2xl:pr-4 pb-2">
-    <div class="flex justify-between mb-2"></div>
+        <div class="flex place-content-between w-full items-center">
-
+            <span class="dark:text-white mr-2">{{ stylizedName }}</span>
-    <div class="flex place-content-between w-full items-center">
+            <div class="flex space-x-2 pb-2 overflow-x-auto">
-
+                <div class="flex items-stretch w-64">
-      <span class="dark:text-white mr-2">{{ stylizedName }}</span>
+                    <input id="fileLoader" ref="inputFile" class="file-selector" type="file" accept=".xml,.xql,.xquery,.xslt,text/xml,text/plain" @change="readFile" />
-
+                </div>
-      <div class="flex items-stretch w-64">
+                
-        <input id="fileLoader" ref="inputFile" class="file-selector" type="file" accept=".xml,.xql,.xquery,.xslt,text/xml,text/plain" @change="readFile"/>
+                <InsertTemplateComponent :stylized-name="props.stylizedName" @update:default-data="updateData"></InsertTemplateComponent>
-      </div>
+                <XMLButtonFormatterComponent v-if="canBeFormatted()" :xml="data" @update:result="(data:any) => updateData(data.result)"></XMLButtonFormatterComponent>
-
+                <button class="tool-button" @click="clear">Clear</button>
-      <div class="flex space-x-2 pb-2 overflow-x-auto">
+            </div>
-        <InsertTemplateComponent :stylized-name="props.stylizedName" @update:default-data="updateData"></InsertTemplateComponent>
+        </div>
-        <XMLButtonFormatterComponent v-if="canBeFormatted()" :xml="data" @update:result="(data:any) => updateData(data.result)"></XMLButtonFormatterComponent>
+        <CodeEditor @update:updated-code="updateData" v-model="data" :code="data" :config="{disabled:false, language:stylizedName}"></CodeEditor>
-        <button class="tool-button" @click="clear">Clear</button>
-      </div>
     </div>
-
-    <div class="flex justify-end gap-2 place-content-between w-full items-center">
-        <XsltParamComponent v-if="addParameters()" @update-value="handleUpdateValue" :xslt="data"/>
-    </div>
-
-    <CodeEditor @update:updated-code="updateData" v-model="data" :code="data" :config="{disabled:false, language:stylizedName}"></CodeEditor>
-  </div>
 </template>

Frontend/src/components/xml/XmlInputFieldToolbarComponent.vue

@@ -0,0 +1,22 @@
+<script setup lang="ts">
+
+import InsertTemplateComponent from '@components/common/InsertTemplateComponent.vue'
+
+const props = defineProps(
+    {
+        prettyName: {type: String, required: true}
+    }
+)
+
+const emit = defineEmits(['update:defaultData'])
+
+function setDefault(data: string) {
+    const emitName = "update:defaultData";
+    emit(emitName, data)
+}
+
+</script>
+
+<template>
+    
+</template>

Frontend/src/components/xml/XmlOutputFieldComponent.vue

@@ -1,14 +1,15 @@
 <script setup lang="ts">
-import {onMounted, ref} from 'vue';
+import { onMounted, ref } from 'vue';
-import {type TabData} from '../common/TabData'
+import { type TabData } from '../common/TabData'
 import CodeEditor from '@/components/common/CodeEditorComponent.vue';
 
-const props = defineProps<{
+const props = defineProps(
-  tool: string;
+    {
-  xml: string | TabData[];
+        tool: {type: String, required: true},
-  query: string;
+        xml: {type: [String, Array<TabData>], required: true},
-  params?: { name: string }[];
+        query: {type: String, required: true}
-}>();
+    }
+)
 
 const emit = defineEmits(["update"]);
 
@@ -53,7 +54,6 @@ function changeAvailableVersions() {
         changeAvailableVersionsOfXSLT();
     else if (props.tool == "xsd")
         versionsForCurrentEngine.value = ["N/A"];
-
     else if (props.tool == "xpath")
         changeAvailableVersionsOfXPath();
 
@@ -85,9 +85,7 @@ function selectDefaultVersion() {
 }
 
 function process() {
-  props.params?.forEach((param) => {console.log(param.name)})
+    let request:Request = prepareRequest();
-
-  let request:Request = prepareRequest();
     fetchRequest(request).then((data) => {
         updateOutputField(data);
     })
@@ -126,25 +124,14 @@ function selectRequestBodyType() : string {
     else
         return prepareRequestBodySingleXml(props.xml!);
 }
-function formatParams() {
-  return props.params.map(param => {
-    const [key, value] = param.name.split(" = ");
-    return {key, value};
-  });
-}
 
 function prepareRequestBodySingleXml(data: string):string {
-
+    let requestBody = JSON.stringify({
-  const formattedParams = formatParams();
-
-  let requestBody = JSON.stringify({
-        "params": formattedParams,
         "data": data,
         "processorData": props.query,
         "processor": engine.value,
         "version": version.value
     });
-    console.log(requestBody);
     return requestBody;
 }
 

Frontend/src/components/xml/XmlTabbedInputComponent.vue

@@ -17,8 +17,6 @@ const emit = defineEmits(['update:modelValue'])
 
 const newTabId = ref(0);
 const activeTabId = ref(0);
-const data = ref('')
-const inputFile = ref()
 
 const tabs = ref(new Array<TabData>);
 tabs.value.push({
@@ -27,6 +25,10 @@ tabs.value.push({
     data: "",
 })
 
+const data = ref('')
+const inputFile = ref()
+
+
 function sendValue() {
     emit('update:modelValue', tabs.value);
 }

Frontend/src/components/xml/XmlToolComponent.vue

@@ -0,0 +1,83 @@
+<script setup lang="ts">
+import { onMounted, ref, watch } from 'vue';
+
+const xml = ref('');
+const transform = ref('');
+const transformPlaceholder = ref('');
+const engine = ref('');
+const result = ref('');
+
+const activeXmlTool = ref('');
+
+async function submit() {
+  const engineEndpoint = engine.value == "libxml" ? "libxml" : "java";
+  const url = document.location.protocol + "//" + document.location.hostname + "/" + engineEndpoint + "/" + activeXmlTool.value;
+
+  var version = "1.0";
+  if (engine.value == "saxon")
+    version = "3.0"
+
+  var requestBody = JSON.stringify({
+    "data": xml.value,
+    "process": transform.value,
+    "processor": engine.value,
+    "version": version
+  });
+
+  var request = new Request(url, {
+    body: requestBody,
+    method: "POST"
+  });
+
+
+  var responseBody = await fetch(request)
+    .then(response => response.json())
+    .then((body) => body);
+
+  result.value = responseBody.result;
+}
+
+watch(activeXmlTool, (tool) => {
+  if (tool == "xpath")
+    transformPlaceholder.value = "XPath";
+  if (tool == "xsd")
+    transformPlaceholder.value = "XSD";
+  if (tool == "xslt")
+    transformPlaceholder.value = "XSLT";
+  if (tool == "xquery")
+    transformPlaceholder.value = "XQuery";
+  
+    transform.value = "";
+})
+
+onMounted(() => {
+  activeXmlTool.value = "xpath";
+});
+</script>
+
+<template>
+  <label for="xpath">XPath</label>
+  <input v-model="activeXmlTool" type="radio" id="xpath" name="xmltool" value="xpath" />
+
+  <label for="xslt">XSLT</label>
+  <input v-model="activeXmlTool" type="radio" id="xslt" name="xmltool" value="xslt" />
+
+  <label for="xsd">XSD</label>
+  <input v-model="activeXmlTool" type="radio" id="xsd" name="xmltool" value="xsd" />
+  
+  <label for="xquery">XQuery</label>
+  <input v-model="activeXmlTool" type="radio" id="xquery" name="xmltool" value="xquery" />
+  <br /><br />
+  <select name="engine" v-model="engine">
+    <option value="saxon" selected>Saxon</option>
+    <option value="xalan">Xalan</option>
+    <option value="libxml">libXML</option>
+  </select>
+  <br />
+  <textarea v-model="xml" id="xml" placeholder="XML"></textarea>
+  <textarea v-model="transform" id="transform" :placeholder="transformPlaceholder"></textarea><br />
+  <button @click="submit">Submit</button><br />
+  <pre><code>{{ result }}</code></pre>
+</template>
+
+<style scoped></style>

Frontend/src/components/xml/tooltips/TooltipDiffsComponent.vue

@@ -1,7 +1,7 @@
 <script setup lang="ts">
-import TooltipCategoryComponent from './TooltipCategoryComponent.vue';
 import xpathDiffs from '@/assets/tooltips/xpath/xpathdiffs.json';
 import xsltDiffs from '@/assets/tooltips/xslt/xsltdiffs.json';
+import TooltipCategoryComponent from './TooltipCategoryComponent.vue';
 
 
 const props = defineProps({
@@ -10,7 +10,7 @@ const props = defineProps({
 })
 
 function getDiffEntry(toolVersion : String) : string[] {
-    if ( props.toolName == "xpath" ) {
+    if ( props.toolName == "xpath" ){
         switch(toolVersion){
             case "2.0" : {
                 return xpathDiffs.VersionDiffs[0].diffs
@@ -27,7 +27,7 @@ function getDiffEntry(toolVersion : String) : string[] {
         }
     } else if (props.toolName == "xslt") {
         return ["XSLT 2.0"].concat(xsltDiffs.VersionDiffs[0].diffs).concat(["XSLT 3.0"]).concat(xsltDiffs.VersionDiffs[1].diffs) ;
-    } else {
+    } else{
         return ["foo"]
     }
     

Frontend/src/views/Base64EncoderView.vue

@@ -6,17 +6,17 @@ import { ref } from 'vue'
 
 const data : any = ref("")
 const imageData = ref("")
-const doShowImage = ref(false)
+const DoshowImage = ref(false)
 const inputImage = ref()
 
 function setTextFieldValue(newData: string) {
     data.value = newData.toString()
-    doShowImage.value = false
+    DoshowImage.value = false
 }
 
 function showImage(newImage : string){
     imageData.value = "data:image/jpeg;base64,"+newImage
-    doShowImage.value = true
+    DoshowImage.value = true
 }
 
 function convertImageToBase64(file : any){
@@ -32,7 +32,7 @@ function convertImageToBase64(file : any){
 function clear(){
     data.value = ""
     imageData.value = ""
-    doShowImage.value = false
+    DoshowImage.value = false
     inputImage.value.value = null
 }
 
@@ -65,7 +65,7 @@ function clear(){
     </div>
     
     <div id="layoutRight" class="w-full xl:w-1/2 min-h-[66%] xl:h-full">
-        <div class="border-2 rounded-lg border-gray-300 dark:border-gray-600 min-h-[50%]" v-on="doShowImage">
+        <div class="border-2 rounded-lg border-gray-300 dark:border-gray-600 min-h-[50%]" v-on="DoshowImage">
             <img :src="imageData"/>
         </div>
         

Samples/xquery/xquery.json

@@ -1,6 +1,10 @@
 {
     "data": "<people><person><name>John</name><age>67</age></person><person><name>Anna</name><age>69</age></person></people>",
+<<<<<<< HEAD
+    "process": "for $x in //person return string($x/name)",
+=======
     "processorData": "for $x in //person return string($x/name)",
+>>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
     "processor": "saxon",
     "version": "3.1"
 }