Добавить возможность вернуть старую версию вводной (#3302)

fixes #3291

Author: leotsarev

src/JoinRpg.Portal/Controllers/PlotController.cs

@@ -271,16 +271,22 @@ public async Task<ActionResult> DeleteElement(int plotelementid, int plotFolderI
     private ActionResult ReturnToPlot(PlotFolderIdentification plotFolderId) => RedirectToAction("Edit", new { projectId = plotFolderId.ProjectId.Value, plotFolderId = plotFolderId.PlotFolderId });
 
     [HttpGet, MasterAuthorize()]
-    public async Task<ActionResult> EditElement(int plotelementid, int plotFolderId, int projectId)
+    public async Task<ActionResult> EditElement(ProjectIdentification projectId, PlotElementIdentification elementId, int? version)
     {
-        var folder = await plotRepository.GetPlotFolderAsync(new(projectId, plotFolderId));
+        if (elementId.ProjectId != projectId)
+        {
+            return NotFound();
+        }
+        var folder = await plotRepository.GetPlotFolderAsync(elementId.PlotFolderId);
         if (folder == null)
         {
             return NotFound();
         }
-        var viewModel = new EditPlotElementViewModel(folder.Elements.Single(e => e.PlotElementId == plotelementid),
-          folder.HasMasterAccess(CurrentUserId, acl => acl.CanManagePlots),
-            uriService);
+        var viewModel = new EditPlotElementViewModel(
+            folder.Elements.Single(e => e.PlotElementId == elementId.PlotElementId),
+            folder.HasMasterAccess(CurrentUserId, acl => acl.CanManagePlots),
+            version
+            );
         return View(viewModel);
     }
 

src/JoinRpg.Portal/Views/Plot/EditElementPartial.cshtml

@@ -54,17 +54,21 @@
                     @Html.DisplayFor(model => model.Author)
                 }
             </span>
-            var orderElementsEndpoint = Url.Action("ReorderElements", "Plot", new { Model.ProjectId });
-            <component type="typeof(JoinMoveControl)"
-                       render-mode="Static"
-                       param-Endpoint="@orderElementsEndpoint"
-                       param-SelfId="@Model.PlotElementIdentification.ToString()"
-                       param-ItemIds="@Model.ItemsIds" />
+
+            @if (Model.ItemsIds is not null)
+            {
+                var orderElementsEndpoint = Url.Action("ReorderElements", "Plot", new { Model.ProjectId });
+                <component type="typeof(JoinMoveControl)"
+                  render-mode="Static"
+                  param-Endpoint="@orderElementsEndpoint"
+                  param-SelfId="@Model.PlotElementIdentification.ToString()"
+                  param-ItemIds="@Model.ItemsIds" />
+            }
         }
         <div>
             <component type="typeof(PlotTargetDisplay)"
-                       render-mode="Static"
-                       param-Target="@Model.Target" />
+            render-mode="Static"
+            param-Target="@Model.Target" />
         </div>
         @if (Model.HasMasterAccess)
         {
@@ -116,14 +120,29 @@
                     <span class="glyphicon glyphicon-print"></span>
                     Печать
                 </a>
+                string? editUrl;
+                string editLabel;
+                if (Model.NextModifiedDateTime == null)
+                {
+                    editUrl = Url.Action("EditElement", "Plot", new { Model.ProjectId, elementId = Model.PlotElementIdentification }, null);
+                    editLabel = "Изменить";
+                }
+                else
+                {
+                    editUrl = Url.Action("EditElement", "Plot", new { Model.ProjectId, elementId = Model.PlotElementIdentification, Version = Model.CurrentVersion }, null);
+                    editLabel = "Вернуть эту версию";
+                    
+                }
+                <component
+                  type="typeof(JoinButton)"
+                  render-mode="Static"
+                  param-Link="@editUrl"
+                  param-Label="@editLabel"
+                           param-Preset="@ButtonPreset.Edit"
+                  param-Size="@SizeStyleEnum.Small"
+                  />
                 if (Model.NextModifiedDateTime == null)
                 {
-                    <a class="btn btn-default btn-sm"
-                    href="@Url.Action("EditElement", "Plot", new {Model.PlotElementId, Model.PlotFolderId, Model.ProjectId}, null)">
-                        <span class="glyphicon glyphicon-pencil"></span>
-                        Изменить
-                    </a>
-
                     if ((Model.CurrentVersion > Model.PublishedVersion || Model.PublishedVersion == null))
                     {
                         if (Model.HasEditAccess)

src/JoinRpg.WebPortal.Models/Plot/EditPlotFolderViewModel.cs

@@ -72,46 +72,30 @@ public EditPlotFolderViewModel() { } //For binding
     public bool HasMasterAccess { get; private set; }
 }
 
-public class EditPlotElementViewModel : IProjectIdAware
+public class EditPlotElementViewModel(PlotElement e, bool hasManageAccess, int? version) : IProjectIdAware
 {
-
-    public EditPlotElementViewModel(PlotElement e, bool hasManageAccess, IUriService uriService)
-    {
-        PlotElementId = e.PlotElementId;
-        Targets = e.GetElementBindingsForEdit();
-        Content = e.LastVersion().Content.Contents ?? "";
-        TodoField = e.LastVersion().TodoField;
-        ProjectId = e.PlotFolder.ProjectId;
-        PlotFolderId = e.PlotFolderId;
-        Status = e.GetStatus();
-        ElementType = (PlotElementTypeView)e.ElementType;
-        HasManageAccess = hasManageAccess;
-        HasPublishedVersion = e.Published != null;
-        Target = e.ToTarget();
-    }
-
     [ReadOnly(true)]
-    public int ProjectId { get; }
+    public int ProjectId { get; } = e.PlotFolder.ProjectId;
     [ReadOnly(true)]
-    public int PlotFolderId { get; }
+    public int PlotFolderId { get; } = e.PlotFolderId;
     [ReadOnly(true)]
-    public int PlotElementId { get; }
+    public int PlotElementId { get; } = e.PlotElementId;
 
     [Display(Name = "Для кого")]
-    public IEnumerable<string> Targets { get; set; }
+    public IEnumerable<string> Targets { get; set; } = e.GetElementBindingsForEdit();
     [Display(Name = "Текст вводной"), UIHint("MarkdownString")]
-    public string Content { get; set; }
+    public string Content { get; set; } = (version is null ? e.LastVersion() : e.SpecificVersion(version.Value))?.Content.Contents ?? "";
 
     [Display(Name = "TODO (что доделать для мастеров)"), DataType(DataType.MultilineText)]
-    public string TodoField { get; set; }
+    public string TodoField { get; set; } = e.LastVersion().TodoField;
 
     [ReadOnly(true), Display(Name = "Статус")]
-    public PlotStatus Status { get; }
+    public PlotStatus Status { get; } = e.GetStatus();
 
-    public PlotElementTypeView ElementType { get; }
-    public bool HasManageAccess { get; }
-    public bool HasPublishedVersion { get; }
-    public TargetsInfo Target { get; }
+    public PlotElementTypeView ElementType { get; } = (PlotElementTypeView)e.ElementType;
+    public bool HasManageAccess { get; } = hasManageAccess;
+    public bool HasPublishedVersion { get; } = e.Published != null;
+    public TargetsInfo Target { get; } = e.ToTarget();
 }
 
 public class PlotElementListItemViewModel : IProjectIdAware