Update (#1083)

* Update dependencies. * Use new cache settings. * Fix tests. * Fix domain object cache.- * Test subscriptions again. * Disable messaging cache. * Use random name for cluster instances. * Bind settings properly. * Update operation.
Squidex · Mar 27, 2024 · 43b895b · 43b895b
1 parent bab6d23
commit 43b895b
Show file tree

Hide file tree

Showing 16 changed files with 662 additions and 231 deletions.
diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/UpdateValues.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/UpdateValues.cs
@@ -0,0 +1,56 @@
+// ==========================================================================
+//  Squidex Headless CMS
+// ==========================================================================
+//  Copyright (c) Squidex UG (haftungsbeschraenkt)
+//  All rights reserved. Licensed under the MIT license.
+// ==========================================================================
+
+using Squidex.Domain.Apps.Core.Contents;
+using Squidex.Domain.Apps.Core.Schemas;
+using Squidex.Domain.Apps.Core.Scripting;
+using Squidex.Infrastructure.Json.Objects;
+
+namespace Squidex.Domain.Apps.Core.ConvertContent;
+
+public sealed class UpdateValues : IContentValueConverter
+{
+    private readonly ContentData existingData;
+    private readonly IScriptEngine scriptEngine;
+    private ScriptVars? vars;
+
+    public UpdateValues(ContentData existingData, IScriptEngine scriptEngine)
+    {
+        this.existingData = existingData;
+        this.scriptEngine = scriptEngine;
+    }
+
+    public (bool Remove, JsonValue) ConvertValue(IField field, JsonValue source, IField? parent)
+    {
+        if (source.Value is not JsonObject jsonObject)
+        {
+            return (false, source);
+        }
+
+        if (jsonObject.TryGetValue("$unset", out var value1) && !Equals(value1.Value, false))
+        {
+            return (true, source);
+        }
+
+        if (!jsonObject.TryGetValue("$update", out var value2) || value2.Value is not string update)
+        {
+            return (false, source);
+        }
+
+        var options = new ScriptOptions { Readonly = true };
+
+        vars ??= new ScriptVars
+        {
+            ["$data"] = existingData,
+            ["$self"] = jsonObject
+        };
+
+        var result = scriptEngine.Execute(vars, update, options);
+
+        return (false, result);
+    }
+}
diff --git a/.../src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/ContentFieldProperty.cs b/.../src/Squidex.Domain.Apps.Core.Operations/Scripting/ContentWrapper/ContentFieldProperty.cs
@@ -7,6 +7,7 @@
 
 using System.Diagnostics;
 using Jint.Native;
+using Squidex.Domain.Apps.Core.Scripting.Internal;
 using Squidex.Infrastructure.Json.Objects;
 
 namespace Squidex.Domain.Apps.Core.Scripting.ContentWrapper;

diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/Internal/JintObjectConverter.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/Internal/JintObjectConverter.cs
@@ -14,6 +14,7 @@
 using Squidex.Domain.Apps.Core.Contents;
 using Squidex.Domain.Apps.Core.Scripting.ContentWrapper;
 using Squidex.Infrastructure;
+using Squidex.Infrastructure.Json.Objects;
 using Squidex.Shared.Users;
 
 namespace Squidex.Domain.Apps.Core.Scripting.Internal;
@@ -44,6 +45,9 @@ public bool TryConvert(Engine engine, object value, [MaybeNullWhen(false)] out J
             case ClaimsPrincipal principal:
                 result = JintUser.Create(engine, principal);
                 return true;
+            case JsonValue jsonValue:
+                result = JsonMapper.Map(jsonValue, engine);
+                return true;
             case DomainId domainId:
                 result = domainId.ToString();
                 return true;

diff --git a/...ns/Scripting/ContentWrapper/JsonMapper.cs → ...erations/Scripting/Internal/JsonMapper.cs b/...ns/Scripting/ContentWrapper/JsonMapper.cs → ...erations/Scripting/Internal/JsonMapper.cs
@@ -14,7 +14,7 @@
 using Squidex.Infrastructure;
 using Squidex.Infrastructure.Json.Objects;
 
-namespace Squidex.Domain.Apps.Core.Scripting.ContentWrapper;
+namespace Squidex.Domain.Apps.Core.Scripting.Internal;
 
 public static class JsonMapper
 {

diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/JintScriptEngine.cs
@@ -152,8 +152,9 @@ private ScriptExecutionContext<T> CreateEngine<T>(ScriptOptions options, Cancell
 
         var engine = new Engine(engineOptions =>
         {
-            engineOptions.SetTypeConverter(engine => new CustomClrConverter(engine));
             engineOptions.AddObjectConverter(JintObjectConverter.Instance);
+            engineOptions.AllowClrWrite(!options.Readonly);
+            engineOptions.SetTypeConverter(engine => new CustomClrConverter(engine));
             engineOptions.SetReferencesResolver(NullPropagation.Instance);
             engineOptions.Strict();
 

diff --git a/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/ScriptOptions.cs b/backend/src/Squidex.Domain.Apps.Core.Operations/Scripting/ScriptOptions.cs
@@ -14,4 +14,6 @@ public record struct ScriptOptions
     public bool CanDisallow { get; set; }
 
     public bool AsContext { get; set; }
+
+    public bool Readonly { get; set; }
 }
diff --git a/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetsJintExtension.cs b/backend/src/Squidex.Domain.Apps.Entities/Assets/AssetsJintExtension.cs
@@ -17,7 +17,6 @@
 using Squidex.Domain.Apps.Core.Assets;
 using Squidex.Domain.Apps.Core.Rules.EnrichedEvents;
 using Squidex.Domain.Apps.Core.Scripting;
-using Squidex.Domain.Apps.Core.Scripting.ContentWrapper;
 using Squidex.Domain.Apps.Core.Scripting.Internal;
 using Squidex.Domain.Apps.Entities.Assets.Commands;
 using Squidex.Domain.Apps.Entities.Properties;

diff --git a/backend/src/Squidex.Domain.Apps.Entities/Contents/DomainObject/ContentDomainObject.cs b/backend/src/Squidex.Domain.Apps.Entities/Contents/DomainObject/ContentDomainObject.cs
@@ -322,18 +322,18 @@ protected override bool CanAccept(ICommand command, DomainObjectState state)
         operation.MustHavePermission(PermissionIds.AppContentsUpdate);
         operation.MustHaveData(c.Data);
 
+        var newData = operation.InvokeUpdates(c.Data, Snapshot.EditingData);
+
         if (!c.DoNotValidate)
         {
-            await operation.ValidateInputAsync(c.Data, c.OptimizeValidation, Snapshot.IsPublished, ct);
+            await operation.ValidateInputAsync(newData, c.OptimizeValidation, Snapshot.IsPublished, ct);
         }
 
         if (!c.DoNotValidateWorkflow)
         {
             await operation.CheckUpdateAsync();
         }
 
-        var newData = c.Data;
-
         if (c.EnrichDefaults)
         {
             newData = operation.GenerateDefaultValues(newData);
@@ -363,6 +363,8 @@ protected override bool CanAccept(ICommand command, DomainObjectState state)
         operation.MustHavePermission(PermissionIds.AppContentsUpdate);
         operation.MustHaveData(c.Data);
 
+        c.Data = operation.InvokeUpdates(c.Data, Snapshot.EditingData);
+
         if (!c.DoNotValidate)
         {
             await operation.ValidateInputPartialAsync(c.Data, c.OptimizeValidation, Snapshot.IsPublished, ct);

diff --git a/...end/src/Squidex.Domain.Apps.Entities/Contents/DomainObject/Guards/ValidationExtensions.cs b/...end/src/Squidex.Domain.Apps.Entities/Contents/DomainObject/Guards/ValidationExtensions.cs
@@ -9,6 +9,7 @@
 using Squidex.Domain.Apps.Core.Apps;
 using Squidex.Domain.Apps.Core.Contents;
 using Squidex.Domain.Apps.Core.ConvertContent;
+using Squidex.Domain.Apps.Core.Scripting;
 using Squidex.Domain.Apps.Core.ValidateContent;
 using Squidex.Domain.Apps.Entities.Contents.Repositories;
 using Squidex.Infrastructure;
@@ -97,6 +98,17 @@ public static ContentData GenerateDefaultValues(this ContentOperation operation,
         return converter.Convert(data);
     }
 
+    public static ContentData InvokeUpdates(this ContentOperation operation, ContentData data, ContentData currentData)
+    {
+        var converter =
+            new ContentConverter(
+                operation.Components,
+                operation.Schema);
+        converter.Add(new UpdateValues(currentData, operation.Resolve<IScriptEngine>()));
+
+        return converter.Convert(data);
+    }
+
     public static async Task CheckReferrersAsync(this ContentOperation operation,
         CancellationToken ct)
     {

diff --git a/backend/src/Squidex/wwwroot/editor/squidex-editor.css b/backend/src/Squidex/wwwroot/editor/squidex-editor.css