Skip to content

Add JsonObjectConverter to the default serializer and make a safe check before adding index #16067

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Zeegaan merged 3 commits into from
Apr 16, 2024
Merged

Add JsonObjectConverter to the default serializer and make a safe check before adding index #16067

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7e42f2a
Do not add index if it already exists
bergmania Apr 16, 2024
a90b306
Add the JsonObjectConverter by default. This is required by the block…
bergmania Apr 16, 2024
b3ea5bb
Update test to reflect that fact we have the json object converter ap…
bergmania Apr 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/Umbraco.Infrastructure/Migrations/Upgrade/V_14_0_0/AddGuidsToUsers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,11 @@ private void MigrateSqlServer()
AddColumnIfNotExists<UserDto>(columns, NewColumnName);

var nodeDtoTrashedIndex = $"IX_umbracoUser_userKey";
CreateIndex<UserDto>(nodeDtoTrashedIndex);
if (IndexExists(nodeDtoTrashedIndex) is false)
{
CreateIndex<UserDto>(nodeDtoTrashedIndex);
}


List<NewUserDto>? userDtos = Database.Fetch<NewUserDto>();
if (userDtos is null)
Expand Down
3 changes: 1 addition & 2 deletions src/Umbraco.Infrastructure/Serialization/SystemTextJsonSerializer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,7 @@ public SystemTextJsonSerializer()
new JsonStringEnumConverter(),
new JsonUdiConverter(),
new JsonUdiRangeConverter(),
// We may need to add JsonObjectConverter at some point, but for the time being things work fine without
//new JsonObjectConverter()
new JsonObjectConverter() // Required for block editor values
}
};

Expand Down
15 changes: 8 additions & 7 deletions tests/Umbraco.Tests.UnitTests/Umbraco.Core/Manifest/PackageManifestReaderTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System.Text;
using System.Text.Json;
using System.Text.Json.Nodes;
using Microsoft.Extensions.FileProviders;
using Microsoft.Extensions.Logging;
using Moq;
Expand Down Expand Up @@ -93,15 +94,15 @@ public async Task Can_Deserialize_Extensions()
var first = result.First();

// Ensure that the extensions are deserialized as JsonElement
Assert.IsTrue(first.Extensions.All(e => e is JsonElement));
Assert.IsTrue(first.Extensions.All(e => e is JsonObject));

// Test the deserialization of the first extension to make sure we don't break the JSON parsing
JsonElement firstExtension = (JsonElement)first.Extensions.First();
Assert.AreEqual("tree", firstExtension.GetProperty("type").GetString());
var meta = firstExtension.GetProperty("meta");
Assert.AreEqual("My Tree", meta.GetProperty("label").GetString());
var someArray = meta.GetProperty("someArray");
Assert.AreEqual(1, someArray[0].GetInt32());
JsonObject firstExtension = (JsonObject)first.Extensions.First();
Assert.AreEqual("tree", firstExtension["type"].GetValue<string>());
var meta = firstExtension["meta"];
Assert.AreEqual("My Tree", meta["label"].GetValue<string>());
var someArray = meta["someArray"];
Assert.AreEqual(1, someArray[0].GetValue<int>());
}

[Test]
Expand Down