diff --git a/CHANGELOG.md b/CHANGELOG.md index c8a4a36..7ea1c9a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,19 @@ # [1.9.0-feat-button-for-cicd-testing.1](https://github.com/TechnologyEnhancedLearning/TELBlazor/compare/v1.8.0...v1.9.0-feat-button-for-cicd-testing.1) (2025-06-25) +### Bug Fixes + +* **search:** Improved debounce ([fbc7b0b](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/fbc7b0be762982b8701c24e696133e0dd2facd97)) + + +### Features + +* **searchexperiment:** in theory ([fee2b91](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/fee2b9124b859f9a548e3fa257d53294ce83dc08)) +* **showcase:** added component readme displayer ([a058fe6](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/a058fe6f034b5097fb72c9f72a8b98c57ed2b607)) + +# [1.9.0-feat-button-for-cicd-testing.1](https://github.com/TechnologyEnhancedLearning/TELBlazor/compare/v1.8.0...v1.9.0-feat-button-for-cicd-testing.1) (2025-06-25) + + ### Features * **searchexperiment:** in theory ([fee2b91](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/fee2b9124b859f9a548e3fa257d53294ce83dc08)) diff --git a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/Program.cs b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/Program.cs index 12807f3..4939927 100644 --- a/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/Program.cs +++ b/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost/TELBlazor.Components.ShowCase.E2ETests.WasmServerHost.Client/Program.cs @@ -68,7 +68,7 @@ builder.Services.AddBlazoredLocalStorage(); //Scoped because being consumed with storage where singleton doesnt survive mvc page teardown - // qqqq do we need it builder.Services.AddScoped(sp => levelSwitch); + builder.Services.AddScoped(sp => levelSwitch); builder.Services.AddScoped(); builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) }); builder.Services.AddTELBlazorComponentServicesForTestComponents(); diff --git a/TELBlazor.Components.ShowCase.Shared/Layouts/ComponentLayouts/ShowCase.razor b/TELBlazor.Components.ShowCase.Shared/Layouts/ComponentLayouts/ShowCase.razor index 6cbdb6e..9e768d1 100644 --- a/TELBlazor.Components.ShowCase.Shared/Layouts/ComponentLayouts/ShowCase.razor +++ b/TELBlazor.Components.ShowCase.Shared/Layouts/ComponentLayouts/ShowCase.razor @@ -27,7 +27,7 @@ @if (ComponentReadMeMarkdownUrl != string.Empty) {
-

ReadMe.Md from Components Folder in the Solution

+

README.md from Components Folder in the Solution

See the file directly
@((MarkupString)ComponentReadMeHtmlContent)
diff --git a/TELBlazor.Components.ShowCase.Shared/Pages/OptionalImplementations/TestComponentPages/SearchExperimentPage.razor b/TELBlazor.Components.ShowCase.Shared/Pages/OptionalImplementations/TestComponentPages/SearchExperimentPage.razor index 2f1c1d4..f9750a1 100644 --- a/TELBlazor.Components.ShowCase.Shared/Pages/OptionalImplementations/TestComponentPages/SearchExperimentPage.razor +++ b/TELBlazor.Components.ShowCase.Shared/Pages/OptionalImplementations/TestComponentPages/SearchExperimentPage.razor @@ -21,5 +21,5 @@ private string NoJSActionUrl = "/nojsformsubmitstubpage"; private List NoJSSearchResults = new List() {"In a nojs browser", " the user would first get a blanks components ", " they then send their data", " the Controller would provide","this static info back", "including original provideds search", "having used the same service", "serverside in its controller"}; private List NoJSSuggestions = new List() {"Unsure if this would work ","it might do but we wouldnt", " want to spam a page reload per button press ", " so maybe there would be different suggestions in nojs" }; - private string ComponentReadMeMarkdownUrl = "https://raw.githubusercontent.com/TechnologyEnhancedLearning/TELBlazor/refs/heads/master/TELBlazor.Components/OptionalImplementations/TestComponents/SearchExperiment/README.md"; + private string ComponentReadMeMarkdownUrl = "https://raw.githubusercontent.com/TechnologyEnhancedLearning/TELBlazor/refs/heads/master/TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/README.md"; } \ No newline at end of file diff --git a/TELBlazor.Components/Core/Compliance/IAccessibleComponent.cs b/TELBlazor.Components/Core/Compliance/IAccessibleComponent.cs index 85379d4..e57df8c 100644 --- a/TELBlazor.Components/Core/Compliance/IAccessibleComponent.cs +++ b/TELBlazor.Components/Core/Compliance/IAccessibleComponent.cs @@ -22,7 +22,7 @@ public interface IAccessibleComponent /// /// The title attribute for the button, shown as a tooltip. ///

😱😱😱😱😱 1st rule of aria don't use aria, second rule of aria ... 😱😱😱😱

- /// qqqq + /// qqqq get feedback :( /// /// /// Use a brief message that reinforces the button's action. diff --git a/TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/DummyData.cs b/TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/DummyData.cs index ac565b4..820d8a6 100644 --- a/TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/DummyData.cs +++ b/TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/DummyData.cs @@ -10,55 +10,55 @@ public static class DummyData { public static readonly List AllTerms = new() { - "Dental care", "Dental hygiene", "Dental implants", "Dental braces", "Dental bleeding", - "Dental crowns", "Dental fillings", "Dental anxiety", "Dental pain", "Dental treatment", - "Dental checkup", "Dental cleaning", "Dental x-ray", "Dental surgery", "Dental emergency", - "Tooth extraction", "Toothache", "Tooth infection", "Tooth decay", "Tooth whitening", - "Gum disease", "Gum bleeding", "Gum recession", "Gum pain", "Gum treatment", - "False teeth", "Dentures", "Dental prosthetics", "Teeth grinding", "Teeth straightening", - "Teeth sensitivity", "Teeth whitening kits", "Wisdom teeth", "Root canal", "Jaw pain", + //"Dental care", "Dental hygiene", "Dental implants", "Dental braces", "Dental bleeding", + //"Dental crowns", "Dental fillings", "Dental anxiety", "Dental pain", "Dental treatment", + //"Dental checkup", "Dental cleaning", "Dental x-ray", "Dental surgery", "Dental emergency", + //"Tooth extraction", "Toothache", "Tooth infection", "Tooth decay", "Tooth whitening", + //"Gum disease", "Gum bleeding", "Gum recession", "Gum pain", "Gum treatment", + //"False teeth", "Dentures", "Dental prosthetics", "Teeth grinding", "Teeth straightening", + //"Teeth sensitivity", "Teeth whitening kits", "Wisdom teeth", "Root canal", "Jaw pain", - "Mouth ulcers", "Mouth guards", "Mouthwash", "Oral hygiene", "Oral pain", "Oral cancer", - "Oral surgery", "Oral examination", "Oral infection", "Bad breath", "Plaque control", + //"Mouth ulcers", "Mouth guards", "Mouthwash", "Oral hygiene", "Oral pain", "Oral cancer", + //"Oral surgery", "Oral examination", "Oral infection", "Bad breath", "Plaque control", - "Medical checkup", "Health checkup", "General examination", "Annual physical", - "Blood test", "Urine test", "X-ray chest", "CT scan", "MRI brain", "Eye examination", - "Vision test", "Hearing test", "Hearing aid fitting", "Skin check", "Skin biopsy", + //"Medical checkup", "Health checkup", "General examination", "Annual physical", + //"Blood test", "Urine test", "X-ray chest", "CT scan", "MRI brain", "Eye examination", + //"Vision test", "Hearing test", "Hearing aid fitting", "Skin check", "Skin biopsy", - "Back pain", "Neck pain", "Joint pain", "Chest pain", "Abdominal pain", - "Leg swelling", "Arm numbness", "Foot infection", "Hand injury", "Hip replacement", + //"Back pain", "Neck pain", "Joint pain", "Chest pain", "Abdominal pain", + //"Leg swelling", "Arm numbness", "Foot infection", "Hand injury", "Hip replacement", - "Heart checkup", "Heart surgery", "Heart failure", "Heart palpitations", "Chest tightness", - "Lung infection", "Pneumonia treatment", "Breathing problems", "Shortness of breath", "Asthma attack", + //"Heart checkup", "Heart surgery", "Heart failure", "Heart palpitations", "Chest tightness", + //"Lung infection", "Pneumonia treatment", "Breathing problems", "Shortness of breath", "Asthma attack", - "Skin rash", "Skin irritation", "Eczema treatment", "Psoriasis care", "Acne treatment", - "Wound dressing", "Burn treatment", "Scar removal", "Skin peeling", "Allergy treatment", + //"Skin rash", "Skin irritation", "Eczema treatment", "Psoriasis care", "Acne treatment", + //"Wound dressing", "Burn treatment", "Scar removal", "Skin peeling", "Allergy treatment", - "Ear infection", "Throat infection", "Sinus infection", "Eye infection", "Nasal bleeding", - "Frequent nosebleeds", "Throat pain", "Swollen lymph nodes", "Ear pain", "Voice loss", + //"Ear infection", "Throat infection", "Sinus infection", "Eye infection", "Nasal bleeding", + //"Frequent nosebleeds", "Throat pain", "Swollen lymph nodes", "Ear pain", "Voice loss", - "Fever symptoms", "High temperature", "Cough treatment", "Cold remedies", "Flu vaccination", - "COVID-19 testing", "COVID-19 symptoms", "Headache relief", "Migraine treatment", "Dizziness causes", + //"Fever symptoms", "High temperature", "Cough treatment", "Cold remedies", "Flu vaccination", + //"COVID-19 testing", "COVID-19 symptoms", "Headache relief", "Migraine treatment", "Dizziness causes", - "Depression treatment", "Anxiety management", "Mental health support", "Counseling services", - "Sleep disorder", "Insomnia treatment", "Panic attacks", "Therapy sessions", "Psychiatric assessment", + //"Depression treatment", "Anxiety management", "Mental health support", "Counseling services", + //"Sleep disorder", "Insomnia treatment", "Panic attacks", "Therapy sessions", "Psychiatric assessment", - "Diabetes checkup", "Blood sugar test", "Insulin treatment", "Weight management", "Obesity care", - "Dietician referral", "Nutrition advice", "Cholesterol test", "Hypertension treatment", "Blood pressure check", + //"Diabetes checkup", "Blood sugar test", "Insulin treatment", "Weight management", "Obesity care", + //"Dietician referral", "Nutrition advice", "Cholesterol test", "Hypertension treatment", "Blood pressure check", - "Cancer screening", "Mammogram exam", "Colon cancer test", "Prostate exam", "Biopsy procedure", - "Tumor removal", "Oncology referral", "Radiation therapy", "Chemotherapy care", "Cancer pain management", + //"Cancer screening", "Mammogram exam", "Colon cancer test", "Prostate exam", "Biopsy procedure", + //"Tumor removal", "Oncology referral", "Radiation therapy", "Chemotherapy care", "Cancer pain management", - "Pregnancy test", "Prenatal checkup", "Fertility consultation", "Birth plan", "Ultrasound scan", - "Labour support", "Midwife appointment", "Postnatal care", "Infant checkup", "Child immunisation", + //"Pregnancy test", "Prenatal checkup", "Fertility consultation", "Birth plan", "Ultrasound scan", + //"Labour support", "Midwife appointment", "Postnatal care", "Infant checkup", "Child immunisation", - "Vaccination record", "Tetanus shot", "Flu jab", "Hepatitis B shot", "Travel vaccines", + //"Vaccination record", "Tetanus shot", "Flu jab", "Hepatitis B shot", "Travel vaccines", - "Infection treatment", "Antibiotic prescription", "Inflammation control", "Immune system check", - "Wound infection", "Blood poisoning", "Sepsis symptoms", "Fungal infection", "Viral infection", "Bacterial infection", + //"Infection treatment", "Antibiotic prescription", "Inflammation control", "Immune system check", + //"Wound infection", "Blood poisoning", "Sepsis symptoms", "Fungal infection", "Viral infection", "Bacterial infection", - "Pain management", "Bleeding control", "Emergency care", "Treatment plan", "Recovery plan", - "Follow-up visit", "Health advice", "Patient education", "Medication review", "Drug interaction" + //"Pain management", "Bleeding control", "Emergency care", "Treatment plan", "Recovery plan", + //"Follow-up visit", "Health advice", "Patient education", "Medication review", "Drug interaction" }; } diff --git a/TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/ReadMe.md b/TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/ReadMe.md index 3d5cb22..3b1c51d 100644 --- a/TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/ReadMe.md +++ b/TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/ReadMe.md @@ -9,4 +9,10 @@ For searching # NoJs The component has parameter for the search button action. On search it will hit the specified controller. -IT receives search information via the same interface so it can be populated in a view. \ No newline at end of file +IT receives search information via the same interface so it can be populated in a view. + +# Future +It currently doesnt use a cancellation token, and doesnt keep a list of suggestion responses. +If it kept the response from the first suggestion list and whittled them down from that list as long +as there are no deletions it would only need to call suggestions once. Assuming suggestions give everything. +if it will make a call per press it needs a cancel token potentially. \ No newline at end of file diff --git a/TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/SearchExperiment.razor b/TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/SearchExperiment.razor index 8d7470d..f0669f0 100644 --- a/TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/SearchExperiment.razor +++ b/TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/SearchExperiment.razor @@ -1,13 +1,5 @@ @using System.Diagnostics - - - - @inherits TELComponentBase - - - @inject NavigationManager NavigationManager @inject ISearchExperimentService searchExperimentService @* @implements IDisposable *@ @@ -17,7 +9,6 @@
- + // Reset timer on every keystroke + _debounceTimer?.Dispose(); + _debounceTimer = null; + _debounceTimer = new Timer(async _ => { + // Invoke on UI thread + Logger.LogInformation($"debounce searchText {searchText}"); + await InvokeAsync(() => GetSuggestionsAsync()); _debounceTimer?.Dispose(); _debounceTimer = null; - }, - null, - _debouncePeriod, - Timeout.InfiniteTimeSpan); + + + }, null, _debouncePeriod, Timeout.InfiniteTimeSpan); } private async Task SendSearchRequest() { - suggestions.Clear(); + //suggestions.Clear(); - _cts?.Cancel(); // cancel prior search - _cts = new CancellationTokenSource(); + // _cts?.Cancel(); // cancel prior search + // _cts = new CancellationTokenSource(); - try - { + // try + // { searchResults = (await searchExperimentService.SearchAsync(searchText)).ToList(); - } - catch (OperationCanceledException) - { - // Ignore cancelled searches - } + await InvokeAsync(StateHasChanged); + // } + // catch (OperationCanceledException) + // { + // // Ignore cancelled searches + // } } private async Task GetSuggestionsAsync() { - _cts?.Cancel(); // cancel prior search - _cts = new CancellationTokenSource(); - - try - { - - suggestions = (await searchExperimentService.GetSuggestionsAsync(searchText)).ToList(); - - } - catch (OperationCanceledException) - { - // Ignore cancelled searches - } + // _cts?.Cancel(); // cancel prior search + // _cts = new CancellationTokenSource(); + + // try + // { + Logger.LogInformation($"GetSuggestionsAsync searchText {searchText}"); + suggestions = (await searchExperimentService.GetSuggestionsAsync(searchText)).ToList(); + await InvokeAsync(StateHasChanged); + // } + // catch (OperationCanceledException) + // { + // // Ignore cancelled searches + // } } - + public async Task HandleInput(KeyboardEventArgs args) { + Logger.LogInformation($"handleinput searchText {searchText}"); if (args.Key == null || args.Key.Equals("Enter")) { - + /*fire forget?*/ + //suggestions.Clear(); await SendSearchRequest(); //_ = SendSearchRequest(); } - else if (_debounceTimer != null || searchText.Length < 4 ) + else if ( searchText.Length < 3 ) { - StartDebounceCountdown(); + + _debounceTimer?.Dispose(); + _debounceTimer = null; + } else { StartDebounceCountdown(); /*fire forget?*/ - await GetSuggestionsAsync(); + //await GetSuggestionsAsync(); // _ = GetSuggestionsAsync(); } } diff --git a/TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/SearchExperimentModels.cs b/TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/SearchExperimentModels.cs deleted file mode 100644 index ca4cdab..0000000 --- a/TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/SearchExperimentModels.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TELBlazor.Components.OptionalImplementations.Test.TestComponents.SearchExperiment -{ - //qqqq no mvp - public class SearchRequest - { - public string SearchTerm { get; set; } = string.Empty; - public int PageIndex { get; set; } = 0; - public int PageSize { get; set; } = 10; - public Dictionary AdditionalParameters { get; set; } = new(); - } - - public class SearchResult - { - public IEnumerable Results { get; set; } = Enumerable.Empty(); - public int TotalCount { get; set; } - public int PageIndex { get; set; } - public int PageSize { get; set; } - public bool HasMore => (PageIndex + 1) * PageSize < TotalCount; - } - - public class SuggestionResult - { - public IEnumerable Suggestions { get; set; } = Enumerable.Empty(); - public int Count { get; set; } - } -} diff --git a/TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/SearchExperimentServiceOpenApi.cs b/TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/SearchExperimentServiceOpenApi.cs index 16d352d..1ffd640 100644 --- a/TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/SearchExperimentServiceOpenApi.cs +++ b/TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/SearchExperimentServiceOpenApi.cs @@ -147,16 +147,16 @@ private class ConceptDocument private class ConceptItem { - public string id { get; set; } + //public string id { get; set; } public string title { get; set; } - public string concept { get; set; } + //public string concept { get; set; } public Click click { get; set; } } private class Click { public Payload payload { get; set; } - public string url { get; set; } + //public string url { get; set; } } private class Payload @@ -164,33 +164,7 @@ private class Payload public string clickTargetUrl { get; set; } } - // // Minimal classes to match the API response shape - // private class SearchResponse - // { - // public ConceptDocument conceptDocument { get; set; } - // } - - // private class ConceptDocument - // { - // public List conceptDocumentList { get; set; } - // } - - // private class ConceptItem - // { - // public string title { get; set; } - // public Click click { get; set; } - // } - - // private class Click - // { - // public Payload payload { get; set; } - // } - - // private class Payload - // { - // public string clickTargetUrl { get; set; } - // } - } - } +} +