@blaze-cms/react-page-builder 0.143.0-core-styles.9 → 0.143.1

package/src/helpers/build-raw-query.js

@@ -86,20 +86,22 @@ const buildRawQuery = ({
     if (shouldApplySort) {
       return {
         query,
-        sort: {
-          _script: {
-            type: 'number',
-            script: {
-              lang: 'painless',
-              source:
-                "!doc['id.keyword'].empty ? params.sortOrder.indexOf(doc['id.keyword'].value) : 0",
-              params: {
-                sortOrder: itemsToDisplayIds
-              }
-            },
-            order: 'asc'
+        sort: [
+          {
+            _script: {
+              type: 'number',
+              script: {
+                lang: 'painless',
+                source:
+                  "!doc['id.keyword'].empty ? params.sortOrder.indexOf(doc['id.keyword'].value) : 0",
+                params: {
+                  sortOrder: itemsToDisplayIds
+                }
+              },
+              order: 'asc'
+            }
           }
-        },
+        ],
         ...azQueryBits
       };
     }

package/tests/helpers/mocks.js

@@ -1976,23 +1976,26 @@ const RAW_QUERY_WITH_SHOULD_APPLY_SORT = {
       must_not: [{ ids: { values: ['itemId'] } }]
     }
   },
-  sort: {
-    _script: {
-      type: 'number',
-      script: {
-        lang: 'painless',
-        source: "!doc['id.keyword'].empty ? params.sortOrder.indexOf(doc['id.keyword'].value) : 0",
-        params: {
-          sortOrder: [
-            'd6a79240-3c5e-11ea-84c3-99e89d013812',
-            'fae0a8d0-35ed-11ea-9ef3-a10a62235b17',
-            '0c9dfaf0-35ee-11ea-9ef3-a10a62235b17'
-          ]
-        }
-      },
-      order: 'asc'
+  sort: [
+    {
+      _script: {
+        type: 'number',
+        script: {
+          lang: 'painless',
+          source:
+            "!doc['id.keyword'].empty ? params.sortOrder.indexOf(doc['id.keyword'].value) : 0",
+          params: {
+            sortOrder: [
+              'd6a79240-3c5e-11ea-84c3-99e89d013812',
+              'fae0a8d0-35ed-11ea-9ef3-a10a62235b17',
+              '0c9dfaf0-35ee-11ea-9ef3-a10a62235b17'
+            ]
+          }
+        },
+        order: 'asc'
+      }
     }
-  }
+  ]
 };
 
 const RAW_QUERY_WITH_AGGS = {

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

@@ -96,4 +96,14 @@ describe('getSortProps helper function', () => {
       }
     ]);
   });
+
+  it('should do not apply old style sort if values are empty', () => {
+    const { sortbyFilters, updatedSortProperties } = getSortProps({
+      ...props,
+      defaultSortBy: [],
+      sortProperties: []
+    });
+    expect(sortbyFilters).toEqual([]);
+    expect(updatedSortProperties).toEqual([]);
+  });
 });