Working on recent pages

Author: michaeljolley

src/CmdPalNotionExtension/CmdPalNotionExtensionCommandsProvider.cs

@@ -14,6 +14,7 @@ internal partial class CmdPalNotionExtensionCommandsProvider : CommandProvider
   private readonly TokenService _tokenService;
   private readonly SignInPage _signInPage;
   private readonly SignOutPage _signOutPage;
+  private readonly RecentPagesPage _recentPagesPage;
   private readonly Resources _resources;
   private bool _isSignedIn;
 
@@ -28,6 +29,7 @@ public CmdPalNotionExtensionCommandsProvider(
     _tokenService = tokenService;
     _signInPage = signInPage;
     _signOutPage = signOutPage;
+    _recentPagesPage = recentPagesPage;
 
     DisplayName = _resources.GetResource("ExtensionTitle");
     Icon = NotionHelper.Icon;
@@ -76,6 +78,7 @@ public override ICommandItem[] TopLevelCommands()
         Subtitle = _resources.GetResource("Forms_Sign_Out_Button_Title"),
         Icon = NotionHelper.Icon
       },
+      _recentPagesPage.ToCommandItem()
     };
 
     return commands.ToArray();

src/CmdPalNotionExtension/Controls/Pages/RecentPagesPage.cs

@@ -1,39 +1,55 @@
-using System.Linq;
-using Microsoft.CommandPalette.Extensions.Toolkit;
-using Microsoft.CommandPalette.Extensions;
-
-using CmdPalNotionExtension.Notion;
+using CmdPalNotionExtension.Helpers;
 using CmdPalNotionExtension.ListItems;
+using CmdPalNotionExtension.Notion;
+using Microsoft.CommandPalette.Extensions;
+using Microsoft.CommandPalette.Extensions.Toolkit;
+using System.Collections.Generic;
+using System.Linq;
 
 namespace CmdPalNotionExtension.Controls.Pages;
 
 internal sealed partial class RecentPagesPage : ListPage
 {
   private readonly NotionDataProvider _dataProvider;
   private readonly ListItemFactory _listItemFactory;
+  private readonly Resources _resources;
+
+  private string? _cursor = string.Empty;
+  private List<IListItem> _currentPages = new List<IListItem>();
 
-  public RecentPagesPage(NotionDataProvider dataProvider, ListItemFactory listItemFactory)
+  public RecentPagesPage(
+    NotionDataProvider dataProvider, 
+    ListItemFactory listItemFactory,
+    Resources resources)
   {
     _dataProvider = dataProvider;
     _listItemFactory = listItemFactory;
+    _resources = resources;
 
-    Title = "Recent Pages";
+    Title = _resources.GetResource("Pages_Recent_Pages_Title");
     Icon = new("\uE823");
   }
 
   public override IListItem[] GetItems()
   {
-    var res = _dataProvider.GetRecentNotionPagesAsync().GetAwaiter().GetResult();
+    var res = _dataProvider.GetRecentNotionPagesAsync(_cursor).GetAwaiter().GetResult();
+
+    if (res != null)
+    {
+      _cursor = res.NextCursor;
+      _currentPages.AddRange(res.Results.Select(s => _listItemFactory.Create(s)));
+    }
 
-    return res.Select(item => _listItemFactory.Create(item)).ToArray();
+    return _currentPages.ToArray();
   }
 
   public CommandItem ToCommandItem()
   {
     return new CommandItem(this)
     {
-      Title = "Recent Pages",
-      Subtitle = "Recently viewed pages",
+      Title = _resources.GetResource("Pages_Recent_Pages_Title"),
+      Subtitle = _resources.GetResource("Pages_Recent_Pages_SubTitle"),
+      Icon = NotionHelper.Icon
     };
   }
 }

src/CmdPalNotionExtension/ListItems/ListItemFactory.cs

@@ -61,5 +61,4 @@ internal NotionPageListItem Create(NotionPage notionPage)
     //contentPage.Commands = pageCommands.ToArray();
 
   }
-
 }

src/CmdPalNotionExtension/ListItems/NotionPageListItem.cs

@@ -1,6 +1,7 @@
-using Microsoft.CommandPalette.Extensions;
+using CmdPalNotionExtension.Notion.Models;
+using Microsoft.CommandPalette.Extensions;
 using Microsoft.CommandPalette.Extensions.Toolkit;
-
+using System.Linq;
 using NotionPage = CmdPalNotionExtension.Notion.Models.Page;
 
 namespace CmdPalNotionExtension.ListItems;
@@ -11,7 +12,16 @@ internal sealed partial class NotionPageListItem : ListItem
 
   public NotionPageListItem(NotionPage notionPage, ICommand command) : base(command)
   {
-    Title = "";
+    var titleProp = notionPage.Properties?["Name"];
+    var title = "Unknown page";
+
+    if (titleProp != null)
+    {
+      title = string.Join(" ", ((TitleProperty)titleProp).TitleDetails.SelectMany(s => s.PlainText).ToArray());
+    }
+
+
+    Title = title;
     //Tags = anime.Genres.Select(genre => new Tag
     //{
     //  Text = genre,

src/CmdPalNotionExtension/Notion/Models/Callout.cs

@@ -5,6 +5,6 @@ namespace CmdPalNotionExtension.Notion.Models;
 
 internal sealed record Callout(
   [property: JsonPropertyName("rich_text")] List<RichText>? RichText,
-  [property: JsonPropertyName("icon")] Icon? Icon,
+  [property: JsonPropertyName("icon")] ImageRef? Icon,
   [property: JsonPropertyName("color")] string? Color
 );

src/CmdPalNotionExtension/Notion/Models/CustomEmojiIcon.cs

@@ -0,0 +1,13 @@
+using System.Text.Json.Serialization;
+
+namespace CmdPalNotionExtension.Notion.Models;
+
+internal sealed record CustomEmojiIcon(
+  [property: JsonPropertyName("custom_emoji")] CustomEmoji? Emoji
+) : ImageRef;
+
+internal sealed record CustomEmoji(
+  [property: JsonPropertyName("id")] string? Id,
+  [property: JsonPropertyName("name")] string? Name,
+  [property: JsonPropertyName("url")] string? Url
+);

src/CmdPalNotionExtension/Notion/Models/EmojiIcon.cs

@@ -4,4 +4,4 @@ namespace CmdPalNotionExtension.Notion.Models;
 
 internal sealed record EmojiIcon(
   [property: JsonPropertyName("emoji")] string? Emoji
-) : Icon;
+) : ImageRef;

src/CmdPalNotionExtension/Notion/Models/ExternalIcon.cs

@@ -4,4 +4,4 @@ namespace CmdPalNotionExtension.Notion.Models;
 
 internal sealed record ExternalIcon(
   [property: JsonPropertyName("external")] ExternalObject? External
-) : Icon;
+) : ImageRef;

src/CmdPalNotionExtension/Notion/Models/FileIcon.cs

@@ -5,4 +5,4 @@ namespace CmdPalNotionExtension.Notion.Models;
 internal sealed record FileIcon(
   [property: JsonPropertyName("file")]
   FileObject? File
-) : Icon;
+) : ImageRef;

src/CmdPalNotionExtension/Notion/Models/FileProperty.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Text.Json.Serialization;
+
+namespace CmdPalNotionExtension.Notion.Models;
+
+[JsonPolymorphic(TypeDiscriminatorPropertyName = "type")]
+[JsonDerivedType(typeof(FileObject), typeDiscriminator: "file")]
+[JsonDerivedType(typeof(ExternalObject), typeDiscriminator: "external")]
+internal sealed record FileProperty(
+  [property: JsonPropertyName("type")] string? Type
+);