Forward port of #19045 (Added custom RichTextRegexValidator to validate markup instead of JSON)

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

@@ -248,6 +248,10 @@
 
         builder.Services.AddSingleton<IRichTextRequiredValidator, RichTextRequiredValidator>();
 
+        // same as newing one up and required for the RichTextRegexValidator
+        builder.Services.AddTransient<RegexValidator>();
+        builder.Services.AddSingleton<IRichTextRegexValidator, RichTextRegexValidator>();
+
         return builder;
     }
 

src/Umbraco.Infrastructure/PropertyEditors/RichTextPropertyEditor.cs

@@ -1,4 +1,4 @@
 // Copyright (c) Umbraco.
 // See LICENSE for more details.
 
 using System.Diagnostics.CodeAnalysis;
@@ -93,6 +93,7 @@
         private readonly RichTextEditorPastedImages _pastedImages;
         private readonly IJsonSerializer _jsonSerializer;
         private readonly IRichTextRequiredValidator _richTextRequiredValidator;
+        private readonly IRichTextRegexValidator _richTextRegexValidator;
         private readonly ILogger<RichTextPropertyValueEditor> _logger;
 
         public RichTextPropertyValueEditor(
@@ -111,6 +112,7 @@
             IPropertyValidationService propertyValidationService,
             DataValueReferenceFactoryCollection dataValueReferenceFactoryCollection,
             IRichTextRequiredValidator richTextRequiredValidator,
+            IRichTextRegexValidator richTextRegexValidator,
             BlockEditorVarianceHandler blockEditorVarianceHandler,
             ILanguageService languageService,
             IIOHelper ioHelper)
@@ -122,6 +124,7 @@
             _pastedImages = pastedImages;
             _htmlSanitizer = htmlSanitizer;
             _richTextRequiredValidator = richTextRequiredValidator;
+            _richTextRegexValidator = richTextRegexValidator;
             _jsonSerializer = jsonSerializer;
             _logger = logger;
 
@@ -131,6 +134,8 @@
 
         public override IValueRequiredValidator RequiredValidator => _richTextRequiredValidator;
 
+        public override IValueFormatValidator FormatValidator => _richTextRegexValidator;
+
         protected override RichTextBlockValue CreateWithLayout(IEnumerable<RichTextBlockLayoutItem> layout) => new(layout);
 
         /// <inheritdoc />

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

@@ -0,0 +1,5 @@
+namespace Umbraco.Cms.Core.PropertyEditors.Validators;
+
+internal interface IRichTextRegexValidator : IValueFormatValidator
+{
+}

src/Umbraco.Infrastructure/PropertyEditors/Validators/RichTextRegexValidator.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 RichTextRegexValidator : IRichTextRegexValidator
+{
+    private readonly RegexValidator _regexValidator;
+    private readonly IJsonSerializer _jsonSerializer;
+    private readonly ILogger<RichTextRegexValidator> _logger;
+
+    public RichTextRegexValidator(
+        IJsonSerializer jsonSerializer,
+        ILogger<RichTextRegexValidator> logger,
+        RegexValidator regexValidator)
+    {
+        _jsonSerializer = jsonSerializer;
+        _logger = logger;
+        _regexValidator = regexValidator;
+    }
+
+    public IEnumerable<ValidationResult> ValidateFormat(object? value, string? valueType, string format) => _regexValidator.ValidateFormat(GetValue(value), valueType, format);
+
+    private object? GetValue(object? value) =>
+        RichTextPropertyEditorHelper.TryParseRichTextEditorValue(value, _jsonSerializer, _logger, out RichTextEditorValue? richTextEditorValue)
+            ? richTextEditorValue?.Markup
+            : value;
+}