From 65d09abf01ff98204954499204a6b51979e44c65 Mon Sep 17 00:00:00 2001 From: Adrian Cojocariu Date: Fri, 26 Apr 2024 17:21:01 +0300 Subject: [PATCH] Include IProperty with Algolia's index value converter --- .../Converters/IAlgoliaIndexValueConverter.cs | 6 ++++-- .../Converters/UmbracoBooleanConverter.cs | 6 ++++-- .../Converters/UmbracoDecimalConverter.cs | 6 ++++-- .../Converters/UmbracoIntegerConverter.cs | 6 ++++-- .../Converters/UmbracoMediaPickerConverter.cs | 3 ++- .../Converters/UmbracoTagsConverter.cs | 4 ++-- .../Services/AlgoliaSearchPropertyIndexValueFactory.cs | 2 +- .../Umbraco.Cms.Integrations.Search.Algolia.csproj | 2 +- 8 files changed, 22 insertions(+), 13 deletions(-) diff --git a/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/IAlgoliaIndexValueConverter.cs b/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/IAlgoliaIndexValueConverter.cs index 1c66b68b..95d15628 100644 --- a/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/IAlgoliaIndexValueConverter.cs +++ b/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/IAlgoliaIndexValueConverter.cs @@ -1,4 +1,6 @@ -namespace Umbraco.Cms.Integrations.Search.Algolia.Converters +using Umbraco.Cms.Core.Models; + +namespace Umbraco.Cms.Integrations.Search.Algolia.Converters { /// /// Defines a custom index converter. @@ -13,6 +15,6 @@ public interface IAlgoliaIndexValueConverter /// /// Parses the index values. /// - object ParseIndexValues(IEnumerable indexValues); + object ParseIndexValues(IProperty property, IEnumerable indexValues); } } diff --git a/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoBooleanConverter.cs b/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoBooleanConverter.cs index 711ff6fa..9503733b 100644 --- a/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoBooleanConverter.cs +++ b/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoBooleanConverter.cs @@ -1,10 +1,12 @@ -namespace Umbraco.Cms.Integrations.Search.Algolia.Converters +using Umbraco.Cms.Core.Models; + +namespace Umbraco.Cms.Integrations.Search.Algolia.Converters { public class UmbracoBooleanConverter : IAlgoliaIndexValueConverter { public string Name => Core.Constants.PropertyEditors.Aliases.Boolean; - public object ParseIndexValues(IEnumerable indexValues) + public object ParseIndexValues(IProperty property, IEnumerable indexValues) { if (indexValues != null && indexValues.Any()) { diff --git a/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoDecimalConverter.cs b/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoDecimalConverter.cs index e4c20180..01769bc5 100644 --- a/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoDecimalConverter.cs +++ b/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoDecimalConverter.cs @@ -1,10 +1,12 @@ -namespace Umbraco.Cms.Integrations.Search.Algolia.Converters +using Umbraco.Cms.Core.Models; + +namespace Umbraco.Cms.Integrations.Search.Algolia.Converters { public class UmbracoDecimalConverter : IAlgoliaIndexValueConverter { public string Name => Core.Constants.PropertyEditors.Aliases.Decimal; - public object ParseIndexValues(IEnumerable indexValues) + public object ParseIndexValues(IProperty property, IEnumerable indexValues) { if (indexValues != null && indexValues.Any()) { diff --git a/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoIntegerConverter.cs b/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoIntegerConverter.cs index 03d889c7..3237530c 100644 --- a/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoIntegerConverter.cs +++ b/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoIntegerConverter.cs @@ -1,10 +1,12 @@ -namespace Umbraco.Cms.Integrations.Search.Algolia.Converters +using Umbraco.Cms.Core.Models; + +namespace Umbraco.Cms.Integrations.Search.Algolia.Converters { public class UmbracoIntegerConverter : IAlgoliaIndexValueConverter { public string Name => Core.Constants.PropertyEditors.Aliases.Integer; - public object ParseIndexValues(IEnumerable indexValues) + public object ParseIndexValues(IProperty property, IEnumerable indexValues) { if (indexValues != null && indexValues.Any()) { diff --git a/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoMediaPickerConverter.cs b/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoMediaPickerConverter.cs index 5c097ffa..58bd2575 100644 --- a/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoMediaPickerConverter.cs +++ b/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoMediaPickerConverter.cs @@ -1,4 +1,5 @@ using System.Text.Json; +using Umbraco.Cms.Core.Models; using Umbraco.Cms.Core.Services; namespace Umbraco.Cms.Integrations.Search.Algolia.Converters @@ -11,7 +12,7 @@ public class UmbracoMediaPickerConverter : IAlgoliaIndexValueConverter public string Name => Core.Constants.PropertyEditors.Aliases.MediaPicker3; - public object ParseIndexValues(IEnumerable indexValues) + public object ParseIndexValues(IProperty property, IEnumerable indexValues) { var list = new List(); diff --git a/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoTagsConverter.cs b/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoTagsConverter.cs index 1fb4ec51..49ef446d 100644 --- a/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoTagsConverter.cs +++ b/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoTagsConverter.cs @@ -1,4 +1,4 @@ -using System.Text.Json; +using Umbraco.Cms.Core.Models; namespace Umbraco.Cms.Integrations.Search.Algolia.Converters { @@ -6,7 +6,7 @@ public class UmbracoTagsConverter : IAlgoliaIndexValueConverter { public string Name => Core.Constants.PropertyEditors.Aliases.Tags; - public object ParseIndexValues(IEnumerable indexValues) + public object ParseIndexValues(IProperty property, IEnumerable indexValues) { if (indexValues != null && indexValues.Any()) { diff --git a/src/Umbraco.Cms.Integrations.Search.Algolia/Services/AlgoliaSearchPropertyIndexValueFactory.cs b/src/Umbraco.Cms.Integrations.Search.Algolia/Services/AlgoliaSearchPropertyIndexValueFactory.cs index 4e914601..771e9414 100644 --- a/src/Umbraco.Cms.Integrations.Search.Algolia/Services/AlgoliaSearchPropertyIndexValueFactory.cs +++ b/src/Umbraco.Cms.Integrations.Search.Algolia/Services/AlgoliaSearchPropertyIndexValueFactory.cs @@ -37,7 +37,7 @@ public virtual KeyValuePair GetValue(IProperty property, string var converter = _converterCollection.FirstOrDefault(p => p.Name == property.PropertyType.PropertyEditorAlias); if (converter != null) { - var result = converter.ParseIndexValues(indexValue.Value); + var result = converter.ParseIndexValues(property, indexValue.Value); return new KeyValuePair(property.Alias, result); } diff --git a/src/Umbraco.Cms.Integrations.Search.Algolia/Umbraco.Cms.Integrations.Search.Algolia.csproj b/src/Umbraco.Cms.Integrations.Search.Algolia/Umbraco.Cms.Integrations.Search.Algolia.csproj index b506fc42..897e8f09 100644 --- a/src/Umbraco.Cms.Integrations.Search.Algolia/Umbraco.Cms.Integrations.Search.Algolia.csproj +++ b/src/Umbraco.Cms.Integrations.Search.Algolia/Umbraco.Cms.Integrations.Search.Algolia.csproj @@ -13,7 +13,7 @@ https://github.com/umbraco/Umbraco.Cms.Integrations/tree/main/src/Umbraco.Cms.Integrations.Search.Algolia https://github.com/umbraco/Umbraco.Cms.Integrations - 2.1.4 + 2.2.0 Umbraco HQ Umbraco Umbraco;Umbraco-Marketplace