Browse Source

Update algolia.

pull/493/head
Sebastian 6 years ago
parent
commit
0779f521d4
  1. 19
      backend/extensions/Squidex.Extensions/Actions/Algolia/AlgoliaActionHandler.cs
  2. 4
      backend/extensions/Squidex.Extensions/Squidex.Extensions.csproj
  3. 2
      backend/src/Squidex.Domain.Apps.Entities/Backup/BackupGrain.cs
  4. 12
      backend/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj
  5. 8
      backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
  6. 2
      backend/src/Squidex.Web/Constants.cs
  7. 6
      backend/src/Squidex/Squidex.csproj

19
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<AlgoliaAction, AlgoliaJob>
{
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);
}

4
backend/extensions/Squidex.Extensions/Squidex.Extensions.csproj

@ -8,11 +8,11 @@
<ProjectReference Include="..\..\src\Squidex.Web\Squidex.Web.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Algolia.Search" Version="5.3.1" />
<PackageReference Include="Algolia.Search" Version="6.5.1" />
<PackageReference Include="Confluent.Kafka" Version="1.3.0" />
<PackageReference Include="CoreTweet" Version="1.0.0.483" />
<PackageReference Include="Datadog.Trace" Version="1.13.2" />
<PackageReference Include="Elasticsearch.Net" Version="7.5.1" />
<PackageReference Include="Elasticsearch.Net" Version="7.6.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.2" />
<PackageReference Include="Microsoft.OData.Core" Version="7.6.3" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />

2
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);
}

12
backend/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj

@ -16,10 +16,10 @@
<ProjectReference Include="..\Squidex.Shared\Squidex.Shared.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="CsvHelper" Version="15.0.0" />
<PackageReference Include="Elasticsearch.Net" Version="7.5.1" />
<PackageReference Include="Equals.Fody" Version="1.9.5" />
<PackageReference Include="Fody" Version="4.2.1">
<PackageReference Include="CsvHelper" Version="15.0.1" />
<PackageReference Include="Elasticsearch.Net" Version="7.6.0" />
<PackageReference Include="Equals.Fody" Version="1.9.5" allowedVersions="[1.9.5]" />
<PackageReference Include="Fody" Version="4.2.1" allowedVersions="[4.2.1]">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
@ -28,11 +28,11 @@
<PackageReference Include="Lucene.Net.Analysis.Common" Version="4.8.0-beta00005" />
<PackageReference Include="Lucene.Net.Queries" Version="4.8.0-beta00005" />
<PackageReference Include="Lucene.Net.QueryParser" Version="4.8.0-beta00005" />
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.1">
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Orleans.Core" Version="3.1.1" />
<PackageReference Include="Microsoft.Orleans.Core" Version="3.1.2" />
<PackageReference Include="NodaTime" Version="2.4.7" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />

8
backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj

@ -10,7 +10,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Equals.Fody" Version="1.9.5" />
<PackageReference Include="FluentFTP" Version="31.3.2" />
<PackageReference Include="FluentFTP" Version="32.1.0" />
<PackageReference Include="Fody" Version="4.2.1">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
@ -21,12 +21,12 @@
<PackageReference Include="Microsoft.Extensions.Logging" Version="3.1.2" />
<PackageReference Include="Microsoft.Extensions.ObjectPool" Version="3.1.2" />
<PackageReference Include="Microsoft.OData.Core" Version="7.6.3" />
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.1">
<PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="3.1.2">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="Microsoft.Orleans.Core" Version="3.1.1" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.1.1" />
<PackageReference Include="Microsoft.Orleans.Core" Version="3.1.2" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.1.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="NJsonSchema" Version="10.1.5" />
<PackageReference Include="NodaTime" Version="2.4.7" />

2
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";

6
backend/src/Squidex/Squidex.csproj

@ -45,9 +45,9 @@
<PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.1.0" />
<PackageReference Include="Microsoft.Data.Edm" Version="5.8.4" />
<PackageReference Include="Microsoft.OData.Core" Version="7.6.3" />
<PackageReference Include="Microsoft.Orleans.Core" Version="3.1.1" />
<PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.1.1" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.1.1" />
<PackageReference Include="Microsoft.Orleans.Core" Version="3.1.2" />
<PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="3.1.2" />
<PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="3.1.2" />
<PackageReference Include="MongoDB.Driver" Version="2.10.2" />
<PackageReference Include="Namotion.Reflection" Version="1.0.10" />
<PackageReference Include="NJsonSchema" Version="10.1.5" />

Loading…
Cancel
Save