@blaze-cms/plugin-data-ui 0.147.0-rc-eagle.2 → 0.147.0-rc-eagle.6

package/src/components/ListingTable/SearchFilter/helpers.js

@@ -14,14 +14,32 @@ const updateListFilters = (searchTerm, selectedFilters, setListFilters, fields =
   }
 
   Object.entries(selectedFilters).forEach(([filterKey, filterValue]) => {
-    if (!filterValue || filterValue === DEFAULT_FILTER_OPTION_LABEL) return;
-    filters.push({
-      match: {
-        [`${filterKey}.keyword`]: {
-          query: filterValue
-        }
+    const isEmptyArray = Array.isArray(filterValue) && filterValue.length === 0;
+    if (
+      filterValue == null ||
+      filterValue === '' ||
+      filterValue === DEFAULT_FILTER_OPTION_LABEL ||
+      isEmptyArray
+    )
+      return;
+
+    const field = `${filterKey}.keyword`;
+
+    if (Array.isArray(filterValue)) {
+      if (filterValue.length > 1) {
+        filters.push({
+          terms: { [field]: filterValue }
+        });
+      } else {
+        filters.push({
+          term: { [field]: filterValue[0] }
+        });
       }
-    });
+    } else {
+      filters.push({
+        term: { [field]: filterValue }
+      });
+    }
   });
 
   setListFilters(filters);
@@ -52,9 +70,22 @@ const findSelectFilters = schema => {
   return [...propertySelects, ...dynamicPropertySelects];
 };
 
+const findMultiSelectFilters = schema => {
+  if (!schema || !schema.properties) return [];
+
+  const { properties = {}, dynamicProperties = {} } = schema;
+  const propertyMultiSelect = Object.entries(properties).filter(isFilterMultiSelectItems);
+  const dynamicPropertyMultiSelect =
+    Object.entries(dynamicProperties).filter(isFilterMultiSelectItems);
+  return [...propertyMultiSelect, ...dynamicPropertyMultiSelect];
+};
+
 const isFilterSelectItem = ([, item]) =>
   item.adminListingOptions && item.adminListingOptions.filterType === 'select';
 
+const isFilterMultiSelectItems = ([, item]) =>
+  item.adminListingOptions && item.adminListingOptions.filterType === 'multiSelect';
+
 const buildQueryFields = (selectFilters, entityId) => {
   if (!Array.isArray(selectFilters) || selectFilters.length === 0) {
     return { gqlFields: '', rawQuery: '{}' };
@@ -96,4 +127,20 @@ const buildQueryFields = (selectFilters, entityId) => {
   return { gqlFields, rawQuery };
 };
 
-export { buildQueryFields, updateListFilters, getKeywordSearchFilters, findSelectFilters };
+const getTidyLabel = (value, tidy) => {
+  if (!tidy) return value;
+
+  return value
+    .split(/[\s_-]+/)
+    .map(word => word.charAt(0).toUpperCase() + word.slice(1))
+    .join(' ');
+};
+
+export {
+  buildQueryFields,
+  updateListFilters,
+  getKeywordSearchFilters,
+  findSelectFilters,
+  findMultiSelectFilters,
+  getTidyLabel
+};

package/src/index.js

@@ -14,6 +14,8 @@ import EntityManager from './components/EntityManager';
 //   () => import(/* webpackChunkName: 'EntityManager' */ './components/EntityManager')
 // );
 
+export { default as SearchFilter } from './components/ListingTable/SearchFilter/SearchFilter';
+
 export default async function load(app) {
   app.events.once('admin:menu:config:load', getAddContentMenuItems(app));
 

package/src/utils/get-default-query-params.js

@@ -1,19 +1,31 @@
 const getDefaultQueryParams = schema => {
   const updated = schema.properties && schema.properties.updated;
-  const { adminDefaultListingFilter: where } = schema.displayProperties || {};
+  const { adminDefaultListingFilter: where, adminListings: { defaultSort } = {} } =
+    schema.displayProperties || {};
+
+  let sort = [];
+
+  if (defaultSort?.property) {
+    sort = [
+      {
+        property: defaultSort.property,
+        direction: defaultSort.direction || 'asc'
+      }
+    ];
+  } else if (updated) {
+    sort = [
+      {
+        property: 'updated',
+        direction: 'desc'
+      }
+    ];
+  }
 
   return {
     where,
     limit: 10,
     offset: 0,
-    sort: updated
-      ? [
-          {
-            property: 'updated',
-            direction: 'desc'
-          }
-        ]
-      : []
+    sort
   };
 };