Added search suggestions to Omnibar

Author: yaira2

src/Files.App/Data/Contracts/IGeneralSettingsService.cs

@@ -50,6 +50,11 @@ public interface IGeneralSettingsService : IBaseSettingsService, INotifyProperty
 		/// </summary>
 		List<string> PathHistoryList { get; set; }
 
+		/// <summary>
+		/// A list containing previous search queries.
+		/// </summary>
+		List<string> PreviousSearchQueriesList { get; set; }
+
 		/// <summary>
 		/// Gets or sets a value indicating which date and time format to use.
 		/// </summary>

src/Files.App/Services/Settings/GeneralSettingsService.cs

@@ -65,6 +65,12 @@ public List<string> PathHistoryList
 			set => Set(value);
 		}
 
+		public List<string> PreviousSearchQueriesList
+		{
+			get => Get<List<string>>(null);
+			set => Set(value);
+		}
+
 		public DateTimeFormats DateTimeFormat
 		{
 			get => Get(DateTimeFormats.Application);

src/Files.App/Services/Settings/UserSettingsService.cs

@@ -74,6 +74,7 @@ public override object ExportSettings()
 			export.Remove(nameof(GeneralSettingsService.LastSessionTabList));
 			export.Remove(nameof(GeneralSettingsService.LastCrashedTabList));
 			export.Remove(nameof(GeneralSettingsService.PathHistoryList));
+			export.Remove(nameof(GeneralSettingsService.PreviousSearchQueriesList));
 
 			return JsonSettingsSerializer.SerializeToJson(export);
 		}

src/Files.App/UserControls/NavigationToolbar.xaml

@@ -30,6 +30,10 @@
 			<converters:NullToVisibilityCollapsedConverter x:Key="NullToVisibilityCollapsedConverter" />
 			<converters1:BoolNegationConverter x:Key="BoolNegationConverter" />
 			<converters:VisibilityInvertConverter x:Key="VisibilityInvertConverter" />
+			<converters1:BoolToObjectConverter
+				x:Key="SearchSuggestionGlyphConverter"
+				FalseValue="&#xE7C3;"
+				TrueValue="&#xE81C;" />
 
 			<ResourceDictionary.MergedDictionaries>
 				<ResourceDictionary Source="ms-appx:///UserControls/KeyboardShortcut/KeyboardShortcut.xaml" />

src/Files.App/UserControls/NavigationToolbar.xaml.cs

@@ -316,7 +316,19 @@ await DialogDisplayHelper.ShowDialogAsync(Strings.InvalidCommand.GetLocalizedRes
 			// Search mode
 			else if (mode == OmnibarSearchMode)
 			{
-				ContentPageContext.ShellPage?.SubmitSearch(args.Text);
+				var shellPage = ContentPageContext.ShellPage;
+
+				if (args.Item is SuggestionModel item && !string.IsNullOrWhiteSpace(item.ItemPath) && shellPage is not null)
+					await NavigationHelpers.OpenPath(item.ItemPath, shellPage);
+				else
+				{
+					var searchQuery = args.Item is SuggestionModel x && !string.IsNullOrWhiteSpace(x.Name)
+						? x.Name
+						: args.Text;
+
+					shellPage?.SubmitSearch(searchQuery); // use the resolved shellPage for consistency
+					ViewModel.SaveSearchQueryToList(searchQuery);
+				}
 			}
 		}
 
@@ -338,6 +350,7 @@ await DispatcherQueue.EnqueueOrInvokeAsync(() =>
 			}
 			else if (Omnibar.CurrentSelectedMode == OmnibarSearchMode)
 			{
+				await ViewModel.PopulateOmnibarSuggestionsForSearchMode();
 			}
 		}
 
@@ -456,7 +469,12 @@ await DispatcherQueue.EnqueueOrInvokeAsync(() =>
 			}
 			else if (e.NewMode == OmnibarSearchMode)
 			{
+				if (!ViewModel.InstanceViewModel.IsPageTypeSearchResults)
+					ViewModel.OmnibarSearchModeText = string.Empty;
+				else
+					ViewModel.OmnibarSearchModeText = ViewModel.InstanceViewModel.CurrentSearchQuery;
 
+				await ViewModel.PopulateOmnibarSuggestionsForSearchMode();
 			}
 		}
 
@@ -486,7 +504,7 @@ await DispatcherQueue.EnqueueOrInvokeAsync(() =>
 				}
 				else if (Omnibar.CurrentSelectedMode == OmnibarSearchMode)
 				{
-
+					await ViewModel.PopulateOmnibarSuggestionsForSearchMode();
 				}
 			}
 		}

src/Files.App/ViewModels/UserControls/NavigationToolbarViewModel.cs

@@ -1035,6 +1035,18 @@ private void SavePathToHistory(string path)
 				UserSettingsService.GeneralSettingsService.PathHistoryList = pathHistoryList;
 		}
 
+		public void SaveSearchQueryToList(string searchQuery)
+		{
+			var previousSearchQueriesList = UserSettingsService.GeneralSettingsService.PreviousSearchQueriesList?.ToList() ?? [];
+			previousSearchQueriesList.Remove(searchQuery);
+			previousSearchQueriesList.Insert(0, searchQuery);
+
+			if (previousSearchQueriesList.Count > MaxSuggestionsCount)
+				UserSettingsService.GeneralSettingsService.PreviousSearchQueriesList = previousSearchQueriesList.RemoveFrom(MaxSuggestionsCount + 1);
+			else
+				UserSettingsService.GeneralSettingsService.PreviousSearchQueriesList = previousSearchQueriesList;
+		}
+
 		private static async Task<bool> LaunchApplicationFromPath(string currentInput, string workingDir)
 		{
 			var args = CommandLineParser.SplitArguments(currentInput);
@@ -1243,6 +1255,49 @@ public void PopulateOmnibarSuggestionsForCommandPaletteMode()
 			}
 		}
 
+		public async Task PopulateOmnibarSuggestionsForSearchMode()
+		{
+			if (ContentPageContext.ShellPage is null)
+				return;
+
+			List<SuggestionModel> newSuggestions = [];
+
+			if (string.IsNullOrWhiteSpace(OmnibarSearchModeText))
+			{
+				var previousSearchQueries = UserSettingsService.GeneralSettingsService.PreviousSearchQueriesList;
+				if (previousSearchQueries is not null)
+					newSuggestions.AddRange(previousSearchQueries.Select(query => new SuggestionModel(query, true)));
+			}
+			else
+			{
+				var search = new FolderSearch
+				{
+					Query = OmnibarSearchModeText,
+					Folder = ContentPageContext.ShellPage.ShellViewModel.WorkingDirectory,
+					MaxItemCount = 10,
+				};
+
+				var results = await search.SearchAsync();
+				newSuggestions.AddRange(results.Select(result => new SuggestionModel(result)));
+			}
+
+			// Remove outdated suggestions
+			var toRemove = OmnibarSearchModeSuggestionItems
+				.Where(existing => !newSuggestions.Any(newItem => newItem.ItemPath == existing.ItemPath))
+				.ToList();
+
+			foreach (var item in toRemove)
+				OmnibarSearchModeSuggestionItems.Remove(item);
+
+			// Add new suggestions
+			var toAdd = newSuggestions
+				.Where(newItem => !OmnibarSearchModeSuggestionItems.Any(existing => existing.Name == newItem.Name));
+
+			foreach (var item in toAdd)
+				OmnibarSearchModeSuggestionItems.Add(item);
+		}
+
+
 		[Obsolete("Remove once Omnibar goes out of experimental.")]
 		public async Task SetAddressBarSuggestionsAsync(AutoSuggestBox sender, IShellPage shellpage)
 		{