@blaze-cms/plugin-data-ui 0.146.0-translations.8 → 0.147.0-rc-eagle.4

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,23 @@ 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 +128,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/components/ListingTable/service/index.js

@@ -34,9 +34,8 @@ function buildVariables({ entitySchema, isSearchQuery, listFilters = [], queryPa
 }
 
 const fetchData = async ({ client, querySettings: { entitySchema, queryParams }, listFilters }) => {
-  const {
-    displayProperties: { adminListings: { dataSource: { source, index } = {} } = {} } = {}
-  } = entitySchema;
+  const { displayProperties: { adminListings: { dataSource: { source, index } = {} } = {} } = {} } =
+    entitySchema;
 
   const isSearchQuery = source === 'search';
   const query = buildListingQuery(entitySchema, index, isSearchQuery);

package/src/components/Tabs/index.js

@@ -1,11 +1,7 @@
 import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { Tab, TabItem } from '@blaze-react/tab';
-import {
-  useReadFromCache,
-  GET_CURRENT_TAB_ID,
-  TabsContextProvider
-} from '@blaze-cms/admin-ui-utils';
+import { useTabsContext, TabsContextProvider } from '@blaze-cms/admin-ui-utils';
 import {
   PAGE_BUILDER_TAB,
   PAGE_BUILDER_TAB_INDEX,
@@ -14,25 +10,25 @@ import {
 } from '../../constants';
 
 const Tabs = ({ children, onTabChange, enabled }) => {
-  const { currentTabId } = useReadFromCache({ query: GET_CURRENT_TAB_ID }) || EDITOR_VIEW_TAB_INDEX;
+  const { currentTabId = EDITOR_VIEW_TAB_INDEX } = useTabsContext() || {};
   const [activeAccordions, setActiveAccordions] = useState([]);
-  return enabled ? (
-    <>
-      <TabsContextProvider value={{ currentTabId, activeAccordions, setActiveAccordions }}>
-        <Tab selected={currentTabId}>
-          <TabItem title={EDITOR_VIEW_TAB} action={() => onTabChange(EDITOR_VIEW_TAB_INDEX)}>
-            {children}
-          </TabItem>
-          <TabItem title={PAGE_BUILDER_TAB} action={() => onTabChange(PAGE_BUILDER_TAB_INDEX)}>
-            {children}
-          </TabItem>
-        </Tab>
-      </TabsContextProvider>
-    </>
-  ) : (
-    <>{children}</>
+
+  if (!enabled) return children;
+
+  return (
+    <TabsContextProvider value={{ currentTabId, activeAccordions, setActiveAccordions }}>
+      <Tab selected={currentTabId}>
+        <TabItem title={EDITOR_VIEW_TAB} action={() => onTabChange(EDITOR_VIEW_TAB_INDEX)}>
+          {children}
+        </TabItem>
+        <TabItem title={PAGE_BUILDER_TAB} action={() => onTabChange(PAGE_BUILDER_TAB_INDEX)}>
+          {children}
+        </TabItem>
+      </Tab>
+    </TabsContextProvider>
   );
 };
+
 Tabs.propTypes = {
   children: PropTypes.oneOfType([PropTypes.object, PropTypes.arrayOf(PropTypes.object)]).isRequired,
   onTabChange: PropTypes.func.isRequired,

package/src/index.js

@@ -1,16 +1,20 @@
 import { getFormBuilderLookup, formFieldTypes } from '@blaze-cms/react-form-builder';
-import React from 'react';
 import pkg from '../package.json';
 import { DATA_LISTING_PREFIX, PLUGIN_NAME } from './constants';
 import getAddContentMenuItems from './utils/add-content-menu-items';
 import { UserIcon, TaxonomyIcon, ContentIcon, SettingsIcon } from './icons';
+import EntityDataListing from './components/EntityDataListing';
+import EntityManager from './components/EntityManager';
 
-const EntityDataListing = React.lazy(() =>
-  import(/* webpackChunkName: 'EntityDataListing' */ './components/EntityDataListing')
-);
-const EntityManager = React.lazy(() =>
-  import(/* webpackChunkName: 'EntityManager' */ './components/EntityManager')
-);
+// todo: renable lazy loading after bundler optimisations, currently they are too slow in dev mode
+// const EntityDataListing = React.lazy(
+//   () => import(/* webpackChunkName: 'EntityDataListing' */ './components/EntityDataListing')
+// );
+// const EntityManager = React.lazy(
+//   () => 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/hoc/withContext.js

@@ -1,7 +1,8 @@
 import React from 'react';
 import { useMainContext, MainContext } from '@blaze-cms/admin-ui-utils';
 
-export const withContext = Component => props => {
-  const contexts = useMainContext(MainContext);
-  return <Component {...props} {...contexts} />;
-};
+export const withContext = Component =>
+  function (props) {
+    const contexts = useMainContext(MainContext);
+    return <Component {...props} {...contexts} />;
+  };