Do not allow editing read-only properties (#17915)

Author: kjac

src/Umbraco.Core/Services/ContentEditingServiceBase.cs

@@ -458,7 +458,8 @@ private void RemoveMissingProperties(ContentEditingModelBase contentEditingModel
         IDataValueEditor dataValueEditor = dataEditor.GetValueEditor();
         if (dataValueEditor.IsReadOnly)
         {
-            return null;
+            // read-only property editor - get and return the current value
+            return content.GetValue(propertyType.Alias, culture, segment);
         }
 
         IDataType? dataType = await _dataTypeService.GetAsync(propertyType.DataTypeKey);

tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEditingServiceTests.Update.cs

@@ -333,4 +333,95 @@ public async Task Cannot_Update_Variant_With_Incorrect_Culture_Casing()
         Assert.IsFalse(result.Success);
         Assert.AreEqual(ContentEditingOperationStatus.InvalidCulture, result.Status);
     }
+
+    [Test]
+    public async Task Cannot_Update_Invariant_Readonly_Property_Value()
+    {
+        var content = await CreateInvariantContent();
+        content.SetValue("label", "The initial label value");
+        ContentService.Save(content);
+
+        var updateModel = new ContentUpdateModel
+        {
+            InvariantName = "Updated Name",
+            InvariantProperties = new[]
+            {
+                new PropertyValueModel { Alias = "label", Value = "The updated label value" }
+            }
+        };
+
+        var result = await ContentEditingService.UpdateAsync(content.Key, updateModel, Constants.Security.SuperUserKey);
+        Assert.Multiple(() =>
+        {
+            Assert.IsTrue(result.Success);
+            Assert.AreEqual(ContentEditingOperationStatus.Success, result.Status);
+            Assert.IsNotNull(result.Result.Content);
+        });
+
+        // re-get and validate
+        content = await ContentEditingService.GetAsync(content.Key);
+        Assert.IsNotNull(content);
+        Assert.Multiple(() =>
+        {
+            Assert.AreEqual("Updated Name", content.Name);
+            Assert.AreEqual("The initial label value", content.GetValue<string>("label"));
+        });
+    }
+
+    [Test]
+    public async Task Cannot_Update_Variant_Readonly_Property_Value()
+    {
+        var content = await CreateVariantContent();
+        content.SetValue("variantLabel", "The initial English label value", "en-US");
+        content.SetValue("variantLabel", "The initial Danish label value", "da-DK");
+        ContentService.Save(content);
+
+        var updateModel = new ContentUpdateModel
+        {
+            InvariantProperties = new[]
+            {
+                new PropertyValueModel { Alias = "invariantTitle", Value = "The updated invariant title" }
+            },
+            Variants = new []
+            {
+                new VariantModel
+                {
+                    Culture = "en-US",
+                    Name = "Updated English Name",
+                    Properties = new []
+                    {
+                        new PropertyValueModel { Alias = "variantLabel", Value = "The updated English label value" }
+                    }
+                },
+                new VariantModel
+                {
+                    Culture = "da-DK",
+                    Name = "Updated Danish Name",
+                    Properties = new []
+                    {
+                        new PropertyValueModel { Alias = "variantLabel", Value = "The updated Danish  label value" }
+                    }
+                }
+            }
+        };
+
+        var result = await ContentEditingService.UpdateAsync(content.Key, updateModel, Constants.Security.SuperUserKey);
+        Assert.Multiple(() =>
+        {
+            Assert.IsTrue(result.Success);
+            Assert.AreEqual(ContentEditingOperationStatus.Success, result.Status);
+            Assert.IsNotNull(result.Result.Content);
+        });
+
+        // re-get and validate
+        content = await ContentEditingService.GetAsync(content.Key);
+        Assert.IsNotNull(content);
+        Assert.Multiple(() =>
+        {
+            Assert.AreEqual("Updated English Name", content.GetCultureName("en-US"));
+            Assert.AreEqual("Updated Danish Name", content.GetCultureName("da-DK"));
+            Assert.AreEqual("The initial English label value", content.GetValue<string>("variantLabel", "en-US"));
+            Assert.AreEqual("The initial Danish label value", content.GetValue<string>("variantLabel", "da-DK"));
+        });
+    }
 }

tests/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/ContentEditingServiceTestsBase.cs

@@ -38,6 +38,13 @@ protected IContentType CreateInvariantContentType(params ITemplate[] templates)
             .WithAlias("text")
             .WithName("Text")
             .WithVariations(ContentVariation.Nothing)
+            .Done()
+            .AddPropertyType()
+            .WithAlias("label")
+            .WithName("Label")
+            .WithDataTypeId(Constants.DataTypes.LabelString)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
+            .WithVariations(ContentVariation.Nothing)
             .Done();
 
         foreach (var template in templates)
@@ -83,6 +90,13 @@ protected async Task<IContentType> CreateVariantContentType()
             .WithName("Invariant Title")
             .WithVariations(ContentVariation.Nothing)
             .Done()
+            .AddPropertyType()
+            .WithAlias("variantLabel")
+            .WithName("Variant Label")
+            .WithDataTypeId(Constants.DataTypes.LabelString)
+            .WithPropertyEditorAlias(Constants.PropertyEditors.Aliases.Label)
+            .WithVariations(ContentVariation.Culture)
+            .Done()
             .Build();
         contentType.AllowedAsRoot = true;
         ContentTypeService.Save(contentType);