From c440b08bdf3aa9c9f225b819d015bf9af7075743 Mon Sep 17 00:00:00 2001 From: mikolaj widla Date: Mon, 6 Mar 2023 12:35:29 +0100 Subject: [PATCH 1/4] Fixed bug, that broke UUID changer when user provides spaces in UUID. --- .../src/main/resources/static/js/datatransfer.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Backend/mocked-services/src/main/resources/static/js/datatransfer.js b/Backend/mocked-services/src/main/resources/static/js/datatransfer.js index d70fcab..d69a399 100644 --- a/Backend/mocked-services/src/main/resources/static/js/datatransfer.js +++ b/Backend/mocked-services/src/main/resources/static/js/datatransfer.js @@ -280,9 +280,10 @@ async function fetchUUIDCheck(givenUUID , strategy){ } function checkUUIDChars(uuid) { + uuid.replace(/ /g,'') console.log("UUID in check: " + uuid); const regex = new RegExp("^[A-z0-9-]+$"); - if(regex.test(uuid)){ + if(regex.test(uuid) || uuid == ""){ return uuid ; } return "invalid"; From 6d104948cc74b2412dd6e24885f98a367007ad33 Mon Sep 17 00:00:00 2001 From: mikolaj widla Date: Mon, 6 Mar 2023 15:03:06 +0100 Subject: [PATCH 2/4] Fixed bug, that dont refresh data after modal closes by clicking in overlay --- .../src/main/resources/static/js/datatransfer.js | 1 - Backend/mocked-services/src/main/resources/static/js/modal.js | 3 +++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Backend/mocked-services/src/main/resources/static/js/datatransfer.js b/Backend/mocked-services/src/main/resources/static/js/datatransfer.js index d69a399..12222d6 100644 --- a/Backend/mocked-services/src/main/resources/static/js/datatransfer.js +++ b/Backend/mocked-services/src/main/resources/static/js/datatransfer.js @@ -310,7 +310,6 @@ function changeUUID(element){ changeMessage = "success"; } clientUUID = data; - $("#uuid-input").attr("disabled", true); $("#editable").attr("checked", false); uuidChangeModalDisplay(changeMessage); diff --git a/Backend/mocked-services/src/main/resources/static/js/modal.js b/Backend/mocked-services/src/main/resources/static/js/modal.js index f743055..84c4278 100644 --- a/Backend/mocked-services/src/main/resources/static/js/modal.js +++ b/Backend/mocked-services/src/main/resources/static/js/modal.js @@ -74,13 +74,16 @@ function showModal(jmodal){ function hideModal(jmodal){ if(!modalDisplayed) return; + if ($(uuidChangeModal).hasClass('active')) window.location.reload(); overlay.removeClass('active'); jmodal.removeClass('active'); modalDisplayed = false; } btnModalClose.click(closeModals); + overlay.click(closeModals); + dataLossModalNo.click(closeModals); dataLossModalYes.click(dropChangesAndClose); From 04fc1030169451ddcb4533b07e6ba8decc29e69b Mon Sep 17 00:00:00 2001 From: mikolaj widla Date: Tue, 7 Mar 2023 11:02:47 +0100 Subject: [PATCH 3/4] Fixed validation for UUID --- .../src/main/resources/static/js/datatransfer.js | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Backend/mocked-services/src/main/resources/static/js/datatransfer.js b/Backend/mocked-services/src/main/resources/static/js/datatransfer.js index 12222d6..a8c6136 100644 --- a/Backend/mocked-services/src/main/resources/static/js/datatransfer.js +++ b/Backend/mocked-services/src/main/resources/static/js/datatransfer.js @@ -283,7 +283,8 @@ function checkUUIDChars(uuid) { uuid.replace(/ /g,'') console.log("UUID in check: " + uuid); const regex = new RegExp("^[A-z0-9-]+$"); - if(regex.test(uuid) || uuid == ""){ + console.log("UUID: "+uuid) + if(regex.test(uuid) && uuid != ""){ return uuid ; } return "invalid"; @@ -292,8 +293,8 @@ function checkUUIDChars(uuid) { function changeUUID(element){ const uuidStrategy = $('input[name="uuid-validation-type"]:checked').val(); - // const givenUUID = checkUUIDChars(element.value); - const givenUUID = element.value; + const givenUUID = checkUUIDChars(element.value); + //const givenUUID = element.value; console.log(givenUUID); if( givenUUID == clientUUID ){ From 0844525f8eb54cffb2dfbeed1c6194a5a31466a4 Mon Sep 17 00:00:00 2001 From: Adam Bem Date: Tue, 7 Mar 2023 11:21:07 +0100 Subject: [PATCH 4/4] Fixed typos --- .../src/main/resources/static/js/datatransfer.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/Backend/mocked-services/src/main/resources/static/js/datatransfer.js b/Backend/mocked-services/src/main/resources/static/js/datatransfer.js index a8c6136..fd84f61 100644 --- a/Backend/mocked-services/src/main/resources/static/js/datatransfer.js +++ b/Backend/mocked-services/src/main/resources/static/js/datatransfer.js @@ -294,8 +294,6 @@ function changeUUID(element){ const uuidStrategy = $('input[name="uuid-validation-type"]:checked').val(); const givenUUID = checkUUIDChars(element.value); - //const givenUUID = element.value; - console.log(givenUUID); if( givenUUID == clientUUID ){ $("#uuid-input").attr("disabled", true);