Skip to content

Commit d438261

Browse files
dtng95dtng95
authored
Merge pull request #232 from umbraco/feature/v15/algolia-update
Update Algolia for v15
2 parents 7747af1 + 4d1ac7d commit d438261

13 files changed

+4669
-1205
lines changed

‎src/Umbraco.Cms.Integrations.Search.Algolia/Client/package-lock.json

+4,628-1,170
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Umbraco.Cms.Integrations.Search.Algolia/Client/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"@hey-api/openapi-ts": "^0.46.3",
2222
"@typescript-eslint/eslint-plugin": "^7.13.0",
2323
"@typescript-eslint/parser": "^7.13.0",
24-
"@umbraco-cms/backoffice": "^14.0.0",
24+
"@umbraco-cms/backoffice": "^15.0.0",
2525
"eslint": "^8.56.0",
2626
"eslint-config-prettier": "^9.1.0",
2727
"eslint-import-resolver-typescript": "^3.6.1",

‎src/Umbraco.Cms.Integrations.Search.Algolia/Client/public/umbraco-package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"id": "Umbraco.Cms.Integrations.Search.Algolia",
33
"name": "Umbraco CMS Integrations: Search - Algolia",
4-
"version": "3.0.0",
4+
"version": "4.0.0",
55
"extensions": [
66
{
77
"name": "Umbraco EntryPoint",
88
"alias": "Umb.Algolia.EntryPoint",
9-
"type": "entryPoint",
9+
"type": "backofficeEntryPoint",
1010
"js": "/App_Plugins/Algolia/algolia.js"
1111
}
1212
]

‎src/Umbraco.Cms.Integrations.Search.Algolia/Client/src/dashboard/manifest.ts

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
1-
import type { ManifestDashboard } from "@umbraco-cms/backoffice/extension-registry";
2-
3-
const dashboardManifest: ManifestDashboard = {
1+
const dashboardManifest: UmbExtensionManifest = {
42
type: "dashboard",
5-
name: "Algolia Search Management",
63
alias: "Algolia.Dashboard",
7-
elementName: "algolia-dashboard-element",
8-
js: () => import('./search-management-dashboard/algolia-dashboard.element.js'),
4+
name: "Algolia Search Management",
5+
element: () => import('./search-management-dashboard/algolia-dashboard.element.js'),
96
meta: {
107
label: "Algolia Search Management",
118
pathname: "algolia-search-management"

‎src/Umbraco.Cms.Integrations.Search.Algolia/Client/tsconfig.json

+5-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"experimentalDecorators": true,
55
"useDefineForClassFields": false,
66
"module": "ESNext",
7-
"lib": ["ES2020", "DOM", "DOM.Iterable"],
7+
"lib": [ "ES2020", "DOM", "DOM.Iterable" ],
88
"skipLibCheck": true,
99

1010
/* Bundler mode */
@@ -19,7 +19,10 @@
1919
"noUnusedLocals": true,
2020
"noUnusedParameters": true,
2121
"noFallthroughCasesInSwitch": true,
22-
22+
"types": [
23+
"@umbraco-cms/backoffice/extension-registry",
24+
"@umbraco-cms/backoffice/extension-types"
25+
],
2326
"paths": {
2427
"@umbraco-integrations/algolia/generated": [
2528
"./generated/index.ts"

‎src/Umbraco.Cms.Integrations.Search.Algolia/Converters/IAlgoliaIndexValueConverter.cs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
using Umbraco.Cms.Core.Models;
2+
using Umbraco.Cms.Core.PropertyEditors;
23

34
namespace Umbraco.Cms.Integrations.Search.Algolia.Converters
45
{
@@ -15,6 +16,6 @@ public interface IAlgoliaIndexValueConverter
1516
/// <summary>
1617
/// Parses the index values.
1718
/// </summary>
18-
object ParseIndexValues(IProperty property, IEnumerable<object> indexValues);
19+
object ParseIndexValues(IProperty property, IndexValue indexValue);
1920
}
2021
}

‎src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoBooleanConverter.cs

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
using Umbraco.Cms.Core.Models;
2+
using Umbraco.Cms.Core.PropertyEditors;
23

34
namespace Umbraco.Cms.Integrations.Search.Algolia.Converters
45
{
56
public class UmbracoBooleanConverter : IAlgoliaIndexValueConverter
67
{
78
public string Name => Core.Constants.PropertyEditors.Aliases.Boolean;
89

9-
public object ParseIndexValues(IProperty property, IEnumerable<object> indexValues)
10+
public object ParseIndexValues(IProperty property, IndexValue indexValue)
1011
{
11-
if (indexValues != null && indexValues.Any())
12+
if (indexValue != null && indexValue.Values.Any())
1213
{
13-
var value = indexValues.FirstOrDefault();
14+
var value = indexValue.Values.FirstOrDefault();
1415

1516
return value != null
1617
? value.Equals(1)

‎src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoDecimalConverter.cs

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
using Umbraco.Cms.Core.Models;
2+
using Umbraco.Cms.Core.PropertyEditors;
23

34
namespace Umbraco.Cms.Integrations.Search.Algolia.Converters
45
{
56
public class UmbracoDecimalConverter : IAlgoliaIndexValueConverter
67
{
78
public string Name => Core.Constants.PropertyEditors.Aliases.Decimal;
89

9-
public object ParseIndexValues(IProperty property, IEnumerable<object> indexValues)
10+
public object ParseIndexValues(IProperty property, IndexValue indexValue)
1011
{
11-
if (indexValues != null && indexValues.Any())
12+
if (indexValue != null && indexValue.Values.Any())
1213
{
13-
var value = indexValues.FirstOrDefault();
14+
var value = indexValue.Values.FirstOrDefault();
1415

1516
return value != null
1617
? decimal.Parse(value.ToString())

‎src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoIntegerConverter.cs

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
using Umbraco.Cms.Core.Models;
2+
using Umbraco.Cms.Core.PropertyEditors;
23

34
namespace Umbraco.Cms.Integrations.Search.Algolia.Converters
45
{
56
public class UmbracoIntegerConverter : IAlgoliaIndexValueConverter
67
{
78
public string Name => Core.Constants.PropertyEditors.Aliases.Integer;
89

9-
public object ParseIndexValues(IProperty property, IEnumerable<object> indexValues)
10+
public object ParseIndexValues(IProperty property, IndexValue indexValue)
1011
{
11-
if (indexValues != null && indexValues.Any())
12+
if (indexValue != null && indexValue.Values.Any())
1213
{
13-
var value = indexValues.FirstOrDefault();
14+
var value = indexValue.Values.FirstOrDefault();
1415

1516
return value ?? default(int);
1617
}

‎src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoMediaPickerConverter.cs

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System.Text.Json;
22
using Umbraco.Cms.Core.Models;
3+
using Umbraco.Cms.Core.PropertyEditors;
34
using Umbraco.Cms.Core.Services;
45

56
namespace Umbraco.Cms.Integrations.Search.Algolia.Converters
@@ -12,11 +13,11 @@ public class UmbracoMediaPickerConverter : IAlgoliaIndexValueConverter
1213

1314
public string Name => Core.Constants.PropertyEditors.Aliases.MediaPicker3;
1415

15-
public object ParseIndexValues(IProperty property, IEnumerable<object> indexValues)
16+
public object ParseIndexValues(IProperty property, IndexValue indexValue)
1617
{
1718
var list = new List<string>();
1819

19-
var parsedIndexValue = ParseIndexValue(indexValues);
20+
var parsedIndexValue = ParseIndexValue(indexValue);
2021

2122
if (string.IsNullOrEmpty(parsedIndexValue)) return list;
2223

@@ -38,11 +39,11 @@ public object ParseIndexValues(IProperty property, IEnumerable<object> indexValu
3839
return list;
3940
}
4041

41-
private string ParseIndexValue(IEnumerable<object> values)
42+
private string ParseIndexValue(IndexValue indexValue)
4243
{
43-
if (values != null && values.Any())
44+
if (indexValue != null && indexValue.Values.Any())
4445
{
45-
var value = values.FirstOrDefault();
46+
var value = indexValue.Values.FirstOrDefault();
4647

4748
if (value == null) return string.Empty;
4849

‎src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoTagsConverter.cs

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
using Umbraco.Cms.Core.Models;
2+
using Umbraco.Cms.Core.PropertyEditors;
23

34
namespace Umbraco.Cms.Integrations.Search.Algolia.Converters
45
{
56
public class UmbracoTagsConverter : IAlgoliaIndexValueConverter
67
{
78
public string Name => Core.Constants.PropertyEditors.Aliases.Tags;
89

9-
public object ParseIndexValues(IProperty property, IEnumerable<object> indexValues)
10+
public object ParseIndexValues(IProperty property, IndexValue indexValue)
1011
{
11-
if (indexValues != null && indexValues.Any())
12+
if (indexValue != null && indexValue.Values.Any())
1213
{
13-
return indexValues;
14+
return indexValue.Values;
1415
}
1516

1617
return Enumerable.Empty<string>();

‎src/Umbraco.Cms.Integrations.Search.Algolia/Services/AlgoliaSearchPropertyIndexValueFactory.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -58,11 +58,11 @@ public virtual KeyValuePair<string, object> GetValue(IProperty property, string
5858
var converter = _converterCollection.FirstOrDefault(p => p.Name == property.PropertyType.PropertyEditorAlias);
5959
if (converter != null)
6060
{
61-
var result = converter.ParseIndexValues(property, indexValue.Value);
61+
var result = converter.ParseIndexValues(property, indexValue);
6262
return new KeyValuePair<string, object>(property.Alias, result);
6363
}
6464

65-
return new KeyValuePair<string, object>(property.Alias, indexValue.Value);
65+
return new KeyValuePair<string, object>(property.Alias, indexValue.Values);
6666
}
6767
catch (Exception ex)
6868
{

‎src/Umbraco.Cms.Integrations.Search.Algolia/Umbraco.Cms.Integrations.Search.Algolia.csproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Razor">
22
<PropertyGroup>
3-
<TargetFramework>net8.0</TargetFramework>
3+
<TargetFramework>net9.0</TargetFramework>
44
<Nullable>enable</Nullable>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<StaticWebAssetBasePath>/</StaticWebAssetBasePath>
@@ -13,7 +13,7 @@
1313
<PackageIconUrl></PackageIconUrl>
1414
<PackageProjectUrl>https://github.com/umbraco/Umbraco.Cms.Integrations/tree/main/src/Umbraco.Cms.Integrations.Search.Algolia</PackageProjectUrl>
1515
<RepositoryUrl>https://github.com/umbraco/Umbraco.Cms.Integrations</RepositoryUrl>
16-
<Version>3.2.0</Version>
16+
<Version>4.0.0</Version>
1717
<Authors>Umbraco HQ</Authors>
1818
<Company>Umbraco</Company>
1919
<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>
@@ -23,8 +23,8 @@
2323

2424
<ItemGroup>
2525
<PackageReference Include="Algolia.Search" Version="6.13.0" />
26-
<PackageReference Include="Umbraco.Cms.Web.Website" Version="[14.0.0,15)" />
27-
<PackageReference Include="Umbraco.Cms.Api.Common" Version="[14.0.0,15)" />
26+
<PackageReference Include="Umbraco.Cms.Web.Website" Version="[15.0.0,16)" />
27+
<PackageReference Include="Umbraco.Cms.Api.Common" Version="[15.0.0,16)" />
2828
</ItemGroup>
2929

3030
<ItemGroup>

0 commit comments

Comments
 (0)