From 1bf47d8220bb5d5d974b28fa35c84524a8969881 Mon Sep 17 00:00:00 2001 From: LD-Reborn Date: Thu, 18 Dec 2025 22:32:57 +0100 Subject: [PATCH] Made settings a proper checkbox (single setting), fixed other issues regarding settings getting and setting --- .../Controllers/SearchdomainController.cs | 30 ++++++- src/Server/Searchdomain.cs | 18 +++- src/Server/Views/Home/Index.cshtml | 87 ++++++++++++------- src/Server/wwwroot/css/site.css | 6 +- 4 files changed, 106 insertions(+), 35 deletions(-) diff --git a/src/Server/Controllers/SearchdomainController.cs b/src/Server/Controllers/SearchdomainController.cs index 11ca113..f76ecf1 100644 --- a/src/Server/Controllers/SearchdomainController.cs +++ b/src/Server/Controllers/SearchdomainController.cs @@ -1,3 +1,4 @@ +using System.Text.Json; using ElmahCore; using Microsoft.AspNetCore.Mvc; using Server.Exceptions; @@ -98,14 +99,39 @@ public class SearchdomainController : ControllerBase { _logger.LogError("Unable to update searchdomain {searchdomain} - not found", [searchdomain]); return Ok(new SearchdomainUpdateResults() { Success = false, Message = $"Unable to update searchdomain {searchdomain} - not found" }); - } catch (Exception) + } catch (Exception ex) { - _logger.LogError("Unable to update searchdomain {searchdomain}", [searchdomain]); + _logger.LogError("Unable to update searchdomain {searchdomain} - Exception: {ex.Message} - {ex.StackTrace}", [searchdomain, ex.Message, ex.StackTrace]); return Ok(new SearchdomainUpdateResults() { Success = false, Message = $"Unable to update searchdomain {searchdomain}" }); } return Ok(new SearchdomainUpdateResults(){Success = true}); } + [HttpPost("UpdateSettings")] + public ActionResult UpdateSettings(string searchdomain, [FromBody] SearchdomainSettings request) + { + try + { + Searchdomain searchdomain_ = _domainManager.GetSearchdomain(searchdomain); + Dictionary parameters = new() + { + {"settings", JsonSerializer.Serialize(request)}, + {"id", searchdomain_.id} + }; + searchdomain_.helper.ExecuteSQLNonQuery("UPDATE searchdomain set settings = @settings WHERE id = @id", parameters); + searchdomain_.settings = request; + } catch (SearchdomainNotFoundException) + { + _logger.LogError("Unable to update settings for searchdomain {searchdomain} - not found", [searchdomain]); + return Ok(new SearchdomainUpdateResults() { Success = false, Message = $"Unable to update settings for searchdomain {searchdomain} - not found" }); + } catch (Exception ex) + { + _logger.LogError("Unable to update settings for searchdomain {searchdomain} - Exception: {ex.Message} - {ex.StackTrace}", [searchdomain, ex.Message, ex.StackTrace]); + return Ok(new SearchdomainUpdateResults() { Success = false, Message = $"Unable to update settings for searchdomain {searchdomain}" }); + } + return Ok(new SearchdomainUpdateResults(){Success = true}); + } + [HttpGet("GetSearches")] public ActionResult GetSearches(string searchdomain) { diff --git a/src/Server/Searchdomain.cs b/src/Server/Searchdomain.cs index 053f518..019eb79 100644 --- a/src/Server/Searchdomain.cs +++ b/src/Server/Searchdomain.cs @@ -1,5 +1,6 @@ using System.Data; using System.Data.Common; +using System.Text.Json; using ElmahCore.Mvc.Logger; using MySql.Data.MySqlClient; using Server.Helper; @@ -24,7 +25,7 @@ public class Searchdomain public SQLHelper helper; private readonly ILogger _logger; - public Searchdomain(string searchdomain, string connectionString, AIProvider aIProvider, Dictionary> embeddingCache, ILogger logger, string provider = "sqlserver", bool runEmpty = false, SearchdomainSettings searchdomainSettings = new()) + public Searchdomain(string searchdomain, string connectionString, AIProvider aIProvider, Dictionary> embeddingCache, ILogger logger, string provider = "sqlserver", bool runEmpty = false) { _connectionString = connectionString; _provider = provider.ToLower(); @@ -34,10 +35,10 @@ public class Searchdomain this._logger = logger; searchCache = []; entityCache = []; - settings = searchdomainSettings; connection = new MySqlConnection(connectionString); connection.Open(); helper = new SQLHelper(connection, connectionString); + settings = GetSettings(); modelsInUse = []; // To make the compiler shut up - it is set in UpdateSearchDomain() don't worry // yeah, about that... if (!runEmpty) { @@ -231,6 +232,19 @@ public class Searchdomain return this.id; } + public SearchdomainSettings GetSettings() + { + Dictionary parameters = new() + { + ["name"] = searchdomain + }; + DbDataReader reader = helper.ExecuteSQLCommand("SELECT settings from searchdomain WHERE name = @name", parameters); + reader.Read(); + string settingsString = reader.GetString(0); + reader.Close(); + return JsonSerializer.Deserialize(settingsString); + } + public void InvalidateSearchCache() { searchCache = []; diff --git a/src/Server/Views/Home/Index.cshtml b/src/Server/Views/Home/Index.cshtml index d36f9fb..7332a80 100644 --- a/src/Server/Views/Home/Index.cshtml +++ b/src/Server/Views/Home/Index.cshtml @@ -55,16 +55,11 @@
- + +
- +
@@ -149,8 +144,8 @@ - - + + @@ -162,9 +157,9 @@
KeyValue@T["Key"]@T["Value"]
- - - + + + @@ -174,7 +169,7 @@
@@ -194,7 +189,7 @@
-
Access times
+

Access times

    @@ -335,6 +330,13 @@ deleteSearchdomain(domainKey); selectDomain(0); }); + document + .getElementById('searchdomainConfigUpdate') + .addEventListener('click', () => { + const domainKey = getSelectedDomainKey(); + const cacheReconciliation = document.getElementById('searchdomainConfigCacheReconciliation').checked; + updateSearchdomainConfig(domainKey, { CacheReconciliation: cacheReconciliation}); + }); }); function deleteSearchdomain(domainKey) { @@ -367,7 +369,7 @@ // Update sidebar and header name var domainItem = document.getElementById('sidebar_domain_' + domainKey); domainItem.innerText = newName; - document.querySelector('.section-card h4').innerText = newName; + document.querySelector('.section-card h3').innerText = newName; domains[domainKey] = newName; console.log('Searchdomain renamed successfully'); @@ -380,6 +382,27 @@ }); } + function updateSearchdomainConfig(domainKey, newSettings) { + // Implement update logic here + fetch(`/Searchdomain/UpdateSettings?searchdomain=${encodeURIComponent(domains[domainKey])}`, { + method: 'POST', + headers: { + 'Content-Type': 'application/json' + }, + body: JSON.stringify(newSettings) + }).then(response => { + if (response.ok) { + // TODO add toast + console.log('Searchdomain settings updated successfully'); + } else { + // TODO add toast + console.error('Failed to update searchdomain settings'); + } + }).catch(error => { + console.error('Error updating searchdomain settings:', error); + }); + } + function getSelectedDomainKey() { return document.querySelector('.domain-item.active').id.split("_")[2] - 0; } @@ -398,7 +421,10 @@ selectedItem.classList.add('active'); var domainName = domains[domainKey]; - document.querySelector('.section-card h4').innerText = domainName; + document.querySelector('.section-card h3').innerText = domainName; + + let searchdomainConfigPromise = getSearchdomainConfig(getSelectedDomainKey()); + let configElementCacheReconsiliation = document.getElementById('searchdomainConfigCacheReconciliation'); /* ---------- ENTITIES ---------- */ let entitiesUrl = `/Entity/List?searchdomain=${encodeURIComponent(domainName)}&returnEmbeddings=false`; @@ -436,6 +462,20 @@ console.error('Error fetching queries:', err); hideQueriesLoading(queriesCard); }); + + searchdomainConfigPromise.then(searchdomainConfig => { + if (searchdomainConfig != null && searchdomainConfig.Settings != null) + { + console.log(searchdomainConfig); + configElementCacheReconsiliation.checked = searchdomainConfig.Settings.CacheReconciliation; + configElementCacheReconsiliation.disabled = false; + } else { + //configElement.value = 'Error fetching searchdomain config'; + configElementCacheReconsiliation.disabled = true; + // TODO add toast + console.error('Failed to fetch searchdomain config'); + } + }); } function clearEntitiesTable() { @@ -488,8 +528,6 @@ function populateQueriesTable(filterText = '') { if (!queries) return; - let searchdomainConfigPromise = getSearchdomainConfig(getSelectedDomainKey()); - let configElement = document.getElementById('searchdomainConfig'); const tbody = document.querySelector('#queriesTable tbody'); tbody.innerHTML = ''; @@ -520,17 +558,6 @@ tbody.appendChild(row); }); - searchdomainConfigPromise.then(searchdomainConfig => { - if (searchdomainConfig != null && searchdomainConfig.Settings != null) - { - configElement.value = JSON.stringify(searchdomainConfig.Settings, null, 2); - } else { - configElement.value = 'Error fetching searchdomain config'; - console.log(searchdomainConfig); - // TODO add toast - console.error('Failed to fetch searchdomain config'); - } - }); } diff --git a/src/Server/wwwroot/css/site.css b/src/Server/wwwroot/css/site.css index 44eaade..6d5089c 100644 --- a/src/Server/wwwroot/css/site.css +++ b/src/Server/wwwroot/css/site.css @@ -44,4 +44,8 @@ body { .d-none { display: none; -} \ No newline at end of file +} + +.modal-title { + font-size: 1.25rem; +}
    NameProbMethodSimilarityMethod@T["Name"]@T["ProbMethod"]@T["SimilarityMethod"]