fix: Fix bug that a tag filter can not be removed when the filter is selected and then renamed. fix #390

VShawn · VShawn · commit 32d5a17413a2 · 2023-04-05T09:53:42.000+08:00
diff --git a/Ui/View/ServerList/ServerListPageViewModel.Tag.cs b/Ui/View/ServerList/ServerListPageViewModel.Tag.cs
@@ -24,6 +24,27 @@ public partial class ServerListPageViewModel
         private string _selectedTabName = TAB_ALL_NAME;
         public string SelectedTabName { get => _selectedTabName; private set => SetAndNotifyIfChanged(ref _selectedTabName, value); }
 
+
+        private void OnTagsChanged()
+        {
+            // 当修改了tags后，将无效的tag筛选器移除。
+            var needRemove = new List<string>();
+            var filters = TagFilters.ToList();
+            foreach (var filter in filters)
+            {
+                if (AppData.TagList.All(x => x.Name != filter.TagName))
+                {
+                    needRemove.Add(filter.TagName);
+                }
+            }
+
+            if (!needRemove.Any()) return;
+            foreach (var tag in needRemove)
+            {
+                FilterTagsControl(tag, TagFilter.FilterTagsControlAction.Remove);
+            }
+        }
+
         private List<TagFilter> _tagFilters = new List<TagFilter>();
         public List<TagFilter> TagFilters
         {
@@ -82,11 +103,13 @@ public List<TagFilter> TagFilters
         private void FilterTagsControl(object? o, TagFilter.FilterTagsControlAction action)
         {
             string newTagName;
-            if (o is Tag obj && AppData.TagList.Any(x => x.Name == obj.Name))
+            if (o is Tag obj
+                && (AppData.TagList.Any(x => x.Name == obj.Name) || action == TagFilter.FilterTagsControlAction.Remove))
             {
                 newTagName = obj.Name;
             }
-            else if (o is string str && AppData.TagList.Any(x => x.Name == str))
+            else if (o is string str
+                     && (AppData.TagList.Any(x => x.Name == str) || action == TagFilter.FilterTagsControlAction.Remove))
             {
                 newTagName = str;
             }
diff --git a/Ui/View/ServerList/ServerListPageViewModel.cs b/Ui/View/ServerList/ServerListPageViewModel.cs
@@ -177,6 +177,11 @@ public ServerListPageViewModel(DataSourceService sourceService, GlobalData appDa
             }
 
             RebuildVmServerList();
+            AppData.PropertyChanged += (sender, args) =>
+            {
+                if (args.PropertyName == nameof(AppData.TagList))
+                    OnTagsChanged();
+            };
         }
 
         protected override void OnViewLoaded()

Original file line number	Diff line number	Diff line change
`@@ -177,6 +177,11 @@ public ServerListPageViewModel(DataSourceService sourceService, GlobalData appDa`
`177`	`177`	`}`
`178`	`178`
`179`	`179`	`RebuildVmServerList();`
	`180`	`+ AppData.PropertyChanged += (sender, args) =>`
	`181`	`+ {`
	`182`	`+ if (args.PropertyName == nameof(AppData.TagList))`
	`183`	`+ OnTagsChanged();`
	`184`	`+ };`
`180`	`185`	`}`
`181`	`186`
`182`	`187`	`protected override void OnViewLoaded()`