From dd56dd405d2292fded4b39f5459f97042e58f185 Mon Sep 17 00:00:00 2001
From: Ahmet <ahmet.cotur@hotmail.com>
Date: Wed, 20 Jan 2021 12:42:36 +0300
Subject: [PATCH] Page content converted to nullable

---
 .../Contents/ContentViewComponent.cs          | 32 +++++++++++--------
 .../Shared/Components/Contents/Default.cshtml |  2 +-
 .../Shared/Components/Pages/Default.cshtml    | 12 +++----
 3 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Contents/ContentViewComponent.cs b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Contents/ContentViewComponent.cs
index 129bff61cf..6a2a4e5a13 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Contents/ContentViewComponent.cs
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Contents/ContentViewComponent.cs
@@ -2,6 +2,7 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc;
+using Volo.Abp.Domain.Entities;
 using Volo.CmsKit.Public.Contents;
 using Volo.CmsKit.Web.Contents;
 
@@ -25,18 +26,26 @@ namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Contents
             string entityType,
             string entityId)
         {
-            var content = await contentAppService.GetAsync(new GetContentInput
+            var content = string.Empty;
+            
+            try
             {
-                EntityId = entityId,
-                EntityType = entityType
-            });
+                var contentDto = await contentAppService.GetAsync(new GetContentInput
+                {
+                    EntityId = entityId,
+                    EntityType = entityType
+                });
+
+                content = contentDto.Value;
+            }
+            catch (EntityNotFoundException e)
+            {
+                // ContentDto can be null, we will render empty content.
+            }
 
             var viewModel = new ContentViewModel
             {
-                EntityId = entityId,
-                EntityType = entityType,
-                ContentId = content.Id,
-                Rendered = await contentRenderer.RenderAsync(content.Value)
+                Value = await contentRenderer.RenderAsync(content)
             };
 
             return View("~/Pages/CmsKit/Shared/Components/Contents/Default.cshtml", viewModel);
@@ -44,12 +53,7 @@ namespace Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Contents
 
         public class ContentViewModel
         {
-            public Guid ContentId { get; set; }
-            public string EntityType { get; set; }
-
-            public string EntityId { get; set; }
-
-            public string Rendered { get; set; }
+            public string Value { get; set; }
         }
     }
 }
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Contents/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Contents/Default.cshtml
index 29f7bfa6a3..0f1ddedfe5 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Contents/Default.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Contents/Default.cshtml
@@ -1,3 +1,3 @@
 @model Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Contents.ContentViewComponent.ContentViewModel
 
-@Html.Raw(Model.Rendered)
+@Html.Raw(Model.Value)
diff --git a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Pages/Default.cshtml b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Pages/Default.cshtml
index 28af196e39..e10fa0754a 100644
--- a/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Pages/Default.cshtml
+++ b/modules/cms-kit/src/Volo.CmsKit.Public.Web/Pages/CmsKit/Shared/Components/Pages/Default.cshtml
@@ -1,16 +1,16 @@
 @addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI.Bootstrap
 
 @using Microsoft.AspNetCore.Mvc.RazorPages
+@using Volo.Abp.AspNetCore.Mvc.UI.Layout
 @using Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Contents
 @model Volo.CmsKit.Public.Web.Pages.CmsKit.Shared.Components.Pages.PageViewModel
+@inject IPageLayout PageLayout
+
+@{
+    PageLayout.Content.Title = Model.Title;
+}
 
 <abp-card>
-    <abp-card-header>
-        <h3>
-            @Model.Title
-        </h3>
-    </abp-card-header>
-    
     <abp-card-body>
         @await Component.InvokeAsync(typeof(ContentViewComponent), 
             new