From 0c76809ee25418925b140b8824641b3b732bc3a5 Mon Sep 17 00:00:00 2001
From: Tobias Klika <cee@live.at>
Date: Mon, 25 May 2020 11:27:23 +0200
Subject: [PATCH] output nested renderers in editor

---
 zero.Core/Api/PageTreeApi.cs                  | 10 +--
 zero.Core/Api/PagesApi.cs                     | 44 +++++++++---
 zero.Core/Entities/Pages/Page.cs              | 24 +++++--
 zero.Core/ServiceCollectionExtensions.cs      | 14 ++--
 .../TestData/Renderers/NewsPageRenderer.cs    |  2 +
 zero.Web.UI/App/editor/editor-component.vue   |  6 +-
 zero.Web.UI/App/pages/pages/page.vue          | 68 ++++++++-----------
 zero.Web.UI/Sass/Modules/_box.scss            |  8 +++
 zero.Web/Controllers/PageTreeController.cs    | 10 +--
 zero.Web/Controllers/PagesController.cs       | 19 +++++-
 zero.Web/Defaults/DefaultBackofficePlugin.cs  |  1 +
 zero.Web/Renderers/LanguageRenderer.cs        | 19 ++++++
 zero.Web/ZeroBuilder.cs                       |  2 -
 13 files changed, 147 insertions(+), 80 deletions(-)
 create mode 100644 zero.Web/Renderers/LanguageRenderer.cs

diff --git a/zero.Core/Api/PageTreeApi.cs b/zero.Core/Api/PageTreeApi.cs
index 8b664fe1..cd336996 100644
--- a/zero.Core/Api/PageTreeApi.cs
+++ b/zero.Core/Api/PageTreeApi.cs
@@ -12,7 +12,7 @@ using zero.Core.Options;
 
 namespace zero.Core.Api
 {
-  public class PageTreeApi : AppAwareBackofficeApi, IPageTreeApi
+  public class PageTreeApi<T> : AppAwareBackofficeApi, IPageTreeApi<T> where T : IPage
   {
     protected IZeroOptions Options { get; private set; }
 
@@ -31,8 +31,8 @@ namespace zero.Core.Api
 
       using (IAsyncDocumentSession session = Raven.OpenAsyncSession())
       {
-        IList<Page> pages = await session
-          .Query<Page>()
+        IList<T> pages = await session
+          .Query<T>()
           .Scope(Scope)
           .WhereIf(x => x.ParentId == parentId, !parentId.IsNullOrEmpty(), x => x.ParentId == null)
           .ToListAsync();
@@ -65,7 +65,7 @@ namespace zero.Core.Api
 
 
         // build tree
-        foreach (Page page in pages)
+        foreach (T page in pages)
         {
           PageType pageType = pageTypes.FirstOrDefault(x => x.Alias == page.PageTypeAlias);
 
@@ -117,7 +117,7 @@ namespace zero.Core.Api
   }
 
 
-  public interface IPageTreeApi : IAppAwareBackofficeApi
+  public interface IPageTreeApi<T> where T : IPage
   {
     /// <summary>
     /// Get all children for the current parent page (or root if empty)
diff --git a/zero.Core/Api/PagesApi.cs b/zero.Core/Api/PagesApi.cs
index 0e510c09..a650f91f 100644
--- a/zero.Core/Api/PagesApi.cs
+++ b/zero.Core/Api/PagesApi.cs
@@ -9,7 +9,7 @@ using zero.Core.Options;
 
 namespace zero.Core.Api
 {
-  public class PagesApi : AppAwareBackofficeApi, IPagesApi
+  public class PagesApi<T> : AppAwareBackofficeApi, IPagesApi<T> where T : IPage
   {
     protected IZeroOptions Options { get; private set; }
 
@@ -20,16 +20,9 @@ namespace zero.Core.Api
 
 
     /// <inheritdoc />
-    public async Task<IList<Page>> GetChildren(string parentId = null)
+    public async Task<T> GetById(string id)
     {
-      using (IAsyncDocumentSession session = Raven.OpenAsyncSession())
-      {
-        return await session
-          .Query<Page>()
-          .Scope(Scope)
-          .WhereIf(x => x.ParentId == parentId, !parentId.IsNullOrEmpty(), x => x.ParentId == null)
-          .ToListAsync();
-      }
+      return await GetById<T>(id);
     }
 
 
@@ -65,11 +58,30 @@ namespace zero.Core.Api
 
       return types.Where(x => pageType.AllowedChildrenTypes.Contains(x.Alias)).ToList();
     }
+
+
+    /// <inheritdoc />
+    public async Task<EntityResult<T>> Save(T model)
+    {
+      return await Save(model, null);
+    }
+
+
+    /// <inheritdoc />
+    public async Task<EntityResult<T>> Delete(string id)
+    {
+      return await DeleteById<T>(id);
+    }
   }
 
 
-  public interface IPagesApi : IAppAwareBackofficeApi
+  public interface IPagesApi<T> where T : IPage
   {
+    /// <summary>
+    /// Get page by Id
+    /// </summary>
+    Task<T> GetById(string id);
+
     /// <summary>
     /// Get all available page types
     /// </summary>
@@ -79,5 +91,15 @@ namespace zero.Core.Api
     /// Get all page types which are allowed below a selected parent page
     /// </summary>
     Task<IList<PageType>> GetAllowedPageTypes(string parentId = null);
+
+    /// <summary>
+    /// Creates or updates a page
+    /// </summary>
+    Task<EntityResult<T>> Save(T model);
+
+    /// <summary>
+    /// Deletes a page by Id
+    /// </summary>
+    Task<EntityResult<T>> Delete(string id);
   }
 }
diff --git a/zero.Core/Entities/Pages/Page.cs b/zero.Core/Entities/Pages/Page.cs
index 15fccfa4..342b800a 100644
--- a/zero.Core/Entities/Pages/Page.cs
+++ b/zero.Core/Entities/Pages/Page.cs
@@ -4,19 +4,29 @@
   /// A page can consist of unlimited properties and be rendered as you wish
   /// The backoffice rendering is done by an IRenderer
   /// </summary>
-  public class Page : ZeroEntity, IAppAwareEntity, IZeroDbConventions
+  public class Page : ZeroEntity, IPage
   {
-    /// <summary>
-    /// Id of the parent page
-    /// </summary>
+    /// <inheritdoc />
     public string ParentId { get; set; }
 
-    /// <summary>
-    /// Alias of the used page type
-    /// </summary>
+    /// <inheritdoc />
     public string PageTypeAlias { get; set; }
 
     /// <inheritdoc />
     public string AppId { get; set; }
   }
+
+
+  public interface IPage : IZeroEntity, IAppAwareEntity, IZeroDbConventions
+  {
+    /// <summary>
+    /// Id of the parent page
+    /// </summary>
+    string ParentId { get; set; }
+
+    /// <summary>
+    /// Alias of the used page type
+    /// </summary>
+    string PageTypeAlias { get; set; }
+  }
 }
\ No newline at end of file
diff --git a/zero.Core/ServiceCollectionExtensions.cs b/zero.Core/ServiceCollectionExtensions.cs
index b3bef5bd..3b235ac8 100644
--- a/zero.Core/ServiceCollectionExtensions.cs
+++ b/zero.Core/ServiceCollectionExtensions.cs
@@ -14,18 +14,20 @@ namespace zero.Core.Entities
       services.AddAllByInterfaceTransient(typeof(IValidator), typeof(IValidator<>), AppDomain.CurrentDomain.GetAssemblies());
 
       services.AddTransient<IApplication, Application>(); 
-      services.AddTransient(typeof(IApplicationsApi<>), typeof(ApplicationsApi<>));
-
       services.AddTransient<ICountry, Country>();
-      services.AddTransient(typeof(ICountriesApi<>), typeof(CountriesApi<>));
-
       services.AddTransient<ILanguage, Language>();
-      services.AddTransient(typeof(ILanguagesApi<>), typeof(LanguagesApi<>));
-
       services.AddTransient<ITranslation, Translation>();
+      services.AddTransient<IPage, Page>();
+
+
+      services.AddTransient(typeof(IApplicationsApi<>), typeof(ApplicationsApi<>));
+      services.AddTransient(typeof(ICountriesApi<>), typeof(CountriesApi<>));
+      services.AddTransient(typeof(ILanguagesApi<>), typeof(LanguagesApi<>));
       services.AddTransient(typeof(ITranslationsApi), typeof(TranslationsApi));
       services.AddTransient(typeof(ITranslationsApi<>), typeof(TranslationsApi<>));
       services.AddTransient(typeof(ITranslationsApiFacade), typeof(TranslationsApiFacade));
+      services.AddTransient(typeof(IPagesApi<>), typeof(PagesApi<>));
+      services.AddTransient(typeof(IPageTreeApi<>), typeof(PageTreeApi<>));
     }
 
 
diff --git a/zero.Debug/TestData/Renderers/NewsPageRenderer.cs b/zero.Debug/TestData/Renderers/NewsPageRenderer.cs
index da4b9578..190cbafb 100644
--- a/zero.Debug/TestData/Renderers/NewsPageRenderer.cs
+++ b/zero.Debug/TestData/Renderers/NewsPageRenderer.cs
@@ -10,6 +10,8 @@ namespace zero.TestData
   {
     public NewsPageRenderer()
     {
+      Alias = "debug.newspage";
+
       LabelTemplate = "@_test.fields.{0}";
       DescriptionTemplate = "@_test.fields.{0}_text";
 
diff --git a/zero.Web.UI/App/editor/editor-component.vue b/zero.Web.UI/App/editor/editor-component.vue
index fa794bfd..ae9c60d6 100644
--- a/zero.Web.UI/App/editor/editor-component.vue
+++ b/zero.Web.UI/App/editor/editor-component.vue
@@ -54,7 +54,7 @@
     computed: {
       params()
       {
-        return this.component.params;
+        return this.view === 'renderer' ? this.component : this.component.params;
       },
       view()
       {
@@ -63,7 +63,7 @@
       classes()
       {
         let classes = this.component.params.options.classes;
-        if (this.view === 'nested')
+        if (this.view === 'nested' || this.view === 'renderer')
         {
           classes.push('full-width');
         }
@@ -89,7 +89,7 @@
         }
         else if (this.view === 'renderer')
         {
-          return import(`zero/editor/editor-nested`);
+          return import(`zero/editor/editor`);
         }
         else
         {
diff --git a/zero.Web.UI/App/pages/pages/page.vue b/zero.Web.UI/App/pages/pages/page.vue
index 30460034..2de20184 100644
--- a/zero.Web.UI/App/pages/pages/page.vue
+++ b/zero.Web.UI/App/pages/pages/page.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="page">
+  <ui-form ref="form" class="page" v-slot="form" @submit="onSubmit" @load="onLoad">
     <ui-header-bar :title="title" :on-back="onBack">
       <ui-dropdown>
         <template v-slot:button>
@@ -8,16 +8,17 @@
         <ui-dropdown-list v-model="actions" :action="actionSelected" />
       </ui-dropdown>
       <ui-button type="white" label="Preview" icon="fth-eye" />
-      <ui-button label="Save" />
+      <ui-button :submit="true" label="Save" />
     </ui-header-bar>
 
-     <ui-editor :config="renderer" v-model="model" />
-  </div>
+     <ui-editor v-if="!loading" :config="renderer" v-model="model" />
+  </ui-form>
 </template>
 
 
 <script>
   import UiEditor from 'zero/editor/editor';
+  import PagesApi from 'zero/resources/pages';
 
   export default {
 
@@ -26,7 +27,8 @@
     components: { UiEditor },
 
     data: () => ({
-      renderer: 'debug.redirectpage',
+      loading: true,
+      renderer: null,
       actions: [],
       model: {
         name: null,
@@ -37,38 +39,6 @@
       }
     }),
 
-    created()
-    {
-      this.actions.push({
-        name: 'Create',
-        icon: 'fth-plus'
-      });
-      this.actions.push({
-        name: 'Move',
-        icon: 'fth-corner-down-right'
-      });
-      this.actions.push({
-        name: 'Copy',
-        icon: 'fth-copy',
-        disabled: true
-      });
-      this.actions.push({
-        name: 'Sort',
-        icon: 'fth-arrow-down'
-      });
-      this.actions.push({
-        type: 'separator'
-      });
-      this.actions.push({
-        name: 'Delete',
-        icon: 'fth-x',
-        action(item, dropdown)
-        {
-          dropdown.hide();
-        }
-      });
-    },
-
 
     computed: {
       isCreate()
@@ -111,7 +81,29 @@
       onBack()
       {
         this.$router.go(-1);
-      }
+      },
+
+      onLoad(form)
+      {
+        form.load(PagesApi.getById(this.$route.params.id)).then(response =>
+        {
+          this.renderer = 'debug.' + response.entity.pageTypeAlias + 'page';
+          this.model = response.entity;
+          this.loading = false;
+        });
+      },
+
+
+      onSubmit(form)
+      {
+        //this.fullModel.model = this.model;
+
+        console.info(JSON.parse(JSON.stringify(this.model)));
+        //form.handle(PagesApi.save(this.model)).then(response =>
+        //{
+        //  console.info(response);
+        //});
+      },
 
     }
   }
diff --git a/zero.Web.UI/Sass/Modules/_box.scss b/zero.Web.UI/Sass/Modules/_box.scss
index f5b2f6e4..ab9c467e 100644
--- a/zero.Web.UI/Sass/Modules/_box.scss
+++ b/zero.Web.UI/Sass/Modules/_box.scss
@@ -23,6 +23,14 @@
     padding: 0 var(--padding) 25px;
     border-bottom: 1px solid var(--color-line-light);
   }
+
+  .ui-property-content &
+  {
+    margin: 0;
+    padding: 0;
+    background: transparent;
+    box-shadow: none;
+  }
 }
 
 .ui-blank-box
diff --git a/zero.Web/Controllers/PageTreeController.cs b/zero.Web/Controllers/PageTreeController.cs
index edd96e61..aa79fd68 100644
--- a/zero.Web/Controllers/PageTreeController.cs
+++ b/zero.Web/Controllers/PageTreeController.cs
@@ -1,15 +1,15 @@
-using Microsoft.AspNetCore.Hosting;
-using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
 using zero.Core.Api;
+using zero.Core.Entities;
 
 namespace zero.Web.Controllers
 {
-  public class PageTreeController : BackofficeController
+  public class PageTreeController<T> : BackofficeController where T : IPage
   {
-    IPageTreeApi Api;
+    IPageTreeApi<T> Api;
 
-    public PageTreeController(IPageTreeApi api)
+    public PageTreeController(IPageTreeApi<T> api)
     {
       Api = api;
     }
diff --git a/zero.Web/Controllers/PagesController.cs b/zero.Web/Controllers/PagesController.cs
index f4107a63..fa3b51b6 100644
--- a/zero.Web/Controllers/PagesController.cs
+++ b/zero.Web/Controllers/PagesController.cs
@@ -1,14 +1,15 @@
 using Microsoft.AspNetCore.Mvc;
 using System.Threading.Tasks;
 using zero.Core.Api;
+using zero.Core.Entities;
 
 namespace zero.Web.Controllers
 {
-  public class PagesController : BackofficeController
+  public class PagesController<T> : BackofficeController where T : IPage
   {
-    IPagesApi Api;
+    IPagesApi<T> Api;
 
-    public PagesController(IPagesApi api)
+    public PagesController(IPagesApi<T> api)
     {
       Api = api;
     }
@@ -21,5 +22,17 @@ namespace zero.Web.Controllers
     {
       return Json(await Api.GetAllowedPageTypes(parent));
     }
+
+
+    /// <summary>
+    /// Get translation by id
+    /// </summary>  
+    //public IActionResult GetEmpty() => JsonEdit(new T());
+
+
+    /// <summary>
+    /// Get page by id
+    /// </summary>  
+    public async Task<IActionResult> GetById([FromQuery] string id) => JsonEdit(await Api.GetById(id));
   }
 }
diff --git a/zero.Web/Defaults/DefaultBackofficePlugin.cs b/zero.Web/Defaults/DefaultBackofficePlugin.cs
index fb5cb141..4a4029a4 100644
--- a/zero.Web/Defaults/DefaultBackofficePlugin.cs
+++ b/zero.Web/Defaults/DefaultBackofficePlugin.cs
@@ -16,6 +16,7 @@ namespace zero.Web.Defaults
       EntityMap.Use<ICountry, Country>();
       EntityMap.Use<ILanguage, Language>();
       EntityMap.Use<ITranslation, Translation>();
+      EntityMap.Use<IPage, Page>();
     }
     
     public void Configure(IZeroPluginOptions plugin, IZeroOptions zero)
diff --git a/zero.Web/Renderers/LanguageRenderer.cs b/zero.Web/Renderers/LanguageRenderer.cs
new file mode 100644
index 00000000..00e8a8df
--- /dev/null
+++ b/zero.Web/Renderers/LanguageRenderer.cs
@@ -0,0 +1,19 @@
+//using FluentValidation;
+//using System.Threading.Tasks;
+//using zero.Core.Entities;
+//using zero.Core.Renderer;
+
+//namespace zero.Web.Renderers
+//{
+//  public class LanguageRenderer : AbstractRenderer<Language>
+//  {
+//    public LanguageRenderer()
+//    {
+//      Field(x => x.Name).Text();
+//      Field(x => x.Code).Text();
+//      Field(x => x.IsDefault).Toggle();
+
+//      RuleFor(x => x.Name).NotEmpty();
+//    }
+//  }
+//}
\ No newline at end of file
diff --git a/zero.Web/ZeroBuilder.cs b/zero.Web/ZeroBuilder.cs
index b5ace5a6..6223b2e7 100644
--- a/zero.Web/ZeroBuilder.cs
+++ b/zero.Web/ZeroBuilder.cs
@@ -96,8 +96,6 @@ namespace zero.Web
 
       Services.AddTransient<ISetupApi, SetupApi>();
       Services.AddTransient<ISectionsApi, SectionsApi>();
-      Services.AddTransient<IPagesApi, PagesApi>();
-      Services.AddTransient<IPageTreeApi, PageTreeApi>();
       Services.AddTransient<ISettingsApi, SettingsApi>();
       Services.AddTransient<IAuthenticationApi, AuthenticationApi>();
       Services.AddTransient<IUserApi, UserApi>();