@gudhub/core 1.1.132 → 1.1.133

package/GUDHUB/Storage/ModulesList.js

@@ -1536,10 +1536,10 @@ export default function generateModulesList(async_modules_path, file_server_url,
             technology: 'angular'
         },
         {
-            data_type: "edit_form",
-            name: 'Edit form',
+            data_type: "popup_item_editor",
+            name: 'Popup Item Editor',
             icon: 'pencil',
-            url: file_server_url + '/' + async_modules_path + "edit_form.js",
+            url: file_server_url + '/' + async_modules_path + "popup_item_editor.js",
             type: 'gh_element',
             technology: 'angular'
         },

package/GUDHUB/Utils/filter/filter.js

@@ -311,71 +311,75 @@ class ItemsFilter {
 
   }
 
-  filter(filters, items) {
-
-    const allFiltersAndStrategy = this.checkIfAllFiltersHaveAndStrategy(filters);
-
-    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);
-            }
-
-            // Needed for performance optimization
-            // We don't need to check other filters if we already know that result is false in case of 'and' strategy
-            if(!result && allFiltersAndStrategy) {
-              break;
-            }
-            
-      }
-
-      if(result) {
-        filteredItems.push(item);
-      }
-    }
-
-    if(filteredItems.length || filters.length && !filteredItems.length) {
-      return filteredItems;
-    } 
-     else {
-      return items;
-    }
-    
-  }
+	filter(filters, items) {
+		const allFiltersAndStrategy = this.checkIfAllFiltersHaveAndStrategy(filters);
+
+		const filteredItems = [];
+		const activeFilters = filters.filter(function (filter) {
+			return filter.valuesArray.length;
+		});
+
+		const shouldCheckTrash = items.some(item =>
+			Object.prototype.hasOwnProperty.call(item, 'trash')
+		);
+		
+		for (let item of items) {
+			if (shouldCheckTrash && item.trash == true) {
+				continue;
+			}
+
+			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);
+				}
+
+				// Needed for performance optimization
+				// We don't need to check other filters if we already know that result is false in case of 'and' strategy
+				if(!result && allFiltersAndStrategy) {
+					break;
+				}
+			}
+
+			if (result) {
+				filteredItems.push(item);
+			}
+		}
+
+		if (filteredItems.length || filters.length && !filteredItems.length) {
+			return filteredItems;
+		} else {
+			return items;
+		}
+	}
 
   checkIfAllFiltersHaveAndStrategy(filters) {
     return filters.every((filter) => {

package/GUDHUB/Utils/json_constructor/json_constructor.js

@@ -186,27 +186,21 @@ export function compiler(scheme, item, util, variables, appId) {
     return util.gudhub.filter(itemsList, [...modified_filters_list, ...filtersList]);
   }
 
-	/* Filter items by scheme filter */
-	async function filterItems(
-		filtersList = [],
-		itemsList = [],
-		appId = '',
-		item = {}
-	) {
-		const hasTrashField = itemsList.some(item => Object.prototype.hasOwnProperty.call(item, 'trash'));
-
-		const filteredItems = hasTrashField
-			? itemsList.filter(item => !item.trash)
-			: itemsList;
-
-		return filtersList.length ? getFilteredItems(
-			filtersList,
-			appId,
-			appId,
-			item.item_id,
-			filteredItems
-		) : [...filteredItems];
-	}
+  /* Filter items by scheme filter */
+  async function filterItems(
+    filtersList = [],
+    itemsList = [],
+    appId = '',
+    item = {}
+  ) {
+    return filtersList.length ? getFilteredItems(
+      filtersList,
+      appId,
+      appId,
+      item.item_id,
+      itemsList
+    ) : [...itemsList ];
+  }
 
   return schemeCompiler(scheme, item, appId, variables);
 }

package/package.json

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