From c1bf3a7e154d3e11c7dd493a6272ec033cf7d9aa Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Thu, 11 Jul 2024 12:02:39 +0200 Subject: [PATCH 1/6] bump version to 13.4.1 --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 288af47e084d..3b44f006d50e 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", - "version": "13.5.0-rc", + "version": "13.4.1", "assemblyVersion": { "precision": "build" }, From a41555cc0d451344ed552f36e66f77d0346c1ca5 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Thu, 11 Jul 2024 11:41:20 +0200 Subject: [PATCH 2/6] fix: revert the `inert` attribute on Tours since you are expected to be able to work with the background in certain steps --- .../components/application/umbtour/umbtourstep.directive.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstep.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstep.directive.js index 53ff989c7d76..c54f907d4477 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstep.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstep.directive.js @@ -14,18 +14,15 @@ (function () { 'use strict'; - function TourStepDirective(focusLockService) { + function TourStepDirective() { function link(scope, element, attrs, ctrl) { scope.close = function () { if (scope.onClose) { scope.onClose(); - focusLockService.removeInertAttribute(); } } - - focusLockService.addInertAttribute(); } var directive = { From d72fc5c4e83c71dfee73b45fc2eacf5158a040e6 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Thu, 11 Jul 2024 11:41:20 +0200 Subject: [PATCH 3/6] fix: revert the `inert` attribute on Tours since you are expected to be able to work with the background in certain steps --- .../components/application/umbtour/umbtourstep.directive.js | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstep.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstep.directive.js index 53ff989c7d76..c54f907d4477 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstep.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstep.directive.js @@ -14,18 +14,15 @@ (function () { 'use strict'; - function TourStepDirective(focusLockService) { + function TourStepDirective() { function link(scope, element, attrs, ctrl) { scope.close = function () { if (scope.onClose) { scope.onClose(); - focusLockService.removeInertAttribute(); } } - - focusLockService.addInertAttribute(); } var directive = { From be81586b46047d4c41d734b36363cf09206943b3 Mon Sep 17 00:00:00 2001 From: Jacob Overgaard <752371+iOvergaard@users.noreply.github.com> Date: Thu, 11 Jul 2024 15:07:36 +0200 Subject: [PATCH 4/6] set version to 13.5.0-rc --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index 3b44f006d50e..288af47e084d 100644 --- a/version.json +++ b/version.json @@ -1,6 +1,6 @@ { "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/main/src/NerdBank.GitVersioning/version.schema.json", - "version": "13.4.1", + "version": "13.5.0-rc", "assemblyVersion": { "precision": "build" }, From dfe41d7f7630b5d1be144a4ea1fd8e861143f839 Mon Sep 17 00:00:00 2001 From: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com> Date: Mon, 15 Jul 2024 11:45:57 +0300 Subject: [PATCH 5/6] V13: Ensure `TransformingIndexValues` event is also raised from the `DeliveryApiContentIndex` (#16756) * Removing override of OnTransformingIndexValues from DeliveryApiContentIndex * Making sure that TransformingIndexValues event is raised for DeliveryApiContentIndex without performing the special index value transformations * Review suggestion --- .../DeliveryApiContentIndex.cs | 9 +++----- .../UmbracoExamineIndex.cs | 21 +++++++++++++++++-- 2 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/Umbraco.Examine.Lucene/DeliveryApiContentIndex.cs b/src/Umbraco.Examine.Lucene/DeliveryApiContentIndex.cs index c572fc85f702..3195a6df7cc7 100644 --- a/src/Umbraco.Examine.Lucene/DeliveryApiContentIndex.cs +++ b/src/Umbraco.Examine.Lucene/DeliveryApiContentIndex.cs @@ -17,6 +17,9 @@ public class DeliveryApiContentIndex : UmbracoExamineIndex private readonly IDeliveryApiCompositeIdHandler _deliveryApiCompositeIdHandler; private readonly ILogger _logger; + // The special path and icon value transformations are not needed in this case + protected override bool ApplySpecialValueTransformations => false; + [Obsolete("Use the constructor that takes an IDeliveryApiCompositeIdHandler instead, scheduled for removal in v15")] public DeliveryApiContentIndex( ILoggerFactory loggerFactory, @@ -134,10 +137,4 @@ protected override void PerformDeleteFromIndex(IEnumerable itemIds, Acti return (compositeIdModel.Id?.ToString(CultureInfo.InvariantCulture), compositeIdModel.Culture); } - - protected override void OnTransformingIndexValues(IndexingItemEventArgs e) - { - // UmbracoExamineIndex (base class down the hierarchy) performs some magic transformations here for paths and icons; - // we don't want that for the Delivery API, so we'll have to override this method and simply do nothing. - } } diff --git a/src/Umbraco.Examine.Lucene/UmbracoExamineIndex.cs b/src/Umbraco.Examine.Lucene/UmbracoExamineIndex.cs index 5faccf581f09..bfec67f5d10a 100644 --- a/src/Umbraco.Examine.Lucene/UmbracoExamineIndex.cs +++ b/src/Umbraco.Examine.Lucene/UmbracoExamineIndex.cs @@ -38,8 +38,14 @@ protected UmbracoExamineIndex( } public Attempt IsHealthy() => _diagnostics.IsHealthy(); + public virtual IReadOnlyDictionary Metadata => _diagnostics.Metadata; + /// + /// Performs special __Path and __Icon value transformations to all deriving indexes when set to true. + /// + protected virtual bool ApplySpecialValueTransformations => true; + /// /// When set to true Umbraco will keep the index in sync with Umbraco data automatically /// @@ -115,16 +121,27 @@ protected override void OnTransformingIndexValues(IndexingItemEventArgs e) { base.OnTransformingIndexValues(e); + if (ApplySpecialValueTransformations) + { + ApplySpecialIndexValueTransformations(e); + } + } + + /// + /// Updates the index ValueSet with a special __Path and __Icon fields. + /// + private void ApplySpecialIndexValueTransformations(IndexingItemEventArgs e) + { var updatedValues = e.ValueSet.Values.ToDictionary(x => x.Key, x => (IEnumerable)x.Value); - //ensure special __Path field + // Ensure special __Path field var path = e.ValueSet.GetValue("path"); if (path != null) { updatedValues[UmbracoExamineFieldNames.IndexPathFieldName] = path.Yield(); } - //icon + // Ensure special __Icon field if (e.ValueSet.Values.TryGetValue("icon", out IReadOnlyList? icon) && e.ValueSet.Values.ContainsKey(UmbracoExamineFieldNames.IconFieldName) == false) { From 635076d657ae5bf61f93c9c9475bc6ec136cc0bc Mon Sep 17 00:00:00 2001 From: nikolajlauridsen Date: Fri, 19 Jul 2024 10:14:54 +0200 Subject: [PATCH 6/6] Revert "fix: revert the `inert` attribute on Tours since you are expected to be able to work with the background in certain steps" This reverts commit d72fc5c4e83c71dfee73b45fc2eacf5158a040e6. --- .../components/application/umbtour/umbtourstep.directive.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstep.directive.js b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstep.directive.js index c54f907d4477..53ff989c7d76 100644 --- a/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstep.directive.js +++ b/src/Umbraco.Web.UI.Client/src/common/directives/components/application/umbtour/umbtourstep.directive.js @@ -14,15 +14,18 @@ (function () { 'use strict'; - function TourStepDirective() { + function TourStepDirective(focusLockService) { function link(scope, element, attrs, ctrl) { scope.close = function () { if (scope.onClose) { scope.onClose(); + focusLockService.removeInertAttribute(); } } + + focusLockService.addInertAttribute(); } var directive = {