Fix asset rendering with null file

contentful · Sep 3, 2021 · ff1e679 · ff1e679
1 parent af6781f
commit ff1e679
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 8 deletions.
diff --git a/Contentful.AspNetCore/Contentful.AspNetCore.csproj b/Contentful.AspNetCore/Contentful.AspNetCore.csproj
@@ -13,10 +13,10 @@
     <PackageProjectUrl>https://github.com/contentful/contentful.net</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <RepositoryType>git</RepositoryType>
-    <Version>6.0.12</Version>
-    <AssemblyVersion>6.0.12.0</AssemblyVersion>
+    <Version>6.0.13</Version>
+    <AssemblyVersion>6.0.13.0</AssemblyVersion>
     <RepositoryUrl>https://github.com/contentful/contentful.net</RepositoryUrl>
-    <FileVersion>6.0.12.0</FileVersion>
+    <FileVersion>6.0.13.0</FileVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <DocumentationFile>bin\Release\netstandard1.5\Contentful.AspNetCore.xml</DocumentationFile>
@@ -25,7 +25,7 @@
     <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="contentful.csharp" Version="6.0.12" />
+    <PackageReference Include="contentful.csharp" Version="6.0.13" />
     <PackageReference Include="gitlink" Version="3.1.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>

diff --git a/Contentful.Core.Tests/Models/Rendering/HtmlRenderTests.cs b/Contentful.Core.Tests/Models/Rendering/HtmlRenderTests.cs
@@ -141,5 +141,26 @@ public async Task ListItemRendererShouldRespectRendererOptions(bool omitParagrap
             //Assert
             Assert.Equal(expectedResult, result);
         }
+
+        [Fact]
+        public void AssetShouldRenderEmptyLinkWithNoFile()
+        {
+            //Arrange
+            var renderer = new AssetRenderer(null);
+            var assetStructure = new AssetStructure
+            {
+                Content = new List<IContent>(),
+                Data = new AssetStructureData
+                {
+                    Target = new Asset()
+                },
+                NodeType = ""
+            };
+
+            //Act
+            var html = renderer.Render(assetStructure);
+            //Assert
+            Assert.Equal("<a></a>", html);
+        }
     }
 }
diff --git a/Contentful.Core/Contentful.Core.csproj b/Contentful.Core/Contentful.Core.csproj
@@ -18,9 +18,9 @@
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <AssemblyVersion>6.0.12.0</AssemblyVersion>
-    <FileVersion>6.0.12.0</FileVersion>
-    <Version>6.0.12</Version>
+    <AssemblyVersion>6.0.13.0</AssemblyVersion>
+    <FileVersion>6.0.13.0</FileVersion>
+    <Version>6.0.13</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="gitlink" Version="3.1.0">

diff --git a/Contentful.Core/Models/Authoring.cs b/Contentful.Core/Models/Authoring.cs
@@ -643,7 +643,8 @@ public string Render(IContent content)
                 sb.Append($"<img src=\"{asset.File.Url}\" alt=\"{asset.Title}\" />");
             }else
             {
-                sb.Append($"<a href=\"{asset.File.Url}\">");
+                var url = asset.File?.Url;
+                sb.Append(string.IsNullOrEmpty(url)? "<a>" : $"<a href=\"{asset.File.Url}\">");
 
                 if (assetStructure.Content != null && assetStructure.Content.Any())
                 {