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

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,

package/tests/unit/src/components/SearchFilter/helpers/build-query.test.js

@@ -11,6 +11,7 @@ const mockedProps = [
 ];
 
 describe('buildUrlQuery helper function', () => {
+  const noProps = buildUrlQuery();
   const simpleExample = buildUrlQuery(...mockedProps[0]);
   const withTextSearch = buildUrlQuery(...mockedProps[1]);
   const withSearchAndRange = buildUrlQuery(...mockedProps[2]);
@@ -20,6 +21,11 @@ describe('buildUrlQuery helper function', () => {
     anotherQuery: '123'
   });
 
+  it('should not break if no params are passed', () => {
+    expect(typeof noProps).toBe('string');
+    expect(noProps).toEqual('');
+  });
+
   it('should always return a string', () => {
     expect(typeof simpleExample).toBe('string');
   });

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

@@ -0,0 +1,28 @@
+import getUpdatedFilterBy from '../../../../../../src/components/SearchFilter/helpers/get-updated-filter-by';
+
+const mockedFilterByProperty = ['categoryId/product', 'subjectIds/product'];
+
+const mockedParentData = {
+  id: 'abc123d',
+  categoryId: null,
+  subjectIds: ['subjectid123s']
+};
+
+describe('getUpdatedFilterBy helper', () => {
+  const mockedFilterBy = [1, 2, 3];
+  const noParentData = getUpdatedFilterBy(mockedFilterBy, [], {});
+  const withFilterBy = getUpdatedFilterBy(mockedFilterBy, [], { id: '123' });
+  const withUpdatedFilterBy = getUpdatedFilterBy([], mockedFilterByProperty, mockedParentData);
+
+  it('should return current filterBy and filterByProperty if no parentData or if filterBy values exist', () => {
+    expect(noParentData).toEqual({ updatedFilterBy: mockedFilterBy, updatedFilterByProperty: [] });
+    expect(withFilterBy).toEqual({ updatedFilterBy: mockedFilterBy, updatedFilterByProperty: [] });
+  });
+
+  it('should return updated filterBy based on parent data matchess', () => {
+    expect(withUpdatedFilterBy).toEqual({
+      updatedFilterBy: ['subjectIds/subjectid123s'],
+      updatedFilterByProperty: mockedFilterByProperty
+    });
+  });
+});

package/tests/unit/src/components/SocialFollow/__snapshots__/SocialFollow.test.js.snap

@@ -61,7 +61,7 @@ exports[`SocialFollow component should render without throwing an error and matc
               xmlns="http://www.w3.org/2000/svg"
             >
               <path
-                d="M459.37 151.716c.325 4.548.325 9.097.325 13.645 0 138.72-105.583 298.558-298.558 298.558-59.452 0-114.68-17.219-161.137-47.106 8.447.974 16.568 1.299 25.34 1.299 49.055 0 94.213-16.568 130.274-44.832-46.132-.975-84.792-31.188-98.112-72.772 6.498.974 12.995 1.624 19.818 1.624 9.421 0 18.843-1.3 27.614-3.573-48.081-9.747-84.143-51.98-84.143-102.985v-1.299c13.969 7.797 30.214 12.67 47.431 13.319-28.264-18.843-46.781-51.005-46.781-87.391 0-19.492 5.197-37.36 14.294-52.954 51.655 63.675 129.3 105.258 216.365 109.807-1.624-7.797-2.599-15.918-2.599-24.04 0-57.828 46.782-104.934 104.934-104.934 30.213 0 57.502 12.67 76.67 33.137 23.715-4.548 46.456-13.32 66.599-25.34-7.798 24.366-24.366 44.833-46.132 57.827 21.117-2.273 41.584-8.122 60.426-16.243-14.292 20.791-32.161 39.308-52.628 54.253z"
+                d="M389.2 48h70.6L305.6 224.2 487 464H345L233.7 318.6 106.5 464H35.8L200.7 275.5 26.8 48H172.4L272.9 180.9 389.2 48zM364.4 421.8h39.1L151.1 88h-42L364.4 421.8z"
               />
             </svg>
           </i>

package/tests/unit/src/helpers/build-raw-query.test.js

@@ -32,6 +32,7 @@ const filterData = {
   relations: [],
   stringProps: []
 };
+const customProperty = 'lastname';
 
 describe('build raw query', () => {
   const {
@@ -365,7 +366,6 @@ describe('build raw query', () => {
   });
 
   it('should return query with aggs if requested using custom az param', () => {
-    const customProperty = 'lastname';
     const queryWithAggs = buildRawQuery({
       docType,
       operator,
@@ -387,4 +387,73 @@ describe('build raw query', () => {
 
     expect(JSON.stringify(queryWithAggs)).toContain(`${customProperty}.keyword`);
   });
+
+  it('should handle filters with search where custom sort is also set', () => {
+    const queryWithAggs = buildRawQuery({
+      docType,
+      operator,
+      searchValues: {
+        searchValuesText,
+        searchValuesCheckboxSelectRange,
+        searchValuesCheckboxOr: searchValuesCheckboxOrEmpty
+      },
+      filterData,
+      id,
+      itemsToDisplay: [],
+      shouldApplySort: true,
+      azOptions: {
+        shouldReturnAggs: false,
+        isAZ: false,
+        sortProperties: [{ isScore: true }]
+      }
+    });
+
+    expect(JSON.stringify(queryWithAggs)).not.toContain('sort');
+  });
+
+  it('should handle search filters with az listing using custom sort', () => {
+    const queryWithAggs = buildRawQuery({
+      docType,
+      operator,
+      searchValues: {
+        searchValuesText,
+        searchValuesCheckboxSelectRange,
+        searchValuesCheckboxOr: searchValuesCheckboxOrEmpty
+      },
+      filterData,
+      id,
+      itemsToDisplay: [],
+      shouldApplySort: true,
+      azOptions: {
+        shouldReturnAggs: true,
+        isAZ: true,
+        sortProperties: [{ isScore: true }, { propsToDisplay: [customProperty] }]
+      }
+    });
+
+    expect(JSON.stringify(queryWithAggs)).toContain(`${customProperty}.keyword`);
+  });
+
+  it('should handle search filters with az listing using custom default', () => {
+    const queryWithAggs = buildRawQuery({
+      docType,
+      operator,
+      searchValues: {
+        searchValuesText,
+        searchValuesCheckboxSelectRange,
+        searchValuesCheckboxOr: searchValuesCheckboxOrEmpty
+      },
+      filterData,
+      id,
+      itemsToDisplay: [],
+      shouldApplySort: true,
+      azOptions: {
+        shouldReturnAggs: true,
+        isAZ: true,
+        sortProperties: [{ isScore: true }]
+      }
+    });
+
+    expect(queryWithAggs).toEqual(RAW_QUERY_WITH_AGGS);
+  });
 });

package/tests/unit/src/helpers/build-sort-values.test.js

@@ -31,4 +31,24 @@ describe('buildSortValues helper function', () => {
     );
     expect(withUseSortObject).toEqual({ 'slug.keyword': 'asc' });
   });
+
+  it('should filter out duplicate sort values', () => {
+    const sort = buildSortValues(
+      [
+        {
+          propsToDisplay: ['slug'],
+          sort: 'ASC',
+          label: ''
+        },
+        {
+          propsToDisplay: ['slug'],
+          sort: 'ASC',
+          label: ''
+        }
+      ],
+      [],
+      ['name', 'slug', 'metaTitle']
+    );
+    expect(sort).toEqual({ sort: 'slug.keyword:asc' });
+  });
 });

package/tests/unit/src/helpers/get-generic-render-variables.test.js

@@ -122,4 +122,29 @@ describe('get card/list render variables', () => {
 
     expect(sort).toEqual('tag.name.keyword:asc');
   });
+
+  it('should handle multiple sort properties', () => {
+    const sortProperties = [
+      {
+        propsToDisplay: ['featured'],
+        sort: 'DESC',
+        label: '',
+        status: 'show'
+      },
+      {
+        propsToDisplay: ['date'],
+        sort: 'DESC',
+        label: '',
+        items: null,
+        status: 'show'
+      }
+    ];
+    const { sort } = getGenericRenderVariables({
+      relations: [{ localField: 'tag', entityIdentifier: 'tags' }],
+      filterProps: mockedProps({ sort: '', sortby: '', sortProperties }),
+      stringProps: ['tags.name']
+    });
+
+    expect(sort).toEqual('featured:desc,date:desc');
+  });
 });