Browse Source

Bugfixes2 (#1243)

* Improve error DB error handling.

* Several fixes
pull/1244/head
Sebastian Stehle 9 months ago
committed by GitHub
parent
commit
52c2d6c790
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 14
      backend/src/Squidex.Data.EntityFramework/Squidex.Data.EntityFramework.csproj
  2. 12
      backend/src/Squidex.Data.MongoDb/Squidex.Data.MongoDb.csproj
  3. 2
      backend/src/Squidex.Domain.Apps.Core.Model/Squidex.Domain.Apps.Core.Model.csproj
  4. 6
      backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/ScriptExecutionContext.cs
  5. 4
      backend/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj
  6. 14
      backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
  7. 24
      backend/src/Squidex/Squidex.csproj
  8. 76
      backend/src/Squidex/wwwroot/editor/squidex-editor.js
  9. 25
      backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/Scripting/JintScriptEngineTests.cs

14
backend/src/Squidex.Data.EntityFramework/Squidex.Data.EntityFramework.csproj

@ -40,13 +40,13 @@
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql.Json.Microsoft" Version="8.0.3" />
<PackageReference Include="Pomelo.EntityFrameworkCore.MySql.NetTopologySuite" Version="8.0.3" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="Squidex.AI.EntityFramework" Version="7.28.0" />
<PackageReference Include="Squidex.Assets.EntityFramework" Version="7.28.0" />
<PackageReference Include="Squidex.Assets.TusAdapter" Version="7.28.0" />
<PackageReference Include="Squidex.Events.EntityFramework" Version="7.28.0" />
<PackageReference Include="Squidex.Flows.EntityFramework" Version="7.28.0" />
<PackageReference Include="Squidex.Hosting" Version="7.28.0" />
<PackageReference Include="Squidex.Messaging.EntityFramework" Version="7.28.0" />
<PackageReference Include="Squidex.AI.EntityFramework" Version="7.30.0" />
<PackageReference Include="Squidex.Assets.EntityFramework" Version="7.30.0" />
<PackageReference Include="Squidex.Assets.TusAdapter" Version="7.30.0" />
<PackageReference Include="Squidex.Events.EntityFramework" Version="7.30.0" />
<PackageReference Include="Squidex.Flows.EntityFramework" Version="7.30.0" />
<PackageReference Include="Squidex.Hosting" Version="7.30.0" />
<PackageReference Include="Squidex.Messaging.EntityFramework" Version="7.30.0" />
<PackageReference Include="Squidex.OpenIdDict.EntityFramework" Version="5.8.4" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />

12
backend/src/Squidex.Data.MongoDb/Squidex.Data.MongoDb.csproj

@ -25,12 +25,12 @@
<PackageReference Include="MongoDB.Driver.GridFS" Version="2.30.0" />
<PackageReference Include="NodaTime.Serialization.SystemTextJson" Version="1.3.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="Squidex.AI.Mongo" Version="7.28.0" />
<PackageReference Include="Squidex.Assets.Mongo" Version="7.28.0" />
<PackageReference Include="Squidex.Events.Mongo" Version="7.28.0" />
<PackageReference Include="Squidex.Flows.Mongo" Version="7.28.0" />
<PackageReference Include="Squidex.Hosting" Version="7.28.0" />
<PackageReference Include="Squidex.Messaging.Mongo" Version="7.28.0" />
<PackageReference Include="Squidex.AI.Mongo" Version="7.30.0" />
<PackageReference Include="Squidex.Assets.Mongo" Version="7.30.0" />
<PackageReference Include="Squidex.Events.Mongo" Version="7.30.0" />
<PackageReference Include="Squidex.Flows.Mongo" Version="7.30.0" />
<PackageReference Include="Squidex.Hosting" Version="7.30.0" />
<PackageReference Include="Squidex.Messaging.Mongo" Version="7.30.0" />
<PackageReference Include="Squidex.OpenIddict.MongoDb" Version="5.8.4" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.ValueTuple" Version="4.5.0" />

2
backend/src/Squidex.Domain.Apps.Core.Model/Squidex.Domain.Apps.Core.Model.csproj

@ -20,7 +20,7 @@
<PackageReference Include="NetTopologySuite" Version="2.5.0" />
<PackageReference Include="NodaTime.Serialization.SystemTextJson" Version="1.3.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="Squidex.Flows" Version="7.28.0" />
<PackageReference Include="Squidex.Flows" Version="7.30.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

6
backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/ScriptExecutionContext.cs

@ -64,10 +64,7 @@ public sealed class ScriptExecutionContext<T> : ScriptExecutionContext, ISchedul
public override JsValue Evaluate(Prepared<Script> script)
{
lock (Engine)
{
return Engine.Evaluate(script);
}
return Engine.Evaluate(script);
}
public override void Schedule(Func<IScheduler, CancellationToken, Task> action)
@ -83,7 +80,6 @@ public sealed class ScriptExecutionContext<T> : ScriptExecutionContext, ISchedul
try
{
await action(this, cancellationToken);
TryComplete();
}
catch (Exception ex)

4
backend/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj

@ -29,8 +29,8 @@
<PackageReference Include="NJsonSchema" Version="11.0.2" />
<PackageReference Include="NodaTime.Serialization.SystemTextJson" Version="1.3.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="Squidex.AI" Version="7.28.0" />
<PackageReference Include="Squidex.Messaging.Subscriptions" Version="7.28.0" />
<PackageReference Include="Squidex.AI" Version="7.30.0" />
<PackageReference Include="Squidex.Messaging.Subscriptions" Version="7.30.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
<PackageReference Include="System.Linq.Async" Version="6.0.1" />

14
backend/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj

@ -24,13 +24,13 @@
<PackageReference Include="NodaTime" Version="3.2.0" />
<PackageReference Include="OpenTelemetry.Api" Version="1.9.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="Squidex.Assets" Version="7.28.0" />
<PackageReference Include="Squidex.Caching" Version="7.28.0" />
<PackageReference Include="Squidex.Events" Version="7.28.0" />
<PackageReference Include="Squidex.Hosting.Abstractions" Version="7.28.0" />
<PackageReference Include="Squidex.Log" Version="7.28.0" />
<PackageReference Include="Squidex.Messaging" Version="7.28.0" />
<PackageReference Include="Squidex.Text" Version="7.28.0" />
<PackageReference Include="Squidex.Assets" Version="7.30.0" />
<PackageReference Include="Squidex.Caching" Version="7.30.0" />
<PackageReference Include="Squidex.Events" Version="7.30.0" />
<PackageReference Include="Squidex.Hosting.Abstractions" Version="7.30.0" />
<PackageReference Include="Squidex.Log" Version="7.30.0" />
<PackageReference Include="Squidex.Messaging" Version="7.30.0" />
<PackageReference Include="Squidex.Text" Version="7.30.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="System.Collections.Immutable" Version="8.0.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />

24
backend/src/Squidex/Squidex.csproj

@ -60,17 +60,17 @@
<PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
<PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
<PackageReference Include="ReportGenerator" Version="5.4.1" PrivateAssets="all" />
<PackageReference Include="Squidex.Assets.Azure" Version="7.28.0" />
<PackageReference Include="Squidex.Assets.GoogleCloud" Version="7.28.0" />
<PackageReference Include="Squidex.Assets.FTP" Version="7.28.0" />
<PackageReference Include="Squidex.Assets.ImageSharp" Version="7.28.0" />
<PackageReference Include="Squidex.Assets.S3" Version="7.28.0" />
<PackageReference Include="Squidex.Assets.TusAdapter" Version="7.28.0" />
<PackageReference Include="Squidex.Assets.Azure" Version="7.30.0" />
<PackageReference Include="Squidex.Assets.GoogleCloud" Version="7.30.0" />
<PackageReference Include="Squidex.Assets.FTP" Version="7.30.0" />
<PackageReference Include="Squidex.Assets.ImageSharp" Version="7.30.0" />
<PackageReference Include="Squidex.Assets.S3" Version="7.30.0" />
<PackageReference Include="Squidex.Assets.TusAdapter" Version="7.30.0" />
<PackageReference Include="Squidex.ClientLibrary" Version="21.8.0" />
<PackageReference Include="Squidex.Events.GetEventStore" Version="7.28.0" />
<PackageReference Include="Squidex.Hosting" Version="7.28.0" />
<PackageReference Include="Squidex.Messaging.All" Version="7.28.0" />
<PackageReference Include="Squidex.Messaging.Subscriptions" Version="7.28.0" />
<PackageReference Include="Squidex.Events.GetEventStore" Version="7.30.0" />
<PackageReference Include="Squidex.Hosting" Version="7.30.0" />
<PackageReference Include="Squidex.Messaging.All" Version="7.30.0" />
<PackageReference Include="Squidex.Messaging.Subscriptions" Version="7.30.0" />
<PackageReference Include="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="all" />
<PackageReference Include="YDotNet" Version="0.4.3" />
<PackageReference Include="YDotNet.Native" Version="0.4.3" />
@ -84,11 +84,11 @@
</ItemGroup>
<ItemGroup Condition="'$(IncludeMagick)' == 'true'">
<PackageReference Include="Squidex.Assets.ImageMagick" Version="7.28.0" />
<PackageReference Include="Squidex.Assets.ImageMagick" Version="7.30.0" />
</ItemGroup>
<ItemGroup Condition="'$(IncludeKafka)' == 'true'">
<PackageReference Include="Squidex.Messaging.Kafka" Version="7.28.0" />
<PackageReference Include="Squidex.Messaging.Kafka" Version="7.30.0" />
</ItemGroup>
<PropertyGroup>

76
backend/src/Squidex/wwwroot/editor/squidex-editor.js

File diff suppressed because one or more lines are too long

25
backend/tests/Squidex.Domain.Apps.Core.Tests/Operations/Scripting/JintScriptEngineTests.cs

@ -698,4 +698,29 @@ public class JintScriptEngineTests : IClassFixture<TranslationsFixture>
Assert.Equal(100, ((AssetMetadata)vars["metadata"]!).GetInt32(KnownMetadataKeys.PixelWidth));
}
[Fact]
public async Task Should_run_with_promises()
{
var vars = new DataScriptVars();
const string script = @"
function asyncMethod() {
return new Promise((resolve, reject) => {
getJSON('http://cloud.squidex.io/healthz', (data) => {
resolve(data);
}, {}, true);
});
}
(async () => {
await asyncMethod();
complete(42)
})()
";
var result = await sut.ExecuteAsync(vars, script, contentOptions);
Assert.Equal(42.0, result.Value);
}
}

Loading…
Cancel
Save