From 0c993f78861192551d5776a61a89a6d8b4166e7b Mon Sep 17 00:00:00 2001 From: modzeleg Date: Thu, 28 Jan 2021 17:28:01 +0100 Subject: [PATCH] T157 static content and table generated. Added css to table --- .../klaus/controller/KlausMvcController.java | 30 +++++++++++++ src/main/resources/static/js/datatransfer.js | 45 +++++++++++++++++++ src/main/resources/static/js/uianimation.js | 21 --------- src/main/resources/templates/mock.html | 30 ++++--------- 4 files changed, 84 insertions(+), 42 deletions(-) diff --git a/src/main/java/com/release11/klaus/controller/KlausMvcController.java b/src/main/java/com/release11/klaus/controller/KlausMvcController.java index 1225fe0..6aa6890 100644 --- a/src/main/java/com/release11/klaus/controller/KlausMvcController.java +++ b/src/main/java/com/release11/klaus/controller/KlausMvcController.java @@ -123,6 +123,36 @@ public class KlausMvcController { return "mock"; } + @GetMapping({"/mock/json", "/mock/json/{uuid}"}) + @ResponseBody + public List getJsonList(final MockedMessageDto mockedMessageDto, final Model model, + @PathVariable(required = false) UUID uuid){ + if(uuid == null) uuid = UUID.randomUUID(); + List messages = klausService.getAllMockedResponses(uuid); + if(!(messages.size() > 0)) { + Map headers = new HashMap<>(); + headers.put("Keep-Alive", "timeout=60"); + headers.put("Connection", "keep-alive"); + headers.put("Date", LocalDateTime.now().toString()); + MockedMessageDto msg = MockedMessageDto.builder() + .clientUUID(uuid) + .mockedResponseId(1) + .mediaType(MediaType.APPLICATION_XML_VALUE) + .messageBody("\n" + + "\n" + + " Tove\n" + + " Jani\n" + + " Reminder\n" + + " Don't forget me this weekend!\n" + + "") + .httpHeaders(headers) + .httpStatus(200) + .build(); + messages.add(msg); + } + return messages; + } + @SneakyThrows @ModelAttribute("localhost") public String localhost() { diff --git a/src/main/resources/static/js/datatransfer.js b/src/main/resources/static/js/datatransfer.js index e69de29..3e49151 100644 --- a/src/main/resources/static/js/datatransfer.js +++ b/src/main/resources/static/js/datatransfer.js @@ -0,0 +1,45 @@ +function getData(uuid){ + $.getJSON('http://localhost:8097/mock/json', function(json) { + fillStaticFields(json[0].clientUUID + , json[0].mockedResponseId + , json[0].mediaType + , json[0].messageBody + , json[0].httpStatus); + fillHeaderTable(json[0].httpHeaders); + + }); +} + +function fillStaticFields(uuid, id, mediaType, body, httpStatus){ + $('#messageLink').html(createLink(uuid,id)); + $('#typeSelector').val(mediaType); + $('#bodyEditor').html(body); + + //TODO: HttpStatus +} + +function createLink(uuid, id){ + var link = 'http://localhost:8097/klaus/v1/'+uuid+'/'+id; + return link; +} + +function fillHeaderTable(headers){ + var innerHTML = $('#headerTable').html(); + innerHTML += generateHeaderTable(headers); + $('#headerTable').html(innerHTML); +} + +function generateHeaderTable(headers){ + var innerHTML = ''; + var keys = Object.keys(headers); + for(var h in headers){ + innerHTML += + '' + + '' + keys[h] + '' + + '' + headers[h] + '' + + '' + } + return innerHTML; +} + +$(document).ready(getData()); \ No newline at end of file diff --git a/src/main/resources/static/js/uianimation.js b/src/main/resources/static/js/uianimation.js index 4198c52..71c46a5 100644 --- a/src/main/resources/static/js/uianimation.js +++ b/src/main/resources/static/js/uianimation.js @@ -27,24 +27,3 @@ function createMessageTab() { $("#optional").click(changeAdvancedVisibility); $(".menuFactory").click(createMessageTab); - -// var key = $("#headerKey"); -// var value = $("#headerValue"); -// function addHeaderTableRow(){ -// var headerTable = document.getElementById("headerTable"); -// headerTable.innerHTML += -// '' + -// '' + -// '' + -// '' + -// '' + -// '' + -// '' + -// ''; -// key.html(""); -// value.html(""); -// // alert("key: " + key.val() + -// // "\n" + "value: " + value.val()); -// } - -// key.keypress(function(e){ if(e.key == 'Enter') addHeaderTableRow()}); diff --git a/src/main/resources/templates/mock.html b/src/main/resources/templates/mock.html index e51e1dd..e8a226c 100644 --- a/src/main/resources/templates/mock.html +++ b/src/main/resources/templates/mock.html @@ -1,13 +1,14 @@ - + R11 MockedServices - - + + +
@@ -23,19 +24,17 @@
-
Your message
- +

Content Type

- @@ -43,7 +42,7 @@

Body:

- +
@@ -59,16 +58,6 @@ Name Value - - - - - - - @@ -88,12 +77,11 @@
-
- + \ No newline at end of file