[PORT][Expression]fix null check in expression (#2118)

microsoft · Apr 28, 2020 · 18cb982 · 18cb982
1 parent a26c719
commit 18cb982
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/libraries/adaptive-expressions/src/expressionFunctions.ts b/libraries/adaptive-expressions/src/expressionFunctions.ts
@@ -1838,8 +1838,8 @@ export class ExpressionFunctions {
             return false;
         }
 
-        if (args[0] === undefined || args[0] === null) {
-            return args[1] === undefined || args[1] === null;
+        if (args[0] === undefined || args[0] === null || args[1] === undefined || args[1] === null) {
+            return (args[0] === undefined || args[0] === null) && (args[1] === undefined || args[1] === null);
         }
 
         if (Array.isArray(args[0]) && args[0].length === 0 && Array.isArray(args[1]) && args[1].length === 0) {

diff --git a/libraries/adaptive-expressions/tests/expressionParser.test.js b/libraries/adaptive-expressions/tests/expressionParser.test.js
@@ -317,7 +317,18 @@ const dataSource = [
     ['emptyList == {  }', false],
     ['emptyObject == {  }', true],
     ['emptyObject == [  ]', false],
-
+    ['{} == undefined', false],
+    ['{} != undefined', true],
+    ['[] == undefined', false],
+    ['{} != undefined', true],
+    ['{} == null', false],
+    ['{} != null', true],
+    ['[] == null', false],
+    ['{} != null', true],
+    ['{} == {}', true],
+    ['[] == []', true],
+    ['{} != []', true],
+    ['[] == {}', false],
 
     // Conversion functions tests
     ['float(\'10.333\')', 10.333],
@@ -632,7 +643,7 @@ const dataSource = [
 ];
 
 const scope = {
-    "$index": "index",
+    '$index': 'index',
     alist: [
         {
             Name: 'item1'