Merge branch 'v13/dev' into contrib

Author: nul800sebastiaan

src/Umbraco.Cms.Api.Delivery/DependencyInjection/UmbracoBuilderExtensions.cs

@@ -15,6 +15,7 @@
 using Umbraco.Cms.Api.Delivery.Routing;
 using Umbraco.Cms.Api.Delivery.Security;
 using Umbraco.Cms.Api.Delivery.Services;
+using Umbraco.Cms.Api.Delivery.Services.QueryBuilders;
 using Umbraco.Cms.Core;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.DeliveryApi;
@@ -55,6 +56,7 @@ public static IUmbracoBuilder AddDeliveryApi(this IUmbracoBuilder builder)
         builder.Services.AddSingleton<IApiAccessService, ApiAccessService>();
         builder.Services.AddSingleton<IApiContentQueryService, ApiContentQueryService>();
         builder.Services.AddSingleton<IApiContentQueryProvider, ApiContentQueryProvider>();
+        builder.Services.AddSingleton<IApiContentQueryFactory, ApiContentQueryFactory>();
         builder.Services.AddSingleton<IApiMediaQueryService, ApiMediaQueryService>();
         builder.Services.AddTransient<IMemberApplicationManager, MemberApplicationManager>();
         builder.Services.AddTransient<IRequestMemberAccessService, RequestMemberAccessService>();

src/Umbraco.Cms.Api.Delivery/Services/ApiContentQueryProvider.cs

@@ -1,4 +1,4 @@
-using Examine;
+using Examine;
 using Examine.Search;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
@@ -27,6 +27,7 @@ internal sealed class ApiContentQueryProvider : IApiContentQueryProvider
     public ApiContentQueryProvider(
         IExamineManager examineManager,
         ContentIndexHandlerCollection indexHandlers,
+        IApiContentQueryFactory apiContentQueryFactory,
         IOptions<DeliveryApiSettings> deliveryApiSettings,
         ILogger<ApiContentQueryProvider> logger)
     {
@@ -41,7 +42,7 @@ public ApiContentQueryProvider(
 
         // for the time being we're going to keep these as internal implementation details.
         // perhaps later on it will make sense to expose them through the DI.
-        _selectorBuilder = new ApiContentQuerySelectorBuilder(deliveryApiSettings.Value);
+        _selectorBuilder = new ApiContentQuerySelectorBuilder(deliveryApiSettings.Value, apiContentQueryFactory);
         _filterBuilder = new ApiContentQueryFilterBuilder(fieldTypes, _logger);
         _sortBuilder = new ApiContentQuerySortBuilder(fieldTypes, _logger);
 

src/Umbraco.Cms.Api.Delivery/Services/QueryBuilders/ApiContentQueryFactory.cs

@@ -0,0 +1,26 @@
+using Examine;
+using Examine.Lucene.Providers;
+using Examine.Lucene.Search;
+using Examine.Search;
+using Umbraco.Cms.Infrastructure.Examine;
+
+namespace Umbraco.Cms.Api.Delivery.Services.QueryBuilders
+{
+    internal sealed class ApiContentQueryFactory : IApiContentQueryFactory
+    {
+        /// <inheritdoc/>
+        public IQuery CreateApiContentQuery(IIndex index)
+        {
+            // Needed for enabling leading wildcards searches
+            BaseLuceneSearcher searcher = index.Searcher as BaseLuceneSearcher ?? throw new InvalidOperationException($"Index searcher must be of type {nameof(BaseLuceneSearcher)}.");
+
+            IQuery query = searcher.CreateQuery(
+                IndexTypes.Content,
+                BooleanOperation.And,
+                searcher.LuceneAnalyzer,
+                new LuceneSearchOptions { AllowLeadingWildcard = true });
+
+            return query;
+        }
+    }
+}

src/Umbraco.Cms.Api.Delivery/Services/QueryBuilders/ApiContentQuerySelectorBuilder.cs

@@ -1,6 +1,4 @@
 using Examine;
-using Examine.Lucene.Providers;
-using Examine.Lucene.Search;
 using Examine.Search;
 using Umbraco.Cms.Core.Configuration.Models;
 using Umbraco.Cms.Core.DeliveryApi;
@@ -13,11 +11,15 @@ namespace Umbraco.Cms.Api.Delivery.Services.QueryBuilders;
 internal sealed class ApiContentQuerySelectorBuilder
 {
     private readonly DeliveryApiSettings _deliveryApiSettings;
+    private readonly IApiContentQueryFactory _queryFactory;
     private readonly string _fallbackGuidValue;
 
-    public ApiContentQuerySelectorBuilder(DeliveryApiSettings deliveryApiSettings)
+    public ApiContentQuerySelectorBuilder(
+        DeliveryApiSettings deliveryApiSettings,
+        IApiContentQueryFactory queryFactory)
     {
         _deliveryApiSettings = deliveryApiSettings;
+        _queryFactory = queryFactory;
 
         // A fallback value is needed for Examine queries in case we don't have a value - we can't pass null or empty string
         // It is set to a random guid since this would be highly unlikely to yield any results
@@ -26,14 +28,7 @@ public ApiContentQuerySelectorBuilder(DeliveryApiSettings deliveryApiSettings)
 
     public IBooleanOperation Build(SelectorOption selectorOption, IIndex index, string culture, ProtectedAccess protectedAccess, bool preview)
     {
-        // Needed for enabling leading wildcards searches
-        BaseLuceneSearcher searcher = index.Searcher as BaseLuceneSearcher ?? throw new InvalidOperationException($"Index searcher must be of type {nameof(BaseLuceneSearcher)}.");
-
-        IQuery query = searcher.CreateQuery(
-            IndexTypes.Content,
-            BooleanOperation.And,
-            searcher.LuceneAnalyzer,
-            new LuceneSearchOptions { AllowLeadingWildcard = true });
+        IQuery query = _queryFactory.CreateApiContentQuery(index);
 
         IBooleanOperation selectorOperation = selectorOption.Values.Length == 1
             ? query.Field(selectorOption.FieldName, selectorOption.Values.First())

src/Umbraco.Cms.Api.Delivery/Services/QueryBuilders/IApiContentQueryFactory.cs

@@ -0,0 +1,18 @@
+using Examine;
+using Examine.Search;
+
+namespace Umbraco.Cms.Api.Delivery.Services.QueryBuilders
+{
+    /// <summary>
+    /// Used to create an <see cref="IQuery"/> instance for content items for the content delivery api.
+    /// </summary>
+    public interface IApiContentQueryFactory
+    {
+        /// <summary>
+        /// Creates an <see cref="IQuery"/> for content items for the content delivery api.
+        /// </summary>
+        /// <param name="index">The <see cref="IIndex"/>.</param>
+        /// <returns>An <see cref="IQuery"/> instance.</returns>
+        IQuery CreateApiContentQuery(IIndex index);
+    }
+}

src/Umbraco.Core/Configuration/Models/RichTextEditorSettings.cs

@@ -146,6 +146,11 @@ public class RichTextEditorSettings
     [DefaultValue(StaticInvalidElements)]
     public string InvalidElements { get; set; } = StaticInvalidElements;
 
+    /// <summary>
+    ///     Cloud API Key for TinyMCE. This is required to use TinyMCE premium plugins.
+    /// </summary>
+    public string? CloudApiKey { get; set; }
+
     public class RichTextEditorCommand
     {
         [Required]

src/Umbraco.Core/Models/ContentEditing/RichTextEditorConfiguration.cs

@@ -19,4 +19,7 @@ public class RichTextEditorConfiguration
 
     [DataMember(Name = "customConfig")]
     public IDictionary<string, string>? CustomConfig { get; set; }
+
+    [DataMember(Name = "cloudApiKey")]
+    public string? CloudApiKey { get; set; }
 }

src/Umbraco.Web.BackOffice/PropertyEditors/RichTextPreValueController.cs

@@ -30,7 +30,8 @@ public RichTextEditorConfiguration GetConfiguration()
                     new RichTextEditorCommand { Alias = x.Alias, Mode = x.Mode, Name = x.Name }),
             ValidElements = settings.ValidElements,
             InvalidElements = settings.InvalidElements,
-            CustomConfig = settings.CustomConfig
+            CustomConfig = settings.CustomConfig,
+            CloudApiKey = settings.CloudApiKey,
         };
 
         return config;

src/Umbraco.Web.UI.Client/package-lock.json

@@ -51,7 +51,7 @@
     "ng-file-upload": "12.2.13",
     "nouislider": "15.7.1",
     "spectrum-colorpicker2": "2.0.10",
-    "tinymce": "6.7.3",
+    "tinymce": "6.8.1",
     "typeahead.js": "0.11.1",
     "underscore": "1.13.6",
     "wicg-inert": "3.1.2"