Feature: Update the Drives Widget & Tags Widget when refreshing the Home Page (#16732)

ferrariofilippo · web-flow · commit d079525d395d · 2025-01-29T17:08:33.000-05:00
diff --git a/src/Files.App/Data/Contracts/IAddressToolbarViewModel.cs b/src/Files.App/Data/Contracts/IAddressToolbarViewModel.cs
@@ -40,8 +40,6 @@ public interface IAddressToolbarViewModel
 
 		public event ItemDraggedOverPathItemEventHandler ItemDraggedOverPathItem;
 
-		public event EventHandler RefreshRequested;
-
 		public event EventHandler RefreshWidgetsRequested;
 
 		public void SwitchSearchBoxVisibility();
diff --git a/src/Files.App/Data/Items/WidgetFileTagsContainerItem.cs b/src/Files.App/Data/Items/WidgetFileTagsContainerItem.cs
@@ -21,6 +21,8 @@ public sealed partial class WidgetFileTagsContainerItem : ObservableObject, IAsy
 
 		public ObservableCollection<WidgetFileTagCardItem> Tags { get; }
 
+		public string Uid => _tagUid;
+
 		private string? _Color;
 		public string? Color
 		{
diff --git a/src/Files.App/ViewModels/HomeViewModel.cs b/src/Files.App/ViewModels/HomeViewModel.cs
@@ -115,6 +115,11 @@ public void RefreshWidgetList()
 			ReloadWidgets();
 		}
 
+		public Task RefreshWidgetProperties()
+		{
+			return Task.WhenAll(WidgetItems.Select(w => w.WidgetItemModel.RefreshWidgetAsync()));
+		}
+
 		private bool InsertWidget(WidgetContainerItem widgetModel, int atIndex)
 		{
 			// The widget must not be null and must implement IWidgetItemModel
diff --git a/src/Files.App/ViewModels/UserControls/AddressToolbarViewModel.cs b/src/Files.App/ViewModels/UserControls/AddressToolbarViewModel.cs
@@ -58,8 +58,6 @@ public sealed class AddressToolbarViewModel : ObservableObject, IAddressToolbarV
 
 		public event PathBoxItemDroppedEventHandler? PathBoxItemDropped;
 
-		public event EventHandler? RefreshRequested;
-
 		public event EventHandler? RefreshWidgetsRequested;
 
 		public ObservableCollection<PathBoxItem> PathComponents { get; } = [];
@@ -201,8 +199,6 @@ public Style LayoutThemedIcon
 
 		public AddressToolbarViewModel()
 		{
-			RefreshClickCommand = new RelayCommand<RoutedEventArgs>(e => RefreshRequested?.Invoke(this, EventArgs.Empty));
-
 			dispatcherQueue = DispatcherQueue.GetForCurrentThread();
 			dragOverTimer = dispatcherQueue.CreateTimer();
 
@@ -230,11 +226,6 @@ private async void UpdateService_OnPropertyChanged(object? sender, PropertyChang
 			IsUpdating = UpdateService.IsUpdating;
 		}
 
-		public void RefreshWidgets()
-		{
-			RefreshWidgetsRequested?.Invoke(this, EventArgs.Empty);
-		}
-
 		private void UserSettingsService_OnSettingChangedEvent(object? sender, SettingChangedEventArgs e)
 		{
 			switch (e.SettingName)
@@ -449,8 +440,6 @@ public string PathControlDisplayText
 			set => SetProperty(ref pathControlDisplayText, value);
 		}
 
-		public ICommand RefreshClickCommand { get; }
-
 		public void PathItemSeparator_DataContextChanged(FrameworkElement sender, DataContextChangedEventArgs args)
 		{
 			var pathSeparatorIcon = sender as FontIcon;
diff --git a/src/Files.App/ViewModels/UserControls/Widgets/BaseWidgetViewModel.cs b/src/Files.App/ViewModels/UserControls/Widgets/BaseWidgetViewModel.cs
@@ -24,6 +24,7 @@ public abstract class BaseWidgetViewModel : ObservableObject
 		protected IHomePageContext HomePageContext { get; } = Ioc.Default.GetRequiredService<IHomePageContext>();
 		protected IContentPageContext ContentPageContext { get; } = Ioc.Default.GetRequiredService<IContentPageContext>();
 		protected IFileTagsService FileTagsService { get; } = Ioc.Default.GetRequiredService<IFileTagsService>();
+		protected IFileTagsSettingsService FileTagsSettingsService { get; } = Ioc.Default.GetRequiredService<IFileTagsSettingsService>();
 		protected DrivesViewModel DrivesViewModel { get; } = Ioc.Default.GetRequiredService<DrivesViewModel>();
 		protected INetworkService NetworkService { get; } = Ioc.Default.GetRequiredService<INetworkService>();
 		protected ICommandManager CommandManager { get; } = Ioc.Default.GetRequiredService<ICommandManager>();
diff --git a/src/Files.App/ViewModels/UserControls/Widgets/FileTagsWidgetViewModel.cs b/src/Files.App/ViewModels/UserControls/Widgets/FileTagsWidgetViewModel.cs
@@ -12,6 +12,8 @@ namespace Files.App.ViewModels.UserControls.Widgets
 	/// </summary>
 	public sealed partial class FileTagsWidgetViewModel : BaseWidgetViewModel, IWidgetViewModel
 	{
+		private CancellationTokenSource _updateCTS;
+
 		// Properties
 
 		public ObservableCollection<WidgetFileTagsContainerItem> Containers { get; } = [];
@@ -34,6 +36,8 @@ public FileTagsWidgetViewModel()
 		{
 			_ = InitializeWidget();
 
+			FileTagsSettingsService.OnTagsUpdated += FileTagsSettingsService_OnTagsUpdated;
+
 			PinToSidebarCommand = new AsyncRelayCommand<WidgetCardItem>(ExecutePinToSidebarCommand);
 			UnpinFromSidebarCommand = new AsyncRelayCommand<WidgetCardItem>(ExecuteUnpinFromSidebarCommand);
 			OpenFileLocationCommand = new RelayCommand<WidgetCardItem>(ExecuteOpenFileLocationCommand);
@@ -46,20 +50,44 @@ public async Task InitializeWidget()
 		{
 			await foreach (var item in FileTagsService.GetTagsAsync())
 			{
-				var container = new WidgetFileTagsContainerItem(item.Uid)
-				{
-					Name = item.Name,
-					Color = item.Color
-				};
+				CreateTagContainerItem(item);
+			}
+		}
+
+		public async Task RefreshWidgetAsync()
+		{
+			_updateCTS?.Cancel();
+			_updateCTS = new CancellationTokenSource();
+			await foreach (var item in FileTagsService.GetTagsAsync())
+			{
+				if (_updateCTS.IsCancellationRequested)
+					break;
 
-				Containers.Add(container);
-				_ = container.InitAsync();
+				var matchingItem = Containers.First(c => c.Uid == item.Uid);
+				if (matchingItem is null)
+				{
+					CreateTagContainerItem(item);
+				}
+				else
+				{
+					matchingItem.Name = item.Name;
+					matchingItem.Color = item.Color;
+					matchingItem.Tags.Clear();
+					_ = matchingItem.InitAsync(_updateCTS.Token);
+				}
 			}
 		}
 
-		public Task RefreshWidgetAsync()
+		private void CreateTagContainerItem(TagViewModel tag)
 		{
-			return Task.CompletedTask;
+			var container = new WidgetFileTagsContainerItem(tag.Uid)
+			{
+				Name = tag.Name,
+				Color = tag.Color
+			};
+
+			Containers.Add(container);
+			_ = container.InitAsync();
 		}
 
 		public override List<ContextMenuFlyoutItemViewModel> GetItemMenuItems(WidgetCardItem item, bool isPinned, bool isFolder = false)
@@ -189,10 +217,16 @@ private void ExecuteOpenFileLocationCommand(WidgetCardItem? item)
 				});
 		}
 
+		private async void FileTagsSettingsService_OnTagsUpdated(object? sender, EventArgs e)
+		{
+			await RefreshWidgetAsync();
+		}
+
 		// Disposer
 
 		public void Dispose()
 		{
+			FileTagsSettingsService.OnTagsUpdated -= FileTagsSettingsService_OnTagsUpdated;
 		}
 	}
 }
diff --git a/src/Files.App/Views/HomePage.xaml.cs b/src/Files.App/Views/HomePage.xaml.cs
@@ -47,9 +47,6 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)
 			AppInstance.ToolbarViewModel.CanGoForward = AppInstance.CanNavigateForward;
 			AppInstance.ToolbarViewModel.CanNavigateToParent = false;
 
-			AppInstance.ToolbarViewModel.RefreshRequested -= ToolbarViewModel_RefreshRequested;
-			AppInstance.ToolbarViewModel.RefreshRequested += ToolbarViewModel_RefreshRequested;
-
 			// Set path of working directory empty
 			await AppInstance.ShellViewModel.SetWorkingDirectoryAsync("Home");
 			AppInstance.ShellViewModel.CheckForBackgroundImage();
@@ -74,6 +71,8 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)
 
 			AppInstance.ToolbarViewModel.PathComponents.Add(item);
 
+			await ViewModel.RefreshWidgetProperties();
+
 			base.OnNavigatedTo(e);
 		}
 
@@ -82,20 +81,10 @@ protected override void OnNavigatedFrom(NavigationEventArgs e)
 			Dispose();
 		}
 
-		private async void ToolbarViewModel_RefreshRequested(object? sender, EventArgs e)
-		{
-			AppInstance.ToolbarViewModel.CanRefresh = false;
-
-			await Task.WhenAll(ViewModel.WidgetItems.Select(w => w.WidgetItemModel.RefreshWidgetAsync()));
-
-			AppInstance.ToolbarViewModel.CanRefresh = true;
-		}
-
 		// Disposer
 
 		public void Dispose()
 		{
-			AppInstance.ToolbarViewModel.RefreshRequested -= ToolbarViewModel_RefreshRequested;
 			ViewModel?.Dispose();
 		}
 	}
diff --git a/src/Files.App/Views/Shells/BaseShellPage.cs b/src/Files.App/Views/Shells/BaseShellPage.cs
@@ -185,7 +185,6 @@ public BaseShellPage(CurrentInstanceViewModel instanceViewModel)
 			ToolbarViewModel.AddressBarTextEntered += ShellPage_AddressBarTextEntered;
 			ToolbarViewModel.PathBoxItemDropped += ShellPage_PathBoxItemDropped;
 
-			ToolbarViewModel.RefreshRequested += ShellPage_RefreshRequested;
 			ToolbarViewModel.EditModeEnabled += NavigationToolbar_EditModeEnabled;
 			ToolbarViewModel.ItemDraggedOverPathItem += ShellPage_NavigationRequested;
 			ToolbarViewModel.PathBoxQuerySubmitted += NavigationToolbar_QuerySubmitted;
@@ -379,11 +378,6 @@ protected async void ShellPage_TextChanged(ISearchBoxViewModel sender, SearchBox
 			}
 		}
 
-		protected async void ShellPage_RefreshRequested(object sender, EventArgs e)
-		{
-			await Refresh_Click();
-		}
-
 		protected void AppSettings_SortDirectionPreferenceUpdated(object sender, SortDirection e)
 		{
 			ShellViewModel?.UpdateSortDirectionStatusAsync();
@@ -562,6 +556,12 @@ public async Task Refresh_Click()
 				ToolbarViewModel.CanRefresh = false;
 				ShellViewModel?.RefreshItems(null);
 			}
+			else if (ItemDisplay.Content is HomePage homePage)
+			{
+				ToolbarViewModel.CanRefresh = false;
+				await homePage.ViewModel.RefreshWidgetProperties();
+				ToolbarViewModel.CanRefresh = true;
+			}
 		}
 
 		public virtual void Back_Click()
@@ -831,7 +831,6 @@ public virtual void Dispose()
 			ToolbarViewModel.ToolbarPathItemLoaded -= ShellPage_ToolbarPathItemLoaded;
 			ToolbarViewModel.AddressBarTextEntered -= ShellPage_AddressBarTextEntered;
 			ToolbarViewModel.PathBoxItemDropped -= ShellPage_PathBoxItemDropped;
-			ToolbarViewModel.RefreshRequested -= ShellPage_RefreshRequested;
 			ToolbarViewModel.EditModeEnabled -= NavigationToolbar_EditModeEnabled;
 			ToolbarViewModel.ItemDraggedOverPathItem -= ShellPage_NavigationRequested;
 			ToolbarViewModel.PathBoxQuerySubmitted -= NavigationToolbar_QuerySubmitted;

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@ public sealed partial class WidgetFileTagsContainerItem : ObservableObject, IAsy`
`21`	`21`
`22`	`22`	`public ObservableCollection<WidgetFileTagCardItem> Tags { get; }`
`23`	`23`
	`24`	`+ public string Uid => _tagUid;`
	`25`	`+`
`24`	`26`	`private string? _Color;`
`25`	`27`	`public string? Color`
`26`	`28`	`{`
Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,11 @@ public void RefreshWidgetList()`
`115`	`115`	`ReloadWidgets();`
`116`	`116`	`}`
`117`	`117`
	`118`	`+ public Task RefreshWidgetProperties()`
	`119`	`+ {`
	`120`	`+ return Task.WhenAll(WidgetItems.Select(w => w.WidgetItemModel.RefreshWidgetAsync()));`
	`121`	`+ }`
	`122`	`+`
`118`	`123`	`private bool InsertWidget(WidgetContainerItem widgetModel, int atIndex)`
`119`	`124`	`{`
`120`	`125`	`// The widget must not be null and must implement IWidgetItemModel`
Original file line number	Diff line number	Diff line change
`@@ -58,8 +58,6 @@ public sealed class AddressToolbarViewModel : ObservableObject, IAddressToolbarV`
`58`	`58`
`59`	`59`	`public event PathBoxItemDroppedEventHandler? PathBoxItemDropped;`
`60`	`60`
`61`		`- public event EventHandler? RefreshRequested;`
`62`		`-`
`63`	`61`	`public event EventHandler? RefreshWidgetsRequested;`
`64`	`62`
`65`	`63`	`public ObservableCollection<PathBoxItem> PathComponents { get; } = [];`
`@@ -201,8 +199,6 @@ public Style LayoutThemedIcon`
`201`	`199`
`202`	`200`	`public AddressToolbarViewModel()`
`203`	`201`	`{`
`204`		`- RefreshClickCommand = new RelayCommand<RoutedEventArgs>(e => RefreshRequested?.Invoke(this, EventArgs.Empty));`
`205`		`-`
`206`	`202`	`dispatcherQueue = DispatcherQueue.GetForCurrentThread();`
`207`	`203`	`dragOverTimer = dispatcherQueue.CreateTimer();`
`208`	`204`
`@@ -230,11 +226,6 @@ private async void UpdateService_OnPropertyChanged(object? sender, PropertyChang`
`230`	`226`	`IsUpdating = UpdateService.IsUpdating;`
`231`	`227`	`}`
`232`	`228`
`233`		`- public void RefreshWidgets()`
`234`		`- {`
`235`		`- RefreshWidgetsRequested?.Invoke(this, EventArgs.Empty);`
`236`		`- }`
`237`		`-`
`238`	`229`	`private void UserSettingsService_OnSettingChangedEvent(object? sender, SettingChangedEventArgs e)`
`239`	`230`	`{`
`240`	`231`	`switch (e.SettingName)`
`@@ -449,8 +440,6 @@ public string PathControlDisplayText`
`449`	`440`	`set => SetProperty(ref pathControlDisplayText, value);`
`450`	`441`	`}`
`451`	`442`
`452`		`- public ICommand RefreshClickCommand { get; }`
`453`		`-`
`454`	`443`	`public void PathItemSeparator_DataContextChanged(FrameworkElement sender, DataContextChangedEventArgs args)`
`455`	`444`	`{`
`456`	`445`	`var pathSeparatorIcon = sender as FontIcon;`