Prevent DataSourceLoadOptionsParser from System.InvalidOperationExcep…

…tion on parsing binary filter with value json object (#631)
DevExpress · Aug 27, 2024 · 61ac579 · 61ac579
1 parent 0af7be9
commit 61ac579
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 0 deletions.
diff --git a/net/DevExtreme.AspNet.Data.Tests/DataSourceLoadOptionsParserTests.cs b/net/DevExtreme.AspNet.Data.Tests/DataSourceLoadOptionsParserTests.cs
@@ -72,6 +72,20 @@ public void MustParseNull() {
             Assert.Equal(new[] { "fieldName", "=", null }, opts.Filter.Cast<string>());
         }
 
+        [Fact]
+        public void MustParseObject() {
+            var opts = new SampleLoadOptions();
+
+            DataSourceLoadOptionsParser.Parse(opts, key => {
+                if(key == DataSourceLoadOptionsParser.KEY_FILTER)
+                    return @"[ ""fieldName1"", ""="", {""Value"":0} ]";
+                return null;
+            });
+
+            Assert.Equal(3, opts.Filter.Count);
+            Assert.Equal("{\"Value\":0}", opts.Filter[2].ToString());
+        }
+
         [Fact]
         public void MustParseNumericAsString() {
             var opts = new SampleLoadOptions();

diff --git a/net/DevExtreme.AspNet.Data.Tests/DeserializeTests.cs b/net/DevExtreme.AspNet.Data.Tests/DeserializeTests.cs
@@ -16,6 +16,13 @@ public void FilterOperandValueCanBeNull(string rawJsonCriteria) {
             var deserializedList = JsonSerializer.Deserialize<IList>(rawJsonCriteria, TESTS_DEFAULT_SERIALIZER_OPTIONS);
             Assert.Equal(3, deserializedList.Count);
         }
+
+        [Fact]
+        public void FilterOperandValueCanBeObject() {
+            var deserializedList = JsonSerializer.Deserialize<IList>(@"[""fieldName1"",""="",{""Value"":0}]", TESTS_DEFAULT_SERIALIZER_OPTIONS);
+            Assert.Equal(3, deserializedList.Count);
+            Assert.Equal("{\"Value\":0}", deserializedList[2].ToString());
+        }
     }
 
 }
diff --git a/net/DevExtreme.AspNet.Data.Tests/DeserializeTestsEx.cs b/net/DevExtreme.AspNet.Data.Tests/DeserializeTestsEx.cs
@@ -13,6 +13,13 @@ public void FilterOperandValueCanBeNull(string rawJsonCriteria) {
             var deserializedList = JsonConvert.DeserializeObject<IList>(rawJsonCriteria);
             Assert.Equal(3, deserializedList.Count);
         }
+
+        [Fact]
+        public void FilterOperandValueCanBeObject() {
+            var deserializedList = JsonConvert.DeserializeObject<IList>(@"[""fieldName1"",""="",{""Value"":0}]");
+            Assert.Equal(3, deserializedList.Count);
+            Assert.Equal("{\r\n  \"Value\": 0\r\n}", deserializedList[2].ToString());
+        }
     }
 
 }

diff --git a/net/DevExtreme.AspNet.Data/Compatibility.cs b/net/DevExtreme.AspNet.Data/Compatibility.cs
@@ -43,6 +43,8 @@ static object UnwrapJsonElement(object deserializeObject) {
                     if(jsonElement.TryGetDecimal(out var decimalValue))
                         return decimalValue;
                     throw new NotImplementedException();
+                case JsonValueKind.Object:
+                    return jsonElement;
                 default:
                     throw new NotImplementedException();
             }