Add shared draft status on admin summary

Author: hishamco

…tents/Drivers/ShareDraftContentDriver.cs …ents/Drivers/SharedDraftContentDriver.cssrc/OrchardCoreContrib.Contents/Drivers/ShareDraftContentDriver.cs renamed to src/OrchardCoreContrib.Contents/Drivers/SharedDraftContentDriver.cs src/OrchardCoreContrib.Contents/Drivers/ShareDraftContentDriver.cs renamed to src/OrchardCoreContrib.Contents/Drivers/SharedDraftContentDriver.cs

@@ -11,14 +11,14 @@
 
 namespace OrchardCoreContrib.Contents.Drivers;
 
-public sealed class ShareDraftContentDriver(
+public sealed class SharedDraftContentDriver(
     IAuthorizationService authorizationService,
     IHttpContextAccessor httpContextAccessor,
     ISharedDraftLinkService linkService,
     INotifier notifier,
-    IHtmlLocalizer<ShareDraftContentDriver> H) : ContentDisplayDriver
+    IHtmlLocalizer<SharedDraftContentDriver> H) : ContentDisplayDriver
 {
-    public override async Task<IDisplayResult> EditAsync(ContentItem contentItem, BuildEditorContext context)
+    public override async Task<IDisplayResult> DisplayAsync(ContentItem contentItem, BuildDisplayContext context)
     {
         var user = httpContextAccessor.HttpContext.User;
 
@@ -27,9 +27,40 @@ public override async Task<IDisplayResult> EditAsync(ContentItem contentItem, Bu
             return null;
         }
 
-        return Initialize<ShareDraftViewModel>("Content_ShareDraftButton", model => model.ContentItem = contentItem)
+        var model = new SharedDraftLinkViewModel();
+
+        var link = await linkService.GetActiveLinkAsync(contentItem.ContentItemId);
+
+        if (link is not null)
+        {
+            model.Link = link;
+            model.GeneratedLink = linkService.GetGeneratedLink(link.Token);
+        }
+
+        return Shape("SharedDraftStatus_SummaryAdmin", model)
             .RenderWhen(() => Task.FromResult(!contentItem.Published))
-            .Location("Actions:30");
+            .Location("SummaryAdmin", "Meta:15");
+    }
+
+    public override async Task<IDisplayResult> EditAsync(ContentItem contentItem, BuildEditorContext context)
+    {
+        var user = httpContextAccessor.HttpContext.User;
+
+        if (!await authorizationService.AuthorizeAsync(user, ContentsPermissions.ShareDraftContent))
+        {
+            return null;
+        }
+
+        var generatedLink = await linkService.GenerateLinkAsync(contentItem.ContentItemId);
+
+        var link = await linkService.GetActiveLinkAsync(contentItem.ContentItemId);
+
+        return Initialize<SharedDraftLinkViewModel>("Content_ShareDraftButton", model =>
+        {
+            model.Link = link;
+            model.GeneratedLink = generatedLink;
+        }).RenderWhen(() => Task.FromResult(!contentItem.Published))
+        .Location("Actions:30");
     }
 
     public override async Task<IDisplayResult> UpdateAsync(ContentItem contentItem, UpdateEditorContext context)
@@ -41,7 +72,7 @@ public override async Task<IDisplayResult> UpdateAsync(ContentItem contentItem,
             return null;
         }
 
-        var model = new ShareDraftViewModel();
+        var model = new SharedDraftLinkViewModel();
 
         await context.Updater.TryUpdateModelAsync(model, Prefix);
 

src/OrchardCoreContrib.Contents/Services/ISharedDraftLinkService.cs

@@ -1,14 +1,19 @@
 using OrchardCore.ContentManagement;
+using OrchardCoreContrib.Contents.Models;
 
 namespace OrchardCoreContrib.Contents.Services;
 
 public interface ISharedDraftLinkService
 {
-    Task<string> GenerateLinkAsync(ContentItem contentItem);
+    Task<string> GenerateLinkAsync(string contentItemId);
+
+    string GetGeneratedLink(string token);
 
     Task<ContentItem> GetDraftContentAsync(string token);
 
     Task<int> CleanupExpiredLinksAsync();
 
     Task<bool> RevokeLinkAsync(string contentItemId);
+
+    Task<SharedDraftLink> GetActiveLinkAsync(string contentItemId);
 }

src/OrchardCoreContrib.Contents/Services/SharedDraftLinkService.cs

@@ -1,33 +1,36 @@
 using Microsoft.AspNetCore.Http;
 using OrchardCore.ContentManagement;
+using OrchardCore.Environment.Shell;
 using OrchardCoreContrib.Contents.Indexes;
 using OrchardCoreContrib.Contents.Models;
+using Parlot.Fluent;
 using YesSql;
 
 namespace OrchardCoreContrib.Contents.Services;
 
 public class SharedDraftLinkService(
     IContentManager contentManager,
     IHttpContextAccessor httpContextAccessor,
-    YesSql.ISession session) : ISharedDraftLinkService
+    YesSql.ISession session,
+    ShellSettings shellSettings) : ISharedDraftLinkService
 {
-    public async Task<string> GenerateLinkAsync(ContentItem contentItem)
+    public async Task<string> GenerateLinkAsync(string contentItemId)
     {
-        ArgumentNullException.ThrowIfNull(contentItem);
+        ArgumentException.ThrowIfNullOrEmpty(contentItemId);
 
         var existingLink = await session.Query<SharedDraftLink, SharedDraftLinkIndex>()
-            .Where(l => l.ContentItemId == contentItem.ContentItemId && l.ExpirationUtc > DateTime.UtcNow)
+            .Where(l => l.ContentItemId == contentItemId && l.ExpirationUtc > DateTime.UtcNow)
             .FirstOrDefaultAsync();
 
         if (existingLink is not null)
         {
-            return $"/share/{existingLink.Token}";
+            return GetGeneratedLink(existingLink.Token);
         }
 
         var token = Guid.NewGuid().ToString("N");
         var link = new SharedDraftLink
         {
-            ContentItemId = contentItem.ContentItemId,
+            ContentItemId = contentItemId,
             Token = token,
             ExpirationUtc = DateTime.UtcNow.AddDays(30),
             CreatedBy = httpContextAccessor.HttpContext.User.Identity.Name,
@@ -36,7 +39,19 @@ public async Task<string> GenerateLinkAsync(ContentItem contentItem)
 
         await session.SaveAsync(link);
 
-        return $"/share/{token}";
+        return GetGeneratedLink(token);
+    }
+
+    public string GetGeneratedLink(string token)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(token);
+
+        var tenant = shellSettings.RequestUrlPrefix;
+        var baseUrl = $"{httpContextAccessor.HttpContext.Request.Scheme}://{httpContextAccessor.HttpContext.Request.Host}";
+
+        return string.IsNullOrEmpty(tenant)
+            ? $"{baseUrl}/share/{token}"
+            : $"{baseUrl}/{tenant}/share/{token}";
     }
 
     public async Task<ContentItem> GetDraftContentAsync(string token)
@@ -84,4 +99,13 @@ public async Task<bool> RevokeLinkAsync(string contentItemId)
 
         return true;
     }
+
+    public async Task<SharedDraftLink> GetActiveLinkAsync(string contentItemId)
+    {
+        ArgumentException.ThrowIfNullOrEmpty(contentItemId);
+
+        return await session.Query<SharedDraftLink, SharedDraftLinkIndex>()
+            .Where(l => l.ContentItemId == contentItemId && l.ExpirationUtc > DateTime.UtcNow)
+            .FirstOrDefaultAsync();
+    }
 }

src/OrchardCoreContrib.Contents/Startup.cs

@@ -22,7 +22,7 @@ public override void ConfigureServices(IServiceCollection services)
 
         services.AddIndexProvider<SharedDraftLinkIndexProvider>();
 
-        services.AddScoped<IContentDisplayDriver, ShareDraftContentDriver>();
+        services.AddScoped<IContentDisplayDriver, SharedDraftContentDriver>();
         services.AddScoped<ISharedDraftLinkService, SharedDraftLinkService>();
 
         services.AddPermissionProvider<Permissions>();

src/OrchardCoreContrib.Contents/ViewModels/ShareDraftViewModel.cs

@@ -0,0 +1,14 @@
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+using OrchardCore.DisplayManagement.Views;
+using OrchardCoreContrib.Contents.Models;
+
+namespace OrchardCoreContrib.Contents.ViewModels;
+
+public class SharedDraftLinkViewModel : ShapeViewModel
+{
+    [BindNever]
+    public SharedDraftLink Link { get; set; }
+
+    [BindNever]
+    public string GeneratedLink { get; set; }
+}

src/OrchardCoreContrib.Contents/ViewModels/SharedDraftLinkViewModel.cs

@@ -1,23 +1,9 @@
 @using Microsoft.AspNetCore.Authorization
-@using OrchardCore.ContentManagement
-@using OrchardCore.Environment.Shell
 @using OrchardCoreContrib.Contents
-@using OrchardCoreContrib.Contents.Models
-@using OrchardCoreContrib.Contents.Services
 @using OrchardCoreContrib.Contents.ViewModels
-@model ShareDraftViewModel
-@inject ISharedDraftLinkService LinkService
-@inject ShellSettings ShellSettings
+@model SharedDraftLinkViewModel
 @inject IAuthorizationService AuthorizationService
 
-@{
-    var tenant = ShellSettings.RequestUrlPrefix;
-    var link = await LinkService.GenerateLinkAsync(Model.ContentItem);
-    var fullLink = string.IsNullOrEmpty(ShellSettings.RequestUrlPrefix)
-        ? $"{Context.Request.Scheme}://{Context.Request.Host}{link}"
-        : $"{Context.Request.Scheme}://{Context.Request.Host}/{tenant}{link}";
-}
-
 <div class="btn-group mb-1">
     <button type="button" class="btn btn-secondary" data-bs-toggle="modal" data-bs-target="#shareDraftModal">
         @T["Share Draft"]
@@ -40,7 +26,7 @@
                 <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
             </div>
             <div class="modal-body">
-                <input id="linkInput" type="text" class="form-control" readonly value="@fullLink" />
+                <input id="linkInput" type="text" class="form-control" readonly value="@Model.GeneratedLink" />
                 <button id="copyButton" type="button" class="btn btn-outline-secondary mt-2" onclick="copyUrl()">
                     Copy to Clipboard
                 </button>

src/OrchardCoreContrib.Contents/Views/Content_ShareDraftButton.cshtml

@@ -0,0 +1,15 @@
+@using OrchardCoreContrib.Contents.ViewModels
+@model SharedDraftLinkViewModel
+
+<span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Shared Draft Status"]">
+    @if (Model.Link is null)
+    {
+        <i class="fa-solid fa-link text-secondary" aria-hidden="true"></i> 
+        @T["Not Shared"]
+    }
+    else
+    {
+        <i class="fa-solid fa-link text-primary" aria-hidden="true"></i> 
+        <a class="text-primary" href="@Model.GeneratedLink" target="_blank">@T["Shared"]</a>
+    }
+</span>