Merge pull request #113 from umbraco/v15/feature/46045-Review,-test-and-release-update-for-ActiveCampaign-(Forms)

46045 Review, test and release update for ActiveCampaign (Forms) 15

Author: dtng95

src/Umbraco.Forms.Integrations.Crm.ActiveCampaign/ActiveCampaignContactsWorkflow.cs

@@ -1,5 +1,7 @@
-using Microsoft.Extensions.Logging;
+using Lucene.Net.Index;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
+using System;
 using System.Text.Json;
 using Umbraco.Forms.Core;
 using Umbraco.Forms.Core.Enums;
@@ -124,15 +126,19 @@ public override List<Exception> ValidateSettings()
             var list = new List<Exception>();
 
             if (string.IsNullOrEmpty(ContactMappings))
+            {
                 list.Add(new Exception("Contact mappings are required."));
-
-            var mappings = JsonSerializer.Deserialize<List<ContactMappingDto>>(ContactMappings);
-            foreach(var contactField in _settings.ContactFields.Where(p => p.Required))
+            }
+            else
             {
-                if(!mappings.Any(p => p.ContactField == contactField.Name))
+                var mappings = JsonSerializer.Deserialize<List<ContactMappingDto>>(ContactMappings);
+                foreach (var contactField in _settings.ContactFields.Where(p => p.Required))
                 {
-                    list.Add(new Exception("Invalid contact mappings. Please make sure the mandatory fields are mapped."));
-                    break;
+                    if (!mappings.Any(p => p.ContactField == contactField.Name))
+                    {
+                        list.Add(new Exception("Invalid contact mappings. Please make sure the mandatory fields are mapped."));
+                        break;
+                    }
                 }
             }
 

src/Umbraco.Forms.Integrations.Crm.ActiveCampaign/Client/config.outputPath.js

@@ -1 +1 @@
-export const outputPath = 'Debug' !== 'Release' ? '../wwwroot' : '../obj/Debug/net8.0/clientassets'
+export const outputPath = 'Debug' !== 'Release' ? '../wwwroot' : '../obj/Debug/net9.0/clientassets'