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

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.134.0-admin-updates.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/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/core-auth-ui": "0.134.0-admin-updates.0",
+    "@blaze-cms/core-errors": "0.134.0-admin-updates.0",
+    "@blaze-cms/core-errors-ui": "0.134.0-admin-updates.0",
+    "@blaze-cms/image-cdn-react": "0.3.0-alpha.6",
+    "@blaze-cms/nextjs-components": "0.134.0-admin-updates.0",
+    "@blaze-cms/plugin-search-ui": "0.134.0-admin-updates.0",
+    "@blaze-cms/setup-ui": "0.134.0-admin-updates.0",
+    "@blaze-cms/utils": "0.134.0-admin-updates.0",
+    "@blaze-cms/utils-handlebars": "0.134.0-admin-updates.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": "6eebfa2c3fdbef9c3cf817a86ea4ecb0224c9880"
 }

package/src/components/Banner/AdSlotRender.js

@@ -2,6 +2,7 @@ import React, { useState } from 'react';
 import { AdSlot } from 'react-dfp';
 import PropTypes from 'prop-types';
 import { BANNER_LOADING, BANNER_EMPTY, BANNER_LOADED } from '../../constants';
+import Wrapper from '../Wrapper';
 
 const AdSlotRender = ({
   shouldShowBanner,
@@ -9,6 +10,7 @@ const AdSlotRender = ({
   sizeId,
   parsedAdunit,
   parsedSizes,
+  modifiers,
   targetingArguments
 }) => {
   const [{ loadingStatus = BANNER_LOADING, minHeight }, setLoadingStatus] = useState({});
@@ -24,11 +26,11 @@ const AdSlotRender = ({
       })
       .sort();
   const className = `ad-slot ad-slot-${loadingStatus} ${bannerClass}`;
-
+  const newModifers = `${modifiers} banner-${loadingStatus}`;
   return (
-    <>
+    <Wrapper className="banner" modifiers={newModifers}>
       {styles && <style>{styles.join('\n')}</style>}
-      <div className={className} style={{ minHeight }}>
+      <div className={className} style={{ minHeight }} data-testid="ad-slot">
         {shouldShowBanner && (
           <AdSlot
             adUnit={parsedAdunit}
@@ -46,7 +48,7 @@ const AdSlotRender = ({
           />
         )}
       </div>
-    </>
+    </Wrapper>
   );
 };
 
@@ -56,11 +58,13 @@ AdSlotRender.propTypes = {
   sizeId: PropTypes.string.isRequired,
   parsedAdunit: PropTypes.string.isRequired,
   parsedSizes: PropTypes.array,
+  modifiers: PropTypes.string,
   targetingArguments: PropTypes.object.isRequired
 };
 
 AdSlotRender.defaultProps = {
-  parsedSizes: null
+  parsedSizes: null,
+  modifiers: ''
 };
 
 export default AdSlotRender;

package/src/components/Banner/Banner.js

@@ -7,7 +7,6 @@ import { useQuery } from '@apollo/client';
 import { useRouter } from 'next/router';
 import { buildUserQuery, buildPropsData } from './helpers';
 import { getSingleEntitySchema, getUser } from '../../application/query';
-import Wrapper from '../Wrapper';
 import BannerRender from './BannerRender';
 import buildPropsQuery from '../../helpers/build-props-query';
 import { getClassModifiers } from '../../utils';
@@ -47,16 +46,15 @@ const Banner = ({ type, ...otherProps }) => {
   const bannerKey = `${sizeId}${asPath}`;
 
   return (
-    <Wrapper className={type} modifiers={modifiers}>
-      <BannerRender
-        key={bannerKey}
-        {...otherProps}
-        action={action}
-        actionKey={actionKey}
-        asPath={asPath}
-        userPropsData={userPropsData}
-      />
-    </Wrapper>
+    <BannerRender
+      key={bannerKey}
+      {...otherProps}
+      action={action}
+      actionKey={actionKey}
+      asPath={asPath}
+      userPropsData={userPropsData}
+      modifiers={modifiers}
+    />
   );
 };
 

package/src/components/Banner/BannerRender.js

@@ -34,6 +34,7 @@ const BannerRender = ({
   actionKey,
   renderCounter,
   userPropsData,
+  modifiers,
   ...otherProps
 }) => {
   const { id } = otherProps;
@@ -90,6 +91,7 @@ const BannerRender = ({
       sizeId={sizeId}
       parsedAdunit={parsedAdunit}
       parsedSizes={parsedSizes}
+      modifiers={modifiers}
       targetingArguments={targetingArguments}
     />
   );
@@ -108,6 +110,7 @@ BannerRender.propTypes = {
   targetings: PropTypes.string,
   sizes: PropTypes.string,
   renderCounter: PropTypes.number,
+  modifiers: PropTypes.string,
   userPropsData: PropTypes.object
 };
 
@@ -120,6 +123,7 @@ BannerRender.defaultProps = {
   targetings: '',
   sizes: '',
   renderCounter: null,
+  modifiers: '',
   userPropsData: {}
 };
 

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/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 };

package/tests/unit/src/components/Banner/AdSlotRender.test.js

@@ -50,17 +50,17 @@ describe('Banner render component', () => {
       <AdSlotRender {...defaultProps} shouldShowBanner={false} />
     );
 
-    expect(container.childNodes[0].nodeName).toEqual('STYLE');
-    expect(container.childNodes[1]).toHaveClass('ad-slot ad-slot-loading banner-sizeId');
+    expect(container.childNodes[0].nodeName).toEqual('DIV');
+    expect(getByTestId('ad-slot')).toHaveClass('ad-slot ad-slot-loading banner-sizeId');
     expect(() => getByTestId(slotTestId)).toThrow();
     expect(asFragment()).toMatchSnapshot();
   });
 
   describe('AdSlot loading', () => {
     it('should render AdSlot', () => {
-      const { asFragment, container, getByTestId } = render(<AdSlotRender {...defaultProps} />);
+      const { asFragment, getByTestId } = render(<AdSlotRender {...defaultProps} />);
       expect(getByTestId('adslot-test')).toBeDefined();
-      expect(container.childNodes[1]).toHaveClass('ad-slot ad-slot-loading banner-sizeId');
+      expect(getByTestId('ad-slot')).toHaveClass('ad-slot ad-slot-loading banner-sizeId');
       expect(asFragment()).toMatchSnapshot();
     });
 
@@ -69,16 +69,11 @@ describe('Banner render component', () => {
       const adSlot = getByTestId(slotTestId);
 
       fireEvent.mouseOver(adSlot);
-      await waitFor(() =>
-        expect(container.childNodes[0]).toHaveClass('ad-slot ad-slot-loaded banner-sizeId')
-      );
-      expect(container.childNodes[0]).toHaveStyle('min-height: 250px');
+      await waitFor(() => expect(container.childNodes[0]).toHaveClass('banner banner-loaded'));
       expect(asFragment()).toMatchSnapshot();
 
       fireEvent.mouseLeave(adSlot);
-      await waitFor(() =>
-        expect(container.childNodes[0]).toHaveClass('ad-slot ad-slot-empty banner-sizeId')
-      );
+      await waitFor(() => expect(container.childNodes[0]).toHaveClass('banner banner-empty'));
       expect(asFragment()).toMatchSnapshot();
     });
   });