Merge pull request #96 from rpbouman/issue-92-filtering-for-null-does…

…nt-work Fix null literal value detection
rpbouman · Jul 12, 2024 · 59b5fc6 · 59b5fc6
2 parents 4367893 + 1c4b670
commit 59b5fc6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/FilterUi/FilterUi.js b/src/FilterUi/FilterUi.js
@@ -272,7 +272,7 @@ class FilterDialog {
           filterValuesList.selectedOptions.length === 1 && toFilterValuesList.selectedOptions.length === 0 && filterValuesList.selectedOptions[0].getAttribute('data-sql-null') !== String(true) ||
           filterValuesList.selectedOptions.length === 0 && toFilterValuesList.selectedOptions.length === 1 && toFilterValuesList.selectedOptions[0].getAttribute('data-sql-null') !== String(true)
         )
-      ) {
+      ){
 
         var selectedList = filterValuesList.selectedOptions.length ? filterValuesList : toFilterValuesList;
         var values = filterValuesList.selectedOptions.length ? currentValues : currentToValues;

diff --git a/src/QueryModel/QueryModel.js b/src/QueryModel/QueryModel.js
@@ -224,8 +224,9 @@ class QueryAxisItem {
 
     var nullCondition;
     var indexOfNull = literalLists.valueLiterals.findIndex(function(value){
-      return value === null;
+      return value.startsWith('NULL::');
     });
+
     if (indexOfNull !== -1) {
       operator = 'IS';
       switch (filter.filterType) {