From dc4a9dfe7c42dd99f68487659d580bee50486525 Mon Sep 17 00:00:00 2001 From: Michelle <88682822+emshahh@users.noreply.github.com> Date: Thu, 6 Jun 2024 11:52:17 -0400 Subject: [PATCH 1/9] modal popping up for confirming deletion of any pattern on candidate url page and successfully deletes or closes modal depending on what user chooses --- .../static/js/candidate_url_list.js | 93 ++++++++++++++----- .../sde_collections/candidate_urls_list.html | 27 ++++++ 2 files changed, 96 insertions(+), 24 deletions(-) diff --git a/sde_indexing_helper/static/js/candidate_url_list.js b/sde_indexing_helper/static/js/candidate_url_list.js index c283f55d..97ebec37 100644 --- a/sde_indexing_helper/static/js/candidate_url_list.js +++ b/sde_indexing_helper/static/js/candidate_url_list.js @@ -13,6 +13,7 @@ var matchPatternTypeMap = { "Individual URL Pattern": 1, "Multi-URL Pattern": 2, }; + var uniqueId; //used for logic related to contents on column customization modal const dict = { 1: "Images", @@ -44,14 +45,14 @@ function modalContents(tableName) { if (checkboxCount > 0 && tableName === uniqueId) { $modal = $("#hideShowColumnsModal").modal({ - backdrop: 'static', + backdrop: "static", keyboard: true, }); return; } $modal = $("#hideShowColumnsModal").modal({ - backdrop: 'static', + backdrop: "static", keyboard: true, }); var table = $(tableName).DataTable(); @@ -101,13 +102,16 @@ function initializeDataTable() { colReorder: true, stateSave: true, layout: { - bottomEnd: 'inputPaging', + bottomEnd: "inputPaging", topEnd: null, topStart: { - info:true, + info: true, pageLength: { - menu: [[25, 50, 100, 500],["Show 25", "Show 50", "Show 100", "Show 500"]] - }, + menu: [ + [25, 50, 100, 500], + ["Show 25", "Show 50", "Show 100", "Show 500"], + ], + }, buttons: [ "spacer", "csv", @@ -120,8 +124,8 @@ function initializeDataTable() { }, }, ], - } - }, + }, + }, serverSide: true, orderCellsTop: true, pagingType: "input", @@ -166,9 +170,9 @@ function initializeDataTable() { let alteredLines = []; lines.forEach((line) => { let newLine = ""; - newLine = line.replace("open_in_new",""); + newLine = line.replace("open_in_new", ""); alteredLines.push(newLine); - }) + }); return alteredLines.join("\n") + appliedFiltersInfo; }, }, @@ -254,7 +258,10 @@ function initializeDataTable() { ], createdRow: function (row, data, dataIndex) { if (data["excluded"]) { - $(row).attr("style", "background-color: rgba(255, 61, 87, 0.36) !important"); + $(row).attr( + "style", + "background-color: rgba(255, 61, 87, 0.36) !important" + ); } }, }); @@ -340,7 +347,7 @@ function initializeDataTable() { data: "candidate_urls_count", class: "text-center whiteText", sortable: true, - }, + }, { data: null, sortable: false, @@ -784,7 +791,7 @@ function handleHideorShowKeypress() { $("#hideShowColumnsModal").modal("hide"); } //Confirm modal selections via enter - if(event.key == "Enter" && $("#hideShowColumnsModal").is(":visible")) { + if (event.key == "Enter" && $("#hideShowColumnsModal").is(":visible")) { var table = $(uniqueId).DataTable(); $("[id^='checkbox_']").each(function () { var checkboxValue = $(this).val(); @@ -796,7 +803,7 @@ function handleHideorShowKeypress() { $("#hideShowColumnsModal").modal("hide"); } }); - + $("body").on("click", ".modal-backdrop", function () { $("#hideShowColumnsModal").modal("hide"); }); @@ -819,7 +826,9 @@ function handleHideorShowSubmitButton() { function handleDocumentTypeSelect() { $("body").on("click", ".document_type_select", function () { - $match_pattern = $(this).parents(".document_type_dropdown").data("match-pattern"); + $match_pattern = $(this) + .parents(".document_type_dropdown") + .data("match-pattern"); postDocumentTypePatterns( $match_pattern, (match_pattern_type = 1), @@ -846,9 +855,9 @@ function handleExcludeIndividualUrlClick() { function handleDeleteExcludePatternButtonClick() { $("body").on("click", ".delete-exclude-pattern-button", function () { - row_id = $(this).data("row-id"); + var patternRowId = $(this).data("row-id"); deletePattern( - `/api/exclude-patterns/${row_id}/`, + `/api/exclude-patterns/${patternRowId}/`, (data_type = "Exclude Pattern") ); }); @@ -856,9 +865,9 @@ function handleDeleteExcludePatternButtonClick() { function handleDeleteIncludePatternButtonClick() { $("body").on("click", ".delete-include-pattern-button", function () { - row_id = $(this).data("row-id"); + var patternRowId = $(this).data("row-id"); deletePattern( - `/api/include-patterns/${row_id}/`, + `/api/include-patterns/${patternRowId}/`, (data_type = "Include Pattern") ); }); @@ -866,9 +875,9 @@ function handleDeleteIncludePatternButtonClick() { function handleDeleteTitlePatternButtonClick() { $("body").on("click", ".delete-title-pattern-button", function () { - row_id = $(this).data("row-id"); + patternRowId = $(this).data("row-id"); deletePattern( - `/api/title-patterns/${row_id}/`, + `/api/title-patterns/${patternRowId}/`, (data_type = "Title Pattern") ); }); @@ -876,9 +885,9 @@ function handleDeleteTitlePatternButtonClick() { function handleDeleteDocumentTypeButtonClick() { $("body").on("click", ".delete-document-type-pattern-button", function () { - row_id = $(this).data("row-id"); + patternRowId = $(this).data("row-id"); deletePattern( - `/api/document-type-patterns/${row_id}/`, + `/api/document-type-patterns/${patternRowId}/`, (data_type = "Document Type Pattern") ); }); @@ -1143,10 +1152,46 @@ function deletePattern( `YOU ARE ATTEMPTING TO DELETE A MULTI-URL PATTERN. THIS WILL AFFECT ${candidate_urls_count} URLs. \n\nAre you sure you want to do this? Currently there is no way to delete a single URL from a Multi-URL pattern` ); } else { - var confirmDelete = confirm( + console.log("data_type", data_type); + $modal = $("#deletePatternModal").modal({ + backdrop: "static", + keyboard: true, + }); + + $(".delete-pattern-caption").text( `Are you sure you want to delete this ${data_type}?` ); } + + $("#deletePatternModalForm").on("click", "button", function (event) { + event.preventDefault(); + var buttonId = $(this).attr("id"); + if (buttonId === "dontDeletePattern") { + $modal = $("#deletePatternModal").modal("hide"); + return; + } else if (buttonId === "deletePattern") { + $.ajax({ + url: url, + type: "DELETE", + data: { + csrfmiddlewaretoken: csrftoken, + }, + headers: { + "X-CSRFToken": csrftoken, + }, + success: function (data) { + $("#candidate_urls_table").DataTable().ajax.reload(null, false); + $("#exclude_patterns_table").DataTable().ajax.reload(null, false); + $("#include_patterns_table").DataTable().ajax.reload(null, false); + $("#title_patterns_table").DataTable().ajax.reload(null, false); + $("#document_type_patterns_table") + .DataTable() + .ajax.reload(null, false); + }, + }); + } + }); + if (!confirmDelete) { return; } diff --git a/sde_indexing_helper/templates/sde_collections/candidate_urls_list.html b/sde_indexing_helper/templates/sde_collections/candidate_urls_list.html index cef56211..f5d31fd7 100644 --- a/sde_indexing_helper/templates/sde_collections/candidate_urls_list.html +++ b/sde_indexing_helper/templates/sde_collections/candidate_urls_list.html @@ -418,5 +418,32 @@
Customize Column + + + + {% endblock content %} \ No newline at end of file From 39063c40beed2417046c10be5467eec3b63e372c Mon Sep 17 00:00:00 2001 From: Michelle <88682822+emshahh@users.noreply.github.com> Date: Thu, 6 Jun 2024 11:56:47 -0400 Subject: [PATCH 2/9] remove console logs --- sde_indexing_helper/static/js/candidate_url_list.js | 1 - 1 file changed, 1 deletion(-) diff --git a/sde_indexing_helper/static/js/candidate_url_list.js b/sde_indexing_helper/static/js/candidate_url_list.js index 97ebec37..bc316bcf 100644 --- a/sde_indexing_helper/static/js/candidate_url_list.js +++ b/sde_indexing_helper/static/js/candidate_url_list.js @@ -1152,7 +1152,6 @@ function deletePattern( `YOU ARE ATTEMPTING TO DELETE A MULTI-URL PATTERN. THIS WILL AFFECT ${candidate_urls_count} URLs. \n\nAre you sure you want to do this? Currently there is no way to delete a single URL from a Multi-URL pattern` ); } else { - console.log("data_type", data_type); $modal = $("#deletePatternModal").modal({ backdrop: "static", keyboard: true, From 0224d8af488281e2cae4959585114925cb00c927 Mon Sep 17 00:00:00 2001 From: Michelle <88682822+emshahh@users.noreply.github.com> Date: Mon, 10 Jun 2024 11:50:32 -0400 Subject: [PATCH 3/9] modal popping up for delete url button --- .../static/js/collection_detail.js | 27 ++++++++++++++++++ .../sde_collections/collection_detail.html | 28 ++++++++++++++++++- 2 files changed, 54 insertions(+), 1 deletion(-) diff --git a/sde_indexing_helper/static/js/collection_detail.js b/sde_indexing_helper/static/js/collection_detail.js index 892b0fb1..43f9b906 100644 --- a/sde_indexing_helper/static/js/collection_detail.js +++ b/sde_indexing_helper/static/js/collection_detail.js @@ -53,6 +53,33 @@ function postDocTypeChange(collection_id, docType) { }); } +////////////////////////////// +///// DELETE URL CHANGE ////// +////////////////////////////// + +function handleDeleteURLButtonClick(dataId) { + $modal = $("#deleteURLModal").modal(); + $("#deleteURLModalForm").on("click", "button", function (event) { + event.preventDefault(); + var buttonId = $(this).attr("id"); + + if (buttonId === "cancelURLDeletion") { + $modal = $("#deleteURLModal").modal("hide"); + return; + } else if (buttonId === "deleteURL") { + // url delete req here + } + }); +} + +$(document).ready(function () { + $("body").on("click", ".urlDeleteButton", function (e) { + e.preventDefault(); + var dataId = $(this).data("id"); + handleDeleteURLButtonClick(dataId); + }); +}); + ////////////////////////////// ///// DIVISION CHANGE //////// ////////////////////////////// diff --git a/sde_indexing_helper/templates/sde_collections/collection_detail.html b/sde_indexing_helper/templates/sde_collections/collection_detail.html index c119e6f6..db2b4170 100644 --- a/sde_indexing_helper/templates/sde_collections/collection_detail.html +++ b/sde_indexing_helper/templates/sde_collections/collection_detail.html @@ -160,7 +160,7 @@

{{ colle {% for required_url in required_urls %}
-
+ {% csrf_token %}
+ + + {% endblock content %} {% block javascripts %} From 223eb596f13bc3046219c13f031bd17c75e79007 Mon Sep 17 00:00:00 2001 From: Michelle <88682822+emshahh@users.noreply.github.com> Date: Mon, 10 Jun 2024 12:04:14 -0400 Subject: [PATCH 4/9] wip --- .../static/js/collection_detail.js | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/sde_indexing_helper/static/js/collection_detail.js b/sde_indexing_helper/static/js/collection_detail.js index 43f9b906..b501916b 100644 --- a/sde_indexing_helper/static/js/collection_detail.js +++ b/sde_indexing_helper/static/js/collection_detail.js @@ -68,6 +68,26 @@ function handleDeleteURLButtonClick(dataId) { return; } else if (buttonId === "deleteURL") { // url delete req here + $.ajax({ + url: "/delete-required-url/" + dataId, + type: "PUT", + data: { + name: inputValue, + csrfmiddlewaretoken: csrftoken, + }, + headers: { + "X-CSRFToken": csrftoken, + }, + success: function (data) { + // console.log("Success:", data); + $(".collectionName").text(`${data.name}`); + toastr.success("Name Updated!"); + }, + error: function (xhr, textStatus, errorThrown) { + // console.log("Error:", errorThrown); + toastr.error("Error updating name."); + }, + }); } }); } From 7b482a8e225058638bdc66bd85ebffaeb8a08b10 Mon Sep 17 00:00:00 2001 From: Michelle <88682822+emshahh@users.noreply.github.com> Date: Mon, 10 Jun 2024 12:29:26 -0400 Subject: [PATCH 5/9] delete modal for url delete successfully popping up, delete url when clicking delete, closing when user changes mind --- .../static/js/collection_detail.js | 20 +++++++------------ .../sde_collections/collection_detail.html | 4 ++-- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/sde_indexing_helper/static/js/collection_detail.js b/sde_indexing_helper/static/js/collection_detail.js index b501916b..548b14c5 100644 --- a/sde_indexing_helper/static/js/collection_detail.js +++ b/sde_indexing_helper/static/js/collection_detail.js @@ -57,8 +57,9 @@ function postDocTypeChange(collection_id, docType) { ///// DELETE URL CHANGE ////// ////////////////////////////// -function handleDeleteURLButtonClick(dataId) { +function handleDeleteURLButtonClick(dataId, dataURL) { $modal = $("#deleteURLModal").modal(); + $(".delete-URL-caption").text(`Are you sure you want to delete ${dataURL}?`); $("#deleteURLModalForm").on("click", "button", function (event) { event.preventDefault(); var buttonId = $(this).attr("id"); @@ -67,25 +68,18 @@ function handleDeleteURLButtonClick(dataId) { $modal = $("#deleteURLModal").modal("hide"); return; } else if (buttonId === "deleteURL") { - // url delete req here $.ajax({ url: "/delete-required-url/" + dataId, - type: "PUT", - data: { - name: inputValue, - csrfmiddlewaretoken: csrftoken, - }, + type: "POST", headers: { "X-CSRFToken": csrftoken, }, success: function (data) { - // console.log("Success:", data); - $(".collectionName").text(`${data.name}`); - toastr.success("Name Updated!"); + window.location.reload(); }, error: function (xhr, textStatus, errorThrown) { - // console.log("Error:", errorThrown); - toastr.error("Error updating name."); + console.log("Error:", errorThrown); + toastr.error("Error deleting URL."); }, }); } @@ -96,7 +90,7 @@ $(document).ready(function () { $("body").on("click", ".urlDeleteButton", function (e) { e.preventDefault(); var dataId = $(this).data("id"); - handleDeleteURLButtonClick(dataId); + handleDeleteURLButtonClick(dataId.id, dataId.url); }); }); diff --git a/sde_indexing_helper/templates/sde_collections/collection_detail.html b/sde_indexing_helper/templates/sde_collections/collection_detail.html index db2b4170..858327aa 100644 --- a/sde_indexing_helper/templates/sde_collections/collection_detail.html +++ b/sde_indexing_helper/templates/sde_collections/collection_detail.html @@ -163,7 +163,7 @@

{{ colle
{% csrf_token %}
@@ -308,7 +308,7 @@
Rename Collection
Are you sure?
-

+

From 0bd9ab8d5abc66d671c2c3bff2c86d51d2e73e9d Mon Sep 17 00:00:00 2001 From: Michelle <88682822+emshahh@users.noreply.github.com> Date: Mon, 10 Jun 2024 13:49:04 -0400 Subject: [PATCH 6/9] adding event listener to delete URL on press of enter key --- .../static/js/collection_detail.js | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/sde_indexing_helper/static/js/collection_detail.js b/sde_indexing_helper/static/js/collection_detail.js index 548b14c5..2faf7ec6 100644 --- a/sde_indexing_helper/static/js/collection_detail.js +++ b/sde_indexing_helper/static/js/collection_detail.js @@ -60,6 +60,34 @@ function postDocTypeChange(collection_id, docType) { function handleDeleteURLButtonClick(dataId, dataURL) { $modal = $("#deleteURLModal").modal(); $(".delete-URL-caption").text(`Are you sure you want to delete ${dataURL}?`); + $("#deleteURLModal").on("keydown", function (event) { + if (event.keyCode === 13) { + // Check if the focused element is the button + if ( + document.activeElement.id === "deleteURLModal" || + document.activeElement.id === "deleteURL" + ) { + // Simulate a click event on the button + $.ajax({ + url: "/delete-required-url/" + dataId, + type: "POST", + headers: { + "X-CSRFToken": csrftoken, + }, + success: function (data) { + window.location.reload(); + }, + error: function (xhr, textStatus, errorThrown) { + console.log("Error:", errorThrown); + toastr.error("Error deleting URL."); + }, + }); + } else { + $modal = $("#deleteURLModal").modal("hide"); + } + } + }); + $("#deleteURLModalForm").on("click", "button", function (event) { event.preventDefault(); var buttonId = $(this).attr("id"); From 7f378642255e95087be8ea7d5910252f26ec2dc8 Mon Sep 17 00:00:00 2001 From: Kshaw362 Date: Mon, 10 Jun 2024 14:14:40 -0400 Subject: [PATCH 7/9] 117: making sure we only delete the url that was last selected --- sde_indexing_helper/static/js/collection_detail.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sde_indexing_helper/static/js/collection_detail.js b/sde_indexing_helper/static/js/collection_detail.js index 2faf7ec6..a1ec7971 100644 --- a/sde_indexing_helper/static/js/collection_detail.js +++ b/sde_indexing_helper/static/js/collection_detail.js @@ -2,6 +2,7 @@ var collection_id; var newDivisionVal; var currentDivisionVal; var currentDivisonText; +var currentUrlToDelete; let originalValue = document.getElementById("github-link-display").textContent; document.getElementById("github-link-form").style.display = "none"; @@ -95,7 +96,7 @@ function handleDeleteURLButtonClick(dataId, dataURL) { if (buttonId === "cancelURLDeletion") { $modal = $("#deleteURLModal").modal("hide"); return; - } else if (buttonId === "deleteURL") { + } else if (buttonId === "deleteURL" && dataId === currentUrlToDelete) { $.ajax({ url: "/delete-required-url/" + dataId, type: "POST", @@ -118,6 +119,7 @@ $(document).ready(function () { $("body").on("click", ".urlDeleteButton", function (e) { e.preventDefault(); var dataId = $(this).data("id"); + currentUrlToDelete = dataId.id; handleDeleteURLButtonClick(dataId.id, dataId.url); }); }); From 690559e76ed1caa3d668b5f2d9ad716e85c1d13c Mon Sep 17 00:00:00 2001 From: Michelle <88682822+emshahh@users.noreply.github.com> Date: Mon, 10 Jun 2024 14:15:16 -0400 Subject: [PATCH 8/9] wip --- .../static/js/candidate_url_list.js | 30 +++++++++++++++++++ .../static/js/collection_detail.js | 7 +---- 2 files changed, 31 insertions(+), 6 deletions(-) diff --git a/sde_indexing_helper/static/js/candidate_url_list.js b/sde_indexing_helper/static/js/candidate_url_list.js index 48a8920c..947d449b 100644 --- a/sde_indexing_helper/static/js/candidate_url_list.js +++ b/sde_indexing_helper/static/js/candidate_url_list.js @@ -1157,6 +1157,36 @@ function deletePattern( ); } + $("#deletePatternModal").on("keydown", function (event) { + if (event.keyCode === 13) { + // Check if the focused element is the button + if (document.activeElement.id === "deletePatternModal") { + console.log("url", url); + // Simulate a click event on the button + $.ajax({ + url: url, + type: "DELETE", + data: { + csrfmiddlewaretoken: csrftoken, + }, + headers: { + "X-CSRFToken": csrftoken, + }, + success: function (data) { + $modal = $("#deletePatternModal").modal("hide"); + $("#candidate_urls_table").DataTable().ajax.reload(null, false); + $("#exclude_patterns_table").DataTable().ajax.reload(null, false); + $("#include_patterns_table").DataTable().ajax.reload(null, false); + $("#title_patterns_table").DataTable().ajax.reload(null, false); + $("#document_type_patterns_table") + .DataTable() + .ajax.reload(null, false); + }, + }); + } + } + }); + $("#deletePatternModalForm").on("click", "button", function (event) { event.preventDefault(); var buttonId = $(this).attr("id"); diff --git a/sde_indexing_helper/static/js/collection_detail.js b/sde_indexing_helper/static/js/collection_detail.js index a1ec7971..cff22465 100644 --- a/sde_indexing_helper/static/js/collection_detail.js +++ b/sde_indexing_helper/static/js/collection_detail.js @@ -64,10 +64,7 @@ function handleDeleteURLButtonClick(dataId, dataURL) { $("#deleteURLModal").on("keydown", function (event) { if (event.keyCode === 13) { // Check if the focused element is the button - if ( - document.activeElement.id === "deleteURLModal" || - document.activeElement.id === "deleteURL" - ) { + if (document.activeElement.id === "deleteURLModal") { // Simulate a click event on the button $.ajax({ url: "/delete-required-url/" + dataId, @@ -83,8 +80,6 @@ function handleDeleteURLButtonClick(dataId, dataURL) { toastr.error("Error deleting URL."); }, }); - } else { - $modal = $("#deleteURLModal").modal("hide"); } } }); From 206d5e28c79c2539b380533001a84e1f9638d006 Mon Sep 17 00:00:00 2001 From: Michelle <88682822+emshahh@users.noreply.github.com> Date: Mon, 10 Jun 2024 14:37:58 -0400 Subject: [PATCH 9/9] event listener to submit form on enter key --- .../static/js/candidate_url_list.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sde_indexing_helper/static/js/candidate_url_list.js b/sde_indexing_helper/static/js/candidate_url_list.js index 947d449b..c3daae15 100644 --- a/sde_indexing_helper/static/js/candidate_url_list.js +++ b/sde_indexing_helper/static/js/candidate_url_list.js @@ -13,6 +13,7 @@ var matchPatternTypeMap = { "Individual URL Pattern": 1, "Multi-URL Pattern": 2, }; +var currentURLtoDelete; var uniqueId; //used for logic related to contents on column customization modal const dict = { @@ -851,6 +852,7 @@ function handleExcludeIndividualUrlClick() { function handleDeleteExcludePatternButtonClick() { $("body").on("click", ".delete-exclude-pattern-button", function () { var patternRowId = $(this).data("row-id"); + currentURLtoDelete = `/api/exclude-patterns/${patternRowId}/`; deletePattern( `/api/exclude-patterns/${patternRowId}/`, (data_type = "Exclude Pattern") @@ -861,6 +863,7 @@ function handleDeleteExcludePatternButtonClick() { function handleDeleteIncludePatternButtonClick() { $("body").on("click", ".delete-include-pattern-button", function () { var patternRowId = $(this).data("row-id"); + currentURLtoDelete = `/api/include-patterns/${patternRowId}/`; deletePattern( `/api/include-patterns/${patternRowId}/`, (data_type = "Include Pattern") @@ -870,7 +873,8 @@ function handleDeleteIncludePatternButtonClick() { function handleDeleteTitlePatternButtonClick() { $("body").on("click", ".delete-title-pattern-button", function () { - patternRowId = $(this).data("row-id"); + var patternRowId = $(this).data("row-id"); + currentURLtoDelete = `/api/title-patterns/${patternRowId}/`; deletePattern( `/api/title-patterns/${patternRowId}/`, (data_type = "Title Pattern") @@ -881,6 +885,7 @@ function handleDeleteTitlePatternButtonClick() { function handleDeleteDocumentTypeButtonClick() { $("body").on("click", ".delete-document-type-pattern-button", function () { patternRowId = $(this).data("row-id"); + currentURLtoDelete = `/api/document-type-patterns/${patternRowId}/`; deletePattern( `/api/document-type-patterns/${patternRowId}/`, (data_type = "Document Type Pattern") @@ -903,6 +908,7 @@ function handleNewTitleChange() { var match_pattern_type = $(this).data("match-pattern-type"); var candidate_urls_count = $(this).data("candidate-urls-count"); if (!title_pattern) { + currentURLtoDelete = `/api/title-patterns/${generated_title_id}/`; deletePattern( `/api/title-patterns/${generated_title_id}/`, (data_type = "Title Pattern"), @@ -1160,8 +1166,10 @@ function deletePattern( $("#deletePatternModal").on("keydown", function (event) { if (event.keyCode === 13) { // Check if the focused element is the button - if (document.activeElement.id === "deletePatternModal") { - console.log("url", url); + if ( + document.activeElement.id === "deletePatternModal" && + url === currentURLtoDelete + ) { // Simulate a click event on the button $.ajax({ url: url, @@ -1193,7 +1201,7 @@ function deletePattern( if (buttonId === "dontDeletePattern") { $modal = $("#deletePatternModal").modal("hide"); return; - } else if (buttonId === "deletePattern") { + } else if (buttonId === "deletePattern" && url === currentURLtoDelete) { $.ajax({ url: url, type: "DELETE",