Merge remote-tracking branch 'origin/v12/dev' into v14/dev

src/Umbraco.Core/Constants-Telemetry.cs

@@ -29,5 +29,6 @@ public static partial class Constants
         public static string DatabaseProvider = "DatabaseProvider";
         public static string CurrentServerRole = "CurrentServerRole";
         public static string RuntimeMode = "RuntimeMode";
+        public static string BackofficeExternalLoginProviderCount = "BackofficeExternalLoginProviderCount";
     }
 }

src/Umbraco.Core/EmbeddedResources/Lang/en_us.xml

@@ -3010,7 +3010,7 @@ To manage your website, simply open the Umbraco backoffice and start adding cont
           We will send:
           <ul>
             <li>Anonymized site ID, Umbraco version, and packages installed.</li>
-            <li>Number of: Root nodes, Content nodes, Macros, Media, Document Types, Templates, Languages, Domains, User Group, Users, Members, and Property Editors in use.</li>
+            <li>Number of: Root nodes, Content nodes, Macros, Media, Document Types, Templates, Languages, Domains, User Group, Users, Members, Backoffice external login providers, and Property Editors in use.</li>
             <li>System information: Webserver, server OS, server framework, server OS language, and database provider.</li>
             <li>Configuration settings: Modelsbuilder mode, if custom Umbraco path exists, ASP environment, and if you are in debug mode.</li>
           </ul>

src/Umbraco.Core/PropertyEditors/DefaultPropertyIndexValueFactory.cs

@@ -10,10 +10,14 @@ namespace Umbraco.Cms.Core.PropertyEditors;
 public class DefaultPropertyIndexValueFactory : IPropertyIndexValueFactory
 {
     /// <inheritdoc />
-    public IEnumerable<KeyValuePair<string, IEnumerable<object?>>> GetIndexValues(IProperty property, string? culture, string? segment, bool published)
+    public IEnumerable<KeyValuePair<string, IEnumerable<object?>>> GetIndexValues(IProperty property, string? culture, string? segment, bool published, IEnumerable<string> availableCultures)
     {
         yield return new KeyValuePair<string, IEnumerable<object?>>(
             property.Alias,
             property.GetValue(culture, segment, published).Yield());
     }
+
+    [Obsolete("Use the overload with the availableCultures parameter instead, scheduled for removal in v14")]
+    public IEnumerable<KeyValuePair<string, IEnumerable<object?>>> GetIndexValues(IProperty property, string? culture, string? segment, bool published)
+        => GetIndexValues(property, culture, segment, published, Enumerable.Empty<string>());
 }

src/Umbraco.Core/PropertyEditors/IPropertyIndexValueFactory.cs

@@ -22,5 +22,9 @@ public interface IPropertyIndexValueFactory
     ///         more than one value for a given field.
     ///     </para>
     /// </remarks>
+    IEnumerable<KeyValuePair<string, IEnumerable<object?>>> GetIndexValues(IProperty property, string? culture, string? segment, bool published, IEnumerable<string> availableCultures)
+        => GetIndexValues(property, culture, segment, published);
+
+    [Obsolete("Use the overload with the availableCultures parameter instead, scheduled for removal in v14")]
     IEnumerable<KeyValuePair<string, IEnumerable<object?>>> GetIndexValues(IProperty property, string? culture, string? segment, bool published);
 }

src/Umbraco.Core/PropertyEditors/JsonPropertyIndexValueFactoryBase.cs

@@ -25,7 +25,8 @@ public abstract class JsonPropertyIndexValueFactoryBase<TSerialized> : IProperty
         IProperty property,
         string? culture,
         string? segment,
-        bool published)
+        bool published,
+        IEnumerable<string> availableCultures)
     {
         var result = new List<KeyValuePair<string, IEnumerable<object?>>>();
 
@@ -43,7 +44,7 @@ public abstract class JsonPropertyIndexValueFactoryBase<TSerialized> : IProperty
                     return result;
                 }
 
-                result.AddRange(Handle(deserializedPropertyValue, property, culture, segment, published));
+                result.AddRange(Handle(deserializedPropertyValue, property, culture, segment, published, availableCultures));
             }
             catch (InvalidCastException)
             {
@@ -62,6 +63,10 @@ public abstract class JsonPropertyIndexValueFactoryBase<TSerialized> : IProperty
         return result;
     }
 
+    [Obsolete("Use method overload that has availableCultures, scheduled for removal in v14")]
+    public IEnumerable<KeyValuePair<string, IEnumerable<object?>>> GetIndexValues(IProperty property, string? culture, string? segment, bool published)
+        => GetIndexValues(property, culture, segment, published, Enumerable.Empty<string>());
+
     /// <summary>
     ///  Method to return a list of resume of the content. By default this returns an empty list
     /// </summary>
@@ -75,10 +80,23 @@ public abstract class JsonPropertyIndexValueFactoryBase<TSerialized> : IProperty
     /// <summary>
     ///  Method that handle the deserialized object.
     /// </summary>
+    [Obsolete("Use the overload with the availableCultures parameter instead, scheduled for removal in v14")]
     protected abstract IEnumerable<KeyValuePair<string, IEnumerable<object?>>> Handle(
         TSerialized deserializedPropertyValue,
         IProperty property,
         string? culture,
         string? segment,
         bool published);
+
+    /// <summary>
+    ///  Method that handle the deserialized object.
+    /// </summary>
+    protected virtual IEnumerable<KeyValuePair<string, IEnumerable<object?>>> Handle(
+        TSerialized deserializedPropertyValue,
+        IProperty property,
+        string? culture,
+        string? segment,
+        bool published,
+        IEnumerable<string> availableCultures) =>
+        Handle(deserializedPropertyValue, property, culture, segment, published);
 }

src/Umbraco.Core/PropertyEditors/NoopPropertyIndexValueFactory.cs

@@ -8,5 +8,9 @@ namespace Umbraco.Cms.Core.PropertyEditors;
 public class NoopPropertyIndexValueFactory : IPropertyIndexValueFactory
 {
     /// <inheritdoc />
-    public IEnumerable<KeyValuePair<string, IEnumerable<object?>>> GetIndexValues(IProperty property, string? culture, string? segment, bool published) => Array.Empty<KeyValuePair<string, IEnumerable<object?>>>();
+    public IEnumerable<KeyValuePair<string, IEnumerable<object?>>> GetIndexValues(IProperty property, string? culture, string? segment, bool published, IEnumerable<string> availableCultures) => Array.Empty<KeyValuePair<string, IEnumerable<object?>>>();
+
+    [Obsolete("Use the overload with the availableCultures parameter instead, scheduled for removal in v14")]
+    public IEnumerable<KeyValuePair<string, IEnumerable<object?>>> GetIndexValues(IProperty property, string? culture, string? segment, bool published)
+        => GetIndexValues(property, culture, segment, published);
 }

src/Umbraco.Core/PropertyEditors/TagPropertyIndexValueFactory.cs

@@ -9,6 +9,18 @@ public class TagPropertyIndexValueFactory : JsonPropertyIndexValueFactoryBase<st
     {
     }
 
+    protected override IEnumerable<KeyValuePair<string, IEnumerable<object?>>> Handle(
+        string[] deserializedPropertyValue,
+        IProperty property,
+        string? culture,
+        string? segment,
+        bool published,
+        IEnumerable<string> availableCultures)
+    {
+        yield return new KeyValuePair<string, IEnumerable<object?>>(property.Alias, deserializedPropertyValue);
+    }
+
+    [Obsolete("Use the overload that specifies availableCultures, scheduled for removal in v14")]
     protected override IEnumerable<KeyValuePair<string, IEnumerable<object?>>> Handle(
         string[] deserializedPropertyValue,
         IProperty property,