Skip to content

Refactor logging #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Phil-NHS merged 3 commits into from
Aug 18, 2025
Merged

Refactor logging #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
77dbf5d
feat(cicd): Tidy and version increment check
Phil-NHS Aug 18, 2025
ee0e814
chore(release): 1.10.0-refactor-logging.2 [skip ci]
semantic-release-bot Aug 18, 2025
abefbc6
Merge branch 'master' into refactor-logging
Phil-NHS Aug 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 0 additions & 62 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,62 +0,0 @@
# [1.10.0](https://github.com/TechnologyEnhancedLearning/TELBlazor/compare/v1.9.1...v1.10.0) (2025-08-12)


### Features

* **pr readme:** we're due a version bump i feel ([f8d4314](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/f8d431497cfb5b659a2afdccd501774523a2127f))

# [1.10.0-refactor-logging.1](https://github.com/TechnologyEnhancedLearning/TELBlazor/compare/v1.9.1...v1.10.0-refactor-logging.1) (2025-08-12)


### Features

* **pr readme:** we're due a version bump i feel ([f8d4314](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/f8d431497cfb5b659a2afdccd501774523a2127f))

## [1.9.1](https://github.com/TechnologyEnhancedLearning/TELBlazor/compare/v1.9.0...v1.9.1) (2025-06-25)


### Bug Fixes

* **search:** Improved debounce ([fbc7b0b](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/fbc7b0be762982b8701c24e696133e0dd2facd97))

# [1.9.0](https://github.com/TechnologyEnhancedLearning/TELBlazor/compare/v1.8.0...v1.9.0) (2025-06-25)


### 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)


### 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)


### 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))
* **showcase:** added component readme displayer ([a058fe6](https://github.com/TechnologyEnhancedLearning/TELBlazor/commit/a058fe6f034b5097fb72c9f72a8b98c57ed2b607))
2 changes: 1 addition & 1 deletion ...nalImplementations/Test/TestComponents/SearchExperiment/SearchExperimentServiceOpenApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
{
public class SearchExperimentServiceOpenApi :ISearchExperimentService
{
//qqqq can do alot better
//qqqq very very much just bit of proof of concept.
private readonly HttpClient _httpClient;
private readonly string _baseUrl;
private readonly ILogger<SearchExperimentServiceOpenApi> _logger; // logger
Expand Down Expand Up @@ -53,7 +53,7 @@
var response = await _httpClient.GetFromJsonAsync<SearchResponse>(url);
_logger.LogWarning(JsonSerializer.Serialize(response));
return response?.conceptDocument?.conceptDocumentList?
.Select(x => x.click?.payload?.clickTargetUrl)

Check warning on line 56 in TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/SearchExperimentServiceOpenApi.cs

View workflow job for this annotation

GitHub Actions / Pull Request run CI Checks / Check solution builds as Release 

Argument of type 'IEnumerable<string?>' cannot be used for parameter 'source' of type 'IEnumerable<string>' in 'List<string> Enumerable.ToList<string>(IEnumerable<string> source)' due to differences in the nullability of reference types.
.Where(url => !string.IsNullOrWhiteSpace(url)).DefaultIfEmpty("Soz nout found. ⚠️I'm actually just hitting the suggestion endpoint atm. coz t'uther bokked. ⚠️").ToList<string>()
?? new List<string>() { "Soz nout found. ⚠I'm actually just hitting the suggestion endpoint atm.coz t'uther bokked. ⚠️" };
}
Expand All @@ -66,19 +66,19 @@

private class SearchResponse
{
public ConceptDocument conceptDocument { get; set; }

Check warning on line 69 in TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/SearchExperimentServiceOpenApi.cs

View workflow job for this annotation

GitHub Actions / Pull Request run CI Checks / Check solution builds as Release 

Non-nullable property 'conceptDocument' must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring the property as nullable.
// You could also add resourceDocument or catalogueDocument if needed
}

private class ConceptDocument
{
public List<ConceptItem> conceptDocumentList { get; set; }

Check warning on line 75 in TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/SearchExperimentServiceOpenApi.cs

View workflow job for this annotation

GitHub Actions / Pull Request run CI Checks / Check solution builds as Release 

Non-nullable property 'conceptDocumentList' must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring the property as nullable.
}

private class ConceptItem
{
//public string id { get; set; }
public string title { get; set; }

Check warning on line 81 in TELBlazor.Components/OptionalImplementations/Test/TestComponents/SearchExperiment/SearchExperimentServiceOpenApi.cs

View workflow job for this annotation

GitHub Actions / Pull Request run CI Checks / Check solution builds as Release 

Non-nullable property 'title' must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring the property as nullable.
//public string concept { get; set; }
public Click click { get; set; }
}
Expand Down
13 changes: 4 additions & 9 deletions TELBlazor.Components/TELBlazor.Components.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,13 +59,12 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
</ItemGroup>
<!--qqqq tidy up and comment later-->
<!--Ensure no stale version cs files and that new ones are generated-->
<!--<Delete Files="TELBlazorPackageVersion/VersionInfo.TELBlazor.cs" />
<Delete Files="TELBlazorPackageVersion/VersionInfo.cs" />-->

<!--
Build partial classes for the version info. Compile version into before rest of the project so accessible for razor.
-->
<PropertyGroup>
<!-- Exclude generated files from auto-inclusion to prevent duplicates -->
<!-- Exclude generated files from auto-inclusion to prevent duplicates as we want to control order of compilation-->
<DefaultItemExcludes>$(DefaultItemExcludes);TELBlazorPackageVersion\VersionInfo.*.cs</DefaultItemExcludes>
</PropertyGroup>
<Target Name="PreBuildCleanup" BeforeTargets="GenerateTELBlazorPackageVersion;RunGulp;CoreCompile;BeforeCompile">
Expand All @@ -85,14 +84,10 @@ namespace TELBlazor.Components.TELBlazorPackageVersion
Overwrite="true"
Encoding="UTF-8" />
</Target>
<!-- qqqq was this beforetargets corecompile -->
<Target Name="RunGulp" DependsOnTargets="GenerateTELBlazorPackageVersion" BeforeTargets="CoreCompile;BeforeCompile">
<Exec WorkingDirectory="$(MSBuildProjectDirectory)/.."
Command="npx gulp --cwd &quot;$(MSBuildProjectDirectory)&quot; --gulpfile &quot;$(MSBuildProjectDirectory)/gulpfile.js&quot;" />
</Target>


<!--qqqq i dont think this should be needed-->
<Target Name="CompileVersionInfoBeforeRazor" DependsOnTargets="GenerateTELBlazorPackageVersion;RunGulp;PreBuildCleanup" BeforeTargets="CoreCompile;BeforeCompile">
<ItemGroup>
<Compile Include="TELBlazorPackageVersion\VersionInfo.TELBlazor.cs" />
Expand Down
Loading