@blaze-cms/react-page-builder 0.127.0 → 0.128.0-admin-updates.3

package/tests/helpers/mocks.js

@@ -873,7 +873,7 @@ const CARD_RENDER_SEARCH_PUBLISHED_MOCK = [
         offset: 0,
         sort: '',
         rawQueryStringified:
-          '{"bool":{"filter":{"bool":{"must":[{"term":{"docType":"published_page"}}]}}}}'
+          '{"bool":{"filter":{"bool":{"must":[{"term":{"docType":["published_page"]}}]}}}}'
       }
     },
     result: {
@@ -1255,7 +1255,6 @@ const MOCKED_ALL_FILTERS_INCLUDING_TEXT = {
     { propsToDisplay: ['name', 'metaTitle'], type: TEXT_SEARCH_STRING }
   ]
 };
-
 const RAW_QUERY_ONLY_TEXT_SEARCH = {
   bool: {
     must: [
@@ -1263,9 +1262,7 @@ const RAW_QUERY_ONLY_TEXT_SEARCH = {
         bool: {
           must: [
             {
-              bool: {
-                should: [{ match: { name: 'search' } }, { match: { metaTitle: 'search' } }]
-              }
+              bool: { should: [{ match: { name: 'search' } }, { match: { metaTitle: 'search' } }] }
             }
           ]
         }
@@ -1273,22 +1270,12 @@ const RAW_QUERY_ONLY_TEXT_SEARCH = {
     ],
     filter: {
       bool: {
-        must: [
-          {
-            term: {
-              docType: 'published_page'
-            }
-          }
-        ]
+        should: [{ match: { docType: 'published_page' } }],
+        minimum_should_match: 1,
+        must: []
       }
     },
-    must_not: [
-      {
-        ids: {
-          values: ['itemId']
-        }
-      }
-    ]
+    must_not: [{ ids: { values: ['itemId'] } }]
   }
 };
 
@@ -1307,22 +1294,12 @@ const RAW_QUERY_CHECKBOX_SELECT = {
     ],
     filter: {
       bool: {
-        must: [
-          {
-            term: {
-              docType: 'published_page'
-            }
-          }
-        ]
+        should: [{ match: { docType: 'published_page' } }],
+        minimum_should_match: 1,
+        must: []
       }
     },
-    must_not: [
-      {
-        ids: {
-          values: ['itemId']
-        }
-      }
-    ]
+    must_not: [{ ids: { values: ['itemId'] } }]
   }
 };
 
@@ -1334,33 +1311,19 @@ const RAW_QUERY_CHECKBOX_SELECT_CHECKBOX_HAS_OR_OPERATOR = {
           must: [
             { match: { metaDescription: 'test' } },
             { match: { category: 'cat' } },
-            {
-              bool: {
-                should: [{ match: { name: 'someName' } }, { match: { name: 'another' } }]
-              }
-            }
+            { bool: { should: [{ match: { name: 'someName' } }, { match: { name: 'another' } }] } }
           ]
         }
       }
     ],
     filter: {
       bool: {
-        must: [
-          {
-            term: {
-              docType: 'published_page'
-            }
-          }
-        ]
+        should: [{ match: { docType: 'published_page' } }],
+        minimum_should_match: 1,
+        must: []
       }
     },
-    must_not: [
-      {
-        ids: {
-          values: ['itemId']
-        }
-      }
-    ]
+    must_not: [{ ids: { values: ['itemId'] } }]
   }
 };
 
@@ -1380,22 +1343,12 @@ const RAW_QUERY_ALL_SEARCH_VALUE_SAME_OPERATOR = {
     ],
     filter: {
       bool: {
-        must: [
-          {
-            term: {
-              docType: 'published_page'
-            }
-          }
-        ]
+        should: [{ match: { docType: 'published_page' } }],
+        minimum_should_match: 1,
+        must: []
       }
     },
-    must_not: [
-      {
-        ids: {
-          values: ['itemId']
-        }
-      }
-    ]
+    must_not: [{ ids: { values: ['itemId'] } }]
   }
 };
 
@@ -1408,9 +1361,7 @@ const RAW_QUERY_ALL_SEARCH_VALUE_DIFFERENT_OPERATOR = {
             { match: { metaDescription: 'test' } },
             { match: { category: 'cat' } },
             {
-              bool: {
-                should: [{ match: { name: 'search' } }, { match: { metaTitle: 'search' } }]
-              }
+              bool: { should: [{ match: { name: 'search' } }, { match: { metaTitle: 'search' } }] }
             }
           ]
         }
@@ -1418,22 +1369,12 @@ const RAW_QUERY_ALL_SEARCH_VALUE_DIFFERENT_OPERATOR = {
     ],
     filter: {
       bool: {
-        must: [
-          {
-            term: {
-              docType: 'published_page'
-            }
-          }
-        ]
+        should: [{ match: { docType: 'published_page' } }],
+        minimum_should_match: 1,
+        must: []
       }
     },
-    must_not: [
-      {
-        ids: {
-          values: ['itemId']
-        }
-      }
-    ]
+    must_not: [{ ids: { values: ['itemId'] } }]
   }
 };
 
@@ -1447,33 +1388,19 @@ const RAW_QUERY_ALL_SEARCH_VALUE_SAME_OPERATOR_TEXT_CHECKBOX_HAS_OR_OPERATOR = {
             { match: { metaTitle: 'search' } },
             { match: { metaDescription: 'test' } },
             { match: { category: 'cat' } },
-            {
-              bool: {
-                should: [{ match: { name: 'someName' } }, { match: { name: 'another' } }]
-              }
-            }
+            { bool: { should: [{ match: { name: 'someName' } }, { match: { name: 'another' } }] } }
           ]
         }
       }
     ],
     filter: {
       bool: {
-        must: [
-          {
-            term: {
-              docType: 'published_page'
-            }
-          }
-        ]
+        should: [{ match: { docType: 'published_page' } }],
+        minimum_should_match: 1,
+        must: []
       }
     },
-    must_not: [
-      {
-        ids: {
-          values: ['itemId']
-        }
-      }
-    ]
+    must_not: [{ ids: { values: ['itemId'] } }]
   }
 };
 
@@ -1501,22 +1428,12 @@ const RAW_QUERY_ALL_SEARCH_VALUE_DIFFERENT_OPERATOR_TEXT_CHECKBOX_HAS_OR_OPERATO
     ],
     filter: {
       bool: {
-        must: [
-          {
-            term: {
-              docType: 'published_page'
-            }
-          }
-        ]
+        should: [{ match: { docType: 'published_page' } }],
+        minimum_should_match: 1,
+        must: []
       }
     },
-    must_not: [
-      {
-        ids: {
-          values: ['itemId']
-        }
-      }
-    ]
+    must_not: [{ ids: { values: ['itemId'] } }]
   }
 };
 
@@ -1534,25 +1451,14 @@ const RAW_QUERY_STRINGIFIED_WITH_RANGE =
 const RAW_QUERY_BASE_CHECKBOX_FILTERS = {
   filter: {
     bool: {
-      must: [
-        {
-          term: {
-            docType: 'published_page'
-          }
-        },
-        { match: { featured: true } },
-        { match: { sponsored: true } }
-      ]
+      should: [{ match: { docType: 'published_page' } }],
+      minimum_should_match: 1,
+      must: [{ match: { featured: true } }, { match: { sponsored: true } }]
     }
   },
-  must_not: [
-    {
-      ids: {
-        values: ['itemId']
-      }
-    }
-  ]
+  must_not: [{ ids: { values: ['itemId'] } }]
 };
+
 const RAW_QUERY_CHECKBOX_FILTERS = {
   bool: {
     must: [
@@ -1560,46 +1466,33 @@ const RAW_QUERY_CHECKBOX_FILTERS = {
         bool: {
           must: [
             {
-              bool: {
-                should: [{ match: { name: 'search' } }, { match: { metaTitle: 'search' } }]
-              }
+              bool: { should: [{ match: { name: 'search' } }, { match: { metaTitle: 'search' } }] }
             }
           ]
         }
       },
-      {
-        regexp: {
-          'name.keyword': {
-            value: 'x.*',
-            case_insensitive: true
-          }
-        }
-      }
+      { regexp: { 'name.keyword': { value: 'x.*', case_insensitive: true } } }
     ],
-    ...RAW_QUERY_BASE_CHECKBOX_FILTERS
+    filter: {
+      bool: {
+        should: [{ match: { docType: 'published_page' } }],
+        minimum_should_match: 1,
+        must: [{ match: { featured: true } }, { match: { sponsored: true } }]
+      }
+    },
+    must_not: [{ ids: { values: ['itemId'] } }]
   }
 };
 
 const RAW_QUERY_BASE_ONE_CHECKBOX_FILTERS = {
   filter: {
     bool: {
-      must: [
-        {
-          term: {
-            docType: 'published_page'
-          }
-        },
-        { match: { sponsored: true } }
-      ]
+      should: [{ match: { docType: 'published_page' } }],
+      minimum_should_match: 1,
+      must: [{ match: { sponsored: true } }]
     }
   },
-  must_not: [
-    {
-      ids: {
-        values: ['itemId']
-      }
-    }
-  ]
+  must_not: [{ ids: { values: ['itemId'] } }]
 };
 
 const RAW_QUERY_ONE_CHECKBOX_FILTERS = {
@@ -1609,27 +1502,29 @@ const RAW_QUERY_ONE_CHECKBOX_FILTERS = {
         bool: {
           must: [
             {
-              bool: {
-                should: [{ match: { name: 'search' } }, { match: { metaTitle: 'search' } }]
-              }
+              bool: { should: [{ match: { name: 'search' } }, { match: { metaTitle: 'search' } }] }
             }
           ]
         }
       }
     ],
-    ...RAW_QUERY_BASE_ONE_CHECKBOX_FILTERS
+    filter: {
+      bool: {
+        should: [{ match: { docType: 'published_page' } }],
+        minimum_should_match: 1,
+        must: [{ match: { sponsored: true } }]
+      }
+    },
+    must_not: [{ ids: { values: ['itemId'] } }]
   }
 };
 
 const RAW_QUERY_BASE_ONE_CHECKBOX_FILTERS_AND_OTHER_FILTERS = {
   filter: {
     bool: {
+      should: [{ match: { docType: 'published_page' } }],
+      minimum_should_match: 1,
       must: [
-        {
-          term: {
-            docType: 'published_page'
-          }
-        },
         { match: { sponsored: true } },
         {
           bool: {
@@ -1639,59 +1534,32 @@ const RAW_QUERY_BASE_ONE_CHECKBOX_FILTERS_AND_OTHER_FILTERS = {
             ]
           }
         },
-        {
-          bool: {
-            should: [{ match: { 'category.name.keyword': 'another category' } }]
-          }
-        }
+        { bool: { should: [{ match: { 'category.name.keyword': 'another category' } }] } }
       ]
     }
   },
-  must_not: [
-    {
-      ids: {
-        values: ['itemId']
-      }
-    }
-  ]
+  must_not: [{ ids: { values: ['itemId'] } }]
 };
 
 const RAW_QUERY_BASE_ONE_CHECKBOX_FILTERS_AND_OTHER_FILTERS_OR_OPERATOR = {
   filter: {
     bool: {
+      should: [{ match: { docType: 'published_page' } }],
+      minimum_should_match: 1,
       must: [
-        {
-          term: {
-            docType: 'published_page'
-          }
-        },
         { match: { sponsored: true } },
         {
           bool: {
             should: [
-              {
-                bool: {
-                  should: [{ match: { price: '10' } }, { match: { price: '332' } }]
-                }
-              },
-              {
-                bool: {
-                  should: [{ match: { 'authors.lastname.keyword': 'last name' } }]
-                }
-              }
+              { bool: { should: [{ match: { price: '10' } }, { match: { price: '332' } }] } },
+              { bool: { should: [{ match: { 'authors.lastname.keyword': 'last name' } }] } }
             ]
           }
         }
       ]
     }
   },
-  must_not: [
-    {
-      ids: {
-        values: ['itemId']
-      }
-    }
-  ]
+  must_not: [{ ids: { values: ['itemId'] } }]
 };
 
 const RAW_QUERY_BASE_ONE_CHECKBOX_FILTERS_AND_OTHER_FILTERS_OR_OPERATOR_ITEMS_TO_DISPLAY = {
@@ -1747,15 +1615,31 @@ const RAW_QUERY_ONE_CHECKBOX_FILTERS_AND_OTHER_FILTERS = {
         bool: {
           must: [
             {
-              bool: {
-                should: [{ match: { name: 'search' } }, { match: { metaTitle: 'search' } }]
-              }
+              bool: { should: [{ match: { name: 'search' } }, { match: { metaTitle: 'search' } }] }
             }
           ]
         }
       }
     ],
-    ...RAW_QUERY_BASE_ONE_CHECKBOX_FILTERS_AND_OTHER_FILTERS
+    filter: {
+      bool: {
+        should: [{ match: { docType: 'published_page' } }],
+        minimum_should_match: 1,
+        must: [
+          { match: { sponsored: true } },
+          {
+            bool: {
+              should: [
+                { match: { 'name.keyword': 'entity-name' } },
+                { match: { 'name.keyword': 'another name' } }
+              ]
+            }
+          },
+          { bool: { should: [{ match: { 'category.name.keyword': 'another category' } }] } }
+        ]
+      }
+    },
+    must_not: [{ ids: { values: ['itemId'] } }]
   }
 };
 
@@ -1766,23 +1650,26 @@ const RAW_QUERY_ITEMS_TO_DISPLAY = {
         bool: {
           must: [
             {
-              bool: {
-                should: [{ match: { name: 'search' } }, { match: { metaTitle: 'search' } }]
-              }
+              bool: { should: [{ match: { name: 'search' } }, { match: { metaTitle: 'search' } }] }
             }
           ]
         }
       },
       {
         ids: {
-          values: ITEMS_TO_DISPLAY
+          values: [
+            'd6a79240-3c5e-11ea-84c3-99e89d013812',
+            'fae0a8d0-35ed-11ea-9ef3-a10a62235b17',
+            '0c9dfaf0-35ee-11ea-9ef3-a10a62235b17'
+          ]
         }
       }
     ],
     filter: {
       bool: {
+        should: [{ match: { docType: 'published_page' } }],
+        minimum_should_match: 1,
         must: [
-          { term: { docType: 'published_page' } },
           { match: { sponsored: true } },
           {
             bool: {
@@ -1808,23 +1695,26 @@ const RAW_QUERY_OR_OPERATOR_ITEMS_TO_DISPLAY = {
         bool: {
           must: [
             {
-              bool: {
-                should: [{ match: { name: 'search' } }, { match: { metaTitle: 'search' } }]
-              }
+              bool: { should: [{ match: { name: 'search' } }, { match: { metaTitle: 'search' } }] }
             }
           ]
         }
       },
       {
         ids: {
-          values: ITEMS_TO_DISPLAY
+          values: [
+            'd6a79240-3c5e-11ea-84c3-99e89d013812',
+            'fae0a8d0-35ed-11ea-9ef3-a10a62235b17',
+            '0c9dfaf0-35ee-11ea-9ef3-a10a62235b17'
+          ]
         }
       }
     ],
     filter: {
       bool: {
+        should: [{ match: { docType: 'published_page' } }],
+        minimum_should_match: 1,
         must: [
-          { term: { docType: 'published_page' } },
           { match: { sponsored: true } },
           {
             bool: {
@@ -1851,14 +1741,11 @@ const RAW_QUERY_OR_OPERATOR_ITEMS_TO_DISPLAY = {
 const RAW_QUERY_FINAL_VALUES_WITH_AND_UPDATED = {
   filter: {
     bool: {
+      should: [{ match: { docType: 'published_page' } }],
+      minimum_should_match: 1,
       must: [
-        { term: { docType: 'published_page' } },
         { match: { sponsored: true } },
-        {
-          bool: {
-            should: [{ match: { tagIds: 'id1' } }, { match: { tagIds: 'id2' } }]
-          }
-        },
+        { bool: { should: [{ match: { tagIds: 'id1' } }, { match: { tagIds: 'id2' } }] } },
         { bool: { should: [{ match: { categoryId: 'catId' } }] } }
       ]
     }
@@ -1954,9 +1841,7 @@ const RAW_QUERY_ONE_CHECKBOX_FILTERS_AND_OTHER_FILTERS_OR_OPERATOR = {
         bool: {
           must: [
             {
-              bool: {
-                should: [{ match: { name: 'search' } }, { match: { metaTitle: 'search' } }]
-              }
+              bool: { should: [{ match: { name: 'search' } }, { match: { metaTitle: 'search' } }] }
             }
           ]
         }
@@ -1964,12 +1849,9 @@ const RAW_QUERY_ONE_CHECKBOX_FILTERS_AND_OTHER_FILTERS_OR_OPERATOR = {
     ],
     filter: {
       bool: {
+        should: [{ match: { docType: 'published_page' } }],
+        minimum_should_match: 1,
         must: [
-          {
-            term: {
-              docType: 'published_page'
-            }
-          },
           { match: { featured: true } },
           {
             bool: {
@@ -1982,42 +1864,29 @@ const RAW_QUERY_ONE_CHECKBOX_FILTERS_AND_OTHER_FILTERS_OR_OPERATOR = {
                     ]
                   }
                 },
-                {
-                  bool: {
-                    should: [{ match: { price: '33' } }]
-                  }
-                }
+                { bool: { should: [{ match: { price: '33' } }] } }
               ]
             }
           }
         ]
       }
     },
-    must_not: [
-      {
-        ids: {
-          values: ['itemId']
-        }
-      }
-    ]
+    must_not: [{ ids: { values: ['itemId'] } }]
   }
 };
 
 const RAW_QUERY_WITH_ITEMS_TO_DISPLAY = {
   filter: {
     bool: {
+      should: [{ match: { docType: 'published_page' } }],
+      minimum_should_match: 1,
       must: [
-        { term: { docType: 'published_page' } },
         { ids: { values: ['displayItem1', 'displayItem2'] } },
         { match: { sponsored: true } },
         {
           bool: {
             should: [
-              {
-                bool: {
-                  should: [{ match: { tagIds: 'id1' } }, { match: { tagIds: 'id2' } }]
-                }
-              },
+              { bool: { should: [{ match: { tagIds: 'id1' } }, { match: { tagIds: 'id2' } }] } },
               { bool: { should: [{ match: { 'categoryId.keyword': 'catId' } }] } }
             ]
           }
@@ -2029,24 +1898,22 @@ const RAW_QUERY_WITH_ITEMS_TO_DISPLAY = {
 };
 
 const RAW_QUERY_WITH_QUERY_FILTERS = {
+  should: [{ bool: { should: [{ match: { tagIds: 'id1' } }, { match: { tagIds: 'id2' } }] } }],
   minimum_should_match: 1,
-  should: [
-    {
-      bool: {
-        should: [{ match: { tagIds: 'id1' } }, { match: { tagIds: 'id2' } }]
-      }
-    }
-  ],
   filter: {
     bool: {
-      must: [{ term: { docType: 'published_page' } }, { match: { sponsored: true } }]
+      should: [{ match: { docType: 'published_page' } }],
+      minimum_should_match: 1,
+      must: [{ match: { sponsored: true } }]
     }
   },
   must_not: [{ ids: { values: ['itemId'] } }]
 };
 
 const RAW_QUERY_EMPTY_FILTERS_VALUE = {
-  filter: { bool: { must: [{ term: { docType: 'published_page' } }] } },
+  filter: {
+    bool: { should: [{ match: { docType: 'published_page' } }], minimum_should_match: 1, must: [] }
+  },
   must_not: [{ ids: { values: ['itemId'] } }]
 };
 
@@ -2067,14 +1934,19 @@ const RAW_QUERY_WITH_SHOULD_APPLY_SORT = {
         },
         {
           ids: {
-            values: ITEMS_TO_DISPLAY
+            values: [
+              'd6a79240-3c5e-11ea-84c3-99e89d013812',
+              'fae0a8d0-35ed-11ea-9ef3-a10a62235b17',
+              '0c9dfaf0-35ee-11ea-9ef3-a10a62235b17'
+            ]
           }
         }
       ],
       filter: {
         bool: {
+          should: [{ match: { docType: 'published_page' } }],
+          minimum_should_match: 1,
           must: [
-            { term: { docType: 'published_page' } },
             { match: { sponsored: true } },
             {
               bool: {
@@ -2098,7 +1970,11 @@ const RAW_QUERY_WITH_SHOULD_APPLY_SORT = {
         lang: 'painless',
         source: "!doc['id.keyword'].empty ? params.sortOrder.indexOf(doc['id.keyword'].value) : 0",
         params: {
-          sortOrder: ITEMS_TO_DISPLAY
+          sortOrder: [
+            'd6a79240-3c5e-11ea-84c3-99e89d013812',
+            'fae0a8d0-35ed-11ea-9ef3-a10a62235b17',
+            '0c9dfaf0-35ee-11ea-9ef3-a10a62235b17'
+          ]
         }
       },
       order: 'asc'
@@ -2122,7 +1998,13 @@ const RAW_QUERY_WITH_AGGS = {
           }
         }
       ],
-      filter: { bool: { must: [{ term: { docType: 'published_page' } }] } },
+      filter: {
+        bool: {
+          should: [{ match: { docType: 'published_page' } }],
+          minimum_should_match: 1,
+          must: []
+        }
+      },
       must_not: [{ ids: { values: ['itemId'] } }]
     }
   },
@@ -2131,11 +2013,7 @@ const RAW_QUERY_WITH_AGGS = {
       terms: { script: "doc['name.keyword'].getValue().substring(0,1).toUpperCase()", size: 500 }
     }
   },
-  sort: [
-    {
-      'name.keyword': 'asc'
-    }
-  ]
+  sort: [{ 'name.keyword': 'asc' }]
 };
 
 const MOCKED_GTM_CHILD_COMPONENTS = [