@blaze-cms/plugin-data-ui 0.146.0-core-styles.56 → 0.146.0-core-styles.61

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

@@ -0,0 +1,96 @@
+import { DEFAULT_FILTER_OPTION_LABEL } from '../../../constants';
+
+const updateListFilters = (searchTerm, selectedFilters, setListFilters, fields = []) => {
+  const filters = [];
+  if (searchTerm) {
+    filters.push({
+      simple_query_string: {
+        query: `${searchTerm}*`,
+        fields
+      }
+    });
+  }
+
+  Object.keys(selectedFilters).forEach(filterKey => {
+    const filterValue = selectedFilters[filterKey];
+    if (!filterValue || filterValue === DEFAULT_FILTER_OPTION_LABEL) return;
+    filters.push({
+      match: {
+        [filterKey]: filterValue
+      }
+    });
+  });
+
+  setListFilters(filters);
+};
+
+const getKeywordSearchFilters = schema => {
+  if (!schema || !schema.properties) return [];
+
+  const { properties = {}, dynamicProperties = {} } = schema;
+
+  const propertyKeyword = Object.entries(properties).filter(isFilterKeywordItem);
+  const dynamicPropertyKeywords = Object.entries(dynamicProperties).filter(isFilterKeywordItem);
+
+  return [...propertyKeyword, ...dynamicPropertyKeywords];
+};
+
+const isFilterKeywordItem = ([, item]) =>
+  item.adminListingOptions && item.adminListingOptions.includeInKeywordSeach === true;
+
+const findSelectFilters = schema => {
+  if (!schema || !schema.properties) return [];
+
+  const { properties = {}, dynamicProperties = {} } = schema;
+
+  const propertySelects = Object.entries(properties).filter(isFilterSelectItem);
+  const dynamicPropertySelects = Object.entries(dynamicProperties).filter(isFilterSelectItem);
+
+  return [...propertySelects, ...dynamicPropertySelects];
+};
+
+const isFilterSelectItem = ([, item]) =>
+  item.adminListingOptions && item.adminListingOptions.filterType === 'select';
+
+const buildQueryFields = (selectFilters, entityId) => {
+  if (!Array.isArray(selectFilters) || selectFilters.length === 0) {
+    return { gqlFields: '', rawQuery: '{}' };
+  }
+
+  const aggs = {};
+  selectFilters.forEach(([property, details]) => {
+    aggs[property] = {
+      terms: {
+        field: `${property}.keyword`, // todo: handle different field types
+        size: 1000, // todo: customise size
+        order: {
+          _key: 'asc'
+        }
+      }
+    };
+  });
+
+  const docType = entityId;
+  const rawQueryObject = {
+    size: 0,
+    query: {
+      bool: {
+        filter: {
+          bool: {
+            must: [{ match: { docType } }]
+          }
+        }
+      }
+    },
+    aggs
+  };
+  const rawQuery = JSON.stringify(rawQueryObject);
+
+  const gqlFields = `
+    rawResults
+  `;
+
+  return { gqlFields, rawQuery };
+};
+
+export { buildQueryFields, updateListFilters, getKeywordSearchFilters, findSelectFilters };

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

@@ -0,0 +1,9 @@
+import { gql } from '@apollo/client';
+
+const NOOP_QUERY = gql`
+  query NoOp {
+    __typename
+  }
+`;
+
+export { NOOP_QUERY };

package/src/components/ListingTable/service/index.js

@@ -35,11 +35,11 @@ function buildVariables({ entitySchema, isSearchQuery, listFilters = [], queryPa
 
 const fetchData = async ({ client, querySettings: { entitySchema, queryParams }, listFilters }) => {
   const {
-    displayProperties: { adminListings: { dataSource: { source } = {} } = {} } = {}
+    displayProperties: { adminListings: { dataSource: { source, index } = {} } = {} } = {}
   } = entitySchema;
 
   const isSearchQuery = source === 'search';
-  const query = buildListingQuery(entitySchema, isSearchQuery);
+  const query = buildListingQuery(entitySchema, index, isSearchQuery);
   const variables = buildVariables({ entitySchema, listFilters, queryParams, isSearchQuery });
 
   const { data = {} } = await client.query({

package/src/constants.js

@@ -26,6 +26,8 @@ const PAGE_BUILDER_TAB_INDEX = 1;
 const EDITOR_VIEW_TAB = 'Editor view';
 const EDITOR_VIEW_TAB_INDEX = 0;
 
+const ENTER_KEY = 'Enter';
+
 const ICON_SIZE = {
   WIDTH: '25px',
   HEIGHT: '25px'
@@ -36,6 +38,8 @@ const ICON_COLOR = {
   FILL: '#63779C'
 };
 
+const DEFAULT_FILTER_OPTION_LABEL = 'Any';
+
 export {
   DATA_LISTING_PREFIX,
   ENTITY_PUBLISHED,
@@ -63,5 +67,7 @@ export {
   SAVE_BEFORE_PUBLISH_MESSAGE,
   ICON_SIZE,
   ICON_COLOR,
-  PAGE_NOT_FOUND
+  PAGE_NOT_FOUND,
+  ENTER_KEY,
+  DEFAULT_FILTER_OPTION_LABEL
 };

package/src/utils/build-listing-query.js

@@ -2,21 +2,21 @@ import { gql } from '@apollo/client';
 import { BlazeError } from '@blaze-cms/core-errors';
 import { getDynamicQuery } from '@blaze-cms/admin-ui-utils';
 
-const buildAdminSearchQuery = entitySchema => {
+const buildAdminSearchQuery = (entitySchema, index) => {
   const { listingProperties = [] } = entitySchema || {};
   const parsedProperties = `id, ${listingProperties.join(' ') || 'id name'}`;
 
-  return getDynamicQuery('ADMIN_SEARCH')([entitySchema], parsedProperties, true);
+  return getDynamicQuery('ADMIN_SEARCH')([entitySchema], parsedProperties, true, index);
 };
 
-function buildListingQuery(entitySchema, isSearchQuery) {
+function buildListingQuery(entitySchema, index, isSearchQuery) {
   if (!entitySchema.actions || !entitySchema.actions.getAll || !entitySchema.listingProperties) {
     throw new BlazeError(
       'Listing query requires getAll action and listingProperties from entity schema'
     );
   }
 
-  if (isSearchQuery) return buildAdminSearchQuery(entitySchema);
+  if (isSearchQuery) return buildAdminSearchQuery(entitySchema, index);
 
   const sortType =
     entitySchema.actions.getAll[0].toUpperCase() + entitySchema.actions.getAll.substr(1);