Compare commits
9 Commits
add-XML-fo
...
finished_m
| Author | SHA1 | Date | |
|---|---|---|---|
| c3e0659bfa | |||
| 4f96d91c5c | |||
| 48ff86d837 | |||
| c3eef96354 | |||
| ba5d5685b9 | |||
| e8b22a41c6 | |||
| 467adf2264 | |||
| 0812fc6c49 | |||
| 971cc5f36a |
@@ -40,20 +40,17 @@ def formatXML(source: str, prettify: bool) -> str:
|
|||||||
if prolog_start != -1:
|
if prolog_start != -1:
|
||||||
prolog_end = source.find("?>") + 2
|
prolog_end = source.find("?>") + 2
|
||||||
prolog = source[prolog_start:prolog_end]
|
prolog = source[prolog_start:prolog_end]
|
||||||
source = source[prolog_end:].strip()
|
source = source[prolog_end: ]
|
||||||
|
|
||||||
byte_input = BytesIO(source.encode("utf-8"))
|
byte_input = BytesIO(source.encode("utf-8"))
|
||||||
parser = etree.XMLParser(remove_blank_text=True)
|
parser = etree.XMLParser(remove_blank_text=True)
|
||||||
xml = etree.parse(byte_input, parser=parser)
|
xml = etree.parse(byte_input, parser=parser)
|
||||||
|
|
||||||
if prettify:
|
if prettify:
|
||||||
prolog += "\n"
|
prolog += "\n"
|
||||||
return prolog + etree.tostring(xml, pretty_print=True, encoding="utf-8").decode("utf-8")
|
|
||||||
|
|
||||||
raw_xml = etree.tostring(xml, encoding="utf-8").decode("utf-8")
|
return prolog + etree.tostring(xml, pretty_print=prettify).decode()
|
||||||
raw_xml = " ".join(raw_xml.split())
|
|
||||||
|
|
||||||
return prolog + raw_xml
|
|
||||||
|
|
||||||
def xpath(source: str, xpath: str) -> str:
|
def xpath(source: str, xpath: str) -> str:
|
||||||
"""
|
"""
|
||||||
@@ -86,6 +83,7 @@ def xpath(source: str, xpath: str) -> str:
|
|||||||
return result_string, "node"
|
return result_string, "node"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def xsd(source: str, xsd: str) -> bool:
|
def xsd(source: str, xsd: str) -> bool:
|
||||||
"""
|
"""
|
||||||
Method used to validate XML string against XSD schema
|
Method used to validate XML string against XSD schema
|
||||||
@@ -106,6 +104,8 @@ def xsd(source: str, xsd: str) -> bool:
|
|||||||
except etree.DocumentInvalid as e:
|
except etree.DocumentInvalid as e:
|
||||||
return str(e)
|
return str(e)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def xslt(source: str, xslt: str) -> str:
|
def xslt(source: str, xslt: str) -> str:
|
||||||
"""
|
"""
|
||||||
Method used to transform XML string using XSLT
|
Method used to transform XML string using XSLT
|
||||||
|
|||||||
@@ -36,8 +36,8 @@ def process_xml(request: request, type: str) -> str:
|
|||||||
response_json['result'] = Parser.xslt(data, processorData)
|
response_json['result'] = Parser.xslt(data, processorData)
|
||||||
elif (type == "xpath"):
|
elif (type == "xpath"):
|
||||||
response_json['result'], response_json['type'] = Parser.xpath(data, processorData)
|
response_json['result'], response_json['type'] = Parser.xpath(data, processorData)
|
||||||
# elif (type == "prettify"):
|
elif (type == "prettify"):
|
||||||
# response_json['result'] = Parser.formatXML(data, True)
|
response_json['result'] = Parser.formatXML(data, True)
|
||||||
elif (type == "minimize"):
|
elif (type == "minimize"):
|
||||||
response_json['result'] = Parser.formatXML(data, False)
|
response_json['result'] = Parser.formatXML(data, False)
|
||||||
elif (type == "prettifyHtml"):
|
elif (type == "prettifyHtml"):
|
||||||
@@ -77,10 +77,9 @@ def xsd():
|
|||||||
def xslt():
|
def xslt():
|
||||||
return process_xml(request, "xslt")
|
return process_xml(request, "xslt")
|
||||||
|
|
||||||
# Removed because lxml can't pretify <xs:complexType mixed="true">
|
@app.route("/prettify", methods=["POST"])
|
||||||
# @app.route("/prettify", methods=["POST"])
|
def prettify():
|
||||||
# def prettify():
|
return process_xml(request, "prettify")
|
||||||
# return process_xml(request, "prettify")
|
|
||||||
|
|
||||||
@app.route("/minimize", methods=["POST"])
|
@app.route("/minimize", methods=["POST"])
|
||||||
def minimize():
|
def minimize():
|
||||||
|
|||||||
@@ -44,7 +44,6 @@ public class SparkApplication {
|
|||||||
registry.registerController(new XmlController(gson, logger, saxon, xalan));
|
registry.registerController(new XmlController(gson, logger, saxon, xalan));
|
||||||
registry.registerController(new MultipleXMLController(gson,logger, saxon));
|
registry.registerController(new MultipleXMLController(gson,logger, saxon));
|
||||||
registry.registerController(new JsonController(gson, jsongson, logger));
|
registry.registerController(new JsonController(gson, jsongson, logger));
|
||||||
registry.registerController(new XmlFormatterController(gson));
|
|
||||||
|
|
||||||
registry.register();
|
registry.register();
|
||||||
|
|
||||||
|
|||||||
@@ -1,51 +0,0 @@
|
|||||||
package com.r11.tools.controller;
|
|
||||||
|
|
||||||
import com.google.gson.Gson;
|
|
||||||
import com.r11.tools.controller.internal.GlobalControllerManifest;
|
|
||||||
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.XmlJobType;
|
|
||||||
import com.r11.tools.model.XMLRequestBody;
|
|
||||||
import com.r11.tools.model.XMLResponseBody;
|
|
||||||
import com.r11.tools.xml.XmlFormatter;
|
|
||||||
import spark.Request;
|
|
||||||
import spark.Response;
|
|
||||||
|
|
||||||
@GlobalControllerManifest
|
|
||||||
public class XmlFormatterController implements RestController {
|
|
||||||
private final Gson gson;
|
|
||||||
|
|
||||||
public XmlFormatterController(Gson gson) {
|
|
||||||
this.gson = gson;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@ScopedControllerManifest(method = HandlerType.POST, path = "/prettify")
|
|
||||||
public void acceptRequestXslt(Request request, Response response) {
|
|
||||||
acceptRequest(request, response);
|
|
||||||
}
|
|
||||||
private void acceptRequest(Request request, Response response){
|
|
||||||
long timeStart = System.currentTimeMillis();
|
|
||||||
long duration;
|
|
||||||
|
|
||||||
XmlFormatter formatter = new XmlFormatter();
|
|
||||||
XMLRequestBody requestBody;
|
|
||||||
try {
|
|
||||||
requestBody = this.gson.fromJson(request.body(), XMLRequestBody.class);
|
|
||||||
} catch (Exception e) {
|
|
||||||
requestErrorResponse(response, e);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
String responseString = formatter.formatXML(requestBody.getData());
|
|
||||||
duration = System.currentTimeMillis() - timeStart;
|
|
||||||
XMLResponseBody responseBody = new XMLResponseBody(responseString,"OK",duration);
|
|
||||||
response.body(this.gson.toJson(responseBody));
|
|
||||||
|
|
||||||
}
|
|
||||||
private void requestErrorResponse(Response response, Exception ex) {
|
|
||||||
XMLResponseBody responseBody = new XMLResponseBody(ex.getMessage(), "ERR", "N/A", -1);
|
|
||||||
response.status(400);
|
|
||||||
response.body(this.gson.toJson(responseBody));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -4,7 +4,6 @@ import com.google.gson.annotations.SerializedName;
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* POJO class used to contain body of XML related requests
|
* POJO class used to contain body of XML related requests
|
||||||
*
|
|
||||||
* @author Adam Bem
|
* @author Adam Bem
|
||||||
*/
|
*/
|
||||||
public class XMLRequestBody {
|
public class XMLRequestBody {
|
||||||
@@ -16,8 +15,6 @@ public class XMLRequestBody {
|
|||||||
private String processor;
|
private String processor;
|
||||||
@SerializedName("version")
|
@SerializedName("version")
|
||||||
private String version;
|
private String version;
|
||||||
@SerializedName("pretify")
|
|
||||||
private String pretif;
|
|
||||||
|
|
||||||
public String getData() {
|
public String getData() {
|
||||||
return data;
|
return data;
|
||||||
@@ -34,8 +31,4 @@ public class XMLRequestBody {
|
|||||||
public String getVersion() {
|
public String getVersion() {
|
||||||
return version;
|
return version;
|
||||||
}
|
}
|
||||||
|
|
||||||
public String getPretif() {
|
|
||||||
return pretif;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,6 @@ package com.r11.tools.model;
|
|||||||
|
|
||||||
public class XMLResponseBody {
|
public class XMLResponseBody {
|
||||||
|
|
||||||
|
|
||||||
private String result;
|
private String result;
|
||||||
private String status;
|
private String status;
|
||||||
private String processor;
|
private String processor;
|
||||||
@@ -11,11 +10,6 @@ public class XMLResponseBody {
|
|||||||
// Optional
|
// Optional
|
||||||
private String type;
|
private String type;
|
||||||
|
|
||||||
public XMLResponseBody(String result, String status, long duration) {
|
|
||||||
this.result = result;
|
|
||||||
this.status = status;
|
|
||||||
this.duration = duration;
|
|
||||||
}
|
|
||||||
public XMLResponseBody(String result, String status, String processor) {
|
public XMLResponseBody(String result, String status, String processor) {
|
||||||
this.result = result;
|
this.result = result;
|
||||||
this.status = status;
|
this.status = status;
|
||||||
|
|||||||
@@ -1,37 +0,0 @@
|
|||||||
package com.r11.tools.xml;
|
|
||||||
|
|
||||||
import org.w3c.dom.Document;
|
|
||||||
import org.xml.sax.InputSource;
|
|
||||||
|
|
||||||
import javax.xml.parsers.DocumentBuilder;
|
|
||||||
import javax.xml.parsers.DocumentBuilderFactory;
|
|
||||||
import javax.xml.transform.OutputKeys;
|
|
||||||
import javax.xml.transform.Transformer;
|
|
||||||
import javax.xml.transform.TransformerFactory;
|
|
||||||
import javax.xml.transform.dom.DOMSource;
|
|
||||||
import javax.xml.transform.stream.StreamResult;
|
|
||||||
import java.io.StringReader;
|
|
||||||
import java.io.StringWriter;
|
|
||||||
|
|
||||||
public class XmlFormatter {
|
|
||||||
public String formatXML(String inputXML) {
|
|
||||||
try {
|
|
||||||
DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
|
|
||||||
factory.setNamespaceAware(true);
|
|
||||||
DocumentBuilder builder = factory.newDocumentBuilder();
|
|
||||||
Document document = builder.parse(new InputSource(new StringReader(inputXML)));
|
|
||||||
|
|
||||||
TransformerFactory transformerFactory = TransformerFactory.newInstance();
|
|
||||||
Transformer transformer = transformerFactory.newTransformer();
|
|
||||||
transformer.setOutputProperty(OutputKeys.INDENT, "yes");
|
|
||||||
transformer.setOutputProperty("{http://xml.apache.org/xslt}indent-amount", "2");
|
|
||||||
|
|
||||||
StringWriter writer = new StringWriter();
|
|
||||||
transformer.transform(new DOMSource(document), new StreamResult(writer));
|
|
||||||
return writer.toString();
|
|
||||||
} catch (Exception e) {
|
|
||||||
e.printStackTrace();
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -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.
|
This template should help get you started developing with Vue 3 in Vite.
|
||||||
|
|
||||||
@@ -44,46 +44,3 @@ npm run build
|
|||||||
```sh
|
```sh
|
||||||
npm run lint
|
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
|
|
||||||
|
|
||||||
|
|||||||
69
Frontend/src/components/CodeEditorComponent.vue
Normal file
69
Frontend/src/components/CodeEditorComponent.vue
Normal file
@@ -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>
|
||||||
@@ -7,6 +7,12 @@ import {xml} from '@codemirror/lang-xml'
|
|||||||
import {json} from '@codemirror/lang-json'
|
import {json} from '@codemirror/lang-json'
|
||||||
import {html} from '@codemirror/lang-html'
|
import {html} from '@codemirror/lang-html'
|
||||||
|
|
||||||
|
function isDarkModeSet(){
|
||||||
|
return localStorage.theme == "dark";
|
||||||
|
}
|
||||||
|
|
||||||
|
const theme : string = inject('theme')! ;
|
||||||
|
|
||||||
const props= defineProps({
|
const props= defineProps({
|
||||||
code : {
|
code : {
|
||||||
type: String,
|
type: String,
|
||||||
@@ -24,25 +30,21 @@ const emit = defineEmits(
|
|||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
||||||
const theme : string = inject('theme')!;
|
|
||||||
let extensions = parseExtensions();
|
|
||||||
|
|
||||||
onBeforeUpdate( () => { extensions = parseExtensions(); } )
|
|
||||||
|
|
||||||
function dataUpdated(newData:String){
|
function dataUpdated(newData:String){
|
||||||
emit('update:updatedCode',newData)
|
emit('update:updatedCode',newData)
|
||||||
}
|
}
|
||||||
|
|
||||||
function selectTheme() {
|
function selectTheme() {
|
||||||
if (isDarkModeSet())
|
if (isDarkModeSet()) {
|
||||||
return oneDark;
|
return oneDark;
|
||||||
else
|
}
|
||||||
|
else {
|
||||||
return espresso;
|
return espresso;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function isDarkModeSet(){
|
let extensions = parseExtensions();
|
||||||
return localStorage.theme == "dark";
|
|
||||||
}
|
|
||||||
|
|
||||||
function parseExtensions(){
|
function parseExtensions(){
|
||||||
return [
|
return [
|
||||||
@@ -66,7 +68,7 @@ function parseLanguage(name: String){
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
onBeforeUpdate( () => { extensions = parseExtensions(); } )
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -1,22 +1,30 @@
|
|||||||
<script setup lang="ts">
|
<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>
|
</script>
|
||||||
|
|
||||||
|
|||||||
@@ -21,8 +21,6 @@ const emit = defineEmits([
|
|||||||
'update:error'
|
'update:error'
|
||||||
])
|
])
|
||||||
|
|
||||||
const fetchLink = document.location.protocol + "//" + document.location.hostname + "/libxml/html/" + chooseType(props.formatType);
|
|
||||||
|
|
||||||
function chooseType(formatType: String){
|
function chooseType(formatType: String){
|
||||||
if (formatType == "HTML -> XML"){
|
if (formatType == "HTML -> XML"){
|
||||||
return "convert";
|
return "convert";
|
||||||
@@ -47,6 +45,8 @@ function createBody(){
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const fetchLink = document.location.protocol + "//" + document.location.hostname + "/libxml/html/" + chooseType(props.formatType);
|
||||||
|
|
||||||
|
|
||||||
function process(){
|
function process(){
|
||||||
fetch(fetchLink, {body:createBody(), method: "POST"})
|
fetch(fetchLink, {body:createBody(), method: "POST"})
|
||||||
|
|||||||
@@ -18,37 +18,38 @@ function process() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
function prepareRequest():Request {
|
function prepareRequest():Request {
|
||||||
return new Request(prepareURL(), {
|
var request = new Request(prepareURL(), {
|
||||||
body: prepareRequestBody(),
|
body: prepareRequestBody(),
|
||||||
method: "POST"
|
method: "POST"
|
||||||
})
|
})
|
||||||
|
return request
|
||||||
}
|
}
|
||||||
|
|
||||||
function prepareURL(): string {
|
function prepareURL(): string {
|
||||||
let mode = "/java/prettify";
|
var mode = "prettify"
|
||||||
console.log("prepareUrl")
|
if (props.isMinimizer)
|
||||||
console.log(props.isMinimizer)
|
mode = "minimize"
|
||||||
if (props.isMinimizer)
|
return document.location.protocol + "//" + document.location.hostname + "/libxml/" + mode
|
||||||
mode = "/libxml/minimize"
|
|
||||||
return document.location.protocol + "//" + document.location.hostname + mode
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function prepareRequestBody():string {
|
function prepareRequestBody():string {
|
||||||
return JSON.stringify({
|
var requestBody = JSON.stringify({
|
||||||
"data": props.xml,
|
"data": props.xml,
|
||||||
"processorData": "N/A",
|
"processorData": "N/A",
|
||||||
"processor": "libxml",
|
"processor": "libxml",
|
||||||
"version": "1.0"
|
"version": "1.0"
|
||||||
})
|
})
|
||||||
|
return requestBody
|
||||||
}
|
}
|
||||||
|
|
||||||
async function fetchRequest(request: Request):Promise<JSON> {
|
async function fetchRequest(request: Request):Promise<JSON> {
|
||||||
return await fetch(request)
|
var responseBody = await fetch(request)
|
||||||
.then(response => response.json())
|
.then(response => response.json())
|
||||||
.then((body) => {
|
.then((body) => {
|
||||||
emit("update:error", body.status == "ERR")
|
emit("update:error", body.status == "ERR")
|
||||||
return body
|
return body
|
||||||
})
|
})
|
||||||
|
return responseBody
|
||||||
}
|
}
|
||||||
|
|
||||||
function sendProcessedData(data: JSON) {
|
function sendProcessedData(data: JSON) {
|
||||||
|
|||||||
@@ -19,7 +19,7 @@
|
|||||||
<li><strong>XPath</strong> - This is tool that allows to parse XPath on selected XML</li>
|
<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>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>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>
|
</ul>
|
||||||
|
|
||||||
<h2 class="text-xl mt-2">Formatter - Tools:</h2>
|
<h2 class="text-xl mt-2">Formatter - Tools:</h2>
|
||||||
@@ -39,4 +39,3 @@
|
|||||||
</template>
|
</template>
|
||||||
|
|
||||||
<style scoped></style>
|
<style scoped></style>
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
|
|
||||||
|
import { ref } from 'vue'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
const props = defineProps(
|
const props = defineProps(
|
||||||
{
|
{
|
||||||
name: {type: String, required: true}
|
name: {type: String, required: true}
|
||||||
|
|||||||
@@ -1,5 +1,9 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
|
|
||||||
|
import { ref } from 'vue'
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
const props = defineProps(
|
const props = defineProps(
|
||||||
{
|
{
|
||||||
imgPath: {type: String, required: true},
|
imgPath: {type: String, required: true},
|
||||||
|
|||||||
@@ -1,6 +1,18 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { ref } from 'vue';
|
import { ref } from 'vue';
|
||||||
|
|
||||||
|
|
||||||
|
// const props = defineProps({
|
||||||
|
// version: {
|
||||||
|
// type: String,
|
||||||
|
// required: true
|
||||||
|
// },
|
||||||
|
// toolType: {
|
||||||
|
// type: String,
|
||||||
|
// required: true
|
||||||
|
// }
|
||||||
|
// })
|
||||||
|
|
||||||
const emit = defineEmits([
|
const emit = defineEmits([
|
||||||
"update:visible"
|
"update:visible"
|
||||||
])
|
])
|
||||||
|
|||||||
@@ -14,5 +14,5 @@ const props = defineProps(
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<template>
|
<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>
|
</template>
|
||||||
@@ -1,11 +1,6 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import {ref, type Ref } from 'vue';
|
import {ref, type Ref } from 'vue';
|
||||||
|
|
||||||
const emit = defineEmits([
|
|
||||||
'click:showHeaders',
|
|
||||||
'click:showBody',
|
|
||||||
])
|
|
||||||
|
|
||||||
interface historyRecord {
|
interface historyRecord {
|
||||||
clientUUID : String,
|
clientUUID : String,
|
||||||
dateTimeStamp: String,
|
dateTimeStamp: String,
|
||||||
@@ -19,11 +14,15 @@ interface Headers {
|
|||||||
[propName: string]: any;
|
[propName: string]: any;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
const emit = defineEmits([
|
||||||
|
'click:showHeaders',
|
||||||
|
'click:showBody',
|
||||||
|
])
|
||||||
|
|
||||||
|
|
||||||
const clientUUID = localStorage.getItem("clientUUID")
|
const clientUUID = localStorage.getItem("clientUUID")
|
||||||
const fetchLink = window.location.protocol + "//" + window.location.hostname + "/mock/api/event";
|
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 });
|
fetch(fetchLink+"/"+clientUUID).then(response => response.json()).then(data => { historyRecords.value = data });
|
||||||
|
|
||||||
function parseTimeStamp(timestamp : String){
|
function parseTimeStamp(timestamp : String){
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
|
import { ref } from 'vue';
|
||||||
|
|
||||||
const emit = defineEmits([
|
const emit = defineEmits([
|
||||||
'closed:toast_closed',
|
'closed:toast_closed',
|
||||||
|
|||||||
@@ -4,6 +4,10 @@ import HeadersComponent from './HeadersComponent.vue';
|
|||||||
import SaveComponent from './SaveComponent.vue';
|
import SaveComponent from './SaveComponent.vue';
|
||||||
import CodeEditorComponent from '@/components/common/CodeEditorComponent.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 {
|
interface mockedMessageData {
|
||||||
clientUUID: string;
|
clientUUID: string;
|
||||||
contentType: string;
|
contentType: string;
|
||||||
@@ -12,10 +16,6 @@ interface mockedMessageData {
|
|||||||
httpStatus: number;
|
httpStatus: number;
|
||||||
}
|
}
|
||||||
|
|
||||||
const clientUUID = ref('');
|
|
||||||
const host = window.location.protocol + "//" + window.location.hostname + "/mock";
|
|
||||||
const mockMessageLink = ref("www.google.com");
|
|
||||||
|
|
||||||
const exampleData : mockedMessageData = {
|
const exampleData : mockedMessageData = {
|
||||||
clientUUID : "exampleUUID",
|
clientUUID : "exampleUUID",
|
||||||
contentType: "application/json",
|
contentType: "application/json",
|
||||||
@@ -23,8 +23,8 @@ const exampleData : mockedMessageData = {
|
|||||||
httpHeaders: {Connection:"keep-alive"},
|
httpHeaders: {Connection:"keep-alive"},
|
||||||
httpStatus: 200,
|
httpStatus: 200,
|
||||||
}
|
}
|
||||||
let messageData : Ref<mockedMessageData> = ref(exampleData);
|
|
||||||
|
|
||||||
|
let messageData : Ref<mockedMessageData> = ref(exampleData);
|
||||||
if ( localStorage.clientUUID != undefined ){
|
if ( localStorage.clientUUID != undefined ){
|
||||||
clientUUID.value = localStorage.clientUUID;
|
clientUUID.value = localStorage.clientUUID;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import InsertTemplateComponent from '@components/common/InsertTemplateComponent.vue'
|
import InsertTemplateComponent from '@components/common/InsertTemplateComponent.vue'
|
||||||
import XMLButtonFormatterComponent from '@components/formatter/XMLButtonFormatterComponent.vue'
|
import XMLButtonFormatterComponent from '@components/formatter/XMLButtonFormatterComponent.vue'
|
||||||
import CodeEditor from '@/components/common/CodeEditorComponent.vue'
|
|
||||||
|
|
||||||
import { ref } from 'vue'
|
import { ref } from 'vue'
|
||||||
|
import CodeEditor from '@/components/common/CodeEditorComponent.vue'
|
||||||
|
|
||||||
const props = defineProps(
|
const props = defineProps(
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -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>
|
||||||
@@ -54,7 +54,6 @@ function changeAvailableVersions() {
|
|||||||
changeAvailableVersionsOfXSLT();
|
changeAvailableVersionsOfXSLT();
|
||||||
else if (props.tool == "xsd")
|
else if (props.tool == "xsd")
|
||||||
versionsForCurrentEngine.value = ["N/A"];
|
versionsForCurrentEngine.value = ["N/A"];
|
||||||
|
|
||||||
else if (props.tool == "xpath")
|
else if (props.tool == "xpath")
|
||||||
changeAvailableVersionsOfXPath();
|
changeAvailableVersionsOfXPath();
|
||||||
|
|
||||||
|
|||||||
@@ -17,8 +17,6 @@ const emit = defineEmits(['update:modelValue'])
|
|||||||
|
|
||||||
const newTabId = ref(0);
|
const newTabId = ref(0);
|
||||||
const activeTabId = ref(0);
|
const activeTabId = ref(0);
|
||||||
const data = ref('')
|
|
||||||
const inputFile = ref()
|
|
||||||
|
|
||||||
const tabs = ref(new Array<TabData>);
|
const tabs = ref(new Array<TabData>);
|
||||||
tabs.value.push({
|
tabs.value.push({
|
||||||
@@ -27,6 +25,10 @@ tabs.value.push({
|
|||||||
data: "",
|
data: "",
|
||||||
})
|
})
|
||||||
|
|
||||||
|
const data = ref('')
|
||||||
|
const inputFile = ref()
|
||||||
|
|
||||||
|
|
||||||
function sendValue() {
|
function sendValue() {
|
||||||
emit('update:modelValue', tabs.value);
|
emit('update:modelValue', tabs.value);
|
||||||
}
|
}
|
||||||
|
|||||||
83
Frontend/src/components/xml/XmlToolComponent.vue
Normal file
83
Frontend/src/components/xml/XmlToolComponent.vue
Normal file
@@ -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>
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import TooltipCategoryComponent from './TooltipCategoryComponent.vue';
|
|
||||||
import xpathDiffs from '@/assets/tooltips/xpath/xpathdiffs.json';
|
import xpathDiffs from '@/assets/tooltips/xpath/xpathdiffs.json';
|
||||||
import xsltDiffs from '@/assets/tooltips/xslt/xsltdiffs.json';
|
import xsltDiffs from '@/assets/tooltips/xslt/xsltdiffs.json';
|
||||||
|
import TooltipCategoryComponent from './TooltipCategoryComponent.vue';
|
||||||
|
|
||||||
|
|
||||||
const props = defineProps({
|
const props = defineProps({
|
||||||
@@ -10,7 +10,7 @@ const props = defineProps({
|
|||||||
})
|
})
|
||||||
|
|
||||||
function getDiffEntry(toolVersion : String) : string[] {
|
function getDiffEntry(toolVersion : String) : string[] {
|
||||||
if ( props.toolName == "xpath" ) {
|
if ( props.toolName == "xpath" ){
|
||||||
switch(toolVersion){
|
switch(toolVersion){
|
||||||
case "2.0" : {
|
case "2.0" : {
|
||||||
return xpathDiffs.VersionDiffs[0].diffs
|
return xpathDiffs.VersionDiffs[0].diffs
|
||||||
@@ -27,7 +27,7 @@ function getDiffEntry(toolVersion : String) : string[] {
|
|||||||
}
|
}
|
||||||
} else if (props.toolName == "xslt") {
|
} else if (props.toolName == "xslt") {
|
||||||
return ["XSLT 2.0"].concat(xsltDiffs.VersionDiffs[0].diffs).concat(["XSLT 3.0"]).concat(xsltDiffs.VersionDiffs[1].diffs) ;
|
return ["XSLT 2.0"].concat(xsltDiffs.VersionDiffs[0].diffs).concat(["XSLT 3.0"]).concat(xsltDiffs.VersionDiffs[1].diffs) ;
|
||||||
} else {
|
} else{
|
||||||
return ["foo"]
|
return ["foo"]
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -6,17 +6,17 @@ import { ref } from 'vue'
|
|||||||
|
|
||||||
const data : any = ref("")
|
const data : any = ref("")
|
||||||
const imageData = ref("")
|
const imageData = ref("")
|
||||||
const doShowImage = ref(false)
|
const DoshowImage = ref(false)
|
||||||
const inputImage = ref()
|
const inputImage = ref()
|
||||||
|
|
||||||
function setTextFieldValue(newData: string) {
|
function setTextFieldValue(newData: string) {
|
||||||
data.value = newData.toString()
|
data.value = newData.toString()
|
||||||
doShowImage.value = false
|
DoshowImage.value = false
|
||||||
}
|
}
|
||||||
|
|
||||||
function showImage(newImage : string){
|
function showImage(newImage : string){
|
||||||
imageData.value = "data:image/jpeg;base64,"+newImage
|
imageData.value = "data:image/jpeg;base64,"+newImage
|
||||||
doShowImage.value = true
|
DoshowImage.value = true
|
||||||
}
|
}
|
||||||
|
|
||||||
function convertImageToBase64(file : any){
|
function convertImageToBase64(file : any){
|
||||||
@@ -32,7 +32,7 @@ function convertImageToBase64(file : any){
|
|||||||
function clear(){
|
function clear(){
|
||||||
data.value = ""
|
data.value = ""
|
||||||
imageData.value = ""
|
imageData.value = ""
|
||||||
doShowImage.value = false
|
DoshowImage.value = false
|
||||||
inputImage.value.value = null
|
inputImage.value.value = null
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -65,7 +65,7 @@ function clear(){
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="layoutRight" class="w-full xl:w-1/2 min-h-[66%] xl:h-full">
|
<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"/>
|
<img :src="imageData"/>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,10 @@
|
|||||||
{
|
{
|
||||||
"data": "<people><person><name>John</name><age>67</age></person><person><name>Anna</name><age>69</age></person></people>",
|
"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)",
|
"processorData": "for $x in //person return string($x/name)",
|
||||||
|
>>>>>>> 307e732608fca31b60027b417412691ff0e1c2f0
|
||||||
"processor": "saxon",
|
"processor": "saxon",
|
||||||
"version": "3.1"
|
"version": "3.1"
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user