From f2f28ef3371f0a929907b39bfafc9c08c40c198c Mon Sep 17 00:00:00 2001 From: Sven <40752681+NeoCoderMatrix86@users.noreply.github.com> Date: Mon, 8 Apr 2024 09:22:17 +0200 Subject: [PATCH] Revert "Error boundary reload link doesnt work" --- .github/workflows/run_unit_tests.yml | 6 ++--- .../AudioCuesheetEditor.csproj | 24 +++++++++---------- .../Resources/Localization/MainLayout/de.json | 6 ++--- .../Resources/Localization/MainLayout/en.json | 6 ++--- AudioCuesheetEditor/Shared/MainLayout.razor | 16 ++++--------- .../AudioCuesheetEditorTests.csproj | 10 ++++---- netlify/build.sh | 4 ++-- 7 files changed, 30 insertions(+), 42 deletions(-) diff --git a/.github/workflows/run_unit_tests.yml b/.github/workflows/run_unit_tests.yml index 0232fc35..e436b851 100644 --- a/.github/workflows/run_unit_tests.yml +++ b/.github/workflows/run_unit_tests.yml @@ -13,14 +13,14 @@ jobs: - uses: actions/checkout@v4.1.2 # sets up .NET - # version can be found here https://dotnet.microsoft.com/en-us/download/dotnet/8.0 + # version can be found here https://dotnet.microsoft.com/en-us/download/dotnet/7.0 - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: '8.0.203' + dotnet-version: '7.0.101' - name: Install wasm-tools - run: dotnet workload install wasm-tools + run: dotnet workload install wasm-tools-net7 # Only publish when unit tests are ok - name: Run Unit Tests diff --git a/AudioCuesheetEditor/AudioCuesheetEditor.csproj b/AudioCuesheetEditor/AudioCuesheetEditor.csproj index 2873eb08..1f86a34b 100644 --- a/AudioCuesheetEditor/AudioCuesheetEditor.csproj +++ b/AudioCuesheetEditor/AudioCuesheetEditor.csproj @@ -1,7 +1,7 @@ - net8.0 + net7.0 true enable enable @@ -96,19 +96,19 @@ - - - - + + + + - + - - - - - - + + + + + + diff --git a/AudioCuesheetEditor/Resources/Localization/MainLayout/de.json b/AudioCuesheetEditor/Resources/Localization/MainLayout/de.json index d1b08919..bec6bc09 100644 --- a/AudioCuesheetEditor/Resources/Localization/MainLayout/de.json +++ b/AudioCuesheetEditor/Resources/Localization/MainLayout/de.json @@ -3,7 +3,7 @@ "translations": { "About": "Über", "An error occured": "Ein Fehler ist aufgetreten!", - "An error has occured in this application. Please report this error with as much details as possible here: https://github.com/NeoCoderMatrix86/AudioCuesheetEditor/issues/new?assignees=&labels=unreviewed+bug&template=bug_report.md&title=.": "Es ist ein Fehler in der Anwendung aufgetreten. Bitte melden Sie diesen Fehler unter Angabe von möglichst vielen Details hier: https://github.com/NeoCoderMatrix86/AudioCuesheetEditor/issues/new?assignees=&labels=unreviewed+bug&template=bug_report.md&title=.", + "An error has occured in this applciation. Please report this error with as much details as possible here. Afterwards you can reload the application.": "Es ist ein Fehler in der Anwendung aufgetreten. Bitte melden Sie diesen Fehler unter Angabe von möglichst vielen Details hier: https://github.com/NeoCoderMatrix86/AudioCuesheetEditor/issues/new?assignees=&labels=unreviewed+bug&template=bug_report.md&title=. Anschließend können Sie die Anwendung neu laden.", "Help": "Hilfe", "Undo last change": "Letzte Änderung Rückgängig machen", "Redo last change": "Letzte Änderung wiederherstellen", @@ -69,8 +69,6 @@ "Length": "Länge", "Flags": "Markierungen", "PreGap": "Vorlücke", - "PostGap": "Nachlücke", - "Error details": "Fehlerdetails", - "Reload application": "Applikation neu laden" + "PostGap": "Nachlücke" } } \ No newline at end of file diff --git a/AudioCuesheetEditor/Resources/Localization/MainLayout/en.json b/AudioCuesheetEditor/Resources/Localization/MainLayout/en.json index c1c490d8..a3788458 100644 --- a/AudioCuesheetEditor/Resources/Localization/MainLayout/en.json +++ b/AudioCuesheetEditor/Resources/Localization/MainLayout/en.json @@ -3,7 +3,7 @@ "translations": { "About": "About", "An error occured": "An error has occured!", - "An error has occured in this application. Please report this error with as much details as possible here: https://github.com/NeoCoderMatrix86/AudioCuesheetEditor/issues/new?assignees=&labels=unreviewed+bug&template=bug_report.md&title=.": "An error has occured in this application. Please report this error with as much details as possible here: https://github.com/NeoCoderMatrix86/AudioCuesheetEditor/issues/new?assignees=&labels=unreviewed+bug&template=bug_report.md&title=.", + "An error has occured in this applciation. Please report this error with as much details as possible here. Afterwards you can reload the application.": "An error has occured in this applciation. Please report this error with as much details as possible here: https://github.com/NeoCoderMatrix86/AudioCuesheetEditor/issues/new?assignees=&labels=unreviewed+bug&template=bug_report.md&title=. Afterwards you can reload the application.", "Help": "Help", "Undo last change": "Undo last change", "Redo last change": "Redo last change", @@ -69,8 +69,6 @@ "Length": "Length", "Flags": "Flags", "PreGap": "Pregap", - "PostGap": "Postgap", - "Error details": "Error details", - "Reload application": "Reload application" + "PostGap": "Postgap" } } \ No newline at end of file diff --git a/AudioCuesheetEditor/Shared/MainLayout.razor b/AudioCuesheetEditor/Shared/MainLayout.razor index 00a6f2b7..7ee97645 100644 --- a/AudioCuesheetEditor/Shared/MainLayout.razor +++ b/AudioCuesheetEditor/Shared/MainLayout.razor @@ -170,11 +170,8 @@ along with Foobar. If not, see - @_localizer["An error occured"] - @((MarkupString)_localizer["An error has occured in this application. Please report this error with as much details as possible here: https://github.com/NeoCoderMatrix86/AudioCuesheetEditor/issues/new?assignees=&labels=unreviewed+bug&template=bug_report.md&title=."]) - @_localizer["Error details"] - @context - + @_localizer["An error occured"] + @((MarkupString)_localizer["An error has occured in this applciation. Please report this error with as much details as possible here. Afterwards you can reload the application."]) @@ -563,7 +560,8 @@ along with Foobar. If not, see { _logger.LogInformation("restartApplicationDelegate"); modalDialog.Confirmed -= restartApplicationDelegate; - await ReloadApplication(); + await _jsRuntime.InvokeVoidAsync("removeBeforeunload"); + _navigationManager.NavigateTo(_navigationManager.Uri, true); }; modalDialog.Confirmed += restartApplicationDelegate; await modalDialog.ShowModal(); @@ -846,10 +844,4 @@ along with Foobar. If not, see } return Task.CompletedTask; } - - async Task ReloadApplication() - { - await _jsRuntime.InvokeVoidAsync("removeBeforeunload"); - _navigationManager.NavigateTo(_navigationManager.Uri, true); - } } \ No newline at end of file diff --git a/AudioCuesheetEditorTests/AudioCuesheetEditorTests.csproj b/AudioCuesheetEditorTests/AudioCuesheetEditorTests.csproj index 123e9e5e..2df2704d 100644 --- a/AudioCuesheetEditorTests/AudioCuesheetEditorTests.csproj +++ b/AudioCuesheetEditorTests/AudioCuesheetEditorTests.csproj @@ -1,16 +1,16 @@ - net8.0 + net7.0 enable false - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/netlify/build.sh b/netlify/build.sh index 2d64ae2f..7e646326 100644 --- a/netlify/build.sh +++ b/netlify/build.sh @@ -1,11 +1,11 @@ #!/usr/bin/env bash set -e -## install latest .NET 8.0 release +## install latest .NET 7.0 release pushd /tmp wget https://dotnet.microsoft.com/download/dotnet/scripts/v1/dotnet-install.sh chmod u+x /tmp/dotnet-install.sh -/tmp/dotnet-install.sh --channel 8.0 +/tmp/dotnet-install.sh --channel 7.0 popd ## Install wasm-tools