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

package/src/helpers/get-extra-az-bits.js

@@ -1,7 +1,45 @@
-import { AZ_AGGS, ALL_AZ_SORT } from '../constants';
+import { AZ, AZ_DEFAULT_PROP } from '../constants';
 
-const getExtraAzBits = (shouldReturnAggs, isAZ, azFilter) => {
+function getAzArgs(azSortProperty) {
+  const azProp = `${azSortProperty}.keyword`;
+
+  const AZ_AGGS = {
+    aggs: {
+      azCount: {
+        terms: {
+          script: `doc['${azProp}'].getValue().substring(0,1).toUpperCase()`,
+          size: 500
+        }
+      }
+    },
+    sort: [{ [azProp]: 'asc' }]
+  };
+  const ALL_AZ_SORT = {
+    sort: [
+      {
+        _script: {
+          type: 'number',
+          script: {
+            lang: 'painless',
+            source: `int charPos = params.letters.indexOf(doc['${azProp}'].value.substring(0,1).toUpperCase()); charPos > -1 ? charPos : 100`,
+            params: {
+              letters: AZ
+            }
+          },
+          order: 'asc'
+        }
+      },
+      { [azProp]: 'asc' }
+    ]
+  };
+
+  return { ALL_AZ_SORT, AZ_AGGS };
+}
+
+const getExtraAzBits = ({ shouldReturnAggs, isAZ, azSortProperty = AZ_DEFAULT_PROP, azFilter }) => {
   if (!isAZ || (isAZ && azFilter)) return {};
+
+  const { AZ_AGGS, ALL_AZ_SORT } = getAzArgs(azSortProperty);
   if (shouldReturnAggs) return AZ_AGGS;
 
   return ALL_AZ_SORT;

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

@@ -1,42 +1,25 @@
-import getSortbyFieldName from './get-sort-by-field-name';
 import { DEFAULT_LIMIT, DEFAULT_OFFSET } from '../constants';
+import buildSortValues from './build-sort-values';
 
-const buildSortValues = (sortFilters, relations, stringProps) => {
-  if (!sortFilters || !sortFilters.length) return { sort: [] };
-
-  const sortValues = sortFilters
-    .map(({ sort, propsToDisplay }) => {
-      if (!sort) return null;
-
-      const sortFieldName = getSortbyFieldName(relations, propsToDisplay, stringProps);
-      return sortFieldName ? `${sortFieldName}:${sort.toLowerCase()}` : null;
-    })
-    .filter(Boolean)
-    .join(',');
-
-  return { sort: sortValues };
-};
-const getCorrectSort = (relations, filterProps, stringProps, isTextSearchApplied) => {
-  if (isTextSearchApplied) {
-    return {};
-  }
+const getCorrectSort = (relations, filterProps, stringProps, useSortObject) => {
   const { sort, sortby, sortProperties = [] } = filterProps;
 
   return buildSortValues(
     [{ sort, propsToDisplay: sortby }, ...sortProperties],
     relations,
-    stringProps
+    stringProps,
+    useSortObject
   );
 };
 
-const getGenericRenderVariables = (
+const getGenericRenderVariables = ({
   relations,
   filterProps = {},
   stringProps = [],
   rawQuery = {},
-  isTextSearchFilterApplied = false,
   useRandomSort = false
-) => {
+}) => {
+  const rawQueryCopy = { ...rawQuery };
   const { limit = DEFAULT_LIMIT, offset } = filterProps;
   const limitToUse = Number(limit || DEFAULT_LIMIT);
   const offsetToUse = Number(offset || DEFAULT_OFFSET);
@@ -45,7 +28,7 @@ const getGenericRenderVariables = (
     const rawQueryStringified = JSON.stringify({
       query: {
         function_score: {
-          query: rawQuery && rawQuery.query ? rawQuery.query : rawQuery,
+          query: rawQueryCopy && rawQueryCopy.query ? rawQueryCopy.query : rawQueryCopy,
           random_score: {},
           boost_mode: 'replace'
         }
@@ -59,13 +42,23 @@ const getGenericRenderVariables = (
     };
   }
 
-  const sort = getCorrectSort(relations, filterProps, stringProps, isTextSearchFilterApplied);
+  const sort = getCorrectSort(relations, filterProps, stringProps, !!rawQueryCopy.sort);
+
+  if (rawQueryCopy.sort && sort) {
+    rawQueryCopy.sort = [...rawQueryCopy.sort, sort];
+
+    return {
+      limit: limitToUse,
+      offset: offsetToUse,
+      rawQueryStringified: JSON.stringify(rawQueryCopy)
+    };
+  }
 
   return {
     limit: limitToUse,
     offset: offsetToUse,
     ...sort,
-    rawQueryStringified: JSON.stringify(rawQuery)
+    rawQueryStringified: JSON.stringify(rawQueryCopy)
   };
 };
 

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

@@ -90,4 +90,45 @@ 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,4 +38,25 @@ 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-list-query.test.js

@@ -0,0 +1,55 @@
+import getListQuery from '../../../../../../src/components/List/helpers/get-list-query';
+
+describe('getListQuery', () => {
+  it('should handle empty query', () => {
+    const query = {};
+    const hasListSpecificFilters = false;
+    const name = 'testList';
+
+    const result = getListQuery(query, hasListSpecificFilters, name);
+
+    expect(result).toEqual({});
+  });
+
+  it('should handle query without list-specific filters', () => {
+    const query = {
+      param1: 'value1',
+      param2: 'value2',
+      otherParam: 'otherValue',
+      'pb[testList][page]': '2',
+      'pb[testList][sort]': 'date',
+      'pb[testList][sortby]': 'asc'
+    };
+    const hasListSpecificFilters = false;
+    const name = 'testList';
+
+    const result = getListQuery(query, hasListSpecificFilters, name);
+
+    expect(result).toEqual({
+      param1: 'value1',
+      param2: 'value2',
+      otherParam: 'otherValue',
+      sort: 'date',
+      sortby: 'asc',
+      'pb[testList][page]': '2'
+    });
+  });
+
+  it('should handle query with list-specific filters', () => {
+    const query = {
+      'pb[testList][filter1]': 'filterValue1',
+      'pb[testList][page]': '3',
+      'pb[testList][sort]': 'name'
+    };
+    const hasListSpecificFilters = true;
+    const name = 'testList';
+
+    const result = getListQuery(query, hasListSpecificFilters, name);
+
+    expect(result).toEqual({
+      filter1: 'filterValue1',
+      sort: 'name',
+      'pb[testList][page]': '3'
+    });
+  });
+});

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

@@ -42,6 +42,24 @@ describe('getSortProps helper function', () => {
     ]);
   });
 
+  it('should add score sort as second value if has textSearch', () => {
+    const { sortbyFilters, updatedSortProperties } = getSortProps({
+      ...props,
+      querySortBy,
+      querySort: desc,
+      isTextSearchFilterApplied: true
+    });
+    expect(sortbyFilters).toEqual([querySortBy, property]);
+    expect(updatedSortProperties).toEqual([
+      {
+        propsToDisplay: [querySortBy],
+        sort: desc
+      },
+      { isScore: true },
+      ...sortProperties
+    ]);
+  });
+
   it('should use old style sort', () => {
     const { sortbyFilters, updatedSortProperties } = getSortProps({
       ...props,

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

@@ -0,0 +1,72 @@
+// 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

@@ -0,0 +1,20 @@
+/**
+ * @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();
+  });
+});

package/tests/unit/src/constants/__snapshots__/index.test.js.snap

@@ -0,0 +1,3 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`constants should match snapshot 1`] = `undefined`;

package/tests/unit/src/constants/index.test.js

@@ -0,0 +1,7 @@
+import constants from '../../../../src/constants';
+
+describe('constants', () => {
+  it('should match snapshot', () => {
+    expect(constants).toMatchSnapshot();
+  });
+});

package/tests/unit/src/helpers/__snapshots__/get-extra-az-bits.test.js.snap

@@ -0,0 +1,137 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`getExtraAzBits helper function should return ALL_AZ_SORT if shouldReturnAggs is false and is Az and no Az filter is passed 1`] = `
+Object {
+  "sort": Array [
+    Object {
+      "_script": Object {
+        "order": "asc",
+        "script": Object {
+          "lang": "painless",
+          "params": Object {
+            "letters": Array [
+              "A",
+              "B",
+              "C",
+              "D",
+              "E",
+              "F",
+              "G",
+              "H",
+              "I",
+              "J",
+              "K",
+              "L",
+              "M",
+              "N",
+              "O",
+              "P",
+              "Q",
+              "R",
+              "S",
+              "T",
+              "U",
+              "V",
+              "W",
+              "X",
+              "Y",
+              "Z",
+            ],
+          },
+          "source": "int charPos = params.letters.indexOf(doc['name.keyword'].value.substring(0,1).toUpperCase()); charPos > -1 ? charPos : 100",
+        },
+        "type": "number",
+      },
+    },
+    Object {
+      "name.keyword": "asc",
+    },
+  ],
+}
+`;
+
+exports[`getExtraAzBits helper function should return ALL_AZ_SORT if shouldReturnAggs is false and is Az and no Az filter is passed with custom property 1`] = `
+Object {
+  "sort": Array [
+    Object {
+      "_script": Object {
+        "order": "asc",
+        "script": Object {
+          "lang": "painless",
+          "params": Object {
+            "letters": Array [
+              "A",
+              "B",
+              "C",
+              "D",
+              "E",
+              "F",
+              "G",
+              "H",
+              "I",
+              "J",
+              "K",
+              "L",
+              "M",
+              "N",
+              "O",
+              "P",
+              "Q",
+              "R",
+              "S",
+              "T",
+              "U",
+              "V",
+              "W",
+              "X",
+              "Y",
+              "Z",
+            ],
+          },
+          "source": "int charPos = params.letters.indexOf(doc['lastname.keyword'].value.substring(0,1).toUpperCase()); charPos > -1 ? charPos : 100",
+        },
+        "type": "number",
+      },
+    },
+    Object {
+      "lastname.keyword": "asc",
+    },
+  ],
+}
+`;
+
+exports[`getExtraAzBits helper function should return AZ_AGGS if shouldReturnAggs and isAz is true 1`] = `
+Object {
+  "aggs": Object {
+    "azCount": Object {
+      "terms": Object {
+        "script": "doc['name.keyword'].getValue().substring(0,1).toUpperCase()",
+        "size": 500,
+      },
+    },
+  },
+  "sort": Array [
+    Object {
+      "name.keyword": "asc",
+    },
+  ],
+}
+`;
+
+exports[`getExtraAzBits helper function should return AZ_AGGS if shouldReturnAggs and isAz is true with custom property 1`] = `
+Object {
+  "aggs": Object {
+    "azCount": Object {
+      "terms": Object {
+        "script": "doc['lastname.keyword'].getValue().substring(0,1).toUpperCase()",
+        "size": 500,
+      },
+    },
+  },
+  "sort": Array [
+    Object {
+      "lastname.keyword": "asc",
+    },
+  ],
+}
+`;

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

@@ -1,11 +1,12 @@
 import buildAzFilter from '../../../../src/helpers/build-az-filter';
+import { AZ_DEFAULT_PROP } from '../../../../src/constants';
 
 const mockFilters = [{ must: ['this'] }];
 const mockedResult = [
   { must: ['this'] },
   {
     regexp: {
-      'name.keyword': {
+      [`${AZ_DEFAULT_PROP}.keyword`]: {
         value: `b.*`,
         case_insensitive: true
       }
@@ -14,12 +15,12 @@ const mockedResult = [
 ];
 describe('buildAzFilter helper function', () => {
   it('should leave unchanged filters if no az is passed', () => {
-    buildAzFilter('', mockFilters);
+    buildAzFilter('', mockFilters, AZ_DEFAULT_PROP);
     expect(mockFilters).toEqual(mockFilters);
   });
 
   it('should update filters if az is passed', () => {
-    buildAzFilter('b', mockFilters);
+    buildAzFilter('b', mockFilters, AZ_DEFAULT_PROP);
     expect(mockFilters).toEqual(mockedResult);
   });
 });