Hide disabled widgets (#3253)

microsoft · Jun 19, 2024 · b9c628e · b9c628e
1 parent d3203b2
commit b9c628e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/tools/Dashboard/DevHome.Dashboard/Helpers/WidgetHelpers.cs b/tools/Dashboard/DevHome.Dashboard/Helpers/WidgetHelpers.cs
@@ -93,9 +93,9 @@ public static async Task<bool> IsIncludedWidgetProviderAsync(WidgetProviderDefin
         var endOfPfnIndex = providerId.IndexOf('!', StringComparison.Ordinal);
         var familyNamePartOfProviderId = providerId[..endOfPfnIndex];
 
-        // Get the list of packages that contain Dev Home widgets.
+        // Get the list of packages that contain Dev Home widgets and are enabled.
         var extensionService = Application.Current.GetService<IExtensionService>();
-        var enabledWidgetProviderIds = await extensionService.GetInstalledDevHomeWidgetPackageFamilyNamesAsync(true);
+        var enabledWidgetProviderIds = await extensionService.GetInstalledDevHomeWidgetPackageFamilyNamesAsync(includeDisabledExtensions: false);
 
         // Check if the specified widget provider is in the list.
         var include = enabledWidgetProviderIds.ToList().Contains(familyNamePartOfProviderId);

diff --git a/tools/Dashboard/DevHome.Dashboard/Views/DashboardView.xaml b/tools/Dashboard/DevHome.Dashboard/Views/DashboardView.xaml
@@ -67,7 +67,7 @@
         </Grid>
 
         <ScrollViewer VerticalScrollBarVisibility="Auto" Grid.Row="1">
-            <!-- This Grid helps keep the content centered -->
+            <!-- This Grid helps keep the content centered -->
             <Grid>
                 <StackPanel MaxWidth="{ThemeResource MaxPageContentWidth}" Margin="{ThemeResource ContentPageMargin}">
                     <!-- Top Banner - Default/First run experience - shown until user dismissed -->

diff --git a/tools/Dashboard/DevHome.Dashboard/Views/DashboardView.xaml.cs b/tools/Dashboard/DevHome.Dashboard/Views/DashboardView.xaml.cs
@@ -302,7 +302,6 @@ private async Task RestorePinnedWidgetsAsync(ComSafeWidget[] hostWidgets)
                     continue;
                 }
 
-                // Ensure only one copy of a widget is pinned if that widget's definition only allows for one instance.
                 var comSafeWidgetDefinition = new ComSafeWidgetDefinition(widgetDefinitionId);
                 if (!await comSafeWidgetDefinition.PopulateAsync())
                 {
@@ -311,6 +310,14 @@ private async Task RestorePinnedWidgetsAsync(ComSafeWidget[] hostWidgets)
                     continue;
                 }
 
+                // If the widget's extension was disabled, hide the widget (don't add it to the list), but don't delete it.
+                if (!await WidgetHelpers.IsIncludedWidgetProviderAsync(comSafeWidgetDefinition.ProviderDefinition))
+                {
+                    _log.Information($"Not adding widget from disabled extension {comSafeWidgetDefinition.ProviderDefinitionId}");
+                    continue;
+                }
+
+                // Ensure only one copy of a widget is pinned if that widget's definition only allows for one instance.
                 if (comSafeWidgetDefinition.AllowMultiple == false)
                 {
                     if (pinnedSingleInstanceWidgets.Contains(widgetDefinitionId))