Feature/v17/hubspot

azure-pipeline - Crm.Hubspot.yml

@@ -1,8 +1,8 @@
 trigger:
   branches:
     include:
-    - main-v16
-    - v16/dev
+    - main-v17
+    - v17/dev
   paths:
     include:
     - src/Umbraco.Cms.Integrations.Crm.Hubspot/**
@@ -16,24 +16,28 @@ variables:
   project: 'src/$(projectName)/$(projectName).csproj'
   buildPlatform: 'Any CPU'
   buildConfiguration: 'Release'
+  productGroup: 'DXP'
+  productVersion: 'v17'
+  DT_API_KEY: $(dtApiKey)
+  DT_BASE_URL: $(dtBaseUrl)
 
 steps:
+- task: UseDotNet@2
+  displayName: 'Use SDK version 10.0.100'
+  inputs:
+    packageType: 'sdk'
+    version: '10.0.100'
+
 - task: NuGetToolInstaller@1
   displayName: 'Install NuGet'
 
 - task: DotNetCoreCLI@2
   displayName: 'NuGet Restore'
   inputs:
     command: 'restore'
-    feedsToUse: 'select'
+    feedsToUse: 'config'
     projects: '$(project)'
-    includeNuGetOrg: true
-
-- task: UseDotNet@2
-  displayName: 'Use SDK version 9.0.203'
-  inputs:
-    packageType: 'sdk'
-    version: '9.0.203'
+    nugetConfigPath: 'NuGet.config'
 
 - task: VSBuild@1
   displayName: 'Build Project'
@@ -57,3 +61,26 @@ steps:
     PathtoPublish: '$(Build.ArtifactStagingDirectory)'
     ArtifactName: 'drop'
     publishLocation: 'Container'
+
+# Generate/upload SBOM with cdxgen
+- script: |
+    cd $(Build.SourcesDirectory)
+    npm install --global @cyclonedx/cdxgen
+  displayName: 'Install cdxgen'
+
+- script: |
+    mkdir -p $(Build.ArtifactStagingDirectory)/bom
+    cd $(Build.SourcesDirectory)
+
+    cdxgen --recurse --output $(Build.ArtifactStagingDirectory)\bom\bom.json --json-pretty --project-group "$(productGroup)" --project-name "$(projectName)" --project-version "$(productVersion)" --server-url "$(DT_BASE_URL)" --api-key "$(DT_API_KEY)" --deep
+  displayName: 'Generate & Upload SBOM with cdxgen'
+  env:
+    DT_API_KEY: $(DT_API_KEY)
+    DT_BASE_URL: $(DT_BASE_URL)
+
+# Publish SBOM artifact
+- task: PublishPipelineArtifact@1
+  displayName: 'Publish SBOM Artifact'
+  inputs:
+    targetPath: $(Build.ArtifactStagingDirectory)/bom
+    artifactName: SBOM    

azure-pipeline - Search.Algolia.yml

@@ -1,8 +1,8 @@
 trigger:
   branches:
     include:
-    - main-v16
-    - v16/dev
+    - main-v17
+    - v17/dev
   paths:
     include:
     - src/Umbraco.Cms.Integrations.Search.Algolia/**
@@ -16,23 +16,29 @@ variables:
   project: 'src/$(projectName)/$(projectName).csproj'
   buildPlatform: 'Any CPU'
   buildConfiguration: 'Release'
+  productGroup: 'DXP'
+  productVersion: 'v17'
+  DT_API_KEY: $(dtApiKey)
+  DT_BASE_URL: $(dtBaseUrl)
 
 steps:
+- task: UseDotNet@2
+  displayName: 'Use SDK version 10.0.100'
+  inputs:
+    packageType: 'sdk'
+    version: '10.0.100'
+
 - task: NuGetToolInstaller@1
   displayName: 'Install NuGet'
 
 - task: DotNetCoreCLI@2
   displayName: 'NuGet Restore'
   inputs:
     command: 'restore'
-    feedsToUse: 'select'
+    feedsToUse: 'config'
     projects: '$(project)'
-    includeNuGetOrg: true
-- task: UseDotNet@2
-  displayName: 'Use SDK version 9.0.203'
-  inputs:
-    packageType: 'sdk'
-    version: '9.0.203'
+    nugetConfigPath: 'NuGet.config'
+
 - task: VSBuild@1
   displayName: 'Build Project'
   inputs:
@@ -55,3 +61,26 @@ steps:
     PathtoPublish: '$(Build.ArtifactStagingDirectory)'
     ArtifactName: 'drop'
     publishLocation: 'Container'
+
+# Generate/upload SBOM with cdxgen
+- script: |
+    cd $(Build.SourcesDirectory)
+    npm install --global @cyclonedx/cdxgen
+  displayName: 'Install cdxgen'
+
+- script: |
+    mkdir -p $(Build.ArtifactStagingDirectory)/bom
+    cd $(Build.SourcesDirectory)
+
+    cdxgen --recurse --output $(Build.ArtifactStagingDirectory)\bom\bom.json --json-pretty --project-group "$(productGroup)" --project-name "$(projectName)" --project-version "$(productVersion)" --server-url "$(DT_BASE_URL)" --api-key "$(DT_API_KEY)" --deep
+  displayName: 'Generate & Upload SBOM with cdxgen'
+  env:
+    DT_API_KEY: $(DT_API_KEY)
+    DT_BASE_URL: $(DT_BASE_URL)
+
+# Publish SBOM artifact
+- task: PublishPipelineArtifact@1
+  displayName: 'Publish SBOM Artifact'
+  inputs:
+    targetPath: $(Build.ArtifactStagingDirectory)/bom
+    artifactName: SBOM    

examples/Umbraco.Cms.Integrations.Testsite.V17/Umbraco.Cms.Integrations.Testsite.V17.csproj

@@ -8,6 +8,7 @@
 
   <ItemGroup>
     <PackageReference Include="Umbraco.Cms" Version="17.0.0" />
+    <ProjectReference Include="..\..\src\Umbraco.Cms.Integrations.Crm.Hubspot\Umbraco.Cms.Integrations.Crm.Hubspot.csproj" />
     <ProjectReference Include="..\..\src\Umbraco.Cms.Integrations.SEO.Semrush\Umbraco.Cms.Integrations.SEO.Semrush.csproj" />
     <ProjectReference Include="..\..\src\Umbraco.Cms.Integrations.Automation.Zapier\Umbraco.Cms.Integrations.Automation.Zapier.csproj" />
     <ProjectReference Include="..\..\src\Umbraco.Cms.Integrations.Crm.Dynamics\Umbraco.Cms.Integrations.Crm.Dynamics.csproj" />

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

@@ -1,6 +1,7 @@
 using Asp.Versioning;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.WebUtilities;
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Api.Common.Builders;
 using Umbraco.Cms.Integrations.Crm.ActiveCampaign.Configuration;
@@ -21,15 +22,13 @@ 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 = "")
         {
             try
             {
                 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
                 {
@@ -48,5 +47,22 @@ public async Task<IActionResult> GetForms([FromQuery] int? page = 1)
                     .Build());
             }
         }
+
+        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/types.gen.ts

@@ -62,6 +62,7 @@ export type GetFormsData = {
     path?: never;
     query?: {
         page?: number;
+        searchQuery?: string;
     };
     url: '/umbraco/activecampaign-forms/management/api/v1/forms';
 };

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Client/src/context/activecampaign-forms.context.ts

@@ -28,8 +28,8 @@ export class ActiveCampaignFormsContext extends UmbControllerBase {
         this.#configurationModel.setValue(data);
     }
 
-    async getForms(page?: number) {
-        return await this.#repository.getForms(page);
+    async getForms(page?: number, searchQuery?: string) {
+        return await this.#repository.getForms(page, searchQuery);
     }
 
     async getForm(id: string) {

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Client/src/modal/activecampaign-forms-modal.element.ts

@@ -29,6 +29,11 @@ export default class ActiveCampaignFormsModalElement
     @state()
     _totalPages = 1;
 
+    @state()
+    _searchQuery = "";
+
+    #filterTimeout?: NodeJS.Timeout;
+
     constructor() {
         super();
 
@@ -47,6 +52,13 @@ export default class ActiveCampaignFormsModalElement
         this.#checkApiAccess();
     }
 
+    disconnectedCallback() {
+        super.disconnectedCallback();
+        if (this.#filterTimeout) {
+            clearTimeout(this.#filterTimeout);
+        }
+    }
+
     async #checkApiAccess() {
         if (!this.#activecampaignFormsContext || !this.#configurationModel) return;
 
@@ -58,10 +70,10 @@ export default class ActiveCampaignFormsModalElement
         await this.#loadForms();
     }
 
-    async #loadForms(page?: number) {
+    async #loadForms(page?: number, searchQuery?: string) {
         this._loading = true;
 
-        const { data } = await this.#activecampaignFormsContext.getForms(page);
+        const { data } = await this.#activecampaignFormsContext.getForms(page, searchQuery);
         if (!data) {
             this._loading = false;
             return;
@@ -75,21 +87,26 @@ export default class ActiveCampaignFormsModalElement
         this._loading = false;
     }
 
-    #handleFilterInput(event: UUIInputEvent) {
+    async #handleFilterInput(event: UUIInputEvent) {
         let query = (event.target.value as string) || '';
         query = query.toLowerCase();
+        this._searchQuery = query;
 
-        const result = !query
-            ? this._forms
-            : this._forms.filter((form) => form.name.toLowerCase().includes(query));
+        // Clear existing timeout
+        if (this.#filterTimeout) {
+            clearTimeout(this.#filterTimeout);
+        }
 
-        this._filteredForms = result;
+        this.#filterTimeout = setTimeout(async () => {
+            this._currentPageNumber = 1;
+            await this.#loadForms(this._currentPageNumber, this._searchQuery);
+        }, 500);
     }
 
     async #onPageChange(event: UUIPaginationEvent) {
         this._currentPageNumber = event.target?.current;
 
-        await this.#loadForms(this._currentPageNumber);
+        await this.#loadForms(this._currentPageNumber, this._searchQuery);
     }
 
     #renderPagination() {

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Client/src/property-editor/form-picker-property-editor.element.ts

@@ -15,7 +15,6 @@ export default class ActiveCampaignFormPickerElement extends UmbElementMixin(Lit
 
     @property({ type: String })
     public value = "";
-
 
     @state()
     private _form: FormDtoModel = {

src/Umbraco.Cms.Integrations.Crm.ActiveCampaign/Client/src/repository/activecampaign-forms.repository.ts

@@ -28,8 +28,8 @@ export class ActiveCampaignFormsRepository extends UmbControllerBase {
         return { data };
     }
 
-    async getForms(page?: number) {
-        const { data, error } = await tryExecute(this, ActiveCampaignForms.getForms({ query: { page } }));
+    async getForms(page?: number, searchQuery?: string) {
+        const { data, error } = await tryExecute(this, ActiveCampaignFormsService.getForms({ query: { page, searchQuery } }));
 
         if (error || !data) {
             return { error };

src/Umbraco.Cms.Integrations.Crm.Hubspot/Api/Management/Controllers/GetAccessTokenController.cs

@@ -16,9 +16,9 @@ public class GetAccessTokenController : HubspotFormsControllerBase
 
         public GetAccessTokenController(
             IOptions<HubspotSettings> settingsOptions,
-            AuthorizationImplementationFactory authorizationImplementationFactory) 
+            IHubspotAuthorizationServiceFactory authorizationServiceFactory) 
             : base(settingsOptions) 
-            => _authorizationService = authorizationImplementationFactory(Settings.UseUmbracoAuthorization);
+            => _authorizationService = authorizationServiceFactory.GetAuthorizationService(Settings.UseUmbracoAuthorization);
 
         [HttpPost("access-token", Name = Constants.OperationIdentifiers.GetAccessToken)]
         [ProducesResponseType(typeof(string), StatusCodes.Status200OK)]

src/Umbraco.Cms.Integrations.Crm.Hubspot/Api/Management/Controllers/GetAuthorizationUrlController.cs

@@ -16,8 +16,8 @@ public class GetAuthorizationUrlController : HubspotFormsControllerBase
 
         public GetAuthorizationUrlController(
             IOptions<HubspotSettings> settingsOptions,
-            AuthorizationImplementationFactory authorizationImplementationFactory) 
-            : base(settingsOptions) => _authorizationService = authorizationImplementationFactory(Settings.UseUmbracoAuthorization);
+            IHubspotAuthorizationServiceFactory authorizationServiceFactory) 
+            : base(settingsOptions) => _authorizationService = authorizationServiceFactory.GetAuthorizationService(Settings.UseUmbracoAuthorization);
 
         [HttpGet("authorization-url", Name = Constants.OperationIdentifiers.GetAuthorizationUrl)]
         [ProducesResponseType(typeof(string), StatusCodes.Status200OK)]

src/Umbraco.Cms.Integrations.Crm.Hubspot/Api/Management/Controllers/RefreshAccessTokenController.cs

@@ -4,7 +4,6 @@
 using Microsoft.Extensions.Options;
 using Umbraco.Cms.Integrations.Crm.Hubspot.Configuration;
 using Umbraco.Cms.Integrations.Crm.Hubspot.Services;
-using static Umbraco.Cms.Integrations.Crm.Hubspot.HubspotComposer;
 
 namespace Umbraco.Cms.Integrations.Crm.Hubspot.Api.Management.Controllers
 {
@@ -15,8 +14,8 @@ public class RefreshAccessTokenController : HubspotFormsControllerBase
 
         public RefreshAccessTokenController(
             IOptions<HubspotSettings> settingsOptions,
-            AuthorizationImplementationFactory authorizationImplementationFactory) 
-            : base(settingsOptions) => _authorizationService = authorizationImplementationFactory(Settings.UseUmbracoAuthorization);
+            IHubspotAuthorizationServiceFactory authorizationServiceFactory) 
+            : base(settingsOptions) => _authorizationService = authorizationServiceFactory.GetAuthorizationService(Settings.UseUmbracoAuthorization);
 
         [HttpPost("refresh", Name = Constants.OperationIdentifiers.RefreshAccessToken)]
         [ProducesResponseType(typeof(string), StatusCodes.Status200OK)]

src/Umbraco.Cms.Integrations.Crm.Hubspot/Api/Management/Controllers/ValidateAccessTokenController.cs

@@ -21,12 +21,12 @@ public ValidateAccessTokenController(
             IOptions<HubspotSettings> settingsOptions,
             IHttpClientFactory httpClientFactory,
             ITokenService tokenService,
-            IHubspotAuthorizationService authorizationService)
+            IHubspotAuthorizationServiceFactory authorizationServiceFactory)
             : base(settingsOptions)
         {
             _httpClientFactory = httpClientFactory;
             _tokenService = tokenService;
-            _authorizationService = authorizationService;
+            _authorizationService = authorizationServiceFactory.GetAuthorizationService(settingsOptions.Value.UseUmbracoAuthorization);
         }
 
         [HttpGet("validate", Name = Constants.OperationIdentifiers.ValidateAccessToken)]

src/Umbraco.Cms.Integrations.Crm.Hubspot/Client/.npmrc

@@ -0,0 +1 @@
+@umbraco-cms:registry=https://www.myget.org/F/umbracoprereleases/npm/