Skip to content

Add support for template block #215

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
KoditkarVedant merged 2 commits into from
Dec 31, 2021
Merged

Add support for template block #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5969201
Add support for Template Block ✨
KoditkarVedant Dec 31, 2021
85a73d7
Add integration test for Template block ✅
KoditkarVedant Dec 31, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions ...lient/Api/Blocks/RequestParams/BlocksUpdateParameters/UpdateBlocks/TemplateUpdateBlock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
using System.Collections.Generic;
using Newtonsoft.Json;

namespace Notion.Client
{
public class TemplateUpdateBlock : UpdateBlock, IUpdateBlock
{
[JsonProperty("template")]
public Data Template { get; set; }

public class Data
{
[JsonProperty("text")]
public IEnumerable<RichTextBaseInput> Text { get; set; }
}
}
}
3 changes: 3 additions & 0 deletions Src/Notion.Client/Models/Blocks/BlockType.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ public enum BlockType
[EnumMember(Value = "column_list")]
ColumnList,

[EnumMember(Value = "template")]
Template,

[EnumMember(Value = "unsupported")]
Unsupported
}
Expand Down
1 change: 1 addition & 0 deletions Src/Notion.Client/Models/Blocks/IBlock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ namespace Notion.Client
[JsonSubtypes.KnownSubType(typeof(PDFBlock), BlockType.PDF)]
[JsonSubtypes.KnownSubType(typeof(QuoteBlock), BlockType.Quote)]
[JsonSubtypes.KnownSubType(typeof(TableOfContentsBlock), BlockType.TableOfContents)]
[JsonSubtypes.KnownSubType(typeof(TemplateBlock), BlockType.Template)]
[JsonSubtypes.KnownSubType(typeof(ToDoBlock), BlockType.ToDo)]
[JsonSubtypes.KnownSubType(typeof(ToggleBlock), BlockType.Toggle)]
[JsonSubtypes.KnownSubType(typeof(VideoBlock), BlockType.Video)]
Expand Down
64 changes: 6 additions & 58 deletions Src/Notion.Client/Models/Blocks/IColumnChildrenBlock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,65 +1,13 @@
using JsonSubTypes;
using Newtonsoft.Json;

namespace Notion.Client
namespace Notion.Client
{
//[JsonConverter(typeof(JsonSubtypes), "type")]
//[JsonSubtypes.KnownSubType(typeof(AudioBlock), BlockType.Audio)]
//[JsonSubtypes.KnownSubType(typeof(BookmarkBlock), BlockType.Bookmark)]
//[JsonSubtypes.KnownSubType(typeof(BreadcrumbBlock), BlockType.Breadcrumb)]
//[JsonSubtypes.KnownSubType(typeof(BulletedListItemBlock), BlockType.BulletedListItem)]
//[JsonSubtypes.KnownSubType(typeof(CalloutBlock), BlockType.Callout)]
//[JsonSubtypes.KnownSubType(typeof(ChildDatabaseBlock), BlockType.ChildDatabase)]
//[JsonSubtypes.KnownSubType(typeof(ChildPageBlock), BlockType.ChildPage)]
//[JsonSubtypes.KnownSubType(typeof(CodeBlock), BlockType.Code)]
//[JsonSubtypes.KnownSubType(typeof(DividerBlock), BlockType.Divider)]
//[JsonSubtypes.KnownSubType(typeof(EmbedBlock), BlockType.Embed)]
//[JsonSubtypes.KnownSubType(typeof(EquationBlock), BlockType.Equation)]
//[JsonSubtypes.KnownSubType(typeof(FileBlock), BlockType.File)]
//[JsonSubtypes.KnownSubType(typeof(HeadingOneBlock), BlockType.Heading_1)]
//[JsonSubtypes.KnownSubType(typeof(HeadingTwoBlock), BlockType.Heading_2)]
//[JsonSubtypes.KnownSubType(typeof(HeadingThreeeBlock), BlockType.Heading_3)]
//[JsonSubtypes.KnownSubType(typeof(ImageBlock), BlockType.Image)]
//[JsonSubtypes.KnownSubType(typeof(NumberedListItemBlock), BlockType.NumberedListItem)]
//[JsonSubtypes.KnownSubType(typeof(ParagraphBlock), BlockType.Paragraph)]
//[JsonSubtypes.KnownSubType(typeof(PDFBlock), BlockType.PDF)]
//[JsonSubtypes.KnownSubType(typeof(QuoteBlock), BlockType.Quote)]
//[JsonSubtypes.KnownSubType(typeof(TableOfContentsBlock), BlockType.TableOfContents)]
//[JsonSubtypes.KnownSubType(typeof(ToDoBlock), BlockType.ToDo)]
//[JsonSubtypes.KnownSubType(typeof(ToggleBlock), BlockType.Toggle)]
//[JsonSubtypes.KnownSubType(typeof(VideoBlock), BlockType.Video)]
//[JsonSubtypes.KnownSubType(typeof(UnsupportedBlock), BlockType.Unsupported)]
public interface IColumnChildrenBlock : IBlock
public interface ITemplateChildrendBlock : IBlock
{
}

public interface IColumnChildrenBlock : IBlock, ITemplateChildrendBlock
{
}

//[JsonConverter(typeof(JsonSubtypes), "type")]
//[JsonSubtypes.KnownSubType(typeof(AudioBlock), BlockType.Audio)]
//[JsonSubtypes.KnownSubType(typeof(BookmarkBlock), BlockType.Bookmark)]
//[JsonSubtypes.KnownSubType(typeof(BreadcrumbBlock), BlockType.Breadcrumb)]
//[JsonSubtypes.KnownSubType(typeof(BulletedListItemBlock), BlockType.BulletedListItem)]
//[JsonSubtypes.KnownSubType(typeof(CalloutBlock), BlockType.Callout)]
//[JsonSubtypes.KnownSubType(typeof(ChildPageBlock), BlockType.ChildPage)]
//[JsonSubtypes.KnownSubType(typeof(ChildDatabaseBlock), BlockType.ChildDatabase)]
//[JsonSubtypes.KnownSubType(typeof(CodeBlock), BlockType.Code)]
//[JsonSubtypes.KnownSubType(typeof(ColumnListBlock), BlockType.ColumnList)]
//[JsonSubtypes.KnownSubType(typeof(DividerBlock), BlockType.Divider)]
//[JsonSubtypes.KnownSubType(typeof(EmbedBlock), BlockType.Embed)]
//[JsonSubtypes.KnownSubType(typeof(EquationBlock), BlockType.Equation)]
//[JsonSubtypes.KnownSubType(typeof(FileBlock), BlockType.File)]
//[JsonSubtypes.KnownSubType(typeof(HeadingOneBlock), BlockType.Heading_1)]
//[JsonSubtypes.KnownSubType(typeof(HeadingTwoBlock), BlockType.Heading_2)]
//[JsonSubtypes.KnownSubType(typeof(HeadingThreeeBlock), BlockType.Heading_3)]
//[JsonSubtypes.KnownSubType(typeof(ImageBlock), BlockType.Image)]
//[JsonSubtypes.KnownSubType(typeof(NumberedListItemBlock), BlockType.NumberedListItem)]
//[JsonSubtypes.KnownSubType(typeof(ParagraphBlock), BlockType.Paragraph)]
//[JsonSubtypes.KnownSubType(typeof(PDFBlock), BlockType.PDF)]
//[JsonSubtypes.KnownSubType(typeof(QuoteBlock), BlockType.Quote)]
//[JsonSubtypes.KnownSubType(typeof(TableOfContentsBlock), BlockType.TableOfContents)]
//[JsonSubtypes.KnownSubType(typeof(ToDoBlock), BlockType.ToDo)]
//[JsonSubtypes.KnownSubType(typeof(ToggleBlock), BlockType.Toggle)]
//[JsonSubtypes.KnownSubType(typeof(VideoBlock), BlockType.Video)]
//[JsonSubtypes.KnownSubType(typeof(UnsupportedBlock), BlockType.Unsupported)]
public interface INonColumnBlock : IBlock
{
}
Expand Down
22 changes: 22 additions & 0 deletions Src/Notion.Client/Models/Blocks/TemplateBlock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
using System.Collections.Generic;
using Newtonsoft.Json;

namespace Notion.Client
{
public class TemplateBlock : Block, IColumnChildrenBlock, INonColumnBlock
{
public override BlockType Type => BlockType.Template;

[JsonProperty("template")]
public Data Template { get; set; }

public class Data
{
[JsonProperty("text")]
public IEnumerable<RichTextBase> Text { get; set; }

[JsonProperty("children")]
public IEnumerable<ITemplateChildrendBlock> Children { get; set; }
}
}
}
54 changes: 54 additions & 0 deletions Test/Notion.IntegrationTests/IBlocksClientTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,60 @@ private static IEnumerable<object[]> BlockData()

Assert.Equal("https://www.iaspaper.net/wp-content/uploads/2017/09/TNEA-Online-Application.jpg", embedBlock.Embed.Url);
})
},
new object[]
{
new TemplateBlock()
{
Template = new TemplateBlock.Data
{
Text = new List<RichTextBase>
{
new RichTextText
{
Text = new Text
{
Content = "Test Template"
}
}
},
Children = new List<ITemplateChildrendBlock>
{
new EmbedBlock()
{
Embed = new EmbedBlock.Info
{
Url = "https://zephoria.com/wp-content/uploads/2014/08/online-community.jpg"
}
}
}
}
},
new TemplateUpdateBlock()
{
Template = new TemplateUpdateBlock.Data
{
Text = new List<RichTextBaseInput>
{
new RichTextTextInput
{
Text = new Text
{
Content = "Test Template 2"
}
}
}
}
},
new Action<IBlock> (block =>
{
Assert.NotNull(block);
var templateBlock = Assert.IsType<TemplateBlock>(block);

Assert.Single(templateBlock.Template.Text);
Assert.Null(templateBlock.Template.Children);
Assert.Equal("Test Template 2", templateBlock.Template.Text.OfType<RichTextText>().First().Text.Content);
})
}
};
}
Expand Down