View and edit links in changesets view. Closes #249.

impworks · Dec 15, 2023 · 530471f · 530471f
1 parent f5834e8
commit 530471f
Show file tree

Hide file tree

Showing 5 changed files with 101 additions and 2 deletions.
diff --git a/src/Bonsai/Areas/Admin/Logic/Changesets/ChangesetsManagerService.cs b/src/Bonsai/Areas/Admin/Logic/Changesets/ChangesetsManagerService.cs
@@ -120,6 +120,10 @@ public async Task<ChangesetsListVM> GetChangesetsAsync(ChangesetsListRequestVM r
                                          EntityType = x.EntityType,
                                          EntityTitle = GetEntityTitle(x),
                                          EntityThumbnailUrl = GetEntityThumbnailUrl(x),
+                                         EntityExists = x.EditedMedia?.IsDeleted == false
+                                                        || x.EditedPage?.IsDeleted == false
+                                                        || x.EditedRelation?.IsDeleted == false,
+                                         EntityKey = x.EditedPage?.Key ?? x.EditedMedia?.Key,
                                          PageType = GetPageType(x),
                                          CanRevert = CanRevert(x)
                                      })
@@ -133,7 +137,14 @@ public async Task<ChangesetsListVM> GetChangesetsAsync(ChangesetsListRequestVM r
         /// </summary>
         public async Task<ChangesetDetailsVM> GetChangesetDetailsAsync(Guid id)
         {
-            var (chg, prev) = await GetChangesetPairAsync(id, q => q.AsNoTracking().Include(x => x.Author).Include(x => x.EditedMedia));
+            var (chg, prev) = await GetChangesetPairAsync(
+                id,
+                q => q.AsNoTracking()
+                      .Include(x => x.Author)
+                      .Include(x => x.EditedMedia)
+                      .Include(x => x.EditedPage)
+                      .Include(x => x.EditedRelation)
+            );
 
             var renderer = _renderers[chg.EntityType];
             var prevData = await renderer.RenderValuesAsync(prev?.UpdatedState);
@@ -146,6 +157,11 @@ public async Task<ChangesetDetailsVM> GetChangesetDetailsAsync(Guid id)
                 Date = chg.Date,
                 ChangeType = chg.ChangeType,
                 EntityType = chg.EntityType,
+                EntityId = chg.EditedPageId ?? chg.EditedMediaId ?? chg.EditedRelationId ?? Guid.Empty,
+                EntityExists = chg.EditedMedia?.IsDeleted == false
+                               || chg.EditedPage?.IsDeleted == false
+                               || chg.EditedRelation?.IsDeleted == false,
+                EntityKey = chg.EditedPage?.Key ?? chg.EditedMedia?.Key,
                 ThumbnailUrl = chg.EditedMedia != null
                     ? MediaPresenterService.GetSizedMediaPath(chg.EditedMedia.FilePath, MediaSize.Small)
                     : null,

diff --git a/src/Bonsai/Areas/Admin/ViewModels/Changesets/ChangesetDetailsVM.cs b/src/Bonsai/Areas/Admin/ViewModels/Changesets/ChangesetDetailsVM.cs
@@ -34,6 +34,21 @@ public class ChangesetDetailsVM
         /// </summary>
         public ChangesetEntityType EntityType { get; set; }
 
+        /// <summary>
+        /// ID of the entity that has been edited.
+        /// </summary>
+        public Guid EntityId { get; set; }
+
+        /// <summary>
+        /// Flag indicating that the entity has a current version that can be viewed.
+        /// </summary>
+        public bool EntityExists { get; set; }
+
+        /// <summary>
+        /// Frontend-based key of the entity.
+        /// </summary>
+        public string EntityKey { get; set; }
+
         /// <summary>
         /// URL of the thumbnail (for media changesets).
         /// </summary>

diff --git a/src/Bonsai/Areas/Admin/ViewModels/Changesets/ChangesetTitleVM.cs b/src/Bonsai/Areas/Admin/ViewModels/Changesets/ChangesetTitleVM.cs
@@ -43,6 +43,16 @@ public class ChangesetTitleVM
         /// </summary>
         public Guid EntityId { get; set; }
 
+        /// <summary>
+        /// Flag indicating that the entity has a current version that can be viewed.
+        /// </summary>
+        public bool EntityExists { get; set; }
+
+        /// <summary>
+        /// Frontend-based key of the entity.
+        /// </summary>
+        public string EntityKey { get; set; }
+
         /// <summary>
         /// Author of the change.
         /// </summary>

diff --git a/src/Bonsai/Areas/Admin/Views/Changesets/Details.cshtml b/src/Bonsai/Areas/Admin/Views/Changesets/Details.cshtml
@@ -1,4 +1,5 @@
 @using System.Globalization
+@using Bonsai.Data.Models
 @using Humanizer
 @using Impworks.Utils.Format
 
@@ -50,4 +51,29 @@
 @if (Model.CanRevert)
 {
     <a class="btn btn-danger" href="@Url.Action("Revert", "Changesets", new {area = "Admin", id = Model.Id})">Восстановить</a>
+}
+
+@if (Model.EntityExists)
+{
+    var editUrl = Model.EntityType switch
+    {
+        ChangesetEntityType.Page => Url.Action("Update", "Pages", new { area = "Admin", id = Model.EntityId }),
+        ChangesetEntityType.Media => Url.Action("Update", "Media", new { area = "Admin", id = Model.EntityId }),
+        ChangesetEntityType.Relation => Url.Action("Update", "Relations", new { area = "Admin", id = Model.EntityId }),
+    };
+    var outUrl = Model.EntityType switch
+    {
+        ChangesetEntityType.Page => Url.Action("Description", "Page", new { area = "Front", key = Model.EntityKey }),
+        ChangesetEntityType.Media => Url.Action("Index", "Home", new { area = "Front" }) + "#media-" + Model.EntityKey,
+        _ => null
+    };
+
+    <a class="btn btn-warning" href="@editUrl">Редактировать</a>
+
+    if (outUrl != null)
+    {
+        <a class="ml-4" href="@outUrl" target="_blank">
+            <span class="fa fa-external-link-square"></span> Текущая версия
+        </a>
+    }
 }
diff --git a/src/Bonsai/Areas/Admin/Views/Changesets/Index.cshtml b/src/Bonsai/Areas/Admin/Views/Changesets/Index.cshtml
@@ -1,4 +1,5 @@
 @using Bonsai.Areas.Admin.ViewModels.Changesets
+@using Bonsai.Data.Models
 @using Humanizer
 @using Impworks.Utils.Format
 @using Impworks.Utils.Strings
@@ -81,7 +82,22 @@
                             @(StringHelper.Coalesce(c.EntityTitle, "—"))
                         </a>
                     </td>
-                    <td>@c.EntityType.GetEnumDescription()</td>
+                    <td>
+                        @if (c.EntityExists)
+                        {
+                            var editUrl = c.EntityType switch
+                            {
+                                ChangesetEntityType.Page => Url.Action("Update", "Pages", new { area = "Admin", id = c.EntityId }),
+                                ChangesetEntityType.Media => Url.Action("Update", "Media", new { area = "Admin", id = c.EntityId }),
+                                ChangesetEntityType.Relation => Url.Action("Update", "Relations", new { area = "Admin", id = c.EntityId }),
+                            };
+                            <a href="@editUrl">@c.EntityType.GetEnumDescription()</a>
+                        }
+                        else
+                        {
+                            <text>@c.EntityType.GetEnumDescription()</text>
+                        }
+                    </td>
                     <td><span title="@c.Date.LocalDateTime.ToLongDateString()">@c.Date.Humanize()</span></td>
                     <td>@c.ChangeType.GetEnumDescription()</td>
                     <td>@c.Author</td>
@@ -92,6 +108,22 @@
                                 <span class="fa fa-history" title="Восстановить"></span>
                             </a>
                         }
+                        @if (c.EntityExists)
+                        {
+                            var outUrl = c.EntityType switch
+                            {
+                                ChangesetEntityType.Page => Url.Action("Description", "Page", new { area = "Front", key = c.EntityKey }),
+                                ChangesetEntityType.Media => Url.Action("Index", "Home", new { area = "Front" }) + "#media-" + c.EntityKey,
+                                _ => null
+                            };
+
+                            if (outUrl != null)
+                            {
+                                <a href="@outUrl" target="_blank">
+                                    <span class="fa fa-external-link-square" title="Просмотреть текущую версию"></span>
+                                </a>
+                            }
+                        }
                     </td>
                 </tr>
             }