From c7ac4a48c3ed52419bfaa0c392c2f698a742a5a3 Mon Sep 17 00:00:00 2001 From: BroodjeAap Date: Mon, 3 Oct 2022 17:01:00 +0000 Subject: [PATCH] added filter results to edit filter modal --- static/edit.js | 52 +++++++++++++++++++++++++++++++++------ static/edit.ts | 27 ++++++++++++++++++++ templates/watch/view.html | 8 +++--- 3 files changed, 76 insertions(+), 11 deletions(-) diff --git a/static/edit.js b/static/edit.js index 440ac80..76f3188 100644 --- a/static/edit.js +++ b/static/edit.js @@ -536,6 +536,7 @@ function onSubmitNewFilter() { }); } function editNode(node) { + var e_1, _a; var addFilterButton = document.getElementById("filterButton"); addFilterButton.click(); var name = node.label; @@ -560,10 +561,40 @@ function editNode(node) { onTypeChange(node); var submitButton = document.getElementById("submitFilterButton"); submitButton.innerHTML = "Save"; + var filterModalFooter = document.getElementById("filterResultsDiv"); + filterModalFooter.innerHTML = ""; + try { + for (var _b = __values(node.results), _c = _b.next(); !_c.done; _c = _b.next()) { + var result = _c.value; + var cardDiv = document.createElement("div"); + cardDiv.classList.add("card", "my-2"); + var cardBody = document.createElement("div"); + cardBody.classList.add("card-body", "text-center"); + var pre = document.createElement("pre"); + var code = document.createElement("code"); + if (result.length > 50) { + code.innerHTML = "String of length >50"; + } + else { + code.innerHTML = "'" + result + "'"; + } + cardDiv.appendChild(cardBody); + pre.appendChild(code); + cardBody.appendChild(pre); + filterModalFooter.appendChild(cardDiv); + } + } + catch (e_1_1) { e_1 = { error: e_1_1 }; } + finally { + try { + if (_c && !_c.done && (_a = _b["return"])) _a.call(_b); + } + finally { if (e_1) throw e_1.error; } + } submitButton.onclick = function () { submitEditNode(node); }; } function logNode(node) { - var e_1, _a; + var e_2, _a; var logButton = document.getElementById("logButton"); logButton.click(); var logTitle = document.getElementById("logModalLabel"); @@ -583,12 +614,12 @@ function logNode(node) { logBody.appendChild(row); } } - catch (e_1_1) { e_1 = { error: e_1_1 }; } + catch (e_2_1) { e_2 = { error: e_2_1 }; } finally { try { if (_c && !_c.done && (_a = _b["return"])) _a.call(_b); } - finally { if (e_1) throw e_1.error; } + finally { if (e_2) throw e_2.error; } } } function deleteNode(node) { @@ -622,7 +653,7 @@ function submitEditNode(node) { node.resize(_diagram.ctx); } function saveWatch() { - var e_2, _a, e_3, _b; + var e_3, _a, e_4, _b; var watchIdInput = document.getElementById("watch_id"); var watchId = Number(watchIdInput.value); var filters = new Array(); @@ -646,12 +677,12 @@ function saveWatch() { }); } } - catch (e_2_1) { e_2 = { error: e_2_1 }; } + catch (e_3_1) { e_3 = { error: e_3_1 }; } finally { try { if (_d && !_d.done && (_a = _c["return"])) _a.call(_c); } - finally { if (e_2) throw e_2.error; } + finally { if (e_3) throw e_3.error; } } var filtersInput = document.getElementById("filtersInput"); filtersInput.value = JSON.stringify(filters); @@ -668,12 +699,12 @@ function saveWatch() { }); } } - catch (e_3_1) { e_3 = { error: e_3_1 }; } + catch (e_4_1) { e_4 = { error: e_4_1 }; } finally { try { if (_f && !_f.done && (_b = _e["return"])) _b.call(_e); } - finally { if (e_3) throw e_3.error; } + finally { if (e_4) throw e_4.error; } } var connectionsInput = document.getElementById("connectionsInput"); connectionsInput.value = JSON.stringify(connections); @@ -684,6 +715,11 @@ function addFilterButtonClicked() { var submitButton = document.getElementById("submitFilterButton"); submitButton.onclick = onSubmitNewFilter; submitButton.innerHTML = "Add Filter"; + var filterModalFooter = document.getElementById("filterResultsDiv"); + filterModalFooter.innerHTML = ""; + var var1Input = document.getElementById("typeInput"); + var1Input.value = "xpath"; + onTypeChange(); } function pageInit() { var select = document.getElementById("typeInput"); diff --git a/static/edit.ts b/static/edit.ts index f8f549e..cd93f68 100644 --- a/static/edit.ts +++ b/static/edit.ts @@ -573,6 +573,26 @@ function editNode(node: DiagramNode){ onTypeChange(node); let submitButton = document.getElementById("submitFilterButton") as HTMLButtonElement; submitButton.innerHTML = "Save"; + + let filterModalFooter = document.getElementById("filterResultsDiv") as HTMLDivElement; + filterModalFooter.innerHTML = ""; + for (let result of node.results){ + let cardDiv = document.createElement("div"); + cardDiv.classList.add("card", "my-2"); + let cardBody = document.createElement("div"); + cardBody.classList.add("card-body", "text-center"); + let pre = document.createElement("pre"); + let code = document.createElement("code"); + if (result.length > 50){ + code.innerHTML = `String of length >50`; + } else { + code.innerHTML = `'${result}'`; + } + cardDiv.appendChild(cardBody); + pre.appendChild(code); + cardBody.appendChild(pre); + filterModalFooter.appendChild(cardDiv); + } submitButton.onclick = function() {submitEditNode(node);} } @@ -678,6 +698,13 @@ function addFilterButtonClicked(){ let submitButton = document.getElementById("submitFilterButton") as HTMLButtonElement; submitButton.onclick = onSubmitNewFilter submitButton.innerHTML = "Add Filter" + + let filterModalFooter = document.getElementById("filterResultsDiv") as HTMLDivElement; + filterModalFooter.innerHTML = ""; + + let var1Input = document.getElementById("typeInput") as HTMLInputElement; + var1Input.value = "xpath"; + onTypeChange(); } function pageInit(){ diff --git a/templates/watch/view.html b/templates/watch/view.html index 9d32900..351f31b 100644 --- a/templates/watch/view.html +++ b/templates/watch/view.html @@ -85,9 +85,11 @@ -
+
+
+
@@ -147,10 +149,10 @@
- +
- +
MessageMessage