Skip to content

Commit ecc5957

Browse files
Merge pull request #477 from NeoCoderMatrix86/407-better-input-for-catalogue-number
Better input for catalogue number
2 parents bdc2467 + 2dabd3f commit ecc5957

7 files changed

Lines changed: 45 additions & 17 deletions

File tree

AudioCuesheetEditor.End2EndTests/AudioCuesheetEditor.End2EndTests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
2020
<PackageReference Include="Microsoft.Playwright.MSTest" Version="1.54.0" />
2121
<PackageReference Include="Microsoft.Testing.Extensions.CodeCoverage" Version="17.14.2" />
22-
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="1.8.0" />
23-
<PackageReference Include="MSTest" Version="3.10.0" />
22+
<PackageReference Include="Microsoft.Testing.Extensions.TrxReport" Version="1.8.3" />
23+
<PackageReference Include="MSTest" Version="3.10.3" />
2424
</ItemGroup>
2525

2626
<ItemGroup>

AudioCuesheetEditor.End2EndTests/Pages/IndexTest.cs

Lines changed: 2 additions & 2 deletions
Large diffs are not rendered by default.

AudioCuesheetEditor.Tests/AudioCuesheetEditor.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<ItemGroup>
1010
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
1111
<PackageReference Include="Moq" Version="4.20.72" />
12-
<PackageReference Include="MSTest.TestAdapter" Version="3.10.0" />
13-
<PackageReference Include="MSTest.TestFramework" Version="3.10.0" />
12+
<PackageReference Include="MSTest.TestAdapter" Version="3.10.3" />
13+
<PackageReference Include="MSTest.TestFramework" Version="3.10.3" />
1414
<PackageReference Include="coverlet.collector" Version="6.0.4">
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

AudioCuesheetEditor/AudioCuesheetEditor.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,16 @@
2222
<ItemGroup>
2323
<PackageReference Include="HtmlSanitizer" Version="9.0.886" />
2424
<PackageReference Include="MetaBrainz.MusicBrainz" Version="6.1.0" />
25-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.7" />
26-
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.7" PrivateAssets="all" />
25+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.8" />
26+
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="9.0.8" PrivateAssets="all" />
2727
<PackageReference Include="BlazorDownloadFile" Version="2.4.0.2" />
2828
<PackageReference Include="Howler.Blazor" Version="0.9.8" />
2929
<PackageReference Include="Markdig" Version="0.41.3" />
30-
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.7" />
31-
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="9.0.7" />
32-
<PackageReference Include="MudBlazor" Version="8.10.0" />
30+
<PackageReference Include="Microsoft.Extensions.Logging" Version="9.0.8" />
31+
<PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="9.0.8" />
32+
<PackageReference Include="MudBlazor" Version="8.11.0" />
3333
<PackageReference Include="Toolbelt.Blazor.HotKeys2" Version="6.0.1" />
34-
<PackageReference Include="z440.atl.core" Version="7.2.0" />
34+
<PackageReference Include="z440.atl.core" Version="7.3.0" />
3535
</ItemGroup>
3636

3737
<ItemGroup>

AudioCuesheetEditor/Shared/BaseLocalizedComponent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
//along with Foobar. If not, see
1515
//<http: //www.gnu.org/licenses />.
1616
using AudioCuesheetEditor.Data.Options;
17-
using AudioCuesheetEditor.Model.Options;
1817
using AudioCuesheetEditor.Services.UI;
1918
using Microsoft.AspNetCore.Components;
2019

@@ -67,6 +66,7 @@ protected virtual void Dispose(bool disposing)
6766
if (disposing)
6867
{
6968
LocalizationService.LocalizationChanged -= LocalizationService_LocalizationChanged;
69+
TraceChangeManager.TracedObjectHistoryChanged -= TraceChangeManager_TracedObjectHistoryChanged;
7070
TraceChangeManager.UndoDone -= TraceChangeManager_UndoDone;
7171
TraceChangeManager.RedoDone -= TraceChangeManager_RedoDone;
7272
}

AudioCuesheetEditor/Shared/Cuesheet/CuesheetData.razor

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ You should have received a copy of the GNU General Public License
1515
along with Foobar. If not, see
1616
<http: //www.gnu.org/licenses />.
1717
-->
18-
1918
@inherits BaseLocalizedComponent
2019

2120
@inject IStringLocalizer<CuesheetData> _localizer
@@ -37,7 +36,9 @@ along with Foobar. If not, see
3736
<FileInput Id="@fileInputAudiofileId" Label="@_localizer["Audiofile"]" FileName="@Cuesheet.Audiofile?.Name" OnFileSelected="OnAudiofileSelected" Error="@fileInputAudiofileErrorText" Filter="@String.Join(",", Audiofile.AudioCodecs.Select(x => x.MimeType))" DisplayDownloadFile
3837
OnDownloadFileClicked="DownloadAudio" OnFileRenameClicked="AudioFileRename" FileRenameDisabled="Cuesheet.Audiofile == null" FileDownloadDisabled="Cuesheet.Audiofile != null ? Cuesheet.Audiofile.IsContentStreamLoaded == false : true" />
3938
<FileInput Label="@_localizer["CD Textfile"]" FileName="@Cuesheet.CDTextfile?.Name" OnFileSelected="OnCDTextfileSelected" Filter="@FileExtensions.CDTextfile" Error="@fileInputCDTextfileErrorText" OnFileRenameClicked="CDTextFileRename" FileRenameDisabled="Cuesheet.CDTextfile == null" />
40-
<MudTextField @bind-Value="Cuesheet.Cataloguenumber" For="(() => Cuesheet.Cataloguenumber)" Validation="_validationService.ValidateProperty" Label="@_localizer["Cataloguenumber"]" Placeholder="@_localizer["Enter the cuesheet catalogue number here"]" Variant="Variant.Outlined" />
39+
<MudTextField @ref="catalogueNumberTextField" @bind-Value="catalogueNumber" For="(() => Cuesheet.Cataloguenumber)" Validation="_validationService.ValidateProperty"
40+
Label="@_localizer["Cataloguenumber"]" Placeholder="@_localizer["Enter the cuesheet catalogue number here"]" Variant="Variant.Outlined"
41+
Mask="@(new PatternMask("00 00000 00000 0"))" OnBlur="CataloguenumberOnBlur" />
4142
break;
4243
}
4344

@@ -62,7 +63,9 @@ along with Foobar. If not, see
6263
string? fileInputAudiofileId;
6364
string? fileInputAudiofileErrorText;
6465
string? fileInputCDTextfileErrorText;
66+
string? catalogueNumber;
6567
MudForm? form;
68+
MudTextField<string>? catalogueNumberTextField;
6669

6770
protected override void OnInitialized()
6871
{
@@ -73,13 +76,17 @@ along with Foobar. If not, see
7376
}
7477
_sessionStateContainer.ImportCuesheetChanged += SessionStateContainer_ImportCuesheetChanged;
7578
_sessionStateContainer.CuesheetChanged += SessionStateContainer_CuesheetChanged;
79+
TraceChangeManager.UndoDone += TraceChangeManager_UndoDone;
80+
TraceChangeManager.RedoDone += TraceChangeManager_RedoDone;
7681
}
7782

7883
protected override void Dispose(bool disposing)
7984
{
8085
base.Dispose(disposing);
8186
_sessionStateContainer.ImportCuesheetChanged -= SessionStateContainer_ImportCuesheetChanged;
8287
_sessionStateContainer.CuesheetChanged -= SessionStateContainer_CuesheetChanged;
88+
TraceChangeManager.UndoDone -= TraceChangeManager_UndoDone;
89+
TraceChangeManager.RedoDone -= TraceChangeManager_RedoDone;
8390
}
8491

8592
protected override void OnParametersSet()
@@ -89,6 +96,7 @@ along with Foobar. If not, see
8996
{
9097
SetAudiofileValidationText();
9198
}
99+
catalogueNumber = Cuesheet?.Cataloguenumber;
92100
}
93101

94102
async Task OnAudiofileSelected(IBrowserFile? browserFile)
@@ -220,4 +228,24 @@ along with Foobar. If not, see
220228
{
221229
StateHasChanged();
222230
}
231+
232+
void CataloguenumberOnBlur()
233+
{
234+
if (Cuesheet != null)
235+
{
236+
Cuesheet.Cataloguenumber = catalogueNumber?.Replace(" ", string.Empty);
237+
}
238+
}
239+
240+
void TraceChangeManager_RedoDone(object? sender, EventArgs e)
241+
{
242+
catalogueNumber = Cuesheet?.Cataloguenumber;
243+
catalogueNumberTextField?.ResetAsync();
244+
}
245+
246+
void TraceChangeManager_UndoDone(object? sender, EventArgs e)
247+
{
248+
catalogueNumber = Cuesheet?.Cataloguenumber;
249+
catalogueNumberTextField?.ResetAsync();
250+
}
223251
}

AudioCuesheetEditor/wwwroot/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico">
1414
<link href="css/app.css" rel="stylesheet" />
1515

16-
<link href="_content/MudBlazor/MudBlazor.min.css" rel="stylesheet" />
16+
<link href="_content/MudBlazor/MudBlazor.min.css?v=1" rel="stylesheet" />
1717

1818
<script src="scripts/howler.core.min.js"></script>
1919
<script src="_content/Howler.Blazor/JsInteropHowl.js"></script>
@@ -57,7 +57,7 @@
5757
<script src="_framework/blazor.webassembly.js"></script>
5858
<script>navigator.serviceWorker.register('service-worker.js');</script>
5959
<script src="scripts/library.js"></script>
60-
<script src="_content/MudBlazor/MudBlazor.min.js"></script>
60+
<script src="_content/MudBlazor/MudBlazor.min.js?v=1"></script>
6161
</body>
6262

6363
</html>

0 commit comments

Comments
 (0)