diff --git a/backend/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaActionHandler.cs b/backend/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaActionHandler.cs index 9a2b12f6a..257ab688f 100644 --- a/backend/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaActionHandler.cs +++ b/backend/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaActionHandler.cs @@ -8,12 +8,11 @@ using System; using System.Threading; using System.Threading.Tasks; -using Algolia.Search; +using Algolia.Search.Clients; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Squidex.Domain.Apps.Core.HandleRules; using Squidex.Domain.Apps.Core.Rules.EnrichedEvents; -using AlgoliaIndex = Algolia.Search.Index; #pragma warning disable IDE0059 // Value assigned to symbol is never used @@ -21,14 +20,14 @@ namespace Squidex.Extensions.Actions.Algolia { public sealed class AlgoliaActionHandler : RuleActionHandler { - private readonly ClientPool<(string AppId, string ApiKey, string IndexName), AlgoliaIndex> clients; + private readonly ClientPool<(string AppId, string ApiKey, string IndexName), ISearchIndex> clients; public AlgoliaActionHandler(RuleEventFormatter formatter) : base(formatter) { - clients = new ClientPool<(string AppId, string ApiKey, string IndexName), AlgoliaIndex>(key => + clients = new ClientPool<(string AppId, string ApiKey, string IndexName), ISearchIndex>(key => { - var client = new AlgoliaClient(key.AppId, key.ApiKey); + var client = new SearchClient(key.AppId, key.ApiKey); return client.InitIndex(key.IndexName); }); @@ -102,18 +101,18 @@ namespace Squidex.Extensions.Actions.Algolia { if (job.Content != null) { - var response = await index.PartialUpdateObjectAsync(job.Content, true, ct); + var response = await index.PartialUpdateObjectAsync(job.Content, null, ct, true); - return Result.Success(response.ToString(Formatting.Indented)); + return Result.Success(JsonConvert.SerializeObject(response, Formatting.Indented)); } else { - var response = await index.DeleteObjectAsync(job.ContentId, ct); + var response = await index.DeleteObjectAsync(job.ContentId, null, ct); - return Result.Success(response.ToString(Formatting.Indented)); + return Result.Success(JsonConvert.SerializeObject(response, Formatting.Indented)); } } - catch (AlgoliaException ex) + catch (Exception ex) { return Result.Failed(ex); } diff --git a/backend/extensions/Squidex.Extensions/Squidex.Extensions.csproj b/backend/extensions/Squidex.Extensions/Squidex.Extensions.csproj index 0a9083a4e..dbd8a8769 100644 --- a/backend/extensions/Squidex.Extensions/Squidex.Extensions.csproj +++ b/backend/extensions/Squidex.Extensions/Squidex.Extensions.csproj @@ -8,11 +8,11 @@ - + - + diff --git a/backend/src/Squidex.Domain.Apps.Entities/Backup/BackupGrain.cs b/backend/src/Squidex.Domain.Apps.Entities/Backup/BackupGrain.cs index ad877e48b..10d494612 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Backup/BackupGrain.cs +++ b/backend/src/Squidex.Domain.Apps.Entities/Backup/BackupGrain.cs @@ -142,7 +142,7 @@ namespace Squidex.Domain.Apps.Entities.Backup { var @event = eventDataFormatter.Parse(storedEvent.Data); - if (@event.Payload is SquidexEvent squidexEvent) + if (@event.Payload is SquidexEvent squidexEvent && squidexEvent.Actor != null) { context.UserMapping.Backup(squidexEvent.Actor); } diff --git a/backend/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj b/backend/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj index dbc0713a5..d33c44c6c 100644 --- a/backend/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj +++ b/backend/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj @@ -16,10 +16,10 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -28,11 +28,11 @@ - + all runtime; build; native; contentfiles; analyzers - + diff --git a/backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj b/backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj index 717448721..5fc9d9231 100644 --- a/backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj +++ b/backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj @@ -10,7 +10,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -21,12 +21,12 @@ - + all runtime; build; native; contentfiles; analyzers - - + + diff --git a/backend/src/Squidex.Web/Constants.cs b/backend/src/Squidex.Web/Constants.cs index 0c10bd520..b27382684 100644 --- a/backend/src/Squidex.Web/Constants.cs +++ b/backend/src/Squidex.Web/Constants.cs @@ -18,7 +18,7 @@ namespace Squidex.Web public static readonly string ApiScope = "squidex-api"; - public static readonly string OrleansClusterId = "squidex"; + public static readonly string OrleansClusterId = "squidex-v2"; public static readonly string OrleansPrefix = "/orleans"; diff --git a/backend/src/Squidex/Squidex.csproj b/backend/src/Squidex/Squidex.csproj index 0099446cd..e25e23208 100644 --- a/backend/src/Squidex/Squidex.csproj +++ b/backend/src/Squidex/Squidex.csproj @@ -45,9 +45,9 @@ - - - + + +