edit, remove + toggle page modules

zero.Web/Controllers/BackofficeController.cs

@@ -57,17 +57,15 @@ namespace zero.Web.Controllers
     /// <summary>
     /// Creates an edit model with appropriate options and permissions
     /// </summary>
-    public JsonResult Edit<T>(T data, bool typed = true, Action<dynamic> transform = null) where T : IZeroIdEntity
+    public JsonResult Edit<T>(T data, bool typed = true, Action<EditModel<T>> transform = null) where T : IZeroIdEntity
     {
       Type type = typeof(T);
       bool canBeShared = AppAwareShareableType.IsAssignableFrom(type);
 
       //ControllerContext.ActionDescriptor.FilterDescriptors[0].
 
-      dynamic model = new ExpandoObject();
+      EditModel<T> model = new EditModel<T>();
       model.Entity = data;
-
-      model.Meta = new ExpandoObject();
       model.Meta.Token = Token.Get(data);
       model.Meta.IsAppAware = AppAwareType.IsAssignableFrom(type);
       model.Meta.CanBeShared = canBeShared;
@@ -82,6 +80,32 @@ namespace zero.Web.Controllers
     }
 
 
+    /// <summary>
+    /// Creates an edit model with appropriate options and permissions
+    /// </summary>
+    public JsonResult Edit<T, TWrapper>(TWrapper data, bool typed = true, Action<EditModel<T>> transform = null) 
+      where T : IZeroIdEntity
+      where TWrapper : EditModel<T>, new() 
+    {
+      Type type = typeof(T);
+      bool canBeShared = AppAwareShareableType.IsAssignableFrom(type);
+
+      //ControllerContext.ActionDescriptor.FilterDescriptors[0].
+
+      data.Meta.Token = Token.Get(data.Entity);
+      data.Meta.IsAppAware = AppAwareType.IsAssignableFrom(type);
+      data.Meta.CanBeShared = canBeShared;
+      data.Meta.CanCreate = true;
+      data.Meta.CanCreateShared = canBeShared;
+      data.Meta.CanEdit = true;
+      data.Meta.CanDelete = true;
+
+      transform?.Invoke(data);
+
+      return Json(data, typed);
+    }
+
+
     public IActionResult JsonPreviews<T>(Dictionary<string, T> items, Func<T, PreviewModel> transform)
     {
       IList<PreviewModel> previews = new List<PreviewModel>();

zero.Web/Controllers/PagesController.cs

@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using zero.Core.Api;
 using zero.Core.Entities;
+using zero.Web.Models;
 
 namespace zero.Web.Controllers
 {
@@ -22,7 +23,17 @@ namespace zero.Web.Controllers
  
     public IActionResult GetPageType([FromQuery] string alias) => Json(Api.GetPageType(alias));
 
-    public async Task<IActionResult> GetById([FromQuery] string id) => Edit(await Api.GetById(id));
+    public async Task<IActionResult> GetById([FromQuery] string id)
+    {
+      T entity = await Api.GetById(id);
+
+      return Edit<T, PageEditModel<T>>(new PageEditModel<T>()
+      {
+        Entity = entity,
+        Revisions = await RevisionsApi.GetPaged<T>(id),
+        PageType = Api.GetPageType(entity.PageTypeAlias)
+      });
+    }
 
     public IActionResult GetEmpty(string type, string parent = null) => Edit(new T()
     {

zero.Web/Models/ObsoleteEditModel.cs

@@ -4,7 +4,6 @@ namespace zero.Web.Models
 {
   public class EditModel : EditModel<object> { }
 
-
   public class EditModel<T>
   {
     /// <summary>
@@ -12,6 +11,15 @@ namespace zero.Web.Models
     /// </summary>
     public T Entity { get; set; }
 
+    /// <summary>
+    /// Meta data
+    /// </summary>
+    public EditMetaModel Meta { get; set; } = new EditMetaModel();
+  }
+
+
+  public class EditMetaModel
+  {
     /// <summary>
     /// Whether an entity of this type can be created
     /// </summary>

zero.Web/Models/PageEditModel.cs

@@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using zero.Core.Entities;
+
+namespace zero.Web.Models
+{
+  public class PageEditModel<T> : EditModel<T> where T : IPage
+  {
+    public PageType PageType { get; set; }
+
+    public ListResult<Revision> Revisions { get; set; }
+  }
+}