Move context to own model and add as property on new BlockListItemViewPage

Author: skttl

src/Our.Umbraco.BlockListMvc/Constants.cs

@@ -8,6 +8,6 @@ namespace Our.Umbraco.BlockListMvc
 {
     public class Constants
     {
-        public const string BlockListViewDataKey = "Our.Umbraco.BlockListMvc.BlockList";
+        public const string BlockListItemContextViewDataKey = "Our.Umbraco.BlockListMvc.BlockListItemContext";
     }
 }

src/Our.Umbraco.BlockListMvc/Controllers/BlockListMvcSurfaceController.cs

@@ -1,4 +1,5 @@
-using System;
+using Our.Umbraco.BlockListMvc.Models;
+using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
@@ -21,6 +22,11 @@ public TModel Model
             get { return (TModel)ControllerContext.RouteData.Values["blockListItem"]; }
         }
 
+        public BlockListItemContext BlockListItemContext
+        {
+            get { return (BlockListItemContext)ControllerContext.RouteData.Values["blockListItemContext"]; }
+        }
+
         public string ViewPath
         {
             get { return ControllerContext.RouteData.Values["blockListItemViewPath"] as string ?? string.Empty; }
@@ -31,6 +37,11 @@ public string ContentTypeAlias
             get { return ControllerContext.RouteData.Values["blockListItemContentTypeAlias"] as string ?? string.Empty; }
         }
 
+        protected void SetBlockListItemContext()
+        {
+            ViewData[Constants.BlockListItemContextViewDataKey] = BlockListItemContext;
+        }
+
         protected PartialViewResult CurrentPartialView(object model = null)
         {
             if (model == null)
@@ -48,13 +59,14 @@ protected PartialViewResult CurrentPartialView(object model = null)
 
         protected override PartialViewResult PartialView(string viewName, object model)
         {
+            SetBlockListItemContext();
+
             if (string.IsNullOrWhiteSpace(ViewPath) == false)
             {
                 var viewPath = GetFullViewPath(viewName, ViewPath);
                 if (ViewEngines.Engines.FindPartialView(ControllerContext, viewPath).View != null)
                     return base.PartialView(viewPath, model);
             }
-
             return base.PartialView(viewName, model);
         }
 

src/Our.Umbraco.BlockListMvc/Helpers/RenderHelper.cs

@@ -70,7 +70,8 @@ internal static BlockListItemRendering GetBlockListItemData(BlockListItem item,
 
             rendering.RouteValues = new
             {
-                blockListItem = new BlockListItemWithContext(item, list),
+                blockListItem = item,
+                blockListItemContext = new BlockListItemContext(item, list),
                 blockListItemContentTypeAlias = contentTypeAlias,
                 blockListItemViewPath = viewPath
             };

src/Our.Umbraco.BlockListMvc/Models/BlockListItemContext.cs

@@ -5,13 +5,12 @@
 using System.Threading.Tasks;
 using Umbraco.Core;
 using Umbraco.Core.Models.Blocks;
-using Umbraco.Core.Models.PublishedContent;
 
 namespace Our.Umbraco.BlockListMvc.Models
 {
-    public class BlockListItemWithContext : BlockListItem
+    public class BlockListItemContext
     {
-        public BlockListItemWithContext(BlockListItem item, BlockListModel list) : base(item.ContentUdi, item.Content, item.SettingsUdi, item.Settings)
+        public BlockListItemContext(BlockListItem item, BlockListModel list)
         {
             Item = item;
             List = list;
@@ -35,26 +34,4 @@ public BlockListItemWithContext(BlockListItem item, BlockListModel list) : base(
         private BlockListItem _nextBlock;
         public BlockListItem NextBlock => _nextBlock ?? (_nextBlock = List != null && !IsLast ? List[Index + 1] : null);
     }
-
-    public class BlockListItemWithContext<T> : BlockListItemWithContext
-        where T : IPublishedElement
-    {
-        public BlockListItemWithContext(BlockListItem item, BlockListModel list) : base(item, list)
-        {
-
-        }
-        public new T Content { get; }
-    }
-
-    public class BlockListItemWithContext<TContent, TSettings> : BlockListItemWithContext
-        where TContent : IPublishedElement
-        where TSettings : IPublishedElement
-    {
-        public BlockListItemWithContext(BlockListItem item, BlockListModel list) : base(item, list)
-        {
-
-        }
-        public new TContent Content { get; }
-        public new TSettings Settings { get; }
-    }
 }

src/Our.Umbraco.BlockListMvc/Mvc/BlockListItemViewPage.cs

@@ -0,0 +1,21 @@
+using Our.Umbraco.BlockListMvc.Models;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Umbraco.Web.Mvc;
+
+namespace Our.Umbraco.BlockListMvc.Mvc
+{
+    public abstract class BlockListItemViewPage<T> : UmbracoViewPage<T>
+    {
+        private BlockListItemContext _blockContext;
+        public BlockListItemContext BlockContext => _blockContext ?? (_blockContext = ViewData[Constants.BlockListItemContextViewDataKey] as BlockListItemContext);
+
+        protected override void InitializePage()
+        {
+            base.InitializePage();
+        }
+    }
+}