#2199 Remove EditLayout from project

fluentcms · Oct 26, 2024 · 65ff8b4 · 65ff8b4
1 parent 4e89d94
commit 65ff8b4
Show file tree

Hide file tree

Showing 36 changed files with 10 additions and 245 deletions.
diff --git a/src/Backend/FluentCMS.Entities/SiteAssociatedEntities/Page.cs b/src/Backend/FluentCMS.Entities/SiteAssociatedEntities/Page.cs
@@ -7,7 +7,6 @@ public class Page : SiteAssociatedEntity
     public int Order { get; set; }
     public string Path { get; set; } = string.Empty; // URL path, only one segment without forward slash (/)
     public Guid? LayoutId { get; set; }
-    public Guid? EditLayoutId { get; set; }
     public Guid? DetailLayoutId { get; set; }
     public bool Locked { get; set; } = false;
 }
diff --git a/src/Backend/FluentCMS.Entities/SiteAssociatedEntities/Site.cs b/src/Backend/FluentCMS.Entities/SiteAssociatedEntities/Site.cs
@@ -7,5 +7,4 @@ public class Site : AuditableEntity
     public List<string> Urls { get; set; } = [];
     public Guid LayoutId { get; set; }
     public Guid DetailLayoutId { get; set; }
-    public Guid EditLayoutId { get; set; }
 }
diff --git a/src/Backend/FluentCMS.Services/LayoutService.cs b/src/Backend/FluentCMS.Services/LayoutService.cs
@@ -68,7 +68,7 @@ public async Task<Layout> Delete(Guid id, CancellationToken cancellationToken =
         var site = await siteRepository.GetById(siteId, cancellationToken) ??
             throw new AppException(ExceptionCodes.SiteNotFound);
 
-        if (site.LayoutId == id || site.EditLayoutId == id || site.DetailLayoutId == id)
+        if (site.LayoutId == id || site.DetailLayoutId == id)
             throw new AppException(ExceptionCodes.LayoutUnableToDeleteDefaultLayout);
 
         var deleted = await layoutRepository.Delete(id, cancellationToken) ??

diff --git a/src/Backend/FluentCMS.Services/MessageHandlers/PageMessageHandler.cs b/src/Backend/FluentCMS.Services/MessageHandlers/PageMessageHandler.cs
@@ -22,11 +22,6 @@ public async Task Handle(Message<Layout> notification, CancellationToken cancell
                         page.DetailLayoutId = null;
                         await pageService.Update(page, cancellationToken);
                     }
-                    if (page.EditLayoutId == layoutId)
-                    {
-                        page.EditLayoutId = null;
-                        await pageService.Update(page, cancellationToken);
-                    }
                 }
                 break;
 
@@ -71,7 +66,6 @@ private async Task CreatePageTemplate(Guid? parentPageId, int order, PageTemplat
             Title = pageTemplate.Title,
             LayoutId = layouts.Where(x => x.Name == pageTemplate.Layout).SingleOrDefault()?.Id,
             DetailLayoutId = layouts.Where(x => x.Name == pageTemplate.DetailLayout).SingleOrDefault()?.Id,
-            EditLayoutId = layouts.Where(x => x.Name == pageTemplate.EditLayout).SingleOrDefault()?.Id,
             Order = order,
             Locked = pageTemplate.Locked,
         };

diff --git a/src/Backend/FluentCMS.Services/Models/PageTemplate.cs b/src/Backend/FluentCMS.Services/Models/PageTemplate.cs
@@ -8,7 +8,6 @@ public class PageTemplate
     public string Title { get; set; } = default!;
     public string? Layout { get; set; } = default!;
     public string? DetailLayout { get; set; } = default!;
-    public string? EditLayout { get; set; } = default!;
     public List<PageTemplate> Children { get; set; } = [];
     public List<PluginTemplate> Plugins { get; set; } = [];
     public bool Locked { get; set; } = false;

diff --git a/src/Backend/FluentCMS.Services/Models/SiteTemplate.cs b/src/Backend/FluentCMS.Services/Models/SiteTemplate.cs
@@ -10,7 +10,6 @@ public class SiteTemplate
     public List<Layout> Layouts { get; set; } = [];
     public List<Block> Blocks { get; set; } = [];
     public string Layout { get; set; } = default!;
-    public string EditLayout { get; set; } = default!;
     public string DetailLayout { get; set; } = default!;
     public List<PageTemplate> Pages { get; set; } = [];
     public List<string> AdminRoles { get; set; } = [];

diff --git a/src/Backend/FluentCMS.Services/SiteService.cs b/src/Backend/FluentCMS.Services/SiteService.cs
@@ -91,7 +91,6 @@ public async Task<Site> Create(SiteTemplate siteTemplate, CancellationToken canc
 
         site.Urls = [ValidateAndFormatUrl(siteTemplate.Url)];
         site.LayoutId = layouts.Where(x => x.Name == siteTemplate.Layout).Single().Id;
-        site.EditLayoutId = layouts.Where(x => x.Name == siteTemplate.EditLayout).Single().Id;
         site.DetailLayoutId = layouts.Where(x => x.Name == siteTemplate.DetailLayout).Single().Id;
 
         ValidateAndFormatUrls(site);

diff --git a/src/Backend/FluentCMS.Web.Api/Controllers/PageController.cs b/src/Backend/FluentCMS.Web.Api/Controllers/PageController.cs
@@ -122,15 +122,13 @@ private async Task<PageFullDetailResponse> GetPageResponse(string domain, string
         var roles = await roleService.GetAllForSite(site.Id, cancellationToken) ?? [];
 
         var layoutId = page.LayoutId ?? site.LayoutId;
-        var editLayoutId = page.EditLayoutId ?? site.EditLayoutId;
         var detailLayoutId = page.DetailLayoutId ?? site.DetailLayoutId;
 
         var pageResponse = mapper.Map<PageFullDetailResponse>(page);
         pageResponse.Site = mapper.Map<SiteDetailResponse>(site);
         pageResponse.Site.AllRoles = mapper.Map<List<RoleDetailResponse>>(roles);
         pageResponse.Site.Settings = siteSettings.Values;
         pageResponse.Layout = mapper.Map<LayoutDetailResponse>(layoutsDict[layoutId]);
-        pageResponse.EditLayout = mapper.Map<LayoutDetailResponse>(layoutsDict[editLayoutId]);
         pageResponse.DetailLayout = mapper.Map<LayoutDetailResponse>(layoutsDict[detailLayoutId]);
         pageResponse.Sections = [];
         pageResponse.Settings = pageSettings.Values;

diff --git a/src/Backend/FluentCMS.Web.Api/Models/Pages/PageCreateRequest.cs b/src/Backend/FluentCMS.Web.Api/Models/Pages/PageCreateRequest.cs
@@ -11,8 +11,6 @@ public class PageCreateRequest
 
     public Guid? DetailLayoutId { get; set; } = default!;
 
-    public Guid? EditLayoutId { get; set; } = default!;
-
     [Required]
     public string Title { get; set; } = string.Empty;
 

diff --git a/src/Backend/FluentCMS.Web.Api/Models/Pages/PageDetailResponse.cs b/src/Backend/FluentCMS.Web.Api/Models/Pages/PageDetailResponse.cs
@@ -10,7 +10,6 @@ public class PageDetailResponse : BaseSiteAssociatedResponse
     public string FullPath { get; set; } = default!;
     public Guid? LayoutId { get; set; }
     public Guid? DetailLayoutId { get; set; }
-    public Guid? EditLayoutId { get; set; }
     public bool Locked { get; set; } = false;
     public IEnumerable<Guid> ViewRoleIds { get; set; } = [];
     public IEnumerable<Guid> AdminRoleIds { get; set; } = [];

diff --git a/src/Backend/FluentCMS.Web.Api/Models/Pages/PageFullDetailResponse.cs b/src/Backend/FluentCMS.Web.Api/Models/Pages/PageFullDetailResponse.cs
@@ -9,7 +9,6 @@ public class PageFullDetailResponse : BaseSiteAssociatedResponse
     public string FullPath { get; set; } = default!;
     public LayoutDetailResponse Layout { get; set; } = default!;
     public LayoutDetailResponse DetailLayout { get; set; } = default!;
-    public LayoutDetailResponse EditLayout { get; set; } = default!;
     public SiteDetailResponse Site { get; set; } = default!;
     public Dictionary<string, List<PluginDetailResponse>> Sections { get; set; } = [];
     public bool Locked { get; set; } = false;

diff --git a/src/Backend/FluentCMS.Web.Api/Models/Site/SiteDetailResponse.cs b/src/Backend/FluentCMS.Web.Api/Models/Site/SiteDetailResponse.cs
@@ -7,7 +7,6 @@ public class SiteDetailResponse : BaseAuditableResponse
     public List<string> Urls { get; set; } = [];
     public Guid LayoutId { get; set; }
     public Guid DetailLayoutId { get; set; }
-    public Guid EditLayoutId { get; set; }
     public IEnumerable<Guid> AdminRoleIds { get; set; } = [];
     public IEnumerable<Guid> ContributorRoleIds { get; set; } = [];
     public List<RoleDetailResponse> AllRoles { get; set; } = [];

diff --git a/src/Backend/FluentCMS.Web.Api/Models/Site/SiteUpdateRequest.cs b/src/Backend/FluentCMS.Web.Api/Models/Site/SiteUpdateRequest.cs
@@ -19,9 +19,6 @@ public class SiteUpdateRequest
     [Required]
     public Guid DetailLayoutId { get; set; } = default!;
 
-    [Required]
-    public Guid EditLayoutId { get; set; } = default!;
-
     [Required]
     public List<Guid> ContributorRoleIds { get; set; } = [];
 

diff --git a/src/FluentCMS/Templates/Blank/EditLayout.body.html b/src/FluentCMS/Templates/Blank/EditLayout.body.html
diff --git a/src/FluentCMS/Templates/Blank/EditLayout.head.html b/src/FluentCMS/Templates/Blank/EditLayout.head.html
diff --git a/src/FluentCMS/Templates/Blank/EditLayout.html b/src/FluentCMS/Templates/Blank/EditLayout.html
diff --git a/src/FluentCMS/Templates/Blank/site.json b/src/FluentCMS/Templates/Blank/site.json
@@ -2,7 +2,6 @@
     "Name": "FluentCMS Administration",
     "Description": "FluentCMS blank site template",
     "Layout": "DefaultLayout",
-    "EditLayout": "EditLayout",
     "DetailLayout": "SingleLayout",
     "AdminRoles": [ "Administrators" ],
     "ContributorRoles": [ "Contributors" ],
@@ -43,9 +42,6 @@
         {
             "Name": "AuthLayout"
         },
-        {
-            "Name": "EditLayout"
-        },
         {
             "Name": "SingleLayout"
         }
@@ -54,15 +50,13 @@
         {
             "Title": "Home",
             "Path": "/",
-            "EditLayout": "EditLayout",
             "ViewRoles": [ "All Users" ],
             "Plugins": []
         },
         {
             "Title": "Admin",
             "Path": "/admin",
             "Layout": "AdminLayout",
-            "EditLayout": "AdminLayout",
             "AdminRoles": [ "Administrators" ],
             "Locked": true,
             "Plugins": [],
@@ -71,7 +65,6 @@
                     "Title": "Content Type Builder",
                     "Path": "/content-types",
                     "Layout": "AdminLayout",
-                    "EditLayout": "AdminLayout",
                     "AdminRoles": [ "Administrators" ],
                     "Locked": true,
                     "Plugins": [
@@ -86,7 +79,6 @@
                     "Title": "Users",
                     "Path": "/users",
                     "Layout": "AdminLayout",
-                    "EditLayout": "AdminLayout",
                     "AdminRoles": [ "Administrators" ],
                     "Locked": true,
                     "Plugins": [
@@ -101,7 +93,6 @@
                     "Title": "File Management",
                     "Path": "/files",
                     "Layout": "AdminLayout",
-                    "EditLayout": "AdminLayout",
                     "AdminRoles": [ "Administrators" ],
                     "Locked": true,
                     "Plugins": [
@@ -116,7 +107,6 @@
                     "Title": "Api Tokens",
                     "Path": "/api-tokens",
                     "Layout": "AdminLayout",
-                    "EditLayout": "AdminLayout",
                     "AdminRoles": [ "Administrators" ],
                     "Locked": true,
                     "Plugins": [
@@ -131,7 +121,6 @@
                     "Title": "Roles",
                     "Path": "/roles",
                     "Layout": "AdminLayout",
-                    "EditLayout": "AdminLayout",
                     "AdminRoles": [ "Administrators" ],
                     "Locked": true,
                     "Plugins": [
@@ -146,7 +135,6 @@
                     "Title": "Sites",
                     "Path": "/sites",
                     "Layout": "AdminLayout",
-                    "EditLayout": "AdminLayout",
                     "AdminRoles": [ "Administrators" ],
                     "Locked": true,
                     "Plugins": [
@@ -161,7 +149,6 @@
                     "Title": "Plugins",
                     "Path": "/plugins",
                     "Layout": "AdminLayout",
-                    "EditLayout": "AdminLayout",
                     "AdminRoles": [ "Administrators" ],
                     "Locked": true,
                     "Plugins": [
@@ -176,7 +163,6 @@
                     "Title": "Pages",
                     "Path": "/pages",
                     "Layout": "AdminLayout",
-                    "EditLayout": "AdminLayout",
                     "AdminRoles": [ "Administrators" ],
                     "Locked": true,
                     "Plugins": [
@@ -191,7 +177,6 @@
                     "Title": "Blocks",
                     "Path": "/blocks",
                     "Layout": "AdminLayout",
-                    "EditLayout": "AdminLayout",
                     "AdminRoles": [ "Administrators" ],
                     "Locked": true,
                     "Plugins": [
@@ -206,7 +191,6 @@
                     "Title": "Layouts",
                     "Path": "/layouts",
                     "Layout": "AdminLayout",
-                    "EditLayout": "AdminLayout",
                     "AdminRoles": [ "Administrators" ],
                     "Locked": true,
                     "Plugins": [
@@ -221,7 +205,6 @@
                     "Title": "GlobalSettings",
                     "Path": "/globalsettings",
                     "Layout": "AdminLayout",
-                    "EditLayout": "AdminLayout",
                     "AdminRoles": [ "Administrators" ],
                     "Locked": true,
                     "Plugins": [
@@ -307,7 +290,6 @@
                     "Path": "/profile",
                     "ViewRoles": [ "Authenticated Users" ],
                     "Layout": "AdminLayout",
-                    "EditLayout": "AdminLayout",
                     "Locked": true,
                     "Plugins": [
                         {

diff --git a/src/FluentCMS/Templates/Default/EditLayout.body.html b/src/FluentCMS/Templates/Default/EditLayout.body.html
diff --git a/src/FluentCMS/Templates/Default/EditLayout.head.html b/src/FluentCMS/Templates/Default/EditLayout.head.html
diff --git a/src/FluentCMS/Templates/Default/EditLayout.html b/src/FluentCMS/Templates/Default/EditLayout.html