V14: Integrations (HubSpot/Forms)

- update UI implementation

Author: dtng95

src/Umbraco.Forms.Integrations.Crm.Hubspot/Api/Management/Controllers/Forms/FormControllerBase.cs

@@ -0,0 +1,26 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Umbraco.Cms.Web.Common.Authorization;
+using Umbraco.Cms.Web.Common.Routing;
+using Umbraco.Forms.Core.Services;
+
+namespace Umbraco.Forms.Integrations.Crm.Hubspot.Api.Management.Controllers.Forms
+{
+    [BackOfficeRoute($"{Constants.ManagementApi.RootPath}/v{{version:apiVersion}}/forms")]
+    [ApiExplorerSettings(GroupName = Constants.ManagementApi.FormGroupName)]
+    [Authorize(Policy = AuthorizationPolicies.BackOfficeAccess)]
+    public class FormControllerBase : HubspotControllerBase
+    {
+        protected readonly IFormService FormService;
+
+        public FormControllerBase(IFormService formService)
+        {
+            FormService = formService;
+        }
+    }
+}

src/Umbraco.Forms.Integrations.Crm.Hubspot/Api/Management/Controllers/Forms/GetFormFieldsController.cs

@@ -0,0 +1,32 @@
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Umbraco.Forms.Core.Models;
+using Umbraco.Forms.Core.Services;
+
+namespace Umbraco.Forms.Integrations.Crm.Hubspot.Api.Management.Controllers.Forms
+{
+    public class GetFormFieldsController : FormControllerBase
+    {
+        public GetFormFieldsController(IFormService formService) : base(formService)
+        {
+        }
+
+        [HttpGet("fields")]
+        [ProducesResponseType(typeof(List<Field>), StatusCodes.Status200OK)]
+        public IActionResult GetFormFields(string formId)
+        {
+            List<Field> formFields = new List<Field>();
+            var result = FormService.Get(new Guid(formId));
+            if (result != null)
+            {
+                formFields = result.AllFields;
+            }
+            return Ok(formFields);
+        }
+    }
+}

src/Umbraco.Forms.Integrations.Crm.Hubspot/Client/generated/services.gen.ts

@@ -3,7 +3,7 @@
 import type { CancelablePromise } from './core/CancelablePromise';
 import { OpenAPI } from './core/OpenAPI';
 import { request as __request } from './core/request';
-import type { IsAuthorizationConfiguredResponse, GetAuthenticationUrlResponse, AuthorizeData, AuthorizeResponse, DeauthorizeResponse, GetAllResponse } from './types.gen';
+import type { IsAuthorizationConfiguredResponse, GetAuthenticationUrlResponse, AuthorizeData, AuthorizeResponse, DeauthorizeResponse, GetAllResponse, GetFormFieldsData, GetFormFieldsResponse } from './types.gen';
 
 export class ContactsService {
     /**
@@ -65,4 +65,23 @@ export class ContactsService {
         });
     }
 
+}
+
+export class FormsService {
+    /**
+     * @param data The data for the request.
+     * @param data.formId
+     * @returns unknown OK
+     * @throws ApiError
+     */
+    public static getFormFields(data: GetFormFieldsData = {}): CancelablePromise<GetFormFieldsResponse> {
+        return __request(OpenAPI, {
+            method: 'GET',
+            url: '/umbraco/hubspot/management/api/v1/forms/fields',
+            query: {
+                formId: data.formId
+            }
+        });
+    }
+    
 }

src/Umbraco.Forms.Integrations.Crm.Hubspot/Client/generated/types.gen.ts

@@ -14,6 +14,12 @@ export type AggregateException = {
     readonly message: string;
 };
 
+export type AllowedUploadType = {
+    type: string;
+    name: string;
+    checked: string;
+};
+
 export type Assembly = {
     readonly definedTypes: Array<(TypeInfo)>;
     readonly exportedTypes: Array<(Type)>;
@@ -161,6 +167,33 @@ export type Exception = {
     readonly stackTrace?: string | null;
 };
 
+export type Field = {
+    caption: string;
+    tooltip?: string | null;
+    /**
+     * @deprecated
+     */
+    placeholder?: string | null;
+    cssClass?: string | null;
+    alias: string;
+    id: string;
+    fieldTypeId: string;
+    prevalueSourceId: string;
+    dataSourceFieldKey?: string | null;
+    containsSensitiveData: boolean;
+    mandatory: boolean;
+    regex?: string | null;
+    requiredErrorMessage?: string | null;
+    invalidErrorMessage?: string | null;
+    condition?: FieldCondition | null;
+    settings: {
+        [key: string]: (string);
+    };
+    preValues: Array<(FieldPrevalue)>;
+    allowedUploadTypes?: Array<(AllowedUploadType)> | null;
+    allowMultipleFileUploads: boolean;
+};
+
 export enum FieldAttributes {
     PRIVATE_SCOPE = 'PrivateScope',
     PRIVATE = 'Private',
@@ -183,6 +216,50 @@ export enum FieldAttributes {
     RESERVED_MASK = 'ReservedMask'
 }
 
+export type FieldCondition = {
+    id: string;
+    enabled: boolean;
+    actionType: FieldConditionActionType;
+    logicType: FieldConditionLogicType;
+    rules: Array<(FieldConditionRule)>;
+};
+
+export enum FieldConditionActionType {
+    SHOW = 'Show',
+    HIDE = 'Hide'
+}
+
+export enum FieldConditionLogicType {
+    ALL = 'All',
+    ANY = 'Any'
+}
+
+export type FieldConditionRule = {
+    id: string;
+    field: string;
+    operator: FieldConditionRuleOperator;
+    value: string;
+};
+
+export enum FieldConditionRuleOperator {
+    IS = 'Is',
+    IS_NOT = 'IsNot',
+    GREATER_THEN = 'GreaterThen',
+    LESS_THEN = 'LessThen',
+    CONTAINS = 'Contains',
+    CONTAINS_IGNORE_CASE = 'ContainsIgnoreCase',
+    STARTS_WITH = 'StartsWith',
+    STARTS_WITH_IGNORE_CASE = 'StartsWithIgnoreCase',
+    ENDS_WITH = 'EndsWith',
+    ENDS_WITH_IGNORE_CASE = 'EndsWithIgnoreCase',
+    NOT_CONTAINS = 'NotContains',
+    NOT_CONTAINS_IGNORE_CASE = 'NotContainsIgnoreCase',
+    NOT_STARTS_WITH = 'NotStartsWith',
+    NOT_STARTS_WITH_IGNORE_CASE = 'NotStartsWithIgnoreCase',
+    NOT_ENDS_WITH = 'NotEndsWith',
+    NOT_ENDS_WITH_IGNORE_CASE = 'NotEndsWithIgnoreCase'
+}
+
 export type FieldInfo = {
     readonly name: string;
     readonly declaringType?: Type | null;
@@ -215,6 +292,11 @@ export type FieldInfo = {
     readonly fieldHandle: RuntimeFieldHandle;
 };
 
+export type FieldPrevalue = {
+    value: string;
+    caption?: string | null;
+};
+
 export enum GenericParameterAttributes {
     NONE = 'None',
     COVARIANT = 'Covariant',
@@ -745,6 +827,12 @@ export type DeauthorizeResponse = AuthorizationResult;
 
 export type GetAllResponse = Array<(Property)>;
 
+export type GetFormFieldsData = {
+    formId?: string;
+};
+
+export type GetFormFieldsResponse = Array<(Field)>;
+
 export type $OpenApiTs = {
     '/umbraco/hubspot/management/api/v1/contacts/auth/configured': {
         get: {
@@ -797,4 +885,15 @@ export type $OpenApiTs = {
             };
         };
     };
+    '/umbraco/hubspot/management/api/v1/forms/fields': {
+        get: {
+            req: GetFormFieldsData;
+            res: {
+                /**
+                 * OK
+                 */
+                200: Array<(Field)>;
+            };
+        };
+    };
 };

src/Umbraco.Forms.Integrations.Crm.Hubspot/Client/src/context/hubspot.context.ts

@@ -3,10 +3,14 @@ import { UmbContextToken } from "@umbraco-cms/backoffice/context-api";
 import type { UmbControllerHost } from "@umbraco-cms/backoffice/controller-api";
 import { HubspotRepository } from "../repository/hubspot.repository";
 import { type AuthorizeData } from "@umbraco-integrations/hubspot/generated";
+import { UmbObjectState } from "@umbraco-cms/backoffice/observable-api";
 
 export class HubspotContext extends UmbControllerBase{
     #repository: HubspotRepository;
 
+    #settingsModel = new UmbObjectState<string | undefined>(undefined);
+    settingsModel = this.#settingsModel.asObservable();
+    
     constructor(host: UmbControllerHost) {
         super(host);
 
@@ -19,15 +23,16 @@ export class HubspotContext extends UmbControllerBase{
     }
 
     async isAuthorizationConfigured() {
-        return await this.#repository.isAuthorizationConfigured();
+        const { data } = await this.#repository.isAuthorizationConfigured();
+        this.#settingsModel.setValue(data);
     }
 
     async getAuthenticationUrl() {
         return await this.#repository.getAuthenticationUrl();
     }
 
-    async authorize(authData: AuthorizeData) {
-        return await this.#repository.authorize(authData);
+    async authorize(code: string) {
+        return await this.#repository.authorize(code);
     }
 
     async deauthorize() {
@@ -37,6 +42,10 @@ export class HubspotContext extends UmbControllerBase{
     async getAll() {
         return await this.#repository.getAll();
     }
+
+    async getFormFields(formId : string) {
+        return await this.#repository.getFormFields(formId);
+    }
 }
 
 export default HubspotContext;

src/Umbraco.Forms.Integrations.Crm.Hubspot/Client/src/models/hubspot.model.ts

@@ -0,0 +1,5 @@
+export interface HubspotMappingValue {
+    formField: string;
+    hubspotField: string;
+    appendValue: boolean;
+}