link generating fixed

Directory.Packages.props

@@ -6,10 +6,10 @@
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
   </PropertyGroup>
   <ItemGroup>
-    <PackageVersion Include="Kentico.Xperience.Admin" Version="29.3.0" />
-    <PackageVersion Include="Kentico.Xperience.WebApp" Version="29.3.0" />
-    <PackageVersion Include="kentico.xperience.azurestorage" Version="29.3.0" />
-    <PackageVersion Include="kentico.xperience.imageprocessing" Version="29.3.0" />
+    <PackageVersion Include="Kentico.Xperience.Admin" Version="29.5.0" />
+    <PackageVersion Include="Kentico.Xperience.WebApp" Version="29.5.0" />
+    <PackageVersion Include="kentico.xperience.azurestorage" Version="29.5.0" />
+    <PackageVersion Include="kentico.xperience.imageprocessing" Version="29.5.0" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
     <PackageVersion Include="SonarAnalyzer.CSharp" Version="9.6.0.74858" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />

examples/DancingGoat/.config/dotnet-tools.json

@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "kentico.xperience.dbmanager": {
-      "version": "28.1.0",
+      "version": "29.5.0",
       "commands": [
         "kentico-xperience-dbmanager"
       ]

src/Kentico.Xperience.Zapier/Admin/UIPages/ZapierApiKeyListingPage.cs

@@ -23,15 +23,15 @@ internal class ZapierApiKeyListingPage : ListingPage
     private readonly IInfoProvider<ApiKeyInfo> apiKeyInfoProvider;
     private readonly IAuthenticatedUserAccessor userAccessor;
     private readonly IUserInfoProvider userProvider;
-    private readonly IPageUrlGenerator pageUrlGenerator;
+    private readonly IPageLinkGenerator pageLinkGenerator;
 
 
-    public ZapierApiKeyListingPage(IInfoProvider<ApiKeyInfo> apiKeyInfoProvider, IAuthenticatedUserAccessor userAccessor, IUserInfoProvider userProvider, IPageUrlGenerator pageUrlGenerator)
+    public ZapierApiKeyListingPage(IInfoProvider<ApiKeyInfo> apiKeyInfoProvider, IAuthenticatedUserAccessor userAccessor, IUserInfoProvider userProvider, IPageLinkGenerator pageLinkGenerator)
     {
         this.apiKeyInfoProvider = apiKeyInfoProvider;
         this.userAccessor = userAccessor;
         this.userProvider = userProvider;
-        this.pageUrlGenerator = pageUrlGenerator;
+        this.pageLinkGenerator = pageLinkGenerator;
     }
 
 
@@ -91,6 +91,9 @@ public async Task<INavigateResponse> Generate(CancellationToken _)
         apiKeyInfoProvider.Set(apiKeyInfo);
 
         transaction.Commit();
-        return NavigateTo(pageUrlGenerator.GenerateUrl<ZapierNewApiKeyPage>(apiKeyInfo.ApiKeyID.ToString()));
+        return NavigateTo(pageLinkGenerator.GetPath<ZapierNewApiKeyPage>(new PageParameterValues
+        {
+            { typeof(ZapierApiKeyEditSection), apiKeyInfo.ApiKeyID }
+        }));
     }
 }

src/Kentico.Xperience.Zapier/Admin/UIPages/ZapierNewApiKeyPage.cs

@@ -20,7 +20,7 @@ namespace Kentico.Xperience.Zapier.Admin.UIPages;
 internal class ZapierNewApiKeyPage : InfoEditPage<ApiKeyInfo>
 {
     private readonly IInfoProvider<ApiKeyInfo> apiKeyInfoProvider;
-    private readonly IPageUrlGenerator pageUrlGenerator;
+    private readonly IPageLinkGenerator pageLinkGenerator;
     private readonly IZapierTokenManager tokenManager;
 
 
@@ -34,11 +34,11 @@ internal class ZapierNewApiKeyPage : InfoEditPage<ApiKeyInfo>
     protected override bool RefetchAll => true;
 
 
-    public ZapierNewApiKeyPage(IFormComponentMapper formComponentMapper, IFormDataBinder formDataBinder, IInfoProvider<ApiKeyInfo> apiKeyInfoProvider, IPageUrlGenerator pageUrlGenerator, IZapierTokenManager tokenManager)
+    public ZapierNewApiKeyPage(IFormComponentMapper formComponentMapper, IFormDataBinder formDataBinder, IInfoProvider<ApiKeyInfo> apiKeyInfoProvider, IPageLinkGenerator pageLinkGenerator, IZapierTokenManager tokenManager)
     : base(formComponentMapper, formDataBinder)
     {
         this.apiKeyInfoProvider = apiKeyInfoProvider;
-        this.pageUrlGenerator = pageUrlGenerator;
+        this.pageLinkGenerator = pageLinkGenerator;
         this.tokenManager = tokenManager;
     }
 
@@ -67,7 +67,7 @@ public override async Task ConfigurePage()
 
     protected override async Task<ICommandResponse> SubmitInternal(FormSubmissionCommandArguments args, ICollection<IFormItem> items, IFormFieldValueProvider formFieldValueProvider)
     {
-        string navigationUrl = pageUrlGenerator.GenerateUrl<ZapierApiKeyListingPage>();
+        string navigationUrl = pageLinkGenerator.GetPath<ZapierApiKeyListingPage>();
         return await Task.FromResult(NavigateTo(navigationUrl, RefetchAll));
     }
 

src/Kentico.Xperience.Zapier/Helpers/AdminUrlHelper.cs

@@ -0,0 +1,30 @@
+using Kentico.Xperience.Admin.Base;
+using Kentico.Xperience.Admin.Base.UIPages;
+using Kentico.Xperience.Admin.Headless.UIPages;
+using Kentico.Xperience.Admin.Websites;
+using Kentico.Xperience.Admin.Websites.UIPages;
+
+namespace Kentico.Xperience.Zapier.Helpers;
+
+internal static class AdminUrlHelper
+{
+    internal static PageParameterValues GetWebPageParams(int webPageItemId, int websiteChannelId, string lang) => new()
+        {
+            { typeof(WebPageLayout), new WebPageUrlIdentifier(lang, webPageItemId).ToString() },
+            { typeof(WebPagesApplication), $"webpages-{websiteChannelId}" },
+        };
+
+    internal static PageParameterValues GetHeadlessParams(int headlessItemId, int headlessChannelId, string lang) => new()
+    {
+        { typeof(HeadlessEditLayout), headlessItemId },
+        { typeof(HeadlessChannelContentLanguage), lang },
+        { typeof(HeadlessChannelApplication), $"headless-{headlessChannelId}"},
+    };
+
+    internal static PageParameterValues GetReusableParams(int contentItemId, int contentItemContentFolderId, string lang) => new()
+    {
+        { typeof(ContentItemEditSection), contentItemId},
+        { typeof(ContentHubFolder), contentItemContentFolderId },
+        { typeof(ContentHubContentLanguage), lang },
+    };
+}

src/Kentico.Xperience.Zapier/Triggers/AdminLinkService.cs

@@ -0,0 +1,25 @@
+using Kentico.Xperience.Admin.Base;
+
+namespace Kentico.Xperience.Zapier.Triggers;
+
+
+internal interface IAdminLinkService
+{
+    string GenerateAdminLink<T>(PageParameterValues parameters, Uri baseUri);
+}
+
+
+internal class AdminLinkService : IAdminLinkService
+{
+    private readonly IPageLinkGenerator pageLinkGenerator;
+
+    public AdminLinkService(IPageLinkGenerator pageLinkGenerator) => this.pageLinkGenerator = pageLinkGenerator;
+
+    public string GenerateAdminLink<T>(PageParameterValues parameters, Uri baseUri)
+    {
+        string relativePath = pageLinkGenerator.GetPath<T>(parameters);
+        var adminUrl = new Uri(baseUri, $"/admin{relativePath}");
+
+        return adminUrl.ToString();
+    }
+}

src/Kentico.Xperience.Zapier/Triggers/Handlers/Abstractions/ZapierWorkflowHandler.cs

@@ -9,15 +9,20 @@ namespace Kentico.Xperience.Zapier.Triggers.Handlers.Abstractions;
 internal abstract class ZapierWorkflowHandler : ZapierTriggerHandler
 {
     private readonly IHttpContextAccessor httpContextAccessor;
+    protected readonly IAdminLinkService AdminLinkService;
 
 
     protected ZapierWorkflowHandler(
         ZapierTriggerInfo zapierTrigger,
         IEventLogService? eventLogService,
         HttpClient client,
-        IHttpContextAccessor httpContextAccessor)
+        IHttpContextAccessor httpContextAccessor,
+        IAdminLinkService adminLinkService)
         : base(zapierTrigger, eventLogService, client)
-        => this.httpContextAccessor = httpContextAccessor;
+    {
+        this.httpContextAccessor = httpContextAccessor;
+        AdminLinkService = adminLinkService;
+    }
 
 
     protected Uri GetHostDomain() => new($"https://{httpContextAccessor.HttpContext?.Request.Host.Value ?? string.Empty}");

src/Kentico.Xperience.Zapier/Triggers/Handlers/WorkflowHeadlessHandler.cs

@@ -2,6 +2,8 @@
 using CMS.Core;
 
 using Kentico.Integration.Zapier;
+using Kentico.Xperience.Admin.Headless.UIPages;
+using Kentico.Xperience.Zapier.Helpers;
 using Kentico.Xperience.Zapier.Triggers.Handlers.Abstractions;
 
 using Microsoft.AspNetCore.Http;
@@ -10,7 +12,9 @@ namespace Kentico.Xperience.Zapier.Triggers.Handlers;
 
 internal class WorkflowHeadlessHandler : ZapierWorkflowHandler
 {
-    public WorkflowHeadlessHandler(ZapierTriggerInfo zapierTrigger, IEventLogService? eventLogService, HttpClient client, IHttpContextAccessor httpContextAccessor) : base(zapierTrigger, eventLogService, client, httpContextAccessor)
+    public WorkflowHeadlessHandler(ZapierTriggerInfo zapierTrigger, IEventLogService? eventLogService,
+        HttpClient client, IHttpContextAccessor httpContextAccessor, IAdminLinkService adminLinkService) : base(
+        zapierTrigger, eventLogService, client, httpContextAccessor, adminLinkService)
     {
     }
 
@@ -44,9 +48,11 @@ private void Handler(object? sender, HeadlessItemWorkflowMoveToStepArguments e)
         }
 
         var data = e.GetZapierWorkflowPostObject();
-        var websiteUri = GetHostDomain();
-        var adminUrl = new Uri(websiteUri, $"/admin/headless-{e.HeadlessChannelID}/{e.ContentLanguageName}/list/{e.ID}");
-        data.TryAdd("AdminLink", adminUrl);
+
+        var pageParams = AdminUrlHelper.GetHeadlessParams(e.ID, e.HeadlessChannelID, e.ContentLanguageName);
+        string adminLink = AdminLinkService.GenerateAdminLink<HeadlessContentTab>(pageParams, GetHostDomain());
+
+        data.TryAdd("AdminLink", adminLink);
 
         if (ZapierTrigger != null)
         {

src/Kentico.Xperience.Zapier/Triggers/Handlers/WorkflowPagesHandler.cs

@@ -1,7 +1,8 @@
 using CMS.ContentWorkflowEngine;
 using CMS.Core;
-
 using Kentico.Integration.Zapier;
+using Kentico.Xperience.Admin.Websites.UIPages;
+using Kentico.Xperience.Zapier.Helpers;
 using Kentico.Xperience.Zapier.Triggers.Handlers.Abstractions;
 
 using Microsoft.AspNetCore.Http;
@@ -10,8 +11,15 @@ namespace Kentico.Xperience.Zapier.Triggers.Handlers;
 
 internal class WorkflowPagesHandler : ZapierWorkflowHandler
 {
-    public WorkflowPagesHandler(ZapierTriggerInfo zapierTrigger, IEventLogService? eventLogService, HttpClient client, IHttpContextAccessor httpContextAccessor) : base(zapierTrigger, eventLogService, client, httpContextAccessor)
+    public WorkflowPagesHandler(
+        ZapierTriggerInfo zapierTrigger,
+        IEventLogService? eventLogService,
+        HttpClient client,
+        IHttpContextAccessor httpContextAccessor,
+        IAdminLinkService adminLinkService)
+        : base(zapierTrigger, eventLogService, client, httpContextAccessor, adminLinkService)
     {
+
     }
 
 
@@ -45,10 +53,11 @@ private void Handler(object? sender, WebPageWorkflowMoveToStepArguments e)
 
 
         var data = e.GetZapierWorkflowPostObject();
-        var websiteUri = GetHostDomain();
-        var adminUrl = new Uri(websiteUri, $"/admin/webpages-{e.WebsiteChannelID}/{e.ContentLanguageName}_{e.ID}");
 
-        data.TryAdd("AdminLink", adminUrl);
+        var pageParams = AdminUrlHelper.GetWebPageParams(e.ID, e.WebsiteChannelID, e.ContentLanguageName);
+        string adminLink = AdminLinkService.GenerateAdminLink<ContentTab>(pageParams, GetHostDomain());
+
+        data.TryAdd("AdminLink", adminLink);
 
 
         if (ZapierTrigger != null)

src/Kentico.Xperience.Zapier/Triggers/Handlers/WorkflowReusableHandler.cs

@@ -1,9 +1,12 @@
 using CMS.ContentEngine;
+using CMS.ContentEngine.Internal;
 using CMS.ContentWorkflowEngine;
 using CMS.Core;
 using CMS.DataEngine;
 
 using Kentico.Integration.Zapier;
+using Kentico.Xperience.Admin.Base.UIPages;
+using Kentico.Xperience.Zapier.Helpers;
 using Kentico.Xperience.Zapier.Triggers.Handlers.Abstractions;
 
 using Microsoft.AspNetCore.Http;
@@ -13,13 +16,20 @@ namespace Kentico.Xperience.Zapier.Triggers.Handlers;
 internal class WorkflowReusableHandler : ZapierWorkflowHandler
 {
     private readonly IInfoProvider<ContentLanguageInfo> contentLanguageProvider;
+    private readonly IInfoProvider<ContentItemInfo> contentInfoProvider;
+
     public WorkflowReusableHandler(ZapierTriggerInfo zapierTrigger,
         IEventLogService? eventLogService,
         HttpClient client,
         IHttpContextAccessor httpContextAccessor,
-        IInfoProvider<ContentLanguageInfo> contentLanguageProvider)
-        : base(zapierTrigger, eventLogService, client, httpContextAccessor) =>
+        IInfoProvider<ContentLanguageInfo> contentLanguageProvider,
+        IInfoProvider<ContentItemInfo> contentInfoProvider,
+        IAdminLinkService adminLinkService)
+        : base(zapierTrigger, eventLogService, client, httpContextAccessor, adminLinkService)
+    {
         this.contentLanguageProvider = contentLanguageProvider;
+        this.contentInfoProvider = contentInfoProvider;
+    }
 
 
     public override bool RegistrationProcessor(bool register = true)
@@ -52,12 +62,15 @@ private void Handler(object? sender, ContentItemWorkflowMoveToStepArguments e)
 
         var data = e.GetZapierWorkflowPostObject();
 
+        var contentItemInfo = contentInfoProvider.Get(e.ID);
         var info = contentLanguageProvider.Get(e.ContentLanguageID);
 
-        var websiteUri = GetHostDomain();
-        var adminUrl = new Uri(websiteUri, $"/admin/content-hub/{info.ContentLanguageName}/list/{e.ID}");
+        var pageParams = AdminUrlHelper.GetReusableParams(e.ID, contentItemInfo.ContentItemContentFolderID,
+            info.ContentLanguageName);
+
+        string adminLink = AdminLinkService.GenerateAdminLink<ContentItemEdit>(pageParams, GetHostDomain());
 
-        data.TryAdd("AdminLink", adminUrl);
+        data.TryAdd("AdminLink", adminLink);
 
 
         if (ZapierTrigger != null)

src/Kentico.Xperience.Zapier/Triggers/Handlers/ZapierTriggerHandlerFactory.cs

@@ -1,4 +1,5 @@
 using CMS.ContentEngine;
+using CMS.ContentEngine.Internal;
 using CMS.Core;
 using CMS.DataEngine;
 using CMS.EventLog;
@@ -23,10 +24,13 @@ internal class ZapierTriggerHandlerFactory : IZapierTriggerHandlerFactory
     private readonly HttpClient client;
     private readonly IWorkflowScopeService workflowScopeService;
     private readonly IInfoProvider<ContentLanguageInfo> contentLanguageProvider;
+    private readonly IInfoProvider<ContentItemInfo> contentInfoProvider;
+
     private readonly IHttpContextAccessor httpContextAccessor;
     private readonly IInfoProvider<ZapierTriggerEventLogTypeInfo> triggerEventLogTypeInfoProvider;
     private readonly IProgressiveCache progressiveCache;
     private readonly IEventLogService logService;
+    private readonly IAdminLinkService adminLinkService;
 
 
     public ZapierTriggerHandlerFactory(HttpClient client,
@@ -35,7 +39,9 @@ public ZapierTriggerHandlerFactory(HttpClient client,
         IHttpContextAccessor httpContextAccessor,
         IInfoProvider<ZapierTriggerEventLogTypeInfo> triggerEventLogTypeInfoProvider,
         IProgressiveCache progressiveCache,
-        IEventLogService logService)
+        IEventLogService logService,
+        IAdminLinkService adminLinkService,
+        IInfoProvider<ContentItemInfo> contentInfoProvider)
     {
         this.client = client;
         this.workflowScopeService = workflowScopeService;
@@ -44,6 +50,8 @@ public ZapierTriggerHandlerFactory(HttpClient client,
         this.triggerEventLogTypeInfoProvider = triggerEventLogTypeInfoProvider;
         this.progressiveCache = progressiveCache;
         this.logService = logService;
+        this.adminLinkService = adminLinkService;
+        this.contentInfoProvider = contentInfoProvider;
     }
 
 
@@ -73,9 +81,9 @@ public ZapierTriggerHandlerFactory(HttpClient client,
 
                 ZapierWorkflowHandler workflowHandler = classType switch
                 {
-                    ZapierTriggerObjectClassType.Website => new WorkflowPagesHandler(trigger, logService, client, httpContextAccessor),
-                    ZapierTriggerObjectClassType.Reusable => new WorkflowReusableHandler(trigger, logService, client, httpContextAccessor, contentLanguageProvider),
-                    ZapierTriggerObjectClassType.Headless => new WorkflowHeadlessHandler(trigger, logService, client, httpContextAccessor),
+                    ZapierTriggerObjectClassType.Website => new WorkflowPagesHandler(trigger, logService, client, httpContextAccessor, adminLinkService),
+                    ZapierTriggerObjectClassType.Reusable => new WorkflowReusableHandler(trigger, logService, client, httpContextAccessor, contentLanguageProvider, contentInfoProvider, adminLinkService),
+                    ZapierTriggerObjectClassType.Headless => new WorkflowHeadlessHandler(trigger, logService, client, httpContextAccessor, adminLinkService),
                     ZapierTriggerObjectClassType.Form => throw new NotImplementedException(),
                     ZapierTriggerObjectClassType.Other => throw new NotImplementedException(),
                     ZapierTriggerObjectClassType.System => throw new NotImplementedException(),

src/Kentico.Xperience.Zapier/ZapierServiceCollectionExtensions.cs

@@ -30,7 +30,7 @@ public static IServiceCollection AddKenticoZapier(this IServiceCollection servic
         services.AddSingleton<IZapierTriggerService, ZapierTriggerService>();
         services.AddSingleton<IZapierTokenManager, ZapierTokenManager>();
         services.AddSingleton<IZapierTriggerHandlerFactory, ZapierTriggerHandlerFactory>();
-
+        services.AddSingleton<IAdminLinkService, AdminLinkService>();
         services.AddSingleton<IWorkflowScopeService, WorkflowScopeService>();
 
         services.AddAuthentication()