Merge branch 'master' into issue_tracker

Updated existing theme so that line highlighting is transparent,  had to add new theme because ovewriting exisiting value was impossible.

Reviewed-on: #291
Reviewed-by: Adam Bem <bema@noreply.example.com>
Co-authored-by: szewczyw <wojtekszewczyk2000@gmail.com>
Co-committed-by: szewczyw <wojtekszewczyk2000@gmail.com>

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

@@ -10,8 +10,6 @@ import org.apache.logging.log4j.Logger;
 import spark.Request;
 import spark.Response;
 
-import java.io.StringWriter;
-
 /**
  * Controller used to handle XML tools: XPath, XSD validation, XQuery and XSLT
  * @author Adam Bem
@@ -50,14 +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 {
@@ -67,12 +60,7 @@ public class XmlController implements RestController {
             return;
         }
 
-        if (requestBody.getProcessor() == null ) {
+        if (requestBody.getProcessor() == null) {
-            if(requestBody.getProcessorData() != null){
-                processRequest(new XmlJob(response, requestBody, xmlJobType));
-                return;
-            }
-            System.out.println("getProcessor=null");
             invalidEngineSelectedResponse(response);
             return;
         }
@@ -103,9 +91,10 @@ public class XmlController implements RestController {
             responseBody.setDuration(duration);
 
             xmlJob.getResponse().status(200);
-           /* this.logger.info("Request (" + xmlJob.getXmlJobType() + ", " +
+
+            this.logger.info("Request (" + xmlJob.getXmlJobType() + ", " +
                     xmlJob.getEngine().getVersion() +
-                    ") processed in " + duration + " ms.");*/
+                    ") processed in " + duration + " ms.");
 
         } catch (Exception ex) {
             responseBody = processingErrorResponse(ex, xmlJob);
@@ -140,13 +129,6 @@ public class XmlController implements RestController {
 
         String result = null;
         switch (xmlJob.getXmlJobType()) {
-            case XSLT_PARAM:
-                System.out.println("xstl_param");
-                System.out.println(requestBody.getProcessorData());
-                System.out.println(requestBody.getParamName());
-                System.out.println(requestBody.getParamValue());
-                result = addParam(requestBody.getProcessorData(), requestBody.getParamName(), requestBody.getParamValue());
-                break;
             case XSLT:
                 result = engine.processXSLT(requestBody.getData(), requestBody.getProcessorData());
                 break;
@@ -159,16 +141,7 @@ public class XmlController implements RestController {
                         requestBody.getVersion());
                 break;
         }
-        System.out.println("can we get here?");
+        return new XMLResponseBody(result, "OK", requestBody.getVersion());
-        return new XMLResponseBody(result, "OK", requestBody.getProcessorData());
-    }
-
-    private String addParam(String processorData, String paramName, String paramValue) {
-        System.out.println("addParamSaxon");
-        processorData= processorData.replace("<xsl:template match=\"/\">", "<xsl:param name=\""+paramName+"\" select=\"'"+paramValue+"'\"/>\n\t\t<xsl:template match=\"/\">");
-        StringWriter sw = new StringWriter();
-        sw.write(processorData);
-        return sw.toString();
     }
 
     private XMLResponseBody processingErrorResponse(Exception ex, XmlJob xmlJob) {

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/xml/Saxon.java

@@ -164,9 +164,4 @@ public class Saxon implements XmlEngine{
     public String getVersion() {
         return "Saxon " + new Processor(false).getSaxonProductVersion();
     }
-
-    @Override
-    public String addParam(String data, String processorData) throws Exception {
-        return null;
-    }
 }

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

@@ -124,11 +124,6 @@ public class Xalan implements XmlEngine{
         return org.apache.xalan.Version.getVersion();
     }
 
-    @Override
-    public String addParam(String data, String processorData) throws Exception {
-        return null;
-    }
-
     /**
      * Validates string representation of the xml document against xsd schema
      * @param data xml document

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

@@ -9,7 +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();
-    String addParam(String processorData, String paramName, String paramValue) throws Exception;
+
 }

Frontend/src/components/XsltParamComponent.vue

@@ -1,107 +0,0 @@
-<script setup lang="ts">
-import {ref} from 'vue'
-
-const emit = defineEmits<{
-  (event: 'update-value', value: string): void;
-}>();
-
-const props = defineProps({
-  xslt: {type: String, required: true}
-})
-
-
-const sendToParent = (xslt: string) => {
-  emit('update-value', xslt);
-};
-const nameInput = ref('')
-const valueInput = ref('')
-
-const options = ref<{ name: string }[]>([
-  { name: "Add Param" },
-  { name: "Set Param" },
-]);
-
-const selectedOption = ref(options.value[0].name);
-
-
-const selectedFunction = () => {
-  if(selectedOption.value === "Add Param") {
-    sendRequest("addParam");
-  }
-  else {
-    sendRequest("setParam")
-    }
-};
-const sendRequest = (type:string) => {
-  console.log(type)
-  let request: Request = prepareRequest(type)
-  fetchRequest(request).then((body) => {
-    const result = (body as any).result;
-    sendToParent(result);
-  });
-}
-
-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({
-    "processorData": props.xslt,
-    "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()
-     // .then(response => response.json())
-   //   .then((body) => body)
-  //console.log(responseBody);
-  //return responseBody
-}
-
-</script>
-
-<template>
-  <select
-      v-model="selectedOption"
-      class="px-3 rounded-full border border-slate-400 bg-white dark:text-slate-100 dark:bg-gray-600 w-1/3"
-  >
-    <option v-for="option in options" :value="option.name" :key="option.name">
-      {{ option.name }}
-    </option>
-  </select>
-
-  <input
-      id="NameTextInput"
-      v-model="nameInput"
-      class="text-input 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
-      id="ValueTextInput"
-      v-model="valueInput"
-      class="text-input 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">{{selectedOption}}</button>
-</template>
-

Frontend/src/components/common/CodeEditorComponent.vue

@@ -2,7 +2,8 @@
 import { onBeforeUpdate, inject } from 'vue'
 import { Codemirror } from 'vue-codemirror'
 import { oneDark } from '@codemirror/theme-one-dark'
-import { espresso } from 'thememirror';
+import { createTheme} from 'thememirror';
+import {tags as t} from '@lezer/highlight';
 import {xml} from '@codemirror/lang-xml'
 import {json} from '@codemirror/lang-json'
 import {html} from '@codemirror/lang-html'
@@ -18,6 +19,47 @@ const props= defineProps({
     },
 })
 
+const lightTheme = createTheme({
+	variant: 'light',
+	settings: {
+		background: '#FFFFFF',
+		foreground: '#000000',
+		caret: '#000000',
+		selection: '#80C7FF',
+		gutterBackground: '#FFFFFF',
+		gutterForeground: '#00000070',
+		lineHighlight: '#C1E2F840',
+	},
+	styles: [
+		{
+			tag: t.comment,
+			color: '#AAAAAA',
+		},
+		{
+			tag: [t.keyword, t.operator, t.typeName, t.tagName, t.propertyName],
+			color: '#2F6F9F',
+			fontWeight: 'bold',
+		},
+		{
+			tag: [t.attributeName, t.definition(t.propertyName)],
+			color: '#4F9FD0',
+		},
+		{
+			tag: [t.className, t.string, t.special(t.brace)],
+			color: '#CF4F5F',
+		},
+		{
+			tag: t.number,
+			color: '#CF4F5F',
+			fontWeight: 'bold',
+		},
+		{
+			tag: t.variableName,
+			fontWeight: 'bold',
+		},
+	],
+});
+
 const emit = defineEmits(
   [
     'update:updatedCode'
@@ -37,7 +79,7 @@ function selectTheme() {
   if (isDarkModeSet())
     return oneDark;
   else
-    return espresso;
+    return lightTheme;
 }
 
 function isDarkModeSet(){
@@ -83,4 +125,4 @@ function parseLanguage(name: String){
       />
     
   </div>
-</template>
+</template>

Frontend/src/components/xml/XmlInputFieldComponent.vue

@@ -2,14 +2,13 @@
 import InsertTemplateComponent from '@components/common/InsertTemplateComponent.vue'
 import XMLButtonFormatterComponent from '@components/formatter/XMLButtonFormatterComponent.vue'
 import CodeEditor from '@/components/common/CodeEditorComponent.vue'
-import XsltParamComponent from '@/components/XsltParamComponent.vue'
 
-import {ref} from 'vue'
+import { ref } from 'vue'
 
 const props = defineProps(
     {
-      stylizedName: {type: String, required: true},
+        stylizedName: {type: String, required: true},
-      data: {type: String},
+        data: {type: String},
     }
 )
 const emit = defineEmits(['update:modelValue'])
@@ -18,72 +17,54 @@ const data = ref('')
 const inputFile = ref()
 
 function sendValue() {
-  emit('update:modelValue', data.value)
+    emit('update:modelValue', data.value)
 }
 
-
 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 = (value: string) => {data.value = value};
-
-
 </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 place-content-between w-full items-center">
-      <div v-if="addParameters()" class="flex justify-end space-x-2 pb-2 overflow-x-auto ml-auto">
-        <XsltParamComponent @update-value="handleUpdateValue" :xslt="data"/>
-      </div>
-    </div>
-
-    <CodeEditor @update:updated-code="updateData" v-model="data" :code="data" :config="{disabled:false, language:stylizedName}"></CodeEditor>
-  </div>
 </template>

issue_template/bug.md

@@ -0,0 +1,21 @@
+---
+
+name: "Bug template"    
+about: "This template is for reporting bugs"  
+title: "Bug"    
+
+---
+
+## Description
+*A clear and concise description of the issue.*
+
+### Selected Fields
+- **Engine:** [Specify the engine used]
+- **Version:** [Specify the version]
+- **Tool:** [Specify the currently used tool]
+
+### Data: 
+*Paste used xml/xslt/json etc...*
+
+## Additional Context
+*Any other information that might help with this issue.*

issue_template/feature.md

@@ -0,0 +1,10 @@
+---
+
+name: "Feature request template"    
+about: "This template is for requesting features"    
+title: "Feature request" 
+
+---
+
+## Feature Request 
+*Describe the feature you’d like to see and why it’s useful.*