feat(display): remove entity from block list context cause it's never…

… used
sitkoru · Sep 8, 2021 · c258cca · c258cca
1 parent 0ff5397
commit c258cca
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 35 deletions.
diff --git a/src/Sitko.Blockly.Blazor/Display/BlockComponent.cs b/src/Sitko.Blockly.Blazor/Display/BlockComponent.cs
@@ -4,21 +4,25 @@
 
 namespace Sitko.Blockly.Blazor.Display
 {
-    public abstract class BlockComponent<TEntity, TBlock, TListOptions> : BaseComponent
-        where TListOptions : BlazorBlocklyListOptions, new()
+    public abstract class BlockComponent<TBlock> : BaseComponent
         where TBlock : ContentBlock
     {
 #if NET6_0_OR_GREATER
         [EditorRequired]
 #endif
         [Parameter]
         public TBlock Block { get; set; } = null!;
+    }
 
+    public abstract class BlockComponent<TBlock, TListOptions> : BlockComponent<TBlock>
+        where TListOptions : BlazorBlocklyListOptions, new()
+        where TBlock : ContentBlock
+    {
 #if NET6_0_OR_GREATER
         [EditorRequired]
 #endif
         [Parameter]
-        public BlockListContext<TEntity> Context { get; set; } = null!;
+        public BlockListContext Context { get; set; } = null!;
 
         protected TListOptions ListOptions { get; set; } = new();
 

diff --git a/src/Sitko.Blockly.Blazor/Display/Blocks/CutBlockComponent.cs b/src/Sitko.Blockly.Blazor/Display/Blocks/CutBlockComponent.cs
@@ -1,7 +1,7 @@
 namespace Sitko.Blockly.Blazor.Display.Blocks
 {
     public abstract class
-        CutBlockComponent<TEntity, TListOptions> : BlockComponent<TEntity, Sitko.Blockly.Blocks.CutBlock, TListOptions>
+        CutBlockComponent<TListOptions> : BlockComponent<Sitko.Blockly.Blocks.CutBlock, TListOptions>
         where TListOptions : BlazorBlocklyListOptions, new()
     {
     }

diff --git a/src/Sitko.Blockly.Blazor/Display/Blocks/FilesBlockComponent.cs b/src/Sitko.Blockly.Blazor/Display/Blocks/FilesBlockComponent.cs
@@ -1,7 +1,7 @@
 namespace Sitko.Blockly.Blazor.Display.Blocks
 {
     public abstract class
-        FilesBlockComponent<TEntity, TListOptions> : BlockComponent<TEntity, Sitko.Blockly.Blocks.FilesBlock,
+        FilesBlockComponent<TListOptions> : BlockComponent<Sitko.Blockly.Blocks.FilesBlock,
             TListOptions> where TListOptions : BlazorBlocklyListOptions, new()
     {
     }

diff --git a/src/Sitko.Blockly.Blazor/Display/Blocks/GalleryBlockComponent.cs b/src/Sitko.Blockly.Blazor/Display/Blocks/GalleryBlockComponent.cs
@@ -1,7 +1,7 @@
 namespace Sitko.Blockly.Blazor.Display.Blocks
 {
     public abstract class
-        GalleryBlockComponent<TEntity, TListOptions> : BlockComponent<TEntity, Sitko.Blockly.Blocks.GalleryBlock,
+        GalleryBlockComponent<TListOptions> : BlockComponent<Sitko.Blockly.Blocks.GalleryBlock,
             TListOptions> where TListOptions : BlazorBlocklyListOptions, new()
     {
     }

diff --git a/src/Sitko.Blockly.Blazor/Display/Blocks/IframeBlockComponent.cs b/src/Sitko.Blockly.Blazor/Display/Blocks/IframeBlockComponent.cs
@@ -1,7 +1,7 @@
 namespace Sitko.Blockly.Blazor.Display.Blocks
 {
     public abstract class
-        IframeBlockComponent<TEntity, TListOptions> : BlockComponent<TEntity, Sitko.Blockly.Blocks.IframeBlock,
+        IframeBlockComponent<TListOptions> : BlockComponent<Sitko.Blockly.Blocks.IframeBlock,
             TListOptions> where TListOptions : BlazorBlocklyListOptions, new()
     {
     }

diff --git a/src/Sitko.Blockly.Blazor/Display/Blocks/QuoteBlockComponent.cs b/src/Sitko.Blockly.Blazor/Display/Blocks/QuoteBlockComponent.cs
@@ -1,7 +1,6 @@
 namespace Sitko.Blockly.Blazor.Display.Blocks
 {
-    public abstract class QuoteBlockComponent<TEntity, TListOptions> : BlockComponent<TEntity,
-        Sitko.Blockly.Blocks.QuoteBlock,
+    public abstract class QuoteBlockComponent<TListOptions> : BlockComponent<Sitko.Blockly.Blocks.QuoteBlock,
         TListOptions> where TListOptions : BlazorBlocklyListOptions, new()
     {
     }

diff --git a/src/Sitko.Blockly.Blazor/Display/Blocks/TextBlockComponent.cs b/src/Sitko.Blockly.Blazor/Display/Blocks/TextBlockComponent.cs
@@ -1,7 +1,7 @@
 namespace Sitko.Blockly.Blazor.Display.Blocks
 {
     public abstract class
-        TextBlockComponent<TEntity, TListOptions> : BlockComponent<TEntity, Sitko.Blockly.Blocks.TextBlock,
+        TextBlockComponent<TListOptions> : BlockComponent<Sitko.Blockly.Blocks.TextBlock,
             TListOptions> where TListOptions : BlazorBlocklyListOptions, new()
     {
     }

diff --git a/src/Sitko.Blockly.Blazor/Display/Blocks/TwitchBlockComponent.cs b/src/Sitko.Blockly.Blazor/Display/Blocks/TwitchBlockComponent.cs
@@ -8,7 +8,7 @@ namespace Sitko.Blockly.Blazor.Display.Blocks
     using Sitko.Blazor.ScriptInjector;
 
     public abstract class
-        TwitchBlockComponent<TEntity, TListOptions> : BlockComponent<TEntity, Sitko.Blockly.Blocks.TwitchBlock,
+        TwitchBlockComponent<TListOptions> : BlockComponent<Sitko.Blockly.Blocks.TwitchBlock,
             TListOptions> where TListOptions : BlazorBlocklyListOptions, new()
     {
         protected ElementReference ContainerRef { get; set; }

diff --git a/src/Sitko.Blockly.Blazor/Display/Blocks/TwitterBlockComponent.cs b/src/Sitko.Blockly.Blazor/Display/Blocks/TwitterBlockComponent.cs
@@ -8,7 +8,7 @@ namespace Sitko.Blockly.Blazor.Display.Blocks
     using Sitko.Blazor.ScriptInjector;
 
     public abstract class
-        TwitterBlockComponent<TEntity, TListOptions> : BlockComponent<TEntity, Sitko.Blockly.Blocks.TwitterBlock,
+        TwitterBlockComponent<TListOptions> : BlockComponent<Sitko.Blockly.Blocks.TwitterBlock,
             TListOptions> where TListOptions : BlazorBlocklyListOptions, new()
     {
         protected ElementReference ContainerRef { get; set; }

diff --git a/src/Sitko.Blockly.Blazor/Display/Blocks/YoutubeBlockComponent.cs b/src/Sitko.Blockly.Blazor/Display/Blocks/YoutubeBlockComponent.cs
@@ -1,7 +1,7 @@
 namespace Sitko.Blockly.Blazor.Display.Blocks
 {
     public abstract class
-        YoutubeBlockComponent<TEntity, TListOptions> : BlockComponent<TEntity, Sitko.Blockly.Blocks.YoutubeBlock,
+        YoutubeBlockComponent<TListOptions> : BlockComponent<Sitko.Blockly.Blocks.YoutubeBlock,
             TListOptions> where TListOptions : BlazorBlocklyListOptions, new()
     {
     }

diff --git a/src/Sitko.Blockly.Blazor/Display/BlocksList.cs b/src/Sitko.Blockly.Blazor/Display/BlocksList.cs
@@ -9,20 +9,10 @@ namespace Sitko.Blockly.Blazor.Display
 {
     using JetBrains.Annotations;
 
-    public abstract class BlocksList<TEntity, TOptions> : BaseComponent where TOptions : BlazorBlocklyListOptions, new()
+    public abstract class BlocksList<TOptions> : BaseComponent where TOptions : BlazorBlocklyListOptions, new()
     {
 #if NET6_0_OR_GREATER
         [EditorRequired]
-#endif
-        [Parameter]
-        public TEntity Entity { get; set; } = default!;
-#if NET6_0_OR_GREATER
-        [EditorRequired]
-#endif
-        [Parameter]
-        public string EntityUrl { get; set; } = null!;
-#if NET6_0_OR_GREATER
-        [EditorRequired]
 #endif
         [Parameter]
         public IEnumerable<ContentBlock> EntityBlocks { get; set; } = null!;
@@ -54,21 +44,23 @@ protected override void Initialize()
         {
             base.Initialize();
             BlockDescriptors = Blockly.Descriptors.ToArray();
-            Context = new BlockListContext<TEntity>(Entity, EntityUrl, ListOptions.Mode);
+            if (Context is null)
+            {
+                throw new InvalidOperationException(LocalizationProvider["You must provide block list context"]);
+            }
         }
 
-        protected BlockListContext<TEntity> Context { get; private set; } = null!;
+#if NET6_0_OR_GREATER
+        [EditorRequired]
+#endif
+        [Parameter]
+        public BlockListContext? Context { get; set; }
 
         [PublicAPI]
         public RenderFragment RenderBlock(IBlazorBlockDescriptor blockDescriptor, ContentBlock block) =>
             builder =>
             {
                 var component = blockDescriptor.DisplayComponent;
-                if (blockDescriptor.DisplayComponent.IsGenericTypeDefinition)
-                {
-                    component = blockDescriptor.DisplayComponent.MakeGenericType(typeof(TEntity));
-                }
-
                 builder.OpenComponent(0, component);
                 builder.AddAttribute(1, "Block", block);
                 builder.AddAttribute(2, "Context", Context);

diff --git a/src/Sitko.Blockly/Display/BlockListContext.cs b/src/Sitko.Blockly/Display/BlockListContext.cs
@@ -6,8 +6,5 @@ public enum BlocksListMode
         Full
     }
 
-    public record BlockListContext(BlocksListMode Mode);
-
-    public record BlockListContext<TEntity>
-        (TEntity Entity, string EntityUrl, BlocksListMode Mode) : BlockListContext(Mode);
+    public record BlockListContext(string EntityUrl, BlocksListMode Mode);
 }