From 619a39927ec15b956971aac6e78ec4762250ed11 Mon Sep 17 00:00:00 2001
From: George Drak <sonicgd@gmail.com>
Date: Wed, 8 Sep 2021 15:43:14 +0500
Subject: [PATCH] feat(display): remove ListContext, make List options required

---
 apps/Sitko.Blockly.Demo/Pages/Index.razor     | 58 ++++++++++---------
 apps/Sitko.Blockly.Demo/Pages/Show.razor      |  4 +-
 .../Display/AntDesignBlocklyListOptions.cs    |  7 +++
 .../Display/Blocks/AntCutBlockComponent.razor | 42 ++++++++------
 .../Blocks/AntFilesBlockComponent.razor       |  4 +-
 .../Blocks/AntGalleryBlockComponent.razor     |  6 +-
 .../Blocks/AntQuoteBlockComponent.razor       |  6 +-
 .../Display/BlazorBlocklyListOptions.cs       |  6 ++
 .../Display/BlockComponent.cs                 | 24 +-------
 .../Display/Blocks/CutBlockComponent.cs       |  2 +-
 .../Display/Blocks/FilesBlockComponent.cs     |  2 +-
 .../Display/Blocks/GalleryBlockComponent.cs   |  2 +-
 .../Display/Blocks/IframeBlockComponent.cs    |  2 +-
 .../Display/Blocks/QuoteBlockComponent.cs     |  2 +-
 .../Display/Blocks/TextBlockComponent.cs      |  2 +-
 .../Display/Blocks/TwitchBlockComponent.cs    |  2 +-
 .../Display/Blocks/TwitterBlockComponent.cs   |  2 +-
 .../Display/Blocks/YoutubeBlockComponent.cs   |  2 +-
 .../Display/BlocksList.cs                     | 38 +++---------
 .../Display/BlocklyListOptions.cs             | 13 ++++-
 ...{BlockListContext.cs => BlocksListMode.cs} |  2 -
 21 files changed, 110 insertions(+), 118 deletions(-)
 rename src/Sitko.Blockly/Display/{BlockListContext.cs => BlocksListMode.cs} (59%)

diff --git a/apps/Sitko.Blockly.Demo/Pages/Index.razor b/apps/Sitko.Blockly.Demo/Pages/Index.razor
index d84aac4..5bf79da 100644
--- a/apps/Sitko.Blockly.Demo/Pages/Index.razor
+++ b/apps/Sitko.Blockly.Demo/Pages/Index.razor
@@ -4,37 +4,39 @@
 @using Sitko.Blockly.Display
 @using Sitko.Core.Storage
 @inherits BaseComponent
-    <PageContainer Title="Posts">
+<PageContainer Title="Posts">
+    <Breadcrumb>
         <Breadcrumb>
-            <Breadcrumb>
-                <BreadcrumbItem>Home</BreadcrumbItem>
-                <BreadcrumbItem>Posts</BreadcrumbItem>
-            </Breadcrumb>
+            <BreadcrumbItem>Home</BreadcrumbItem>
+            <BreadcrumbItem>Posts</BreadcrumbItem>
         </Breadcrumb>
-        <Content>
-        </Content>
-        <ExtraContent>
-            <Button>
-                <a href="/Posts/Add">Add</a>
-            </Button>
-        </ExtraContent>
-        <ChildContent>
-            @foreach (Post post in Posts)
-            {
-                <Card Title="@post.Title">
-                    <Extra>
-                        <a href="/Posts/@post.Id/Edit">
-                            <Button>Edit</Button>
-                        </a>
-                    </Extra>
-                    <ChildContent>
-                        <AntBlocksList TEntity="Post" Entity="post" EntityBlocks="post.Blocks" Options="@(new AntDesignBlocklyListOptions {Storage = GetService<IStorage<BlocklyStorageOptions>>(), Mode = BlocksListMode.Preview})" EntityUrl="@($"/Posts/{post.Id}")"></AntBlocksList>
-                    </ChildContent>
-                </Card>
-            }
+    </Breadcrumb>
+    <Content>
+    </Content>
+    <ExtraContent>
+        <Button>
+            <a href="/Posts/Add">Add</a>
+        </Button>
+    </ExtraContent>
+    <ChildContent>
+        @foreach (Post post in Posts)
+        {
+            <Card Title="@post.Title">
+                <Extra>
+                    <a href="/Posts/@post.Id/Edit">
+                        <Button>Edit</Button>
+                    </a>
+                </Extra>
+                <ChildContent>
+                    <AntBlocksList
+                        EntityBlocks="post.Blocks" Options="@(new AntDesignBlocklyListOptions(BlocksListMode.Preview, GetService<IStorage<BlocklyStorageOptions>>(), $"Posts/{post.Id}"))">
+                    </AntBlocksList>
+                </ChildContent>
+            </Card>
+        }
 
-        </ChildContent>
-    </PageContainer>
+    </ChildContent>
+</PageContainer>
 
 
 @code{
diff --git a/apps/Sitko.Blockly.Demo/Pages/Show.razor b/apps/Sitko.Blockly.Demo/Pages/Show.razor
index 1cf908b..576c3d5 100644
--- a/apps/Sitko.Blockly.Demo/Pages/Show.razor
+++ b/apps/Sitko.Blockly.Demo/Pages/Show.razor
@@ -1,6 +1,6 @@
 @page "/Posts/{PostId:guid}"
-@using Sitko.Blockly.Demo.Data.Entities
 @using Sitko.Core.Storage
+@using Sitko.Blockly.Display
 @inherits BaseComponent
 @if (Post is not null)
 {
@@ -20,7 +20,7 @@
         <Content>
         </Content>
         <ChildContent>
-            <AntBlocksList TEntity="Post" Entity="Post" EntityBlocks="Post.Blocks" EntityUrl="@($"/Posts/{PostId}")" Options="@(new AntDesignBlocklyListOptions {Storage = GetService<IStorage<BlocklyStorageOptions>>()})"></AntBlocksList>
+            <AntBlocksList EntityBlocks="Post.Blocks" Options="@(new AntDesignBlocklyListOptions(BlocksListMode.Full, GetService<IStorage<BlocklyStorageOptions>>()))"></AntBlocksList>
         </ChildContent>
     </PageContainer>
 }
diff --git a/src/Sitko.Blockly.AntDesign/Display/AntDesignBlocklyListOptions.cs b/src/Sitko.Blockly.AntDesign/Display/AntDesignBlocklyListOptions.cs
index 805901a..819a0db 100644
--- a/src/Sitko.Blockly.AntDesign/Display/AntDesignBlocklyListOptions.cs
+++ b/src/Sitko.Blockly.AntDesign/Display/AntDesignBlocklyListOptions.cs
@@ -2,7 +2,14 @@
 
 namespace Sitko.Blockly.AntDesignComponents.Display
 {
+    using Core.Storage;
+    using Sitko.Blockly.Display;
+
     public class AntDesignBlocklyListOptions : BlazorBlocklyListOptions
     {
+        public AntDesignBlocklyListOptions(BlocksListMode mode = BlocksListMode.Full,
+            IStorage? storage = null, string? entityUrl = null) : base(mode, storage, entityUrl)
+        {
+        }
     }
 }
diff --git a/src/Sitko.Blockly.AntDesign/Display/Blocks/AntCutBlockComponent.razor b/src/Sitko.Blockly.AntDesign/Display/Blocks/AntCutBlockComponent.razor
index d9ed4f5..08c5702 100644
--- a/src/Sitko.Blockly.AntDesign/Display/Blocks/AntCutBlockComponent.razor
+++ b/src/Sitko.Blockly.AntDesign/Display/Blocks/AntCutBlockComponent.razor
@@ -1,19 +1,27 @@
 @inherits CutBlockComponent<AntDesignBlocklyListOptions>
-<a href="@Context.EntityUrl">
-    <Button>
-        @{
-            if (string.IsNullOrEmpty(Block.ButtonText))
-            {
-                <span>
-                    @LocalizationProvider["Read more..."]
-                </span>
+@if (Options.EntityUrl is not null)
+{
+    <a href="@Options.EntityUrl">
+        <Button>
+            @{
+                if (string.IsNullOrEmpty(Block.ButtonText))
+                {
+                    <span>
+                        @LocalizationProvider["Read more..."]
+                    </span>
+                }
+                else
+                {
+                    <span>
+                        @Block.ButtonText
+                    </span>
+                }
             }
-            else
-            {
-                <span>
-                    @Block.ButtonText
-                </span>
-            }
-        }
-    </Button>
-</a>
+        </Button>
+    </a>
+
+}
+else
+{
+    <AntBlockErrorComponent Error="@LocalizationProvider["Not Entity url provided"]"></AntBlockErrorComponent>
+}
diff --git a/src/Sitko.Blockly.AntDesign/Display/Blocks/AntFilesBlockComponent.razor b/src/Sitko.Blockly.AntDesign/Display/Blocks/AntFilesBlockComponent.razor
index 25da884..76ae6a2 100644
--- a/src/Sitko.Blockly.AntDesign/Display/Blocks/AntFilesBlockComponent.razor
+++ b/src/Sitko.Blockly.AntDesign/Display/Blocks/AntFilesBlockComponent.razor
@@ -1,11 +1,11 @@
 @inherits FilesBlockComponent<AntDesignBlocklyListOptions>
-@if (ListOptions.Storage is not null)
+@if (Options.Storage is not null)
 {
     <ul>
         @foreach (var file in Block.Files)
         {
             <li>
-                <AntDesign.Icon Type="paper-clip"/> <a target="_blank" rel="noopener noreferrer" title="@file.FileName" href="@ListOptions.Storage.PublicUri(file)">@file.FileName</a><span class="filesize">&nbsp;(@file.HumanSize)</span>
+                <AntDesign.Icon Type="paper-clip"/> <a target="_blank" rel="noopener noreferrer" title="@file.FileName" href="@Options.Storage.PublicUri(file)">@file.FileName</a><span class="filesize">&nbsp;(@file.HumanSize)</span>
             </li>
         }
     </ul>
diff --git a/src/Sitko.Blockly.AntDesign/Display/Blocks/AntGalleryBlockComponent.razor b/src/Sitko.Blockly.AntDesign/Display/Blocks/AntGalleryBlockComponent.razor
index 2a829b8..90204ff 100644
--- a/src/Sitko.Blockly.AntDesign/Display/Blocks/AntGalleryBlockComponent.razor
+++ b/src/Sitko.Blockly.AntDesign/Display/Blocks/AntGalleryBlockComponent.razor
@@ -1,5 +1,5 @@
 @inherits GalleryBlockComponent<AntDesignBlocklyListOptions>
-@if (ListOptions.Storage is not null)
+@if (Options.Storage is not null)
 {
     if (Block.Pictures.Any())
     {
@@ -10,7 +10,7 @@
                     @foreach (var image in Block.Pictures)
                     {
                         <CarouselSlick>
-                            <img src="@ListOptions.Storage.PublicUri(image).ToString()" alt="Image: @image.FileName"/>
+                            <img src="@Options.Storage.PublicUri(image).ToString()" alt="Image: @image.FileName"/>
                         </CarouselSlick>
                     }
                 </Carousel>
@@ -20,7 +20,7 @@
         {
             var image = Block.Pictures.First();
             <div class="single-image">
-                <img src="@ListOptions.Storage.PublicUri(image).ToString()" alt="Image: @image.FileName"/>
+                <img src="@Options.Storage.PublicUri(image).ToString()" alt="Image: @image.FileName"/>
             </div>
         }
     }
diff --git a/src/Sitko.Blockly.AntDesign/Display/Blocks/AntQuoteBlockComponent.razor b/src/Sitko.Blockly.AntDesign/Display/Blocks/AntQuoteBlockComponent.razor
index c5fd6c5..8729a6a 100644
--- a/src/Sitko.Blockly.AntDesign/Display/Blocks/AntQuoteBlockComponent.razor
+++ b/src/Sitko.Blockly.AntDesign/Display/Blocks/AntQuoteBlockComponent.razor
@@ -4,15 +4,15 @@
         @((MarkupString) Block.Text)
     </div>
     <footer class="author">
-        @if (ListOptions.Storage is not null && Block.Picture != null)
+        @if (Options.Storage is not null && Block.Picture != null)
         {
-            <div class="picture" style="background-image: url(@ListOptions.Storage.PublicUri(Block.Picture))">
+            <div class="picture" style="background-image: url(@Options.Storage.PublicUri(Block.Picture))">
             </div>
         }
         <cite>
             @{
                 var authorText = Block.Author;
-                @if (ListOptions.Storage is null || Block.Picture is null)
+                @if (Options.Storage is null || Block.Picture is null)
                 {
                     authorText = $"— {authorText}";
                 }
diff --git a/src/Sitko.Blockly.Blazor/Display/BlazorBlocklyListOptions.cs b/src/Sitko.Blockly.Blazor/Display/BlazorBlocklyListOptions.cs
index a8cf201..ced8253 100644
--- a/src/Sitko.Blockly.Blazor/Display/BlazorBlocklyListOptions.cs
+++ b/src/Sitko.Blockly.Blazor/Display/BlazorBlocklyListOptions.cs
@@ -2,7 +2,13 @@
 
 namespace Sitko.Blockly.Blazor.Display
 {
+    using Core.Storage;
+
     public class BlazorBlocklyListOptions : BlocklyListOptions
     {
+        public BlazorBlocklyListOptions(BlocksListMode mode = BlocksListMode.Full,
+            IStorage? storage = null, string? entityUrl = null) : base(mode, storage, entityUrl)
+        {
+        }
     }
 }
diff --git a/src/Sitko.Blockly.Blazor/Display/BlockComponent.cs b/src/Sitko.Blockly.Blazor/Display/BlockComponent.cs
index 7aa8213..5209336 100644
--- a/src/Sitko.Blockly.Blazor/Display/BlockComponent.cs
+++ b/src/Sitko.Blockly.Blazor/Display/BlockComponent.cs
@@ -1,5 +1,4 @@
 using Microsoft.AspNetCore.Components;
-using Sitko.Blockly.Display;
 using Sitko.Core.App.Blazor.Components;
 
 namespace Sitko.Blockly.Blazor.Display
@@ -10,33 +9,16 @@ public abstract class BlockComponent<TBlock> : BaseComponent
 #if NET6_0_OR_GREATER
         [EditorRequired]
 #endif
-        [Parameter]
-        public TBlock Block { get; set; } = null!;
+        [Parameter] public TBlock Block { get; set; } = null!;
     }
 
     public abstract class BlockComponent<TBlock, TListOptions> : BlockComponent<TBlock>
-        where TListOptions : BlazorBlocklyListOptions, new()
+        where TListOptions : BlazorBlocklyListOptions
         where TBlock : ContentBlock
     {
 #if NET6_0_OR_GREATER
         [EditorRequired]
 #endif
-        [Parameter]
-        public BlockListContext Context { get; set; } = null!;
-
-        protected TListOptions ListOptions { get; set; } = new();
-
-        [Parameter]
-        public TListOptions? Options
-        {
-            get => ListOptions;
-            set
-            {
-                if (value is not null)
-                {
-                    ListOptions = value;
-                }
-            }
-        }
+        [Parameter] public TListOptions Options { get; set; } = null!;
     }
 }
diff --git a/src/Sitko.Blockly.Blazor/Display/Blocks/CutBlockComponent.cs b/src/Sitko.Blockly.Blazor/Display/Blocks/CutBlockComponent.cs
index c6c783b..ddfcb74 100644
--- a/src/Sitko.Blockly.Blazor/Display/Blocks/CutBlockComponent.cs
+++ b/src/Sitko.Blockly.Blazor/Display/Blocks/CutBlockComponent.cs
@@ -2,7 +2,7 @@
 {
     public abstract class
         CutBlockComponent<TListOptions> : BlockComponent<Sitko.Blockly.Blocks.CutBlock, TListOptions>
-        where TListOptions : BlazorBlocklyListOptions, new()
+        where TListOptions : BlazorBlocklyListOptions
     {
     }
 }
diff --git a/src/Sitko.Blockly.Blazor/Display/Blocks/FilesBlockComponent.cs b/src/Sitko.Blockly.Blazor/Display/Blocks/FilesBlockComponent.cs
index 0f689d4..392b41e 100644
--- a/src/Sitko.Blockly.Blazor/Display/Blocks/FilesBlockComponent.cs
+++ b/src/Sitko.Blockly.Blazor/Display/Blocks/FilesBlockComponent.cs
@@ -2,7 +2,7 @@
 {
     public abstract class
         FilesBlockComponent<TListOptions> : BlockComponent<Sitko.Blockly.Blocks.FilesBlock,
-            TListOptions> where TListOptions : BlazorBlocklyListOptions, new()
+            TListOptions> where TListOptions : BlazorBlocklyListOptions
     {
     }
 }
diff --git a/src/Sitko.Blockly.Blazor/Display/Blocks/GalleryBlockComponent.cs b/src/Sitko.Blockly.Blazor/Display/Blocks/GalleryBlockComponent.cs
index cdca1c4..33a8718 100644
--- a/src/Sitko.Blockly.Blazor/Display/Blocks/GalleryBlockComponent.cs
+++ b/src/Sitko.Blockly.Blazor/Display/Blocks/GalleryBlockComponent.cs
@@ -2,7 +2,7 @@
 {
     public abstract class
         GalleryBlockComponent<TListOptions> : BlockComponent<Sitko.Blockly.Blocks.GalleryBlock,
-            TListOptions> where TListOptions : BlazorBlocklyListOptions, new()
+            TListOptions> where TListOptions : BlazorBlocklyListOptions
     {
     }
 }
diff --git a/src/Sitko.Blockly.Blazor/Display/Blocks/IframeBlockComponent.cs b/src/Sitko.Blockly.Blazor/Display/Blocks/IframeBlockComponent.cs
index 6fd354d..3c34cff 100644
--- a/src/Sitko.Blockly.Blazor/Display/Blocks/IframeBlockComponent.cs
+++ b/src/Sitko.Blockly.Blazor/Display/Blocks/IframeBlockComponent.cs
@@ -2,7 +2,7 @@
 {
     public abstract class
         IframeBlockComponent<TListOptions> : BlockComponent<Sitko.Blockly.Blocks.IframeBlock,
-            TListOptions> where TListOptions : BlazorBlocklyListOptions, new()
+            TListOptions> where TListOptions : BlazorBlocklyListOptions
     {
     }
 }
diff --git a/src/Sitko.Blockly.Blazor/Display/Blocks/QuoteBlockComponent.cs b/src/Sitko.Blockly.Blazor/Display/Blocks/QuoteBlockComponent.cs
index d1718f3..edadacc 100644
--- a/src/Sitko.Blockly.Blazor/Display/Blocks/QuoteBlockComponent.cs
+++ b/src/Sitko.Blockly.Blazor/Display/Blocks/QuoteBlockComponent.cs
@@ -1,7 +1,7 @@
 namespace Sitko.Blockly.Blazor.Display.Blocks
 {
     public abstract class QuoteBlockComponent<TListOptions> : BlockComponent<Sitko.Blockly.Blocks.QuoteBlock,
-        TListOptions> where TListOptions : BlazorBlocklyListOptions, new()
+        TListOptions> where TListOptions : BlazorBlocklyListOptions
     {
     }
 }
diff --git a/src/Sitko.Blockly.Blazor/Display/Blocks/TextBlockComponent.cs b/src/Sitko.Blockly.Blazor/Display/Blocks/TextBlockComponent.cs
index e3234f0..aad6b9e 100644
--- a/src/Sitko.Blockly.Blazor/Display/Blocks/TextBlockComponent.cs
+++ b/src/Sitko.Blockly.Blazor/Display/Blocks/TextBlockComponent.cs
@@ -2,7 +2,7 @@
 {
     public abstract class
         TextBlockComponent<TListOptions> : BlockComponent<Sitko.Blockly.Blocks.TextBlock,
-            TListOptions> where TListOptions : BlazorBlocklyListOptions, new()
+            TListOptions> where TListOptions : BlazorBlocklyListOptions
     {
     }
 }
diff --git a/src/Sitko.Blockly.Blazor/Display/Blocks/TwitchBlockComponent.cs b/src/Sitko.Blockly.Blazor/Display/Blocks/TwitchBlockComponent.cs
index 11c959f..43e647c 100644
--- a/src/Sitko.Blockly.Blazor/Display/Blocks/TwitchBlockComponent.cs
+++ b/src/Sitko.Blockly.Blazor/Display/Blocks/TwitchBlockComponent.cs
@@ -9,7 +9,7 @@ namespace Sitko.Blockly.Blazor.Display.Blocks
 
     public abstract class
         TwitchBlockComponent<TListOptions> : BlockComponent<Sitko.Blockly.Blocks.TwitchBlock,
-            TListOptions> where TListOptions : BlazorBlocklyListOptions, new()
+            TListOptions> where TListOptions : BlazorBlocklyListOptions
     {
         protected ElementReference ContainerRef { get; set; }
         [Inject] private IJSRuntime JsRuntime { get; set; } = null!;
diff --git a/src/Sitko.Blockly.Blazor/Display/Blocks/TwitterBlockComponent.cs b/src/Sitko.Blockly.Blazor/Display/Blocks/TwitterBlockComponent.cs
index d5e0734..f9e3c0f 100644
--- a/src/Sitko.Blockly.Blazor/Display/Blocks/TwitterBlockComponent.cs
+++ b/src/Sitko.Blockly.Blazor/Display/Blocks/TwitterBlockComponent.cs
@@ -9,7 +9,7 @@ namespace Sitko.Blockly.Blazor.Display.Blocks
 
     public abstract class
         TwitterBlockComponent<TListOptions> : BlockComponent<Sitko.Blockly.Blocks.TwitterBlock,
-            TListOptions> where TListOptions : BlazorBlocklyListOptions, new()
+            TListOptions> where TListOptions : BlazorBlocklyListOptions
     {
         protected ElementReference ContainerRef { get; set; }
         [Inject] protected IJSRuntime JsRuntime { get; set; } = null!;
diff --git a/src/Sitko.Blockly.Blazor/Display/Blocks/YoutubeBlockComponent.cs b/src/Sitko.Blockly.Blazor/Display/Blocks/YoutubeBlockComponent.cs
index 32f814f..b621afa 100644
--- a/src/Sitko.Blockly.Blazor/Display/Blocks/YoutubeBlockComponent.cs
+++ b/src/Sitko.Blockly.Blazor/Display/Blocks/YoutubeBlockComponent.cs
@@ -2,7 +2,7 @@
 {
     public abstract class
         YoutubeBlockComponent<TListOptions> : BlockComponent<Sitko.Blockly.Blocks.YoutubeBlock,
-            TListOptions> where TListOptions : BlazorBlocklyListOptions, new()
+            TListOptions> where TListOptions : BlazorBlocklyListOptions
     {
     }
 }
diff --git a/src/Sitko.Blockly.Blazor/Display/BlocksList.cs b/src/Sitko.Blockly.Blazor/Display/BlocksList.cs
index 18a19f5..2e9c9d6 100644
--- a/src/Sitko.Blockly.Blazor/Display/BlocksList.cs
+++ b/src/Sitko.Blockly.Blazor/Display/BlocksList.cs
@@ -2,20 +2,18 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Components;
-using Sitko.Blockly.Display;
 using Sitko.Core.App.Blazor.Components;
 
 namespace Sitko.Blockly.Blazor.Display
 {
     using JetBrains.Annotations;
 
-    public abstract class BlocksList<TOptions> : BaseComponent where TOptions : BlazorBlocklyListOptions, new()
+    public abstract class BlocksList<TOptions> : BaseComponent where TOptions : BlazorBlocklyListOptions
     {
 #if NET6_0_OR_GREATER
         [EditorRequired]
 #endif
-        [Parameter]
-        public IEnumerable<ContentBlock> EntityBlocks { get; set; } = null!;
+        [Parameter] public IEnumerable<ContentBlock> EntityBlocks { get; set; } = null!;
 
         [PublicAPI]
         protected IBlazorBlockDescriptor[] BlockDescriptors { get; private set; } =
@@ -25,36 +23,19 @@ namespace Sitko.Blockly.Blazor.Display
 
         protected ContentBlock[] Blocks => EntityBlocks.Where(b => b.Enabled).OrderBy(b => b.Position).ToArray();
 
-        protected TOptions ListOptions { get; set; } = new();
-
-        [Parameter]
-        public TOptions? Options
-        {
-            get => ListOptions;
-            set
-            {
-                if (value is not null)
-                {
-                    ListOptions = value;
-                }
-            }
-        }
+        [Parameter] public TOptions Options { get; set; } = null!;
 
         protected override void Initialize()
         {
             base.Initialize();
-            BlockDescriptors = Blockly.Descriptors.ToArray();
-            if (Context is null)
+
+            if (Options is null)
             {
-                throw new InvalidOperationException(LocalizationProvider["You must provide block list context"]);
+                throw new InvalidOperationException("Provide options for BlocksList");
             }
-        }
 
-#if NET6_0_OR_GREATER
-        [EditorRequired]
-#endif
-        [Parameter]
-        public BlockListContext? Context { get; set; }
+            BlockDescriptors = Blockly.Descriptors.ToArray();
+        }
 
         [PublicAPI]
         public RenderFragment RenderBlock(IBlazorBlockDescriptor blockDescriptor, ContentBlock block) =>
@@ -63,8 +44,7 @@ public RenderFragment RenderBlock(IBlazorBlockDescriptor blockDescriptor, Conten
                 var component = blockDescriptor.DisplayComponent;
                 builder.OpenComponent(0, component);
                 builder.AddAttribute(1, "Block", block);
-                builder.AddAttribute(2, "Context", Context);
-                builder.AddAttribute(3, "Options", ListOptions);
+                builder.AddAttribute(2, "Options", Options);
                 builder.CloseComponent();
             };
     }
diff --git a/src/Sitko.Blockly/Display/BlocklyListOptions.cs b/src/Sitko.Blockly/Display/BlocklyListOptions.cs
index 7372eeb..ce3dafc 100644
--- a/src/Sitko.Blockly/Display/BlocklyListOptions.cs
+++ b/src/Sitko.Blockly/Display/BlocklyListOptions.cs
@@ -4,7 +4,16 @@ namespace Sitko.Blockly.Display
 {
     public class BlocklyListOptions
     {
-        public IStorage? Storage { get; set; }
-        public BlocksListMode Mode { get; set; } = BlocksListMode.Full;
+        public IStorage? Storage { get; }
+        public BlocksListMode Mode { get; }
+        public string? EntityUrl { get; }
+
+        public BlocklyListOptions(BlocksListMode mode = BlocksListMode.Full, IStorage? storage = null,
+            string? entityUrl = null)
+        {
+            Storage = storage;
+            Mode = mode;
+            EntityUrl = entityUrl;
+        }
     }
 }
diff --git a/src/Sitko.Blockly/Display/BlockListContext.cs b/src/Sitko.Blockly/Display/BlocksListMode.cs
similarity index 59%
rename from src/Sitko.Blockly/Display/BlockListContext.cs
rename to src/Sitko.Blockly/Display/BlocksListMode.cs
index f5699fa..710048e 100644
--- a/src/Sitko.Blockly/Display/BlockListContext.cs
+++ b/src/Sitko.Blockly/Display/BlocksListMode.cs
@@ -5,6 +5,4 @@ public enum BlocksListMode
         Preview,
         Full
     }
-
-    public record BlockListContext(string EntityUrl, BlocksListMode Mode);
 }