From ee12986fef895d703652e8ab3e20672308fac035 Mon Sep 17 00:00:00 2001
From: LD-Reborn <lucretia.dietz@gmx.de>
Date: Mon, 22 Dec 2025 14:22:16 +0100
Subject: [PATCH] Added query deleting

---
 .../Controllers/SearchdomainController.cs     | 29 +++++++
 src/Server/Views/Home/Index.cshtml            | 76 +++++++++++++++++--
 src/Shared/Models/SearchdomainResults.cs      |  9 +++
 3 files changed, 109 insertions(+), 5 deletions(-)

diff --git a/src/Server/Controllers/SearchdomainController.cs b/src/Server/Controllers/SearchdomainController.cs
index 6d75dbf..20f0f2e 100644
--- a/src/Server/Controllers/SearchdomainController.cs
+++ b/src/Server/Controllers/SearchdomainController.cs
@@ -1,5 +1,6 @@
 using System.Text.Json;
 using ElmahCore;
+using Microsoft.AspNetCore.Http.HttpResults;
 using Microsoft.AspNetCore.Mvc;
 using Server.Exceptions;
 using Server.Helper;
@@ -156,6 +157,34 @@ public class SearchdomainController : ControllerBase
         return Ok(new SearchdomainSearchesResults() { Searches = searchCache, Success = true });
     }
 
+    [HttpDelete("Searches")]
+    public ActionResult<SearchdomainDeleteSearchResult> DeleteSearch(string searchdomain, string query)
+    {
+        Searchdomain searchdomain_;
+        try
+        {
+            searchdomain_ = _domainManager.GetSearchdomain(searchdomain);
+        }
+        catch (SearchdomainNotFoundException)
+        {
+            _logger.LogError("Unable to retrieve the searchdomain {searchdomain} - it likely does not exist yet", [searchdomain]);
+            return Ok(new SearchdomainDeleteSearchResult() { Success = false, Message = "Searchdomain not found" });
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError("Unable to retrieve the searchdomain {searchdomain} - {ex.Message} - {ex.StackTrace}", [searchdomain, ex.Message, ex.StackTrace]);
+            return Ok(new SearchdomainDeleteSearchResult() { Success = false, Message = ex.Message });
+        }
+        Dictionary<string, DateTimedSearchResult> searchCache = searchdomain_.searchCache;
+        bool containsKey = searchCache.ContainsKey(query);
+        if (containsKey)
+        {
+            searchCache.Remove(query);
+            return Ok(new SearchdomainDeleteSearchResult() {Success = true});
+        }
+        return Ok(new SearchdomainDeleteSearchResult() {Success = false, Message = "Query not found in search cache"});
+    }
+
     [HttpGet("GetSettings")]
     public ActionResult<SearchdomainSettingsResults> GetSettings(string searchdomain)
     {
diff --git a/src/Server/Views/Home/Index.cshtml b/src/Server/Views/Home/Index.cshtml
index 7848b8b..240cd0e 100644
--- a/src/Server/Views/Home/Index.cshtml
+++ b/src/Server/Views/Home/Index.cshtml
@@ -502,6 +502,33 @@
   </div>
 </div>
 
+<!-- Delete query Modal -->
+<div class="modal fade" id="deleteQueryModal" tabindex="-1" aria-hidden="true">
+  <div class="modal-dialog modal-m modal-dialog-scrollable">
+    <div class="modal-content">
+
+      <div class="modal-header bg-danger text-white">
+        <h2 class="modal-title" id="deleteQueryTitle">@T["Delete query"]</h2>
+        <button type="button" class="btn-close" data-bs-dismiss="modal"></button>
+      </div>
+
+      <div class="modal-body">
+        <p>@Html.Raw(T["GenericDeleteConfirmation", "deleteQueryConfirmationModalName"])</p>
+      </div>
+
+      <div class="modal-footer">
+        <button type="button" id="queryConfirmDelete" class="btn btn-danger" data-bs-dismiss="modal">
+          @T["Delete"]
+        </button>
+        <button type="button" class="btn btn-secondary" data-bs-dismiss="modal">
+          @T["Close"]
+        </button>
+      </div>
+
+    </div>
+  </div>
+</div>
+
 <script>
     var domains = JSON.parse('@Html.Raw(System.Text.Json.JsonSerializer.Serialize(domains))');
     var probMethods = JSON.parse('@Html.Raw(System.Text.Json.JsonSerializer.Serialize(probMethods))');
@@ -763,6 +790,30 @@
                 });
 
             });
+        document
+            .getElementById('queryConfirmDelete')
+            .addEventListener('click', () => {
+                let searchdomain = domains[getSelectedDomainKey()];
+                let query = document.getElementById('deleteQueryConfirmationModalName').textContent;
+                fetch(`/Searchdomain/Searches?searchdomain=${searchdomain}&query=${query}`, {
+                    method: 'DELETE',
+                    headers: {
+                        'Content-Type': 'application/json'
+                    }
+                }).then(async response => {
+                    result = await response.json();
+                    if (response.ok && result.Success) {
+                        // TODO add toast
+                        console.log('Search query was deleted successfully');
+                        selectDomain(getSelectedDomainKey());
+                    } else {
+                        // TODO add toast
+                        console.error('Failed to delete query:', result.Message);
+                    }
+                }).catch(error => {
+                    console.error('Error creating entity:', error);
+                });
+            });
     });
 
     function deleteSearchdomain(domainKey) {
@@ -1054,14 +1105,29 @@
                 row.appendChild(nameCell);
 
                 const actionCell = document.createElement('td');
-                const btn = document.createElement('button');
-                btn.className = 'btn btn-sm btn-info';
-                btn.textContent = '@T["Details"]';
-                btn.addEventListener('click', () => {
+                actionCell.classList.add('btn-group');
+                const btnDetails = document.createElement('button');
+                btnDetails.className = 'btn btn-sm btn-info';
+                btnDetails.textContent = '@T["Details"]';
+                btnDetails.addEventListener('click', () => {
                     showQueryDetails(query);
                 });
+                const btnDelete = document.createElement('button');
+                btnDelete.className = 'btn btn-sm btn-danger';
+                btnDelete.textContent = '@T["Delete"]';
+                btnDelete.addEventListener('click', () => {
+                    const modal = new bootstrap.Modal(
+                      document.getElementById('deleteQueryModal')
+                    );
+                    modal.show();
+                    let queryConfirmDelete = document.getElementById('queryConfirmDelete');
+                    queryConfirmDelete.setAttribute('data-name', query.Name);
+                    let deleteQueryConfirmationModalName = document.getElementById('deleteQueryConfirmationModalName');
+                    deleteQueryConfirmationModalName.textContent = query.Name;
+                });
 
-                actionCell.appendChild(btn);
+                actionCell.appendChild(btnDetails);
+                actionCell.appendChild(btnDelete);
                 row.appendChild(actionCell);
 
                 tbody.appendChild(row);
diff --git a/src/Shared/Models/SearchdomainResults.cs b/src/Shared/Models/SearchdomainResults.cs
index 92f6990..6866ca4 100644
--- a/src/Shared/Models/SearchdomainResults.cs
+++ b/src/Shared/Models/SearchdomainResults.cs
@@ -55,6 +55,15 @@ public class SearchdomainSearchesResults
     public required Dictionary<string, DateTimedSearchResult> Searches { get; set; }
 }
 
+public class SearchdomainDeleteSearchResult
+{
+    [JsonPropertyName("Success")]
+    public required bool Success { get; set; }
+
+    [JsonPropertyName("Message")]
+    public string? Message { get; set; }    
+}
+
 public class SearchdomainSettingsResults
 {
     [JsonPropertyName("Success")]