@gudhub/core 1.1.70 → 1.1.71

package/GUDHUB/Storage/ModulesList.js

@@ -911,10 +911,10 @@ export default function generateModulesList(async_modules_path, file_server_url,
         },
         {
             data_type: 'static_nested_list',
-            name: 'Static Nested List',
+            name: 'Nested Filter',
             icon: 'scheduling',
-            js: 'https://gudhub.com/modules/nested-filter/dist/main.js',
-            css: 'https://gudhub.com/modules/nested-filter/dist/style.css',
+            js: 'https://gudhub.com/modules/nested-filter/dist/main.js?t=1',
+            css: 'https://gudhub.com/modules/nested-filter/dist/style.css?t=1',
             type: 'gh_element',
             technology: 'class'
         },

package/GUDHUB/Utils/Utils.js

@@ -1,5 +1,6 @@
 import { filterPreparation } from "./filter/filterPreparation.js";
 import filter from "./filter/filter.js";
+import { mergeFilters } from "./filter/mergeFilters.js";
 import { jsonToItems } from "./json_to_items/json_to_items.js";
 import {
   mergeItems,
@@ -48,6 +49,10 @@ export class Utils {
     return filter(items, filter_list);
   }
 
+  mergeFilters(src, dest) {
+    return mergeFilters(src, dest);
+  }
+
   group(fieldGroup, items) {
     return group(fieldGroup, items);
   }
@@ -68,10 +73,7 @@ export class Utils {
       app_id,
       item_id
     );
-    const itemsList = this.filter(items, [
-      ...filters_list,
-      ...modified_filters_list,
-    ]);
+    const itemsList = this.filter(items, modified_filters_list);
     const newItems = this.group(field_group, itemsList);
     return newItems
       .filter((newItem) => {

package/GUDHUB/Utils/filter/filter.js

@@ -1,34 +1,13 @@
 import { getDate, getDistanceFromLatLonInKm, isSimilarStrings } from "./utils.js";
 
 export default function (items, filters) {
-  const filterAggregate = new Aggregate();
-  const filterChecker = new Checker();
+  const itemsFilter = new ItemsFilter();
 
   if (!items || !items.length) {
     return [];
   }
 
-  return items.filter(function (item) {
-    return filters
-      .filter(function (filter) {
-        return filter.valuesArray.length;
-      })
-      .every(function (filter) {
-        var currField = item.fields.find(function (itemField) {
-          return filter.field_id == itemField.field_id;
-        });
-
-        filterAggregate
-          .setStrategy(filter.search_type)
-          .setEntity(
-            currField && currField.field_value != undefined
-              ? currField.field_value
-              : null
-          )
-          .setFilterValues(filter.valuesArray);
-        return filterChecker.check(filterAggregate);
-      });
-  });
+  return itemsFilter.filter(filters, items);
 }
 
 class Checker {
@@ -326,3 +305,67 @@ class Aggregate {
     return this._checkOption;
   }
 }
+
+class ItemsFilter {
+  constructor() {
+
+  }
+
+  filter(filters, items) {
+
+    const filteredItems = [];
+    const activeFilters = filters.filter(function (filter) {
+      return filter.valuesArray.length;
+    });
+    
+    for(let item of items) {
+      let result = true;
+
+      for(let i = 0; i < activeFilters.length; i++) {
+        const filter = activeFilters[i];
+  
+        const currField = item.fields.find(function (itemField) {
+          return filter.field_id == itemField.field_id;
+        });
+  
+        const filterAggregate = new Aggregate();
+        const filterChecker = new Checker();
+  
+        filterAggregate
+            .setStrategy(filter.search_type)
+            .setEntity(
+              currField && currField.field_value != undefined
+                ? currField.field_value
+                : null
+            )
+            .setFilterValues(filter.valuesArray);
+           
+            switch(filter.boolean_strategy) {
+              case 'and':
+                result = result && filterChecker.check(filterAggregate);
+              break;
+
+              case 'or':
+                result = result || filterChecker.check(filterAggregate);
+              break;
+
+              default:
+                result = result && filterChecker.check(filterAggregate);
+            }
+            
+      }
+
+      if(result) {
+        filteredItems.push(item);
+      }
+    }
+
+    if(filteredItems.length || filters.length && !filteredItems.length) {
+      return filteredItems;
+    } 
+     else {
+      return items;
+    }
+    
+  }
+}

package/GUDHUB/Utils/filter/filter.test.js

@@ -1,6 +1,8 @@
 import should from 'should';
 import {GudHub} from './../../gudhub.js';
 
+import { app_8263 } from '../../../fake_server/fake_server_data/app_8263.js';
+
 
 
   describe('Filter', function() {
@@ -9,6 +11,64 @@ import {GudHub} from './../../gudhub.js';
     it('Should return one Item', function(){
         gudhub.filter(items, filters).length.should.equal(1);
     });
+
+    it('FILTER AND / should return items matching first AND second filter', function() {
+        const filters = [
+            {
+                "field_id": 96606,
+                "data_type": "text",
+                "valuesArray": [
+                    "Dothan"
+                ],
+                "search_type": "contain_or",
+                "boolean_strategy": "and",
+                "selected_search_option_variable": "Value"
+            },
+            
+            {
+                "field_id": 96608,
+                "data_type": "phone",
+                "valuesArray": [
+                    "677"
+                ],
+                "search_type": "contain_or",
+                "boolean_strategy": "and",
+                "selected_search_option_variable": "Value"
+            }
+        ];
+
+        const filteredItems = gudhub.filter(app_8263.items_list, filters);
+        filteredItems.length.should.equal(1);
+    });
+
+    it('FILTER OR / should return items matching first OR second filter', function() {
+        const filters = [
+            {
+                "field_id": 96606,
+                "data_type": "text",
+                "valuesArray": [
+                    "Distributors"
+                ],
+                "search_type": "contain_or",
+                "boolean_strategy": "and",
+                "selected_search_option_variable": "Value"
+            },
+            
+            {
+                "field_id": 96608,
+                "data_type": "phone",
+                "valuesArray": [
+                    "353"
+                ],
+                "search_type": "contain_or",
+                "boolean_strategy": "or",
+                "selected_search_option_variable": "Value"
+            }
+        ];
+
+        const filteredItems = gudhub.filter(app_8263.items_list, filters);
+        filteredItems.length.should.equal(8);
+    });
     
   });
 

package/GUDHUB/Utils/filter/filterPreparation.js

@@ -55,6 +55,8 @@ export async function filterPreparation(
   if (filters_list) {
     for (const filter of filters_list) {
       if (filter) {
+        // ---------------------- WARNING !!! -------------------------------
+        // Should be fixed: modification of filters_list valuesArray
         switch (filter.input_type) {
           case "variable":
             const functionName =

package/GUDHUB/Utils/filter/mergeFilters.js

@@ -0,0 +1,32 @@
+export function mergeFilters(srcFilters, destFilters) {
+  const mergedFieldIds = [];
+  let filters = [];
+
+  if(srcFilters.length > 0) {
+    srcFilters.forEach(filter => {
+      filters.push(filter);
+    });
+  } else {
+    filters = destFilters;
+  }
+
+  if(filters.length > 0) {
+    
+    filters.forEach((filter, index) => {
+      for(let i = 0; i < destFilters.length; i++) {
+          if(filter.field_id == destFilters[i].field_id) {
+            mergedFieldIds.push(filter.field_id);
+            filters[index] = gudhub.mergeObjects(destFilters[i], filter);
+          }
+      }
+    });
+
+    for(let k = 0; k < destFilters.length; k++) {
+      if(!mergedFieldIds.includes(destFilters[k].field_id)) {
+        filters.push(destFilters[k]);
+      }
+    }
+
+  }
+  return filters;
+}

package/GUDHUB/gudhub.js

@@ -176,6 +176,11 @@ export class GudHub {
     return this.util.filter(items, filter_list);
   }
 
+  //============ MERGE FILTERS ==========//
+  mergeFilters(source, destination) {
+    return this.util.mergeFilters(source, destination);
+  }
+
   //============ GROUP ==========//
   group(fieldGroup, items) {
     return this.util.group(fieldGroup, items);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gudhub/core",
-  "version": "1.1.70",
+  "version": "1.1.71",
   "description": "",
   "main": "index.js",
   "scripts": {