Feature: Updated query to include unindexed items in results (files-c…

…ommunity#14415)
marcelwgn · Jan 10, 2024 · 2022300 · 2022300
1 parent 4e6cf66
commit 2022300
Show file tree

Hide file tree

Showing 22 changed files with 8 additions and 179 deletions.
diff --git a/src/Files.App/Actions/Global/SearchUnindexedItemsAction.cs b/src/Files.App/Actions/Global/SearchUnindexedItemsAction.cs
diff --git a/src/Files.App/Data/Commands/CommandCodes.cs b/src/Files.App/Data/Commands/CommandCodes.cs
@@ -14,7 +14,6 @@ public enum CommandCodes
 		ExitCompactOverlay,
 		ToggleCompactOverlay,
 		Search,
-		SearchUnindexedItems,
 		EditPath,
 		Redo,
 		Undo,

diff --git a/src/Files.App/Data/Commands/Manager/CommandManager.cs b/src/Files.App/Data/Commands/Manager/CommandManager.cs
@@ -44,7 +44,6 @@ public IRichCommand this[HotKey hotKey]
 		public IRichCommand ExitCompactOverlay => commands[CommandCodes.ExitCompactOverlay];
 		public IRichCommand ToggleCompactOverlay => commands[CommandCodes.ToggleCompactOverlay];
 		public IRichCommand Search => commands[CommandCodes.Search];
-		public IRichCommand SearchUnindexedItems => commands[CommandCodes.SearchUnindexedItems];
 		public IRichCommand EditPath => commands[CommandCodes.EditPath];
 		public IRichCommand Redo => commands[CommandCodes.Redo];
 		public IRichCommand Undo => commands[CommandCodes.Undo];
@@ -214,7 +213,6 @@ public CommandManager()
 			[CommandCodes.ExitCompactOverlay] = new ExitCompactOverlayAction(),
 			[CommandCodes.ToggleCompactOverlay] = new ToggleCompactOverlayAction(),
 			[CommandCodes.Search] = new SearchAction(),
-			[CommandCodes.SearchUnindexedItems] = new SearchUnindexedItemsAction(),
 			[CommandCodes.EditPath] = new EditPathAction(),
 			[CommandCodes.Redo] = new RedoAction(),
 			[CommandCodes.Undo] = new UndoAction(),

diff --git a/src/Files.App/Data/Commands/Manager/ICommandManager.cs b/src/Files.App/Data/Commands/Manager/ICommandManager.cs
@@ -17,7 +17,6 @@ public interface ICommandManager : IEnumerable<IRichCommand>
 		IRichCommand ExitCompactOverlay { get; }
 		IRichCommand ToggleCompactOverlay { get; }
 		IRichCommand Search { get; }
-		IRichCommand SearchUnindexedItems { get; }
 		IRichCommand EditPath { get; }
 		IRichCommand Redo { get; }
 		IRichCommand Undo { get; }

diff --git a/src/Files.App/Data/Contexts/ContentPage/ContentPageContext.cs b/src/Files.App/Data/Contexts/ContentPage/ContentPageContext.cs
@@ -47,8 +47,6 @@ internal class ContentPageContext : ObservableObject, IContentPageContext
 
 		public bool IsMultiPaneActive => ShellPage is not null && ShellPage.PaneHolder is not null && ShellPage.PaneHolder.IsMultiPaneActive;
 
-		public bool ShowSearchUnindexedItemsMessage => ShellPage is not null && ShellPage.InstanceViewModel.ShowSearchUnindexedItemsMessage;
-
 		public bool IsGitRepository => ShellPage is not null && ShellPage.InstanceViewModel.IsGitRepository;
 
 		public bool CanExecuteGitAction => IsGitRepository && !GitHelpers.IsExecutingGitAction;
@@ -151,9 +149,6 @@ private void InstanceViewModel_PropertyChanged(object? sender, PropertyChangedEv
 				case nameof(CurrentInstanceViewModel.IsPageTypeSearchResults):
 					UpdatePageType();
 					break;
-				case nameof(CurrentInstanceViewModel.ShowSearchUnindexedItemsMessage):
-					OnPropertyChanged(nameof(ShowSearchUnindexedItemsMessage));
-					break;
 				case nameof(CurrentInstanceViewModel.IsGitRepository):
 					OnPropertyChanged(nameof(IsGitRepository));
 					OnPropertyChanged(nameof(CanExecuteGitAction));
@@ -205,7 +200,6 @@ private void Update()
 			OnPropertyChanged(nameof(CanCreateItem));
 			OnPropertyChanged(nameof(IsMultiPaneEnabled));
 			OnPropertyChanged(nameof(IsMultiPaneActive));
-			OnPropertyChanged(nameof(ShowSearchUnindexedItemsMessage));
 			OnPropertyChanged(nameof(IsGitRepository));
 			OnPropertyChanged(nameof(CanExecuteGitAction));
 		}

diff --git a/src/Files.App/Data/Contexts/ContentPage/IContentPageContext.cs b/src/Files.App/Data/Contexts/ContentPage/IContentPageContext.cs
@@ -30,8 +30,6 @@ public interface IContentPageContext : INotifyPropertyChanged
 		bool IsMultiPaneEnabled { get; }
 		bool IsMultiPaneActive { get; }
 
-		bool ShowSearchUnindexedItemsMessage { get; }
-
 		bool IsGitRepository { get; }
 		bool CanExecuteGitAction { get; }
 

diff --git a/src/Files.App/Data/EventArguments/NavigationArguments.cs b/src/Files.App/Data/EventArguments/NavigationArguments.cs
@@ -17,8 +17,6 @@ public class NavigationArguments
 
 		public string? SearchQuery { get; set; } = null;
 
-		public bool SearchUnindexedItems { get; set; } = false;
-
 		public bool IsLayoutSwitch { get; set; } = false;
 
 		public IEnumerable<string>? SelectItems { get; set; }

diff --git a/src/Files.App/Data/Models/CurrentInstanceViewModel.cs b/src/Files.App/Data/Models/CurrentInstanceViewModel.cs
@@ -31,7 +31,6 @@ public bool IsPageTypeSearchResults
 				SetProperty(ref isPageTypeSearchResults, value);
 				OnPropertyChanged(nameof(CanCreateFileInPage));
 				OnPropertyChanged(nameof(CanCopyPathInPage));
-				OnPropertyChanged(nameof(ShowSearchUnindexedItemsMessage));
 			}
 		}
 
@@ -42,24 +41,6 @@ public string CurrentSearchQuery
 			set => SetProperty(ref currentSearchQuery, value);
 		}
 
-		private bool searchedUnindexedItems;
-		public bool SearchedUnindexedItems
-		{
-			get => searchedUnindexedItems;
-			set
-			{
-				if (SetProperty(ref searchedUnindexedItems, value))
-				{
-					OnPropertyChanged(nameof(ShowSearchUnindexedItemsMessage));
-				}
-			}
-		}
-
-		public bool ShowSearchUnindexedItemsMessage
-		{
-			get => !SearchedUnindexedItems && IsPageTypeSearchResults;
-		}
-
 		private bool isPageTypeNotHome = false;
 		public bool IsPageTypeNotHome
 		{

diff --git a/src/Files.App/Services/Settings/GeneralSettingsService.cs b/src/Files.App/Services/Settings/GeneralSettingsService.cs
@@ -13,12 +13,6 @@ public GeneralSettingsService(ISettingsSharingContext settingsSharingContext)
 			RegisterSettingsContext(settingsSharingContext);
 		}
 
-		public bool SearchUnindexedItems
-		{
-			get => Get(false);
-			set => Set(value);
-		}
-
 		public bool OpenSpecificPageOnStartup
 		{
 			get => Get(false);
@@ -267,7 +261,6 @@ protected override void RaiseOnSettingChangedEvent(object sender, SettingChanged
 		{
 			switch (e.SettingName)
 			{
-				case nameof(SearchUnindexedItems):
 				case nameof(OpenSpecificPageOnStartup):
 				case nameof(ContinueLastSessionOnStartUp):
 				case nameof(OpenNewTabOnStartup):

diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
@@ -987,9 +987,6 @@
   <data name="ShowProtectedSystemFiles" xml:space="preserve">
     <value>Show protected system files</value>
   </data>
-  <data name="SettingsSearchUnindexedItems" xml:space="preserve">
-    <value>Include unindexed items in search results</value>
-  </data>
   <data name="SyncFolderPreferencesAcrossDirectories" xml:space="preserve">
     <value>Sync layout and sorting preferences across directories</value>
   </data>
@@ -1281,12 +1278,6 @@
   <data name="PropertyISO" xml:space="preserve">
     <value>ISO speed</value>
   </data>
-  <data name="SearchUnindexedItemsLabel.Text" xml:space="preserve">
-    <value>Didn't find what you're looking for?</value>
-  </data>
-  <data name="SearchUnindexedItemsButton.Content" xml:space="preserve">
-    <value>Search unindexed items</value>
-  </data>
   <data name="ReplaceExisting" xml:space="preserve">
     <value>Replace existing</value>
   </data>
@@ -2968,9 +2959,6 @@
   <data name="ShowCheckboxesWhenSelectingItems" xml:space="preserve">
     <value>Show checkboxes when selecting items</value>
   </data>
-  <data name="SearchUnindexedItemsDescription" xml:space="preserve">
-    <value>Search for unindexed items</value>
-  </data>
   <data name="EditPathDescription" xml:space="preserve">
     <value>Focus path bar</value>
   </data>

diff --git a/src/Files.App/Utils/Storage/Search/FolderSearch.cs b/src/Files.App/Utils/Storage/Search/FolderSearch.cs
@@ -26,7 +26,6 @@ public class FolderSearch
 
 		public uint MaxItemCount { get; set; } = 0; // 0: no limit
 		public uint ThumbnailSize { get; set; } = 24;
-		public bool SearchUnindexedItems { get; set; } = false;
 
 		private uint UsedMaxItemCount => MaxItemCount > 0 ? MaxItemCount : uint.MaxValue;
 
@@ -515,9 +514,7 @@ private QueryOptions ToQueryOptions()
 				UserSearchFilter = AQSQuery ?? string.Empty,
 			};
 
-			query.IndexerOption = SearchUnindexedItems
-				? IndexerOption.DoNotUseIndexer
-				: IndexerOption.OnlyUseIndexerAndOptimizeForIndexedProperties;
+			query.IndexerOption = IndexerOption.UseIndexerWhenAvailable;
 
 			query.SortOrder.Clear();
 			query.SortOrder.Add(new SortEntry { PropertyName = "System.Search.Rank", AscendingOrder = false });

diff --git a/src/Files.App/ViewModels/Settings/GeneralViewModel.cs b/src/Files.App/ViewModels/Settings/GeneralViewModel.cs
@@ -1,7 +1,6 @@
 // Copyright (c) 2023 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
-using Microsoft.Extensions.Logging;
 using System.Collections.Specialized;
 using System.Globalization;
 using Windows.Globalization;
@@ -159,7 +158,7 @@ private void InitStartupSettingsRecentFoldersFlyout()
 				CommandParameter = "Home",
 				Tooltip = "Home".GetLocalizedResource()
 			});
-			recentsItem.Items.Add(new MenuFlyoutItemViewModel("Browse".GetLocalizedResource()) { Command = AddPageCommand });		
+			recentsItem.Items.Add(new MenuFlyoutItemViewModel("Browse".GetLocalizedResource()) { Command = AddPageCommand });
 		}
 
 		private void PagesOnStartupList_CollectionChanged(object sender, NotifyCollectionChangedEventArgs e)
@@ -332,7 +331,7 @@ private FolderPicker InitializeWithWindow(FolderPicker obj)
 
 		private void RemovePage(PageOnStartupViewModel page)
 		{
-				PagesOnStartupList.Remove(page);
+			PagesOnStartupList.Remove(page);
 		}
 
 		private async Task AddPageAsync(string path = null)
@@ -369,20 +368,6 @@ public DateTimeFormats DateTimeFormat
 			}
 		}
 
-		public bool SearchUnindexedItems
-		{
-			get => UserSettingsService.GeneralSettingsService.SearchUnindexedItems;
-			set
-			{
-				if (value != UserSettingsService.GeneralSettingsService.SearchUnindexedItems)
-				{
-					UserSettingsService.GeneralSettingsService.SearchUnindexedItems = value;
-
-					OnPropertyChanged();
-				}
-			}
-		}
-
 		public bool ShowQuickAccessWidget
 		{
 			get => UserSettingsService.GeneralSettingsService.ShowQuickAccessWidget;

diff --git a/src/Files.App/Views/Layouts/BaseLayoutPage.cs b/src/Files.App/Views/Layouts/BaseLayoutPage.cs
@@ -362,7 +362,6 @@ protected virtual void BaseFolderSettings_LayoutModeChangeRequested(object? send
 						IsSearchResultPage = navigationArguments.IsSearchResultPage,
 						SearchPathParam = navigationArguments.SearchPathParam,
 						SearchQuery = navigationArguments.SearchQuery,
-						SearchUnindexedItems = navigationArguments.SearchUnindexedItems,
 						IsLayoutSwitch = true,
 						AssociatedTabInstance = ParentShellPageInstance
 					});
@@ -469,7 +468,6 @@ protected override async void OnNavigatedTo(NavigationEventArgs e)
 						Query = navigationArguments.SearchQuery,
 						Folder = navigationArguments.SearchPathParam,
 						ThumbnailSize = InstanceViewModel!.FolderSettings.GetIconSize(),
-						SearchUnindexedItems = navigationArguments.SearchUnindexedItems
 					};
 
 					_ = ParentShellPageInstance.FilesystemViewModel.SearchAsync(searchInstance);

diff --git a/src/Files.App/Views/Layouts/ColumnsLayoutPage.xaml.cs b/src/Files.App/Views/Layouts/ColumnsLayoutPage.xaml.cs
@@ -119,7 +119,6 @@ protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
 				Column = 0,
 				IsSearchResultPage = navigationArguments.IsSearchResultPage,
 				SearchQuery = navigationArguments.SearchQuery,
-				SearchUnindexedItems = navigationArguments.SearchUnindexedItems,
 				SearchPathParam = navigationArguments.SearchPathParam,
 				NavPathParam = path,
 				SelectItems = path == navigationArguments.NavPathParam ? navigationArguments.SelectItems : null
@@ -392,7 +391,6 @@ public void SetSelectedPathOrNavigate(string navigationPath, Type sourcePageType
 					{
 						columnParam.IsSearchResultPage = navArgs.IsSearchResultPage;
 						columnParam.SearchQuery = navArgs.SearchQuery;
-						columnParam.SearchUnindexedItems = navArgs.SearchUnindexedItems;
 						columnParam.SearchPathParam = navArgs.SearchPathParam;
 					}
 

diff --git a/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml b/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml
@@ -1509,21 +1509,6 @@
 
 		</SemanticZoom>
 
-		<!--  Search Unindexed Items  -->
-		<StackPanel
-			x:Name="SearchUnindexedItemsPanel"
-			HorizontalAlignment="Center"
-			VerticalAlignment="Bottom"
-			x:Load="{x:Bind Commands.SearchUnindexedItems.IsExecutable, Mode=OneWay}"
-			Orientation="Vertical">
-			<TextBlock Text="{helpers:ResourceString Name=SearchUnindexedItemsLabel/Text}" />
-			<HyperlinkButton
-				x:Name="SearchUnindexedItemsButton"
-				HorizontalAlignment="Center"
-				Command="{x:Bind Commands.SearchUnindexedItems}"
-				Content="{x:Bind Commands.SearchUnindexedItems.Label}" />
-		</StackPanel>
-
 		<!--  Selector  -->
 		<Canvas HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
 			<Rectangle

diff --git a/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs b/src/Files.App/Views/Layouts/DetailsLayoutPage.xaml.cs
@@ -843,7 +843,7 @@ private void TagItem_Tapped(object sender, TappedRoutedEventArgs e)
 			if (tagName is null)
 				return;
 
-			ParentShellPageInstance?.SubmitSearch($"tag:{tagName}", false);
+			ParentShellPageInstance?.SubmitSearch($"tag:{tagName}");
 		}
 
 		private void FileTag_PointerEntered(object sender, PointerRoutedEventArgs e)

diff --git a/src/Files.App/Views/Layouts/GridLayoutPage.xaml b/src/Files.App/Views/Layouts/GridLayoutPage.xaml
@@ -654,22 +654,6 @@
 						</GroupStyle>
 					</toolkit:AdaptiveGridView.GroupStyle>
 
-					<!--  Search Unindexed Items  -->
-					<toolkit:AdaptiveGridView.Footer>
-						<StackPanel
-							x:Name="SearchUnindexedItemsPanel"
-							HorizontalAlignment="Stretch"
-							x:Load="{x:Bind Commands.SearchUnindexedItems.IsExecutable, Mode=OneWay}"
-							Orientation="Vertical">
-							<TextBlock HorizontalTextAlignment="Center" Text="{helpers:ResourceString Name=SearchUnindexedItemsLabel/Text}" />
-							<HyperlinkButton
-								x:Name="SearchUnindexedItemsButton"
-								HorizontalAlignment="Center"
-								Command="{x:Bind Commands.SearchUnindexedItems}"
-								Content="{x:Bind Commands.SearchUnindexedItems.Label}" />
-						</StackPanel>
-					</toolkit:AdaptiveGridView.Footer>
-
 					<toolkit:AdaptiveGridView.ItemContainerStyle>
 						<Style BasedOn="{StaticResource DefaultGridViewItemStyle}" TargetType="GridViewItem">
 							<Setter Property="HorizontalContentAlignment" Value="Stretch" />

diff --git a/src/Files.App/Views/Settings/GeneralPage.xaml b/src/Files.App/Views/Settings/GeneralPage.xaml
@@ -92,17 +92,6 @@
 				</ComboBox>
 			</local:SettingsBlockControl>
 
-			<!--  Search settings  -->
-			<local:SettingsBlockControl Title="{helpers:ResourceString Name=SettingsSearchUnindexedItems}" HorizontalAlignment="Stretch">
-				<local:SettingsBlockControl.Icon>
-					<FontIcon Glyph="&#xE721;" />
-				</local:SettingsBlockControl.Icon>
-				<ToggleSwitch
-					AutomationProperties.Name="{helpers:ResourceString Name=SettingsSearchUnindexedItems}"
-					IsOn="{x:Bind ViewModel.SearchUnindexedItems, Mode=TwoWay}"
-					Style="{StaticResource RightAlignedToggleSwitchStyle}" />
-			</local:SettingsBlockControl>
-
 			<!--  Startup settings  -->
 			<local:SettingsBlockControl Title="{helpers:ResourceString Name=StartupSettings}" HorizontalAlignment="Stretch">
 				<local:SettingsBlockControl.Icon>