Merge branch 'main' into 87-refactor-reporting-service

christiannagel · web-flow · commit c67ca9893845 · 2023-05-05T07:56:29.000+02:00
diff --git a/src/clients/xaml/CodeBreaker.ViewModels/CodeBreaker.ViewModels.csproj b/src/clients/xaml/CodeBreaker.ViewModels/CodeBreaker.ViewModels.csproj
@@ -17,8 +17,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CNInnovation.Codebreaker.Services" Version="2.0.1-beta.1.6" />
-    <PackageReference Include="CNInnovation.Codebreaker.Shared" Version="2.0.1-beta.1.6" />
+    <PackageReference Include="CNInnovation.Codebreaker.Services" Version="2.0.1-beta.1.8" />
+    <PackageReference Include="CNInnovation.Codebreaker.Shared" Version="2.0.1-beta.1.9" />
     <PackageReference Include="CommunityToolkit.Mvvm" Version="8.1.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="7.0.1" />
   </ItemGroup>
diff --git a/src/clients/xaml/CodeBreaker.ViewModels/Components/InfoMessageViewModel.cs b/src/clients/xaml/CodeBreaker.ViewModels/Components/InfoMessageViewModel.cs
@@ -12,8 +12,7 @@ public enum InfoMessageSeverity
     Error
 }
 
-[ObservableObject]
-public partial class InfoMessageViewModel
+public partial class InfoMessageViewModel : ObservableObject
 {
     public static InfoMessageViewModel Error(string content)
     {
diff --git a/src/clients/xaml/CodeBreaker.ViewModels/Components/SelectedFieldViewModel.cs b/src/clients/xaml/CodeBreaker.ViewModels/Components/SelectedFieldViewModel.cs
@@ -2,8 +2,7 @@
 
 namespace CodeBreaker.ViewModels;
 
-[ObservableObject]
-public partial class SelectedFieldViewModel
+ public partial class SelectedFieldViewModel : ObservableObject
 {
     [ObservableProperty]
     private string? _value;
diff --git a/src/clients/xaml/CodeBreaker.ViewModels/Pages/AccountPageViewModel.cs b/src/clients/xaml/CodeBreaker.ViewModels/Pages/AccountPageViewModel.cs
@@ -5,8 +5,7 @@
 
 namespace CodeBreaker.ViewModels.Pages;
 
-[ObservableObject]
-public partial class AccountPageViewModel
+public partial class AccountPageViewModel : ObservableObject
 {
     private readonly IAuthService _authService;
 
diff --git a/src/clients/xaml/CodeBreaker.ViewModels/Pages/AuthPageViewModel.cs b/src/clients/xaml/CodeBreaker.ViewModels/Pages/AuthPageViewModel.cs
@@ -8,8 +8,7 @@
 
 namespace CodeBreaker.ViewModels;
 
-[ObservableObject]
-public partial class AuthPageViewModel
+public partial class AuthPageViewModel : ObservableObject
 {
     private readonly IAuthService _authService;
 
diff --git a/src/clients/xaml/CodeBreaker.ViewModels/Pages/GamePageViewModel.cs b/src/clients/xaml/CodeBreaker.ViewModels/Pages/GamePageViewModel.cs
@@ -31,8 +31,7 @@ public class GamePageViewModelOptions
     public bool EnableDialogs { get; set; } = false;
 }
 
-[ObservableObject]
-public partial class GamePageViewModel
+public partial class GamePageViewModel : ObservableObject
 {
     private readonly IGameClient _client;
     private int _moveNumber = 0;
@@ -109,7 +108,7 @@ public GameDto? Game
     [ObservableProperty]
     private bool _isCancelling = false;
 
-    public bool IsNameEnterable => !InProgress && !_isNamePredefined;
+    public bool IsNameEnterable => !InProgress && !IsNamePredefined;
 
     [RelayCommand(AllowConcurrentExecutions = false, FlowExceptionsToTaskScheduler = true)]
     private async Task StartGameAsync()
@@ -119,7 +118,7 @@ private async Task StartGameAsync()
             InitializeValues();
 
             InProgress = true;
-            CreateGameResponse response = await _client.StartGameAsync(_name, "6x4Game");
+            CreateGameResponse response = await _client.StartGameAsync(Name, "6x4Game");
 
             GameStatus = GameMode.Started;
 
diff --git a/src/clients/xaml/CodeBreaker.ViewModels/Pages/LivePageViewModel.cs b/src/clients/xaml/CodeBreaker.ViewModels/Pages/LivePageViewModel.cs
@@ -6,8 +6,7 @@
 
 namespace CodeBreaker.ViewModels;
 
-[ObservableObject]
-public partial class LivePageViewModel
+public partial class LivePageViewModel : ObservableObject
 {
     private readonly LiveClient _liveClient;
 
@@ -30,7 +29,6 @@ public LivePageViewModel(LiveClient liveClient)
 
     public ObservableCollection<GameViewModel> Games { get; private init; } = new();
 
-
     [RelayCommand(AllowConcurrentExecutions = false, FlowExceptionsToTaskScheduler = true, IncludeCancelCommand = true)]
     public async Task StartStreamingAsync(CancellationToken token = default)
     {

Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,7 @@ public enum InfoMessageSeverity`
`12`	`12`	`Error`
`13`	`13`	`}`
`14`	`14`
`15`		`-[ObservableObject]`
`16`		`-public partial class InfoMessageViewModel`
	`15`	`+public partial class InfoMessageViewModel : ObservableObject`
`17`	`16`	`{`
`18`	`17`	`public static InfoMessageViewModel Error(string content)`
`19`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace CodeBreaker.ViewModels;`
`4`	`4`
`5`		`-[ObservableObject]`
`6`		`-public partial class SelectedFieldViewModel`
	`5`	`+ public partial class SelectedFieldViewModel : ObservableObject`
`7`	`6`	`{`
`8`	`7`	`[ObservableProperty]`
`9`	`8`	`private string? _value;`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace CodeBreaker.ViewModels.Pages;`
`7`	`7`
`8`		`-[ObservableObject]`
`9`		`-public partial class AccountPageViewModel`
	`8`	`+public partial class AccountPageViewModel : ObservableObject`
`10`	`9`	`{`
`11`	`10`	`private readonly IAuthService _authService;`
`12`	`11`
Original file line number	Diff line number	Diff line change
`@@ -8,8 +8,7 @@`
`8`	`8`
`9`	`9`	`namespace CodeBreaker.ViewModels;`
`10`	`10`
`11`		`-[ObservableObject]`
`12`		`-public partial class AuthPageViewModel`
	`11`	`+public partial class AuthPageViewModel : ObservableObject`
`13`	`12`	`{`
`14`	`13`	`private readonly IAuthService _authService;`
`15`	`14`
Original file line number	Diff line number	Diff line change
`@@ -6,8 +6,7 @@`
`6`	`6`
`7`	`7`	`namespace CodeBreaker.ViewModels;`
`8`	`8`
`9`		`-[ObservableObject]`
`10`		`-public partial class LivePageViewModel`
	`9`	`+public partial class LivePageViewModel : ObservableObject`
`11`	`10`	`{`
`12`	`11`	`private readonly LiveClient _liveClient;`
`13`	`12`
`@@ -30,7 +29,6 @@ public LivePageViewModel(LiveClient liveClient)`
`30`	`29`
`31`	`30`	`public ObservableCollection<GameViewModel> Games { get; private init; } = new();`
`32`	`31`
`33`		`-`
`34`	`32`	`[RelayCommand(AllowConcurrentExecutions = false, FlowExceptionsToTaskScheduler = true, IncludeCancelCommand = true)]`
`35`	`33`	`public async Task StartStreamingAsync(CancellationToken token = default)`
`36`	`34`	`{`