From 8d9822ea706bfc8eb9961324557ccd5ebb5bb5c0 Mon Sep 17 00:00:00 2001
From: kjac <kja@umbraco.dk>
Date: Mon, 31 Mar 2025 07:06:23 +0200
Subject: [PATCH] Fix mapping errors for invariant editing

---
 src/Umbraco.Core/Services/ContentEditingServiceBase.cs |  4 ++--
 .../Services/ContentEditingServiceTests.Create.cs      | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/src/Umbraco.Core/Services/ContentEditingServiceBase.cs b/src/Umbraco.Core/Services/ContentEditingServiceBase.cs
index 96874fb677..0907e82769 100644
--- a/src/Umbraco.Core/Services/ContentEditingServiceBase.cs
+++ b/src/Umbraco.Core/Services/ContentEditingServiceBase.cs
@@ -318,9 +318,9 @@ internal abstract class ContentEditingServiceBase<TContent, TContentType, TConte
             return null;
         }
 
-        if (contentType.VariesByNothing() && (contentEditingModelBase.InvariantName.IsNullOrWhiteSpace() || contentEditingModelBase.Variants.Any()))
+        if (contentType.VariesByNothing() && contentEditingModelBase.InvariantName.IsNullOrWhiteSpace())
         {
-            // either missing the invariant name or has one more variants = invalid
+            // does not vary by anything and is missing the invariant name = invalid
             operationStatus = ContentEditingOperationStatus.ContentTypeCultureVarianceMismatch;
             return null;
         }
diff --git a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEditingServiceTests.Create.cs b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEditingServiceTests.Create.cs
index 673b70e912..01773bb828 100644
--- a/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEditingServiceTests.Create.cs
+++ b/tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEditingServiceTests.Create.cs
@@ -370,8 +370,9 @@ public partial class ContentEditingServiceTests
         Assert.IsNull(result.Result.Content);
     }
 
-    [Test]
-    public async Task Cannot_Create_With_Variant_Property_Value_For_Invariant_Content()
+    [TestCase(ContentVariation.Culture)]
+    [TestCase(ContentVariation.Segment)]
+    public async Task Cannot_Create_With_Variant_Property_Value_For_Invariant_Content(ContentVariation contentVariation)
     {
         var contentType = ContentTypeBuilder.CreateContentMetaContentType();
         contentType.AllowedTemplates = null;
@@ -391,7 +392,8 @@ public partial class ContentEditingServiceTests
             {
                 new VariantModel
                 {
-                    Culture = "en-US",
+                    Culture = contentVariation is ContentVariation.Culture ? "en-US" : null,
+                    Segment = contentVariation is ContentVariation.Segment ? "segment" : null,
                     Name = "The English Name",
                     Properties = new []
                     {
@@ -403,7 +405,7 @@ public partial class ContentEditingServiceTests
 
         var result = await ContentEditingService.CreateAsync(createModel, Constants.Security.SuperUserKey);
         Assert.IsFalse(result.Success);
-        Assert.AreEqual(ContentEditingOperationStatus.ContentTypeCultureVarianceMismatch, result.Status);
+        Assert.AreEqual(ContentEditingOperationStatus.PropertyTypeNotFound, result.Status);
         Assert.IsNotNull(result.Result);
         Assert.IsNull(result.Result.Content);
     }