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

package/lib-es/components/ListingTable/SearchFilter/SearchFilter.js

@@ -1,10 +1,11 @@
 import React, { useMemo } from 'react';
 import PropTypes from 'prop-types';
-import { getKeywordSearchFilters, findSelectFilters } from './helpers';
+import { getKeywordSearchFilters, findSelectFilters, findMultiSelectFilters } from './helpers';
 import SearchContainer from './SearchContainer';
 const SearchFilter = ({
   schema,
-  setListFilters
+  setListFilters,
+  values
 }) => {
   const {
     displayProperties = {}
@@ -20,6 +21,7 @@ const SearchFilter = ({
   } = displayProperties;
   const keywordFiltersToUse = useMemo(() => getKeywordSearchFilters(schema), [schema]);
   const selectFiltersToDisplay = useMemo(() => findSelectFilters(schema), [schema]);
+  const multiSelectFiltersToDisplay = useMemo(() => findMultiSelectFilters(schema), [schema]);
   if (disableListingFilter) return null;
   const canSearch = source === 'search' && (keywordFiltersToUse.length > 0 || selectFiltersToDisplay.length > 0);
   if (!canSearch) return null;
@@ -29,7 +31,9 @@ const SearchFilter = ({
     setListFilters: setListFilters,
     keywordFiltersToUse: keywordFiltersToUse,
     selectFiltersToDisplay: selectFiltersToDisplay,
-    schema: schema
+    multiSelectFiltersToDisplay: multiSelectFiltersToDisplay,
+    schema: schema,
+    values: values
   });
 };
 SearchFilter.propTypes = {

package/lib-es/components/ListingTable/SearchFilter/SearchFilter.js.map

@@ -1 +1 @@
-{"version":3,"file":"SearchFilter.js","names":["React","useMemo","PropTypes","getKeywordSearchFilters","findSelectFilters","SearchContainer","SearchFilter","schema","setListFilters","displayProperties","adminListings","dataSource","source","index","disableListingFilter","keywordFiltersToUse","selectFiltersToDisplay","canSearch","length","createElement","key","id","propTypes","func","isRequired","object"],"sources":["../../../../src/components/ListingTable/SearchFilter/SearchFilter.js"],"sourcesContent":["import React, { useMemo } from 'react';\nimport PropTypes from 'prop-types';\nimport { getKeywordSearchFilters, findSelectFilters } from './helpers';\nimport SearchContainer from './SearchContainer';\n\nconst SearchFilter = ({ schema, setListFilters }) => {\n  const { displayProperties = {} } = schema || {};\n  const {\n    adminListings: { dataSource: { source, index } = {}, disableListingFilter = false } = {}\n  } = displayProperties;\n\n  const keywordFiltersToUse = useMemo(() => getKeywordSearchFilters(schema), [schema]);\n  const selectFiltersToDisplay = useMemo(() => findSelectFilters(schema), [schema]);\n\n  if (disableListingFilter) return null;\n\n  const canSearch =\n    source === 'search' && (keywordFiltersToUse.length > 0 || selectFiltersToDisplay.length > 0);\n  if (!canSearch) return null;\n\n  return (\n    <SearchContainer\n      index={index}\n      key={schema.id}\n      setListFilters={setListFilters}\n      keywordFiltersToUse={keywordFiltersToUse}\n      selectFiltersToDisplay={selectFiltersToDisplay}\n      schema={schema}\n    />\n  );\n};\n\nSearchFilter.propTypes = {\n  setListFilters: PropTypes.func.isRequired,\n  schema: PropTypes.object.isRequired\n};\n\nexport default SearchFilter;\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,OAAO,QAAQ,OAAO;AACtC,OAAOC,SAAS,MAAM,YAAY;AAClC,SAASC,uBAAuB,EAAEC,iBAAiB,QAAQ,WAAW;AACtE,OAAOC,eAAe,MAAM,mBAAmB;AAE/C,MAAMC,YAAY,GAAGA,CAAC;EAAEC,MAAM;EAAEC;AAAe,CAAC,KAAK;EACnD,MAAM;IAAEC,iBAAiB,GAAG,CAAC;EAAE,CAAC,GAAGF,MAAM,IAAI,CAAC,CAAC;EAC/C,MAAM;IACJG,aAAa,EAAE;MAAEC,UAAU,EAAE;QAAEC,MAAM;QAAEC;MAAM,CAAC,GAAG,CAAC,CAAC;MAAEC,oBAAoB,GAAG;IAAM,CAAC,GAAG,CAAC;EACzF,CAAC,GAAGL,iBAAiB;EAErB,MAAMM,mBAAmB,GAAGd,OAAO,CAAC,MAAME,uBAAuB,CAACI,MAAM,CAAC,EAAE,CAACA,MAAM,CAAC,CAAC;EACpF,MAAMS,sBAAsB,GAAGf,OAAO,CAAC,MAAMG,iBAAiB,CAACG,MAAM,CAAC,EAAE,CAACA,MAAM,CAAC,CAAC;EAEjF,IAAIO,oBAAoB,EAAE,OAAO,IAAI;EAErC,MAAMG,SAAS,GACbL,MAAM,KAAK,QAAQ,KAAKG,mBAAmB,CAACG,MAAM,GAAG,CAAC,IAAIF,sBAAsB,CAACE,MAAM,GAAG,CAAC,CAAC;EAC9F,IAAI,CAACD,SAAS,EAAE,OAAO,IAAI;EAE3B,oBACEjB,KAAA,CAAAmB,aAAA,CAACd,eAAe;IACdQ,KAAK,EAAEA,KAAM;IACbO,GAAG,EAAEb,MAAM,CAACc,EAAG;IACfb,cAAc,EAAEA,cAAe;IAC/BO,mBAAmB,EAAEA,mBAAoB;IACzCC,sBAAsB,EAAEA,sBAAuB;IAC/CT,MAAM,EAAEA;EAAO,CAChB,CAAC;AAEN,CAAC;AAEDD,YAAY,CAACgB,SAAS,GAAG;EACvBd,cAAc,EAAEN,SAAS,CAACqB,IAAI,CAACC,UAAU;EACzCjB,MAAM,EAAEL,SAAS,CAACuB,MAAM,CAACD;AAC3B,CAAC;AAED,eAAelB,YAAY","ignoreList":[]}
+{"version":3,"file":"SearchFilter.js","names":["React","useMemo","PropTypes","getKeywordSearchFilters","findSelectFilters","findMultiSelectFilters","SearchContainer","SearchFilter","schema","setListFilters","values","displayProperties","adminListings","dataSource","source","index","disableListingFilter","keywordFiltersToUse","selectFiltersToDisplay","multiSelectFiltersToDisplay","canSearch","length","createElement","key","id","propTypes","func","isRequired","object"],"sources":["../../../../src/components/ListingTable/SearchFilter/SearchFilter.js"],"sourcesContent":["import React, { useMemo } from 'react';\nimport PropTypes from 'prop-types';\nimport { getKeywordSearchFilters, findSelectFilters, findMultiSelectFilters } from './helpers';\nimport SearchContainer from './SearchContainer';\n\nconst SearchFilter = ({ schema, setListFilters, values }) => {\n  const { displayProperties = {} } = schema || {};\n  const {\n    adminListings: { dataSource: { source, index } = {}, disableListingFilter = false } = {}\n  } = displayProperties;\n\n  const keywordFiltersToUse = useMemo(() => getKeywordSearchFilters(schema), [schema]);\n  const selectFiltersToDisplay = useMemo(() => findSelectFilters(schema), [schema]);\n  const multiSelectFiltersToDisplay = useMemo(() => findMultiSelectFilters(schema), [schema]);\n\n  if (disableListingFilter) return null;\n\n  const canSearch =\n    source === 'search' && (keywordFiltersToUse.length > 0 || selectFiltersToDisplay.length > 0);\n  if (!canSearch) return null;\n\n  return (\n    <SearchContainer\n      index={index}\n      key={schema.id}\n      setListFilters={setListFilters}\n      keywordFiltersToUse={keywordFiltersToUse}\n      selectFiltersToDisplay={selectFiltersToDisplay}\n      multiSelectFiltersToDisplay={multiSelectFiltersToDisplay}\n      schema={schema}\n      values={values}\n    />\n  );\n};\n\nSearchFilter.propTypes = {\n  setListFilters: PropTypes.func.isRequired,\n  schema: PropTypes.object.isRequired\n};\n\nexport default SearchFilter;\n"],"mappings":"AAAA,OAAOA,KAAK,IAAIC,OAAO,QAAQ,OAAO;AACtC,OAAOC,SAAS,MAAM,YAAY;AAClC,SAASC,uBAAuB,EAAEC,iBAAiB,EAAEC,sBAAsB,QAAQ,WAAW;AAC9F,OAAOC,eAAe,MAAM,mBAAmB;AAE/C,MAAMC,YAAY,GAAGA,CAAC;EAAEC,MAAM;EAAEC,cAAc;EAAEC;AAAO,CAAC,KAAK;EAC3D,MAAM;IAAEC,iBAAiB,GAAG,CAAC;EAAE,CAAC,GAAGH,MAAM,IAAI,CAAC,CAAC;EAC/C,MAAM;IACJI,aAAa,EAAE;MAAEC,UAAU,EAAE;QAAEC,MAAM;QAAEC;MAAM,CAAC,GAAG,CAAC,CAAC;MAAEC,oBAAoB,GAAG;IAAM,CAAC,GAAG,CAAC;EACzF,CAAC,GAAGL,iBAAiB;EAErB,MAAMM,mBAAmB,GAAGhB,OAAO,CAAC,MAAME,uBAAuB,CAACK,MAAM,CAAC,EAAE,CAACA,MAAM,CAAC,CAAC;EACpF,MAAMU,sBAAsB,GAAGjB,OAAO,CAAC,MAAMG,iBAAiB,CAACI,MAAM,CAAC,EAAE,CAACA,MAAM,CAAC,CAAC;EACjF,MAAMW,2BAA2B,GAAGlB,OAAO,CAAC,MAAMI,sBAAsB,CAACG,MAAM,CAAC,EAAE,CAACA,MAAM,CAAC,CAAC;EAE3F,IAAIQ,oBAAoB,EAAE,OAAO,IAAI;EAErC,MAAMI,SAAS,GACbN,MAAM,KAAK,QAAQ,KAAKG,mBAAmB,CAACI,MAAM,GAAG,CAAC,IAAIH,sBAAsB,CAACG,MAAM,GAAG,CAAC,CAAC;EAC9F,IAAI,CAACD,SAAS,EAAE,OAAO,IAAI;EAE3B,oBACEpB,KAAA,CAAAsB,aAAA,CAAChB,eAAe;IACdS,KAAK,EAAEA,KAAM;IACbQ,GAAG,EAAEf,MAAM,CAACgB,EAAG;IACff,cAAc,EAAEA,cAAe;IAC/BQ,mBAAmB,EAAEA,mBAAoB;IACzCC,sBAAsB,EAAEA,sBAAuB;IAC/CC,2BAA2B,EAAEA,2BAA4B;IACzDX,MAAM,EAAEA,MAAO;IACfE,MAAM,EAAEA;EAAO,CAChB,CAAC;AAEN,CAAC;AAEDH,YAAY,CAACkB,SAAS,GAAG;EACvBhB,cAAc,EAAEP,SAAS,CAACwB,IAAI,CAACC,UAAU;EACzCnB,MAAM,EAAEN,SAAS,CAAC0B,MAAM,CAACD;AAC3B,CAAC;AAED,eAAepB,YAAY","ignoreList":[]}

package/lib-es/components/ListingTable/SearchFilter/helpers.js

@@ -11,14 +11,30 @@ 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);
 };
@@ -43,7 +59,18 @@ const findSelectFilters = schema => {
   const dynamicPropertySelects = Object.entries(dynamicProperties).filter(isFilterSelectItem);
   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 {
@@ -92,5 +119,9 @@ const buildQueryFields = (selectFilters, entityId) => {
     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 };
 //# sourceMappingURL=helpers.js.map

package/lib-es/components/ListingTable/SearchFilter/helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"helpers.js","names":["DEFAULT_FILTER_OPTION_LABEL","updateListFilters","searchTerm","selectedFilters","setListFilters","fields","filters","push","simple_query_string","query","default_operator","map","field","Object","entries","forEach","filterKey","filterValue","match","getKeywordSearchFilters","schema","properties","dynamicProperties","propertyKeyword","filter","isFilterKeywordItem","dynamicPropertyKeywords","item","adminListingOptions","includeInKeywordSeach","findSelectFilters","propertySelects","isFilterSelectItem","dynamicPropertySelects","filterType","buildQueryFields","selectFilters","entityId","Array","isArray","length","gqlFields","rawQuery","aggs","property","details","terms","size","order","_key","docType","rawQueryObject","bool","must","JSON","stringify"],"sources":["../../../../src/components/ListingTable/SearchFilter/helpers.js"],"sourcesContent":["import { DEFAULT_FILTER_OPTION_LABEL } from '../../../constants';\n\nconst updateListFilters = (searchTerm, selectedFilters, setListFilters, fields = []) => {\n  const filters = [];\n\n  if (searchTerm) {\n    filters.push({\n      simple_query_string: {\n        query: `${searchTerm}`,\n        default_operator: 'AND',\n        fields: fields.map(field => field)\n      }\n    });\n  }\n\n  Object.entries(selectedFilters).forEach(([filterKey, filterValue]) => {\n    if (!filterValue || filterValue === DEFAULT_FILTER_OPTION_LABEL) return;\n    filters.push({\n      match: {\n        [`${filterKey}.keyword`]: {\n          query: filterValue\n        }\n      }\n    });\n  });\n\n  setListFilters(filters);\n};\n\nconst getKeywordSearchFilters = schema => {\n  if (!schema || !schema.properties) return [];\n\n  const { properties = {}, dynamicProperties = {} } = schema;\n\n  const propertyKeyword = Object.entries(properties).filter(isFilterKeywordItem);\n  const dynamicPropertyKeywords = Object.entries(dynamicProperties).filter(isFilterKeywordItem);\n\n  return [...propertyKeyword, ...dynamicPropertyKeywords];\n};\n\nconst isFilterKeywordItem = ([, item]) =>\n  item.adminListingOptions && item.adminListingOptions.includeInKeywordSeach === true;\n\nconst findSelectFilters = schema => {\n  if (!schema || !schema.properties) return [];\n\n  const { properties = {}, dynamicProperties = {} } = schema;\n\n  const propertySelects = Object.entries(properties).filter(isFilterSelectItem);\n  const dynamicPropertySelects = Object.entries(dynamicProperties).filter(isFilterSelectItem);\n\n  return [...propertySelects, ...dynamicPropertySelects];\n};\n\nconst isFilterSelectItem = ([, item]) =>\n  item.adminListingOptions && item.adminListingOptions.filterType === 'select';\n\nconst buildQueryFields = (selectFilters, entityId) => {\n  if (!Array.isArray(selectFilters) || selectFilters.length === 0) {\n    return { gqlFields: '', rawQuery: '{}' };\n  }\n\n  const aggs = {};\n  selectFilters.forEach(([property, details]) => {\n    aggs[property] = {\n      terms: {\n        field: `${property}.keyword`, // todo: handle different field types\n        size: 1000, // todo: customise size\n        order: {\n          _key: 'asc'\n        }\n      }\n    };\n  });\n\n  const docType = entityId;\n  const rawQueryObject = {\n    size: 0,\n    query: {\n      bool: {\n        filter: {\n          bool: {\n            must: [{ match: { docType } }]\n          }\n        }\n      }\n    },\n    aggs\n  };\n  const rawQuery = JSON.stringify(rawQueryObject);\n\n  const gqlFields = `\n    rawResults\n  `;\n\n  return { gqlFields, rawQuery };\n};\n\nexport { buildQueryFields, updateListFilters, getKeywordSearchFilters, findSelectFilters };\n"],"mappings":"AAAA,SAASA,2BAA2B,QAAQ,oBAAoB;AAEhE,MAAMC,iBAAiB,GAAGA,CAACC,UAAU,EAAEC,eAAe,EAAEC,cAAc,EAAEC,MAAM,GAAG,EAAE,KAAK;EACtF,MAAMC,OAAO,GAAG,EAAE;EAElB,IAAIJ,UAAU,EAAE;IACdI,OAAO,CAACC,IAAI,CAAC;MACXC,mBAAmB,EAAE;QACnBC,KAAK,EAAE,GAAGP,UAAU,EAAE;QACtBQ,gBAAgB,EAAE,KAAK;QACvBL,MAAM,EAAEA,MAAM,CAACM,GAAG,CAACC,KAAK,IAAIA,KAAK;MACnC;IACF,CAAC,CAAC;EACJ;EAEAC,MAAM,CAACC,OAAO,CAACX,eAAe,CAAC,CAACY,OAAO,CAAC,CAAC,CAACC,SAAS,EAAEC,WAAW,CAAC,KAAK;IACpE,IAAI,CAACA,WAAW,IAAIA,WAAW,KAAKjB,2BAA2B,EAAE;IACjEM,OAAO,CAACC,IAAI,CAAC;MACXW,KAAK,EAAE;QACL,CAAC,GAAGF,SAAS,UAAU,GAAG;UACxBP,KAAK,EAAEQ;QACT;MACF;IACF,CAAC,CAAC;EACJ,CAAC,CAAC;EAEFb,cAAc,CAACE,OAAO,CAAC;AACzB,CAAC;AAED,MAAMa,uBAAuB,GAAGC,MAAM,IAAI;EACxC,IAAI,CAACA,MAAM,IAAI,CAACA,MAAM,CAACC,UAAU,EAAE,OAAO,EAAE;EAE5C,MAAM;IAAEA,UAAU,GAAG,CAAC,CAAC;IAAEC,iBAAiB,GAAG,CAAC;EAAE,CAAC,GAAGF,MAAM;EAE1D,MAAMG,eAAe,GAAGV,MAAM,CAACC,OAAO,CAACO,UAAU,CAAC,CAACG,MAAM,CAACC,mBAAmB,CAAC;EAC9E,MAAMC,uBAAuB,GAAGb,MAAM,CAACC,OAAO,CAACQ,iBAAiB,CAAC,CAACE,MAAM,CAACC,mBAAmB,CAAC;EAE7F,OAAO,CAAC,GAAGF,eAAe,EAAE,GAAGG,uBAAuB,CAAC;AACzD,CAAC;AAED,MAAMD,mBAAmB,GAAGA,CAAC,GAAGE,IAAI,CAAC,KACnCA,IAAI,CAACC,mBAAmB,IAAID,IAAI,CAACC,mBAAmB,CAACC,qBAAqB,KAAK,IAAI;AAErF,MAAMC,iBAAiB,GAAGV,MAAM,IAAI;EAClC,IAAI,CAACA,MAAM,IAAI,CAACA,MAAM,CAACC,UAAU,EAAE,OAAO,EAAE;EAE5C,MAAM;IAAEA,UAAU,GAAG,CAAC,CAAC;IAAEC,iBAAiB,GAAG,CAAC;EAAE,CAAC,GAAGF,MAAM;EAE1D,MAAMW,eAAe,GAAGlB,MAAM,CAACC,OAAO,CAACO,UAAU,CAAC,CAACG,MAAM,CAACQ,kBAAkB,CAAC;EAC7E,MAAMC,sBAAsB,GAAGpB,MAAM,CAACC,OAAO,CAACQ,iBAAiB,CAAC,CAACE,MAAM,CAACQ,kBAAkB,CAAC;EAE3F,OAAO,CAAC,GAAGD,eAAe,EAAE,GAAGE,sBAAsB,CAAC;AACxD,CAAC;AAED,MAAMD,kBAAkB,GAAGA,CAAC,GAAGL,IAAI,CAAC,KAClCA,IAAI,CAACC,mBAAmB,IAAID,IAAI,CAACC,mBAAmB,CAACM,UAAU,KAAK,QAAQ;AAE9E,MAAMC,gBAAgB,GAAGA,CAACC,aAAa,EAAEC,QAAQ,KAAK;EACpD,IAAI,CAACC,KAAK,CAACC,OAAO,CAACH,aAAa,CAAC,IAAIA,aAAa,CAACI,MAAM,KAAK,CAAC,EAAE;IAC/D,OAAO;MAAEC,SAAS,EAAE,EAAE;MAAEC,QAAQ,EAAE;IAAK,CAAC;EAC1C;EAEA,MAAMC,IAAI,GAAG,CAAC,CAAC;EACfP,aAAa,CAACrB,OAAO,CAAC,CAAC,CAAC6B,QAAQ,EAAEC,OAAO,CAAC,KAAK;IAC7CF,IAAI,CAACC,QAAQ,CAAC,GAAG;MACfE,KAAK,EAAE;QACLlC,KAAK,EAAE,GAAGgC,QAAQ,UAAU;QAAE;QAC9BG,IAAI,EAAE,IAAI;QAAE;QACZC,KAAK,EAAE;UACLC,IAAI,EAAE;QACR;MACF;IACF,CAAC;EACH,CAAC,CAAC;EAEF,MAAMC,OAAO,GAAGb,QAAQ;EACxB,MAAMc,cAAc,GAAG;IACrBJ,IAAI,EAAE,CAAC;IACPtC,KAAK,EAAE;MACL2C,IAAI,EAAE;QACJ5B,MAAM,EAAE;UACN4B,IAAI,EAAE;YACJC,IAAI,EAAE,CAAC;cAAEnC,KAAK,EAAE;gBAAEgC;cAAQ;YAAE,CAAC;UAC/B;QACF;MACF;IACF,CAAC;IACDP;EACF,CAAC;EACD,MAAMD,QAAQ,GAAGY,IAAI,CAACC,SAAS,CAACJ,cAAc,CAAC;EAE/C,MAAMV,SAAS,GAAG;AACpB;AACA,GAAG;EAED,OAAO;IAAEA,SAAS;IAAEC;EAAS,CAAC;AAChC,CAAC;AAED,SAASP,gBAAgB,EAAElC,iBAAiB,EAAEkB,uBAAuB,EAAEW,iBAAiB","ignoreList":[]}
+{"version":3,"file":"helpers.js","names":["DEFAULT_FILTER_OPTION_LABEL","updateListFilters","searchTerm","selectedFilters","setListFilters","fields","filters","push","simple_query_string","query","default_operator","map","field","Object","entries","forEach","filterKey","filterValue","isEmptyArray","Array","isArray","length","terms","term","getKeywordSearchFilters","schema","properties","dynamicProperties","propertyKeyword","filter","isFilterKeywordItem","dynamicPropertyKeywords","item","adminListingOptions","includeInKeywordSeach","findSelectFilters","propertySelects","isFilterSelectItem","dynamicPropertySelects","findMultiSelectFilters","propertyMultiSelect","isFilterMultiSelectItems","dynamicPropertyMultiSelect","filterType","buildQueryFields","selectFilters","entityId","gqlFields","rawQuery","aggs","property","details","size","order","_key","docType","rawQueryObject","bool","must","match","JSON","stringify","getTidyLabel","value","tidy","split","word","charAt","toUpperCase","slice","join"],"sources":["../../../../src/components/ListingTable/SearchFilter/helpers.js"],"sourcesContent":["import { DEFAULT_FILTER_OPTION_LABEL } from '../../../constants';\n\nconst updateListFilters = (searchTerm, selectedFilters, setListFilters, fields = []) => {\n  const filters = [];\n\n  if (searchTerm) {\n    filters.push({\n      simple_query_string: {\n        query: `${searchTerm}`,\n        default_operator: 'AND',\n        fields: fields.map(field => field)\n      }\n    });\n  }\n\n  Object.entries(selectedFilters).forEach(([filterKey, filterValue]) => {\n    const isEmptyArray = Array.isArray(filterValue) && filterValue.length === 0;\n    if (\n      filterValue == null ||\n      filterValue === '' ||\n      filterValue === DEFAULT_FILTER_OPTION_LABEL ||\n      isEmptyArray\n    )\n      return;\n\n    const field = `${filterKey}.keyword`;\n\n    if (Array.isArray(filterValue)) {\n      if (filterValue.length > 1) {\n        filters.push({\n          terms: { [field]: filterValue }\n        });\n      } else {\n        filters.push({\n          term: { [field]: filterValue[0] }\n        });\n      }\n    } else {\n      filters.push({\n        term: { [field]: filterValue }\n      });\n    }\n  });\n\n  setListFilters(filters);\n};\n\nconst getKeywordSearchFilters = schema => {\n  if (!schema || !schema.properties) return [];\n\n  const { properties = {}, dynamicProperties = {} } = schema;\n\n  const propertyKeyword = Object.entries(properties).filter(isFilterKeywordItem);\n  const dynamicPropertyKeywords = Object.entries(dynamicProperties).filter(isFilterKeywordItem);\n\n  return [...propertyKeyword, ...dynamicPropertyKeywords];\n};\n\nconst isFilterKeywordItem = ([, item]) =>\n  item.adminListingOptions && item.adminListingOptions.includeInKeywordSeach === true;\n\nconst findSelectFilters = schema => {\n  if (!schema || !schema.properties) return [];\n\n  const { properties = {}, dynamicProperties = {} } = schema;\n\n  const propertySelects = Object.entries(properties).filter(isFilterSelectItem);\n  const dynamicPropertySelects = Object.entries(dynamicProperties).filter(isFilterSelectItem);\n\n  return [...propertySelects, ...dynamicPropertySelects];\n};\n\nconst findMultiSelectFilters = schema => {\n  if (!schema || !schema.properties) return [];\n\n  const { properties = {}, dynamicProperties = {} } = schema;\n  const propertyMultiSelect = Object.entries(properties).filter(isFilterMultiSelectItems);\n  const dynamicPropertyMultiSelect =\n    Object.entries(dynamicProperties).filter(isFilterMultiSelectItems);\n  return [...propertyMultiSelect, ...dynamicPropertyMultiSelect];\n};\n\nconst isFilterSelectItem = ([, item]) =>\n  item.adminListingOptions && item.adminListingOptions.filterType === 'select';\n\nconst isFilterMultiSelectItems = ([, item]) =>\n  item.adminListingOptions && item.adminListingOptions.filterType === 'multiSelect';\n\nconst buildQueryFields = (selectFilters, entityId) => {\n  if (!Array.isArray(selectFilters) || selectFilters.length === 0) {\n    return { gqlFields: '', rawQuery: '{}' };\n  }\n\n  const aggs = {};\n  selectFilters.forEach(([property, details]) => {\n    aggs[property] = {\n      terms: {\n        field: `${property}.keyword`, // todo: handle different field types\n        size: 1000, // todo: customise size\n        order: {\n          _key: 'asc'\n        }\n      }\n    };\n  });\n\n  const docType = entityId;\n  const rawQueryObject = {\n    size: 0,\n    query: {\n      bool: {\n        filter: {\n          bool: {\n            must: [{ match: { docType } }]\n          }\n        }\n      }\n    },\n    aggs\n  };\n  const rawQuery = JSON.stringify(rawQueryObject);\n\n  const gqlFields = `\n    rawResults\n  `;\n\n  return { gqlFields, rawQuery };\n};\n\nconst getTidyLabel = (value, tidy) => {\n  if (!tidy) return value;\n\n  return value\n    .split(/[\\s_-]+/)\n    .map(word => word.charAt(0).toUpperCase() + word.slice(1))\n    .join(' ');\n};\n\nexport {\n  buildQueryFields,\n  updateListFilters,\n  getKeywordSearchFilters,\n  findSelectFilters,\n  findMultiSelectFilters,\n  getTidyLabel\n};\n"],"mappings":"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","ignoreList":[]}

package/lib-es/index.js

@@ -14,6 +14,7 @@ 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));
   app.events.once('load:custom:field:type', addFieldType => {

package/lib-es/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["getFormBuilderLookup","formFieldTypes","pkg","DATA_LISTING_PREFIX","PLUGIN_NAME","getAddContentMenuItems","UserIcon","TaxonomyIcon","ContentIcon","SettingsIcon","EntityDataListing","EntityManager","load","app","events","once","addFieldType","Object","keys","forEach","type","component","emitAsync","addConfig","main","items","content","label","loadOpen","icon","order","taxonomy","user","settings","entityDataListingRoute","path","key","exact","editEntityRoute","addEntityRoute","addRoute","name","version","pluginName"],"sources":["../src/index.js"],"sourcesContent":["import { getFormBuilderLookup, formFieldTypes } from '@blaze-cms/react-form-builder';\nimport pkg from '../package.json';\nimport { DATA_LISTING_PREFIX, PLUGIN_NAME } from './constants';\nimport getAddContentMenuItems from './utils/add-content-menu-items';\nimport { UserIcon, TaxonomyIcon, ContentIcon, SettingsIcon } from './icons';\nimport EntityDataListing from './components/EntityDataListing';\nimport EntityManager from './components/EntityManager';\n\n// todo: renable lazy loading after bundler optimisations, currently they are too slow in dev mode\n// const EntityDataListing = React.lazy(\n//   () => import(/* webpackChunkName: 'EntityDataListing' */ './components/EntityDataListing')\n// );\n// const EntityManager = React.lazy(\n//   () => import(/* webpackChunkName: 'EntityManager' */ './components/EntityManager')\n// );\n\nexport default async function load(app) {\n  app.events.once('admin:menu:config:load', getAddContentMenuItems(app));\n\n  app.events.once('load:custom:field:type', addFieldType => {\n    Object.keys(formFieldTypes).forEach(type => {\n      addFieldType({ type, component: formFieldTypes[type] });\n    });\n  });\n\n  app.events.once('plugin:data-ui:load:loaded', async () => {\n    await app.events.emitAsync('load:custom:field:type', getFormBuilderLookup.addFieldType);\n  });\n\n  app.events.once('admin:menu:config:load', ({ addConfig }) => {\n    addConfig({\n      main: {\n        items: {\n          content: {\n            label: 'content',\n            loadOpen: true,\n            items: {},\n            icon: ContentIcon,\n            order: 10\n          },\n          taxonomy: {\n            label: 'Taxonomy',\n            items: {},\n            icon: TaxonomyIcon,\n            order: 40\n          },\n          user: {\n            label: 'User',\n            items: {},\n            icon: UserIcon,\n            order: 90\n          },\n          settings: {\n            label: 'Settings',\n            items: {},\n            icon: SettingsIcon,\n            order: 100\n          }\n        }\n      }\n    });\n  });\n\n  const entityDataListingRoute = {\n    path: `${DATA_LISTING_PREFIX}/:entityIdentifier`,\n    key: 'entityDataListing',\n    component: EntityDataListing,\n    exact: true\n  };\n\n  const editEntityRoute = {\n    path: `${DATA_LISTING_PREFIX}/:entityIdentifier/:action/:id`,\n    key: 'editEntity',\n    component: EntityManager,\n    exact: true\n  };\n\n  const addEntityRoute = {\n    path: `${DATA_LISTING_PREFIX}/:entityIdentifier/:action`,\n    key: 'createEntity',\n    component: EntityManager,\n    exact: true\n  };\n\n  app.addRoute(entityDataListingRoute);\n  app.addRoute(editEntityRoute);\n  app.addRoute(addEntityRoute);\n\n  return {\n    name: PLUGIN_NAME,\n    version: pkg.version\n  };\n}\n\nload.pluginName = PLUGIN_NAME;\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"index.js","names":["getFormBuilderLookup","formFieldTypes","pkg","DATA_LISTING_PREFIX","PLUGIN_NAME","getAddContentMenuItems","UserIcon","TaxonomyIcon","ContentIcon","SettingsIcon","EntityDataListing","EntityManager","default","SearchFilter","load","app","events","once","addFieldType","Object","keys","forEach","type","component","emitAsync","addConfig","main","items","content","label","loadOpen","icon","order","taxonomy","user","settings","entityDataListingRoute","path","key","exact","editEntityRoute","addEntityRoute","addRoute","name","version","pluginName"],"sources":["../src/index.js"],"sourcesContent":["import { getFormBuilderLookup, formFieldTypes } from '@blaze-cms/react-form-builder';\nimport pkg from '../package.json';\nimport { DATA_LISTING_PREFIX, PLUGIN_NAME } from './constants';\nimport getAddContentMenuItems from './utils/add-content-menu-items';\nimport { UserIcon, TaxonomyIcon, ContentIcon, SettingsIcon } from './icons';\nimport EntityDataListing from './components/EntityDataListing';\nimport EntityManager from './components/EntityManager';\n\n// todo: renable lazy loading after bundler optimisations, currently they are too slow in dev mode\n// const EntityDataListing = React.lazy(\n//   () => import(/* webpackChunkName: 'EntityDataListing' */ './components/EntityDataListing')\n// );\n// const EntityManager = React.lazy(\n//   () => import(/* webpackChunkName: 'EntityManager' */ './components/EntityManager')\n// );\n\nexport { default as SearchFilter } from './components/ListingTable/SearchFilter/SearchFilter';\n\nexport default async function load(app) {\n  app.events.once('admin:menu:config:load', getAddContentMenuItems(app));\n\n  app.events.once('load:custom:field:type', addFieldType => {\n    Object.keys(formFieldTypes).forEach(type => {\n      addFieldType({ type, component: formFieldTypes[type] });\n    });\n  });\n\n  app.events.once('plugin:data-ui:load:loaded', async () => {\n    await app.events.emitAsync('load:custom:field:type', getFormBuilderLookup.addFieldType);\n  });\n\n  app.events.once('admin:menu:config:load', ({ addConfig }) => {\n    addConfig({\n      main: {\n        items: {\n          content: {\n            label: 'content',\n            loadOpen: true,\n            items: {},\n            icon: ContentIcon,\n            order: 10\n          },\n          taxonomy: {\n            label: 'Taxonomy',\n            items: {},\n            icon: TaxonomyIcon,\n            order: 40\n          },\n          user: {\n            label: 'User',\n            items: {},\n            icon: UserIcon,\n            order: 90\n          },\n          settings: {\n            label: 'Settings',\n            items: {},\n            icon: SettingsIcon,\n            order: 100\n          }\n        }\n      }\n    });\n  });\n\n  const entityDataListingRoute = {\n    path: `${DATA_LISTING_PREFIX}/:entityIdentifier`,\n    key: 'entityDataListing',\n    component: EntityDataListing,\n    exact: true\n  };\n\n  const editEntityRoute = {\n    path: `${DATA_LISTING_PREFIX}/:entityIdentifier/:action/:id`,\n    key: 'editEntity',\n    component: EntityManager,\n    exact: true\n  };\n\n  const addEntityRoute = {\n    path: `${DATA_LISTING_PREFIX}/:entityIdentifier/:action`,\n    key: 'createEntity',\n    component: EntityManager,\n    exact: true\n  };\n\n  app.addRoute(entityDataListingRoute);\n  app.addRoute(editEntityRoute);\n  app.addRoute(addEntityRoute);\n\n  return {\n    name: PLUGIN_NAME,\n    version: pkg.version\n  };\n}\n\nload.pluginName = PLUGIN_NAME;\n"],"mappings":"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","ignoreList":[]}

package/lib-es/utils/get-default-query-params.js

@@ -1,16 +1,28 @@
 const getDefaultQueryParams = schema => {
   const updated = schema.properties && schema.properties.updated;
   const {
-    adminDefaultListingFilter: where
+    adminDefaultListingFilter: where,
+    adminListings: {
+      defaultSort
+    } = {}
   } = schema.displayProperties || {};
+  let sort = [];
+  if (defaultSort === null || defaultSort === void 0 ? void 0 : 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
   };
 };
 export { getDefaultQueryParams };

package/lib-es/utils/get-default-query-params.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-default-query-params.js","names":["getDefaultQueryParams","schema","updated","properties","adminDefaultListingFilter","where","displayProperties","limit","offset","sort","property","direction"],"sources":["../../src/utils/get-default-query-params.js"],"sourcesContent":["const getDefaultQueryParams = schema => {\n  const updated = schema.properties && schema.properties.updated;\n  const { adminDefaultListingFilter: where } = schema.displayProperties || {};\n\n  return {\n    where,\n    limit: 10,\n    offset: 0,\n    sort: updated\n      ? [\n          {\n            property: 'updated',\n            direction: 'desc'\n          }\n        ]\n      : []\n  };\n};\n\nexport { getDefaultQueryParams };\n"],"mappings":"AAAA,MAAMA,qBAAqB,GAAGC,MAAM,IAAI;EACtC,MAAMC,OAAO,GAAGD,MAAM,CAACE,UAAU,IAAIF,MAAM,CAACE,UAAU,CAACD,OAAO;EAC9D,MAAM;IAAEE,yBAAyB,EAAEC;EAAM,CAAC,GAAGJ,MAAM,CAACK,iBAAiB,IAAI,CAAC,CAAC;EAE3E,OAAO;IACLD,KAAK;IACLE,KAAK,EAAE,EAAE;IACTC,MAAM,EAAE,CAAC;IACTC,IAAI,EAAEP,OAAO,GACT,CACE;MACEQ,QAAQ,EAAE,SAAS;MACnBC,SAAS,EAAE;IACb,CAAC,CACF,GACD;EACN,CAAC;AACH,CAAC;AAED,SAASX,qBAAqB","ignoreList":[]}
+{"version":3,"file":"get-default-query-params.js","names":["getDefaultQueryParams","schema","updated","properties","adminDefaultListingFilter","where","adminListings","defaultSort","displayProperties","sort","property","direction","limit","offset"],"sources":["../../src/utils/get-default-query-params.js"],"sourcesContent":["const getDefaultQueryParams = schema => {\n  const updated = schema.properties && schema.properties.updated;\n  const { adminDefaultListingFilter: where, adminListings: { defaultSort } = {} } =\n    schema.displayProperties || {};\n\n  let sort = [];\n\n  if (defaultSort?.property) {\n    sort = [\n      {\n        property: defaultSort.property,\n        direction: defaultSort.direction || 'asc'\n      }\n    ];\n  } else if (updated) {\n    sort = [\n      {\n        property: 'updated',\n        direction: 'desc'\n      }\n    ];\n  }\n\n  return {\n    where,\n    limit: 10,\n    offset: 0,\n    sort\n  };\n};\n\nexport { getDefaultQueryParams };\n"],"mappings":"AAAA,MAAMA,qBAAqB,GAAGC,MAAM,IAAI;EACtC,MAAMC,OAAO,GAAGD,MAAM,CAACE,UAAU,IAAIF,MAAM,CAACE,UAAU,CAACD,OAAO;EAC9D,MAAM;IAAEE,yBAAyB,EAAEC,KAAK;IAAEC,aAAa,EAAE;MAAEC;IAAY,CAAC,GAAG,CAAC;EAAE,CAAC,GAC7EN,MAAM,CAACO,iBAAiB,IAAI,CAAC,CAAC;EAEhC,IAAIC,IAAI,GAAG,EAAE;EAEb,IAAIF,WAAW,aAAXA,WAAW,uBAAXA,WAAW,CAAEG,QAAQ,EAAE;IACzBD,IAAI,GAAG,CACL;MACEC,QAAQ,EAAEH,WAAW,CAACG,QAAQ;MAC9BC,SAAS,EAAEJ,WAAW,CAACI,SAAS,IAAI;IACtC,CAAC,CACF;EACH,CAAC,MAAM,IAAIT,OAAO,EAAE;IAClBO,IAAI,GAAG,CACL;MACEC,QAAQ,EAAE,SAAS;MACnBC,SAAS,EAAE;IACb,CAAC,CACF;EACH;EAEA,OAAO;IACLN,KAAK;IACLO,KAAK,EAAE,EAAE;IACTC,MAAM,EAAE,CAAC;IACTJ;EACF,CAAC;AACH,CAAC;AAED,SAAST,qBAAqB","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaze-cms/plugin-data-ui",
-  "version": "0.147.0-rc-eagle.2",
+  "version": "0.147.0-rc-eagle.6",
   "description": "Blaze plugin data ui",
   "main": "lib/index.js",
   "module": "lib-es/index.js",
@@ -32,16 +32,16 @@
   },
   "license": "GPL-3.0",
   "dependencies": {
-    "@blaze-cms/admin-ui-utils": "0.147.0-rc-eagle.2",
-    "@blaze-cms/core-errors": "0.147.0-rc-eagle.2",
-    "@blaze-cms/plugin-render-hooks-ui": "0.147.0-rc-eagle.2",
-    "@blaze-cms/react-form-builder": "0.147.0-rc-eagle.2",
-    "@blaze-cms/react-page-builder": "0.147.0-rc-eagle.2",
-    "@blaze-cms/setup-ui": "0.147.0-rc-eagle.2",
-    "@blaze-cms/versioning-ui": "0.147.0-rc-eagle.2",
+    "@blaze-cms/admin-ui-utils": "0.147.0-rc-eagle.6",
+    "@blaze-cms/core-errors": "0.147.0-rc-eagle.4",
+    "@blaze-cms/plugin-render-hooks-ui": "0.147.0-rc-eagle.6",
+    "@blaze-cms/react-form-builder": "0.147.0-rc-eagle.6",
+    "@blaze-cms/react-page-builder": "0.147.0-rc-eagle.6",
+    "@blaze-cms/setup-ui": "0.147.0-rc-eagle.4",
+    "@blaze-cms/versioning-ui": "0.147.0-rc-eagle.6",
     "@blaze-react/button": "0.8.0-alpha.82",
     "@blaze-react/more": "0.5.19",
-    "@blaze-react/multiselect": "0.8.0-alpha.103",
+    "@blaze-react/multiselect": "0.8.0-alpha.108",
     "@blaze-react/pagination": "0.8.0-alpha.76",
     "@blaze-react/select": "0.8.0-alpha.100",
     "@blaze-react/tab": "^0.7.0",
@@ -57,11 +57,10 @@
     "lodash.unionby": "^4.8.0",
     "lodash.upperfirst": "^4.3.1",
     "react-helmet": "^6.1.0",
-    "regenerator-runtime": "^0.13.3",
     "uuid": "^3.3.3"
   },
   "devDependencies": {
-    "@blaze-cms/core-ui": "0.147.0-rc-eagle.2"
+    "@blaze-cms/core-ui": "0.147.0-rc-eagle.4"
   },
   "peerDependencies": {
     "@apollo/client": "3.x",
@@ -73,5 +72,5 @@
     "lib/*",
     "lib-es/*"
   ],
-  "gitHead": "156a1560d7bc2bbd57b5b51fdf11098349bb26f5"
+  "gitHead": "bcec507f4cd89a2573e960c326852e44b103feb0"
 }

package/src/components/EntityManager/Entity/Entity.js

@@ -490,9 +490,8 @@ const Entity = ({
           </div>
 
           <div
-            className={`column column--one-third page-sidebar page-sidebar--relations${
-              !isRightSidebarOpen ? ' sidebar--collapsed' : ''
-            }`}>
+            className={`column column--one-third page-sidebar page-sidebar--relations${!isRightSidebarOpen ? ' sidebar--collapsed' : ''
+              }`}>
             {showSideBarRelations && (
               <SideBarRelations
                 entity={entity}

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

@@ -0,0 +1,160 @@
+import React, { useState, useEffect, useMemo } from 'react';
+import PropTypes from 'prop-types';
+import MultiSelect from '@blaze-react/multiselect';
+import debounce from 'lodash.debounce';
+import unionBy from 'lodash.unionby';
+import { useApolloClient } from '@apollo/client';
+import {
+  getQuery,
+  getDynamicQuery,
+  getAdminRecordSearch,
+  buildLabel
+} from '@blaze-cms/admin-ui-utils';
+
+const DEBOUNCE_TIME = 500;
+const SEARCH_LOAD_OFFSET = 10;
+const SELECTION_LIMIT = 10;
+
+const shouldLoadMore = (searchTerm, stopIndex, currentDataLength) =>
+  searchTerm &&
+  stopIndex > SEARCH_LOAD_OFFSET &&
+  stopIndex >= currentDataLength - SEARCH_LOAD_OFFSET;
+
+const RelationMultiSelectFilter = ({ id, label, entityIdentifier, selectedIds, onChange }) => {
+  const client = useApolloClient();
+  const [schema, setSchema] = useState(null);
+  const [data, setData] = useState([]);
+  const [searchTerm, setSearchTerm] = useState('');
+
+  const { displayProperties } = schema || {};
+
+  useEffect(() => {
+    let active = true;
+    (async () => {
+      try {
+        const { data: { getEntitySchemas = [] } = {} } = await client.query({
+          query: getQuery('GET_ENTITY_SCHEMA'),
+          variables: { identifier: entityIdentifier }
+        });
+        const [relationSchema] = getEntitySchemas;
+        if (active && relationSchema) setSchema(relationSchema);
+      } catch {
+        if (active) setSchema(null);
+      }
+    })();
+    return () => {
+      active = false;
+    };
+  }, [client, entityIdentifier]);
+
+  useEffect(() => {
+    if (!schema || !selectedIds.length) return undefined;
+    let active = true;
+    (async () => {
+      try {
+        const { data: { result = [] } = {} } = await client.query({
+          query: getDynamicQuery('GET_ALL_ENTITIES')(schema),
+          variables: {
+            where: { id: { _in: selectedIds } },
+            sort: [{ property: 'name', direction: 'asc' }]
+          }
+        });
+        if (active && result.length) setData(prev => unionBy([...prev, ...result], 'id'));
+      } catch {
+        // ignore - selected chips will fall back to id-only display
+      }
+    })();
+    return () => {
+      active = false;
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [schema]);
+
+  const onSearch = useMemo(
+    () => (schema ? getAdminRecordSearch(schema, client) : null),
+    [schema, client]
+  );
+
+  const currentData = useMemo(
+    () =>
+      data.map(option => {
+        const checked = selectedIds.includes(option.id);
+        return {
+          ...option,
+          checked,
+          show: true,
+          name: buildLabel(displayProperties, option)
+        };
+      }),
+    [data, selectedIds, displayProperties]
+  );
+
+  const interceptOnSearchChange = debounce(async ({ value }) => {
+    setSearchTerm(value);
+    if (!onSearch) return;
+    const result = await onSearch({ event: { value }, currentValue: selectedIds });
+    if (!result) return;
+    setData(prev => {
+      const selected = prev.filter(item => selectedIds.includes(item.id));
+      const newOnes = result.filter(item => !selectedIds.includes(item.id));
+      return unionBy([...selected, ...newOnes], 'id');
+    });
+  }, DEBOUNCE_TIME);
+
+  const scrollHook = debounce(async ({ stopIndex }) => {
+    if (!onSearch) return;
+    const currentDataLength = data.length - selectedIds.length;
+    if (!shouldLoadMore(searchTerm, stopIndex, currentDataLength)) return;
+    const result = await onSearch({
+      event: { value: searchTerm },
+      currentValue: selectedIds,
+      currentOffset: currentDataLength
+    });
+    if (!result || !result.length) return;
+    setData(prev => unionBy([...prev, ...result], 'id'));
+  }, DEBOUNCE_TIME);
+
+  const onItemsRenderedIntercept = async event => {
+    if (!onSearch) return;
+    scrollHook(event);
+  };
+
+  const getSelected = ({
+    event: {
+      target: { value }
+    }
+  }) => {
+    onChange(id, value);
+  };
+
+  return (
+    <MultiSelect
+      label={label}
+      name={id}
+      data={{ data: currentData, filterBy: ['name'], identification: 'id', keyValue: 'name' }}
+      limit={SELECTION_LIMIT}
+      onChange={interceptOnSearchChange}
+      getSelected={getSelected}
+      onItemsRendered={onItemsRenderedIntercept}
+      required={false}
+      checkedPreviewCount={1}
+      formatMoreLabel={count => `${count} more`}
+      isDynamic
+    />
+  );
+};
+
+RelationMultiSelectFilter.propTypes = {
+  id: PropTypes.string.isRequired,
+  label: PropTypes.string,
+  entityIdentifier: PropTypes.string.isRequired,
+  selectedIds: PropTypes.array,
+  onChange: PropTypes.func.isRequired
+};
+
+RelationMultiSelectFilter.defaultProps = {
+  label: '',
+  selectedIds: []
+};
+
+export default RelationMultiSelectFilter;