Merge pull request #285 from umbraco/bugfix/v15/activecampaign/pagination-filtering

Update ActiveCampaign pagination and filtering

Author: acoumb

azure-pipeline - Crm.ActiveCampaign.yml

@@ -22,6 +22,12 @@ steps:
     projects: '$(project)'
     includeNuGetOrg: true
 
+- task: UseDotNet@2
+  displayName: 'Use SDK version 9.0.203'
+  inputs:
+    packageType: 'sdk'
+    version: '9.0.203'
+
 - task: VSBuild@1
   displayName: 'Build Project'
   inputs:

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Api/Management/Controllers/GetFormsPagedController.cs

@@ -1,7 +1,9 @@
 using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Options;
+using System.Web;
 using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Configuration;
 using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Models.Dtos;
 
@@ -20,13 +22,11 @@ public GetFormsByPageController(IOptions<ActiveCampaignSettings> options, IHttpC
         [ProducesResponseType(StatusCodes.Status404NotFound)]
         [ProducesResponseType(StatusCodes.Status403Forbidden)]
         [ProducesResponseType(StatusCodes.Status500InternalServerError)]
-        public async Task<IActionResult> GetForms([FromQuery]int? page = 1)
+        public async Task<IActionResult> GetForms([FromQuery] int? page = 1, [FromQuery] string? searchQuery = "")
         {
             var client = HttpClientFactory.CreateClient(Constants.FormsHttpClient);
 
-            var requestUriString = page == 1
-                ? $"{client.BaseAddress}{ApiPath}&limit={Constants.DefaultPageSize}"
-                : $"{client.BaseAddress}{ApiPath}&limit={Constants.DefaultPageSize}&offset={(page - 1) * Constants.DefaultPageSize}";
+            var requestUriString = BuildRequestUri(client.BaseAddress.ToString(), page ?? 1, searchQuery);
 
             var requestMessage = new HttpRequestMessage
             {
@@ -38,5 +38,22 @@ public async Task<IActionResult> GetForms([FromQuery]int? page = 1)
 
             return await HandleResponseAsync<FormCollectionResponseDto>(response);
         }
+
+        private string BuildRequestUri(string baseAddress, int page, string searchQuery)
+        {
+            var uri = $"{baseAddress}{ApiPath}?limit={Constants.DefaultPageSize}";
+
+            if (page > 1)
+            {
+                uri = QueryHelpers.AddQueryString(uri, "offset", ((page - 1) * Constants.DefaultPageSize).ToString());
+            }
+
+            if (!string.IsNullOrWhiteSpace(searchQuery))
+            {
+                uri = QueryHelpers.AddQueryString(uri, "search", searchQuery);
+            }
+
+            return uri;
+        }
     }
 }

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Client/generated/services.gen.ts

@@ -28,7 +28,8 @@ export class ActiveCampaignFormsService {
             method: 'GET',
             url: '/umbraco/activecampaign-forms/management/api/v1/forms',
             query: {
-                page: data.page
+                page: data.page,
+                searchQuery: data.searchQuery
             }
         });
     }

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Client/generated/types.gen.ts

@@ -30,6 +30,7 @@ export type CheckApiAccessResponse = ApiAccessDtoModel;
 
 export type GetFormsData = {
     page?: number;
+    searchQuery?: string;
 };
 
 export type GetFormsResponse = FormCollectionResponseDtoModel;

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Client/openapi-ts.config.ts

@@ -1,5 +1,5 @@
 export default {
-    input: 'http://localhost:6583/umbraco/swagger/activecampaign-forms-management/swagger.json',
+    input: 'http://localhost:40714/umbraco/swagger/activecampaign-forms-management/swagger.json',
     output: {
       lint: 'eslint',
       path: 'generated',