@blaze-cms/react-page-builder 0.133.0-project-admin-customisations.0 → 0.133.0

package/lib-es/components/SearchFilter/helpers/get-updated-filter-by.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"get-updated-filter-by.js","names":["getUpdatedFilterBy","filterBy","filterByProperty","parentData","length","updatedFilterBy","updatedFilterByProperty","forEach","property","key","split","filterData","Array","isArray","dat","push"],"sources":["../../../../src/components/SearchFilter/helpers/get-updated-filter-by.js"],"sourcesContent":["const getUpdatedFilterBy = (filterBy, filterByProperty, parentData) => {\n  if (!parentData || (filterBy && filterBy.length))\n    return { updatedFilterBy: filterBy, updatedFilterByProperty: filterByProperty };\n\n  const updatedFilterBy = [];\n  filterByProperty.forEach(property => {\n    const [key] = property.split('/');\n    const filterData = parentData[key];\n\n    if (!filterData) return;\n    if (Array.isArray(filterData)) filterData.forEach(dat => updatedFilterBy.push(`${key}/${dat}`));\n    else updatedFilterBy.push(`${key}/${filterData}`);\n  });\n\n  return { updatedFilterBy, updatedFilterByProperty: filterByProperty };\n};\n\nexport default getUpdatedFilterBy;\n"],"mappings":"AAAA,MAAMA,kBAAkB,GAAGA,CAACC,QAAQ,EAAEC,gBAAgB,EAAEC,UAAU,KAAK;EACrE,IAAI,CAACA,UAAU,IAAKF,QAAQ,IAAIA,QAAQ,CAACG,MAAO,EAC9C,OAAO;IAAEC,eAAe,EAAEJ,QAAQ;IAAEK,uBAAuB,EAAEJ;EAAiB,CAAC;EAEjF,MAAMG,eAAe,GAAG,EAAE;EAC1BH,gBAAgB,CAACK,OAAO,CAACC,QAAQ,IAAI;IACnC,MAAM,CAACC,GAAG,CAAC,GAAGD,QAAQ,CAACE,KAAK,CAAC,GAAG,CAAC;IACjC,MAAMC,UAAU,GAAGR,UAAU,CAACM,GAAG,CAAC;IAElC,IAAI,CAACE,UAAU,EAAE;IACjB,IAAIC,KAAK,CAACC,OAAO,CAACF,UAAU,CAAC,EAAEA,UAAU,CAACJ,OAAO,CAACO,GAAG,IAAIT,eAAe,CAACU,IAAI,CAAE,GAAEN,GAAI,IAAGK,GAAI,EAAC,CAAC,CAAC,CAAC,KAC3FT,eAAe,CAACU,IAAI,CAAE,GAAEN,GAAI,IAAGE,UAAW,EAAC,CAAC;EACnD,CAAC,CAAC;EAEF,OAAO;IAAEN,eAAe;IAAEC,uBAAuB,EAAEJ;EAAiB,CAAC;AACvE,CAAC;AAED,eAAeF,kBAAkB"}

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

@@ -12,8 +12,9 @@ import getSelectOptions from './get-select-options';
 import isDeviceDesktop from './is-device-desktop';
 import getFilterValues from './get-filter-values';
 import getFilterValueFromQuery from './get-filter-value-from-query';
-import buildUrlQuery from './build-url-query';
 import buildFiltersQuery from './build-filters-query';
 import getFilterRangesAndCheckboxesValues from './get-filter-ranges-and-checkboxes-values';
-export { buildUrlQuery, buildNewUrl, buildRawQueryStringified, decodeValue, encodeValue, checkIfRangeUpdated, getResponsiveFilterClassnames, getDisplayValue, calculateStep, calculateMinMax, getIntersectedProp, getRangeValue, getSelectOptions, isDeviceDesktop, getFilterValues, getFilterValueFromQuery, buildFiltersQuery, getFilterRangesAndCheckboxesValues };
+import getUpdatedFilterBy from './get-updated-filter-by';
+import buildUrlQuery from './build-url-query';
+export { buildNewUrl, buildRawQueryStringified, decodeValue, encodeValue, checkIfRangeUpdated, getResponsiveFilterClassnames, getDisplayValue, calculateStep, calculateMinMax, getIntersectedProp, getRangeValue, getSelectOptions, isDeviceDesktop, getFilterValues, getFilterValueFromQuery, buildFiltersQuery, getFilterRangesAndCheckboxesValues, getUpdatedFilterBy, buildUrlQuery };
 //# sourceMappingURL=index.js.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.js","names":["buildNewUrl","buildRawQueryStringified","decodeValue","encodeValue","checkIfRangeUpdated","getResponsiveFilterClassnames","getDisplayValue","calculateStep","calculateMinMax","getIntersectedProp","getRangeValue","getSelectOptions","isDeviceDesktop","getFilterValues","getFilterValueFromQuery","buildUrlQuery","buildFiltersQuery","getFilterRangesAndCheckboxesValues"],"sources":["../../../../src/components/SearchFilter/helpers/index.js"],"sourcesContent":["import buildNewUrl from './build-new-url';\nimport buildRawQueryStringified from './build-raw-query-stringified';\nimport { decodeValue, encodeValue } from './decode-encode';\nimport checkIfRangeUpdated from './check-if-range-updated';\nimport getResponsiveFilterClassnames from './get-responsive-filter-classnames';\nimport getDisplayValue from './get-display-value';\nimport calculateStep from './calculate-step';\nimport calculateMinMax from './calculate-min-max';\nimport getIntersectedProp from './get-intersected-prop';\nimport getRangeValue from './get-range-value';\nimport getSelectOptions from './get-select-options';\nimport isDeviceDesktop from './is-device-desktop';\nimport getFilterValues from './get-filter-values';\nimport getFilterValueFromQuery from './get-filter-value-from-query';\nimport buildUrlQuery from './build-url-query';\nimport buildFiltersQuery from './build-filters-query';\nimport getFilterRangesAndCheckboxesValues from './get-filter-ranges-and-checkboxes-values';\n\nexport {\n  buildUrlQuery,\n  buildNewUrl,\n  buildRawQueryStringified,\n  decodeValue,\n  encodeValue,\n  checkIfRangeUpdated,\n  getResponsiveFilterClassnames,\n  getDisplayValue,\n  calculateStep,\n  calculateMinMax,\n  getIntersectedProp,\n  getRangeValue,\n  getSelectOptions,\n  isDeviceDesktop,\n  getFilterValues,\n  getFilterValueFromQuery,\n  buildFiltersQuery,\n  getFilterRangesAndCheckboxesValues\n};\n"],"mappings":"AAAA,OAAOA,WAAW,MAAM,iBAAiB;AACzC,OAAOC,wBAAwB,MAAM,+BAA+B;AACpE,SAASC,WAAW,EAAEC,WAAW,QAAQ,iBAAiB;AAC1D,OAAOC,mBAAmB,MAAM,0BAA0B;AAC1D,OAAOC,6BAA6B,MAAM,oCAAoC;AAC9E,OAAOC,eAAe,MAAM,qBAAqB;AACjD,OAAOC,aAAa,MAAM,kBAAkB;AAC5C,OAAOC,eAAe,MAAM,qBAAqB;AACjD,OAAOC,kBAAkB,MAAM,wBAAwB;AACvD,OAAOC,aAAa,MAAM,mBAAmB;AAC7C,OAAOC,gBAAgB,MAAM,sBAAsB;AACnD,OAAOC,eAAe,MAAM,qBAAqB;AACjD,OAAOC,eAAe,MAAM,qBAAqB;AACjD,OAAOC,uBAAuB,MAAM,+BAA+B;AACnE,OAAOC,aAAa,MAAM,mBAAmB;AAC7C,OAAOC,iBAAiB,MAAM,uBAAuB;AACrD,OAAOC,kCAAkC,MAAM,2CAA2C;AAE1F,SACEF,aAAa,EACbf,WAAW,EACXC,wBAAwB,EACxBC,WAAW,EACXC,WAAW,EACXC,mBAAmB,EACnBC,6BAA6B,EAC7BC,eAAe,EACfC,aAAa,EACbC,eAAe,EACfC,kBAAkB,EAClBC,aAAa,EACbC,gBAAgB,EAChBC,eAAe,EACfC,eAAe,EACfC,uBAAuB,EACvBE,iBAAiB,EACjBC,kCAAkC"}
+{"version":3,"file":"index.js","names":["buildNewUrl","buildRawQueryStringified","decodeValue","encodeValue","checkIfRangeUpdated","getResponsiveFilterClassnames","getDisplayValue","calculateStep","calculateMinMax","getIntersectedProp","getRangeValue","getSelectOptions","isDeviceDesktop","getFilterValues","getFilterValueFromQuery","buildFiltersQuery","getFilterRangesAndCheckboxesValues","getUpdatedFilterBy","buildUrlQuery"],"sources":["../../../../src/components/SearchFilter/helpers/index.js"],"sourcesContent":["import buildNewUrl from './build-new-url';\nimport buildRawQueryStringified from './build-raw-query-stringified';\nimport { decodeValue, encodeValue } from './decode-encode';\nimport checkIfRangeUpdated from './check-if-range-updated';\nimport getResponsiveFilterClassnames from './get-responsive-filter-classnames';\nimport getDisplayValue from './get-display-value';\nimport calculateStep from './calculate-step';\nimport calculateMinMax from './calculate-min-max';\nimport getIntersectedProp from './get-intersected-prop';\nimport getRangeValue from './get-range-value';\nimport getSelectOptions from './get-select-options';\nimport isDeviceDesktop from './is-device-desktop';\nimport getFilterValues from './get-filter-values';\nimport getFilterValueFromQuery from './get-filter-value-from-query';\nimport buildFiltersQuery from './build-filters-query';\nimport getFilterRangesAndCheckboxesValues from './get-filter-ranges-and-checkboxes-values';\nimport getUpdatedFilterBy from './get-updated-filter-by';\nimport buildUrlQuery from './build-url-query';\n\nexport {\n  buildNewUrl,\n  buildRawQueryStringified,\n  decodeValue,\n  encodeValue,\n  checkIfRangeUpdated,\n  getResponsiveFilterClassnames,\n  getDisplayValue,\n  calculateStep,\n  calculateMinMax,\n  getIntersectedProp,\n  getRangeValue,\n  getSelectOptions,\n  isDeviceDesktop,\n  getFilterValues,\n  getFilterValueFromQuery,\n  buildFiltersQuery,\n  getFilterRangesAndCheckboxesValues,\n  getUpdatedFilterBy,\n  buildUrlQuery\n};\n"],"mappings":"AAAA,OAAOA,WAAW,MAAM,iBAAiB;AACzC,OAAOC,wBAAwB,MAAM,+BAA+B;AACpE,SAASC,WAAW,EAAEC,WAAW,QAAQ,iBAAiB;AAC1D,OAAOC,mBAAmB,MAAM,0BAA0B;AAC1D,OAAOC,6BAA6B,MAAM,oCAAoC;AAC9E,OAAOC,eAAe,MAAM,qBAAqB;AACjD,OAAOC,aAAa,MAAM,kBAAkB;AAC5C,OAAOC,eAAe,MAAM,qBAAqB;AACjD,OAAOC,kBAAkB,MAAM,wBAAwB;AACvD,OAAOC,aAAa,MAAM,mBAAmB;AAC7C,OAAOC,gBAAgB,MAAM,sBAAsB;AACnD,OAAOC,eAAe,MAAM,qBAAqB;AACjD,OAAOC,eAAe,MAAM,qBAAqB;AACjD,OAAOC,uBAAuB,MAAM,+BAA+B;AACnE,OAAOC,iBAAiB,MAAM,uBAAuB;AACrD,OAAOC,kCAAkC,MAAM,2CAA2C;AAC1F,OAAOC,kBAAkB,MAAM,yBAAyB;AACxD,OAAOC,aAAa,MAAM,mBAAmB;AAE7C,SACElB,WAAW,EACXC,wBAAwB,EACxBC,WAAW,EACXC,WAAW,EACXC,mBAAmB,EACnBC,6BAA6B,EAC7BC,eAAe,EACfC,aAAa,EACbC,eAAe,EACfC,kBAAkB,EAClBC,aAAa,EACbC,gBAAgB,EAChBC,eAAe,EACfC,eAAe,EACfC,uBAAuB,EACvBC,iBAAiB,EACjBC,kCAAkC,EAClCC,kBAAkB,EAClBC,aAAa"}

package/lib-es/components/SocialFollow/sf.config.js

@@ -1,4 +1,5 @@
-import { FaFacebookF, FaTwitter, FaPinterestP, FaInstagram, FaLinkedinIn, FaYoutube, FaTiktok } from 'react-icons/fa';
+import { FaFacebookF, FaPinterestP, FaInstagram, FaLinkedinIn, FaYoutube, FaTiktok } from 'react-icons/fa';
+import { FaXTwitter } from 'react-icons/fa6';
 export const BASE_CLASS_NAME_FOLLOW = 'social__list-item social__list-item--follow';
 export const PORTRAIT = 'portrait';
 export const LANDSCAPE = 'landscape';
@@ -12,7 +13,7 @@ export const SOCIAL_NETWORKS = {
   twitter: {
     name: 'Twitter',
     className: 'twitter',
-    Icon: FaTwitter,
+    Icon: FaXTwitter,
     spanClassName: 'hidden'
   },
   pinterest: {

package/lib-es/components/SocialFollow/sf.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"sf.config.js","names":["FaFacebookF","FaTwitter","FaPinterestP","FaInstagram","FaLinkedinIn","FaYoutube","FaTiktok","BASE_CLASS_NAME_FOLLOW","PORTRAIT","LANDSCAPE","SOCIAL_NETWORKS","facebook","name","className","Icon","spanClassName","twitter","pinterest","instagram","linkedin","youtube","tiktok"],"sources":["../../../src/components/SocialFollow/sf.config.js"],"sourcesContent":["import {\n  FaFacebookF,\n  FaTwitter,\n  FaPinterestP,\n  FaInstagram,\n  FaLinkedinIn,\n  FaYoutube,\n  FaTiktok\n} from 'react-icons/fa';\n\nexport const BASE_CLASS_NAME_FOLLOW = 'social__list-item social__list-item--follow';\nexport const PORTRAIT = 'portrait';\nexport const LANDSCAPE = 'landscape';\n\nexport const SOCIAL_NETWORKS = {\n  facebook: {\n    name: 'Facebook',\n    className: 'facebook',\n    Icon: FaFacebookF,\n    spanClassName: 'hidden'\n  },\n  twitter: {\n    name: 'Twitter',\n    className: 'twitter',\n    Icon: FaTwitter,\n    spanClassName: 'hidden'\n  },\n  pinterest: {\n    name: 'Pinterest',\n    className: 'pinterest',\n    Icon: FaPinterestP,\n    spanClassName: 'hidden'\n  },\n  instagram: {\n    name: 'Instagram',\n    className: 'instagram',\n    Icon: FaInstagram,\n    spanClassName: 'hidden'\n  },\n  linkedin: {\n    name: 'Linkedin',\n    className: 'linkedin',\n    Icon: FaLinkedinIn,\n    spanClassName: 'hidden'\n  },\n  youtube: {\n    name: 'YouTube',\n    className: 'youtube',\n    Icon: FaYoutube,\n    spanClassName: 'hidden'\n  },\n  tiktok: {\n    name: 'TikTok',\n    className: 'tiktok',\n    Icon: FaTiktok,\n    spanClassName: 'hidden'\n  }\n};\n"],"mappings":"AAAA,SACEA,WAAW,EACXC,SAAS,EACTC,YAAY,EACZC,WAAW,EACXC,YAAY,EACZC,SAAS,EACTC,QAAQ,QACH,gBAAgB;AAEvB,OAAO,MAAMC,sBAAsB,GAAG,6CAA6C;AACnF,OAAO,MAAMC,QAAQ,GAAG,UAAU;AAClC,OAAO,MAAMC,SAAS,GAAG,WAAW;AAEpC,OAAO,MAAMC,eAAe,GAAG;EAC7BC,QAAQ,EAAE;IACRC,IAAI,EAAE,UAAU;IAChBC,SAAS,EAAE,UAAU;IACrBC,IAAI,EAAEd,WAAW;IACjBe,aAAa,EAAE;EACjB,CAAC;EACDC,OAAO,EAAE;IACPJ,IAAI,EAAE,SAAS;IACfC,SAAS,EAAE,SAAS;IACpBC,IAAI,EAAEb,SAAS;IACfc,aAAa,EAAE;EACjB,CAAC;EACDE,SAAS,EAAE;IACTL,IAAI,EAAE,WAAW;IACjBC,SAAS,EAAE,WAAW;IACtBC,IAAI,EAAEZ,YAAY;IAClBa,aAAa,EAAE;EACjB,CAAC;EACDG,SAAS,EAAE;IACTN,IAAI,EAAE,WAAW;IACjBC,SAAS,EAAE,WAAW;IACtBC,IAAI,EAAEX,WAAW;IACjBY,aAAa,EAAE;EACjB,CAAC;EACDI,QAAQ,EAAE;IACRP,IAAI,EAAE,UAAU;IAChBC,SAAS,EAAE,UAAU;IACrBC,IAAI,EAAEV,YAAY;IAClBW,aAAa,EAAE;EACjB,CAAC;EACDK,OAAO,EAAE;IACPR,IAAI,EAAE,SAAS;IACfC,SAAS,EAAE,SAAS;IACpBC,IAAI,EAAET,SAAS;IACfU,aAAa,EAAE;EACjB,CAAC;EACDM,MAAM,EAAE;IACNT,IAAI,EAAE,QAAQ;IACdC,SAAS,EAAE,QAAQ;IACnBC,IAAI,EAAER,QAAQ;IACdS,aAAa,EAAE;EACjB;AACF,CAAC"}
+{"version":3,"file":"sf.config.js","names":["FaFacebookF","FaPinterestP","FaInstagram","FaLinkedinIn","FaYoutube","FaTiktok","FaXTwitter","BASE_CLASS_NAME_FOLLOW","PORTRAIT","LANDSCAPE","SOCIAL_NETWORKS","facebook","name","className","Icon","spanClassName","twitter","pinterest","instagram","linkedin","youtube","tiktok"],"sources":["../../../src/components/SocialFollow/sf.config.js"],"sourcesContent":["import {\n  FaFacebookF,\n  FaPinterestP,\n  FaInstagram,\n  FaLinkedinIn,\n  FaYoutube,\n  FaTiktok\n} from 'react-icons/fa';\nimport { FaXTwitter } from 'react-icons/fa6';\n\nexport const BASE_CLASS_NAME_FOLLOW = 'social__list-item social__list-item--follow';\nexport const PORTRAIT = 'portrait';\nexport const LANDSCAPE = 'landscape';\n\nexport const SOCIAL_NETWORKS = {\n  facebook: {\n    name: 'Facebook',\n    className: 'facebook',\n    Icon: FaFacebookF,\n    spanClassName: 'hidden'\n  },\n  twitter: {\n    name: 'Twitter',\n    className: 'twitter',\n    Icon: FaXTwitter,\n    spanClassName: 'hidden'\n  },\n  pinterest: {\n    name: 'Pinterest',\n    className: 'pinterest',\n    Icon: FaPinterestP,\n    spanClassName: 'hidden'\n  },\n  instagram: {\n    name: 'Instagram',\n    className: 'instagram',\n    Icon: FaInstagram,\n    spanClassName: 'hidden'\n  },\n  linkedin: {\n    name: 'Linkedin',\n    className: 'linkedin',\n    Icon: FaLinkedinIn,\n    spanClassName: 'hidden'\n  },\n  youtube: {\n    name: 'YouTube',\n    className: 'youtube',\n    Icon: FaYoutube,\n    spanClassName: 'hidden'\n  },\n  tiktok: {\n    name: 'TikTok',\n    className: 'tiktok',\n    Icon: FaTiktok,\n    spanClassName: 'hidden'\n  }\n};\n"],"mappings":"AAAA,SACEA,WAAW,EACXC,YAAY,EACZC,WAAW,EACXC,YAAY,EACZC,SAAS,EACTC,QAAQ,QACH,gBAAgB;AACvB,SAASC,UAAU,QAAQ,iBAAiB;AAE5C,OAAO,MAAMC,sBAAsB,GAAG,6CAA6C;AACnF,OAAO,MAAMC,QAAQ,GAAG,UAAU;AAClC,OAAO,MAAMC,SAAS,GAAG,WAAW;AAEpC,OAAO,MAAMC,eAAe,GAAG;EAC7BC,QAAQ,EAAE;IACRC,IAAI,EAAE,UAAU;IAChBC,SAAS,EAAE,UAAU;IACrBC,IAAI,EAAEd,WAAW;IACjBe,aAAa,EAAE;EACjB,CAAC;EACDC,OAAO,EAAE;IACPJ,IAAI,EAAE,SAAS;IACfC,SAAS,EAAE,SAAS;IACpBC,IAAI,EAAER,UAAU;IAChBS,aAAa,EAAE;EACjB,CAAC;EACDE,SAAS,EAAE;IACTL,IAAI,EAAE,WAAW;IACjBC,SAAS,EAAE,WAAW;IACtBC,IAAI,EAAEb,YAAY;IAClBc,aAAa,EAAE;EACjB,CAAC;EACDG,SAAS,EAAE;IACTN,IAAI,EAAE,WAAW;IACjBC,SAAS,EAAE,WAAW;IACtBC,IAAI,EAAEZ,WAAW;IACjBa,aAAa,EAAE;EACjB,CAAC;EACDI,QAAQ,EAAE;IACRP,IAAI,EAAE,UAAU;IAChBC,SAAS,EAAE,UAAU;IACrBC,IAAI,EAAEX,YAAY;IAClBY,aAAa,EAAE;EACjB,CAAC;EACDK,OAAO,EAAE;IACPR,IAAI,EAAE,SAAS;IACfC,SAAS,EAAE,SAAS;IACpBC,IAAI,EAAEV,SAAS;IACfW,aAAa,EAAE;EACjB,CAAC;EACDM,MAAM,EAAE;IACNT,IAAI,EAAE,QAAQ;IACdC,SAAS,EAAE,QAAQ;IACnBC,IAAI,EAAET,QAAQ;IACdU,aAAa,EAAE;EACjB;AACF,CAAC"}

package/lib-es/helpers/build-raw-query.js

@@ -32,11 +32,12 @@ const buildRawQuery = ({
     isAZ,
     sortProperties = []
   } = azOptions || {};
-  const [{
-    propsToDisplay: [azSortProp]
-  } = {
+  const sortPropertyToUse = isAZ && sortProperties[0] && sortProperties[0].isScore ? 1 : 0;
+  const {
+    propsToDisplay: [azSortProp] = []
+  } = sortProperties[sortPropertyToUse] || {
     propsToDisplay: []
-  }] = sortProperties;
+  };
   const azSortProperty = azSortProp || AZ_DEFAULT_PROP;
   const searchValuesTextCheckboxSelectJoined = operator === AND_OPERATOR ? [...searchValuesText, ...searchValuesCheckboxSelectRange] : [];
   let searchValuesTextCheckboxOr = searchValuesText;

package/lib-es/helpers/build-raw-query.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-raw-query.js","names":["buildRawQueryBase","getItemsToDisplayIds","getExtraAzBits","buildAzFilter","AND_OPERATOR","AZ_DEFAULT_PROP","buildRawQuery","docType","operator","searchValues","filterData","id","itemsToDisplay","shouldApplySort","azOptions","searchValuesText","searchValuesCheckboxSelectRange","searchValuesCheckboxOr","filterValues","filterOperator","relations","stringProps","azFilter","isAZ","sortProperties","propsToDisplay","azSortProp","azSortProperty","searchValuesTextCheckboxSelectJoined","searchValuesTextCheckboxOr","length","finalValue","finalValueWithCheckboxOrValues","must","bool","should","finalValueIfNoCheckboxOrValues","mustValues","query","_objectSpread","azQueryBits","itemsToDisplayIds","push","ids","values","sort","_script","type","script","lang","source","params","sortOrder","order"],"sources":["../../src/helpers/build-raw-query.js"],"sourcesContent":["import buildRawQueryBase from './build-raw-query-base';\nimport getItemsToDisplayIds from './get-items-to-display-ids';\nimport getExtraAzBits from './get-extra-az-bits';\nimport buildAzFilter from './build-az-filter';\nimport { AND_OPERATOR, AZ_DEFAULT_PROP } from '../constants';\n\nconst buildRawQuery = ({\n  docType,\n  operator,\n  searchValues,\n  filterData,\n  id,\n  itemsToDisplay,\n  shouldApplySort,\n  azOptions\n}) => {\n  const {\n    searchValuesText,\n    searchValuesCheckboxSelectRange,\n    searchValuesCheckboxOr\n  } = searchValues;\n  const { filterValues, filterOperator, relations, stringProps, azFilter } = filterData;\n  const { isAZ, sortProperties = [] } = azOptions || {};\n  const [{ propsToDisplay: [azSortProp] } = { propsToDisplay: [] }] = sortProperties;\n  const azSortProperty = azSortProp || AZ_DEFAULT_PROP;\n\n  const searchValuesTextCheckboxSelectJoined =\n    operator === AND_OPERATOR ? [...searchValuesText, ...searchValuesCheckboxSelectRange] : [];\n  let searchValuesTextCheckboxOr = searchValuesText;\n  if (searchValuesCheckboxOr.length) {\n    searchValuesTextCheckboxOr = [...searchValuesText, ...searchValuesCheckboxOr];\n  }\n\n  let finalValue;\n\n  if (searchValuesTextCheckboxSelectJoined.length) {\n    const finalValueWithCheckboxOrValues = {\n      must: [...searchValuesTextCheckboxSelectJoined, { bool: { should: searchValuesCheckboxOr } }]\n    };\n    const finalValueIfNoCheckboxOrValues = { must: searchValuesTextCheckboxSelectJoined };\n    finalValue = searchValuesCheckboxOr.length\n      ? finalValueWithCheckboxOrValues\n      : finalValueIfNoCheckboxOrValues;\n  } else {\n    finalValue = {\n      must: [...searchValuesCheckboxSelectRange, { bool: { should: searchValuesTextCheckboxOr } }]\n    };\n  }\n  const mustValues = [\n    {\n      bool: finalValue\n    }\n  ];\n\n  buildAzFilter(azFilter, mustValues, azSortProperty);\n\n  const query = {\n    bool: {\n      must: mustValues,\n      ...buildRawQueryBase({ docType, id, filterValues, filterOperator, relations, stringProps })\n    }\n  };\n  const azQueryBits = getExtraAzBits({ ...azOptions, azSortProperty, azFilter });\n\n  if (itemsToDisplay && itemsToDisplay.length) {\n    const itemsToDisplayIds = getItemsToDisplayIds(itemsToDisplay);\n\n    query.bool.must.push({ ids: { values: itemsToDisplayIds } });\n    if (shouldApplySort) {\n      return {\n        query,\n        sort: {\n          _script: {\n            type: 'number',\n            script: {\n              lang: 'painless',\n              source:\n                \"!doc['id.keyword'].empty ? params.sortOrder.indexOf(doc['id.keyword'].value) : 0\",\n              params: {\n                sortOrder: itemsToDisplayIds\n              }\n            },\n            order: 'asc'\n          }\n        },\n        ...azQueryBits\n      };\n    }\n  }\n\n  return isAZ\n    ? {\n        query,\n        ...azQueryBits\n      }\n    : query;\n};\n\nexport default buildRawQuery;\n"],"mappings":"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"}
+{"version":3,"file":"build-raw-query.js","names":["buildRawQueryBase","getItemsToDisplayIds","getExtraAzBits","buildAzFilter","AND_OPERATOR","AZ_DEFAULT_PROP","buildRawQuery","docType","operator","searchValues","filterData","id","itemsToDisplay","shouldApplySort","azOptions","searchValuesText","searchValuesCheckboxSelectRange","searchValuesCheckboxOr","filterValues","filterOperator","relations","stringProps","azFilter","isAZ","sortProperties","sortPropertyToUse","isScore","propsToDisplay","azSortProp","azSortProperty","searchValuesTextCheckboxSelectJoined","searchValuesTextCheckboxOr","length","finalValue","finalValueWithCheckboxOrValues","must","bool","should","finalValueIfNoCheckboxOrValues","mustValues","query","_objectSpread","azQueryBits","itemsToDisplayIds","push","ids","values","sort","_script","type","script","lang","source","params","sortOrder","order"],"sources":["../../src/helpers/build-raw-query.js"],"sourcesContent":["import buildRawQueryBase from './build-raw-query-base';\nimport getItemsToDisplayIds from './get-items-to-display-ids';\nimport getExtraAzBits from './get-extra-az-bits';\nimport buildAzFilter from './build-az-filter';\nimport { AND_OPERATOR, AZ_DEFAULT_PROP } from '../constants';\n\nconst buildRawQuery = ({\n  docType,\n  operator,\n  searchValues,\n  filterData,\n  id,\n  itemsToDisplay,\n  shouldApplySort,\n  azOptions\n}) => {\n  const {\n    searchValuesText,\n    searchValuesCheckboxSelectRange,\n    searchValuesCheckboxOr\n  } = searchValues;\n  const { filterValues, filterOperator, relations, stringProps, azFilter } = filterData;\n\n  const { isAZ, sortProperties = [] } = azOptions || {};\n  const sortPropertyToUse = isAZ && sortProperties[0] && sortProperties[0].isScore ? 1 : 0;\n  const { propsToDisplay: [azSortProp] = [] } = sortProperties[sortPropertyToUse] || {\n    propsToDisplay: []\n  };\n  const azSortProperty = azSortProp || AZ_DEFAULT_PROP;\n\n  const searchValuesTextCheckboxSelectJoined =\n    operator === AND_OPERATOR ? [...searchValuesText, ...searchValuesCheckboxSelectRange] : [];\n  let searchValuesTextCheckboxOr = searchValuesText;\n  if (searchValuesCheckboxOr.length) {\n    searchValuesTextCheckboxOr = [...searchValuesText, ...searchValuesCheckboxOr];\n  }\n\n  let finalValue;\n\n  if (searchValuesTextCheckboxSelectJoined.length) {\n    const finalValueWithCheckboxOrValues = {\n      must: [...searchValuesTextCheckboxSelectJoined, { bool: { should: searchValuesCheckboxOr } }]\n    };\n    const finalValueIfNoCheckboxOrValues = { must: searchValuesTextCheckboxSelectJoined };\n    finalValue = searchValuesCheckboxOr.length\n      ? finalValueWithCheckboxOrValues\n      : finalValueIfNoCheckboxOrValues;\n  } else {\n    finalValue = {\n      must: [...searchValuesCheckboxSelectRange, { bool: { should: searchValuesTextCheckboxOr } }]\n    };\n  }\n  const mustValues = [\n    {\n      bool: finalValue\n    }\n  ];\n\n  buildAzFilter(azFilter, mustValues, azSortProperty);\n\n  const query = {\n    bool: {\n      must: mustValues,\n      ...buildRawQueryBase({ docType, id, filterValues, filterOperator, relations, stringProps })\n    }\n  };\n  const azQueryBits = getExtraAzBits({ ...azOptions, azSortProperty, azFilter });\n\n  if (itemsToDisplay && itemsToDisplay.length) {\n    const itemsToDisplayIds = getItemsToDisplayIds(itemsToDisplay);\n\n    query.bool.must.push({ ids: { values: itemsToDisplayIds } });\n    if (shouldApplySort) {\n      return {\n        query,\n        sort: {\n          _script: {\n            type: 'number',\n            script: {\n              lang: 'painless',\n              source:\n                \"!doc['id.keyword'].empty ? params.sortOrder.indexOf(doc['id.keyword'].value) : 0\",\n              params: {\n                sortOrder: itemsToDisplayIds\n              }\n            },\n            order: 'asc'\n          }\n        },\n        ...azQueryBits\n      };\n    }\n  }\n\n  return isAZ\n    ? {\n        query,\n        ...azQueryBits\n      }\n    : query;\n};\n\nexport default buildRawQuery;\n"],"mappings":"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"}

package/lib-es/helpers/build-sort-values.js

@@ -25,7 +25,7 @@ const buildSortValues = (sortFilters, relations, stringProps, useSortObject) =>
     if (!sort) return null;
     const sortFieldName = getSortbyFieldName(relations, propsToDisplay, stringProps);
     return sortFieldName ? `${sortFieldName}:${sort.toLowerCase()}` : null;
-  }).filter(Boolean).join(',');
+  }).filter((item, index, arr) => !item ? false : arr.indexOf(item) === index).join(',');
   return {
     sort: sortValues
   };

package/lib-es/helpers/build-sort-values.js.map

@@ -1 +1 @@
-{"version":3,"file":"build-sort-values.js","names":["getSortbyFieldName","buildAzSort","sortFilters","relations","stringProps","sortValues","forEach","sort","propsToDisplay","sortFieldName","toLowerCase","buildSortValues","useSortObject","length","map","isScore","filter","Boolean","join"],"sources":["../../src/helpers/build-sort-values.js"],"sourcesContent":["import getSortbyFieldName from './get-sort-by-field-name';\n\nconst buildAzSort = (sortFilters, relations, stringProps) => {\n  const sortValues = {};\n  sortFilters.forEach(({ sort, propsToDisplay }) => {\n    if (!sort) return;\n    const sortFieldName = getSortbyFieldName(relations, propsToDisplay, stringProps);\n    if (sortFieldName) sortValues[sortFieldName] = sort.toLowerCase();\n  });\n\n  return sortValues;\n};\n\nconst buildSortValues = (sortFilters, relations, stringProps, useSortObject) => {\n  if (!sortFilters || !sortFilters.length) return useSortObject ? null : { sort: [] };\n  if (useSortObject) return buildAzSort(sortFilters, relations, stringProps);\n\n  const sortValues = sortFilters\n    .map(({ sort, propsToDisplay, isScore }) => {\n      if (isScore) return '_score';\n      if (!sort) return null;\n\n      const sortFieldName = getSortbyFieldName(relations, propsToDisplay, stringProps);\n      return sortFieldName ? `${sortFieldName}:${sort.toLowerCase()}` : null;\n    })\n    .filter(Boolean)\n    .join(',');\n\n  return { sort: sortValues };\n};\n\nexport default buildSortValues;\n"],"mappings":"AAAA,OAAOA,kBAAkB,MAAM,0BAA0B;AAEzD,MAAMC,WAAW,GAAGA,CAACC,WAAW,EAAEC,SAAS,EAAEC,WAAW,KAAK;EAC3D,MAAMC,UAAU,GAAG,CAAC,CAAC;EACrBH,WAAW,CAACI,OAAO,CAAC,CAAC;IAAEC,IAAI;IAAEC;EAAe,CAAC,KAAK;IAChD,IAAI,CAACD,IAAI,EAAE;IACX,MAAME,aAAa,GAAGT,kBAAkB,CAACG,SAAS,EAAEK,cAAc,EAAEJ,WAAW,CAAC;IAChF,IAAIK,aAAa,EAAEJ,UAAU,CAACI,aAAa,CAAC,GAAGF,IAAI,CAACG,WAAW,CAAC,CAAC;EACnE,CAAC,CAAC;EAEF,OAAOL,UAAU;AACnB,CAAC;AAED,MAAMM,eAAe,GAAGA,CAACT,WAAW,EAAEC,SAAS,EAAEC,WAAW,EAAEQ,aAAa,KAAK;EAC9E,IAAI,CAACV,WAAW,IAAI,CAACA,WAAW,CAACW,MAAM,EAAE,OAAOD,aAAa,GAAG,IAAI,GAAG;IAAEL,IAAI,EAAE;EAAG,CAAC;EACnF,IAAIK,aAAa,EAAE,OAAOX,WAAW,CAACC,WAAW,EAAEC,SAAS,EAAEC,WAAW,CAAC;EAE1E,MAAMC,UAAU,GAAGH,WAAW,CAC3BY,GAAG,CAAC,CAAC;IAAEP,IAAI;IAAEC,cAAc;IAAEO;EAAQ,CAAC,KAAK;IAC1C,IAAIA,OAAO,EAAE,OAAO,QAAQ;IAC5B,IAAI,CAACR,IAAI,EAAE,OAAO,IAAI;IAEtB,MAAME,aAAa,GAAGT,kBAAkB,CAACG,SAAS,EAAEK,cAAc,EAAEJ,WAAW,CAAC;IAChF,OAAOK,aAAa,GAAI,GAAEA,aAAc,IAAGF,IAAI,CAACG,WAAW,CAAC,CAAE,EAAC,GAAG,IAAI;EACxE,CAAC,CAAC,CACDM,MAAM,CAACC,OAAO,CAAC,CACfC,IAAI,CAAC,GAAG,CAAC;EAEZ,OAAO;IAAEX,IAAI,EAAEF;EAAW,CAAC;AAC7B,CAAC;AAED,eAAeM,eAAe"}
+{"version":3,"file":"build-sort-values.js","names":["getSortbyFieldName","buildAzSort","sortFilters","relations","stringProps","sortValues","forEach","sort","propsToDisplay","sortFieldName","toLowerCase","buildSortValues","useSortObject","length","map","isScore","filter","item","index","arr","indexOf","join"],"sources":["../../src/helpers/build-sort-values.js"],"sourcesContent":["import getSortbyFieldName from './get-sort-by-field-name';\n\nconst buildAzSort = (sortFilters, relations, stringProps) => {\n  const sortValues = {};\n  sortFilters.forEach(({ sort, propsToDisplay }) => {\n    if (!sort) return;\n    const sortFieldName = getSortbyFieldName(relations, propsToDisplay, stringProps);\n    if (sortFieldName) sortValues[sortFieldName] = sort.toLowerCase();\n  });\n\n  return sortValues;\n};\n\nconst buildSortValues = (sortFilters, relations, stringProps, useSortObject) => {\n  if (!sortFilters || !sortFilters.length) return useSortObject ? null : { sort: [] };\n  if (useSortObject) return buildAzSort(sortFilters, relations, stringProps);\n\n  const sortValues = sortFilters\n    .map(({ sort, propsToDisplay, isScore }) => {\n      if (isScore) return '_score';\n      if (!sort) return null;\n\n      const sortFieldName = getSortbyFieldName(relations, propsToDisplay, stringProps);\n      return sortFieldName ? `${sortFieldName}:${sort.toLowerCase()}` : null;\n    })\n    .filter((item, index, arr) => (!item ? false : arr.indexOf(item) === index))\n    .join(',');\n\n  return { sort: sortValues };\n};\n\nexport default buildSortValues;\n"],"mappings":"AAAA,OAAOA,kBAAkB,MAAM,0BAA0B;AAEzD,MAAMC,WAAW,GAAGA,CAACC,WAAW,EAAEC,SAAS,EAAEC,WAAW,KAAK;EAC3D,MAAMC,UAAU,GAAG,CAAC,CAAC;EACrBH,WAAW,CAACI,OAAO,CAAC,CAAC;IAAEC,IAAI;IAAEC;EAAe,CAAC,KAAK;IAChD,IAAI,CAACD,IAAI,EAAE;IACX,MAAME,aAAa,GAAGT,kBAAkB,CAACG,SAAS,EAAEK,cAAc,EAAEJ,WAAW,CAAC;IAChF,IAAIK,aAAa,EAAEJ,UAAU,CAACI,aAAa,CAAC,GAAGF,IAAI,CAACG,WAAW,CAAC,CAAC;EACnE,CAAC,CAAC;EAEF,OAAOL,UAAU;AACnB,CAAC;AAED,MAAMM,eAAe,GAAGA,CAACT,WAAW,EAAEC,SAAS,EAAEC,WAAW,EAAEQ,aAAa,KAAK;EAC9E,IAAI,CAACV,WAAW,IAAI,CAACA,WAAW,CAACW,MAAM,EAAE,OAAOD,aAAa,GAAG,IAAI,GAAG;IAAEL,IAAI,EAAE;EAAG,CAAC;EACnF,IAAIK,aAAa,EAAE,OAAOX,WAAW,CAACC,WAAW,EAAEC,SAAS,EAAEC,WAAW,CAAC;EAE1E,MAAMC,UAAU,GAAGH,WAAW,CAC3BY,GAAG,CAAC,CAAC;IAAEP,IAAI;IAAEC,cAAc;IAAEO;EAAQ,CAAC,KAAK;IAC1C,IAAIA,OAAO,EAAE,OAAO,QAAQ;IAC5B,IAAI,CAACR,IAAI,EAAE,OAAO,IAAI;IAEtB,MAAME,aAAa,GAAGT,kBAAkB,CAACG,SAAS,EAAEK,cAAc,EAAEJ,WAAW,CAAC;IAChF,OAAOK,aAAa,GAAI,GAAEA,aAAc,IAAGF,IAAI,CAACG,WAAW,CAAC,CAAE,EAAC,GAAG,IAAI;EACxE,CAAC,CAAC,CACDM,MAAM,CAAC,CAACC,IAAI,EAAEC,KAAK,EAAEC,GAAG,KAAM,CAACF,IAAI,GAAG,KAAK,GAAGE,GAAG,CAACC,OAAO,CAACH,IAAI,CAAC,KAAKC,KAAM,CAAC,CAC3EG,IAAI,CAAC,GAAG,CAAC;EAEZ,OAAO;IAAEd,IAAI,EAAEF;EAAW,CAAC;AAC7B,CAAC;AAED,eAAeM,eAAe"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaze-cms/react-page-builder",
-  "version": "0.133.0-project-admin-customisations.0",
+  "version": "0.133.0",
   "description": "Blaze react page builder",
   "main": "lib/index.js",
   "module": "lib-es/index.js",
@@ -27,15 +27,15 @@
   },
   "license": "GPL-3.0",
   "dependencies": {
-    "@blaze-cms/core-auth-ui": "0.133.0-project-admin-customisations.0",
-    "@blaze-cms/core-errors": "0.133.0-project-admin-customisations.0",
-    "@blaze-cms/core-errors-ui": "0.133.0-project-admin-customisations.0",
+    "@blaze-cms/core-auth-ui": "^0.131.0",
+    "@blaze-cms/core-errors": "^0.131.0",
+    "@blaze-cms/core-errors-ui": "^0.131.0",
     "@blaze-cms/image-cdn-react": "0.3.0-alpha.5",
-    "@blaze-cms/nextjs-components": "0.133.0-project-admin-customisations.0",
-    "@blaze-cms/plugin-search-ui": "0.133.0-project-admin-customisations.0",
-    "@blaze-cms/setup-ui": "0.133.0-project-admin-customisations.0",
-    "@blaze-cms/utils": "0.133.0-project-admin-customisations.0",
-    "@blaze-cms/utils-handlebars": "0.133.0-project-admin-customisations.0",
+    "@blaze-cms/nextjs-components": "^0.133.0",
+    "@blaze-cms/plugin-search-ui": "^0.133.0",
+    "@blaze-cms/setup-ui": "^0.131.0",
+    "@blaze-cms/utils": "^0.131.0",
+    "@blaze-cms/utils-handlebars": "^0.133.0",
     "@blaze-react/breadcrumb": "0.8.0-alpha.60",
     "@blaze-react/button": "0.5.19",
     "@blaze-react/checkboxes": "0.5.31",
@@ -75,7 +75,7 @@
     "next": "12.x",
     "prop-types": "^15.7.2",
     "react": "^17.0.2",
-    "react-icons": ">= 4.3.1"
+    "react-icons": "^4.11.0"
   },
   "devDependencies": {
     "@testing-library/jest-dom": "^5.11.3",
@@ -89,5 +89,5 @@
     "lib/*",
     "lib-es/*"
   ],
-  "gitHead": "aaf10121050962f9219e752b37ad56e8b5bf265b"
+  "gitHead": "d1265256eafcf99954599ab9b12d1cc165929cb9"
 }

package/src/components/Button.js

@@ -60,7 +60,12 @@ const Button = props => {
   const logout = () => {
     handleLogout(client);
     if (hasChildren(children)) return setShowChildren(true);
-    return url ? router.reload(urlToUse) : router.reload();
+
+    if (!urlToUse) return router.reload();
+
+    return urlToUse.startsWith('/')
+      ? router.push('/Resolver', urlToUse)
+      : (window.location.href = urlToUse);
   };
 
   const handleClick = () => {

package/src/components/ContentGroupSection/ContentGroupSection.js

@@ -2,7 +2,7 @@ import React from 'react';
 import PropTypes from 'prop-types';
 import { hasChildren } from '../../helpers';
 
-const ContentGroupSection = ({ children, name }) => {
+const ContentGroupSection = ({ children, name, ...props }) => {
   if (!hasChildren(children)) return null;
 
   return (

package/src/components/DataSummary/helpers/build-loop-props-content.js

@@ -45,12 +45,11 @@ const buildLoopPropsContent = (loopProps = [], propsToDisplay = [], limit = 0, d
 
         return propertiesToDisplay.map(key => {
           const loopValue = loopValues[key];
-          const loopValueItem = loopValue && loopValue[i];
-          const propValue = loopValueItem ? getLoopValue(loopValueItem) : regularValues[key];
+          const propValue = loopValue ? getLoopValue(loopValue[i]) : regularValues[key];
           if (!propValue) return null;
 
           const processedValue = processDataSummaryValue(propValue, options);
-          const linkToPublishedContent = getLinkToPublishedContent(key, data, loopValueItem);
+          const linkToPublishedContent = getLinkToPublishedContent(key, data);
           return [upperFirst(label), processedValue, linkToPublishedContent, modifier];
         });
       })

package/src/components/DataSummary/helpers/get-link-to-published-content.js

@@ -1,9 +1,6 @@
-const getLinkToPublishedContent = (key = '', props = {}, currentValue = null) => {
+const getLinkToPublishedContent = (key = '', props = {}) => {
   const [baseKey] = key.split('.');
   if (!props[baseKey]) return '';
-
-  if (currentValue && typeof currentValue.url !== 'undefined') return currentValue.url;
-
   const content = Array.isArray(props[baseKey]) ? props[baseKey][0] : props[baseKey];
   return content && content.url ? content.url : '';
 };

package/src/components/List/helpers/get-sort-props.js

@@ -6,14 +6,12 @@ const getSortProps = ({
   defaultSortBy,
   isTextSearchFilterApplied
 }) => {
-  const sort = querySort || (sortProperties.length ? null : defaultSort);
-  let sortby = null;
-  if (querySortBy) sortby = [querySortBy];
-  else if (!sortProperties.length) sortby = defaultSortBy;
-
   const updatedSortProperties = [...sortProperties];
+  if (!querySort && !sortProperties.length) {
+    updatedSortProperties.unshift({ sort: defaultSort, propsToDisplay: defaultSortBy });
+  }
   if (isTextSearchFilterApplied) updatedSortProperties.unshift({ isScore: true });
-  if (sort) updatedSortProperties.unshift({ sort, propsToDisplay: sortby });
+  if (querySort) updatedSortProperties.unshift({ sort: querySort, propsToDisplay: [querySortBy] });
 
   const sortbyFilters = updatedSortProperties
     .map(({ propsToDisplay: filterProps }) => filterProps)

package/src/components/SearchFilter/SearchFilter/SearchFilter.js

@@ -3,7 +3,8 @@ import PropTypes from 'prop-types';
 import classnames from 'classnames';
 import debounce from 'lodash.debounce';
 import FiltersList from './FiltersList';
-import { isDeviceDesktop, buildUrlQuery, getResponsiveFilterClassnames } from '../helpers';
+import { isDeviceDesktop, getResponsiveFilterClassnames, buildUrlQuery } from '../helpers';
+
 import CloseMobileForm from './CloseMobileForm';
 import ResetDesktopForm from './ResetDesktopForm';
 import MobileFormToolbar from './MobileFormToolbar';
@@ -31,7 +32,9 @@ const SearchFilter = ({
   const [moreFiltersDesktopCollapsed, setMoreFiltersDesktopCollapsed] = useState(true);
 
   const doSubmit = newValues => {
-    const newQuery = buildUrlQuery(newValues, filters, listComponentName, query);
+    const newQuery = filterValues
+      ? buildUrlQuery(newValues, filters, listComponentName, query)
+      : '';
     handleSearch(newQuery);
     setMoreFiltersDesktopCollapsed(true);
     setMoreFiltersMobileCollapsed(true);
@@ -152,7 +155,7 @@ const SearchFilter = ({
                         onClick={() =>
                           setMoreFiltersDesktopCollapsed(!moreFiltersDesktopCollapsed)
                         }>
-                        More filters
+                        {moreFiltersDesktopCollapsed ? 'More filters' : 'Less filters'}
                       </button>
                     )}
 

package/src/components/SearchFilter/SearchFilterContainer.js

@@ -1,22 +1,25 @@
-import React, { useState, useRef, useReducer, useEffect } from 'react';
+import React, { useState, useEffect, useRef, useReducer, useContext } from 'react';
+import { MainContext } from '@blaze-cms/nextjs-components';
 import { useRouter } from 'next/router';
 import { useQuery } from '@apollo/client';
 import PropTypes from 'prop-types';
 import { parseUrl } from 'query-string';
 import SearchFilter from './SearchFilter';
 import { withTitle } from '../../HOC';
-import { getSearchPublishedContent } from '../../application/query';
+import { getSearchPublishedContent, generateSingleItemQuery } from '../../application/query';
 import {
   buildNewUrl,
   buildRawQueryStringified,
   getFilterValues,
   buildFiltersQuery,
-  getFilterRangesAndCheckboxesValues
+  getFilterRangesAndCheckboxesValues,
+  getUpdatedFilterBy
 } from './helpers';
-import { getEntityData } from '../../helpers';
+import { getEntityData, getInheritedFilters, getQueryProps } from '../../helpers';
 import { RAW_RESULTS } from './constants';
 import { SCROLL_OFFSET } from '../../constants';
 import searchFilterReducer from './searchFilterReducer';
+import { useGetEntitySchemasAsObj } from '../../hooks';
 
 const getFiltersUrlQuery = (query, listName) => {
   if (!listName) return query;
@@ -46,18 +49,20 @@ const SearchFilterContainer = ({
   filterBy,
   filterByProperty,
   shouldAddFilters,
-  listComponentName
+  listComponentName,
+  parent
 }) => {
+  const { isPreview } = useContext(MainContext);
   const router = useRouter();
   const { asPath } = router;
   const searchFilterRef = useRef(null);
   const [key, setKey] = useState(`filter-${name}`);
   const [displaySearchFilter, setDisplaySearchFilter] = useState(false);
   const [urlPath, setUrlPath] = useState(asPath); // used as asPath can take too long to update
+  const [filterValues, dispatch] = useReducer(searchFilterReducer, null);
   const { url: currentUrl, query } = parseUrl(urlPath);
   const updatedQuery = getFiltersUrlQuery(query, listComponentName);
-
-  const [filterValues, dispatch] = useReducer(searchFilterReducer, null);
+  const { itemId: parentId, itemEntity: parentEntity } = parent;
 
   useEffect(
     () => {
@@ -65,6 +70,27 @@ const SearchFilterContainer = ({
     },
     [asPath]
   );
+  const { data: mainSchemas = {}, loading: schemasLoading } = useGetEntitySchemasAsObj([
+    parentEntity,
+    entity
+  ]);
+  const { [parentEntity]: parentSchema = {}, [entity]: filterEntitySchema = {} } = mainSchemas;
+  const { actions = {} } = parentSchema || {};
+  const getAction = isPreview ? actions.get : actions.getPublished;
+  const inheritedFilters = getInheritedFilters(filterBy, filterByProperty);
+  const queryProps = getQueryProps(inheritedFilters, parentSchema, filterEntitySchema);
+  const { data: { entityData: parentData } = {}, loading: parentQueryLoading } = useQuery(
+    generateSingleItemQuery(getAction, queryProps),
+    {
+      variables: { id: parentId },
+      skip: schemasLoading || !inheritedFilters.length
+    }
+  );
+  const { updatedFilterBy, updatedFilterByProperty } = getUpdatedFilterBy(
+    filterBy,
+    filterByProperty,
+    parentData
+  );
 
   const action = getSearchPublishedContent(RAW_RESULTS);
   const [checkboxSelectValues, rangeValues] = getFilterRangesAndCheckboxesValues(filters);
@@ -73,9 +99,9 @@ const SearchFilterContainer = ({
 
   const filtersQuery = buildFiltersQuery({
     shouldAddFilters,
-    query: filterValues || {},
-    filterBy,
-    filterByProperty,
+    query: filterValues,
+    filterBy: updatedFilterBy,
+    filterByProperty: updatedFilterByProperty,
     rangeValues,
     queryKeys: Object.keys(updatedQuery)
   });
@@ -89,7 +115,7 @@ const SearchFilterContainer = ({
 
   const { data, error, loading } = useQuery(action, {
     variables: { rawQueryStringified, limit: 0 }, // we only want aggs so limit=0 for no search results
-    skip: !rawQueryStringified
+    skip: !rawQueryStringified || parentQueryLoading
   });
 
   if (error) return error.message;
@@ -98,7 +124,7 @@ const SearchFilterContainer = ({
   const { searchPublishedContent: { rawResults: { aggregations: filterData } = {} } = {} } =
     data || {};
 
-  if (!filterValues && !loading && (filterData || !rawQueryStringified)) {
+  if (!filterValues && !loading && !parentQueryLoading && (filterData || !rawQueryStringified)) {
     const newValues = getFilterValues(filterData, filters, updatedQuery);
     dispatch({ newValues, shouldSearch: false, type: 'update' });
     return null;
@@ -171,7 +197,8 @@ SearchFilterContainer.propTypes = {
   filterBy: PropTypes.array,
   filterByProperty: PropTypes.array,
   shouldAddFilters: PropTypes.bool,
-  listComponentName: PropTypes.string
+  listComponentName: PropTypes.string,
+  parent: PropTypes.object
 };
 
 SearchFilterContainer.defaultProps = {
@@ -184,7 +211,8 @@ SearchFilterContainer.defaultProps = {
   filterBy: [],
   filterByProperty: [],
   shouldAddFilters: false,
-  listComponentName: ''
+  listComponentName: '',
+  parent: {}
 };
 
 export default withTitle(SearchFilterContainer);

package/src/components/SearchFilter/helpers/build-filters-query.js

@@ -29,38 +29,41 @@ const builFilterObject = ({ queryKey, value, filters, isRange, isInQuery }) => {
     filters.push({ match: { [key]: filterValue } });
   });
 };
+
 const buildFiltersQuery = ({
   shouldAddFilters,
-  query,
+
   filterBy,
   filterByProperty,
   rangeValues,
-  queryKeys
+  queryKeys,
+  query
 }) => {
   if (!shouldAddFilters) return [];
   const mustFilters = [];
-  Object.keys(query).forEach(queryKey => {
-    if (QUERY_KEYS_TO_IGNORE.includes(queryKey)) return;
-    if (!queryKey || !query[queryKey]) return;
-    const queryValue = query[queryKey];
+  if (query) {
+    Object.keys(query).forEach(queryKey => {
+      if (QUERY_KEYS_TO_IGNORE.includes(queryKey)) return;
+      if (!queryKey || !query[queryKey]) return;
+      const queryValue = query[queryKey];
 
-    const isRange = rangeValues.includes(queryKey);
-    const isInQuery = queryKeys.includes(queryKey);
-    builFilterObject({ queryKey, value: queryValue, filters: mustFilters, isRange, isInQuery });
-  });
+      const isRange = rangeValues.includes(queryKey);
+      const isInQuery = queryKeys.includes(queryKey);
+      builFilterObject({ queryKey, value: queryValue, filters: mustFilters, isRange, isInQuery });
+    });
+  }
 
   if (filterByProperty && filterByProperty.length) {
-    filterByProperty &&
-      filterByProperty.forEach(filterByPropOption => {
-        const [filterByPropKey] = filterByPropOption.split('/');
-        filterBy.forEach(filterByOption => {
-          if (filterByOption.indexOf(filterByPropKey) === -1) return;
-          const [, filteryByValue] = filterByOption.split('/');
-          const filterByKeyword = `${filterByPropKey}.keyword`;
-          if (!filteryByValue) return;
-          mustFilters.push({ match: { [filterByKeyword]: filteryByValue } });
-        });
+    filterByProperty.forEach(filterByPropOption => {
+      const [filterByPropKey] = filterByPropOption.split('/');
+      filterBy.forEach(filterByOption => {
+        if (filterByOption.indexOf(filterByPropKey) === -1) return;
+        const [, filteryByValue] = filterByOption.split('/');
+        const filterByKeyword = `${filterByPropKey}.keyword`;
+        if (!filteryByValue) return;
+        mustFilters.push({ match: { [filterByKeyword]: filteryByValue } });
       });
+    });
   }
 
   return mustFilters;

package/src/components/SearchFilter/helpers/build-url-query.js

@@ -2,9 +2,7 @@ import { SEARCH_TERM, TEXT_SEARCH } from '../constants';
 import parseFilterValue from './parse-filter-value';
 import { buildQueryKey } from '../../../helpers';
 
-const buildUrlQuery = (filterValues, filters, listComponentName = '', query = {}) => {
-  if (!filterValues) return '';
-
+const buildUrlQuery = (filterValues = {}, filters = [], listComponentName = '', query = {}) => {
   const newQuery = [];
   const queryKeys = [];
   const searchValue = filterValues[SEARCH_TERM];

package/src/components/SearchFilter/helpers/get-initial-filter-values.js

@@ -0,0 +1,24 @@
+import { SEARCH_TERM, TEXT_SEARCH } from '../constants';
+import getFilterValueFromQuery from './get-filter-value-from-query';
+import { buildQueryKey } from '../../../helpers';
+
+const getInitialFilterValues = (filterData, filters, query, listComponentName) => {
+  const filterValues = {};
+  const searchQueryKey = buildQueryKey(SEARCH_TERM, listComponentName);
+  filterValues[SEARCH_TERM] = query[searchQueryKey] || '';
+
+  filters.forEach(filterProps => {
+    const {
+      propsToDisplay: [key],
+      type
+    } = filterProps;
+    if (type === TEXT_SEARCH) return;
+    const data = filterData && filterData[key] ? filterData[key] : {};
+    const queryKey = buildQueryKey(key, listComponentName);
+    filterValues[key] = getFilterValueFromQuery(queryKey, filterProps, data, query);
+  });
+
+  return filterValues;
+};
+
+export default getInitialFilterValues;

package/src/components/SearchFilter/helpers/get-updated-filter-by.js

@@ -0,0 +1,18 @@
+const getUpdatedFilterBy = (filterBy, filterByProperty, parentData) => {
+  if (!parentData || (filterBy && filterBy.length))
+    return { updatedFilterBy: filterBy, updatedFilterByProperty: filterByProperty };
+
+  const updatedFilterBy = [];
+  filterByProperty.forEach(property => {
+    const [key] = property.split('/');
+    const filterData = parentData[key];
+
+    if (!filterData) return;
+    if (Array.isArray(filterData)) filterData.forEach(dat => updatedFilterBy.push(`${key}/${dat}`));
+    else updatedFilterBy.push(`${key}/${filterData}`);
+  });
+
+  return { updatedFilterBy, updatedFilterByProperty: filterByProperty };
+};
+
+export default getUpdatedFilterBy;

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

@@ -12,12 +12,12 @@ import getSelectOptions from './get-select-options';
 import isDeviceDesktop from './is-device-desktop';
 import getFilterValues from './get-filter-values';
 import getFilterValueFromQuery from './get-filter-value-from-query';
-import buildUrlQuery from './build-url-query';
 import buildFiltersQuery from './build-filters-query';
 import getFilterRangesAndCheckboxesValues from './get-filter-ranges-and-checkboxes-values';
+import getUpdatedFilterBy from './get-updated-filter-by';
+import buildUrlQuery from './build-url-query';
 
 export {
-  buildUrlQuery,
   buildNewUrl,
   buildRawQueryStringified,
   decodeValue,
@@ -34,5 +34,7 @@ export {
   getFilterValues,
   getFilterValueFromQuery,
   buildFiltersQuery,
-  getFilterRangesAndCheckboxesValues
+  getFilterRangesAndCheckboxesValues,
+  getUpdatedFilterBy,
+  buildUrlQuery
 };

package/src/components/SocialFollow/sf.config.js

@@ -1,12 +1,12 @@
 import {
   FaFacebookF,
-  FaTwitter,
   FaPinterestP,
   FaInstagram,
   FaLinkedinIn,
   FaYoutube,
   FaTiktok
 } from 'react-icons/fa';
+import { FaXTwitter } from 'react-icons/fa6';
 
 export const BASE_CLASS_NAME_FOLLOW = 'social__list-item social__list-item--follow';
 export const PORTRAIT = 'portrait';
@@ -22,7 +22,7 @@ export const SOCIAL_NETWORKS = {
   twitter: {
     name: 'Twitter',
     className: 'twitter',
-    Icon: FaTwitter,
+    Icon: FaXTwitter,
     spanClassName: 'hidden'
   },
   pinterest: {

package/src/helpers/build-raw-query.js

@@ -20,8 +20,12 @@ const buildRawQuery = ({
     searchValuesCheckboxOr
   } = searchValues;
   const { filterValues, filterOperator, relations, stringProps, azFilter } = filterData;
+
   const { isAZ, sortProperties = [] } = azOptions || {};
-  const [{ propsToDisplay: [azSortProp] } = { propsToDisplay: [] }] = sortProperties;
+  const sortPropertyToUse = isAZ && sortProperties[0] && sortProperties[0].isScore ? 1 : 0;
+  const { propsToDisplay: [azSortProp] = [] } = sortProperties[sortPropertyToUse] || {
+    propsToDisplay: []
+  };
   const azSortProperty = azSortProp || AZ_DEFAULT_PROP;
 
   const searchValuesTextCheckboxSelectJoined =

package/src/helpers/build-sort-values.js

@@ -23,7 +23,7 @@ const buildSortValues = (sortFilters, relations, stringProps, useSortObject) =>
       const sortFieldName = getSortbyFieldName(relations, propsToDisplay, stringProps);
       return sortFieldName ? `${sortFieldName}:${sort.toLowerCase()}` : null;
     })
-    .filter(Boolean)
+    .filter((item, index, arr) => (!item ? false : arr.indexOf(item) === index))
     .join(',');
 
   return { sort: sortValues };