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

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

@@ -90,45 +90,4 @@ describe('buildLoopPropsContent helper function', () => {
     });
     expect.hasAssertions();
   });
-
-  it('should nested items with urls', () => {
-    const data = {
-      nestedLoopProp: [
-        {
-          nestedValue: 'abc',
-          url: 'http://blazecms.app/abc'
-        },
-        {
-          nestedValue: '123',
-          url: 'http://blazecms.app/123'
-        },
-        {
-          nestedValue: 'no url',
-          url: null
-        }
-      ]
-    };
-    const withUrl = buildLoopPropsContent(
-      mockedLoopProps,
-      [
-        {
-          bold: false,
-          enableLink: true,
-          label: '',
-          modifier: '',
-          prefix: '',
-          propertiesToDisplay: ['nestedLoopProp.nestedValue'],
-          shouldStrip: true
-        }
-      ],
-      0,
-      data
-    );
-
-    withUrl.forEach(([, value, url], index) => {
-      expect(value).toEqual(data.nestedLoopProp[index].nestedValue);
-      expect(url).toEqual(data.nestedLoopProp[index].url || '');
-    });
-    expect.hasAssertions();
-  });
 });

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

@@ -38,25 +38,4 @@ describe('get link to published content', () => {
     const result = getLinkToPublishedContent(publishedKey, props);
     expect(result).toEqual('');
   });
-
-  it('should return url from the currentValue', () => {
-    const currentValue = { url: 'currentValueUrl' };
-    const props = { content: [content] };
-    const result = getLinkToPublishedContent(publishedKey, props, currentValue);
-    expect(result).toEqual(currentValue.url);
-  });
-
-  it('should return url from the currentValue even if falsey', () => {
-    const currentValue = { url: null };
-    const props = { content: [content] };
-    const result = getLinkToPublishedContent(publishedKey, props, currentValue);
-    expect(result).toEqual(currentValue.url);
-  });
-
-  it('should not return url from the currentValue if not set', () => {
-    const currentValue = {};
-    const props = { content: [content] };
-    const result = getLinkToPublishedContent(publishedKey, props, currentValue);
-    expect(result).toEqual(content.url);
-  });
 });

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');
+  });
 });

package/tests/unit/src/components/PlaceholderIcon/__snapshots__/index.test.js.snap

@@ -1,72 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Placeholder component should render PlaceholderIcon 1`] = `
-<DocumentFragment>
-  <div
-    class="editor-view__placeholder"
-    data-testid="placeholder-icon"
-  >
-    <svg
-      height="25px"
-      version="1.1"
-      viewBox="0 0 16 16"
-      width="25px"
-      xmlns="http://www.w3.org/2000/svg"
-    >
-      <title>
-        card
-      </title>
-      <g
-        fill="none"
-        fill-rule="evenodd"
-        id="Icons"
-        stroke="none"
-        stroke-width="1"
-      >
-        <g
-          id="card"
-          transform="translate(-261.000000, -216.000000)"
-        >
-          <g
-            transform="translate(261.000000, 216.000000)"
-          >
-            <path
-              d="M15,1 L15,9.53124644 L14.998,9.531 L14.9986024,7.67959976 L11.4210663,4.62547112 L7.4590683,8.08893259 C7.08560181,8.77082265 6.07591438,8.77082265 5.51715851,8.27688661 L3.50145721,6.5 L1,8.77 L1,7.323 L2.58011188,5.9054667 C3.10161735,5.44445974 3.91799869,5.41372594 4.47882094,5.81326531 L4.59488493,5.9054667 L6.4402744,7.56106172 L10.4252459,3.98593625 C10.9840017,3.49200022 11.8812631,3.49200022 12.4400189,3.98593625 L14.9986024,6.28137475 L14.998,1 Z M6.14778213,2.60821539 C6.69719001,2.60821539 7.14257312,3.0379169 7.14257312,3.56798059 C7.14257312,4.09804429 6.69719002,4.52774581 6.14778213,4.52774581 C5.88422964,4.52580316 5.6316942,4.42547921 5.44313851,4.24781429 C5.25594548,4.06784498 5.15142164,3.82293899 5.15297371,3.56798059 C5.15297371,3.0379169 5.59837425,2.60821539 6.14778213,2.60821539 Z"
-              fill="#63779C"
-              fill-rule="nonzero"
-              id="Combined-Shape"
-            />
-            <path
-              d="M3,13 C3,12.7238576 3.22385763,12.5 3.5,12.5 L12.5,12.5 C12.7761424,12.5 13,12.7238576 13,13 C13,13.2761424 12.7761424,13.5 12.5,13.5 L3.5,13.5 C3.22385763,13.5 3,13.2761424 3,13 Z"
-              fill="#899BBC"
-              fill-rule="nonzero"
-              id="Shape"
-            />
-            <rect
-              height="15"
-              id="Rectangle"
-              rx="2"
-              stroke="#899BBC"
-              width="15"
-              x="0.5"
-              y="0.5"
-            />
-            <line
-              id="Line-2"
-              stroke="#63779C"
-              stroke-linecap="square"
-              x1="0.5"
-              x2="15.5"
-              y1="10.5"
-              y2="10.5"
-            />
-          </g>
-        </g>
-      </g>
-    </svg>
-    <span>
-      card
-    </span>
-  </div>
-</DocumentFragment>
-`;

package/tests/unit/src/components/PlaceholderIcon/index.test.js

@@ -1,20 +0,0 @@
-/**
- * @jest-environment jsdom
- */
-import { render } from '@blaze-cms/tools/test-helpers/test-functions';
-
-import PlaceholderIcon from '../../../../../../blaze-plugin-page-builder-ui/src/components/EditorView/PlaceholderIcon';
-import { CardIcon } from '../../../../../../blaze-plugin-page-builder-ui/src/components/EditorView/Icons';
-
-const mockedProps = {
-  type: 'card',
-  icon: CardIcon
-};
-
-describe('Placeholder component', () => {
-  it('should render PlaceholderIcon', () => {
-    const { asFragment, getByTestId } = render(PlaceholderIcon, mockedProps);
-    expect(getByTestId('placeholder-icon')).toBeDefined();
-    expect(asFragment()).toMatchSnapshot();
-  });
-});