Disallow user from adding widgets if the WidgetService isn't started (#…

…3632)
microsoft · Aug 19, 2024 · b8d6537 · b8d6537
1 parent 25c1167
commit b8d6537
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 7 deletions.
diff --git a/tools/Dashboard/DevHome.Dashboard/Services/WidgetHostingService.cs b/tools/Dashboard/DevHome.Dashboard/Services/WidgetHostingService.cs
@@ -131,7 +131,7 @@ public async Task<WidgetCatalog> GetWidgetCatalogAsync()
             }
             catch (Exception ex)
             {
-                _log.Error(ex, "Exception in GetWidgetDefinitionAsync:");
+                _log.Error(ex, "Exception in GetWidgetCatalogAsync:");
                 _widgetCatalog = null;
             }
         }
@@ -161,7 +161,7 @@ public async Task<WidgetProviderDefinition[]> GetProviderDefinitionsAsync()
             }
             catch (Exception ex)
             {
-                _log.Error(ex, "Exception in GetWidgetDefinitionAsync:");
+                _log.Error(ex, "Exception in GetProviderDefinitionsAsync:");
             }
         }
 
@@ -190,7 +190,7 @@ public async Task<WidgetDefinition[]> GetWidgetDefinitionsAsync()
             }
             catch (Exception ex)
             {
-                _log.Error(ex, "Exception in GetWidgetDefinitionAsync:");
+                _log.Error(ex, "Exception in GetWidgetDefinitionsAsync:");
             }
         }
 

diff --git a/tools/Dashboard/DevHome.Dashboard/ViewModels/DashboardViewModel.cs b/tools/Dashboard/DevHome.Dashboard/ViewModels/DashboardViewModel.cs
@@ -25,7 +25,7 @@ public partial class DashboardViewModel : ObservableObject
     private bool _isLoading;
 
     [ObservableProperty]
-    private bool _hasWidgetService;
+    private bool _hasWidgetServiceInitialized;
 
     public DashboardViewModel(
         IWidgetServiceService widgetServiceService,
@@ -43,7 +43,7 @@ public DashboardViewModel(
 
     public Visibility GetNoWidgetMessageVisibility(int widgetCount, bool isLoading)
     {
-        return (widgetCount == 0 && !isLoading && HasWidgetService) ? Visibility.Visible : Visibility.Collapsed;
+        return (widgetCount == 0 && !isLoading && HasWidgetServiceInitialized) ? Visibility.Visible : Visibility.Collapsed;
     }
 
     public bool IsRunningAsAdmin()

diff --git a/tools/Dashboard/DevHome.Dashboard/Views/DashboardView.xaml b/tools/Dashboard/DevHome.Dashboard/Views/DashboardView.xaml
@@ -60,7 +60,7 @@
                     x:Uid="AddWidget"
                     HorizontalAlignment="Right"
                     Command="{x:Bind AddWidgetClickCommand}"
-                    IsEnabled="{x:Bind ViewModel.HasWidgetService, Mode=OneWay}"/>
+                    IsEnabled="{x:Bind ViewModel.HasWidgetServiceInitialized, Mode=OneWay}"/>
             </StackPanel>
         </Grid>
 

diff --git a/tools/Dashboard/DevHome.Dashboard/Views/DashboardView.xaml.cs b/tools/Dashboard/DevHome.Dashboard/Views/DashboardView.xaml.cs
@@ -86,6 +86,7 @@ private async Task<bool> SubscribeToWidgetCatalogEventsAsync()
             var widgetCatalog = await ViewModel.WidgetHostingService.GetWidgetCatalogAsync();
             if (widgetCatalog == null)
             {
+                _log.Error("Error in in SubscribeToWidgetCatalogEvents, widgetCatalog == null");
                 return false;
             }
 
@@ -194,9 +195,10 @@ private async Task InitializeDashboard()
         }
         else if (ViewModel.WidgetServiceService.CheckForWidgetServiceAsync())
         {
-            ViewModel.HasWidgetService = true;
             if (await SubscribeToWidgetCatalogEventsAsync())
             {
+                ViewModel.HasWidgetServiceInitialized = true;
+
                 var isFirstDashboardRun = !(await _localSettingsService.ReadSettingAsync<bool>(WellKnownSettingsKeys.IsNotFirstDashboardRun));
                 _log.Information($"Is first dashboard run = {isFirstDashboardRun}");
                 if (isFirstDashboardRun)