@huntsman-cancer-institute/navigation 17.14.2 → 17.14.3

package/fesm2022/huntsman-cancer-institute-navigation.mjs

@@ -2313,7 +2313,12 @@ let SearchListControllerComponent = class SearchListControllerComponent extends
         this.boundFilters = [];
         this.boundAdvancedSearchFilters = [];
         for (let filterField of this.filterByAllowedFields) {
-            this.boundFilters.push(new HciFilterDto(filterField, "string", undefined, undefined, "L", false));
+            let dataType = "string";
+            let field = this.fields.find(x => x.field == filterField);
+            if (field && field.type) {
+                dataType = field.type.toLowerCase();
+            }
+            this.boundFilters.push(new HciFilterDto(filterField, dataType, undefined, undefined, "L", false));
         }
         for (let filterField of this.advancedSearchFields) {
             this.boundAdvancedSearchFilters.push(new HciFilterDto(filterField, "string", undefined, undefined, "L", false));
@@ -2367,7 +2372,7 @@ let SearchListControllerComponent = class SearchListControllerComponent extends
             return;
         }
         for (let filter of this.boundFilters) {
-            if (filter.value instanceof Date) {
+            if (filter.value instanceof Date || (filter.getDataType() == 'date' && filter.value && !isNaN(new Date(filter.value).getTime()))) {
                 filter.valid = true;
             }
             else if (filter.value && filter.value.length > 0) {
@@ -4020,6 +4025,7 @@ let SearchListComponent = class SearchListComponent extends NavComponent {
             if (this.filters && this.filters.length > 0) {
                 let include = true;
                 for (let filter of this.filters) {
+                    console.log("filter:", filter);
                     if (!filter.valid) {
                         continue;
                     }
@@ -4028,7 +4034,18 @@ let SearchListComponent = class SearchListComponent extends NavComponent {
                         continue;
                     }
                     else {
-                        let filterValues = filter.getValue().split(",");
+                        let filterValues;
+                        if (filter.getDataType() == "date") {
+                            if (Array.isArray(filter.getValue())) {
+                                filterValues = filter.getValue();
+                            }
+                            else {
+                                filterValues = [filter.getValue()];
+                            }
+                        }
+                        else {
+                            filterValues = filter.getValue().split(",");
+                        }
                         let filterFields = filter.getField().split(" or ");
                         let innerInclude = false;
                         for (let field of filterFields) {
@@ -4042,7 +4059,7 @@ let SearchListComponent = class SearchListComponent extends NavComponent {
                             }
                             else if (row[field] && row[field] instanceof Date || filter.getDataType() == "date") {
                                 for (let value of filterValues) {
-                                    if (value instanceof Date) {
+                                    if (value != undefined && (value instanceof Date || !isNaN(new Date(value).getTime()))) {
                                         if ((new Date(row[field])).getTime() == (new Date(value)).getTime()) {
                                             innerInclude = true;
                                             break;