Merge pull request #90 from umbraco/feature/v10/hubspot-append-values

Add feature to allow contact field value append.

Author: acoumb

src/Umbraco.Forms.Integrations.Crm.Hubspot/App_Plugins/UmbracoForms.Integrations/Crm/Hubspot/hubspot-field-mapper-template.html

@@ -20,10 +20,10 @@
         </div>
 
         <div class="umb-forms-mappings mt2" ng-show="vm.mappings.length > 0 && vm.hubspotFields.length > 0">
-
             <div class="umb-forms-mapping-header">
                 <div class="umb-forms-mapping-field -no-margin-left">Form Field</div>
                 <div class="umb-forms-mapping-field">Hubspot Field</div>
+                <div ng-if="vm.allowContactUpdate" class="umb-forms-mapping-field text-center">Append when updating values</div>
                 <div class="umb-forms-mapping-remove -no-margin-right"></div>
             </div>
 
@@ -46,6 +46,14 @@
                         </select>
                     </div>
 
+                    <div ng-if="vm.allowContactUpdate" class="umb-forms-mapping-field flex justify-center">
+                        <umb-checkbox name="chkAppend"
+                                      value="mapping.appendValue"
+                                      model="mapping.appendValue"
+                                      on-change="vm.stringifyValue()">
+                        </umb-checkbox>
+                    </div>
+
                     <div class="umb-forms-mapping-remove -no-margin-right">
                         <a href="" ng-click="vm.deleteMapping($index)"><i class="icon-trash"></i></a>
                     </div>

src/Umbraco.Forms.Integrations.Crm.Hubspot/App_Plugins/UmbracoForms.Integrations/Crm/Hubspot/hubspotfields.component.js

@@ -53,10 +53,12 @@ function HubSpotFieldsController($scope, $routeParams, umbracoFormsIntegrationsC
 
     vm.$onInit = function () {
 
+        vm.allowContactUpdate = Umbraco.Sys.ServerVariables.umbracoPlugins.umbracoFormsIntegrationsCrmHubspot.allowContactUpdate;
+
         if (!vm.setting.value) {
             vm.mappings = [];
         } else {
-            vm.mappings = JSON.parse(vm.setting.value);
+            vm.mappings = parseMappings(vm.setting.value);
         }
 
         umbracoFormsIntegrationsCrmHubspotResource.isAuthorizationConfigured().then(function (response) {
@@ -178,7 +180,8 @@ function HubSpotFieldsController($scope, $routeParams, umbracoFormsIntegrationsC
         // Add new empty object into the mappings array.
         vm.mappings.push({
             formField: "",
-            hubspotField: ""
+            hubspotField: "",
+            appendValue: false
         });
     };
 
@@ -190,4 +193,14 @@ function HubSpotFieldsController($scope, $routeParams, umbracoFormsIntegrationsC
     vm.stringifyValue = function () {
         vm.setting.value = JSON.stringify(vm.mappings);
     };
+
+    function parseMappings(settingValue) {
+        var mappings = JSON.parse(settingValue);
+        return mappings.map(mappingObj => {
+            if (mappingObj.appendValue === undefined) {
+                mappingObj.appendValue = false;
+            }
+            return mappingObj;
+        });
+    }
 }

src/Umbraco.Forms.Integrations.Crm.Hubspot/HubspotServerVariablesParsingHandler.cs

@@ -1,12 +1,13 @@
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Routing;
-
+using Microsoft.Extensions.Options;
 using System;
 using System.Collections.Generic;
-
+using System.Runtime.Serialization;
 using Umbraco.Cms.Core.Events;
 using Umbraco.Cms.Core.Notifications;
 using Umbraco.Extensions;
+using Umbraco.Forms.Integrations.Crm.Hubspot.Configuration;
 using Umbraco.Forms.Integrations.Crm.Hubspot.Controllers;
 
 namespace Umbraco.Forms.Integrations.Crm.Hubspot
@@ -15,12 +16,15 @@ public class HubspotServerVariablesParsingHandler : INotificationHandler<ServerV
     {
         private readonly IHttpContextAccessor _httpContextAccessor;
         private readonly LinkGenerator _linkGenerator;
+        private readonly HubspotSettings _settings;
 
-        public HubspotServerVariablesParsingHandler(IHttpContextAccessor httpContextAccessor, LinkGenerator linkGenerator)
+        public HubspotServerVariablesParsingHandler(IHttpContextAccessor httpContextAccessor, LinkGenerator linkGenerator, IOptions<HubspotSettings> options)
         {
             _httpContextAccessor = httpContextAccessor;
 
-            _linkGenerator = linkGenerator; 
+            _linkGenerator = linkGenerator;
+
+            _settings = options.Value;
         }
 
         public void Handle(ServerVariablesParsingNotification notification)
@@ -51,6 +55,22 @@ public void Handle(ServerVariablesParsingNotification notification)
             umbracoUrls["umbracoFormsIntegrationsCrmHubspotBaseUrl"] =
                 _linkGenerator.GetUmbracoApiServiceBaseUrl<HubspotController>(controller => controller.GetAllProperties());
 
+            if (serverVars.ContainsKey("umbracoPlugins"))
+            {
+                var umbracoPlugins = (Dictionary<string, object>)serverVars["umbracoPlugins"];
+                umbracoPlugins.Add("umbracoFormsIntegrationsCrmHubspot", new ClientSideConfiguration
+                {
+                    AllowContactUpdate = _settings.AllowContactUpdate
+                });
+            }
+
+        }
+
+        [DataContract]
+        internal sealed class ClientSideConfiguration
+        {
+            [DataMember(Name = "allowContactUpdate")]
+            public bool AllowContactUpdate { get; set; }
         }
     }
 }

src/Umbraco.Forms.Integrations.Crm.Hubspot/Models/MappedProperty.cs

@@ -9,5 +9,8 @@ public class MappedProperty
 
         [JsonProperty(PropertyName = "hubspotField")]
         public string HubspotField { get; set; }
+
+        [JsonProperty(PropertyName = "appendValue")]
+        public bool AppendValue { get; set; }
     }
 }

src/Umbraco.Forms.Integrations.Crm.Hubspot/Services/HubspotContactService.cs

@@ -160,7 +160,9 @@ public async Task<CommandResult> PostContactAsync(Record record, List<MappedProp
                 var recordField = record.GetRecordField(Guid.Parse(fieldId));
                 if (recordField != null)
                 {
-                    var value = recordField.ValuesAsHubspotString(false);
+                    var value = _settings.AllowContactUpdate && mapping.AppendValue
+                        ? ";" + recordField.ValuesAsHubspotString(false)
+                        : recordField.ValuesAsHubspotString(false);
 
                     propertiesRequestV1.Properties.Add(new PropertiesRequestV1.PropertyValue(mapping.HubspotField, value));
                     propertiesRequestV3.Properties.Add(mapping.HubspotField, value);

src/Umbraco.Forms.Integrations.Crm.Hubspot/Umbraco.Forms.Integrations.Crm.Hubspot.csproj

@@ -11,7 +11,7 @@
 		<PackageIconUrl></PackageIconUrl>
 		<PackageProjectUrl>https://github.com/umbraco/Umbraco.Forms.Integrations/tree/main-v10/src/Umbraco.Forms.Integrations.Crm.Hubspot</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/umbraco/Umbraco.Forms.Integrations</RepositoryUrl>
-		<Version>3.2.1</Version>
+		<Version>3.3.0</Version>
 		<Authors>Umbraco HQ</Authors>
 		<Company>Umbraco</Company>
 		<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>