From bd175f7feb7ac03e940c115d9d6ef875463f3818 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Tue, 5 Sep 2023 23:37:43 +0200
Subject: [PATCH 01/30] Add workflow event handler

---
 .../Events/WorkflowContentSetEventHandler.cs  | 87 +++++++++++++++++++
 .../Extensions/ContentSets/Startup.cs         |  8 ++
 2 files changed, 95 insertions(+)
 create mode 100644 Lombiq.HelpfulExtensions/Extensions/ContentSets/Events/WorkflowContentSetEventHandler.cs

diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Events/WorkflowContentSetEventHandler.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Events/WorkflowContentSetEventHandler.cs
new file mode 100644
index 00000000..525d1482
--- /dev/null
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Events/WorkflowContentSetEventHandler.cs
@@ -0,0 +1,87 @@
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.ViewModels;
+using Lombiq.HelpfulLibraries.OrchardCore.Workflow;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using OrchardCore.ContentManagement;
+using OrchardCore.ContentManagement.Metadata.Models;
+using OrchardCore.Workflows.Models;
+using OrchardCore.Workflows.Services;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+
+namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Events;
+
+public class WorkflowContentSetEventHandler : IContentSetEventHandler
+{
+    private readonly IWorkflowManager _workflowManager;
+    private readonly IWorkflowTypeStore _workflowTypeStore;
+
+    public WorkflowContentSetEventHandler(
+        IWorkflowManager workflowManager,
+        IWorkflowTypeStore workflowTypeStore)
+    {
+        _workflowManager = workflowManager;
+        _workflowTypeStore = workflowTypeStore;
+
+    }
+
+    public async Task<IEnumerable<ContentSetLinkViewModel>> GetSupportedOptionsAsync(
+        ContentSetPart part,
+        ContentTypePartDefinition definition)
+    {
+        var links = new List<ContentSetLinkViewModel>();
+
+        var values = new Dictionary<string, object>
+        {
+            [nameof(ContentSetPart)] = part,
+            [nameof(part.ContentItem)] = part.ContentItem,
+            [nameof(ContentSetPartViewModel.Definition)] = definition,
+        };
+        var workflowContexts = await _workflowManager.TriggerEventAndGetContextsAsync<>(_workflowTypeStore, values);
+
+        foreach (var context in workflowContexts)
+        {
+            if (context.Status is WorkflowStatus.Faulted or WorkflowStatus.Halted or WorkflowStatus.Aborted) continue;
+            if (!context.Output.TryGetValue(nameof(ContentSetPartViewModel.MemberLinks), out var memberLinks)) continue;
+
+            switch (memberLinks)
+            {
+                case IEnumerable<ContentSetLinkViewModel> viewModels:
+                    links.AddRange(viewModels);
+                    break;
+                case ContentSetLinkViewModel viewModel:
+                    links.Add(viewModel);
+                    break;
+                case JArray jsonArray:
+                    links.AddRange(jsonArray.ToObject<IEnumerable<ContentSetLinkViewModel>>());
+                    break;
+                case JObject jsonObject:
+                    links.Add(jsonObject.ToObject<ContentSetLinkViewModel>());
+                    break;
+                case string json when !string.IsNullOrWhiteSpace(json):
+                    links.AddRange(JsonConvert.DeserializeObject<List<ContentSetLinkViewModel>>(json));
+                    break;
+                default: continue;
+            }
+        }
+
+        return links;
+    }
+
+    public Task CreatingAsync(
+        ContentItem content,
+        ContentTypePartDefinition definition,
+        string contentSet,
+        string newKey) =>
+        _workflowManager.TriggerEventAsync<>(
+            new
+            {
+                ContentItem = content,
+                Definition = definition,
+                ContentSet = content,
+                NewKey = newKey,
+            },
+            $"{nameof(WorkflowContentSetEventHandler)}.{nameof(CreatingAsync)}" +
+            $"({content.ContentItemId}, {definition.Name}, {content}, {newKey})");
+}
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Startup.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Startup.cs
index 4a5f3d97..3168e3be 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Startup.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Startup.cs
@@ -1,4 +1,5 @@
 using Lombiq.HelpfulExtensions.Extensions.ContentSets.Drivers;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Events;
 using Lombiq.HelpfulExtensions.Extensions.ContentSets.Indexes;
 using Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
 using Lombiq.HelpfulExtensions.Extensions.ContentSets.Services;
@@ -31,3 +32,10 @@ public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder ro
         // No need for anything here yet.
     }
 }
+
+[RequireFeatures("OrchardCore.Workflows")]
+public class WorkflowsStartup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services) =>
+        services.AddScoped<IContentSetEventHandler, WorkflowContentSetEventHandler>();
+}

From 7aa9f9a933e58e4c0125a098e14c1d6c7e3951c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Tue, 5 Sep 2023 23:38:14 +0200
Subject: [PATCH 02/30] Make the event handler invocation a bit more readable.

---
 .../ContentSets/Drivers/ContentSetPartDisplayDriver.cs         | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetPartDisplayDriver.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetPartDisplayDriver.cs
index 90f80478..d39d710f 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetPartDisplayDriver.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetPartDisplayDriver.cs
@@ -103,7 +103,8 @@ public async ValueTask BuildViewModelAsync(
         };
 
         var supportedOptions = (await _contentSetEventHandlers.AwaitEachAsync(item => item.GetSupportedOptionsAsync(part, definition)))
-            .SelectMany(links => links ?? Enumerable.Empty<ContentSetLinkViewModel>());
+            .Where(links => links != null)
+            .SelectMany(links => links);
         options.AddRange(supportedOptions, link => link.Key);
 
         // Ensure the existing content item IDs are applied to the supported option links.

From 58b7f0657d6d4a6ce4fd3662d7e3eb1340bab8d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Wed, 6 Sep 2023 12:10:08 +0200
Subject: [PATCH 03/30] Add and use ContentSetGetSupportedOptionsEvent.

---
 .../ContentSetGetSupportedOptionsEvent.cs     | 17 ++++++++
 ...etGetSupportedOptionsEventDisplayDriver.cs | 42 +++++++++++++++++++
 .../Events/WorkflowContentSetEventHandler.cs  | 15 +++----
 .../Models/GetSupportedOptionsContext.cs      | 20 +++++++++
 .../Extensions/ContentSets/Startup.cs         |  9 +++-
 5 files changed, 92 insertions(+), 11 deletions(-)
 create mode 100644 Lombiq.HelpfulExtensions/Extensions/Activities/ContentSetGetSupportedOptionsEvent.cs
 create mode 100644 Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs
 create mode 100644 Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/GetSupportedOptionsContext.cs

diff --git a/Lombiq.HelpfulExtensions/Extensions/Activities/ContentSetGetSupportedOptionsEvent.cs b/Lombiq.HelpfulExtensions/Extensions/Activities/ContentSetGetSupportedOptionsEvent.cs
new file mode 100644
index 00000000..2d8acb61
--- /dev/null
+++ b/Lombiq.HelpfulExtensions/Extensions/Activities/ContentSetGetSupportedOptionsEvent.cs
@@ -0,0 +1,17 @@
+using Lombiq.HelpfulLibraries.OrchardCore.Workflow;
+using Microsoft.Extensions.Localization;
+
+namespace Lombiq.HelpfulExtensions.Extensions.Activities;
+
+public class ContentSetGetSupportedOptionsEvent : SimpleEventActivityBase
+{
+    public const string OutputName = "MemberLinks";
+
+    public override LocalizedString DisplayText => T["Get Supported Options"];
+    public override LocalizedString Category => T["Content Sets"];
+
+    public ContentSetGetSupportedOptionsEvent(IStringLocalizer stringLocalizer)
+        : base(stringLocalizer)
+    {
+    }
+}
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs
new file mode 100644
index 00000000..73622923
--- /dev/null
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs
@@ -0,0 +1,42 @@
+using Lombiq.HelpfulExtensions.Extensions.Activities;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.ViewModels;
+using Lombiq.HelpfulLibraries.OrchardCore.Workflow;
+using Microsoft.AspNetCore.Html;
+using Microsoft.AspNetCore.Mvc.Localization;
+using Newtonsoft.Json;
+
+namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Drivers;
+
+public class ContentSetGetSupportedOptionsEventDisplayDriver : SimpleEventActivityDisplayDriverBase<ContentSetGetSupportedOptionsEvent>
+{
+    private readonly IHtmlLocalizer<ContentSetGetSupportedOptionsEventDisplayDriver> H;
+
+    public override string IconClass => "fa-circle-half-stroke";
+
+    public override LocalizedHtmlString Description
+    {
+        get
+        {
+            var foreword = H["Tries to get a list of links representing the supported options for this content set."];
+
+            var inputKeys = new GetSupportedOptionsContext(Definition: null, ContentSetPart: null).ToDictionary().Keys;
+            var inputs = H["The available inputs are: {0}", string.Join(", ", inputKeys)];
+
+            // Not using Newtonsoft.Json.Schema to generate a real JSON schema due to licensing issues. On the other hand
+            // System.Text.Json doesn't officially support JSON schema generation yet, so that's not an option either.
+            var schema = JsonConvert.SerializeObject(new ContentSetLinkViewModel(
+                IsDeleted: false,
+                "string",
+                "string",
+                "string")) + "[]";
+            var expectation = H["Expects an output \"{0}\" in the format <code>{1}</code>.", ContentSetGetSupportedOptionsEvent.OutputName, schema];
+
+            return new HtmlString("<br>").Join(foreword, inputs, expectation);
+        }
+    }
+
+    public ContentSetGetSupportedOptionsEventDisplayDriver(
+        IHtmlLocalizer<ContentSetGetSupportedOptionsEventDisplayDriver> htmlLocalizer) =>
+        H = htmlLocalizer;
+}
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Events/WorkflowContentSetEventHandler.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Events/WorkflowContentSetEventHandler.cs
index 525d1482..6d0c0de1 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Events/WorkflowContentSetEventHandler.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Events/WorkflowContentSetEventHandler.cs
@@ -1,4 +1,5 @@
-using Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
+using Lombiq.HelpfulExtensions.Extensions.Activities;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
 using Lombiq.HelpfulExtensions.Extensions.ContentSets.ViewModels;
 using Lombiq.HelpfulLibraries.OrchardCore.Workflow;
 using Newtonsoft.Json;
@@ -23,7 +24,6 @@ public WorkflowContentSetEventHandler(
     {
         _workflowManager = workflowManager;
         _workflowTypeStore = workflowTypeStore;
-
     }
 
     public async Task<IEnumerable<ContentSetLinkViewModel>> GetSupportedOptionsAsync(
@@ -32,13 +32,10 @@ public async Task<IEnumerable<ContentSetLinkViewModel>> GetSupportedOptionsAsync
     {
         var links = new List<ContentSetLinkViewModel>();
 
-        var values = new Dictionary<string, object>
-        {
-            [nameof(ContentSetPart)] = part,
-            [nameof(part.ContentItem)] = part.ContentItem,
-            [nameof(ContentSetPartViewModel.Definition)] = definition,
-        };
-        var workflowContexts = await _workflowManager.TriggerEventAndGetContextsAsync<>(_workflowTypeStore, values);
+        var values = new GetSupportedOptionsContext(definition, part).ToDictionary();
+
+        var workflowContexts = await _workflowManager
+            .TriggerEventAndGetContextsAsync<ContentSetGetSupportedOptionsEvent>(_workflowTypeStore, values);
 
         foreach (var context in workflowContexts)
         {
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/GetSupportedOptionsContext.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/GetSupportedOptionsContext.cs
new file mode 100644
index 00000000..7e9a1058
--- /dev/null
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/GetSupportedOptionsContext.cs
@@ -0,0 +1,20 @@
+using OrchardCore.ContentManagement;
+using OrchardCore.ContentManagement.Metadata.Models;
+using System.Collections.Generic;
+
+namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
+
+public record GetSupportedOptionsContext(
+    ContentTypePartDefinition Definition,
+    ContentSetPart ContentSetPart)
+{
+    public ContentItem ContentItem => ContentSetPart?.ContentItem;
+
+    public IDictionary<string, object> ToDictionary() =>
+        new Dictionary<string, object>
+        {
+            [nameof(Definition)] = Definition,
+            [nameof(ContentSetPart)] = ContentSetPart,
+            [nameof(ContentItem)] = ContentItem,
+        };
+}
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Startup.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Startup.cs
index 3168e3be..c92e37ea 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Startup.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Startup.cs
@@ -1,4 +1,5 @@
-using Lombiq.HelpfulExtensions.Extensions.ContentSets.Drivers;
+using Lombiq.HelpfulExtensions.Extensions.Activities;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Drivers;
 using Lombiq.HelpfulExtensions.Extensions.ContentSets.Events;
 using Lombiq.HelpfulExtensions.Extensions.ContentSets.Indexes;
 using Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
@@ -9,6 +10,7 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Display.ContentDisplay;
 using OrchardCore.Modules;
+using OrchardCore.Workflows.Helpers;
 using System;
 
 namespace Lombiq.HelpfulExtensions.Extensions.ContentSets;
@@ -36,6 +38,9 @@ public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder ro
 [RequireFeatures("OrchardCore.Workflows")]
 public class WorkflowsStartup : StartupBase
 {
-    public override void ConfigureServices(IServiceCollection services) =>
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddActivity<ContentSetGetSupportedOptionsEvent, ContentSetGetSupportedOptionsEventDisplayDriver>();
         services.AddScoped<IContentSetEventHandler, WorkflowContentSetEventHandler>();
+    }
 }

From 314ab64bb4ab51de285fd1e426c0bc835c521922 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Thu, 7 Sep 2023 11:33:42 +0200
Subject: [PATCH 04/30] Add and use ContentSetCreatingEvent.

---
 .../Activities/ContentSetCreatingEvent.cs        | 15 +++++++++++++++
 .../ContentSetGetSupportedOptionsEvent.cs        |  2 +-
 .../ContentSetCreatingEventDisplayDriver.cs      | 16 ++++++++++++++++
 .../Events/WorkflowContentSetEventHandler.cs     | 12 +++---------
 .../ContentSets/Models/CreatingContext.cs        | 15 +++++++++++++++
 .../Extensions/ContentSets/Startup.cs            |  1 +
 6 files changed, 51 insertions(+), 10 deletions(-)
 create mode 100644 Lombiq.HelpfulExtensions/Extensions/Activities/ContentSetCreatingEvent.cs
 create mode 100644 Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetCreatingEventDisplayDriver.cs
 create mode 100644 Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/CreatingContext.cs

diff --git a/Lombiq.HelpfulExtensions/Extensions/Activities/ContentSetCreatingEvent.cs b/Lombiq.HelpfulExtensions/Extensions/Activities/ContentSetCreatingEvent.cs
new file mode 100644
index 00000000..28a01ae8
--- /dev/null
+++ b/Lombiq.HelpfulExtensions/Extensions/Activities/ContentSetCreatingEvent.cs
@@ -0,0 +1,15 @@
+using Lombiq.HelpfulLibraries.OrchardCore.Workflow;
+using Microsoft.Extensions.Localization;
+
+namespace Lombiq.HelpfulExtensions.Extensions.Activities;
+
+public class ContentSetCreatingEvent : SimpleEventActivityBase
+{
+    public override LocalizedString DisplayText => T["Creating Content Set"];
+    public override LocalizedString Category => T["Content Sets"];
+
+    public ContentSetCreatingEvent(IStringLocalizer stringLocalizer)
+        : base(stringLocalizer)
+    {
+    }
+}
diff --git a/Lombiq.HelpfulExtensions/Extensions/Activities/ContentSetGetSupportedOptionsEvent.cs b/Lombiq.HelpfulExtensions/Extensions/Activities/ContentSetGetSupportedOptionsEvent.cs
index 2d8acb61..92e62690 100644
--- a/Lombiq.HelpfulExtensions/Extensions/Activities/ContentSetGetSupportedOptionsEvent.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/Activities/ContentSetGetSupportedOptionsEvent.cs
@@ -7,7 +7,7 @@ public class ContentSetGetSupportedOptionsEvent : SimpleEventActivityBase
 {
     public const string OutputName = "MemberLinks";
 
-    public override LocalizedString DisplayText => T["Get Supported Options"];
+    public override LocalizedString DisplayText => T["Get Supported Content Set Options"];
     public override LocalizedString Category => T["Content Sets"];
 
     public ContentSetGetSupportedOptionsEvent(IStringLocalizer stringLocalizer)
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetCreatingEventDisplayDriver.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetCreatingEventDisplayDriver.cs
new file mode 100644
index 00000000..68ea1f05
--- /dev/null
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetCreatingEventDisplayDriver.cs
@@ -0,0 +1,16 @@
+using Lombiq.HelpfulExtensions.Extensions.Activities;
+using Lombiq.HelpfulLibraries.OrchardCore.Workflow;
+using Microsoft.AspNetCore.Mvc.Localization;
+
+namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Drivers;
+
+public class ContentSetCreatingEventDisplayDriver : SimpleEventActivityDisplayDriverBase<ContentSetCreatingEvent>
+{
+    private readonly IHtmlLocalizer<ContentSetCreatingEventDisplayDriver> H;
+
+    public override string IconClass => "fa-circle-half-stroke";
+    public override LocalizedHtmlString Description => H["Executes when a new content item is created in the content set."];
+
+    public ContentSetCreatingEventDisplayDriver(IHtmlLocalizer<ContentSetCreatingEventDisplayDriver> htmlLocalizer) =>
+        H = htmlLocalizer;
+}
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Events/WorkflowContentSetEventHandler.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Events/WorkflowContentSetEventHandler.cs
index 6d0c0de1..1321b79c 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Events/WorkflowContentSetEventHandler.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Events/WorkflowContentSetEventHandler.cs
@@ -71,14 +71,8 @@ public Task CreatingAsync(
         ContentTypePartDefinition definition,
         string contentSet,
         string newKey) =>
-        _workflowManager.TriggerEventAsync<>(
-            new
-            {
-                ContentItem = content,
-                Definition = definition,
-                ContentSet = content,
-                NewKey = newKey,
-            },
+        _workflowManager.TriggerEventAsync<ContentSetCreatingEvent>(
+            new CreatingContext(content, definition, contentSet, newKey),
             $"{nameof(WorkflowContentSetEventHandler)}.{nameof(CreatingAsync)}" +
-            $"({content.ContentItemId}, {definition.Name}, {content}, {newKey})");
+            $"({content.ContentItemId}, {definition.Name}, {contentSet}, {newKey})");
 }
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/CreatingContext.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/CreatingContext.cs
new file mode 100644
index 00000000..abd9eb02
--- /dev/null
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/CreatingContext.cs
@@ -0,0 +1,15 @@
+using Microsoft.AspNetCore.Routing;
+using OrchardCore.ContentManagement;
+using OrchardCore.ContentManagement.Metadata.Models;
+using System.Collections.Generic;
+
+namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
+
+public record CreatingContext(
+    ContentItem ContentItem,
+    ContentTypePartDefinition Definition,
+    string ContentSet,
+    string NewKey)
+{
+    public IDictionary<string, object> ToDictionary() => new RouteValueDictionary(this);
+}
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Startup.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Startup.cs
index c92e37ea..87638ea7 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Startup.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Startup.cs
@@ -41,6 +41,7 @@ public class WorkflowsStartup : StartupBase
     public override void ConfigureServices(IServiceCollection services)
     {
         services.AddActivity<ContentSetGetSupportedOptionsEvent, ContentSetGetSupportedOptionsEventDisplayDriver>();
+        services.AddActivity<ContentSetCreatingEvent, ContentSetCreatingEventDisplayDriver>();
         services.AddScoped<IContentSetEventHandler, WorkflowContentSetEventHandler>();
     }
 }

From fee2d8c3ffa0e1c620aafde1f00e8f628234e9b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Thu, 7 Sep 2023 22:24:23 +0200
Subject: [PATCH 05/30] Move activities to the correct directory.

---
 .../{ => ContentSets}/Activities/ContentSetCreatingEvent.cs     | 0
 .../Activities/ContentSetGetSupportedOptionsEvent.cs            | 0
 Lombiq.HelpfulExtensions/Extensions/ContentSets/Startup.cs      | 2 +-
 3 files changed, 1 insertion(+), 1 deletion(-)
 rename Lombiq.HelpfulExtensions/Extensions/{ => ContentSets}/Activities/ContentSetCreatingEvent.cs (100%)
 rename Lombiq.HelpfulExtensions/Extensions/{ => ContentSets}/Activities/ContentSetGetSupportedOptionsEvent.cs (100%)

diff --git a/Lombiq.HelpfulExtensions/Extensions/Activities/ContentSetCreatingEvent.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Activities/ContentSetCreatingEvent.cs
similarity index 100%
rename from Lombiq.HelpfulExtensions/Extensions/Activities/ContentSetCreatingEvent.cs
rename to Lombiq.HelpfulExtensions/Extensions/ContentSets/Activities/ContentSetCreatingEvent.cs
diff --git a/Lombiq.HelpfulExtensions/Extensions/Activities/ContentSetGetSupportedOptionsEvent.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Activities/ContentSetGetSupportedOptionsEvent.cs
similarity index 100%
rename from Lombiq.HelpfulExtensions/Extensions/Activities/ContentSetGetSupportedOptionsEvent.cs
rename to Lombiq.HelpfulExtensions/Extensions/ContentSets/Activities/ContentSetGetSupportedOptionsEvent.cs
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Startup.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Startup.cs
index 87638ea7..76fc46ba 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Startup.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Startup.cs
@@ -36,7 +36,7 @@ public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder ro
 }
 
 [RequireFeatures("OrchardCore.Workflows")]
-public class WorkflowsStartup : StartupBase
+public class WorkflowStartup : StartupBase
 {
     public override void ConfigureServices(IServiceCollection services)
     {

From a3b5440b4f0901118056eb29ab4ec70aa86e7e43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Thu, 7 Sep 2023 22:51:28 +0200
Subject: [PATCH 06/30] Move all workflow stuff into the Workflows
 subdirectory.

This is similar to how it's done in OrchardCore, e.g. in the OrchardCore.Contents module.
---
 .../Extensions/ContentSets/Startup.cs         | 16 +--------------
 .../Activities/ContentSetCreatingEvent.cs     |  2 +-
 .../ContentSetGetSupportedOptionsEvent.cs     |  2 +-
 .../ContentSetCreatingEventDisplayDriver.cs   |  4 ++--
 ...etGetSupportedOptionsEventDisplayDriver.cs |  6 +++---
 .../WorkflowContentSetEventHandler.cs         |  5 +++--
 .../ContentSets/Workflows/Startup.cs          | 20 +++++++++++++++++++
 7 files changed, 31 insertions(+), 24 deletions(-)
 rename Lombiq.HelpfulExtensions/Extensions/ContentSets/{ => Workflows}/Activities/ContentSetCreatingEvent.cs (84%)
 rename Lombiq.HelpfulExtensions/Extensions/ContentSets/{ => Workflows}/Activities/ContentSetGetSupportedOptionsEvent.cs (86%)
 rename Lombiq.HelpfulExtensions/Extensions/ContentSets/{ => Workflows}/Drivers/ContentSetCreatingEventDisplayDriver.cs (80%)
 rename Lombiq.HelpfulExtensions/Extensions/ContentSets/{ => Workflows}/Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs (89%)
 rename Lombiq.HelpfulExtensions/Extensions/ContentSets/{Events => Workflows/Handlers}/WorkflowContentSetEventHandler.cs (93%)
 create mode 100644 Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Startup.cs

diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Startup.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Startup.cs
index 76fc46ba..4a5f3d97 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Startup.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Startup.cs
@@ -1,6 +1,4 @@
-using Lombiq.HelpfulExtensions.Extensions.Activities;
-using Lombiq.HelpfulExtensions.Extensions.ContentSets.Drivers;
-using Lombiq.HelpfulExtensions.Extensions.ContentSets.Events;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Drivers;
 using Lombiq.HelpfulExtensions.Extensions.ContentSets.Indexes;
 using Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
 using Lombiq.HelpfulExtensions.Extensions.ContentSets.Services;
@@ -10,7 +8,6 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Display.ContentDisplay;
 using OrchardCore.Modules;
-using OrchardCore.Workflows.Helpers;
 using System;
 
 namespace Lombiq.HelpfulExtensions.Extensions.ContentSets;
@@ -34,14 +31,3 @@ public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder ro
         // No need for anything here yet.
     }
 }
-
-[RequireFeatures("OrchardCore.Workflows")]
-public class WorkflowStartup : StartupBase
-{
-    public override void ConfigureServices(IServiceCollection services)
-    {
-        services.AddActivity<ContentSetGetSupportedOptionsEvent, ContentSetGetSupportedOptionsEventDisplayDriver>();
-        services.AddActivity<ContentSetCreatingEvent, ContentSetCreatingEventDisplayDriver>();
-        services.AddScoped<IContentSetEventHandler, WorkflowContentSetEventHandler>();
-    }
-}
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Activities/ContentSetCreatingEvent.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Activities/ContentSetCreatingEvent.cs
similarity index 84%
rename from Lombiq.HelpfulExtensions/Extensions/ContentSets/Activities/ContentSetCreatingEvent.cs
rename to Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Activities/ContentSetCreatingEvent.cs
index 28a01ae8..c9c76500 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Activities/ContentSetCreatingEvent.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Activities/ContentSetCreatingEvent.cs
@@ -1,7 +1,7 @@
 using Lombiq.HelpfulLibraries.OrchardCore.Workflow;
 using Microsoft.Extensions.Localization;
 
-namespace Lombiq.HelpfulExtensions.Extensions.Activities;
+namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows.Activities;
 
 public class ContentSetCreatingEvent : SimpleEventActivityBase
 {
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Activities/ContentSetGetSupportedOptionsEvent.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Activities/ContentSetGetSupportedOptionsEvent.cs
similarity index 86%
rename from Lombiq.HelpfulExtensions/Extensions/ContentSets/Activities/ContentSetGetSupportedOptionsEvent.cs
rename to Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Activities/ContentSetGetSupportedOptionsEvent.cs
index 92e62690..0300ab1e 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Activities/ContentSetGetSupportedOptionsEvent.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Activities/ContentSetGetSupportedOptionsEvent.cs
@@ -1,7 +1,7 @@
 using Lombiq.HelpfulLibraries.OrchardCore.Workflow;
 using Microsoft.Extensions.Localization;
 
-namespace Lombiq.HelpfulExtensions.Extensions.Activities;
+namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows.Activities;
 
 public class ContentSetGetSupportedOptionsEvent : SimpleEventActivityBase
 {
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetCreatingEventDisplayDriver.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetCreatingEventDisplayDriver.cs
similarity index 80%
rename from Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetCreatingEventDisplayDriver.cs
rename to Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetCreatingEventDisplayDriver.cs
index 68ea1f05..db3b8037 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetCreatingEventDisplayDriver.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetCreatingEventDisplayDriver.cs
@@ -1,8 +1,8 @@
-using Lombiq.HelpfulExtensions.Extensions.Activities;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows.Activities;
 using Lombiq.HelpfulLibraries.OrchardCore.Workflow;
 using Microsoft.AspNetCore.Mvc.Localization;
 
-namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Drivers;
+namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows.Drivers;
 
 public class ContentSetCreatingEventDisplayDriver : SimpleEventActivityDisplayDriverBase<ContentSetCreatingEvent>
 {
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs
similarity index 89%
rename from Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs
rename to Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs
index 73622923..e5eac8e6 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs
@@ -1,12 +1,12 @@
-using Lombiq.HelpfulExtensions.Extensions.Activities;
-using Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
 using Lombiq.HelpfulExtensions.Extensions.ContentSets.ViewModels;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows.Activities;
 using Lombiq.HelpfulLibraries.OrchardCore.Workflow;
 using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.Localization;
 using Newtonsoft.Json;
 
-namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Drivers;
+namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows.Drivers;
 
 public class ContentSetGetSupportedOptionsEventDisplayDriver : SimpleEventActivityDisplayDriverBase<ContentSetGetSupportedOptionsEvent>
 {
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Events/WorkflowContentSetEventHandler.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Handlers/WorkflowContentSetEventHandler.cs
similarity index 93%
rename from Lombiq.HelpfulExtensions/Extensions/ContentSets/Events/WorkflowContentSetEventHandler.cs
rename to Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Handlers/WorkflowContentSetEventHandler.cs
index 1321b79c..dac85e52 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Events/WorkflowContentSetEventHandler.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Handlers/WorkflowContentSetEventHandler.cs
@@ -1,6 +1,7 @@
-using Lombiq.HelpfulExtensions.Extensions.Activities;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Events;
 using Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
 using Lombiq.HelpfulExtensions.Extensions.ContentSets.ViewModels;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows.Activities;
 using Lombiq.HelpfulLibraries.OrchardCore.Workflow;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -11,7 +12,7 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 
-namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Events;
+namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows.Handlers;
 
 public class WorkflowContentSetEventHandler : IContentSetEventHandler
 {
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Startup.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Startup.cs
new file mode 100644
index 00000000..34d5e99a
--- /dev/null
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Startup.cs
@@ -0,0 +1,20 @@
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Events;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows.Activities;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows.Drivers;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows.Handlers;
+using Microsoft.Extensions.DependencyInjection;
+using OrchardCore.Modules;
+using OrchardCore.Workflows.Helpers;
+
+namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows;
+
+[RequireFeatures("OrchardCore.Workflows")]
+public class Startup : StartupBase
+{
+    public override void ConfigureServices(IServiceCollection services)
+    {
+        services.AddActivity<ContentSetGetSupportedOptionsEvent, ContentSetGetSupportedOptionsEventDisplayDriver>();
+        services.AddActivity<ContentSetCreatingEvent, ContentSetCreatingEventDisplayDriver>();
+        services.AddScoped<IContentSetEventHandler, WorkflowContentSetEventHandler>();
+    }
+}

From f47bcfe1d2dd89bae8e77b3abe73650b4f5219e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Fri, 8 Sep 2023 00:15:46 +0200
Subject: [PATCH 07/30] Bug fixes.

---
 .../ContentSets/Workflows/Activities/ContentSetCreatingEvent.cs | 2 +-
 .../Workflows/Activities/ContentSetGetSupportedOptionsEvent.cs  | 2 +-
 .../Extensions/ContentSets/Workflows/Startup.cs                 | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Activities/ContentSetCreatingEvent.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Activities/ContentSetCreatingEvent.cs
index c9c76500..c7462aab 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Activities/ContentSetCreatingEvent.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Activities/ContentSetCreatingEvent.cs
@@ -8,7 +8,7 @@ public class ContentSetCreatingEvent : SimpleEventActivityBase
     public override LocalizedString DisplayText => T["Creating Content Set"];
     public override LocalizedString Category => T["Content Sets"];
 
-    public ContentSetCreatingEvent(IStringLocalizer stringLocalizer)
+    public ContentSetCreatingEvent(IStringLocalizer<ContentSetCreatingEvent> stringLocalizer)
         : base(stringLocalizer)
     {
     }
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Activities/ContentSetGetSupportedOptionsEvent.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Activities/ContentSetGetSupportedOptionsEvent.cs
index 0300ab1e..239f4030 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Activities/ContentSetGetSupportedOptionsEvent.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Activities/ContentSetGetSupportedOptionsEvent.cs
@@ -10,7 +10,7 @@ public class ContentSetGetSupportedOptionsEvent : SimpleEventActivityBase
     public override LocalizedString DisplayText => T["Get Supported Content Set Options"];
     public override LocalizedString Category => T["Content Sets"];
 
-    public ContentSetGetSupportedOptionsEvent(IStringLocalizer stringLocalizer)
+    public ContentSetGetSupportedOptionsEvent(IStringLocalizer<ContentSetGetSupportedOptionsEvent> stringLocalizer)
         : base(stringLocalizer)
     {
     }
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Startup.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Startup.cs
index 34d5e99a..1d8a7e8b 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Startup.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Startup.cs
@@ -8,6 +8,7 @@
 
 namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows;
 
+[Feature(FeatureIds.ContentSets)]
 [RequireFeatures("OrchardCore.Workflows")]
 public class Startup : StartupBase
 {

From 02f0dfe70441f0011464a140da459749d2297939 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Fri, 8 Sep 2023 00:32:16 +0200
Subject: [PATCH 08/30] Create a new type to avoid circular references which
 break JSON serialization.

---
 .../Models/GetSupportedOptionsContext.cs         | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/GetSupportedOptionsContext.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/GetSupportedOptionsContext.cs
index 7e9a1058..8270a5fc 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/GetSupportedOptionsContext.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/GetSupportedOptionsContext.cs
@@ -1,6 +1,7 @@
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 using System.Collections.Generic;
+using System.Linq;
 
 namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
 
@@ -13,7 +14,20 @@ public record GetSupportedOptionsContext(
     public IDictionary<string, object> ToDictionary() =>
         new Dictionary<string, object>
         {
-            [nameof(Definition)] = Definition,
+            // We create a new type here to avoid circular references which break JSON serialization.
+            [nameof(Definition)] = new
+            {
+                Definition.Name,
+                Definition.Settings,
+                PartDefinition = new
+                {
+                    Definition.PartDefinition.Name,
+                    Definition.PartDefinition.Settings,
+                    Fields = Definition.PartDefinition.Fields
+                        .Select(field => new { field.Name, field.Settings, field.FieldDefinition })
+                        .ToList(),
+                },
+            },
             [nameof(ContentSetPart)] = ContentSetPart,
             [nameof(ContentItem)] = ContentItem,
         };

From cbe1e02f8a31596da5f6ab3bbf8e83e86c00df56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Fri, 8 Sep 2023 11:09:28 +0200
Subject: [PATCH 09/30] Fix deserialization.

---
 .../ContentSets/Models/GetSupportedOptionsContext.cs   |  2 +-
 .../Handlers/WorkflowContentSetEventHandler.cs         | 10 ++++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/GetSupportedOptionsContext.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/GetSupportedOptionsContext.cs
index 8270a5fc..6d90f13b 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/GetSupportedOptionsContext.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/GetSupportedOptionsContext.cs
@@ -15,7 +15,7 @@ public IDictionary<string, object> ToDictionary() =>
         new Dictionary<string, object>
         {
             // We create a new type here to avoid circular references which break JSON serialization.
-            [nameof(Definition)] = new
+            [nameof(Definition)] = Definition == null ? null : new
             {
                 Definition.Name,
                 Definition.Settings,
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Handlers/WorkflowContentSetEventHandler.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Handlers/WorkflowContentSetEventHandler.cs
index dac85e52..81ae57cc 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Handlers/WorkflowContentSetEventHandler.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Handlers/WorkflowContentSetEventHandler.cs
@@ -10,6 +10,8 @@
 using OrchardCore.Workflows.Models;
 using OrchardCore.Workflows.Services;
 using System.Collections.Generic;
+using System.Dynamic;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows.Handlers;
@@ -51,11 +53,11 @@ public async Task<IEnumerable<ContentSetLinkViewModel>> GetSupportedOptionsAsync
                 case ContentSetLinkViewModel viewModel:
                     links.Add(viewModel);
                     break;
-                case JArray jsonArray:
-                    links.AddRange(jsonArray.ToObject<IEnumerable<ContentSetLinkViewModel>>());
+                case IEnumerable<object> collection when collection.CastWhere<ExpandoObject>() is { } objects && objects.Any():
+                    links.AddRange(JToken.FromObject(objects).ToObject<IEnumerable<ContentSetLinkViewModel>>());
                     break;
-                case JObject jsonObject:
-                    links.Add(jsonObject.ToObject<ContentSetLinkViewModel>());
+                case ExpandoObject expandoObject:
+                    links.Add(JToken.FromObject(expandoObject).ToObject<ContentSetLinkViewModel>());
                     break;
                 case string json when !string.IsNullOrWhiteSpace(json):
                     links.AddRange(JsonConvert.DeserializeObject<List<ContentSetLinkViewModel>>(json));

From 2b9999ff4c496d93ba7a77d486e3ddf5b20a6ed1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Fri, 8 Sep 2023 13:19:28 +0200
Subject: [PATCH 10/30] Use DocumentedEventActivityDisplayDriverBase.

---
 .../ContentSetCreatingEventDisplayDriver.cs   | 23 +++++++--
 ...etGetSupportedOptionsEventDisplayDriver.cs | 49 ++++++++++---------
 2 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetCreatingEventDisplayDriver.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetCreatingEventDisplayDriver.cs
index db3b8037..84000311 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetCreatingEventDisplayDriver.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetCreatingEventDisplayDriver.cs
@@ -1,16 +1,33 @@
-using Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows.Activities;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows.Activities;
 using Lombiq.HelpfulLibraries.OrchardCore.Workflow;
 using Microsoft.AspNetCore.Mvc.Localization;
+using Microsoft.Extensions.Localization;
+using OrchardCore.ContentManagement;
+using OrchardCore.ContentManagement.Metadata.Models;
+using OrchardCore.DisplayManagement.Notify;
+using System.Collections.Generic;
 
 namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows.Drivers;
 
-public class ContentSetCreatingEventDisplayDriver : SimpleEventActivityDisplayDriverBase<ContentSetCreatingEvent>
+public class ContentSetCreatingEventDisplayDriver : DocumentedEventActivityDisplayDriverBase<ContentSetCreatingEvent>
 {
     private readonly IHtmlLocalizer<ContentSetCreatingEventDisplayDriver> H;
 
     public override string IconClass => "fa-circle-half-stroke";
     public override LocalizedHtmlString Description => H["Executes when a new content item is created in the content set."];
+    public override IDictionary<string, string> AvailableInputs { get; } = new Dictionary<string, string>
+    {
+        [nameof(CreatingContext.ContentItem)] = nameof(ContentItem),
+        [nameof(CreatingContext.Definition)] = nameof(ContentTypePartDefinition),
+        [nameof(CreatingContext.ContentSet)] = "string",
+        [nameof(CreatingContext.NewKey)] = "string",
+    };
 
-    public ContentSetCreatingEventDisplayDriver(IHtmlLocalizer<ContentSetCreatingEventDisplayDriver> htmlLocalizer) =>
+    public ContentSetCreatingEventDisplayDriver(
+        INotifier notifier,
+        IStringLocalizer<DocumentedEventActivityDisplayDriver> baseLocalizer,
+        IHtmlLocalizer<ContentSetCreatingEventDisplayDriver> htmlLocalizer)
+        : base(notifier, baseLocalizer) =>
         H = htmlLocalizer;
 }
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs
index e5eac8e6..d6d9d981 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs
@@ -2,41 +2,46 @@
 using Lombiq.HelpfulExtensions.Extensions.ContentSets.ViewModels;
 using Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows.Activities;
 using Lombiq.HelpfulLibraries.OrchardCore.Workflow;
-using Microsoft.AspNetCore.Html;
 using Microsoft.AspNetCore.Mvc.Localization;
+using Microsoft.Extensions.Localization;
 using Newtonsoft.Json;
+using OrchardCore.ContentManagement;
+using OrchardCore.ContentManagement.Metadata.Models;
+using OrchardCore.DisplayManagement.Notify;
+using System.Collections.Generic;
 
 namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows.Drivers;
 
-public class ContentSetGetSupportedOptionsEventDisplayDriver : SimpleEventActivityDisplayDriverBase<ContentSetGetSupportedOptionsEvent>
+public class ContentSetGetSupportedOptionsEventDisplayDriver :
+    DocumentedEventActivityDisplayDriverBase<ContentSetGetSupportedOptionsEvent>
 {
     private readonly IHtmlLocalizer<ContentSetGetSupportedOptionsEventDisplayDriver> H;
 
     public override string IconClass => "fa-circle-half-stroke";
 
-    public override LocalizedHtmlString Description
-    {
-        get
-        {
-            var foreword = H["Tries to get a list of links representing the supported options for this content set."];
-
-            var inputKeys = new GetSupportedOptionsContext(Definition: null, ContentSetPart: null).ToDictionary().Keys;
-            var inputs = H["The available inputs are: {0}", string.Join(", ", inputKeys)];
+    public override LocalizedHtmlString Description =>
+        H["Tries to get a list of links representing the supported options for this content set."];
 
-            // Not using Newtonsoft.Json.Schema to generate a real JSON schema due to licensing issues. On the other hand
-            // System.Text.Json doesn't officially support JSON schema generation yet, so that's not an option either.
-            var schema = JsonConvert.SerializeObject(new ContentSetLinkViewModel(
-                IsDeleted: false,
-                "string",
-                "string",
-                "string")) + "[]";
-            var expectation = H["Expects an output \"{0}\" in the format <code>{1}</code>.", ContentSetGetSupportedOptionsEvent.OutputName, schema];
+    public override IDictionary<string, string> AvailableInputs { get; } = new Dictionary<string, string>
+    {
+        [nameof(GetSupportedOptionsContext.Definition)] = nameof(ContentTypePartDefinition),
+        [nameof(GetSupportedOptionsContext.ContentSetPart)] = nameof(ContentSetPart),
+        [nameof(GetSupportedOptionsContext.ContentItem)] = nameof(ContentItem),
+    };
 
-            return new HtmlString("<br>").Join(foreword, inputs, expectation);
-        }
-    }
+    public override IDictionary<string, string> ExpectedOutputs { get; } = new Dictionary<string, string>
+    {
+        [ContentSetGetSupportedOptionsEvent.OutputName] = JsonConvert.SerializeObject(new ContentSetLinkViewModel(
+            IsDeleted: false,
+            "string",
+            "string",
+            "string")) + "[]",
+    };
 
     public ContentSetGetSupportedOptionsEventDisplayDriver(
-        IHtmlLocalizer<ContentSetGetSupportedOptionsEventDisplayDriver> htmlLocalizer) =>
+        INotifier notifier,
+        IStringLocalizer<DocumentedEventActivityDisplayDriver> baseLocalizer,
+        IHtmlLocalizer<ContentSetGetSupportedOptionsEventDisplayDriver> htmlLocalizer)
+        : base(notifier, baseLocalizer) =>
         H = htmlLocalizer;
 }

From 421cb02cd8c953adac2dae0951f9691bf226e3a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Fri, 8 Sep 2023 13:20:35 +0200
Subject: [PATCH 11/30] Move workflow models to the correct directory.

---
 .../ContentSets/Models/CreatingContext.cs         | 15 ---------------
 .../ContentSetCreatingEventDisplayDriver.cs       |  4 ++--
 ...entSetGetSupportedOptionsEventDisplayDriver.cs |  1 +
 .../Handlers/WorkflowContentSetEventHandler.cs    |  1 +
 .../Workflows/Models/CreatingContext.cs           | 10 ++++++++++
 .../Models/GetSupportedOptionsContext.cs          |  5 +++--
 6 files changed, 17 insertions(+), 19 deletions(-)
 delete mode 100644 Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/CreatingContext.cs
 create mode 100644 Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Models/CreatingContext.cs
 rename Lombiq.HelpfulExtensions/Extensions/ContentSets/{ => Workflows}/Models/GetSupportedOptionsContext.cs (86%)

diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/CreatingContext.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/CreatingContext.cs
deleted file mode 100644
index abd9eb02..00000000
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/CreatingContext.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using Microsoft.AspNetCore.Routing;
-using OrchardCore.ContentManagement;
-using OrchardCore.ContentManagement.Metadata.Models;
-using System.Collections.Generic;
-
-namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
-
-public record CreatingContext(
-    ContentItem ContentItem,
-    ContentTypePartDefinition Definition,
-    string ContentSet,
-    string NewKey)
-{
-    public IDictionary<string, object> ToDictionary() => new RouteValueDictionary(this);
-}
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetCreatingEventDisplayDriver.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetCreatingEventDisplayDriver.cs
index 84000311..e452782e 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetCreatingEventDisplayDriver.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetCreatingEventDisplayDriver.cs
@@ -1,5 +1,5 @@
-using Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
-using Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows.Activities;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows.Activities;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows.Models;
 using Lombiq.HelpfulLibraries.OrchardCore.Workflow;
 using Microsoft.AspNetCore.Mvc.Localization;
 using Microsoft.Extensions.Localization;
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs
index d6d9d981..4e580789 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs
@@ -1,6 +1,7 @@
 using Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
 using Lombiq.HelpfulExtensions.Extensions.ContentSets.ViewModels;
 using Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows.Activities;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows.Models;
 using Lombiq.HelpfulLibraries.OrchardCore.Workflow;
 using Microsoft.AspNetCore.Mvc.Localization;
 using Microsoft.Extensions.Localization;
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Handlers/WorkflowContentSetEventHandler.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Handlers/WorkflowContentSetEventHandler.cs
index 81ae57cc..f7e34c3b 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Handlers/WorkflowContentSetEventHandler.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Handlers/WorkflowContentSetEventHandler.cs
@@ -2,6 +2,7 @@
 using Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
 using Lombiq.HelpfulExtensions.Extensions.ContentSets.ViewModels;
 using Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows.Activities;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows.Models;
 using Lombiq.HelpfulLibraries.OrchardCore.Workflow;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Models/CreatingContext.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Models/CreatingContext.cs
new file mode 100644
index 00000000..32d4b2f0
--- /dev/null
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Models/CreatingContext.cs
@@ -0,0 +1,10 @@
+using OrchardCore.ContentManagement;
+using OrchardCore.ContentManagement.Metadata.Models;
+
+namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows.Models;
+
+public record CreatingContext(
+    ContentItem ContentItem,
+    ContentTypePartDefinition Definition,
+    string ContentSet,
+    string NewKey);
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/GetSupportedOptionsContext.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Models/GetSupportedOptionsContext.cs
similarity index 86%
rename from Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/GetSupportedOptionsContext.cs
rename to Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Models/GetSupportedOptionsContext.cs
index 6d90f13b..f727c05d 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/GetSupportedOptionsContext.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Models/GetSupportedOptionsContext.cs
@@ -1,9 +1,10 @@
-using OrchardCore.ContentManagement;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
+using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
+namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Workflows.Models;
 
 public record GetSupportedOptionsContext(
     ContentTypePartDefinition Definition,

From 2b2375d5dfd4107eec3388828813adbc733d5a88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Fri, 8 Sep 2023 16:13:28 +0200
Subject: [PATCH 12/30] Fix summary admin.

---
 .../ContentSets/ViewModels/ContentSetPartViewModel.cs  | 10 ++++++++++
 .../Views/ContentSetPart.SummaryAdmin.Links.cshtml     |  5 +++--
 .../Views/ContentSetPart.SummaryAdmin.Tags.cshtml      |  4 ++--
 3 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/ViewModels/ContentSetPartViewModel.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/ViewModels/ContentSetPartViewModel.cs
index f97b3cbb..46488c45 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/ViewModels/ContentSetPartViewModel.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/ViewModels/ContentSetPartViewModel.cs
@@ -1,6 +1,7 @@
 using Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
 using OrchardCore.ContentManagement.Metadata.Models;
+using OrchardCore.ContentManagement.Metadata.Settings;
 using System.Collections.Generic;
 using System.Linq;
 
@@ -22,6 +23,15 @@ public class ContentSetPartViewModel
 
     [BindNever]
     public bool IsNew { get; set; }
+
+    [BindNever]
+    public string Displaytext =>
+        Definition?
+            .Settings?
+            .Property(nameof(ContentTypePartSettings))?
+            .Value
+            .ToObject<ContentTypePartSettings>()?
+            .DisplayName ?? Definition?.Name;
 }
 
 public record ContentSetLinkViewModel(bool IsDeleted, string DisplayText, string ContentItemId, string Key);
diff --git a/Lombiq.HelpfulExtensions/Views/ContentSetPart.SummaryAdmin.Links.cshtml b/Lombiq.HelpfulExtensions/Views/ContentSetPart.SummaryAdmin.Links.cshtml
index 538a906b..c8c90537 100644
--- a/Lombiq.HelpfulExtensions/Views/ContentSetPart.SummaryAdmin.Links.cshtml
+++ b/Lombiq.HelpfulExtensions/Views/ContentSetPart.SummaryAdmin.Links.cshtml
@@ -1,14 +1,15 @@
+@using OrchardCore.ContentManagement.Metadata.Settings
 @model Lombiq.HelpfulExtensions.Extensions.ContentSets.ViewModels.ContentSetPartViewModel
 
 @{
     if (string.IsNullOrEmpty(Model.ContentSet) || !Model.MemberLinks.Any()) { return; }
 
-    var title = T[Model.Definition.Name];
+    var title = T[Model.Displaytext];
 }
 
 <div class="btn-group" title="@title">
     <button type="button"
-            class="btn btn-sm btn-info dropdown-toggle localizations"
+            class="btn btn-sm btn-info dropdown-toggle content-set"
             data-bs-toggle="dropdown"
             aria-haspopup="true"
             aria-expanded="false">
diff --git a/Lombiq.HelpfulExtensions/Views/ContentSetPart.SummaryAdmin.Tags.cshtml b/Lombiq.HelpfulExtensions/Views/ContentSetPart.SummaryAdmin.Tags.cshtml
index 1f35651d..5f56a80a 100644
--- a/Lombiq.HelpfulExtensions/Views/ContentSetPart.SummaryAdmin.Tags.cshtml
+++ b/Lombiq.HelpfulExtensions/Views/ContentSetPart.SummaryAdmin.Tags.cshtml
@@ -2,8 +2,8 @@
 
 @if (Model.ContentSetPart.Key != null)
 {
-    <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T[Model.Definition.Name]">
+    <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Content set type and key"]">
         <i class="fa-solid fa-ellipsis" aria-hidden="true"></i>
-        @T[Model.Definition.Name]: @Model.ContentSetPart.Key
+        @T[Model.Displaytext]: @Model.ContentSetPart.Key
     </span>
 }

From 2ec32fd5402efddecf4c824a2596d1885faa1c87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Fri, 8 Sep 2023 22:32:02 +0200
Subject: [PATCH 13/30] unusing

---
 .../Views/ContentSetPart.SummaryAdmin.Links.cshtml               | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Lombiq.HelpfulExtensions/Views/ContentSetPart.SummaryAdmin.Links.cshtml b/Lombiq.HelpfulExtensions/Views/ContentSetPart.SummaryAdmin.Links.cshtml
index c8c90537..db597eb4 100644
--- a/Lombiq.HelpfulExtensions/Views/ContentSetPart.SummaryAdmin.Links.cshtml
+++ b/Lombiq.HelpfulExtensions/Views/ContentSetPart.SummaryAdmin.Links.cshtml
@@ -1,4 +1,3 @@
-@using OrchardCore.ContentManagement.Metadata.Settings
 @model Lombiq.HelpfulExtensions.Extensions.ContentSets.ViewModels.ContentSetPartViewModel
 
 @{

From 2bcb261634919a820182dc5a1a0655d8837b7fff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Fri, 8 Sep 2023 22:32:14 +0200
Subject: [PATCH 14/30] Add documentation.

---
 ...ntSetGetSupportedOptionsEventDisplayDriver.cs |  7 ++-----
 Readme.md                                        | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs
index 4e580789..9168a9da 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs
@@ -32,11 +32,8 @@ public class ContentSetGetSupportedOptionsEventDisplayDriver :
 
     public override IDictionary<string, string> ExpectedOutputs { get; } = new Dictionary<string, string>
     {
-        [ContentSetGetSupportedOptionsEvent.OutputName] = JsonConvert.SerializeObject(new ContentSetLinkViewModel(
-            IsDeleted: false,
-            "string",
-            "string",
-            "string")) + "[]",
+        [ContentSetGetSupportedOptionsEvent.OutputName] =
+            $"{{ \"{nameof(ContentSetLinkViewModel.Key)}\": string, \"{nameof(ContentSetLinkViewModel.DisplayText)}\": string }}[]",
     };
 
     public ContentSetGetSupportedOptionsEventDisplayDriver(
diff --git a/Readme.md b/Readme.md
index 42ce08aa..aa15491b 100644
--- a/Readme.md
+++ b/Readme.md
@@ -55,6 +55,22 @@ The built-in converters handle the following O1 content parts:
 
 Additionally, if a custom converter fills in the `OrchardIds` content part's `Parent` property on the generated content item, then it also adds it to the parent content item's `ListPart`.
 
+### Content Sets
+
+Adds an attachable (named) content part that ties together a content item and a set of variants for it. This is similar to Content Localization part, but generic and not tied to the culture options. The `IContentSetEventHandler.GetSupportedOptionsAsync()` extension point is used to generate the valid options for a content item with an attached `ContentSetPart`.
+
+The content items are indexed into the `ContentSetIndex`. The `IContentSetManager` has methods to retrieve the existing content items (or just the IDs) for a specific content set.
+
+When the content part is attached, you will see a new dropdown in the content items list on the admin dashboard, just like it is with the Content Localization part, but this is uses the named part's display text as its label. You can use the dropdown or the editor view to select an options. Then the content item is cloned and that option's key assigned to it.
+
+#### Generating content set options
+
+You can generate your custom content set options two ways:
+- Create a service which implements the `IContentSetEventHandler` interface.
+- Create a workflow with the _Creating Content Set_ startup event. The workflow should return an output `MemberLinks` which should contain an array of `{ "Key": string, "DisplayText": string }` objects. Further details can be seen on the event's editor screen.
+
+The latter can be used even if you don't have access to the code, e.g. on DotNest. With either approach you only have to provide the `Key` and `DisplayText` properties, anything else is automatically filled in by the module. In both cases you have access to the context such as the current content item's key, the related part's part definition, etc. You can use this information to only create options selectively.
+
 ### Flows Helpful Extensions
 
 Adds additional styling capabilities to the OrchardCore.Flows feature by making it possible to add classes to widgets in the Flow Part editor. Just add `AdditionalStylingPart` to the content type using `FlowPart`.

From fe0b9a83ccc225ba1f67ada86096282120426399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Sun, 10 Sep 2023 07:20:12 +0200
Subject: [PATCH 15/30] Fix readme.

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index aa15491b..2306f2a5 100644
--- a/Readme.md
+++ b/Readme.md
@@ -59,7 +59,7 @@ Additionally, if a custom converter fills in the `OrchardIds` content part's `Pa
 
 Adds an attachable (named) content part that ties together a content item and a set of variants for it. This is similar to Content Localization part, but generic and not tied to the culture options. The `IContentSetEventHandler.GetSupportedOptionsAsync()` extension point is used to generate the valid options for a content item with an attached `ContentSetPart`.
 
-The content items are indexed into the `ContentSetIndex`. The `IContentSetManager` has methods to retrieve the existing content items (or just the IDs) for a specific content set.
+The content items are indexed into the `ContentSetIndex`. The `IContentSetManager` has methods to retrieve the existing content items (or just the index rows) for a specific content set.
 
 When the content part is attached, you will see a new dropdown in the content items list on the admin dashboard, just like it is with the Content Localization part, but this is uses the named part's display text as its label. You can use the dropdown or the editor view to select an options. Then the content item is cloned and that option's key assigned to it.
 

From 270a8beb1314cc870d692c1cffc2cb033cc090c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Sun, 10 Sep 2023 07:20:58 +0200
Subject: [PATCH 16/30] Add display action.

---
 .../Controllers/ContentSetController.cs       | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/Lombiq.HelpfulExtensions/Controllers/ContentSetController.cs b/Lombiq.HelpfulExtensions/Controllers/ContentSetController.cs
index 03b929c7..b9542dba 100644
--- a/Lombiq.HelpfulExtensions/Controllers/ContentSetController.cs
+++ b/Lombiq.HelpfulExtensions/Controllers/ContentSetController.cs
@@ -1,7 +1,9 @@
-using Lombiq.HelpfulExtensions.Extensions.ContentSets.Services;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Services;
 using Microsoft.AspNetCore.Mvc;
 using OrchardCore;
 using OrchardCore.Modules;
+using System.Linq;
 using System.Threading.Tasks;
 
 namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Controllers;
@@ -22,4 +24,19 @@ public async Task<IActionResult> Create(string fromContentItemId, string fromPar
         await _contentSetManager.CloneContentItemAsync(fromContentItemId, fromPartName, newKey) is { } content
             ? Redirect(_orchardHelper.GetItemEditUrl(content))
             : NotFound();
+
+    [Route("Lombiq.HelpfulExtensions/ContentSet/Display/{setId}/{key}")]
+    public async Task<IActionResult> Display(string setId, string key, bool exactKey)
+    {
+        if (string.IsNullOrEmpty(setId)) return NotFound();
+        if (string.IsNullOrEmpty(key)) return NotFound();
+
+        var indexes = await _contentSetManager.GetIndexAsync(setId);
+        var ids = indexes.ToDictionary(index => index.Key, index => index.ContentItemId);
+
+        if (ids.TryGetValue(key, out var exactMatch)) return this.RedirectToContentDisplay(exactMatch);
+        if (exactKey) return NotFound();
+
+        return this.RedirectToContentDisplay(ids[ContentSetPart.Default]);
+    }
 }

From 225fff21b9d9437e911b54c45069647e322d1265 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Sun, 10 Sep 2023 08:09:08 +0200
Subject: [PATCH 17/30] Fix property name.

---
 .../ContentSets/ViewModels/ContentSetPartViewModel.cs           | 2 +-
 .../Views/ContentSetPart.SummaryAdmin.Links.cshtml              | 2 +-
 .../Views/ContentSetPart.SummaryAdmin.Tags.cshtml               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/ViewModels/ContentSetPartViewModel.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/ViewModels/ContentSetPartViewModel.cs
index 46488c45..c585078c 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/ViewModels/ContentSetPartViewModel.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/ViewModels/ContentSetPartViewModel.cs
@@ -25,7 +25,7 @@ public class ContentSetPartViewModel
     public bool IsNew { get; set; }
 
     [BindNever]
-    public string Displaytext =>
+    public string DisplayName =>
         Definition?
             .Settings?
             .Property(nameof(ContentTypePartSettings))?
diff --git a/Lombiq.HelpfulExtensions/Views/ContentSetPart.SummaryAdmin.Links.cshtml b/Lombiq.HelpfulExtensions/Views/ContentSetPart.SummaryAdmin.Links.cshtml
index db597eb4..e45697aa 100644
--- a/Lombiq.HelpfulExtensions/Views/ContentSetPart.SummaryAdmin.Links.cshtml
+++ b/Lombiq.HelpfulExtensions/Views/ContentSetPart.SummaryAdmin.Links.cshtml
@@ -3,7 +3,7 @@
 @{
     if (string.IsNullOrEmpty(Model.ContentSet) || !Model.MemberLinks.Any()) { return; }
 
-    var title = T[Model.Displaytext];
+    var title = T[Model.DisplayName];
 }
 
 <div class="btn-group" title="@title">
diff --git a/Lombiq.HelpfulExtensions/Views/ContentSetPart.SummaryAdmin.Tags.cshtml b/Lombiq.HelpfulExtensions/Views/ContentSetPart.SummaryAdmin.Tags.cshtml
index 5f56a80a..d3578852 100644
--- a/Lombiq.HelpfulExtensions/Views/ContentSetPart.SummaryAdmin.Tags.cshtml
+++ b/Lombiq.HelpfulExtensions/Views/ContentSetPart.SummaryAdmin.Tags.cshtml
@@ -4,6 +4,6 @@
 {
     <span class="badge ta-badge font-weight-normal" data-bs-toggle="tooltip" title="@T["Content set type and key"]">
         <i class="fa-solid fa-ellipsis" aria-hidden="true"></i>
-        @T[Model.Displaytext]: @Model.ContentSetPart.Key
+        @T[Model.DisplayName]: @Model.ContentSetPart.Key
     </span>
 }

From 7839e076d89617f7837f1752ea02cda44dd7744e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Sun, 10 Sep 2023 08:09:47 +0200
Subject: [PATCH 18/30] Extract ContentSetPartViewModel initialization for DRY.

---
 .../Drivers/ContentSetPartDisplayDriver.cs    | 93 +++++--------------
 .../ViewModels/ContentSetPartViewModel.cs     | 62 ++++++++++++-
 2 files changed, 85 insertions(+), 70 deletions(-)

diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetPartDisplayDriver.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetPartDisplayDriver.cs
index d39d710f..9b7f7cf1 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetPartDisplayDriver.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetPartDisplayDriver.cs
@@ -4,15 +4,12 @@
 using Lombiq.HelpfulExtensions.Extensions.ContentSets.ViewModels;
 using Lombiq.HelpfulLibraries.OrchardCore.Contents;
 using Microsoft.Extensions.Localization;
-using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Display.ContentDisplay;
 using OrchardCore.ContentManagement.Display.Models;
-using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.DisplayManagement.ModelBinding;
 using OrchardCore.DisplayManagement.Views;
 using OrchardCore.Entities;
 using System.Collections.Generic;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Drivers;
@@ -24,13 +21,13 @@ public class ContentSetPartDisplayDriver : ContentPartDisplayDriver<ContentSetPa
     private readonly IContentSetManager _contentSetManager;
     private readonly IIdGenerator _idGenerator;
     private readonly IEnumerable<IContentSetEventHandler> _contentSetEventHandlers;
-    private readonly IStringLocalizer<ContentSetPartDisplayDriver> T;
+    private readonly IStringLocalizer<ContentSetPart> T;
 
     public ContentSetPartDisplayDriver(
         IContentSetManager contentSetManager,
         IIdGenerator idGenerator,
         IEnumerable<IContentSetEventHandler> contentSetEventHandlers,
-        IStringLocalizer<ContentSetPartDisplayDriver> stringLocalizer)
+        IStringLocalizer<ContentSetPart> stringLocalizer)
     {
         _contentSetManager = contentSetManager;
         _idGenerator = idGenerator;
@@ -38,22 +35,33 @@ public ContentSetPartDisplayDriver(
         T = stringLocalizer;
     }
 
-    public override IDisplayResult Display(ContentSetPart part, BuildPartDisplayContext context) =>
-        Combine(
-            Initialize<ContentSetPartViewModel>(
-                    $"{ShapeType}_Tags",
-                    model => BuildViewModelAsync(model, part, context.TypePartDefinition, isNew: false))
+    public override IDisplayResult Display(ContentSetPart part, BuildPartDisplayContext context)
+    {
+        ValueTask InitializeAsync(ContentSetPartViewModel model) =>
+            model.InitializeAsync(
+                _contentSetManager,
+                _contentSetEventHandlers,
+                T,
+                part,
+                context.TypePartDefinition,
+                isNew: false);
+
+        return Combine(
+            Initialize<ContentSetPartViewModel>($"{ShapeType}_Tags", InitializeAsync)
                 .Location(CommonContentDisplayTypes.SummaryAdmin, "Tags:11"),
-            Initialize<ContentSetPartViewModel>(
-                    $"{ShapeType}_Links",
-                    model => BuildViewModelAsync(model, part, context.TypePartDefinition, isNew: false))
+            Initialize<ContentSetPartViewModel>($"{ShapeType}_Links", InitializeAsync)
                 .Location(CommonContentDisplayTypes.SummaryAdmin, "Actions:5")
         );
+    }
 
     public override IDisplayResult Edit(ContentSetPart part, BuildPartEditorContext context) =>
-        Initialize<ContentSetPartViewModel>(
-                $"{nameof(ContentSetPart)}_Edit",
-                model => BuildViewModelAsync(model, part, context.TypePartDefinition, context.IsNew))
+        Initialize<ContentSetPartViewModel>($"{nameof(ContentSetPart)}_Edit", model => model.InitializeAsync(
+                _contentSetManager,
+                _contentSetEventHandlers,
+                T,
+                part,
+                context.TypePartDefinition,
+                context.IsNew))
             .Location($"Parts:0%{context.TypePartDefinition.Name};0");
 
     public override async Task<IDisplayResult> UpdateAsync(
@@ -77,57 +85,4 @@ public override async Task<IDisplayResult> UpdateAsync(
 
         return await EditAsync(part, context);
     }
-
-    public async ValueTask BuildViewModelAsync(
-        ContentSetPartViewModel model,
-        ContentSetPart part,
-        ContentTypePartDefinition definition,
-        bool isNew)
-    {
-        model.Key = part.Key;
-        model.ContentSet = part.ContentSet;
-        model.ContentSetPart = part;
-        model.Definition = definition;
-        model.IsNew = isNew;
-
-        var existingContentItems = (await _contentSetManager.GetContentItemsAsync(part.ContentSet))
-            .ToDictionary(item => item.Get<ContentSetPart>(definition.Name)?.Key);
-
-        var options = new Dictionary<string, ContentSetLinkViewModel>
-        {
-            [ContentSetPart.Default] = new(
-                IsDeleted: false,
-                T["Default content item"],
-                existingContentItems.GetMaybe(ContentSetPart.Default)?.ContentItemId,
-                ContentSetPart.Default),
-        };
-
-        var supportedOptions = (await _contentSetEventHandlers.AwaitEachAsync(item => item.GetSupportedOptionsAsync(part, definition)))
-            .Where(links => links != null)
-            .SelectMany(links => links);
-        options.AddRange(supportedOptions, link => link.Key);
-
-        // Ensure the existing content item IDs are applied to the supported option links.
-        existingContentItems
-            .Where(pair => options.GetMaybe(pair.Key)?.ContentItemId != pair.Value.ContentItemId)
-            .ForEach(pair => options[pair.Key] = options[pair.Key] with { ContentItemId = pair.Value.ContentItemId });
-
-        // Content items that have been added to the set but no longer generate a valid option matching their key.
-        var inapplicableSetMembers = existingContentItems
-            .Where(pair => !options.ContainsKey(pair.Key))
-            .Select(pair => new ContentSetLinkViewModel(
-                IsDeleted: true,
-                T["{0} (No longer applicable)", pair.Value.DisplayText].Value,
-                pair.Value.ContentItemId,
-                pair.Key));
-        options.AddRange(inapplicableSetMembers, link => link.Key);
-
-        model.MemberLinks = options
-            .Values
-            .Where(link => link.Key != model.Key && link.ContentItemId != part.ContentItem.ContentItemId)
-            .OrderBy(link => string.IsNullOrEmpty(link.ContentItemId) ? 1 : 0)
-            .ThenBy(link => link.IsDeleted ? 1 : 0)
-            .ThenBy(link => link.DisplayText)
-            .ToList();
-    }
 }
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/ViewModels/ContentSetPartViewModel.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/ViewModels/ContentSetPartViewModel.cs
index c585078c..641bc031 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/ViewModels/ContentSetPartViewModel.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/ViewModels/ContentSetPartViewModel.cs
@@ -1,9 +1,14 @@
-using Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Events;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Services;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
+using Microsoft.Extensions.Localization;
+using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.ContentManagement.Metadata.Settings;
 using System.Collections.Generic;
 using System.Linq;
+using System.Threading.Tasks;
 
 namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.ViewModels;
 
@@ -32,6 +37,61 @@ public class ContentSetPartViewModel
             .Value
             .ToObject<ContentTypePartSettings>()?
             .DisplayName ?? Definition?.Name;
+
+    public async ValueTask InitializeAsync(
+        IContentSetManager contentSetManager,
+        IEnumerable<IContentSetEventHandler> contentSetEventHandlers,
+        IStringLocalizer stringLocalizer,
+        ContentSetPart part,
+        ContentTypePartDefinition definition,
+        bool isNew)
+    {
+        Key = part.Key;
+        ContentSet = part.ContentSet;
+        ContentSetPart = part;
+        Definition = definition;
+        IsNew = isNew;
+
+        var existingContentItems = (await contentSetManager.GetContentItemsAsync(part.ContentSet))
+            .ToDictionary(item => item.Get<ContentSetPart>(definition.Name)?.Key);
+
+        var options = new Dictionary<string, ContentSetLinkViewModel>
+        {
+            [ContentSetPart.Default] = new(
+                IsDeleted: false,
+                stringLocalizer["Default content item"],
+                existingContentItems.GetMaybe(ContentSetPart.Default)?.ContentItemId,
+                ContentSetPart.Default),
+        };
+
+        var supportedOptions = (await contentSetEventHandlers.AwaitEachAsync(item => item.GetSupportedOptionsAsync(part, definition)))
+            .Where(links => links != null)
+            .SelectMany(links => links);
+        options.AddRange(supportedOptions, link => link.Key);
+
+        // Ensure the existing content item IDs are applied to the supported option links.
+        existingContentItems
+            .Where(pair => options.GetMaybe(pair.Key)?.ContentItemId != pair.Value.ContentItemId)
+            .ForEach(pair => options[pair.Key] = options[pair.Key] with { ContentItemId = pair.Value.ContentItemId });
+
+        // Content items that have been added to the set but no longer generate a valid option matching their key.
+        var inapplicableSetMembers = existingContentItems
+            .Where(pair => !options.ContainsKey(pair.Key))
+            .Select(pair => new ContentSetLinkViewModel(
+                IsDeleted: true,
+                stringLocalizer["{0} (No longer applicable)", pair.Value.DisplayText].Value,
+                pair.Value.ContentItemId,
+                pair.Key));
+        options.AddRange(inapplicableSetMembers, link => link.Key);
+
+        MemberLinks = options
+            .Values
+            .Where(link => link.Key != Key && link.ContentItemId != part.ContentItem.ContentItemId)
+            .OrderBy(link => string.IsNullOrEmpty(link.ContentItemId) ? 1 : 0)
+            .ThenBy(link => link.IsDeleted ? 1 : 0)
+            .ThenBy(link => link.DisplayText)
+            .ToList();
+    }
 }
 
 public record ContentSetLinkViewModel(bool IsDeleted, string DisplayText, string ContentItemId, string Key);

From 98c6dc338779d363f4fe6d656376d615dbd0d87b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Sun, 10 Sep 2023 08:10:04 +0200
Subject: [PATCH 19/30] Add ContentSetContentPickerField.

---
 ...ntentSetContentPickerFieldDisplayDriver.cs | 63 +++++++++++++++++++
 .../Models/ContentSetContentPickerField.cs    | 12 ++++
 .../Extensions/ContentSets/Startup.cs         |  3 +
 .../ContentSetContentPickerFieldViewModel.cs  |  8 +++
 .../Views/ContentSetContentPickerField.cshtml | 28 +++++++++
 5 files changed, 114 insertions(+)
 create mode 100644 Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetContentPickerFieldDisplayDriver.cs
 create mode 100644 Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/ContentSetContentPickerField.cs
 create mode 100644 Lombiq.HelpfulExtensions/Extensions/ContentSets/ViewModels/ContentSetContentPickerFieldViewModel.cs
 create mode 100644 Lombiq.HelpfulExtensions/Views/ContentSetContentPickerField.cshtml

diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetContentPickerFieldDisplayDriver.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetContentPickerFieldDisplayDriver.cs
new file mode 100644
index 00000000..378387fa
--- /dev/null
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetContentPickerFieldDisplayDriver.cs
@@ -0,0 +1,63 @@
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Events;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Services;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.ViewModels;
+using Lombiq.HelpfulLibraries.OrchardCore.Contents;
+using Microsoft.Extensions.Localization;
+using Newtonsoft.Json.Linq;
+using OrchardCore.ContentManagement;
+using OrchardCore.ContentManagement.Display.ContentDisplay;
+using OrchardCore.ContentManagement.Display.Models;
+using OrchardCore.ContentManagement.Metadata;
+using OrchardCore.ContentManagement.Metadata.Models;
+using OrchardCore.DisplayManagement.Views;
+using System.Collections.Generic;
+
+namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Drivers;
+
+public class ContentSetContentPickerFieldDisplayDriver : ContentFieldDisplayDriver<ContentSetContentPickerField>
+{
+    private readonly IContentDefinitionManager _contentDefinitionManager;
+    private readonly IContentSetManager _contentSetManager;
+    private readonly IEnumerable<IContentSetEventHandler> _contentSetEventHandlers;
+    private readonly IStringLocalizer<ContentSetPart> T;
+
+    public ContentSetContentPickerFieldDisplayDriver(
+        IContentDefinitionManager contentDefinitionManager,
+        IContentSetManager contentSetManager,
+        IEnumerable<IContentSetEventHandler> contentSetEventHandlers,
+        IStringLocalizer<ContentSetPart> stringLocalizer)
+    {
+        _contentDefinitionManager = contentDefinitionManager;
+        _contentSetManager = contentSetManager;
+        _contentSetEventHandlers = contentSetEventHandlers;
+        T = stringLocalizer;
+    }
+
+    public override IDisplayResult Display(
+        ContentSetContentPickerField field,
+        BuildFieldDisplayContext fieldDisplayContext)
+    {
+        var name = fieldDisplayContext.PartFieldDefinition.Name;
+        return field.ContentItem.Get<ContentSetPart>(name) is { } part
+            ? Initialize<ContentSetContentPickerFieldViewModel>(
+                    GetDisplayShapeType(fieldDisplayContext),
+                    model =>
+                    {
+                        model.PartFieldDefinition = fieldDisplayContext.PartFieldDefinition;
+                        return model.InitializeAsync(
+                            _contentSetManager,
+                            _contentSetEventHandlers,
+                            T,
+                            part,
+                            new ContentTypePartDefinition(
+                                name,
+                                _contentDefinitionManager.GetPartDefinition(nameof(ContentSetPart)),
+                                new JObject()),
+                            isNew: false);
+                    })
+                .Location(CommonContentDisplayTypes.Detail, CommonLocationNames.Content)
+                .Location(CommonContentDisplayTypes.Summary, CommonLocationNames.Content)
+            : null;
+    }
+}
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/ContentSetContentPickerField.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/ContentSetContentPickerField.cs
new file mode 100644
index 00000000..cc50fbeb
--- /dev/null
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Models/ContentSetContentPickerField.cs
@@ -0,0 +1,12 @@
+using OrchardCore.ContentManagement;
+using System.Diagnostics.CodeAnalysis;
+
+namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
+
+[SuppressMessage(
+    "Minor Code Smell",
+    "S2094:Classes should not be empty",
+    Justification = "Only data we need is the field name.")]
+public class ContentSetContentPickerField : ContentField
+{
+}
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Startup.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Startup.cs
index 4a5f3d97..ecb4456f 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Startup.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Startup.cs
@@ -24,6 +24,9 @@ public override void ConfigureServices(IServiceCollection services)
             .WithMigration<Migrations>();
 
         services.AddScoped<IContentSetManager, ContentSetManager>();
+
+        services.AddContentField<ContentSetContentPickerField>()
+            .UseDisplayDriver<ContentSetContentPickerFieldDisplayDriver>();
     }
 
     public override void Configure(IApplicationBuilder app, IEndpointRouteBuilder routes, IServiceProvider serviceProvider)
diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/ViewModels/ContentSetContentPickerFieldViewModel.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/ViewModels/ContentSetContentPickerFieldViewModel.cs
new file mode 100644
index 00000000..d0799f27
--- /dev/null
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/ViewModels/ContentSetContentPickerFieldViewModel.cs
@@ -0,0 +1,8 @@
+using OrchardCore.ContentManagement.Metadata.Models;
+
+namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.ViewModels;
+
+public class ContentSetContentPickerFieldViewModel : ContentSetPartViewModel
+{
+    public ContentPartFieldDefinition PartFieldDefinition { get; set; }
+}
diff --git a/Lombiq.HelpfulExtensions/Views/ContentSetContentPickerField.cshtml b/Lombiq.HelpfulExtensions/Views/ContentSetContentPickerField.cshtml
new file mode 100644
index 00000000..dd8a6b8e
--- /dev/null
+++ b/Lombiq.HelpfulExtensions/Views/ContentSetContentPickerField.cshtml
@@ -0,0 +1,28 @@
+@model Lombiq.HelpfulExtensions.Extensions.ContentSets.ViewModels.ContentSetContentPickerFieldViewModel
+@using OrchardCore.ContentManagement.Utilities
+@using OrchardCore
+
+@{
+    var name = (Model.PartFieldDefinition.PartDefinition.Name + "-" + Model.PartFieldDefinition.Name).HtmlClassify();
+
+    var links = Model
+        .MemberLinks
+        .Where(link =>
+            !link.IsDeleted &&
+            link.ContentItemId != null &&
+            link.ContentItemId != Model.ContentSetPart.ContentItem.ContentItemId)
+        .ToList();
+    if (!links.Any()) { return; }
+}
+
+<div class="field field-type-localizationsetpickerfield field-name-@name">
+    <span class="name">@Model.DisplayName</span>
+    @for (var i = 0; i < links.Count; i++)
+    {
+        var link = links[i];
+        if (i > 0) { <span>,</span> }
+        <span class="value">
+            <a href="@Orchard.GetItemDisplayUrl(link.ContentItemId)">@link.DisplayText</a>
+        </span>
+    }
+</div>

From 22942916a76ef7225284a0d962d0f8a412421cc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Sun, 10 Sep 2023 09:33:53 +0200
Subject: [PATCH 20/30] Add docs.

---
 .../Controllers/ContentSetController.cs       | 19 +------------------
 Readme.md                                     |  4 ++++
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/Lombiq.HelpfulExtensions/Controllers/ContentSetController.cs b/Lombiq.HelpfulExtensions/Controllers/ContentSetController.cs
index b9542dba..03b929c7 100644
--- a/Lombiq.HelpfulExtensions/Controllers/ContentSetController.cs
+++ b/Lombiq.HelpfulExtensions/Controllers/ContentSetController.cs
@@ -1,9 +1,7 @@
-using Lombiq.HelpfulExtensions.Extensions.ContentSets.Models;
-using Lombiq.HelpfulExtensions.Extensions.ContentSets.Services;
+using Lombiq.HelpfulExtensions.Extensions.ContentSets.Services;
 using Microsoft.AspNetCore.Mvc;
 using OrchardCore;
 using OrchardCore.Modules;
-using System.Linq;
 using System.Threading.Tasks;
 
 namespace Lombiq.HelpfulExtensions.Extensions.ContentSets.Controllers;
@@ -24,19 +22,4 @@ public async Task<IActionResult> Create(string fromContentItemId, string fromPar
         await _contentSetManager.CloneContentItemAsync(fromContentItemId, fromPartName, newKey) is { } content
             ? Redirect(_orchardHelper.GetItemEditUrl(content))
             : NotFound();
-
-    [Route("Lombiq.HelpfulExtensions/ContentSet/Display/{setId}/{key}")]
-    public async Task<IActionResult> Display(string setId, string key, bool exactKey)
-    {
-        if (string.IsNullOrEmpty(setId)) return NotFound();
-        if (string.IsNullOrEmpty(key)) return NotFound();
-
-        var indexes = await _contentSetManager.GetIndexAsync(setId);
-        var ids = indexes.ToDictionary(index => index.Key, index => index.ContentItemId);
-
-        if (ids.TryGetValue(key, out var exactMatch)) return this.RedirectToContentDisplay(exactMatch);
-        if (exactKey) return NotFound();
-
-        return this.RedirectToContentDisplay(ids[ContentSetPart.Default]);
-    }
 }
diff --git a/Readme.md b/Readme.md
index 2306f2a5..dd05d949 100644
--- a/Readme.md
+++ b/Readme.md
@@ -71,6 +71,10 @@ You can generate your custom content set options two ways:
 
 The latter can be used even if you don't have access to the code, e.g. on DotNest. With either approach you only have to provide the `Key` and `DisplayText` properties, anything else is automatically filled in by the module. In both cases you have access to the context such as the current content item's key, the related part's part definition, etc. You can use this information to only create options selectively.
 
+#### Content Set Content Picker Field
+
+You can add this content field to any content item that also has a Content Set part. The field's technical name should be the same as the attached part's technical name. Besides that, no further configuration is needed. If there are available variants for a content item with this field, it will display a comma separated list of links where the option names are the link text.
+
 ### Flows Helpful Extensions
 
 Adds additional styling capabilities to the OrchardCore.Flows feature by making it possible to add classes to widgets in the Flow Part editor. Just add `AdditionalStylingPart` to the content type using `FlowPart`.

From 6b50250d6b2d82e3e822bd301311777d8704d225 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Sun, 10 Sep 2023 18:04:02 +0200
Subject: [PATCH 21/30] Recipe.

---
 .../Lombiq.HelpfulExtensions.csproj           |   1 +
 ...lExtensions.ContentSets.Sample.recipe.json | 292 ++++++++++++++++++
 2 files changed, 293 insertions(+)
 create mode 100644 Lombiq.HelpfulExtensions/Recipes/Lombiq.HelpfulExtensions.ContentSets.Sample.recipe.json

diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj
index 89beaf0c..28e84ac0 100644
--- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj
+++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj
@@ -60,6 +60,7 @@
     <PackageReference Include="Lombiq.NodeJs.Extensions" Version="1.3.0" />
   </ItemGroup>
 
+
   <Import Condition="'$(NuGetBuild)' != 'true'" Project="..\..\..\Utilities\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions.targets" />
 
 </Project>
diff --git a/Lombiq.HelpfulExtensions/Recipes/Lombiq.HelpfulExtensions.ContentSets.Sample.recipe.json b/Lombiq.HelpfulExtensions/Recipes/Lombiq.HelpfulExtensions.ContentSets.Sample.recipe.json
new file mode 100644
index 00000000..c3431ed5
--- /dev/null
+++ b/Lombiq.HelpfulExtensions/Recipes/Lombiq.HelpfulExtensions.ContentSets.Sample.recipe.json
@@ -0,0 +1,292 @@
+{
+  "name": "Lombiq.HelpfulExtensions.ContentSets.Samples",
+  "displayName": "Lombiq Helpful Extensions - Content Sets - Sample",
+  "description": "Sample content type, content items and workflow for the Content Sets feature.",
+  "author": "Lombiq Technologies",
+  "website": "https://github.com/Lombiq/Helpful-Extensions/",
+  "version": "1.0",
+  "issetuprecipe": false,
+  "categories": [
+    "test"
+  ],
+  "tags": [
+    "test"
+  ],
+  "steps": [
+    {
+      "name": "feature",
+      "enable": [
+        "Lombiq.HelpfulExtensions.ContentSets"
+      ]
+    },
+    {
+      "name": "ContentDefinition",
+      "ContentTypes": [
+        {
+          "Name": "ContentSetExample",
+          "DisplayName": "Content Set Example",
+          "Settings": {
+            "ContentTypeSettings": {
+              "Creatable": true,
+              "Listable": true,
+              "Draftable": false,
+              "Versionable": false,
+              "Securable": false
+            },
+            "FullTextAspectSettings": {},
+            "GraphQLContentTypeSettings": {}
+          },
+          "ContentTypePartDefinitionRecords": [
+            {
+              "PartName": "TitlePart",
+              "Name": "TitlePart",
+              "Settings": {
+                "ContentTypePartSettings": {
+                  "Position": "0"
+                }
+              }
+            },
+            {
+              "PartName": "ContentSetExample",
+              "Name": "ContentSetExample",
+              "Settings": {
+                "ContentTypePartSettings": {
+                  "Position": "1"
+                }
+              }
+            },
+            {
+              "PartName": "LiquidPart",
+              "Name": "LiquidPart",
+              "Settings": {
+                "ContentTypePartSettings": {
+                  "Position": "2"
+                }
+              }
+            },
+            {
+              "PartName": "ContentSetPart",
+              "Name": "ContentSetType",
+              "Settings": {
+                "ContentTypePartSettings": {
+                  "DisplayName": "Content Set Type",
+                  "Position": "3"
+                }
+              }
+            }
+          ]
+        }
+      ],
+      "ContentParts": [
+        {
+          "Name": "ContentSetPart",
+          "Settings": {
+            "ContentPartSettings": {
+              "Attachable": true,
+              "Reusable": true,
+              "DisplayName": "Content Set"
+            }
+          },
+          "ContentPartFieldDefinitionRecords": []
+        },
+        {
+          "Name": "ContentSetExample",
+          "Settings": {},
+          "ContentPartFieldDefinitionRecords": [
+            {
+              "FieldName": "ContentSetContentPickerField",
+              "Name": "ContentSetType",
+              "Settings": {
+                "ContentPartFieldSettings": {
+                  "DisplayName": "Content Set Type",
+                  "Position": "0"
+                }
+              }
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "WorkflowType",
+      "data": [
+        {
+          "WorkflowTypeId": "[js:uuid()]",
+          "Name": "Content Set Example Workflow",
+          "IsEnabled": true,
+          "IsSingleton": false,
+          "LockTimeout": 0,
+          "LockExpiration": 0,
+          "DeleteFinishedWorkflows": false,
+          "Activities": [
+            {
+              "ActivityId": "4sbqa4xvasnrazvks7bnmkz04s",
+              "Name": "ContentSetGetSupportedOptionsEvent",
+              "X": 40,
+              "Y": 160,
+              "IsStart": true,
+              "Properties": {
+                "ActivityMetadata": {
+                  "Title": null
+                }
+              }
+            },
+            {
+              "ActivityId": "4az0g1kk6eh2g135cr45zkdpw8",
+              "Name": "IfElseTask",
+              "X": 420,
+              "Y": 160,
+              "IsStart": false,
+              "Properties": {
+                "ActivityMetadata": {
+                  "Title": null
+                },
+                "Condition": {
+                  "Expression": "input('Definition').Name == 'ContentSetType'"
+                }
+              }
+            },
+            {
+              "ActivityId": "47wbveez2chjdsygwdgqezwcdq",
+              "Name": "LogTask",
+              "X": 830,
+              "Y": 40,
+              "IsStart": false,
+              "Properties": {
+                "ActivityMetadata": {
+                  "Title": null
+                },
+                "LogLevel": 2,
+                "Text": {
+                  "Expression": "Definition: \"{{ Workflow.Input.Definition | json }}\"."
+                }
+              }
+            },
+            {
+              "ActivityId": "4pg64655zjgqgzk5s1ysj2p8mp",
+              "Name": "SetOutputTask",
+              "X": 830,
+              "Y": 280,
+              "IsStart": false,
+              "Properties": {
+                "ActivityMetadata": {
+                  "Title": null
+                },
+                "OutputName": "MemberLinks",
+                "Value": {
+                  "Expression": "[ { \"Key\": \"Example1\", \"DisplayText\": \"Some Example\" }, { \"Key\": \"Example2\", \"DisplayText\": \"Other Example\" }, { \"Key\": \"Example3\", \"DisplayText\": \"Final Example\" } ]"
+                }
+              }
+            }
+          ],
+          "Transitions": [
+            {
+              "Id": 0,
+              "SourceActivityId": "4sbqa4xvasnrazvks7bnmkz04s",
+              "SourceOutcomeName": "Done",
+              "DestinationActivityId": "4az0g1kk6eh2g135cr45zkdpw8"
+            },
+            {
+              "Id": 0,
+              "SourceActivityId": "4az0g1kk6eh2g135cr45zkdpw8",
+              "SourceOutcomeName": "False",
+              "DestinationActivityId": "47wbveez2chjdsygwdgqezwcdq"
+            },
+            {
+              "Id": 0,
+              "SourceActivityId": "4az0g1kk6eh2g135cr45zkdpw8",
+              "SourceOutcomeName": "True",
+              "DestinationActivityId": "4pg64655zjgqgzk5s1ysj2p8mp"
+            }
+          ]
+        }
+      ]
+    },
+    {
+      "name": "content",
+      "data": [
+        {
+          "ContentItemId": "[js:uuid()]",
+          "ContentItemVersionId": "[js:uuid()]",
+          "ContentType": "ContentSetExample",
+          "DisplayText": "Default Content Set Example",
+          "Latest": true,
+          "Published": true,
+          "ModifiedUtc": "2023-09-10T05:39:27.0460202Z",
+          "PublishedUtc": "2023-09-10T05:39:27.0833929Z",
+          "CreatedUtc": "2023-09-10T05:39:27.0460202Z",
+          "Owner": null,
+          "Author": "admin",
+          "ContentSetExample": {
+            "ContentSetType": {}
+          },
+          "TitlePart": {
+            "Title": "Default Content Set Example"
+          },
+          "LiquidPart": {
+            "Liquid": "Some generic text."
+          },
+          "ContentSetType": {
+            "ContentSet": "4nbddxahchth32xeg28am0mack",
+            "Key": "Default",
+            "IsDefault": true
+          }
+        },
+        {
+          "ContentItemId": "[js:uuid()]",
+          "ContentItemVersionId": "[js:uuid()]",
+          "ContentType": "ContentSetExample",
+          "DisplayText": "First Content Set Variant",
+          "Latest": true,
+          "Published": true,
+          "ModifiedUtc": "2023-09-10T05:48:28.9723912Z",
+          "PublishedUtc": "2023-09-10T05:48:28.9799812Z",
+          "CreatedUtc": "2023-09-10T05:48:08.4129272Z",
+          "Owner": null,
+          "Author": "admin",
+          "ContentSetExample": {
+            "ContentSetType": {}
+          },
+          "TitlePart": {
+            "Title": "First Content Set Variant"
+          },
+          "LiquidPart": {
+            "Liquid": "Some generic text v1."
+          },
+          "ContentSetType": {
+            "ContentSet": "4nbddxahchth32xeg28am0mack",
+            "Key": "Example1",
+            "IsDefault": false
+          }
+        },
+        {
+          "ContentItemId": "[js:uuid()]",
+          "ContentItemVersionId": "[js:uuid()]",
+          "ContentType": "ContentSetExample",
+          "DisplayText": "Second Content Set Variant",
+          "Latest": true,
+          "Published": true,
+          "ModifiedUtc": "2023-09-10T15:15:33.2219943Z",
+          "PublishedUtc": "2023-09-10T15:15:33.2624978Z",
+          "CreatedUtc": "2023-09-10T15:15:25.0407535Z",
+          "Owner": null,
+          "Author": "admin",
+          "ContentSetExample": {
+            "ContentSetType": {}
+          },
+          "TitlePart": {
+            "Title": "Second Content Set Variant"
+          },
+          "LiquidPart": {
+            "Liquid": "Some generic text v2."
+          },
+          "ContentSetType": {
+            "ContentSet": "4nbddxahchth32xeg28am0mack",
+            "Key": "Example2",
+            "IsDefault": false
+          }
+        }
+      ]
+    }
+  ]
+}

From 209fdd3f35838fe4fe1d844b7e83559ea77adae9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Sun, 10 Sep 2023 19:05:00 +0200
Subject: [PATCH 22/30] Add test.

---
 .../TestCaseUITestContextExtensions.cs        | 52 +++++++++++++++++++
 ...lExtensions.ContentSets.Sample.recipe.json | 12 ++---
 2 files changed, 58 insertions(+), 6 deletions(-)

diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs b/Lombiq.HelpfulExtensions.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
index 8fd6ba22..d85292a3 100644
--- a/Lombiq.HelpfulExtensions.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
+++ b/Lombiq.HelpfulExtensions.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
@@ -5,6 +5,7 @@
 using OpenQA.Selenium;
 using OpenQA.Selenium.Interactions;
 using Shouldly;
+using System.Linq;
 using System.Threading.Tasks;
 using static Lombiq.HelpfulExtensions.Tests.UI.Constants.TextInputValues;
 using static Lombiq.HelpfulExtensions.Tests.UI.Constants.XPathSelectors;
@@ -135,6 +136,57 @@ await context.RetryIfStaleOrFailAsync(async () =>
         });
     }
 
+    /// <summary>
+    /// Tests the Lombiq Helpful Extensions - Content Sets feature.
+    /// </summary>
+    public static async Task TestFeatureContentSetsAsync(this UITestContext context)
+    {
+        const string contentId0 = "contentsetexample000000000";
+        const string contentId2 = "contentsetexample000000002";
+
+        var byLink = By.CssSelector(".field-name-content-set-example-content-set-type .value a");
+
+        void VerifyDisplay(string title, string body, params string[] linkTexts)
+        {
+            var contentItem = context.Get(By.ClassName("content-set-example"));
+
+            contentItem.Get(By.TagName("h1")).Text.Trim().ShouldBe(title);
+            contentItem.Get(By.ClassName("content-set-example-body")).Text.Trim().ShouldBe(body);
+
+            contentItem
+                .GetAll(byLink)
+                .Select(link => link.Text.Trim())
+                .ToArray()
+                .ShouldBe(linkTexts);
+        }
+
+        // Verify the default item.
+        await context.SignInDirectlyAsync();
+        await context.GoToContentItemDisplayByIdAsync(contentId0);
+        VerifyDisplay("Default Content Set Example", "Some generic text.", "Other Example", "Some Example");
+
+        // Verify the first item both by content set content picker link and direct access.
+        await context.ClickReliablyOnAsync(byLink);
+        VerifyDisplay("Second Content Set Variant", "Some generic text v2.", "Default content item", "Some Example");
+        await context.GoToContentItemDisplayByIdAsync(contentId2);
+        VerifyDisplay("Second Content Set Variant", "Some generic text v2.", "Default content item", "Some Example");
+
+        // Create the final variant.
+        await context.GoToContentItemListAsync("ContentSetExample");
+        await context.SelectFromBootstrapDropdownReliablyAsync(
+            context.Get(By.XPath("//li[contains(@class, 'list-group-item')][3]//div[@title='Content Set Type']//button")),
+            By.LinkText("Create Final Example"));
+        await context.ClickAndFillInWithRetriesAsync(By.Id("TitlePart_Title"), "Test Title");
+        await context.ClickPublishAsync();
+        context.ShouldBeSuccess();
+
+        // Verify changes.
+        await context.GoToContentItemDisplayByIdAsync(contentId0);
+        VerifyDisplay("Default Content Set Example", "Some generic text.", "Final Example", "Other Example", "Some Example");
+        await context.ClickReliablyOnAsync(byLink);
+        VerifyDisplay("Test title", "Some generic text v1.", "Default content item", "Other Example", "Some Example");
+    }
+
     private static async Task TestWidgetAsync(this UITestContext context, string widget)
     {
         await context.GoToCreatePageAsync();
diff --git a/Lombiq.HelpfulExtensions/Recipes/Lombiq.HelpfulExtensions.ContentSets.Sample.recipe.json b/Lombiq.HelpfulExtensions/Recipes/Lombiq.HelpfulExtensions.ContentSets.Sample.recipe.json
index c3431ed5..4e6983ef 100644
--- a/Lombiq.HelpfulExtensions/Recipes/Lombiq.HelpfulExtensions.ContentSets.Sample.recipe.json
+++ b/Lombiq.HelpfulExtensions/Recipes/Lombiq.HelpfulExtensions.ContentSets.Sample.recipe.json
@@ -206,7 +206,7 @@
       "name": "content",
       "data": [
         {
-          "ContentItemId": "[js:uuid()]",
+          "ContentItemId": "contentsetexample000000000",
           "ContentItemVersionId": "[js:uuid()]",
           "ContentType": "ContentSetExample",
           "DisplayText": "Default Content Set Example",
@@ -224,7 +224,7 @@
             "Title": "Default Content Set Example"
           },
           "LiquidPart": {
-            "Liquid": "Some generic text."
+            "Liquid": "<div class=\"content-set-example-body\">Some generic text.</div>"
           },
           "ContentSetType": {
             "ContentSet": "4nbddxahchth32xeg28am0mack",
@@ -233,7 +233,7 @@
           }
         },
         {
-          "ContentItemId": "[js:uuid()]",
+          "ContentItemId": "contentsetexample000000001",
           "ContentItemVersionId": "[js:uuid()]",
           "ContentType": "ContentSetExample",
           "DisplayText": "First Content Set Variant",
@@ -251,7 +251,7 @@
             "Title": "First Content Set Variant"
           },
           "LiquidPart": {
-            "Liquid": "Some generic text v1."
+            "Liquid": "<div class=\"content-set-example-body\">Some generic text v1.</div>"
           },
           "ContentSetType": {
             "ContentSet": "4nbddxahchth32xeg28am0mack",
@@ -260,7 +260,7 @@
           }
         },
         {
-          "ContentItemId": "[js:uuid()]",
+          "ContentItemId": "contentsetexample000000002",
           "ContentItemVersionId": "[js:uuid()]",
           "ContentType": "ContentSetExample",
           "DisplayText": "Second Content Set Variant",
@@ -278,7 +278,7 @@
             "Title": "Second Content Set Variant"
           },
           "LiquidPart": {
-            "Liquid": "Some generic text v2."
+            "Liquid": "<div class=\"content-set-example-body\">Some generic text v2.</div>"
           },
           "ContentSetType": {
             "ContentSet": "4nbddxahchth32xeg28am0mack",

From 8cfc4ad937cf6ca5b48473898dbdb4dbdebac680 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Sun, 10 Sep 2023 19:05:35 +0200
Subject: [PATCH 23/30] bug fixes and adjustments

---
 .../Views/ContentSetContentPickerField.cshtml       | 13 ++++++++-----
 .../Views/ContentSetPart.MemberLink.cshtml          |  4 ++--
 2 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Lombiq.HelpfulExtensions/Views/ContentSetContentPickerField.cshtml b/Lombiq.HelpfulExtensions/Views/ContentSetContentPickerField.cshtml
index dd8a6b8e..c83e07b9 100644
--- a/Lombiq.HelpfulExtensions/Views/ContentSetContentPickerField.cshtml
+++ b/Lombiq.HelpfulExtensions/Views/ContentSetContentPickerField.cshtml
@@ -1,10 +1,14 @@
 @model Lombiq.HelpfulExtensions.Extensions.ContentSets.ViewModels.ContentSetContentPickerFieldViewModel
 @using OrchardCore.ContentManagement.Utilities
 @using OrchardCore
+@using OrchardCore.ContentManagement.Metadata.Settings
 
 @{
     var name = (Model.PartFieldDefinition.PartDefinition.Name + "-" + Model.PartFieldDefinition.Name).HtmlClassify();
 
+    var settings = Model.PartFieldDefinition.Settings.GetMaybe(nameof(ContentPartFieldSettings));
+    var displayName = settings?.ToObject<ContentPartFieldSettings>()?.DisplayName ?? Model.PartFieldDefinition.Name;
+
     var links = Model
         .MemberLinks
         .Where(link =>
@@ -16,13 +20,12 @@
 }
 
 <div class="field field-type-localizationsetpickerfield field-name-@name">
-    <span class="name">@Model.DisplayName</span>
+    <span class="name">@displayName</span>
     @for (var i = 0; i < links.Count; i++)
     {
         var link = links[i];
-        if (i > 0) { <span>,</span> }
-        <span class="value">
-            <a href="@Orchard.GetItemDisplayUrl(link.ContentItemId)">@link.DisplayText</a>
-        </span>
+        var url = Orchard.GetItemDisplayUrl(link.ContentItemId);
+        var separator = i < (links.Count - 1) ? ", " : string.Empty;
+        <span class="value"><a href="@url">@link.DisplayText</a></span>@separator
     }
 </div>
diff --git a/Lombiq.HelpfulExtensions/Views/ContentSetPart.MemberLink.cshtml b/Lombiq.HelpfulExtensions/Views/ContentSetPart.MemberLink.cshtml
index 154a5d59..bc6f1ec2 100644
--- a/Lombiq.HelpfulExtensions/Views/ContentSetPart.MemberLink.cshtml
+++ b/Lombiq.HelpfulExtensions/Views/ContentSetPart.MemberLink.cshtml
@@ -15,7 +15,7 @@
     {
         var url = Orchard.Action<AdminController>(controller => controller.Edit(
             link.ContentItemId));
-        <a class="dropdown-item btn-sm" href="@url" title=@T["Edit {0}", link.DisplayText]>
+        <a class="dropdown-item btn-sm" href="@url" title="@T["Edit {0}", link.DisplayText]">
             <i class="fa-solid fa-edit" aria-hidden="true"></i> @link.DisplayText
         </a>
     }
@@ -25,7 +25,7 @@
             contentSetPart.ContentItem.ContentItemId,
             definition.Name,
             link.Key));
-        <a class="dropdown-item btn-sm" href="@url" title=@T["Create {0}", link.DisplayText]>
+        <a class="dropdown-item btn-sm" href="@url" title="@T["Create {0}", link.DisplayText]">
             <i class="fa-solid fa-plus" aria-hidden="true"></i> @link.DisplayText
         </a>
     }

From 5a9fef1a7e3e7c0f31262e00c2365e54ea0b9af1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Sun, 10 Sep 2023 19:30:18 +0200
Subject: [PATCH 24/30] Fix test.

---
 .../Extensions/TestCaseUITestContextExtensions.cs      | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Lombiq.HelpfulExtensions.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs b/Lombiq.HelpfulExtensions.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
index d85292a3..3765cc78 100644
--- a/Lombiq.HelpfulExtensions.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
+++ b/Lombiq.HelpfulExtensions.Tests.UI/Extensions/TestCaseUITestContextExtensions.cs
@@ -162,29 +162,29 @@ void VerifyDisplay(string title, string body, params string[] linkTexts)
 
         // Verify the default item.
         await context.SignInDirectlyAsync();
-        await context.GoToContentItemDisplayByIdAsync(contentId0);
+        await context.GoToRelativeUrlAsync($"/Contents/ContentItems/{contentId0}");
         VerifyDisplay("Default Content Set Example", "Some generic text.", "Other Example", "Some Example");
 
         // Verify the first item both by content set content picker link and direct access.
         await context.ClickReliablyOnAsync(byLink);
         VerifyDisplay("Second Content Set Variant", "Some generic text v2.", "Default content item", "Some Example");
-        await context.GoToContentItemDisplayByIdAsync(contentId2);
+        await context.GoToRelativeUrlAsync($"/Contents/ContentItems/{contentId2}");
         VerifyDisplay("Second Content Set Variant", "Some generic text v2.", "Default content item", "Some Example");
 
         // Create the final variant.
         await context.GoToContentItemListAsync("ContentSetExample");
         await context.SelectFromBootstrapDropdownReliablyAsync(
             context.Get(By.XPath("//li[contains(@class, 'list-group-item')][3]//div[@title='Content Set Type']//button")),
-            By.LinkText("Create Final Example"));
+            By.XPath("//a[@title='Create Final Example']"));
         await context.ClickAndFillInWithRetriesAsync(By.Id("TitlePart_Title"), "Test Title");
         await context.ClickPublishAsync();
         context.ShouldBeSuccess();
 
         // Verify changes.
-        await context.GoToContentItemDisplayByIdAsync(contentId0);
+        await context.GoToRelativeUrlAsync($"/Contents/ContentItems/{contentId0}");
         VerifyDisplay("Default Content Set Example", "Some generic text.", "Final Example", "Other Example", "Some Example");
         await context.ClickReliablyOnAsync(byLink);
-        VerifyDisplay("Test title", "Some generic text v1.", "Default content item", "Other Example", "Some Example");
+        VerifyDisplay("Test Title", "Some generic text v1.", "Default content item", "Other Example", "Some Example");
     }
 
     private static async Task TestWidgetAsync(this UITestContext context, string widget)

From 19a3f4e04f91f892f936a365e9af0352b1fee03a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Sun, 10 Sep 2023 19:33:14 +0200
Subject: [PATCH 25/30] Fix MD032.

---
 Readme.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Readme.md b/Readme.md
index dd05d949..db4df0bf 100644
--- a/Readme.md
+++ b/Readme.md
@@ -66,6 +66,7 @@ When the content part is attached, you will see a new dropdown in the content it
 #### Generating content set options
 
 You can generate your custom content set options two ways:
+
 - Create a service which implements the `IContentSetEventHandler` interface.
 - Create a workflow with the _Creating Content Set_ startup event. The workflow should return an output `MemberLinks` which should contain an array of `{ "Key": string, "DisplayText": string }` objects. Further details can be seen on the event's editor screen.
 

From 367cda68f951c75de8ef2d39381cf9e71adb9e76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Sun, 10 Sep 2023 19:33:51 +0200
Subject: [PATCH 26/30] unusing

---
 .../Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs   | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs
index 9168a9da..b1bcd1df 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Workflows/Drivers/ContentSetGetSupportedOptionsEventDisplayDriver.cs
@@ -5,7 +5,6 @@
 using Lombiq.HelpfulLibraries.OrchardCore.Workflow;
 using Microsoft.AspNetCore.Mvc.Localization;
 using Microsoft.Extensions.Localization;
-using Newtonsoft.Json;
 using OrchardCore.ContentManagement;
 using OrchardCore.ContentManagement.Metadata.Models;
 using OrchardCore.DisplayManagement.Notify;

From eb84106ec9d79d60d0818252d3acfdf4f4f4281e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Mon, 11 Sep 2023 12:54:46 +0200
Subject: [PATCH 27/30] code styling

---
 ...ntentSetContentPickerFieldDisplayDriver.cs | 38 +++++++++----------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetContentPickerFieldDisplayDriver.cs b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetContentPickerFieldDisplayDriver.cs
index 378387fa..644cfa03 100644
--- a/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetContentPickerFieldDisplayDriver.cs
+++ b/Lombiq.HelpfulExtensions/Extensions/ContentSets/Drivers/ContentSetContentPickerFieldDisplayDriver.cs
@@ -39,25 +39,23 @@ public override IDisplayResult Display(
         BuildFieldDisplayContext fieldDisplayContext)
     {
         var name = fieldDisplayContext.PartFieldDefinition.Name;
-        return field.ContentItem.Get<ContentSetPart>(name) is { } part
-            ? Initialize<ContentSetContentPickerFieldViewModel>(
-                    GetDisplayShapeType(fieldDisplayContext),
-                    model =>
-                    {
-                        model.PartFieldDefinition = fieldDisplayContext.PartFieldDefinition;
-                        return model.InitializeAsync(
-                            _contentSetManager,
-                            _contentSetEventHandlers,
-                            T,
-                            part,
-                            new ContentTypePartDefinition(
-                                name,
-                                _contentDefinitionManager.GetPartDefinition(nameof(ContentSetPart)),
-                                new JObject()),
-                            isNew: false);
-                    })
-                .Location(CommonContentDisplayTypes.Detail, CommonLocationNames.Content)
-                .Location(CommonContentDisplayTypes.Summary, CommonLocationNames.Content)
-            : null;
+        if (field.ContentItem.Get<ContentSetPart>(name) is not { } part) return null;
+
+        return Initialize<ContentSetContentPickerFieldViewModel>(GetDisplayShapeType(fieldDisplayContext), model =>
+            {
+                model.PartFieldDefinition = fieldDisplayContext.PartFieldDefinition;
+                return model.InitializeAsync(
+                    _contentSetManager,
+                    _contentSetEventHandlers,
+                    T,
+                    part,
+                    new ContentTypePartDefinition(
+                        name,
+                        _contentDefinitionManager.GetPartDefinition(nameof(ContentSetPart)),
+                        new JObject()),
+                    isNew: false);
+            })
+            .Location(CommonContentDisplayTypes.Detail, CommonLocationNames.Content)
+            .Location(CommonContentDisplayTypes.Summary, CommonLocationNames.Content);
     }
 }

From fea9912043f68458675d12b6449ccbc57263828b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Mon, 11 Sep 2023 13:01:48 +0200
Subject: [PATCH 28/30] Update readme phrasing.

---
 Readme.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Readme.md b/Readme.md
index 91886cb4..f7c6b56d 100644
--- a/Readme.md
+++ b/Readme.md
@@ -62,7 +62,7 @@ Adds an attachable (named) content part that ties together a content item and a
 
 The content items are indexed into the `ContentSetIndex`. The `IContentSetManager` has methods to retrieve the existing content items (or just the index rows) for a specific content set.
 
-When the content part is attached, you will see a new dropdown in the content items list on the admin dashboard, just like it is with the Content Localization part, but this is uses the named part's display text as its label. You can use the dropdown or the editor view to select an options. Then the content item is cloned and that option's key assigned to it.
+When the content part is attached, a new dropdown is added to the content item in the admin dashboard's content items list. This is similar in design to the dropdown added by the Content Localization part. The label is the named part's display text and you can use the dropdown (or the listing in the editor view) to select an option. When an option is selected the content item is cloned and that option's key assigned to it.
 
 #### Generating content set options
 

From 593002bfe405e9c4729328fc2171badcb0bcc15f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?D=C3=A1vid=20El-Saig?= <david.el-saig@lombiq.com>
Date: Mon, 11 Sep 2023 13:59:32 +0200
Subject: [PATCH 29/30] post merge bug fix

---
 .../Views/ContentSetContentPickerField.cshtml                   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Lombiq.HelpfulExtensions/Views/ContentSetContentPickerField.cshtml b/Lombiq.HelpfulExtensions/Views/ContentSetContentPickerField.cshtml
index c83e07b9..4e5884f1 100644
--- a/Lombiq.HelpfulExtensions/Views/ContentSetContentPickerField.cshtml
+++ b/Lombiq.HelpfulExtensions/Views/ContentSetContentPickerField.cshtml
@@ -1,7 +1,7 @@
 @model Lombiq.HelpfulExtensions.Extensions.ContentSets.ViewModels.ContentSetContentPickerFieldViewModel
-@using OrchardCore.ContentManagement.Utilities
 @using OrchardCore
 @using OrchardCore.ContentManagement.Metadata.Settings
+@using OrchardCore.Mvc.Utilities
 
 @{
     var name = (Model.PartFieldDefinition.PartDefinition.Name + "-" + Model.PartFieldDefinition.Name).HtmlClassify();

From 6b229935d9a47ec7c580883f691d55a8d52c545f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Roland=20M=C3=A1rkus?= <roland.markus@lombiq.com>
Date: Mon, 11 Sep 2023 16:46:58 +0200
Subject: [PATCH 30/30] Removing empty line.

---
 Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj
index 29bcce89..45f976d9 100644
--- a/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj
+++ b/Lombiq.HelpfulExtensions/Lombiq.HelpfulExtensions.csproj
@@ -60,7 +60,6 @@
     <PackageReference Include="Lombiq.NodeJs.Extensions" Version="1.3.0" />
   </ItemGroup>
 
-
   <Import Condition="'$(NuGetBuild)' != 'true'" Project="..\..\..\Utilities\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions\Lombiq.NodeJs.Extensions.targets" />
 
 </Project>