From 1dd5fe3cbc0f5c798eae9e3a50c95d44a3e20c4f Mon Sep 17 00:00:00 2001
From: Kenn Jacobsen <kja@umbraco.dk>
Date: Thu, 24 Apr 2025 09:46:30 +0200
Subject: [PATCH] Ensure the default segment is always included in API
 responses (#19126)

---
 .../Mapping/Content/ContentMapDefinition.cs                    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Umbraco.Cms.Api.Management/Mapping/Content/ContentMapDefinition.cs b/src/Umbraco.Cms.Api.Management/Mapping/Content/ContentMapDefinition.cs
index 6970e7d251..3fd3fe6a7c 100644
--- a/src/Umbraco.Cms.Api.Management/Mapping/Content/ContentMapDefinition.cs
+++ b/src/Umbraco.Cms.Api.Management/Mapping/Content/ContentMapDefinition.cs
@@ -56,7 +56,8 @@ public abstract class ContentMapDefinition<TContent, TValueViewModel, TVariantVi
     {
         IPropertyValue[] propertyValues = source.Properties.SelectMany(propertyCollection => propertyCollection.Values).ToArray();
         var cultures = source.AvailableCultures.DefaultIfEmpty(null).ToArray();
-        var segments = propertyValues.Select(property => property.Segment).Distinct().DefaultIfEmpty(null).ToArray();
+        // the default segment (null) must always be included in the view model - both for variant and invariant documents
+        var segments = propertyValues.Select(property => property.Segment).Union([null]).Distinct().ToArray();
 
         return cultures
             .SelectMany(culture => segments.Select(segment =>