Merge pull request #230 from umbraco/bugfix/v14/zapier-polling-error

Fix dictionary duplicate key and multinode null reference.

Author: acoumb

src/Umbraco.Cms.Integrations.Automation.Zapier/Services/Parsers/MultiNodeTreePickerParser.cs

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using Umbraco.Cms.Core.Models.PublishedContent;
+using Umbraco.Cms.Core.Models.PublishedContent;
 
 namespace Umbraco.Cms.Integrations.Automation.Zapier.Services.Parsers
 {
@@ -12,7 +10,7 @@ public string GetValue(IPublishedProperty contentProperty)
 
             var items = contentProperty.GetValue() as IEnumerable<IPublishedContent>;
 
-            return items.Any()
+            return items != null && items.Any()
                 ? string.Join(", ", items.Select(p => p.Name))
                 : string.Empty;
         }

src/Umbraco.Cms.Integrations.Automation.Zapier/Services/ZapierContentService.cs

@@ -31,6 +31,11 @@ public Dictionary<string, string> GetContentTypeDictionary(IContentType contentT
 
                 var parser = _zapierContentFactory.Create(contentProperty.PropertyType.EditorAlias);
 
+                if (contentDict.ContainsKey(propertyType.Alias))
+                {
+                    continue;
+                }
+
                 contentDict.Add(propertyType.Alias, parser.GetValue(contentProperty));
             }
 
@@ -48,6 +53,11 @@ public Dictionary<string, string> GetContentDictionary(IContent contentNode)
 
             foreach (var prop in contentNode.Properties)
             {
+                if (contentDict.ContainsKey(prop.Alias))
+                {
+                    continue;
+                }
+
                 contentDict.Add(prop.Alias, prop.Id == 0 || prop.Values.Count == 0 ? string.Empty : prop.GetValue().ToString());
             }
 

src/Umbraco.Cms.Integrations.Automation.Zapier/Umbraco.Cms.Integrations.Automation.Zapier.csproj

@@ -17,7 +17,7 @@
 		<RepositoryUrl>https://github.com/umbraco/Umbraco.Cms.Integrations</RepositoryUrl>
 		<PackageProjectUrl>https://github.com/umbraco/Umbraco.Cms.Integrations/blob/main/src/Umbraco.Cms.Integrations.Automation.Zapier</PackageProjectUrl>
 		<Product>Umbraco.Cms.Integrations.Automation.Zapier</Product>
-		<Version>2.0.0</Version>
+		<Version>2.0.1</Version>
 		<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>
 		<PackageIcon>zapier.png</PackageIcon>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>