From 9152f4853e3a1c27d96eb1391f963c38db2084f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20M=C3=A1rkus?= Date: Thu, 18 Jan 2024 13:07:46 +0100 Subject: [PATCH 01/13] Upgrading to OC 1.8.2 and NET 8 --- Lombiq.Walkthroughs/Lombiq.Walkthroughs.csproj | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Lombiq.Walkthroughs/Lombiq.Walkthroughs.csproj b/Lombiq.Walkthroughs/Lombiq.Walkthroughs.csproj index adf480e..f95b1b0 100644 --- a/Lombiq.Walkthroughs/Lombiq.Walkthroughs.csproj +++ b/Lombiq.Walkthroughs/Lombiq.Walkthroughs.csproj @@ -3,7 +3,7 @@ - net6.0 + net8.0 true Lombiq Walkthroughs for Orchard Core Orchard Core Walkthroughs module for teaching Orchard Core fundamentals by guiding through the user in step by step guides. @@ -30,11 +30,11 @@ - - - - - + + + + + From 71f7477e60223becab99d4d48212fd4bc993a6d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20M=C3=A1rkus?= Date: Thu, 18 Jan 2024 13:08:16 +0100 Subject: [PATCH 02/13] Upgrading to NET 8. --- Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj b/Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj index 2f41de1..3322543 100644 --- a/Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj +++ b/Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj @@ -1,7 +1,7 @@ - net6.0 + net8.0 From 7b4b08bb7909a3ef8d0bd34b83be8b43f408bb5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20M=C3=A1rkus?= Date: Thu, 18 Jan 2024 13:23:19 +0100 Subject: [PATCH 03/13] Adjusting namespace. --- Lombiq.Walkthroughs/Filters/WalkthroughsButtonFilter.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lombiq.Walkthroughs/Filters/WalkthroughsButtonFilter.cs b/Lombiq.Walkthroughs/Filters/WalkthroughsButtonFilter.cs index a2ece30..0a900e4 100644 --- a/Lombiq.Walkthroughs/Filters/WalkthroughsButtonFilter.cs +++ b/Lombiq.Walkthroughs/Filters/WalkthroughsButtonFilter.cs @@ -3,7 +3,7 @@ using OrchardCore.ContentManagement; using OrchardCore.DisplayManagement; using OrchardCore.DisplayManagement.Layout; -using System; +using OrchardCore.Modules; using System.Threading.Tasks; namespace Lombiq.Walkthroughs.Filters; From 90d3bb2029abb118da5a59917ffe7b28e154fd8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20M=C3=A1rkus?= Date: Fri, 19 Jan 2024 14:07:39 +0100 Subject: [PATCH 04/13] Addressing warnings. --- Lombiq.Walkthroughs/Manifest.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Lombiq.Walkthroughs/Manifest.cs b/Lombiq.Walkthroughs/Manifest.cs index faef8ce..8751e5f 100644 --- a/Lombiq.Walkthroughs/Manifest.cs +++ b/Lombiq.Walkthroughs/Manifest.cs @@ -14,9 +14,9 @@ Name = "Lombiq Walkthroughs", Category = "Content", Description = "Module for enabling the walkthroughs.", - Dependencies = new[] - { + Dependencies = + [ "OrchardCore.Contents", "OrchardCore.ResourceManagement", - } + ] )] From 1720f7bd70745c60bcbc26bcfadfb9afd8bc3061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20M=C3=A1rkus?= Date: Sat, 20 Jan 2024 12:15:45 +0100 Subject: [PATCH 05/13] Addressing warnings. --- .../Filters/WalkthroughsButtonFilter.cs | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/Lombiq.Walkthroughs/Filters/WalkthroughsButtonFilter.cs b/Lombiq.Walkthroughs/Filters/WalkthroughsButtonFilter.cs index 0a900e4..d0e74cf 100644 --- a/Lombiq.Walkthroughs/Filters/WalkthroughsButtonFilter.cs +++ b/Lombiq.Walkthroughs/Filters/WalkthroughsButtonFilter.cs @@ -8,19 +8,10 @@ namespace Lombiq.Walkthroughs.Filters; -public class WalkthroughsButtonFilter : IAsyncResultFilter +public class WalkthroughsButtonFilter( + IShapeFactory shapeFactory, + ILayoutAccessor layoutAccessor) : IAsyncResultFilter { - private readonly IShapeFactory _shapeFactory; - private readonly ILayoutAccessor _layoutAccessor; - - public WalkthroughsButtonFilter( - IShapeFactory shapeFactory, - ILayoutAccessor layoutAccessor) - { - _shapeFactory = shapeFactory; - _layoutAccessor = layoutAccessor; - } - public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next) { if (context.IsAdmin()) @@ -38,10 +29,10 @@ public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultE context.Result is ViewResult viewResult && ((string)(viewResult.Model as dynamic)?.ContentItem?.ContentType).EqualsOrdinalIgnoreCase("Blog")) { - var layout = await _layoutAccessor.GetLayoutAsync(); + var layout = await layoutAccessor.GetLayoutAsync(); var contentZone = layout.Zones["Content"]; - await contentZone.AddAsync(await _shapeFactory.CreateAsync("WalkthroughsButton"), "0"); + await contentZone.AddAsync(await shapeFactory.CreateAsync("WalkthroughsButton"), "0"); } await next(); From 8454e71bf10b3c445bd7dbf75cd60a1be8a4871f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20M=C3=A1rkus?= Date: Tue, 30 Jan 2024 09:38:06 +0100 Subject: [PATCH 06/13] Revert "Addressing warnings." This reverts commit 1720f7bd70745c60bcbc26bcfadfb9afd8bc3061. --- .../Filters/WalkthroughsButtonFilter.cs | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/Lombiq.Walkthroughs/Filters/WalkthroughsButtonFilter.cs b/Lombiq.Walkthroughs/Filters/WalkthroughsButtonFilter.cs index d0e74cf..0a900e4 100644 --- a/Lombiq.Walkthroughs/Filters/WalkthroughsButtonFilter.cs +++ b/Lombiq.Walkthroughs/Filters/WalkthroughsButtonFilter.cs @@ -8,10 +8,19 @@ namespace Lombiq.Walkthroughs.Filters; -public class WalkthroughsButtonFilter( - IShapeFactory shapeFactory, - ILayoutAccessor layoutAccessor) : IAsyncResultFilter +public class WalkthroughsButtonFilter : IAsyncResultFilter { + private readonly IShapeFactory _shapeFactory; + private readonly ILayoutAccessor _layoutAccessor; + + public WalkthroughsButtonFilter( + IShapeFactory shapeFactory, + ILayoutAccessor layoutAccessor) + { + _shapeFactory = shapeFactory; + _layoutAccessor = layoutAccessor; + } + public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultExecutionDelegate next) { if (context.IsAdmin()) @@ -29,10 +38,10 @@ public async Task OnResultExecutionAsync(ResultExecutingContext context, ResultE context.Result is ViewResult viewResult && ((string)(viewResult.Model as dynamic)?.ContentItem?.ContentType).EqualsOrdinalIgnoreCase("Blog")) { - var layout = await layoutAccessor.GetLayoutAsync(); + var layout = await _layoutAccessor.GetLayoutAsync(); var contentZone = layout.Zones["Content"]; - await contentZone.AddAsync(await shapeFactory.CreateAsync("WalkthroughsButton"), "0"); + await contentZone.AddAsync(await _shapeFactory.CreateAsync("WalkthroughsButton"), "0"); } await next(); From d7e6e124ec2e576bbe8ed2f44667a1ec8423bc0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20M=C3=A1rkus?= Date: Fri, 16 Feb 2024 12:35:36 +0100 Subject: [PATCH 07/13] Changing script. --- Lombiq.Walkthroughs/Assets/Scripts/walkthroughs.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lombiq.Walkthroughs/Assets/Scripts/walkthroughs.js b/Lombiq.Walkthroughs/Assets/Scripts/walkthroughs.js index bd55f9a..fa7438c 100644 --- a/Lombiq.Walkthroughs/Assets/Scripts/walkthroughs.js +++ b/Lombiq.Walkthroughs/Assets/Scripts/walkthroughs.js @@ -3586,7 +3586,7 @@ jQuery(($) => { title: 'Deployment', text: `Here you can use "File Download" so the exported recipe.json file will be downloaded (inside a zip file).`, - attachTo: { element: '.btn.btn-primary.btn-sm[href*="ExportFile"]', on: 'top' }, + attachTo: { element: '.btn.btn-primary.btn-sm[href*="ExportFile"]', on: 'right' }, buttons: [ backButton, ], From be896b5e7dce594a6fa9d0cc6e419dd853822fe0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20M=C3=A1rkus?= Date: Fri, 16 Feb 2024 17:29:54 +0100 Subject: [PATCH 08/13] Using issue branch reference. --- .github/workflows/publish-nuget.yml | 2 +- Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj | 2 +- Lombiq.Walkthroughs/Lombiq.Walkthroughs.csproj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/publish-nuget.yml b/.github/workflows/publish-nuget.yml index fac826d..5ea72f9 100644 --- a/.github/workflows/publish-nuget.yml +++ b/.github/workflows/publish-nuget.yml @@ -8,6 +8,6 @@ on: jobs: publish-nuget: name: Publish to NuGet - uses: Lombiq/GitHub-Actions/.github/workflows/publish-nuget.yml@dev + uses: Lombiq/GitHub-Actions/.github/workflows/publish-nuget.yml@issue/OSOE-751 secrets: API_KEY: ${{ secrets.DEFAULT_NUGET_PUBLISH_API_KEY }} diff --git a/Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj b/Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj index f57ad51..6243b98 100644 --- a/Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj +++ b/Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj @@ -21,7 +21,7 @@ - + diff --git a/Lombiq.Walkthroughs/Lombiq.Walkthroughs.csproj b/Lombiq.Walkthroughs/Lombiq.Walkthroughs.csproj index 963bf22..6d0297d 100644 --- a/Lombiq.Walkthroughs/Lombiq.Walkthroughs.csproj +++ b/Lombiq.Walkthroughs/Lombiq.Walkthroughs.csproj @@ -50,7 +50,7 @@ - + From 0c65b766b9c60f2c9d133e35936c3e92a9a0d5ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20M=C3=A1rkus?= Date: Sat, 17 Feb 2024 10:55:27 +0100 Subject: [PATCH 09/13] Using alpha. --- Lombiq.Walkthroughs/Lombiq.Walkthroughs.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lombiq.Walkthroughs/Lombiq.Walkthroughs.csproj b/Lombiq.Walkthroughs/Lombiq.Walkthroughs.csproj index 6d0297d..12db20f 100644 --- a/Lombiq.Walkthroughs/Lombiq.Walkthroughs.csproj +++ b/Lombiq.Walkthroughs/Lombiq.Walkthroughs.csproj @@ -49,7 +49,7 @@ - + From 9ee8bf2c239a9c32a60d9e293917c72e4e14ee77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20M=C3=A1rkus?= Date: Sun, 18 Feb 2024 14:13:48 +0100 Subject: [PATCH 10/13] Using alphas. --- Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj b/Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj index 6243b98..30f7fbb 100644 --- a/Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj +++ b/Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj @@ -21,7 +21,7 @@ - + From b92575a80eb996c02d3047b67b229b7808ad066b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20M=C3=A1rkus?= Date: Tue, 20 Feb 2024 10:09:58 +0100 Subject: [PATCH 11/13] Updating UITT alpha. --- Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj b/Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj index 30f7fbb..b58d811 100644 --- a/Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj +++ b/Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj @@ -21,7 +21,7 @@ - + From 607eaeb9c7cf1c01070584c75f361f69d9d4fc94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20M=C3=A1rkus?= Date: Wed, 21 Feb 2024 12:08:06 +0100 Subject: [PATCH 12/13] Using new UITT alpha. --- Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj b/Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj index b58d811..b703eb1 100644 --- a/Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj +++ b/Lombiq.Walkthroughs.Test.UI/Lombiq.Walkthroughs.Tests.UI.csproj @@ -21,7 +21,7 @@ - + From 9364da82de2050b37ff2d2c7e97e4c9213ae5505 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roland=20M=C3=A1rkus?= Date: Wed, 21 Feb 2024 16:12:10 +0100 Subject: [PATCH 13/13] Reverting to dev reference. --- .github/workflows/publish-nuget.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/publish-nuget.yml b/.github/workflows/publish-nuget.yml index 5ea72f9..fac826d 100644 --- a/.github/workflows/publish-nuget.yml +++ b/.github/workflows/publish-nuget.yml @@ -8,6 +8,6 @@ on: jobs: publish-nuget: name: Publish to NuGet - uses: Lombiq/GitHub-Actions/.github/workflows/publish-nuget.yml@issue/OSOE-751 + uses: Lombiq/GitHub-Actions/.github/workflows/publish-nuget.yml@dev secrets: API_KEY: ${{ secrets.DEFAULT_NUGET_PUBLISH_API_KEY }}