Merge branch 'main' of https://github.com/umbraco/Umbraco.Cms.Integrations

Author: acoumb

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/ActiveCampaignComposer.cs

@@ -1,7 +1,5 @@
 using Microsoft.Extensions.DependencyInjection;
 
-using System;
-
 using Umbraco.Cms.Core.Composing;
 using Umbraco.Cms.Core.DependencyInjection;
 using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.Configuration;
@@ -19,7 +17,7 @@ public void Compose(IUmbracoBuilder builder)
                 .AddHttpClient(Constants.FormsHttpClient, client =>
                     {
                         client.BaseAddress = new Uri(
-                            $"{builder.Config.GetSection(Constants.SettingsPath)[nameof(ActiveCampaignSettings.BaseUrl)]}/api/3/forms");
+                            $"{builder.Config.GetSection(Constants.SettingsPath)[nameof(ActiveCampaignSettings.BaseUrl)]}");
                         client.DefaultRequestHeaders
                             .Add("Api-Token", builder.Config.GetSection(Constants.SettingsPath)[nameof(ActiveCampaignSettings.ApiKey)]);
                     });

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/Constants.cs

@@ -9,6 +9,8 @@ public class Constants
 
         public const string FormsHttpClient = "FormsClient";
 
+        public const int DefaultPageSize = 10;
+
         public class Resources
         {
             public const string AuthorizationFailed = "ActiveCampaign authorization failed.";

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/Controllers/FormsController.cs

@@ -21,6 +21,8 @@ public class FormsController : UmbracoAuthorizedApiController
 
         private readonly IHttpClientFactory _httpClientFactory;
 
+        private const string ApiPath = "/api/3/forms";
+
         public FormsController(IOptions<ActiveCampaignSettings> options, IHttpClientFactory httpClientFactory)
         {
             _settings = options.Value;
@@ -32,11 +34,20 @@ public FormsController(IOptions<ActiveCampaignSettings> options, IHttpClientFact
         public IActionResult CheckApiAccess() => new JsonResult(new ApiAccessDto(_settings.BaseUrl, _settings.ApiKey));
 
         [HttpGet]
-        public async Task<IActionResult> GetForms()
+        public async Task<IActionResult> GetForms(int page = 1)
         {
             var client = _httpClientFactory.CreateClient(Constants.FormsHttpClient);
 
-            var response = await client.SendAsync(new HttpRequestMessage { Method = HttpMethod.Get });
+            var requestUriString = page == 1
+                ? $"{client.BaseAddress}{ApiPath}&limit={Constants.DefaultPageSize}"
+                : $"{client.BaseAddress}{ApiPath}&limit={Constants.DefaultPageSize}&offset={(page - 1) * Constants.DefaultPageSize}";
+
+            var requestMessage = new HttpRequestMessage { 
+                RequestUri = new Uri(requestUriString),
+                Method = HttpMethod.Get 
+            };
+
+            var response = await client.SendAsync(requestMessage);
 
             var content = await response.Content.ReadAsStringAsync();
 
@@ -61,7 +72,7 @@ public async Task<IActionResult> GetForm(string id)
                 new HttpRequestMessage
                 {
                     Method = HttpMethod.Get,
-                    RequestUri = new Uri(client.BaseAddress + "/" + id)
+                    RequestUri = new Uri($"{client.BaseAddress}{ApiPath}/{id}")
                 });
 
             var content = await response.Content.ReadAsStringAsync();

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/Models/Dtos/FormCollectionResponseDto.cs

@@ -1,11 +1,13 @@
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.Models.Dtos
 {
     public class FormCollectionResponseDto : BaseResponseDto
     {
         [JsonPropertyName("forms")]
         public List<FormDto> Form { get; set; }
+
+        [JsonPropertyName("meta")]
+        public MetaDto Meta { get; set; }
     }
 }

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core/Models/Dtos/MetaDto.cs

@@ -0,0 +1,13 @@
+using System.Text.Json.Serialization;
+
+namespace Umbraco.Cms.Integrations.Crm.ActiveCampaign.Core.Models.Dtos
+{
+    public class MetaDto
+    {
+        [JsonPropertyName("total")]
+        public string Total { get; set; }
+
+        [JsonPropertyName("totalPages")]
+        public int TotalPages => int.TryParse(Total, out var total) ? total / Constants.DefaultPageSize : 0;
+    }
+}

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/App_Plugins/UmbracoCms.Integrations/Crm/ActiveCampaign/js/activecampaign.resource.js

@@ -9,9 +9,9 @@
                     $http.get(`${apiEndpoint}/CheckApiAccess`),
                     "Failed");
             },
-            getForms: function () {
+            getForms: function (page) {
                 return umbRequestHelper.resourcePromise(
-                    $http.get(`${apiEndpoint}/GetForms`),
+                    $http.get(`${apiEndpoint}/GetForms?page=${page}`),
                     "Failed");
             },
             getForm: function (id) {

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/App_Plugins/UmbracoCms.Integrations/Crm/ActiveCampaign/js/formpicker.controller.js

@@ -9,6 +9,16 @@
 
     vm.status = "";
 
+    // pagination
+    vm.pagination = {
+        pageNumber: 1,
+        totalPages: 1
+    };
+    vm.nextPage = goToPage;
+    vm.prevPage = goToPage;
+    vm.changePage = goToPage;
+    vm.goToPage = goToPage;
+
     umbracoCmsIntegrationsCrmActiveCampaignResource.checkApiAccess().then(function (response) {
         vm.isApiConfigurationValid = response.isApiConfigurationValid;
         if (response.isApiConfigurationValid) {
@@ -69,12 +79,16 @@
         });
     }
 
-    function loadForms() {
+    function loadForms(page) {
         vm.loading = true;
-        umbracoCmsIntegrationsCrmActiveCampaignResource.getForms().then(function (response) {
+        umbracoCmsIntegrationsCrmActiveCampaignResource.getForms(page).then(function (response) {
+
             vm.formsList = [];
 
             if (response.forms != null) {
+
+                vm.pagination.totalPages = response.meta.totalPages;
+
                 response.forms.forEach(item => {
                     vm.formsList.push({
                         id: item.id,
@@ -87,6 +101,11 @@
             vm.loading = false;
         });
     }
+
+    // pagination events
+    function goToPage(page) {
+        loadForms(page);
+    }
 }
 
 angular.module("umbraco")

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/App_Plugins/UmbracoCms.Integrations/Crm/ActiveCampaign/views/formpickereditor.html

@@ -24,6 +24,21 @@
                                 </a>
                             </li>
                         </ul>
+                        <!-- If list is empty, then display -->
+                        <umb-empty-state ng-if="!vm.formsList"
+                                         position="center">
+                            <localize key="content_listViewNoItems">There are no forms in the list.</localize>
+                        </umb-empty-state>
+                        <!-- Pagination -->
+                        <div class="flex justify-center" ng-show="!vm.loading">
+                            <umb-pagination page-number="vm.pagination.pageNumber"
+                                            total-pages="vm.pagination.totalPages"
+                                            on-next="vm.nextPage"
+                                            on-prev="vm.prevPage"
+                                            on-change="vm.changePage"
+                                            on-go-to-page="vm.goToPage">
+                            </umb-pagination>
+                        </div>
                     </div>
 
                     <div ng-if="vm.status" class="alert alert-warning">