V14: Integrations (HubSpot/Forms)

- Namespace cleanup
- Add confirmation dialog when deauthorize

Author: dtng95

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

@@ -1,10 +1,5 @@
 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.Integrations.Crm.Hubspot.Models.Dtos;
 using Umbraco.Forms.Integrations.Crm.Hubspot.Services;
 

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

@@ -1,10 +1,5 @@
 using Asp.Versioning;
 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.Routing;
 using Umbraco.Forms.Integrations.Crm.Hubspot.Services;
 

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

@@ -1,10 +1,5 @@
 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.Integrations.Crm.Hubspot.Models.Dtos;
 using Umbraco.Forms.Integrations.Crm.Hubspot.Services;
 

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

@@ -1,11 +1,5 @@
 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.Cms.Web.Common.Attributes;
 using Umbraco.Forms.Integrations.Crm.Hubspot.Models.Responses;
 using Umbraco.Forms.Integrations.Crm.Hubspot.Services;
 

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

@@ -1,10 +1,5 @@
 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.Integrations.Crm.Hubspot.Services;
 
 namespace Umbraco.Forms.Integrations.Crm.Hubspot.Api.Management.Controllers.Contacts

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

@@ -1,10 +1,5 @@
 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.Integrations.Crm.Hubspot.Services;
 
 namespace Umbraco.Forms.Integrations.Crm.Hubspot.Api.Management.Controllers.Contacts

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

@@ -1,19 +1,13 @@
-using Microsoft.AspNetCore.Authorization;
+using Asp.Versioning;
 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
 {
+    [ApiVersion("1.0")]
     [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;

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

@@ -1,10 +1,5 @@
 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.Services;
 using Umbraco.Forms.Integrations.Crm.Hubspot.Models.Dtos;
 

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

@@ -1,14 +1,7 @@
-using Asp.Versioning;
-using Microsoft.AspNetCore.Authorization;
+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.Api.Common.Attributes;
 using Umbraco.Cms.Web.Common.Authorization;
-using Umbraco.Cms.Web.Common.Routing;
 
 namespace Umbraco.Forms.Integrations.Crm.Hubspot.Api.Management.Controllers
 {

src/Umbraco.Forms.Integrations.Crm.Hubspot/Client/src/property-editor/hubspot-mapping.property-editor.ts

@@ -6,6 +6,7 @@ import { HubspotWorkflowFormFieldDto, Property } from '@umbraco-integrations/hub
 import { UUIInputEvent, UUISelectEvent } from '@umbraco-cms/backoffice/external/uui';
 import { HubspotMappingValue } from '../models/hubspot.model';
 import { UMB_NOTIFICATION_CONTEXT, UmbNotificationColor } from '@umbraco-cms/backoffice/notification';
+import { umbConfirmModal } from '@umbraco-cms/backoffice/modal';
 
 const elementName = "hubspot-mapping-property-editor";
 
@@ -20,12 +21,6 @@ export class HubspotMappingPropertyUiElement extends UmbLitElement implements Um
   @state()
   public hubspotMappingArray : Array<HubspotMappingValue> = [];
 
-  @state()
-  private selectedHubspotField: string = "";
-
-  @state()
-  private selectedFormField: string = "";
-
   @state()
   private hubspotFields: Array<Property> | undefined = [];
 
@@ -96,9 +91,9 @@ export class HubspotMappingPropertyUiElement extends UmbLitElement implements Um
   async #onConnect(){
     const { data } = await this.#hubspotContext.authorize(this.authorizationCode);
 
-    if(!data) return;
+    if (!data) return;
 
-    if(data.success){
+    if (data.success){
       this.authorizationStatus = "OAuth";
       this.authorizationCode = "";
 
@@ -107,7 +102,7 @@ export class HubspotMappingPropertyUiElement extends UmbLitElement implements Um
       this.requestUpdate();
       this.dispatchEvent(new CustomEvent("authorizationStatus"));
       this._showSuccess("Your Umbraco Forms installation is now connected to your HubSpot account");
-    }else{
+    } else{
       this._showError(data.errorMessage);
     }
   }
@@ -122,7 +117,13 @@ export class HubspotMappingPropertyUiElement extends UmbLitElement implements Um
   }
 
   async #deauthorize(){
-    //TODO: add overlay to confirm deauthorize
+    await umbConfirmModal(this, {
+      color: "danger",
+      headline: "Confirmation",
+      content: "Are you sure you wish to disconnect your Hubspot account?",
+      confirmLabel: 'Disconnect',
+    });
+
     const { data } = await this.#hubspotContext.deauthorize();
 
     if(!data) return;
@@ -137,7 +138,7 @@ export class HubspotMappingPropertyUiElement extends UmbLitElement implements Um
       }
 
       this._showSuccess("Your Umbraco Forms installation is no longer connected to your HubSpot account");
-    }else{
+    } else{
       this._showError(data.errorMessage!);
     }
 
@@ -180,17 +181,15 @@ export class HubspotMappingPropertyUiElement extends UmbLitElement implements Um
   }
 
   #onHubspotSelectChange(e: UUISelectEvent, idx: number){
-    this.selectedHubspotField = e.target.value.toString();
-    this.hubspotMappingArray[idx].hubspotField = this.selectedHubspotField;
+    this.hubspotMappingArray[idx].hubspotField = e.target.value.toString();
 
     this.value = JSON.stringify(this.hubspotMappingArray);
     this.requestUpdate();
     this.dispatchEvent(new CustomEvent('property-value-change'));
   }
 
   #onFormFieldSelectChange(e: UUISelectEvent, idx: number){
-    this.selectedFormField = e.target.value.toString();
-    this.hubspotMappingArray[idx].formField = this.selectedFormField;
+    this.hubspotMappingArray[idx].formField = e.target.value.toString();
 
     this.value = JSON.stringify(this.hubspotMappingArray);
     this.requestUpdate();