Merge pull request #232 from umbraco/feature/v15/algolia-update

dtng95 · web-flow · commit d4382611bd84 · 2024-11-29T15:50:34.000+07:00
Update Algolia for v15
diff --git a/src/Umbraco.Cms.Integrations.Search.Algolia/Client/package-lock.json b/src/Umbraco.Cms.Integrations.Search.Algolia/Client/package-lock.json
diff --git a/src/Umbraco.Cms.Integrations.Search.Algolia/Client/package.json b/src/Umbraco.Cms.Integrations.Search.Algolia/Client/package.json
@@ -21,7 +21,7 @@
     "@hey-api/openapi-ts": "^0.46.3",
     "@typescript-eslint/eslint-plugin": "^7.13.0",
     "@typescript-eslint/parser": "^7.13.0",
-    "@umbraco-cms/backoffice": "^14.0.0",
+    "@umbraco-cms/backoffice": "^15.0.0",
     "eslint": "^8.56.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-import-resolver-typescript": "^3.6.1",
diff --git a/src/Umbraco.Cms.Integrations.Search.Algolia/Client/public/umbraco-package.json b/src/Umbraco.Cms.Integrations.Search.Algolia/Client/public/umbraco-package.json
@@ -1,12 +1,12 @@
 ﻿{
   "id": "Umbraco.Cms.Integrations.Search.Algolia",
   "name": "Umbraco CMS Integrations: Search - Algolia",
-  "version": "3.0.0",
+  "version": "4.0.0",
   "extensions": [
     {
       "name": "Umbraco EntryPoint",
       "alias": "Umb.Algolia.EntryPoint",
-      "type": "entryPoint",
+      "type": "backofficeEntryPoint",
       "js": "/App_Plugins/Algolia/algolia.js"
     }
   ]
diff --git a/src/Umbraco.Cms.Integrations.Search.Algolia/Client/src/dashboard/manifest.ts b/src/Umbraco.Cms.Integrations.Search.Algolia/Client/src/dashboard/manifest.ts
@@ -1,11 +1,8 @@
-﻿import type { ManifestDashboard } from "@umbraco-cms/backoffice/extension-registry";
-
-const dashboardManifest: ManifestDashboard = {
+﻿const dashboardManifest: UmbExtensionManifest = {
     type: "dashboard",
-    name: "Algolia Search Management",
     alias: "Algolia.Dashboard",
-    elementName: "algolia-dashboard-element",
-    js: () => import('./search-management-dashboard/algolia-dashboard.element.js'),
+    name: "Algolia Search Management",
+    element: () => import('./search-management-dashboard/algolia-dashboard.element.js'),
     meta: {
         label: "Algolia Search Management",
         pathname: "algolia-search-management"
diff --git a/src/Umbraco.Cms.Integrations.Search.Algolia/Client/tsconfig.json b/src/Umbraco.Cms.Integrations.Search.Algolia/Client/tsconfig.json
@@ -4,7 +4,7 @@
     "experimentalDecorators": true,
     "useDefineForClassFields": false,
     "module": "ESNext",
-    "lib": ["ES2020", "DOM", "DOM.Iterable"],
+    "lib": [ "ES2020", "DOM", "DOM.Iterable" ],
     "skipLibCheck": true,
 
     /* Bundler mode */
@@ -19,7 +19,10 @@
     "noUnusedLocals": true,
     "noUnusedParameters": true,
     "noFallthroughCasesInSwitch": true,
-
+    "types": [
+      "@umbraco-cms/backoffice/extension-registry",
+      "@umbraco-cms/backoffice/extension-types"
+    ],
     "paths": {
       "@umbraco-integrations/algolia/generated": [
         "./generated/index.ts"
diff --git a/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/IAlgoliaIndexValueConverter.cs b/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/IAlgoliaIndexValueConverter.cs
@@ -1,4 +1,5 @@
 ﻿using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.PropertyEditors;
 
 namespace Umbraco.Cms.Integrations.Search.Algolia.Converters
 {
@@ -15,6 +16,6 @@ public interface IAlgoliaIndexValueConverter
         /// <summary>
         /// Parses the index values.
         /// </summary>
-        object ParseIndexValues(IProperty property, IEnumerable<object> indexValues);
+        object ParseIndexValues(IProperty property, IndexValue indexValue);
     }
 }
diff --git a/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoBooleanConverter.cs b/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoBooleanConverter.cs
@@ -1,16 +1,17 @@
 ﻿using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.PropertyEditors;
 
 namespace Umbraco.Cms.Integrations.Search.Algolia.Converters
 {
     public class UmbracoBooleanConverter : IAlgoliaIndexValueConverter
     {
         public string Name => Core.Constants.PropertyEditors.Aliases.Boolean;
 
-        public object ParseIndexValues(IProperty property, IEnumerable<object> indexValues)
+        public object ParseIndexValues(IProperty property, IndexValue indexValue)
         {
-            if (indexValues != null && indexValues.Any())
+            if (indexValue != null && indexValue.Values.Any())
             {
-                var value = indexValues.FirstOrDefault();
+                var value = indexValue.Values.FirstOrDefault();
 
                 return value != null
                     ? value.Equals(1)
diff --git a/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoDecimalConverter.cs b/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoDecimalConverter.cs
@@ -1,16 +1,17 @@
 ﻿using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.PropertyEditors;
 
 namespace Umbraco.Cms.Integrations.Search.Algolia.Converters
 {
     public class UmbracoDecimalConverter : IAlgoliaIndexValueConverter
     {
         public string Name => Core.Constants.PropertyEditors.Aliases.Decimal;
 
-        public object ParseIndexValues(IProperty property, IEnumerable<object> indexValues)
+        public object ParseIndexValues(IProperty property, IndexValue indexValue)
         {
-            if (indexValues != null && indexValues.Any())
+            if (indexValue != null && indexValue.Values.Any())
             {
-                var value = indexValues.FirstOrDefault();
+                var value = indexValue.Values.FirstOrDefault();
 
                 return value != null
                     ? decimal.Parse(value.ToString())
diff --git a/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoIntegerConverter.cs b/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoIntegerConverter.cs
@@ -1,16 +1,17 @@
 ﻿using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.PropertyEditors;
 
 namespace Umbraco.Cms.Integrations.Search.Algolia.Converters
 {
     public class UmbracoIntegerConverter : IAlgoliaIndexValueConverter
     {
         public string Name => Core.Constants.PropertyEditors.Aliases.Integer;
 
-        public object ParseIndexValues(IProperty property, IEnumerable<object> indexValues)
+        public object ParseIndexValues(IProperty property, IndexValue indexValue)
         {
-            if (indexValues != null && indexValues.Any())
+            if (indexValue != null && indexValue.Values.Any())
             {
-                var value = indexValues.FirstOrDefault();
+                var value = indexValue.Values.FirstOrDefault();
 
                 return value ?? default(int);
             }
diff --git a/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoMediaPickerConverter.cs b/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoMediaPickerConverter.cs
@@ -1,5 +1,6 @@
 ﻿using System.Text.Json;
 using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.PropertyEditors;
 using Umbraco.Cms.Core.Services;
 
 namespace Umbraco.Cms.Integrations.Search.Algolia.Converters
@@ -12,11 +13,11 @@ public class UmbracoMediaPickerConverter : IAlgoliaIndexValueConverter
 
         public string Name => Core.Constants.PropertyEditors.Aliases.MediaPicker3;
 
-        public object ParseIndexValues(IProperty property, IEnumerable<object> indexValues)
+        public object ParseIndexValues(IProperty property, IndexValue indexValue)
         {
             var list = new List<string>();
 
-            var parsedIndexValue = ParseIndexValue(indexValues);
+            var parsedIndexValue = ParseIndexValue(indexValue);
 
             if (string.IsNullOrEmpty(parsedIndexValue)) return list;
 
@@ -38,11 +39,11 @@ public object ParseIndexValues(IProperty property, IEnumerable<object> indexValu
             return list;
         }
 
-        private string ParseIndexValue(IEnumerable<object> values)
+        private string ParseIndexValue(IndexValue indexValue)
         {
-            if (values != null && values.Any())
+            if (indexValue != null && indexValue.Values.Any())
             {
-                var value = values.FirstOrDefault();
+                var value = indexValue.Values.FirstOrDefault();
 
                 if (value == null) return string.Empty;
 
diff --git a/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoTagsConverter.cs b/src/Umbraco.Cms.Integrations.Search.Algolia/Converters/UmbracoTagsConverter.cs
@@ -1,16 +1,17 @@
 ﻿using Umbraco.Cms.Core.Models;
+using Umbraco.Cms.Core.PropertyEditors;
 
 namespace Umbraco.Cms.Integrations.Search.Algolia.Converters
 {
     public class UmbracoTagsConverter : IAlgoliaIndexValueConverter
     {
         public string Name => Core.Constants.PropertyEditors.Aliases.Tags;
 
-        public object ParseIndexValues(IProperty property, IEnumerable<object> indexValues)
+        public object ParseIndexValues(IProperty property, IndexValue indexValue)
         {
-            if (indexValues != null && indexValues.Any())
+            if (indexValue != null && indexValue.Values.Any())
             {
-                return indexValues;
+                return indexValue.Values;
             }
 
             return Enumerable.Empty<string>();
diff --git a/src/Umbraco.Cms.Integrations.Search.Algolia/Services/AlgoliaSearchPropertyIndexValueFactory.cs b/src/Umbraco.Cms.Integrations.Search.Algolia/Services/AlgoliaSearchPropertyIndexValueFactory.cs
@@ -58,11 +58,11 @@ public virtual KeyValuePair<string, object> GetValue(IProperty property, string
                 var converter = _converterCollection.FirstOrDefault(p => p.Name == property.PropertyType.PropertyEditorAlias);
                 if (converter != null)
                 {
-                    var result = converter.ParseIndexValues(property, indexValue.Value);
+                    var result = converter.ParseIndexValues(property, indexValue);
                     return new KeyValuePair<string, object>(property.Alias, result);
                 }
 
-                return new KeyValuePair<string, object>(property.Alias, indexValue.Value);
+                return new KeyValuePair<string, object>(property.Alias, indexValue.Values);
             }
             catch (Exception ex)
             {
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
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<StaticWebAssetBasePath>/</StaticWebAssetBasePath>
@@ -13,7 +13,7 @@
 		<PackageIconUrl></PackageIconUrl>
 		<PackageProjectUrl>https://github.com/umbraco/Umbraco.Cms.Integrations/tree/main/src/Umbraco.Cms.Integrations.Search.Algolia</PackageProjectUrl>
 		<RepositoryUrl>https://github.com/umbraco/Umbraco.Cms.Integrations</RepositoryUrl>
-		<Version>3.2.0</Version>
+		<Version>4.0.0</Version>
 		<Authors>Umbraco HQ</Authors>
 		<Company>Umbraco</Company>
 		<PackageTags>Umbraco;Umbraco-Marketplace</PackageTags>
@@ -23,8 +23,8 @@
 
 	<ItemGroup>
 		<PackageReference Include="Algolia.Search" Version="6.13.0" />
-		<PackageReference Include="Umbraco.Cms.Web.Website" Version="[14.0.0,15)" />
-		<PackageReference Include="Umbraco.Cms.Api.Common" Version="[14.0.0,15)" />
+		<PackageReference Include="Umbraco.Cms.Web.Website" Version="[15.0.0,16)" />
+		<PackageReference Include="Umbraco.Cms.Api.Common" Version="[15.0.0,16)" />
 	</ItemGroup>
 
 	<ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`	`1`	`{`
`2`	`2`	`"id": "Umbraco.Cms.Integrations.Search.Algolia",`
`3`	`3`	`"name": "Umbraco CMS Integrations: Search - Algolia",`
`4`		`- "version": "3.0.0",`
	`4`	`+ "version": "4.0.0",`
`5`	`5`	`"extensions": [`
`6`	`6`	`{`
`7`	`7`	`"name": "Umbraco EntryPoint",`
`8`	`8`	`"alias": "Umb.Algolia.EntryPoint",`
`9`		`- "type": "entryPoint",`
	`9`	`+ "type": "backofficeEntryPoint",`
`10`	`10`	`"js": "/App_Plugins/Algolia/algolia.js"`
`11`	`11`	`}`
`12`	`12`	`]`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`using Umbraco.Cms.Core.Models;`
	`2`	`+using Umbraco.Cms.Core.PropertyEditors;`
`2`	`3`
`3`	`4`	`namespace Umbraco.Cms.Integrations.Search.Algolia.Converters`
`4`	`5`	`{`
`@@ -15,6 +16,6 @@ public interface IAlgoliaIndexValueConverter`
`15`	`16`	`/// <summary>`
`16`	`17`	`/// Parses the index values.`
`17`	`18`	`/// </summary>`
`18`		`- object ParseIndexValues(IProperty property, IEnumerable<object> indexValues);`
	`19`	`+ object ParseIndexValues(IProperty property, IndexValue indexValue);`
`19`	`20`	`}`
`20`	`21`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,16 +1,17 @@`
`1`	`1`	`using Umbraco.Cms.Core.Models;`
	`2`	`+using Umbraco.Cms.Core.PropertyEditors;`
`2`	`3`
`3`	`4`	`namespace Umbraco.Cms.Integrations.Search.Algolia.Converters`
`4`	`5`	`{`
`5`	`6`	`public class UmbracoBooleanConverter : IAlgoliaIndexValueConverter`
`6`	`7`	`{`
`7`	`8`	`public string Name => Core.Constants.PropertyEditors.Aliases.Boolean;`
`8`	`9`
`9`		`- public object ParseIndexValues(IProperty property, IEnumerable<object> indexValues)`
	`10`	`+ public object ParseIndexValues(IProperty property, IndexValue indexValue)`
`10`	`11`	`{`
`11`		`- if (indexValues != null && indexValues.Any())`
	`12`	`+ if (indexValue != null && indexValue.Values.Any())`
`12`	`13`	`{`
`13`		`- var value = indexValues.FirstOrDefault();`
	`14`	`+ var value = indexValue.Values.FirstOrDefault();`
`14`	`15`
`15`	`16`	`return value != null`
`16`	`17`	`? value.Equals(1)`