Merge remote-tracking branch 'origin/release/15.1' into v15/dev

Author: iOvergaard

build/azure-pipelines.yml

@@ -81,6 +81,7 @@ stages:
             submodules: false
             lfs: false,
             fetchDepth: 500
+          - template: templates/backoffice-install.yml
           - task: UseDotNet@2
             displayName: Use .NET SDK from global.json
             inputs:
@@ -299,29 +300,29 @@ stages:
             #              vmImage: 'windows-latest'
             # We split the tests into 3 parts for each OS to reduce the time it takes to run them on the pipeline
             LinuxPart1Of3:
-              vmImage: "ubuntu-24.04"
+              vmImage: "ubuntu-latest"
               # Filter tests that are part of the Umbraco.Infrastructure namespace but not part of the Umbraco.Infrastructure.Service namespace
-              testFilter: '(FullyQualifiedName~Umbraco.Infrastructure) & (FullyQualifiedName!~Umbraco.Infrastructure.Service)'
+              testFilter: "(FullyQualifiedName~Umbraco.Infrastructure) & (FullyQualifiedName!~Umbraco.Infrastructure.Service)"
             LinuxPart2Of3:
-              vmImage: "ubuntu-24.04"
+              vmImage: "ubuntu-latest"
               # Filter tests that are part of the Umbraco.Infrastructure.Service namespace
-              testFilter: '(FullyQualifiedName~Umbraco.Infrastructure.Service)'
+              testFilter: "(FullyQualifiedName~Umbraco.Infrastructure.Service)"
             LinuxPart3Of3:
-              vmImage: "ubuntu-24.04"
+              vmImage: "ubuntu-latest"
               # Filter tests that are not part of the Umbraco.Infrastructure namespace. So this will run all tests that are not part of the Umbraco.Infrastructure namespace
-              testFilter: '(FullyQualifiedName!~Umbraco.Infrastructure)'
+              testFilter: "(FullyQualifiedName!~Umbraco.Infrastructure)"
             macOSPart1Of3:
               vmImage: "macOS-latest"
               # Filter tests that are part of the Umbraco.Infrastructure namespace but not part of the Umbraco.Infrastructure.Service namespace
-              testFilter: '(FullyQualifiedName~Umbraco.Infrastructure) & (FullyQualifiedName!~Umbraco.Infrastructure.Service)'
+              testFilter: "(FullyQualifiedName~Umbraco.Infrastructure) & (FullyQualifiedName!~Umbraco.Infrastructure.Service)"
             macOSPart2Of3:
               vmImage: "macOS-latest"
               # Filter tests that are part of the Umbraco.Infrastructure.Service namespace
-              testFilter: '(FullyQualifiedName~Umbraco.Infrastructure.Service)'
+              testFilter: "(FullyQualifiedName~Umbraco.Infrastructure.Service)"
             macOSPart3Of3:
               vmImage: "macOS-latest"
               # Filter tests that are not part of the Umbraco.Infrastructure namespace.
-              testFilter: '(FullyQualifiedName!~Umbraco.Infrastructure)'
+              testFilter: "(FullyQualifiedName!~Umbraco.Infrastructure)"
         pool:
           vmImage: $(vmImage)
         variables:
@@ -373,40 +374,40 @@ stages:
               Tests__Database__DatabaseType: LocalDb
               Tests__Database__SQLServerMasterConnectionString: N/A
               # Filter tests that are part of the Umbraco.Infrastructure namespace but not part of the Umbraco.Infrastructure.Service namespace
-              testFilter: '(FullyQualifiedName~Umbraco.Infrastructure) & (FullyQualifiedName!~Umbraco.Infrastructure.Service)'
+              testFilter: "(FullyQualifiedName~Umbraco.Infrastructure) & (FullyQualifiedName!~Umbraco.Infrastructure.Service)"
             WindowsPart2Of3:
               vmImage: "windows-latest"
               Tests__Database__DatabaseType: LocalDb
               Tests__Database__SQLServerMasterConnectionString: N/A
               # Filter tests that are part of the Umbraco.Infrastructure.Service namespace
-              testFilter: '(FullyQualifiedName~Umbraco.Infrastructure.Service)'
+              testFilter: "(FullyQualifiedName~Umbraco.Infrastructure.Service)"
             WindowsPart3Of3:
               vmImage: "windows-latest"
               Tests__Database__DatabaseType: LocalDb
               Tests__Database__SQLServerMasterConnectionString: N/A
               # Filter tests that are not part of the Umbraco.Infrastructure namespace. So this will run all tests that are not part of the Umbraco.Infrastructure namespace
-              testFilter: '(FullyQualifiedName!~Umbraco.Infrastructure)'
+              testFilter: "(FullyQualifiedName!~Umbraco.Infrastructure)"
             LinuxPart1Of3:
               vmImage: "ubuntu-latest"
               SA_PASSWORD: UmbracoIntegration123!
               Tests__Database__DatabaseType: SqlServer
               Tests__Database__SQLServerMasterConnectionString: "Server=(local);User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
               # Filter tests that are part of the Umbraco.Infrastructure namespace but not part of the Umbraco.Infrastructure.Service namespace
-              testFilter: '(FullyQualifiedName~Umbraco.Infrastructure) & (FullyQualifiedName!~Umbraco.Infrastructure.Service)'
+              testFilter: "(FullyQualifiedName~Umbraco.Infrastructure) & (FullyQualifiedName!~Umbraco.Infrastructure.Service)"
             LinuxPart2Of3:
               vmImage: "ubuntu-latest"
               SA_PASSWORD: UmbracoIntegration123!
               Tests__Database__DatabaseType: SqlServer
               Tests__Database__SQLServerMasterConnectionString: "Server=(local);User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
               # Filter tests that are part of the Umbraco.Infrastructure.Service namespace
-              testFilter: '(FullyQualifiedName~Umbraco.Infrastructure.Service)'
+              testFilter: "(FullyQualifiedName~Umbraco.Infrastructure.Service)"
             LinuxPart3Of3:
               vmImage: "ubuntu-latest"
               SA_PASSWORD: UmbracoIntegration123!
               Tests__Database__DatabaseType: SqlServer
               Tests__Database__SQLServerMasterConnectionString: "Server=(local);User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
               # Filter tests that are not part of the Umbraco.Infrastructure namespace. So this will run all tests that are not part of the Umbraco.Infrastructure namespace
-              testFilter: '(FullyQualifiedName!~Umbraco.Infrastructure)'
+              testFilter: "(FullyQualifiedName!~Umbraco.Infrastructure)"
         pool:
           vmImage: $(vmImage)
         steps:
@@ -492,22 +493,22 @@ stages:
           matrix:
             LinuxPart1Of3:
               vmImage: "ubuntu-latest"
-              testCommand: "npx playwright test DefaultConfig --grep \"@smoke\"--shard=1/3"
+              testCommand: 'npx playwright test DefaultConfig --grep "@smoke"--shard=1/3'
             LinuxPart2Of3:
               vmImage: "ubuntu-latest"
-              testCommand: "npx playwright test DefaultConfig --grep \"@smoke\" --shard=2/3"
+              testCommand: 'npx playwright test DefaultConfig --grep "@smoke" --shard=2/3'
             LinuxPart3Of3:
               vmImage: "ubuntu-latest"
-              testCommand: "npx playwright test DefaultConfig --grep \"@smoke\" --shard=3/3"
+              testCommand: 'npx playwright test DefaultConfig --grep "@smoke" --shard=3/3'
             WindowsPart1Of3:
               vmImage: "windows-latest"
-              testCommand: "npx playwright test DefaultConfig --grep \"@smoke\" --shard=1/3"
+              testCommand: 'npx playwright test DefaultConfig --grep "@smoke" --shard=1/3'
             WindowsPart2Of3:
               vmImage: "windows-latest"
-              testCommand: "npx playwright test DefaultConfig --grep \"@smoke\" --shard=2/3"
+              testCommand: 'npx playwright test DefaultConfig --grep "@smoke" --shard=2/3'
             WindowsPart3Of3:
               vmImage: "windows-latest"
-              testCommand: "npx playwright test DefaultConfig --grep \"@smoke\" --shard=3/3"
+              testCommand: 'npx playwright test DefaultConfig --grep "@smoke" --shard=3/3'
         pool:
           vmImage: $(vmImage)
         steps:
@@ -635,29 +636,29 @@ stages:
           matrix:
             ${{ if eq(parameters.sqlServerLinuxAcceptanceTests, True) }}:
               LinuxPart1Of3:
-                testCommand: "npx playwright test DefaultConfig --grep \"@smoke\" --grep-invert \"Users\" --shard=1/3"
+                testCommand: 'npx playwright test DefaultConfig --grep "@smoke" --grep-invert "Users" --shard=1/3'
                 vmImage: "ubuntu-latest"
                 SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
                 CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
               LinuxPart2Of3:
-                testCommand: "npx playwright test DefaultConfig --grep \"@smoke\" --grep-invert \"Users\" --shard=2/3"
+                testCommand: 'npx playwright test DefaultConfig --grep "@smoke" --grep-invert "Users" --shard=2/3'
                 vmImage: "ubuntu-latest"
                 SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
                 CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
               LinuxPart3Of3:
-                testCommand: "npx playwright test DefaultConfig --grep \"@smoke\" --grep-invert \"Users\" --shard=3/3"
+                testCommand: 'npx playwright test DefaultConfig --grep "@smoke" --grep-invert "Users" --shard=3/3'
                 vmImage: "ubuntu-latest"
                 SA_PASSWORD: $(UMBRACO__CMS__UNATTENDED__UNATTENDEDUSERPASSWORD)
                 CONNECTIONSTRINGS__UMBRACODBDSN: "Server=(local);Database=Umbraco;User Id=sa;Password=$(SA_PASSWORD);TrustServerCertificate=True"
             WindowsPart1Of3:
               vmImage: "windows-latest"
-              testCommand: "npx playwright test DefaultConfig --grep \"@smoke\" --grep-invert \"Users\" --shard=1/3"
+              testCommand: 'npx playwright test DefaultConfig --grep "@smoke" --grep-invert "Users" --shard=1/3'
             WindowsPart2Of3:
               vmImage: "windows-latest"
-              testCommand: "npx playwright test DefaultConfig --grep \"@smoke\" --grep-invert \"Users\" --shard=2/3"
+              testCommand: 'npx playwright test DefaultConfig --grep "@smoke" --grep-invert "Users" --shard=2/3'
             WindowsPart3Of3:
               vmImage: "windows-latest"
-              testCommand: "npx playwright test DefaultConfig --grep \"@smoke\" --grep-invert \"Users\" --shard=3/3"
+              testCommand: 'npx playwright test DefaultConfig --grep "@smoke" --grep-invert "Users" --shard=3/3'
         pool:
           vmImage: $(vmImage)
         steps:

src/Umbraco.PublishedCache.HybridCache/NotificationHandlers/CacheRefreshingNotificationHandler.cs

@@ -45,7 +45,7 @@ public CacheRefreshingNotificationHandler(
 
     public async Task HandleAsync(ContentRefreshNotification notification, CancellationToken cancellationToken)
     {
-        await RefreshElementsCacheAsync(notification.Entity);
+        ClearElementsCache();
 
         await _documentCacheService.RefreshContentAsync(notification.Entity);
     }
@@ -54,73 +54,36 @@ public async Task HandleAsync(ContentDeletedNotification notification, Cancellat
     {
         foreach (IContent deletedEntity in notification.DeletedEntities)
         {
-            RemoveFromElementsCache(deletedEntity);
+            ClearElementsCache();
             await _documentCacheService.DeleteItemAsync(deletedEntity);
         }
     }
 
     public async Task HandleAsync(MediaRefreshNotification notification, CancellationToken cancellationToken)
     {
-        await RefreshElementsCacheAsync(notification.Entity);
+        ClearElementsCache();
         await _mediaCacheService.RefreshMediaAsync(notification.Entity);
     }
 
     public async Task HandleAsync(MediaDeletedNotification notification, CancellationToken cancellationToken)
     {
         foreach (IMedia deletedEntity in notification.DeletedEntities)
         {
-            RemoveFromElementsCache(deletedEntity);
+            ClearElementsCache();
             await _mediaCacheService.DeleteItemAsync(deletedEntity);
         }
     }
 
-    private async Task RefreshElementsCacheAsync(IUmbracoEntity content)
+    private void ClearElementsCache()
     {
-        IEnumerable<IRelation> parentRelations = _relationService.GetByParent(content)!;
-        IEnumerable<IRelation> childRelations = _relationService.GetByChild(content);
-
-        var ids = parentRelations.Select(x => x.ChildId).Concat(childRelations.Select(x => x.ParentId)).ToHashSet();
-        // We need to add ourselves to the list of ids to clear
-        ids.Add(content.Id);
-        foreach (var id in ids)
-        {
-            if (await _documentCacheService.HasContentByIdAsync(id) is false)
-            {
-                continue;
-            }
-
-            IPublishedContent? publishedContent = await _documentCacheService.GetByIdAsync(id);
-            if (publishedContent is null)
-            {
-                continue;
-            }
-
-            foreach (IPublishedProperty publishedProperty in publishedContent.Properties)
-            {
-                var property = (PublishedProperty) publishedProperty;
-                if (property.ReferenceCacheLevel is PropertyCacheLevel.Elements
-                    || property.PropertyType.DeliveryApiCacheLevel is PropertyCacheLevel.Elements
-                    || property.PropertyType.DeliveryApiCacheLevelForExpansion is PropertyCacheLevel.Elements)
-                {
-                    _elementsCache.ClearByKey(property.ValuesCacheKey);
-                }
-            }
-        }
+        // Ideally we'd like to not have to clear the entire cache here. However, this was the existing behavior in NuCache.
+        // The reason for this is that we have no way to know which elements are affected by the changes. or what their keys are.
+        // This is because currently published elements lives exclusively in a JSON blob in the umbracoPropertyData table.
+        // This means that the only way to resolve these keys are to actually parse this data with a specific value converter, and for all cultures, which is not feasible.
+        // If published elements become their own entities with relations, instead of just property data, we can revisit this,
+        _elementsCache.Clear();
     }
 
-    private void RemoveFromElementsCache(IUmbracoEntity content)
-    {
-        // ClearByKey clears by "startsWith" so we'll clear by the cachekey prefix + contentKey
-        // This will clear any and all properties for this content item, this is important because
-        // we cannot resolve the PublishedContent for this entity since it and its content type is deleted.
-        _elementsCache.ClearByKey(GetContentWideCacheKey(content.Key, true));
-        _elementsCache.ClearByKey(GetContentWideCacheKey(content.Key, false));
-    }
-
-    private string GetContentWideCacheKey(Guid contentKey, bool isPreviewing) => isPreviewing
-        ? CacheKeys.PreviewPropertyCacheKeyPrefix + contentKey
-        : CacheKeys.PropertyCacheKeyPrefix + contentKey;
-
     public Task HandleAsync(ContentTypeRefreshedNotification notification, CancellationToken cancellationToken)
     {
         const ContentTypeChangeTypes types // only for those that have been refreshed