Merge branch 'main' into hishamco/data-context-const

Author: hishamco

.all-contributorsrc

@@ -3538,6 +3538,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "ahlxjg",
+      "name": "Jack Liu",
+      "avatar_url": "https://avatars.githubusercontent.com/u/28708286?v=4",
+      "profile": "https://github.com/ahlxjg",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "skipCi": true,

.github/workflows/community_metrics.yml

@@ -30,7 +30,7 @@ jobs:
         Write-Output "LAST_MONTH=$firstDay..$lastDay" >> $env:GITHUB_ENV
 
     - name: Compute Issue Metrics
-      uses: github/issue-metrics@6a35322ff89cee3e1a594d282c27eb34bffa9174 # v4.1.1
+      uses: github/issue-metrics@326551a377784dd5dd766944c9a87289550e7eb5 # v4.1.2
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SEARCH_QUERY: 'repo:OrchardCMS/OrchardCore is:issue created:${{ env.LAST_MONTH }} -reason:"not planned" -label:"community metrics"'
@@ -43,7 +43,7 @@ jobs:
         Add-Content -Path ./community_metrics.md -Value (Get-Content -Path ./issue_metrics.md -Raw)
 
     - name: Compute Pull Request Metrics
-      uses: github/issue-metrics@6a35322ff89cee3e1a594d282c27eb34bffa9174 # v4.1.1
+      uses: github/issue-metrics@326551a377784dd5dd766944c9a87289550e7eb5 # v4.1.2
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SEARCH_QUERY: 'repo:OrchardCMS/OrchardCore is:pr created:${{ env.LAST_MONTH }} -label:dontmerge -label:notready -is:draft'
@@ -56,7 +56,7 @@ jobs:
         Add-Content -Path ./community_metrics.md -Value ([Environment]::NewLine + $content)
 
     - name: Compute Q&A Discussion Request Metrics
-      uses: github/issue-metrics@6a35322ff89cee3e1a594d282c27eb34bffa9174 # v4.1.1
+      uses: github/issue-metrics@326551a377784dd5dd766944c9a87289550e7eb5 # v4.1.2
       env:
         GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         SEARCH_QUERY: 'repo:OrchardCMS/OrchardCore type:discussions created:${{ env.LAST_MONTH }} category:Q&A'

.github/workflows/preview_ci.yml

@@ -77,6 +77,6 @@ jobs:
         Get-ChildItem ./src/OrchardCore.Cms.Web/App_Data -Recurse | Remove-Item -Recurse -Confirm:$false
         Get-ChildItem ./src/OrchardCore.Cms.Web/App_Data_Tests -Recurse | Remove-Item -Recurse -Confirm:$false
         $output = [System.IO.Path]::GetFullPath("./.build/release")
-        dotnet publish -c Release --property:PublishDir=$output --no-build --framework net10.0
+        dotnet publish src/OrchardCore.Cms.Web/OrchardCore.Cms.Web.csproj -c Release --property:PublishDir=$output --no-build --framework net10.0
         docker buildx build -f Dockerfile-CI --platform=linux/amd64 -t orchardproject/orchardcore-cms-linux:dev --push .
         docker buildx build -f Dockerfile-CI --platform=windows/amd64 -t orchardproject/orchardcore-cms-windows:dev --push .

.github/workflows/release_ci.yml

@@ -79,6 +79,6 @@ jobs:
         Get-ChildItem ./src/OrchardCore.Cms.Web/App_Data -Recurse | Remove-Item -Recurse -Confirm:$false
         Get-ChildItem ./src/OrchardCore.Cms.Web/App_Data_Tests -Recurse | Remove-Item -Recurse -Confirm:$false
         $output = [System.IO.Path]::GetFullPath("./.build/release")
-        dotnet publish -c Release --property:PublishDir=$output --no-build --framework net10.0
+        dotnet publish src/OrchardCore.Cms.Web/OrchardCore.Cms.Web.csproj -c Release --property:PublishDir=$output --no-build --framework net10.0
         docker buildx build -f Dockerfile-CI --platform=linux/amd64 -t orchardproject/orchardcore-cms-linux:latest -t orchardproject/orchardcore-cms-linux:${{ steps.get_version.outputs.VERSION }} --push .
         docker buildx build -f Dockerfile-CI --platform=windows/amd64 -t orchardproject/orchardcore-cms-windows:latest -t orchardproject/orchardcore-cms-windows:${{ steps.get_version.outputs.VERSION }} --push .

.scripts/bloom/helpers/localizations.ts

@@ -0,0 +1,15 @@
+const translations: Record<string, string> = {};
+
+/**
+ * Returns the current translations record.
+ */
+export function getTranslations(): Record<string, string> {
+    return translations;
+}
+
+/**
+ * Merges the given translations into the store.
+ */
+export function setTranslations(t: Record<string, string>): void {
+    Object.assign(translations, t);
+}

Directory.Packages.props

@@ -5,8 +5,8 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="AngleSharp" Version="1.4.0" />
-    <PackageVersion Include="AWSSDK.S3" Version="4.0.19" />
-    <PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.3.25" />
+    <PackageVersion Include="AWSSDK.S3" Version="4.0.19.1" />
+    <PackageVersion Include="AWSSDK.Extensions.NETCore.Setup" Version="4.0.3.26" />
     <PackageVersion Include="Azure.Communication.Email" Version="1.1.0" />
     <PackageVersion Include="Azure.Communication.Sms" Version="1.0.2" />
     <PackageVersion Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.5.0" />
@@ -16,8 +16,8 @@
     <PackageVersion Include="Azure.Storage.Blobs" Version="12.27.0" />
     <PackageVersion Include="BenchmarkDotNet" Version="0.15.8" />
     <PackageVersion Include="Castle.Core" Version="5.2.1" />
-    <PackageVersion Include="DocumentFormat.OpenXml" Version="3.4.1" />
-    <PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.19.16" />
+    <PackageVersion Include="DocumentFormat.OpenXml" Version="3.5.1" />
+    <PackageVersion Include="Elastic.Clients.Elasticsearch" Version="8.19.17" />
     <PackageVersion Include="Fluid.Core" Version="2.31.0" />
     <PackageVersion Include="GraphQL" Version="8.8.4" />
     <PackageVersion Include="GraphQL.DataLoader" Version="8.8.4" />
@@ -38,7 +38,7 @@
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="5.3.0" />
     <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="5.3.0" />
     <PackageVersion Include="Microsoft.Extensions.Azure" Version="1.13.1" />
-    <PackageVersion Include="Microsoft.Identity.Web" Version="4.5.0" />
+    <PackageVersion Include="Microsoft.Identity.Web" Version="4.6.0" />
     <PackageVersion Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="8.16.0" />
     <PackageVersion Include="Microsoft.IO.RecyclableMemoryStream" Version="3.0.1" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.3.0" />
@@ -61,7 +61,7 @@
     <PackageVersion Include="SixLabors.ImageSharp.Web" Version="3.2.0" />
     <PackageVersion Include="SixLabors.ImageSharp.Web.Providers.Azure" Version="3.2.0" />
     <PackageVersion Include="SixLabors.ImageSharp.Web.Providers.AWS" Version="3.2.0" />
-    <PackageVersion Include="StackExchange.Redis" Version="2.12.1" />
+    <PackageVersion Include="StackExchange.Redis" Version="2.12.4" />
     <PackageVersion Include="StyleCop.Analyzers" Version="1.1.118" />
     <PackageVersion Include="xunit.v3.mtp-v2" Version="3.2.2" />
     <PackageVersion Include="YesSql" Version="5.4.7" />

mkdocs.yml

@@ -268,6 +268,7 @@ nav:
               - HTTPS: reference/modules/Https/README.md
               - Key Vault (Azure): reference/modules/KeyVault.Azure/README.md
               - Localization: reference/modules/Localize/README.md
+              - JavaScript Localization: reference/modules/Localize/javascript-localization.md
               - Data Localization: reference/modules/DataLocalization/README.md
               - Logging Serilog: reference/modules/Logging.Serilog/README.md
               - Mini Profiler: reference/modules/MiniProfiler/README.md

src/OrchardCore.Modules/OrchardCore.Alias/Services/AliasAlternatesFactory.cs

@@ -0,0 +1,40 @@
+using System.Collections.Concurrent;
+using OrchardCore.DisplayManagement.Utilities;
+
+namespace OrchardCore.Alias.Services;
+
+/// <summary>
+/// Provides cached alternate patterns for Content shapes with Alias.
+/// Alternates are computed once per unique alias and display type combination and cached for reuse.
+/// </summary>
+internal static class AliasAlternatesFactory
+{
+    private static readonly ConcurrentDictionary<AliasAlternatesCacheKey, string[]> _cache = new();
+
+    /// <summary>
+    /// Gets or creates cached alternates for a Content shape with Alias configuration.
+    /// </summary>
+    public static string[] GetAlternates(string alias, string displayType)
+    {
+        var key = new AliasAlternatesCacheKey(alias, displayType);
+        return _cache.GetOrAdd(key, BuildAlternates);
+    }
+
+    private static string[] BuildAlternates(AliasAlternatesCacheKey key)
+    {
+        var encodedAlias = key.Alias.EncodeAlternateElement();
+
+        return
+        [
+            // Content__Alias__[Alias] e.g. Content-Alias-example, Content-Alias-my-page
+            $"Content__Alias__{encodedAlias}",
+
+            // Content_[DisplayType]__Alias__[Alias] e.g. Content-Alias-example.Summary, Content-Alias-my-page.Summary
+            $"Content_{key.DisplayType}__Alias__{encodedAlias}"
+        ];
+    }
+
+    internal readonly record struct AliasAlternatesCacheKey(
+        string Alias,
+        string DisplayType);
+}

src/OrchardCore.Modules/OrchardCore.Alias/Services/ContentAliasShapeTableProvider.cs

@@ -20,13 +20,14 @@ public override ValueTask DiscoverAsync(ShapeTableBuilder builder)
 
                 if (aliasPart != null)
                 {
-                    var encodedAlias = aliasPart.Alias.EncodeAlternateElement();
+                    var displayType = displaying.Shape.Metadata.DisplayType;
 
-                    // Content__Alias__[Alias] e.g. Content-Alias-example, Content-Alias-my-page
-                    displaying.Shape.Metadata.Alternates.Add("Content__Alias__" + encodedAlias);
+                    // Get cached alternates and add them efficiently
+                    var cachedAlternates = AliasAlternatesFactory.GetAlternates(
+                        aliasPart.Alias,
+                        displayType);
 
-                    // Content_[DisplayType]__Alias__[Alias] e.g. Content-Alias-example.Summary, Content-Alias-my-page.Summary
-                    displaying.Shape.Metadata.Alternates.Add("Content_" + displaying.Shape.Metadata.DisplayType + "__Alias__" + encodedAlias);
+                    displaying.Shape.Metadata.Alternates.AddRange(cachedAlternates);
                 }
             });
 

src/OrchardCore.Modules/OrchardCore.Alias/Services/WidgetAliasAlternatesFactory.cs

@@ -0,0 +1,40 @@
+using System.Collections.Concurrent;
+using OrchardCore.DisplayManagement.Utilities;
+
+namespace OrchardCore.Alias.Services;
+
+/// <summary>
+/// Provides cached alternate patterns for Widget shapes with Alias.
+/// Alternates are computed once per unique alias and display type combination and cached for reuse.
+/// </summary>
+internal static class WidgetAliasAlternatesFactory
+{
+    private static readonly ConcurrentDictionary<WidgetAliasAlternatesCacheKey, string[]> _cache = new();
+
+    /// <summary>
+    /// Gets or creates cached alternates for a Widget shape with Alias configuration.
+    /// </summary>
+    public static string[] GetAlternates(string alias, string displayType)
+    {
+        var key = new WidgetAliasAlternatesCacheKey(alias, displayType);
+        return _cache.GetOrAdd(key, BuildAlternates);
+    }
+
+    private static string[] BuildAlternates(WidgetAliasAlternatesCacheKey key)
+    {
+        var encodedAlias = key.Alias.EncodeAlternateElement();
+
+        return
+        [
+            // Widget__Alias__[Alias] e.g. Widget-Alias-example, Widget-Alias-my-page
+            $"Widget__Alias__{encodedAlias}",
+
+            // Widget_[DisplayType]__Alias__[Alias] e.g. Widget-Alias-example.Summary, Widget-Alias-my-page.Summary
+            $"Widget_{key.DisplayType}__Alias__{encodedAlias}"
+        ];
+    }
+
+    internal readonly record struct WidgetAliasAlternatesCacheKey(
+        string Alias,
+        string DisplayType);
+}