#415 - Force data to show by marshalling to the UI thread (#430)

* #415 - Force data to show by marshalling to the current thread * Update datatype for template * bump app version * bump to 8 * remove thread spawning in loop. Format file
Election-Tech-Initiative · Aug 11, 2023 · 6c5f003 · 6c5f003
1 parent 6f07394
commit 6c5f003
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 33 deletions.
diff --git a/src/electionguard-ui/ElectionGuard.UI/Platforms/Windows/Package.appxmanifest b/src/electionguard-ui/ElectionGuard.UI/Platforms/Windows/Package.appxmanifest
@@ -6,7 +6,7 @@
   xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities"
   IgnorableNamespaces="uap rescap">
 
-  <Identity Name="ElectionGuard.Admin" Publisher="CN=Microsoft" Version="0.0.0.0" />
+  <Identity Name="ElectionGuard.Admin" Publisher="CN=Microsoft" Version="1.91.8.0" />
 
   <mp:PhoneIdentity PhoneProductId="F7E69798-9268-43DC-A51E-3A95FA4992AD" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
@@ -34,6 +34,8 @@
         Square44x44Logo="$placeholder$.png"
         BackgroundColor="transparent">
         <uap:DefaultTile Square71x71Logo="$placeholder$.png" Wide310x150Logo="$placeholder$.png" Square310x310Logo="$placeholder$.png" />
+        <uap:InitialRotationPreference>
+          <uap:Rotation Preference="landscape"/></uap:InitialRotationPreference>
       </uap:VisualElements>
     </Application>
   </Applications>

diff --git a/src/electionguard-ui/ElectionGuard.UI/ViewModels/AdminHomeViewModel.cs b/src/electionguard-ui/ElectionGuard.UI/ViewModels/AdminHomeViewModel.cs
@@ -1,4 +1,5 @@
 using CommunityToolkit.Mvvm.Input;
+using ElectionGuard.UI.Lib.Extensions;
 
 namespace ElectionGuard.UI.ViewModels;
 
@@ -8,6 +9,32 @@ public partial class AdminHomeViewModel : BaseViewModel
     private readonly ElectionService _electionService;
     private readonly MultiTallyService _multiTallyService;
     private readonly TallyService _tallyService;
+
+    [ObservableProperty]
+    private ObservableCollection<Election> _elections = new();
+
+    [ObservableProperty]
+    private ObservableCollection<KeyCeremonyRecord> _keyCeremonies = new();
+
+    [ObservableProperty]
+    [NotifyCanExecuteChangedFor(nameof(CreateElectionCommand))]
+    private bool _hasCompletedKeyCeremonies = false;
+
+    [ObservableProperty]
+    [NotifyCanExecuteChangedFor(nameof(CreateMultipleTalliesCommand))]
+    private bool _canCreateMultiTally = false;
+
+    [ObservableProperty]
+    private ObservableCollection<MultiTallyRecord> _multiTallies = new();
+
+    [ObservableProperty]
+    private Election? _currentElection;
+
+    [ObservableProperty]
+    private KeyCeremonyRecord? _currentKeyCeremony;
+
+    [ObservableProperty]
+    private MultiTallyRecord? _currentMultiTally;
 
     public AdminHomeViewModel(
         IServiceProvider serviceProvider,
@@ -36,19 +63,20 @@ public override async Task OnAppearing()
             HasCompletedKeyCeremonies = keyCeremoniesCompleted > 0;
         }
 
-        var elections = await _electionService.GetAllAsync();
+        var elections = await _electionService.GetAllAsync();
+
         if (elections is not null)
         {
             Elections = new ObservableCollection<Election>(elections);
             CanCreateMultiTally = Elections.Count > 1;
         }
 
-        MultiTallies.Clear();
         var multiTallies = await _multiTallyService.GetAllAsync();
+        var newMultiTallies = new List<MultiTallyRecord>();
         foreach (var multiTally in multiTallies)
         {
             var addMultiTally = false;
-            
+
             // check each tally in the multitally to see if any are not complete / abandoned
             foreach (var (tallyId, _, _) in multiTally.TallyIds)
             {
@@ -60,36 +88,13 @@ public override async Task OnAppearing()
             }
             if (addMultiTally)
             {
-                MultiTallies.Add(multiTally);
+                newMultiTallies.Add(multiTally);
             }
         }
-    }
-
-    [ObservableProperty]
-    private ObservableCollection<Election> _elections = new();
-
-    [ObservableProperty]
-    private ObservableCollection<KeyCeremonyRecord> _keyCeremonies = new();
-
-    [ObservableProperty]
-    [NotifyCanExecuteChangedFor(nameof(CreateElectionCommand))]
-    private bool _hasCompletedKeyCeremonies = false;
-
-    [ObservableProperty]
-    [NotifyCanExecuteChangedFor(nameof(CreateMultipleTalliesCommand))]
-    private bool _canCreateMultiTally = false;
-
-    [ObservableProperty]
-    private ObservableCollection<MultiTallyRecord> _multiTallies = new();
-
-    [ObservableProperty]
-    private Election? _currentElection;
-
-    [ObservableProperty]
-    private KeyCeremonyRecord? _currentKeyCeremony;
 
-    [ObservableProperty]
-    private MultiTallyRecord? _currentMultiTally;
+        MultiTallies.Clear();
+        MultiTallies.AddRange(newMultiTallies);
+    }
 
     partial void OnCurrentMultiTallyChanged(MultiTallyRecord? value)
     {
@@ -123,7 +128,7 @@ public async Task GoKeyCeremony()
         await NavigationService.GoToPage(typeof(CreateKeyCeremonyAdminViewModel));
     }
 
-    [RelayCommand(AllowConcurrentExecutions = true, CanExecute =nameof(HasCompletedKeyCeremonies))]
+    [RelayCommand(AllowConcurrentExecutions = true, CanExecute = nameof(HasCompletedKeyCeremonies))]
     private async Task CreateElection()
     {
         await NavigationService.GoToPage(typeof(CreateElectionViewModel));

diff --git a/src/electionguard-ui/ElectionGuard.UI/Views/AdminHomePage.xaml b/src/electionguard-ui/ElectionGuard.UI/Views/AdminHomePage.xaml
@@ -42,7 +42,7 @@
                     <controls:NoContentView Text="{helper:Translate NoKeyCeremonies}" />
                 </CollectionView.EmptyView>
                 <CollectionView.ItemTemplate>
-                    <DataTemplate x:DataType="model:Election">
+                    <DataTemplate x:DataType="model:KeyCeremonyRecord">
                         <Frame Style="{StaticResource ButtonishFrame}">
                             <Label Style="{StaticResource ButtonishLabel}" Text="{Binding Name}" />
                         </Frame>