Working on recent pages

Author: michaeljolley

src/CmdPalNotionExtension/CmdPalNotionExtensionCommandsProvider.cs

@@ -14,13 +14,13 @@ internal partial class CmdPalNotionExtensionCommandsProvider : CommandProvider
   private readonly TokenService _tokenService;
   private readonly SignInPage _signInPage;
   private readonly SignOutPage _signOutPage;
-  private readonly RecentPagesPage _recentPagesPage;
+  private readonly RecentPage _recentPagesPage;
   private readonly Resources _resources;
   private bool _isSignedIn;
 
   public CmdPalNotionExtensionCommandsProvider(
         TokenService tokenService,
-        RecentPagesPage recentPagesPage,
+        RecentPage recentPagesPage,
         Resources resources,
         SignInPage signInPage,
         SignOutPage signOutPage)

…ension/Controls/Pages/RecentPagesPage.cs …onExtension/Controls/Pages/RecentPage.cssrc/CmdPalNotionExtension/Controls/Pages/RecentPagesPage.cs renamed to src/CmdPalNotionExtension/Controls/Pages/RecentPage.cs src/CmdPalNotionExtension/Controls/Pages/RecentPagesPage.cs renamed to src/CmdPalNotionExtension/Controls/Pages/RecentPage.cs

@@ -1,23 +1,25 @@
-using CmdPalNotionExtension.Helpers;
-using CmdPalNotionExtension.ListItems;
-using CmdPalNotionExtension.Notion;
+using System.Collections.Generic;
+using System.Linq;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
-using System.Collections.Generic;
-using System.Linq;
+
+using CmdPalNotionExtension.Helpers;
+using CmdPalNotionExtension.ListItems;
+using CmdPalNotionExtension.Notion;
 
 namespace CmdPalNotionExtension.Controls.Pages;
 
-internal sealed partial class RecentPagesPage : ListPage
+internal sealed partial class RecentPage : DynamicListPage
 {
   private readonly NotionDataProvider _dataProvider;
   private readonly ListItemFactory _listItemFactory;
   private readonly Resources _resources;
 
   private string? _cursor = string.Empty;
+  private bool _hasMore;
   private List<IListItem> _currentPages = new List<IListItem>();
 
-  public RecentPagesPage(
+  public RecentPage(
     NotionDataProvider dataProvider, 
     ListItemFactory listItemFactory,
     Resources resources)
@@ -32,17 +34,51 @@ public RecentPagesPage(
 
   public override IListItem[] GetItems()
   {
-    var res = _dataProvider.GetRecentNotionPagesAsync(_cursor).GetAwaiter().GetResult();
-
-    if (res != null)
+    if (_cursor == string.Empty)
     {
-      _cursor = res.NextCursor;
-      _currentPages.AddRange(res.Results.Select(s => _listItemFactory.Create(s)));
+      var res = GetSearchResult();
+      if (res != null)
+      {
+        _cursor = res.NextCursor;
+        _hasMore = res.HasMore;
+        _currentPages.AddRange(res.Results.Select(s => _listItemFactory.Create(s)));
+      }
     }
 
     return _currentPages.ToArray();
   }
 
+  public override void UpdateSearchText(string oldSearch, string newSearch)
+  {
+    _currentPages = new List<IListItem>();
+    _hasMore = false;
+    _cursor = string.Empty;
+    RaiseItemsChanged();
+  }
+
+  public override void LoadMore()
+  {
+    if (_hasMore)
+    {
+      var res = GetSearchResult();
+      if (res != null)
+      {
+        _cursor = res.NextCursor;
+        _hasMore = res.HasMore;
+        _currentPages.AddRange(res.Results.Select(s => _listItemFactory.Create(s)));
+      }
+      RaiseItemsChanged();
+
+      base.LoadMore();
+    }
+  }
+
+  private SearchResult GetSearchResult()
+  {
+    var res = _dataProvider.GetRecentNotionPagesAsync(SearchText, _cursor).GetAwaiter().GetResult();
+    return res;
+  }
+
   public CommandItem ToCommandItem()
   {
     return new CommandItem(this)

src/CmdPalNotionExtension/ListItems/NotionPageListItem.cs

@@ -1,7 +1,8 @@
-using CmdPalNotionExtension.Notion.Models;
+using System.Linq;
 using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
-using System.Linq;
+
+using CmdPalNotionExtension.Notion.Models;
 using NotionPage = CmdPalNotionExtension.Notion.Models.Page;
 
 namespace CmdPalNotionExtension.ListItems;
@@ -12,19 +13,45 @@ internal sealed partial class NotionPageListItem : ListItem
 
   public NotionPageListItem(NotionPage notionPage, ICommand command) : base(command)
   {
-    var titleProp = notionPage.Properties?["Name"];
     var title = "Unknown page";
+    var icon = new IconInfo("\uE7C3");
 
-    if (titleProp != null)
+    if (notionPage.Properties.ContainsKey("Name"))
+    {
+      var titleProp = notionPage.Properties["Name"];
+      title = string.Join(" ", ((TitleProperty)titleProp).TitleDetails.SelectMany(s => s.PlainText).ToArray());
+    } 
+    else if (notionPage.Properties.ContainsKey("Title"))
     {
+      var titleProp = notionPage.Properties["Title"];
       title = string.Join(" ", ((TitleProperty)titleProp).TitleDetails.SelectMany(s => s.PlainText).ToArray());
     }
 
+    if (notionPage.Icon != null)
+    {
+      switch (notionPage.Icon.Type)
+      {
+        case "emoji":
+          var emojiIcon = (EmojiIcon)notionPage.Icon;
+          icon = new(emojiIcon.Emoji);
+          break;
+        case "file":
+          var fileIcon = (FileIcon)notionPage.Icon;
+          icon = new(fileIcon.File?.Url);
+          break;
+        case "custom_emoji":
+          var customEmojiIcon = (CustomEmojiIcon)notionPage.Icon;
+          icon = new(customEmojiIcon.Emoji?.Url);
+          break;
+        case "external":
+          var externalIcon = (ExternalIcon)notionPage.Icon;
+          icon = new(externalIcon.External?.Url);
+          break;
+      }
+    }
 
     Title = title;
-    //Tags = anime.Genres.Select(genre => new Tag
-    //{
-    //  Text = genre,
-    //}).Take(_maxNumberOfTags).ToArray();
+    Icon = icon;
+
   }
 }

src/CmdPalNotionExtension/Notion/NotionDataProvider.cs

@@ -66,14 +66,18 @@ private async Task<T> SendAsync<T>(HttpRequestMessage request)
     }
   }
 
-  public async Task<SearchResult> GetRecentNotionPagesAsync(string? cursor)
+  public async Task<SearchResult> GetRecentNotionPagesAsync(string? searchFor, string? cursor)
   {
     var query = new Query() { PageSize = 20 };
 
     if (!string.IsNullOrEmpty(cursor))
     {
       query.Cursor = cursor;
     }
+    if (!string.IsNullOrEmpty(searchFor))
+    {
+      query.SearchFor = searchFor;
+    }
 
     var payload = JsonSerializer.Serialize(query, _jsonSerializerOptions);
 

src/CmdPalNotionExtension/Notion/Query.cs

@@ -5,13 +5,13 @@ namespace CmdPalNotionExtension.Notion;
 internal sealed partial record Query
 {
   [JsonPropertyName("query")]
-  public string? SearchFor { get; init; }
+  public string? SearchFor { get; set; }
 
   [JsonPropertyName("sort")]
   public static object? Sort { get => new { direction = NotionSortDirection.DESC, timestamp = "last_edited_time" }; }
 
   [JsonPropertyName("filter")]
-  public object? Filter { get; init; }
+  public object? Filter { get; set; }
 
   [JsonPropertyName("start_cursor")]
   public string? Cursor { get; set; }

src/CmdPalNotionExtension/Program.cs

@@ -108,7 +108,7 @@ private static async Task HandleCOMServerActivationAsync()
     var commandFactory = new CommandFactory(dataProvider);
     var listItemFactory = new ListItemFactory(commandFactory, tokenService, dataProvider);
 
-    var recentPagesPage = new RecentPagesPage(dataProvider, listItemFactory, resources);
+    var recentPagesPage = new RecentPage(dataProvider, listItemFactory, resources);
 
     var commandProvider = new CmdPalNotionExtensionCommandsProvider(
         tokenService, recentPagesPage, resources, signInPage, signOutPage);