Fix mandatory RTE validation

src/Umbraco.Core/PropertyEditors/Validators/RequiredValidator.cs

@@ -7,7 +7,7 @@ namespace Umbraco.Cms.Core.PropertyEditors.Validators;
 /// <summary>
 ///     A validator that validates that the value is not null or empty (if it is a string)
 /// </summary>
-public sealed class RequiredValidator : IValueRequiredValidator, IManifestValueValidator
+public class RequiredValidator : IValueRequiredValidator, IManifestValueValidator
 {
     private const string ValueCannotBeNull = "Value cannot be null";
     private const string ValueCannotBeEmpty = "Value cannot be empty";
@@ -23,7 +23,7 @@ public IEnumerable<ValidationResult> Validate(object? value, string? valueType,
         ValidateRequired(value, valueType);
 
     /// <inheritdoc cref="IValueRequiredValidator.ValidateRequired" />
-    public IEnumerable<ValidationResult> ValidateRequired(object? value, string? valueType)
+    public virtual IEnumerable<ValidationResult> ValidateRequired(object? value, string? valueType)
     {
         if (value == null)
         {

src/Umbraco.Infrastructure/DependencyInjection/UmbracoBuilder.CoreServices.cs

@@ -28,6 +28,7 @@
 using Umbraco.Cms.Core.Notifications;
 using Umbraco.Cms.Core.Packaging;
 using Umbraco.Cms.Core.PropertyEditors;
+using Umbraco.Cms.Core.PropertyEditors.Validators;
 using Umbraco.Cms.Core.PropertyEditors.ValueConverters;
 using Umbraco.Cms.Core.PublishedCache;
 using Umbraco.Cms.Core.Routing;
@@ -238,6 +239,8 @@ public static IUmbracoBuilder AddCoreInitialServices(this IUmbracoBuilder builde
 
         builder.Services.AddSingleton<IBlockEditorElementTypeCache, BlockEditorElementTypeCache>();
 
+        builder.Services.AddSingleton<IRichTextRequiredValidator, RichTextRequiredValidator>();
+
         return builder;
     }
 

src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs

@@ -12,6 +12,7 @@
 using Umbraco.Cms.Core.Models;
 using Umbraco.Cms.Core.Models.Blocks;
 using Umbraco.Cms.Core.Models.Editors;
+using Umbraco.Cms.Core.PropertyEditors.Validators;
 using Umbraco.Cms.Core.Security;
 using Umbraco.Cms.Core.Serialization;
 using Umbraco.Cms.Core.Services;
@@ -166,15 +167,18 @@ protected override IConfigurationEditor CreateConfigurationEditor() =>
     internal class RichTextPropertyValueEditor : BlockValuePropertyValueEditorBase
     {
         private readonly IBackOfficeSecurityAccessor _backOfficeSecurityAccessor;
+        private readonly ILocalizedTextService _localizedTextService;
         private readonly IHtmlSanitizer _htmlSanitizer;
         private readonly HtmlImageSourceParser _imageSourceParser;
         private readonly HtmlLocalLinkParser _localLinkParser;
         private readonly IHtmlMacroParameterParser _macroParameterParser;
         private readonly RichTextEditorPastedImages _pastedImages;
         private readonly IJsonSerializer _jsonSerializer;
         private readonly IBlockEditorElementTypeCache _elementTypeCache;
+        private readonly IRichTextRequiredValidator _richTextRequiredValidator;
         private readonly ILogger<RichTextPropertyValueEditor> _logger;
 
+        [Obsolete("Use non-obsolete constructor. This is schedules for removal in v16.")]
         public RichTextPropertyValueEditor(
             DataEditorAttribute attribute,
             PropertyEditorCollection propertyEditors,
@@ -193,21 +197,66 @@ public RichTextPropertyValueEditor(
             IBlockEditorElementTypeCache elementTypeCache,
             IPropertyValidationService propertyValidationService,
             DataValueReferenceFactoryCollection dataValueReferenceFactoryCollection)
+            : this(
+                attribute,
+                propertyEditors,
+                dataTypeReadCache,
+                logger,
+                backOfficeSecurityAccessor,
+                localizedTextService,
+                shortStringHelper,
+                imageSourceParser,
+                localLinkParser,
+                pastedImages,
+                jsonSerializer,
+                ioHelper,
+                htmlSanitizer,
+                macroParameterParser,
+                elementTypeCache,
+                propertyValidationService,
+                dataValueReferenceFactoryCollection,
+                StaticServiceProvider.Instance.GetRequiredService<IRichTextRequiredValidator>())
+        {
+
+        }
+        public RichTextPropertyValueEditor(
+            DataEditorAttribute attribute,
+            PropertyEditorCollection propertyEditors,
+            IDataTypeConfigurationCache dataTypeReadCache,
+            ILogger<RichTextPropertyValueEditor> logger,
+            IBackOfficeSecurityAccessor backOfficeSecurityAccessor,
+            ILocalizedTextService localizedTextService,
+            IShortStringHelper shortStringHelper,
+            HtmlImageSourceParser imageSourceParser,
+            HtmlLocalLinkParser localLinkParser,
+            RichTextEditorPastedImages pastedImages,
+            IJsonSerializer jsonSerializer,
+            IIOHelper ioHelper,
+            IHtmlSanitizer htmlSanitizer,
+            IHtmlMacroParameterParser macroParameterParser,
+            IBlockEditorElementTypeCache elementTypeCache,
+            IPropertyValidationService propertyValidationService,
+            DataValueReferenceFactoryCollection dataValueReferenceFactoryCollection,
+            IRichTextRequiredValidator richTextRequiredValidator)
             : base(attribute, propertyEditors, dataTypeReadCache, localizedTextService, logger, shortStringHelper, jsonSerializer, ioHelper, dataValueReferenceFactoryCollection)
         {
             _backOfficeSecurityAccessor = backOfficeSecurityAccessor;
+            _localizedTextService = localizedTextService;
             _imageSourceParser = imageSourceParser;
             _localLinkParser = localLinkParser;
             _pastedImages = pastedImages;
             _htmlSanitizer = htmlSanitizer;
             _macroParameterParser = macroParameterParser;
             _elementTypeCache = elementTypeCache;
+            _richTextRequiredValidator = richTextRequiredValidator;
             _jsonSerializer = jsonSerializer;
             _logger = logger;
 
             Validators.Add(new RichTextEditorBlockValidator(propertyValidationService, CreateBlockEditorValues(), elementTypeCache, jsonSerializer, logger));
         }
 
+        public override IValueRequiredValidator RequiredValidator => _richTextRequiredValidator;
+
         /// <inheritdoc />
         public override object? Configuration
         {

src/Umbraco.Infrastructure/PropertyEditors/Validators/IRichTextRequiredValidator.cs

@@ -0,0 +1,7 @@
+using Umbraco.Cms.Core.PropertyEditors;
+
+namespace Umbraco.Cms.Core.PropertyEditors.Validators;
+
+internal interface IRichTextRequiredValidator : IValueRequiredValidator
+{
+}

src/Umbraco.Infrastructure/PropertyEditors/Validators/RichTextRequiredValidator.cs

@@ -0,0 +1,30 @@
+using System.ComponentModel.DataAnnotations;
+using Microsoft.Extensions.Logging;
+using Umbraco.Cms.Core.Serialization;
+using Umbraco.Cms.Core.Services;
+
+namespace Umbraco.Cms.Core.PropertyEditors.Validators;
+
+internal class RichTextRequiredValidator : RequiredValidator, IRichTextRequiredValidator
+{
+    private readonly IJsonSerializer _jsonSerializer;
+    private readonly ILogger<RichTextRequiredValidator> _logger;
+
+    public RichTextRequiredValidator(ILocalizedTextService textService, IJsonSerializer jsonSerializer, ILogger<RichTextRequiredValidator> logger) : base(textService)
+    {
+        _jsonSerializer = jsonSerializer;
+        _logger = logger;
+    }
+
+    public override IEnumerable<ValidationResult> ValidateRequired(object? value, string? valueType) => base.ValidateRequired(GetValue(value), valueType);
+
+    private object? GetValue(object? value)
+    {
+        if(RichTextPropertyEditorHelper.TryParseRichTextEditorValue(value, _jsonSerializer, _logger, out RichTextEditorValue? richTextEditorValue))
+        {
+            return richTextEditorValue?.Markup;
+        }
+
+        return value;
+    }
+}