@blaze-cms/react-page-builder 0.133.0-admin-updates.1 → 0.133.0-admin-updates.6

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,7 @@ const Button = props => {
   const logout = () => {
     handleLogout(client);
     if (hasChildren(children)) return setShowChildren(true);
-    return url ? router.reload(urlToUse) : router.reload();
+    return url ? (window.location.href = urlToUse) : router.reload();
   };
 
   const handleClick = () => {

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

@@ -152,7 +152,7 @@ const SearchFilter = ({
                         onClick={() =>
                           setMoreFiltersDesktopCollapsed(!moreFiltersDesktopCollapsed)
                         }>
-                        More filters
+                        {moreFiltersDesktopCollapsed ? 'More filters' : 'Less filters'}
                       </button>
                     )}
 

package/src/helpers/get-generic-render-variables.js

@@ -3,9 +3,10 @@ import buildSortValues from './build-sort-values';
 
 const getCorrectSort = (relations, filterProps, stringProps, useSortObject) => {
   const { sort, sortby, sortProperties = [] } = filterProps;
+  const [sortProperty = []] = sortProperties || [];
 
   return buildSortValues(
-    [{ sort, propsToDisplay: sortby }, ...sortProperties],
+    [{ sort, propsToDisplay: sortby }, ...[sortProperty]],
     relations,
     stringProps,
     useSortObject

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();
     });
   });

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

@@ -3,13 +3,18 @@
 exports[`Banner render component AdSlot loading should change class and remove responsive styles after loaded events 1`] = `
 <DocumentFragment>
   <div
-    class="ad-slot ad-slot-loaded banner-sizeId"
-    style="min-height: 250px;"
+    class="banner  banner-loaded"
   >
     <div
-      data-testid="adslot-test"
-      role="button"
-    />
+      class="ad-slot ad-slot-loaded banner-sizeId"
+      data-testid="ad-slot"
+      style="min-height: 250px;"
+    >
+      <div
+        data-testid="adslot-test"
+        role="button"
+      />
+    </div>
   </div>
 </DocumentFragment>
 `;
@@ -17,44 +22,59 @@ exports[`Banner render component AdSlot loading should change class and remove r
 exports[`Banner render component AdSlot loading should change class and remove responsive styles after loaded events 2`] = `
 <DocumentFragment>
   <div
-    class="ad-slot ad-slot-empty banner-sizeId"
-    style=""
+    class="banner  banner-empty"
   >
     <div
-      data-testid="adslot-test"
-      role="button"
-    />
+      class="ad-slot ad-slot-empty banner-sizeId"
+      data-testid="ad-slot"
+      style=""
+    >
+      <div
+        data-testid="adslot-test"
+        role="button"
+      />
+    </div>
   </div>
 </DocumentFragment>
 `;
 
 exports[`Banner render component AdSlot loading should render AdSlot 1`] = `
 <DocumentFragment>
-  <style>
-    @media(min-width:320px){.banner-sizeId{min-height:100px;}
-@media(min-width:728px){.banner-sizeId{min-height:100px;}
-@media(min-width:970px){.banner-sizeId{min-height:250px;}
-  </style>
   <div
-    class="ad-slot ad-slot-loading banner-sizeId"
+    class="banner  banner-loading"
   >
+    <style>
+      @media(min-width:320px){.banner-sizeId{min-height:100px;}
+@media(min-width:728px){.banner-sizeId{min-height:100px;}
+@media(min-width:970px){.banner-sizeId{min-height:250px;}
+    </style>
     <div
-      data-testid="adslot-test"
-      role="button"
-    />
+      class="ad-slot ad-slot-loading banner-sizeId"
+      data-testid="ad-slot"
+    >
+      <div
+        data-testid="adslot-test"
+        role="button"
+      />
+    </div>
   </div>
 </DocumentFragment>
 `;
 
 exports[`Banner render component should not render AdSlot if shouldShowBanner=false but should render styles and wrapper 1`] = `
 <DocumentFragment>
-  <style>
-    @media(min-width:320px){.banner-sizeId{min-height:100px;}
+  <div
+    class="banner  banner-loading"
+  >
+    <style>
+      @media(min-width:320px){.banner-sizeId{min-height:100px;}
 @media(min-width:728px){.banner-sizeId{min-height:100px;}
 @media(min-width:970px){.banner-sizeId{min-height:250px;}
-  </style>
-  <div
-    class="ad-slot ad-slot-loading banner-sizeId"
-  />
+    </style>
+    <div
+      class="ad-slot ad-slot-loading banner-sizeId"
+      data-testid="ad-slot"
+    />
+  </div>
 </DocumentFragment>
 `;

package/tests/unit/src/components/Banner/__snapshots__/BannerRender.test.js.snap

@@ -2,9 +2,14 @@
 
 exports[`Banner render component should render 1`] = `
 <DocumentFragment>
-  <style />
   <div
-    class="ad-slot ad-slot-loading banner-sizeId"
-  />
+    class="banner  banner-loading"
+  >
+    <style />
+    <div
+      class="ad-slot ad-slot-loading banner-sizeId"
+      data-testid="ad-slot"
+    />
+  </div>
 </DocumentFragment>
 `;

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

@@ -60,6 +60,29 @@ describe('getSortProps helper function', () => {
     ]);
   });
 
+  it('should add score sort as first value if has textSearch but no sort applied', () => {
+    const { updatedSortProperties } = getSortProps({
+      ...props,
+      isTextSearchFilterApplied: true
+    });
+    expect(updatedSortProperties).toEqual([{ isScore: true }, ...sortProperties]);
+  });
+
+  it('should add default sort and score sort as first value if has textSearch and no other sort', () => {
+    const { updatedSortProperties } = getSortProps({
+      ...props,
+      sortProperties: [],
+      isTextSearchFilterApplied: true
+    });
+    expect(updatedSortProperties).toEqual([
+      { isScore: true },
+      {
+        propsToDisplay: props.defaultSortBy,
+        sort: props.defaultSort
+      }
+    ]);
+  });
+
   it('should use old style sort', () => {
     const { sortbyFilters, updatedSortProperties } = getSortProps({
       ...props,