* Bugfix with deleting items.

* Bugfix for arrays with strings.
8 years ago · 69736f5b13
25 changed files with 191 additions and 137 deletions
--- a/extensions/Squidex.Extensions/Squidex.Extensions.csproj
+++ b/extensions/Squidex.Extensions/Squidex.Extensions.csproj
@ -11,12 +11,12 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Algolia.Search" Version="5.2.0" />
-    <PackageReference Include="CoreTweet" Version="0.9.0.415" />
-    <PackageReference Include="Elasticsearch.Net" Version="6.3.1" />
+    <PackageReference Include="CoreTweet" Version="1.0.0.483" />
+    <PackageReference Include="Elasticsearch.Net" Version="6.4.0" />
    <PackageReference Include="Microsoft.Extensions.Http" Version="2.1.1" />
    <PackageReference Include="Microsoft.OData.Core" Version="7.5.1" />
    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="NodaTime" Version="2.4.0" />
+    <PackageReference Include="NodaTime" Version="2.4.2" />
    <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
    <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
--- a/src/Squidex.Domain.Apps.Core.Model/Squidex.Domain.Apps.Core.Model.csproj
+++ b/src/Squidex.Domain.Apps.Core.Model/Squidex.Domain.Apps.Core.Model.csproj
@ -8,7 +8,7 @@
    <DebugSymbols>True</DebugSymbols>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="Fody" Version="3.2.9">
+    <PackageReference Include="Fody" Version="3.2.17">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
    </PackageReference>
--- a/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/ContentConverter.cs
+++ b/src/Squidex.Domain.Apps.Core.Operations/ConvertContent/ContentConverter.cs
@ -7,6 +7,10 @@

 using System;
 using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using Newtonsoft.Json.Linq;
 using Squidex.Domain.Apps.Core.Contents;
 using Squidex.Domain.Apps.Core.Schemas;
 using Squidex.Infrastructure;
@ -18,6 +22,57 @@ namespace Squidex.Domain.Apps.Core.ConvertContent
        private static readonly Func<IRootField, string> KeyNameResolver = f => f.Name;
        private static readonly Func<IRootField, long> KeyIdResolver = f => f.Id;

+        public static string ToFullText<T>(this ContentData<T> data, int maxTotalLength = 1024 * 1024, int maxFieldLength = 1000, string separator = " ")
+        {
+            var stringBuilder = new StringBuilder();
+
+            foreach (var value in data.Values.SelectMany(x => x.Values))
+            {
+                AppendText(value, stringBuilder, maxFieldLength, separator, false);
+            }
+
+            var result = stringBuilder.ToString();
+
+            if (result.Length > maxTotalLength)
+            {
+                result = result.Substring(0, maxTotalLength);
+            }
+
+            return result;
+        }
+
+        private static void AppendText(JToken value, StringBuilder stringBuilder, int maxFieldLength, string separator, bool allowObjects)
+        {
+            if (value?.Type == JTokenType.String)
+            {
+                var text = ((JValue)value).ToString(CultureInfo.InvariantCulture);
+
+                if (text.Length <= maxFieldLength)
+                {
+                    if (stringBuilder.Length > 0)
+                    {
+                        stringBuilder.Append(separator);
+                    }
+
+                    stringBuilder.Append(text);
+                }
+            }
+            else if (value?.Type == JTokenType.Array)
+            {
+                foreach (var item in value)
+                {
+                    AppendText(item, stringBuilder, maxFieldLength, separator, true);
+                }
+            }
+            else if (value?.Type == JTokenType.Object && allowObjects)
+            {
+                foreach (JProperty property in value)
+                {
+                    AppendText(property.Value, stringBuilder, maxFieldLength, separator, true);
+                }
+            }
+        }
+
        public static NamedContentData ConvertId2Name(this IdContentData content, Schema schema, params FieldConverter[] converters)
        {
            Guard.NotNull(schema, nameof(schema));
--- a/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj
+++ b/src/Squidex.Domain.Apps.Core.Operations/Squidex.Domain.Apps.Core.Operations.csproj
@ -17,7 +17,7 @@
    <PackageReference Include="Jint" Version="2.11.58" />
    <PackageReference Include="Microsoft.OData.Core" Version="7.5.1" />
    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="NJsonSchema" Version="9.11.0" />
+    <PackageReference Include="NJsonSchema" Version="9.12.2" />
    <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
    <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
--- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Extensions.cs
+++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/Extensions.cs
@ -7,10 +7,7 @@

 using System;
 using System.Collections.Generic;
-using System.Globalization;
 using System.Linq;
-using System.Text;
-using Newtonsoft.Json.Linq;
 using Squidex.Domain.Apps.Core.Contents;
 using Squidex.Domain.Apps.Core.ConvertContent;
 using Squidex.Domain.Apps.Core.ExtractReferenceIds;
@ -20,8 +17,6 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents
 {
    public static class Extensions
    {
-        private const int MaxLength = 1024 * 1024;
-
        public static List<Guid> ToReferencedIds(this IdContentData data, Schema schema)
        {
            return data.GetReferencedIds(schema).ToList();
@ -46,37 +41,5 @@ namespace Squidex.Domain.Apps.Entities.MongoDb.Contents
                FieldConverters.ForNestedName2Id(
                    ValueConverters.EncodeJson()));
        }
-
-        public static string ToFullText<T>(this ContentData<T> data)
-        {
-            var stringBuilder = new StringBuilder();
-
-            foreach (var text in data.Values.SelectMany(x => x.Values).Where(x => x != null).OfType<JValue>())
-            {
-                if (text.Type == JTokenType.String)
-                {
-                    var value = text.ToString(CultureInfo.InvariantCulture);
-
-                    if (value.Length < 1000)
-                    {
-                        if (stringBuilder.Length > 0)
-                        {
-                            stringBuilder.Append(" ");
-                        }
-
-                        stringBuilder.Append(text);
-                    }
-                }
-            }
-
-            var result = stringBuilder.ToString();
-
-            if (result.Length > MaxLength)
-            {
-                result = result.Substring(MaxLength);
-            }
-
-            return result;
-        }
    }
 }
--- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentDraftCollection.cs
+++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentDraftCollection.cs
@ -12,6 +12,7 @@ using System.Threading;
 using System.Threading.Tasks;
 using MongoDB.Driver;
 using NodaTime;
+using Squidex.Domain.Apps.Core.ConvertContent;
 using Squidex.Domain.Apps.Entities.Apps;
 using Squidex.Domain.Apps.Entities.Contents;
 using Squidex.Domain.Apps.Entities.Contents.State;
--- a/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentPublishedCollection.cs
+++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Contents/MongoContentPublishedCollection.cs
@ -9,6 +9,7 @@ using System;
 using System.Threading;
 using System.Threading.Tasks;
 using MongoDB.Driver;
+using Squidex.Domain.Apps.Core.ConvertContent;
 using Squidex.Domain.Apps.Entities.Apps;
 using Squidex.Domain.Apps.Entities.Contents;
 using Squidex.Domain.Apps.Entities.Schemas;
--- a/src/Squidex.Domain.Apps.Entities.MongoDb/Squidex.Domain.Apps.Entities.MongoDb.csproj
+++ b/src/Squidex.Domain.Apps.Entities.MongoDb/Squidex.Domain.Apps.Entities.MongoDb.csproj
@ -16,7 +16,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.OData.Core" Version="7.5.1" />
-    <PackageReference Include="MongoDB.Driver" Version="2.7.0" />
+    <PackageReference Include="MongoDB.Driver" Version="2.7.2" />
    <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
--- a/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Utils/GuidGraphType.cs
+++ b/src/Squidex.Domain.Apps.Entities/Contents/GraphQL/Types/Utils/GuidGraphType.cs
@ -1,55 +0,0 @@
-// ==========================================================================
-//  Squidex Headless CMS
-// ==========================================================================
-//  Copyright (c) Squidex UG (haftungsbeschraenkt)
-//  All rights reserved. Licensed under the MIT license.
-// ==========================================================================
-
-using System;
-using GraphQL.Language.AST;
-using GraphQL.Types;
-
-namespace Squidex.Domain.Apps.Entities.Contents.GraphQL.Types.Utils
-{
-    public sealed class GuidGraphType : ScalarGraphType
-    {
-        public GuidGraphType()
-        {
-            Name = "Guid";
-
-            Description = "The `Guid` scalar type global unique identifier";
-        }
-
-        public override object Serialize(object value)
-        {
-            return ParseValue(value)?.ToString();
-        }
-
-        public override object ParseValue(object value)
-        {
-            if (value is Guid guid)
-            {
-                return guid;
-            }
-
-            var inputValue = value?.ToString().Trim('"');
-
-            if (Guid.TryParse(inputValue, out guid))
-            {
-                return guid;
-            }
-
-            return null;
-        }
-
-        public override object ParseLiteral(IValue value)
-        {
-            if (value is StringValue stringValue)
-            {
-                return ParseValue(stringValue.Value);
-            }
-
-            return null;
-        }
-    }
-}
--- a/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj
+++ b/src/Squidex.Domain.Apps.Entities/Squidex.Domain.Apps.Entities.csproj
@ -14,13 +14,13 @@
    <ProjectReference Include="..\Squidex.Shared\Squidex.Shared.csproj" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="GraphQL" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="2.1.0">
+    <PackageReference Include="GraphQL" Version="2.3.0" />
+    <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="2.1.2">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
    </PackageReference>
-    <PackageReference Include="Microsoft.Orleans.Core" Version="2.1.0" />
-    <PackageReference Include="NodaTime" Version="2.4.0" />
+    <PackageReference Include="Microsoft.Orleans.Core" Version="2.1.2" />
+    <PackageReference Include="NodaTime" Version="2.4.2" />
    <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
    <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
--- a/src/Squidex.Domain.Apps.Events/Squidex.Domain.Apps.Events.csproj
+++ b/src/Squidex.Domain.Apps.Events/Squidex.Domain.Apps.Events.csproj
@ -12,7 +12,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.1.2" />
-    <PackageReference Include="NodaTime" Version="2.4.0" />
+    <PackageReference Include="NodaTime" Version="2.4.2" />
    <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
--- a/src/Squidex.Domain.Users.MongoDb/Squidex.Domain.Users.MongoDb.csproj
+++ b/src/Squidex.Domain.Users.MongoDb/Squidex.Domain.Users.MongoDb.csproj
@ -14,9 +14,9 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="IdentityServer4" Version="2.2.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.1.6" />
    <PackageReference Include="Microsoft.Win32.Registry" Version="4.5.0" />
-    <PackageReference Include="MongoDB.Driver" Version="2.7.0" />
+    <PackageReference Include="MongoDB.Driver" Version="2.7.2" />
    <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
    <PackageReference Include="System.Security.Principal.Windows" Version="4.5.1" />
--- a/src/Squidex.Domain.Users/Squidex.Domain.Users.csproj
+++ b/src/Squidex.Domain.Users/Squidex.Domain.Users.csproj
@ -11,7 +11,7 @@
    <ProjectReference Include="..\Squidex.Shared\Squidex.Shared.csproj" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.1.6" />
    <PackageReference Include="Microsoft.Win32.Registry" Version="4.5.0" />
    <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
    <PackageReference Include="SharpPwned.NET" Version="1.0.8" />
--- a/src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.csproj
+++ b/src/Squidex.Infrastructure.MongoDb/Squidex.Infrastructure.MongoDb.csproj
@ -11,8 +11,8 @@
    <ProjectReference Include="..\Squidex.Infrastructure\Squidex.Infrastructure.csproj" />
  </ItemGroup>
  <ItemGroup>
-    <PackageReference Include="MongoDB.Driver" Version="2.7.0" />
-    <PackageReference Include="MongoDB.Driver.GridFS" Version="2.7.0" />
+    <PackageReference Include="MongoDB.Driver" Version="2.7.2" />
+    <PackageReference Include="MongoDB.Driver.GridFS" Version="2.7.2" />
    <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
--- a/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
+++ b/src/Squidex.Infrastructure/Squidex.Infrastructure.csproj
@ -11,21 +11,21 @@
    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="2.1.2" />
    <PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
    <PackageReference Include="Microsoft.OData.Core" Version="7.5.1" />
-    <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="2.1.0">
+    <PackageReference Include="Microsoft.Orleans.CodeGenerator.MSBuild" Version="2.1.2">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
    </PackageReference>
-    <PackageReference Include="Microsoft.Orleans.Core" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="2.1.0" />
+    <PackageReference Include="Microsoft.Orleans.Core" Version="2.1.2" />
+    <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="2.1.2" />
    <PackageReference Include="Newtonsoft.Json" Version="11.0.2" />
-    <PackageReference Include="NodaTime" Version="2.4.0" />
+    <PackageReference Include="NodaTime" Version="2.4.2" />
    <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
    <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0004" />
    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
    <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
    <PackageReference Include="System.ComponentModel.Annotations" Version="4.5.0" />
    <PackageReference Include="System.Linq" Version="4.3.0" />
-    <PackageReference Include="System.Reactive" Version="4.1.1" />
+    <PackageReference Include="System.Reactive" Version="4.1.2" />
    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.5.1" />
    <PackageReference Include="System.Security.Claims" Version="4.3.0" />
    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.9.0" />
--- a/src/Squidex.Shared/Permissions.cs
+++ b/src/Squidex.Shared/Permissions.cs
@ -170,7 +170,7 @@ namespace Squidex.Shared

            var result =
                matching
-                    .Select(x => x.Id.Split('.'))
+                    .Select(x => x.Id.Split('.')).Where(x => x.Length > 2)
                    .Select(x => x[2])
                    .Distinct()
                    .ToArray();
--- a/src/Squidex/Areas/Api/Controllers/Schemas/SchemaFieldsController.cs
+++ b/src/Squidex/Areas/Api/Controllers/Schemas/SchemaFieldsController.cs
@ -439,6 +439,7 @@ namespace Squidex.Areas.Api.Controllers.Schemas
        [HttpPut]
        [Route("apps/{app}/schemas/{name}/fields/{parentId:long}/nested/{id:long}/disable/")]
        [ProducesResponseType(typeof(ErrorDto), 400)]
+        [ApiPermission(Permissions.AppSchemasUpdate)]
        [ApiCosts(1)]
        public async Task<IActionResult> DisableNestedField(string app, string name, long parentId, long id)
        {
@ -460,6 +461,7 @@ namespace Squidex.Areas.Api.Controllers.Schemas
        /// </returns>
        [HttpDelete]
        [Route("apps/{app}/schemas/{name}/fields/{id:long}/")]
+        [ApiPermission(Permissions.AppSchemasUpdate)]
        [ApiCosts(1)]
        public async Task<IActionResult> DeleteField(string app, string name, long id)
        {
@ -482,6 +484,7 @@ namespace Squidex.Areas.Api.Controllers.Schemas
        /// </returns>
        [HttpDelete]
        [Route("apps/{app}/schemas/{name}/fields/{parentId:long}/nested/{id:long}/")]
+        [ApiPermission(Permissions.AppSchemasUpdate)]
        [ApiCosts(1)]
        public async Task<IActionResult> DeleteNestedField(string app, string name, long parentId, long id)
        {
--- a/src/Squidex/Squidex.csproj
+++ b/src/Squidex/Squidex.csproj
@ -60,12 +60,12 @@
    <PackageReference Include="IdentityServer4" Version="2.2.0" />
    <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="2.6.0" />
    <PackageReference Include="IdentityServer4.AspNetIdentity" Version="2.1.0" />
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.1.4" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.1.6" />
    <PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.1.2" />
    <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="2.1.2" />
    <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="2.1.2" />
    <PackageReference Include="Microsoft.AspNetCore.HttpOverrides" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.1.6" />
    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.3" />
    <PackageReference Include="Microsoft.AspNetCore.Mvc.Razor.ViewCompilation" Version="2.1.1" />
    <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.1" />
@ -77,15 +77,15 @@
    <PackageReference Include="Microsoft.Orleans.Core" Version="2.1.2" />
    <PackageReference Include="Microsoft.Orleans.Core.Abstractions" Version="2.1.2" />
    <PackageReference Include="Microsoft.Orleans.OrleansRuntime" Version="2.1.2" />
-    <PackageReference Include="MongoDB.Driver" Version="2.7.0" />
-    <PackageReference Include="NJsonSchema" Version="9.12.0" />
+    <PackageReference Include="MongoDB.Driver" Version="2.7.2" />
+    <PackageReference Include="NJsonSchema" Version="9.12.2" />
    <PackageReference Include="NodaTime.Serialization.JsonNet" Version="2.0.0" />
    <PackageReference Include="NSwag.AspNetCore" Version="11.20.1" />
    <PackageReference Include="OpenCover" Version="4.6.519" />
    <PackageReference Include="Orleans.Providers.MongoDB" Version="2.0.1" />
    <PackageReference Include="OrleansDashboard" Version="2.1.3" />
    <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
-    <PackageReference Include="ReportGenerator" Version="4.0.2" />
+    <PackageReference Include="ReportGenerator" Version="4.0.3" />
    <PackageReference Include="StackExchange.Redis.StrongName" Version="1.2.6" />
    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
    <PackageReference Include="System.Linq" Version="4.3.0" />
--- a/tests/Squidex.Domain.Apps.Core.Tests/Operations/ConvertContent/ContentConversionTests.cs
+++ b/tests/Squidex.Domain.Apps.Core.Tests/Operations/ConvertContent/ContentConversionTests.cs
@ -5,6 +5,7 @@
 //  All rights reserved. Licensed under the MIT license.
 // ==========================================================================

+using Newtonsoft.Json.Linq;
 using Squidex.Domain.Apps.Core.Contents;
 using Squidex.Domain.Apps.Core.ConvertContent;
 using Squidex.Domain.Apps.Core.Schemas;
@ -148,5 +149,90 @@ namespace Squidex.Domain.Apps.Core.Operations.ConvertContent
            Assert.True(lhs.Equals((object)rhs));
            Assert.Equal(lhs.GetHashCode(), rhs.GetHashCode());
        }
+
+        [Fact]
+        public void Should_extract_strings()
+        {
+            var input =
+                new NamedContentData()
+                    .AddField("field1",
+                        new ContentFieldData()
+                            .AddValue("en", "hello"))
+                    .AddField("field2",
+                        new ContentFieldData()
+                            .AddValue("iv", "world"));
+
+            var result = input.ToFullText();
+
+            Assert.Equal("hello world", result);
+        }
+
+        [Fact]
+        public void Should_extract_strings_from_arrays()
+        {
+            var input =
+                new NamedContentData()
+                    .AddField("field1",
+                        new ContentFieldData()
+                            .AddValue("en", new JArray("hello", "loved")))
+                    .AddField("field2",
+                        new ContentFieldData()
+                            .AddValue("iv", "world"));
+
+            var result = input.ToFullText();
+
+            Assert.Equal("hello loved world", result);
+        }
+
+        [Fact]
+        public void Should_extract_strings_from_objects()
+        {
+            var input =
+                new NamedContentData()
+                    .AddField("field1",
+                        new ContentFieldData()
+                            .AddValue("en", new JArray(new JObject(new JProperty("p1", "hello")))))
+                    .AddField("field2",
+                        new ContentFieldData()
+                            .AddValue("iv", "world"));
+
+            var result = input.ToFullText();
+
+            Assert.Equal("hello world", result);
+        }
+
+        [Fact]
+        public void Should_skip_long_strings()
+        {
+            var input =
+                new NamedContentData()
+                    .AddField("field1",
+                        new ContentFieldData()
+                            .AddValue("en", "hello"))
+                    .AddField("field2",
+                        new ContentFieldData()
+                            .AddValue("iv", "you"));
+
+            var result = input.ToFullText(maxFieldLength: 3);
+
+            Assert.Equal("you", result);
+        }
+
+        [Fact]
+        public void Should_trim_long_results()
+        {
+            var input =
+                new NamedContentData()
+                    .AddField("field1",
+                        new ContentFieldData()
+                            .AddValue("en", "hello"))
+                    .AddField("field2",
+                        new ContentFieldData()
+                            .AddValue("iv", "you"));
+
+            var result = input.ToFullText(maxTotalLength: 7);
+
+            Assert.Equal("hello y", result);
+        }
    }
 }
--- a/tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj
+++ b/tests/Squidex.Domain.Apps.Core.Tests/Squidex.Domain.Apps.Core.Tests.csproj
@ -12,13 +12,13 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="FakeItEasy" Version="4.9.1" />
-    <PackageReference Include="FluentAssertions" Version="5.4.2" />
+    <PackageReference Include="FluentAssertions" Version="5.5.0" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
    <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
    </PackageReference>
--- a/tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj
+++ b/tests/Squidex.Domain.Apps.Entities.Tests/Squidex.Domain.Apps.Entities.Tests.csproj
@ -21,15 +21,15 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="FakeItEasy" Version="4.9.1" />
-    <PackageReference Include="FluentAssertions" Version="5.4.2" />
-    <PackageReference Include="GraphQL" Version="2.1.0" />
+    <PackageReference Include="FluentAssertions" Version="5.5.0" />
+    <PackageReference Include="GraphQL" Version="2.3.0" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="MongoDB.Driver" Version="2.7.0" />
+    <PackageReference Include="MongoDB.Driver" Version="2.7.2" />
    <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
    </PackageReference>
--- a/tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj
+++ b/tests/Squidex.Domain.Users.Tests/Squidex.Domain.Users.Tests.csproj
@ -13,13 +13,13 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="FakeItEasy" Version="4.9.1" />
-    <PackageReference Include="FluentAssertions" Version="5.4.2" />
+    <PackageReference Include="FluentAssertions" Version="5.5.0" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
    <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
    </PackageReference>
--- a/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj
+++ b/tests/Squidex.Infrastructure.Tests/Squidex.Infrastructure.Tests.csproj
@ -13,7 +13,7 @@
  </ItemGroup>
  <ItemGroup>
    <PackageReference Include="FakeItEasy" Version="4.9.1" />
-    <PackageReference Include="FluentAssertions" Version="5.4.2" />
+    <PackageReference Include="FluentAssertions" Version="5.5.0" />
    <PackageReference Include="Google.Cloud.Storage.V1" Version="2.2.0" />
    <PackageReference Include="Microsoft.Extensions.Caching.Abstractions" Version="2.1.2" />
    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.1.2" />
@ -21,8 +21,8 @@
    <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
    <PackageReference Include="System.ValueTuple" Version="4.5.0" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
    </PackageReference>
--- a/tests/Squidex.Tests/Squidex.Tests.csproj
+++ b/tests/Squidex.Tests/Squidex.Tests.csproj
@ -15,11 +15,11 @@
    <PackageReference Include="IdentityServer4" Version="2.2.0" />
    <PackageReference Include="IdentityServer4.AspNetIdentity" Version="2.1.0" />
    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
-    <PackageReference Include="NJsonSchema" Version="9.11.0" />
+    <PackageReference Include="NJsonSchema" Version="9.12.2" />
    <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
-    <PackageReference Include="xunit" Version="2.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0">
+    <PackageReference Include="xunit" Version="2.4.1" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
      <PrivateAssets>all</PrivateAssets>
      <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
    </PackageReference>
--- a/tools/Migrate_00/Migrate_00.csproj
+++ b/tools/Migrate_00/Migrate_00.csproj
@ -5,7 +5,7 @@
    <RuntimeFrameworkVersion>2.1.1</RuntimeFrameworkVersion>
  </PropertyGroup>
  <ItemGroup>
-    <PackageReference Include="MongoDB.Driver" Version="2.7.0" />
+    <PackageReference Include="MongoDB.Driver" Version="2.7.2" />
    <PackageReference Include="RefactoringEssentials" Version="5.6.0" PrivateAssets="all" />
    <PackageReference Include="StyleCop.Analyzers" Version="1.0.2" PrivateAssets="all" />
  </ItemGroup>