Merge pull request #57 from umbraco/feature/zapier-mediacropurl

Get URL for media content types

Author: acoumb

src/Umbraco.Cms.Integrations.Automation.Zapier/Extensions/ContentExtensions.cs

@@ -5,9 +5,11 @@
 #if NETCOREAPP
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.PublishedContent;
+using Umbraco.Extensions;
 #else
 using Umbraco.Core.Models;
 using Umbraco.Core.Models.PublishedContent;
+using Umbraco.Web;
 #endif
 
 namespace Umbraco.Cms.Integrations.Automation.Zapier.Extensions
@@ -33,7 +35,10 @@ public static Dictionary<string, string> ToContentTypeDictionary(this IContentTy
 
                 var contentProperty = content.Properties.First(p => p.Alias == propertyType.Alias);
 
-                contentDict.Add(propertyType.Alias, contentProperty.GetValue().ToString());
+                if(IsMedia(contentProperty, out string url))
+                    contentDict.Add(propertyType.Alias, url);
+                else
+                    contentDict.Add(propertyType.Alias, contentProperty.GetValue().ToString());
             }
 
             return contentDict;
@@ -55,5 +60,23 @@ public static Dictionary<string, string> ToContentDictionary(this IContent conte
 
             return contentDict;
         }
+
+        private static bool IsMedia(IPublishedProperty contentProperty, out string url)
+        {
+            switch (contentProperty.PropertyType.EditorAlias)
+            {
+                case Core.Constants.PropertyEditors.Aliases.MediaPicker:
+                    var mediaPickerValue = contentProperty.GetValue() as IPublishedContent;
+                    url = mediaPickerValue.Url();
+                    return true;
+                case Core.Constants.PropertyEditors.Aliases.MediaPicker3:
+                    var mediaPicker3Value = contentProperty.GetValue() as MediaWithCrops;
+                    url = mediaPicker3Value.LocalCrops.Src;
+                    return true;
+                default:
+                    url = string.Empty;
+                    return false;
+            }
+        }
     }
 }

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

@@ -9,12 +9,12 @@
     <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>1.0.4</Version>
+	<Version>1.1.0</Version>
 	<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
-    <PackageReference Include="UmbracoCms.Web" Version="8.5.4" />
+    <PackageReference Include="UmbracoCms.Web" Version="8.14.0" />
   </ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)' == 'net50'">

src/Umbraco.Cms.Integrations.Automation.Zapier/package.xml

@@ -3,7 +3,7 @@
   <info>
     <package>
       <name>Umbraco.Cms.Integrations.Automation.Zapier</name>
-      <version>1.0.4</version>
+      <version>1.1.0</version>
       <iconUrl></iconUrl>
       <licence url="https://opensource.org/licenses/MIT">MIT</licence>
       <url>https://github.com/umbraco/Umbraco.Cms.Integrations</url>