From e303d7b9c495d59f3769f5a6aa1fabfa46d051b9 Mon Sep 17 00:00:00 2001
From: modzeleg <g.modzelewski@protonmail.com>
Date: Mon, 15 Feb 2021 12:12:43 +0100
Subject: [PATCH 1/3] Monday hotfix

---
 .idea/workspace.xml                               | 15 ++++++++-------
 .../klaus/controller/MockController.java          |  5 +++--
 src/main/resources/templates/mock.html            |  3 ++-
 3 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index c3569b8..927e414 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -20,7 +20,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="458cde88-df3d-44bc-9d57-a33823e2f1a6" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/main/resources/static/js/uianimation.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/js/uianimation.js" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/MockController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/MockController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/templates/mock.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/mock.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -204,7 +205,7 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration default="true" type="JetRunConfigurationType" factoryName="Kotlin">
+    <configuration default="true" type="JetRunConfigurationType">
       <module name="eureka" />
       <option name="VM_PARAMETERS" />
       <option name="PROGRAM_PARAMETERS" />
@@ -217,7 +218,7 @@
         <option name="Make" enabled="true" />
       </method>
     </configuration>
-    <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType" factoryName="Kotlin script">
+    <configuration default="true" type="KotlinStandaloneScriptRunConfigurationType">
       <module name="eureka" />
       <option name="filePath" />
       <option name="vmParameters" />
@@ -313,6 +314,7 @@
       <workItem from="1612609113694" duration="13936000" />
       <workItem from="1612777983977" duration="14203000" />
       <workItem from="1612868404302" duration="13841000" />
+      <workItem from="1613384221052" duration="2559000" />
     </task>
     <task id="LOCAL-00077" summary="testing jenkins docker">
       <created>1601453886631</created>
@@ -661,7 +663,7 @@
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
-    <option name="version" value="1" />
+    <option name="version" value="2" />
   </component>
   <component name="UnknownFeatures">
     <option featureType="com.intellij.fileTypeFactory" implementationName="*.js" />
@@ -671,13 +673,12 @@
       <map>
         <entry key="MAIN">
           <value>
-            <State>
-              <option name="COLUMN_ORDER" />
-            </State>
+            <State />
           </value>
         </entry>
       </map>
     </option>
+    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
     <option name="ADD_EXTERNAL_FILES_SILENTLY" value="true" />
diff --git a/src/main/java/com/release11/klaus/controller/MockController.java b/src/main/java/com/release11/klaus/controller/MockController.java
index b8c95c0..4adcfce 100644
--- a/src/main/java/com/release11/klaus/controller/MockController.java
+++ b/src/main/java/com/release11/klaus/controller/MockController.java
@@ -44,8 +44,9 @@ public class MockController {
     @ResponseBody
     @GetMapping({"/mock/json", "/mock/json/{uuidValue}"})
     public List<MockedMessageDto> getJson(@PathVariable(required = false) String uuidValue){
-        UUID clientUUID = UUID.fromString(uuidValue);
-        if(clientUUID == null) clientUUID = UUID.randomUUID();
+        UUID clientUUID;
+        if(uuidValue == null || uuidValue.equals("")) clientUUID = UUID.randomUUID();
+        else clientUUID = UUID.fromString(uuidValue);
         List<MockedMessageDto> messages = klausService.getAllMockedResponses(clientUUID);
         if(messages.size() == 0) {
             klausService.setMockedResponse(buildDefaultMessage(clientUUID));
diff --git a/src/main/resources/templates/mock.html b/src/main/resources/templates/mock.html
index c476683..cb4018f 100644
--- a/src/main/resources/templates/mock.html
+++ b/src/main/resources/templates/mock.html
@@ -4,12 +4,13 @@
     <title>R11 MockedServices</title>
     <meta charset="utf-8">
     <link rel="stylesheet" href="/css/main.css" type="text/css">
+<!--    <link rel="stylesheet" href="/css/wojtas.css" type="text/css">-->
     <link rel="stylesheet" href="/Dependency/fontello-plus/css/fontello.css" type="text/css"/>
     <link rel="preconnect" href="https://fonts.gstatic.com">
     <link href="https://fonts.googleapis.com/css2?family=Acme&family=Josefin+Slab:wght@500&display=swap" rel="stylesheet">
     <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.5.1/jquery.min.js"></script>
     <script type="text/javascript" src="/js/datatransfer.js"></script>
-    <script type="text/javascript" src="historyloader.js"></script>
+<!--    <script type="text/javascript" src="historyloader.js"></script>-->
 </head>
 <body>
     <div id="container">

From 5a211c654ee801cdabf373e828853150be70ebd4 Mon Sep 17 00:00:00 2001
From: modzeleg <g.modzelewski@protonmail.com>
Date: Mon, 15 Feb 2021 12:55:16 +0100
Subject: [PATCH 2/3] Temporary common css disabled

---
 .idea/workspace.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 927e414..f7c8cbd 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -21,8 +21,6 @@
   <component name="ChangeListManager">
     <list default="true" id="458cde88-df3d-44bc-9d57-a33823e2f1a6" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/MockController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/release11/klaus/controller/MockController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/templates/mock.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/templates/mock.html" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -314,7 +312,7 @@
       <workItem from="1612609113694" duration="13936000" />
       <workItem from="1612777983977" duration="14203000" />
       <workItem from="1612868404302" duration="13841000" />
-      <workItem from="1613384221052" duration="2559000" />
+      <workItem from="1613384221052" duration="4201000" />
     </task>
     <task id="LOCAL-00077" summary="testing jenkins docker">
       <created>1601453886631</created>

From 1da764551988d91017fa9fe08da442d48b104a96 Mon Sep 17 00:00:00 2001
From: modzeleg <g.modzelewski@protonmail.com>
Date: Mon, 15 Feb 2021 13:39:56 +0100
Subject: [PATCH 3/3] Ajax working as intended

---
 .idea/workspace.xml                          |  3 ++-
 src/main/resources/static/js/datatransfer.js | 25 ++++++++++----------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f7c8cbd..da3bb02 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -21,6 +21,7 @@
   <component name="ChangeListManager">
     <list default="true" id="458cde88-df3d-44bc-9d57-a33823e2f1a6" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/static/js/datatransfer.js" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/static/js/datatransfer.js" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -312,7 +313,7 @@
       <workItem from="1612609113694" duration="13936000" />
       <workItem from="1612777983977" duration="14203000" />
       <workItem from="1612868404302" duration="13841000" />
-      <workItem from="1613384221052" duration="4201000" />
+      <workItem from="1613384221052" duration="5569000" />
     </task>
     <task id="LOCAL-00077" summary="testing jenkins docker">
       <created>1601453886631</created>
diff --git a/src/main/resources/static/js/datatransfer.js b/src/main/resources/static/js/datatransfer.js
index 40bd5b3..0b95776 100644
--- a/src/main/resources/static/js/datatransfer.js
+++ b/src/main/resources/static/js/datatransfer.js
@@ -49,37 +49,38 @@ function getCookie(cname) {
 
 function updateData(){
     var updatedJson = generateJson();
-    $.ajax({
+    var request = $.ajax({
         url: 'http://localhost:8097/mock/json',
         type: 'PUT',
         data: JSON.stringify(updatedJson, null, 2),
-        error: function(e) {
-            console.log(e);
-        },
         dataType: "json",
         contentType: "application/json",
-        success: getData(),
     });
-    getData();
+    request.done(function () {
+        getData();
+    });
 }
 
 function addMessage(){
-    $.ajax({
+
+    var request = $.ajax({
         url: 'http://localhost:8097/mock/json/'+clientUUID,
         type: 'POST',
-        success: getData(),
     });
-    getData();
+    request.done(function () {
+        getData();
+    });
 }
 
 function removeTile(id){
     var jsonObject = findJsonById(id);
-    $.ajax({
+    var request = $.ajax({
         url: 'http://localhost:8097/mock/json/'+clientUUID + '/' + id,
         type: 'DELETE',
-        success: getData(),
     });
-    getData();
+    request.done(function () {
+        getData();
+    });
 }