yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove Newtonsoft.Json from Multi URL picker (#15768)

Browse Source
This commit is contained in:
Kenn Jacobsen
2024-02-27 17:18:58 +01:00
committed by GitHub
parent 64bfe88fba
commit 3c2ae389f4
1 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/Umbraco.Infrastructure/PropertyEditors/MultiUrlPickerValueEditor.cs
View File

@@ -2,9 +2,7 @@
// See LICENSE for more details.
using System.Runtime.Serialization;
using System.Text.Json.Nodes;
using Microsoft.Extensions.Logging;
using Newtonsoft.Json.Linq;
using Umbraco.Cms.Core.IO;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.ContentEditing;
@@ -149,13 +147,8 @@ public class MultiUrlPickerValueEditor : DataValueEditor, IDataValueReference
public override object? FromEditor(ContentPropertyData editorValue, object? currentValue)
{
// FIXME: get rid of Json.NET here
// FIXME: consider creating an object deserialization method on IJsonSerializer instead of relying on deserializing serialized JSON here (and likely other places as well)
var value = editorValue.Value is JArray jArray
? jArray.ToString()
: editorValue.Value is JsonArray jsonArray
? jsonArray.ToJsonString()
: string.Empty;
// the editor value is a JsonArray, which produces deserialize-able JSON with ToString() (deserialization happens later on)
var value = editorValue.Value?.ToString();
if (string.IsNullOrEmpty(value))
{