@blaze-cms/react-page-builder 0.134.0 → 0.135.0-admin-updates.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +26 -0
- package/lib/components/Banner/AdSlotRender.js +12 -3
- package/lib/components/Banner/AdSlotRender.js.map +1 -1
- package/lib/components/Banner/Banner.js +4 -7
- package/lib/components/Banner/Banner.js.map +1 -1
- package/lib/components/Banner/BannerRender.js +7 -3
- package/lib/components/Banner/BannerRender.js.map +1 -1
- package/lib/components/Banner/helpers.js +2 -2
- package/lib/components/Banner/helpers.js.map +1 -1
- package/lib/components/BlazeLink.js +2 -2
- package/lib/components/BlazeLink.js.map +1 -1
- package/lib/components/Button.js +2 -2
- package/lib/components/Button.js.map +1 -1
- package/lib/components/Card/CardsContainer.js +2 -2
- package/lib/components/Card/CardsContainer.js.map +1 -1
- package/lib/components/Card/CardsRender.js +2 -2
- package/lib/components/Card/CardsRender.js.map +1 -1
- package/lib/components/Card/helpers/filter-query-setup.js +2 -2
- package/lib/components/Card/helpers/filter-query-setup.js.map +1 -1
- package/lib/components/ClickWrapper.js +2 -2
- package/lib/components/ClickWrapper.js.map +1 -1
- package/lib/components/Code/Code.js +2 -2
- package/lib/components/Code/Code.js.map +1 -1
- package/lib/components/DataSummary/helpers/build-loop-props-content.js +3 -2
- package/lib/components/DataSummary/helpers/build-loop-props-content.js.map +1 -1
- package/lib/components/DataSummary/helpers/get-link-to-published-content.js +2 -0
- package/lib/components/DataSummary/helpers/get-link-to-published-content.js.map +1 -1
- package/lib/components/Image/Image.js +2 -2
- package/lib/components/Image/Image.js.map +1 -1
- package/lib/components/Layout/Layout.js +2 -2
- package/lib/components/Layout/Layout.js.map +1 -1
- package/lib/components/List/ListBuilder.js +2 -2
- package/lib/components/List/ListBuilder.js.map +1 -1
- package/lib/components/List/ListFactory.js +2 -2
- package/lib/components/List/ListFactory.js.map +1 -1
- package/lib/components/List/components/Cards/CardsRender.js +2 -2
- package/lib/components/List/components/Cards/CardsRender.js.map +1 -1
- package/lib/components/List/components/Full/FullRender.js +2 -2
- package/lib/components/List/components/Full/FullRender.js.map +1 -1
- package/lib/components/List/components/Full/FullRenderItem.js +2 -2
- package/lib/components/List/components/Full/FullRenderItem.js.map +1 -1
- package/lib/components/List/components/Pagination/ListPagination.js +2 -2
- package/lib/components/List/components/Pagination/ListPagination.js.map +1 -1
- package/lib/components/List/helpers/build-az-url.js +2 -2
- package/lib/components/List/helpers/build-az-url.js.map +1 -1
- package/lib/components/List/helpers/build-pagination-url.js +2 -2
- package/lib/components/List/helpers/build-pagination-url.js.map +1 -1
- package/lib/components/SearchFilter/components/Range.js +2 -2
- package/lib/components/SearchFilter/components/Range.js.map +1 -1
- package/lib/components/SearchFilter/searchFilterReducer.js +2 -2
- package/lib/components/SearchFilterSort/helpers/update-sort.js +2 -2
- package/lib/components/SearchFilterSort/helpers/update-sort.js.map +1 -1
- package/lib/components/TextBlock/index.js +2 -2
- package/lib/components/TextBlock/index.js.map +1 -1
- package/lib/components/Video/Video.js +2 -2
- package/lib/components/Video/Video.js.map +1 -1
- package/lib/components/Video/providers/JWPlayer/JWPlayerProvider.js +2 -2
- package/lib/components/Video/providers/JWPlayer/JWPlayerProvider.js.map +1 -1
- package/lib/helpers/append-images.js +2 -2
- package/lib/helpers/build-raw-query-base.js +2 -2
- package/lib/helpers/build-raw-query-base.js.map +1 -1
- package/lib/helpers/build-raw-query.js +22 -11
- package/lib/helpers/build-raw-query.js.map +1 -1
- package/lib/helpers/build-search-values-text.js +8 -5
- package/lib/helpers/build-search-values-text.js.map +1 -1
- package/lib/helpers/get-banner-data.js +2 -2
- package/lib/helpers/get-click-wrapper-options.js +2 -2
- package/lib/helpers/get-click-wrapper-options.js.map +1 -1
- package/lib/helpers/get-entities-with-banner.js +2 -2
- package/lib/helpers/get-entities-with-banner.js.map +1 -1
- package/lib/helpers/get-generic-props.js +2 -2
- package/lib/helpers/get-generic-props.js.map +1 -1
- package/lib/helpers/get-generic-render-variables.js +2 -2
- package/lib/helpers/get-generic-render-variables.js.map +1 -1
- package/lib/helpers/inject-multiple-banners/get-banners-for-nodes/get-banners-for-nodes.js +2 -2
- package/lib/helpers/inject-multiple-banners/get-banners-for-nodes/get-banners-for-nodes.js.map +1 -1
- package/lib/helpers/process-data-summary-value.js +2 -2
- package/lib/helpers/process-data-summary-value.js.map +1 -1
- package/lib/helpers/remove-unwanted-characters.js +2 -2
- package/lib/helpers/render-children.js +2 -2
- package/lib/helpers/render-children.js.map +1 -1
- package/lib/helpers/split-children.js +2 -2
- package/lib/helpers/update-childrens-parent.js +2 -2
- package/lib/hooks/helpers/append-gtm-classname.js +2 -2
- package/lib/hooks/helpers/append-gtm-classname.js.map +1 -1
- package/lib/hooks/helpers/buildPBComponents.js +2 -2
- package/lib/hooks/helpers/buildPBComponents.js.map +1 -1
- package/lib/hooks/helpers/get-lightbox-images.js +2 -2
- package/lib/hooks/helpers/get-lightbox-images.js.map +1 -1
- package/lib/hooks/helpers/inject-element-banners.js +2 -2
- package/lib/hooks/helpers/inject-element-banners.js.map +1 -1
- package/lib/hooks/helpers/inject-textblock-banners.js +2 -2
- package/lib/hooks/helpers/inject-textblock-banners.js.map +1 -1
- package/lib/utils/get-class-modifiers.js +2 -2
- package/lib/utils/get-class-modifiers.js.map +1 -1
- package/lib-es/components/Banner/AdSlotRender.js +12 -3
- package/lib-es/components/Banner/AdSlotRender.js.map +1 -1
- package/lib-es/components/Banner/Banner.js +4 -7
- package/lib-es/components/Banner/Banner.js.map +1 -1
- package/lib-es/components/Banner/BannerRender.js +8 -4
- package/lib-es/components/Banner/BannerRender.js.map +1 -1
- package/lib-es/components/Banner/helpers.js +2 -2
- package/lib-es/components/BlazeLink.js +2 -2
- package/lib-es/components/Button.js +2 -2
- package/lib-es/components/Card/CardsContainer.js +2 -2
- package/lib-es/components/Card/CardsRender.js +2 -2
- package/lib-es/components/Card/helpers/filter-query-setup.js +2 -2
- package/lib-es/components/ClickWrapper.js +2 -2
- package/lib-es/components/Code/Code.js +2 -2
- package/lib-es/components/DataSummary/helpers/build-loop-props-content.js +3 -2
- package/lib-es/components/DataSummary/helpers/build-loop-props-content.js.map +1 -1
- package/lib-es/components/DataSummary/helpers/get-link-to-published-content.js +2 -1
- package/lib-es/components/DataSummary/helpers/get-link-to-published-content.js.map +1 -1
- package/lib-es/components/Image/Image.js +2 -2
- package/lib-es/components/Layout/Layout.js +2 -2
- package/lib-es/components/List/ListBuilder.js +2 -2
- package/lib-es/components/List/ListFactory.js +2 -2
- package/lib-es/components/List/components/Cards/CardsRender.js +2 -2
- package/lib-es/components/List/components/Full/FullRender.js +2 -2
- package/lib-es/components/List/components/Full/FullRenderItem.js +2 -2
- package/lib-es/components/List/components/Pagination/ListPagination.js +2 -2
- package/lib-es/components/List/helpers/build-az-url.js +2 -2
- package/lib-es/components/List/helpers/build-pagination-url.js +2 -2
- package/lib-es/components/SearchFilter/components/Range.js +2 -2
- package/lib-es/components/SearchFilter/searchFilterReducer.js +2 -2
- package/lib-es/components/SearchFilterSort/helpers/update-sort.js +2 -2
- package/lib-es/components/TextBlock/index.js +2 -2
- package/lib-es/components/Video/Video.js +2 -2
- package/lib-es/components/Video/providers/JWPlayer/JWPlayerProvider.js +2 -2
- package/lib-es/helpers/append-images.js +2 -2
- package/lib-es/helpers/build-raw-query-base.js +2 -2
- package/lib-es/helpers/build-raw-query.js +21 -9
- package/lib-es/helpers/build-raw-query.js.map +1 -1
- package/lib-es/helpers/build-search-values-text.js +8 -5
- package/lib-es/helpers/build-search-values-text.js.map +1 -1
- package/lib-es/helpers/get-banner-data.js +2 -2
- package/lib-es/helpers/get-click-wrapper-options.js +2 -2
- package/lib-es/helpers/get-entities-with-banner.js +2 -2
- package/lib-es/helpers/get-generic-props.js +2 -2
- package/lib-es/helpers/get-generic-render-variables.js +2 -2
- package/lib-es/helpers/inject-multiple-banners/get-banners-for-nodes/get-banners-for-nodes.js +2 -2
- package/lib-es/helpers/process-data-summary-value.js +2 -2
- package/lib-es/helpers/remove-unwanted-characters.js +2 -2
- package/lib-es/helpers/render-children.js +2 -2
- package/lib-es/helpers/split-children.js +2 -2
- package/lib-es/helpers/update-childrens-parent.js +2 -2
- package/lib-es/hooks/helpers/append-gtm-classname.js +2 -2
- package/lib-es/hooks/helpers/buildPBComponents.js +2 -2
- package/lib-es/hooks/helpers/get-lightbox-images.js +2 -2
- package/lib-es/hooks/helpers/inject-element-banners.js +2 -2
- package/lib-es/hooks/helpers/inject-textblock-banners.js +2 -2
- package/lib-es/utils/get-class-modifiers.js +2 -2
- package/package.json +10 -10
- package/src/components/Banner/AdSlotRender.js +9 -5
- package/src/components/Banner/Banner.js +9 -11
- package/src/components/Banner/BannerRender.js +4 -0
- package/src/components/DataSummary/helpers/build-loop-props-content.js +3 -2
- package/src/components/DataSummary/helpers/get-link-to-published-content.js +4 -1
- package/src/helpers/build-raw-query.js +16 -3
- package/src/helpers/build-search-values-text.js +20 -17
- package/tests/helpers/mocks.js +20 -5
- package/tests/unit/src/components/Banner/AdSlotRender.test.js +6 -11
- package/tests/unit/src/components/Banner/__snapshots__/AdSlotRender.test.js.snap +45 -25
- package/tests/unit/src/components/Banner/__snapshots__/BannerRender.test.js.snap +8 -3
- package/tests/unit/src/components/DataSummary/helpers/build-loop-props-content.test.js +41 -0
- package/tests/unit/src/components/DataSummary/helpers/get-link-to-published-content.test.js +21 -0
- package/tests/unit/src/components/PlaceholderIcon/__snapshots__/index.test.js.snap +87 -0
- package/tests/unit/src/components/PlaceholderIcon/index.test.js +20 -0
- package/tests/unit/src/helpers/build-search-values-text.test.js +22 -11
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"build-search-values-text.js","names":["buildSearchValuesText","propsToDisplay","search_term","searchTerm","reduce","acc","field","index","match","pageBuilderIndexed","query","fuzziness"],"sources":["../../src/helpers/build-search-values-text.js"],"sourcesContent":["const buildSearchValuesText = ({ propsToDisplay }, { search_term: searchTerm }) =>\n propsToDisplay.reduce((acc, field, index) => {\n
|
|
1
|
+
{"version":3,"file":"build-search-values-text.js","names":["buildSearchValuesText","propsToDisplay","search_term","searchTerm","reduce","acc","field","index","should","push","match","pageBuilderIndexed","query","fuzziness","must"],"sources":["../../src/helpers/build-search-values-text.js"],"sourcesContent":["const buildSearchValuesText = ({ propsToDisplay }, { search_term: searchTerm }) =>\n propsToDisplay.reduce(\n (acc, field, index) => {\n if (field && searchTerm) {\n if (index === 0) {\n acc.should.push({\n match: {\n pageBuilderIndexed: {\n query: searchTerm,\n fuzziness: 'AUTO'\n }\n }\n });\n }\n acc.must.push({\n match: {\n [field]: {\n query: searchTerm,\n fuzziness: 'AUTO'\n }\n }\n });\n }\n return acc;\n },\n { should: [], must: [] }\n );\n\nexport default buildSearchValuesText;\n"],"mappings":"AAAA,MAAMA,qBAAqB,GAAGA,CAAC;EAAEC;AAAe,CAAC,EAAE;EAAEC,WAAW,EAAEC;AAAW,CAAC,KAC5EF,cAAc,CAACG,MAAM,CACnB,CAACC,GAAG,EAAEC,KAAK,EAAEC,KAAK,KAAK;EACrB,IAAID,KAAK,IAAIH,UAAU,EAAE;IACvB,IAAII,KAAK,KAAK,CAAC,EAAE;MACfF,GAAG,CAACG,MAAM,CAACC,IAAI,CAAC;QACdC,KAAK,EAAE;UACLC,kBAAkB,EAAE;YAClBC,KAAK,EAAET,UAAU;YACjBU,SAAS,EAAE;UACb;QACF;MACF,CAAC,CAAC;IACJ;IACAR,GAAG,CAACS,IAAI,CAACL,IAAI,CAAC;MACZC,KAAK,EAAE;QACL,CAACJ,KAAK,GAAG;UACPM,KAAK,EAAET,UAAU;UACjBU,SAAS,EAAE;QACb;MACF;IACF,CAAC,CAAC;EACJ;EACA,OAAOR,GAAG;AACZ,CAAC,EACD;EAAEG,MAAM,EAAE,EAAE;EAAEM,IAAI,EAAE;AAAG,CACzB,CAAC;AAEH,eAAed,qBAAqB"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
|
-
function ownKeys(
|
|
3
|
-
function _objectSpread(
|
|
2
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
4
4
|
export default function getBannerData(banner, {
|
|
5
5
|
parent = {},
|
|
6
6
|
limit,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
|
-
function ownKeys(
|
|
3
|
-
function _objectSpread(
|
|
2
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
4
4
|
import { ON_CLICK } from '../constants';
|
|
5
5
|
const getClickWrapperOptions = (children = {}, componentProps = {}, id = null) => {
|
|
6
6
|
let shouldUseClickWrapper = false;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
|
-
function ownKeys(
|
|
3
|
-
function _objectSpread(
|
|
2
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
4
4
|
import injectBannersToEntities from './inject-banners-to-entities';
|
|
5
5
|
export default function getEntitiesWithBanner(entities, options, hasNewBannerSettings) {
|
|
6
6
|
const {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
|
-
function ownKeys(
|
|
3
|
-
function _objectSpread(
|
|
2
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
4
4
|
import getDictionaryMatch from './get-dictionary-match';
|
|
5
5
|
import { propsSchema } from './entities/constants';
|
|
6
6
|
function getGenericProps(props = propsSchema) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
|
-
function ownKeys(
|
|
3
|
-
function _objectSpread(
|
|
2
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
4
4
|
import { DEFAULT_LIMIT, DEFAULT_OFFSET } from '../constants';
|
|
5
5
|
import buildSortValues from './build-sort-values';
|
|
6
6
|
const getCorrectSort = (relations, filterProps, stringProps, useSortObject) => {
|
package/lib-es/helpers/inject-multiple-banners/get-banners-for-nodes/get-banners-for-nodes.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
|
-
function ownKeys(
|
|
3
|
-
function _objectSpread(
|
|
2
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
4
4
|
import flatten from 'lodash.flatten';
|
|
5
5
|
import { groupNodeEntities } from './helpers';
|
|
6
6
|
import injectBanner from '../../inject-banner';
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
2
|
import _objectWithoutProperties from "@babel/runtime/helpers/objectWithoutProperties";
|
|
3
|
-
function ownKeys(
|
|
4
|
-
function _objectSpread(
|
|
3
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
4
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
5
5
|
function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); }
|
|
6
6
|
function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
|
|
7
7
|
import React from 'react';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
|
-
function ownKeys(
|
|
3
|
-
function _objectSpread(
|
|
2
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
4
4
|
function removeUnwantedCharacters(value) {
|
|
5
5
|
const args = value !== null && value !== void 0 ? value : '';
|
|
6
6
|
return Array.isArray(args) ? value.map(removeUnwantedCharacters) : removeCharacters(args);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
|
-
function ownKeys(
|
|
3
|
-
function _objectSpread(
|
|
2
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
4
4
|
import React from 'react';
|
|
5
5
|
import { CHILD_PROPS_TO_USE } from '../constants';
|
|
6
6
|
const buildChildProps = (childProps, parentProps) => {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
|
-
function ownKeys(
|
|
3
|
-
function _objectSpread(
|
|
2
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
4
4
|
/* eslint-disable no-param-reassign */
|
|
5
5
|
const filterChildren = (children, parentComponent) => {
|
|
6
6
|
const withGTMChildren = [];
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
|
-
function ownKeys(
|
|
3
|
-
function _objectSpread(
|
|
2
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
4
4
|
const updateChildrensParent = (cardChildren, id, entity) => {
|
|
5
5
|
const hasCardChildren = !!cardChildren && Object.keys(cardChildren).length && cardChildren.props;
|
|
6
6
|
if (hasCardChildren && cardChildren.props.children) {
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
|
-
function ownKeys(
|
|
3
|
-
function _objectSpread(
|
|
2
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
4
4
|
import { GTM } from '../../constants';
|
|
5
5
|
const appendGtmClassName = (settings, childComponents) => {
|
|
6
6
|
if (!childComponents || Array.isArray(childComponents)) return settings;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
|
-
function ownKeys(
|
|
3
|
-
function _objectSpread(
|
|
2
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
4
4
|
import React from 'react';
|
|
5
5
|
import cloneDeep from 'lodash.clonedeep';
|
|
6
6
|
import GlobalLightbox from '../../components/Image/GlobalLightbox';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
|
-
function ownKeys(
|
|
3
|
-
function _objectSpread(
|
|
2
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
4
4
|
import { PB_TYPE_IMAGE, PB_TYPE_CAROUSEL, PB_TYPE_BANNER } from './constants';
|
|
5
5
|
function checkIfHasLightboxAndImages(component) {
|
|
6
6
|
const isImage = [PB_TYPE_IMAGE, PB_TYPE_CAROUSEL].includes(component.type);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
|
-
function ownKeys(
|
|
3
|
-
function _objectSpread(
|
|
2
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
4
4
|
import updateTargetings from './update-targetings';
|
|
5
5
|
import { IMAGE } from '../../constants';
|
|
6
6
|
import { PB_TYPE_BANNER } from './constants';
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import _extends from "@babel/runtime/helpers/extends";
|
|
2
2
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
3
|
-
function ownKeys(
|
|
4
|
-
function _objectSpread(
|
|
3
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
4
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
5
5
|
import React from 'react';
|
|
6
6
|
import Banner from '../../components/Banner';
|
|
7
7
|
import { getCollisions, checkIfHasCollided } from './check-collisions';
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import _defineProperty from "@babel/runtime/helpers/defineProperty";
|
|
2
|
-
function ownKeys(
|
|
3
|
-
function _objectSpread(
|
|
2
|
+
function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
|
|
3
|
+
function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
|
|
4
4
|
import { BUTTON, BUTTON_ICON, CLASS_MODIFIERS, ICON_BUTTON, LINK, CODE } from '../constants';
|
|
5
5
|
import COMPONENTS_DEFAULT_VALUES from '../constants/componentsDefaultValues';
|
|
6
6
|
const {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@blaze-cms/react-page-builder",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.135.0-admin-updates.2",
|
|
4
4
|
"description": "Blaze react page builder",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"module": "lib-es/index.js",
|
|
@@ -27,15 +27,15 @@
|
|
|
27
27
|
},
|
|
28
28
|
"license": "GPL-3.0",
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@blaze-cms/core-auth-ui": "
|
|
31
|
-
"@blaze-cms/core-errors": "
|
|
32
|
-
"@blaze-cms/core-errors-ui": "
|
|
30
|
+
"@blaze-cms/core-auth-ui": "0.135.0-admin-updates.0",
|
|
31
|
+
"@blaze-cms/core-errors": "0.135.0-admin-updates.0",
|
|
32
|
+
"@blaze-cms/core-errors-ui": "0.135.0-admin-updates.0",
|
|
33
33
|
"@blaze-cms/image-cdn-react": "0.3.0-alpha.6",
|
|
34
|
-
"@blaze-cms/nextjs-components": "
|
|
35
|
-
"@blaze-cms/plugin-search-ui": "
|
|
36
|
-
"@blaze-cms/setup-ui": "
|
|
37
|
-
"@blaze-cms/utils": "
|
|
38
|
-
"@blaze-cms/utils-handlebars": "
|
|
34
|
+
"@blaze-cms/nextjs-components": "0.135.0-admin-updates.0",
|
|
35
|
+
"@blaze-cms/plugin-search-ui": "0.135.0-admin-updates.0",
|
|
36
|
+
"@blaze-cms/setup-ui": "0.135.0-admin-updates.0",
|
|
37
|
+
"@blaze-cms/utils": "0.135.0-admin-updates.0",
|
|
38
|
+
"@blaze-cms/utils-handlebars": "0.135.0-admin-updates.0",
|
|
39
39
|
"@blaze-react/breadcrumb": "0.8.0-alpha.60",
|
|
40
40
|
"@blaze-react/button": "0.5.19",
|
|
41
41
|
"@blaze-react/checkboxes": "0.5.31",
|
|
@@ -89,5 +89,5 @@
|
|
|
89
89
|
"lib/*",
|
|
90
90
|
"lib-es/*"
|
|
91
91
|
],
|
|
92
|
-
"gitHead": "
|
|
92
|
+
"gitHead": "3478417404460cdc28e4320d7c581c61c0651afa"
|
|
93
93
|
}
|
|
@@ -2,6 +2,7 @@ import React, { useState } from 'react';
|
|
|
2
2
|
import { AdSlot } from 'react-dfp';
|
|
3
3
|
import PropTypes from 'prop-types';
|
|
4
4
|
import { BANNER_LOADING, BANNER_EMPTY, BANNER_LOADED } from '../../constants';
|
|
5
|
+
import Wrapper from '../Wrapper';
|
|
5
6
|
|
|
6
7
|
const AdSlotRender = ({
|
|
7
8
|
shouldShowBanner,
|
|
@@ -9,6 +10,7 @@ const AdSlotRender = ({
|
|
|
9
10
|
sizeId,
|
|
10
11
|
parsedAdunit,
|
|
11
12
|
parsedSizes,
|
|
13
|
+
modifiers,
|
|
12
14
|
targetingArguments
|
|
13
15
|
}) => {
|
|
14
16
|
const [{ loadingStatus = BANNER_LOADING, minHeight }, setLoadingStatus] = useState({});
|
|
@@ -24,11 +26,11 @@ const AdSlotRender = ({
|
|
|
24
26
|
})
|
|
25
27
|
.sort();
|
|
26
28
|
const className = `ad-slot ad-slot-${loadingStatus} ${bannerClass}`;
|
|
27
|
-
|
|
29
|
+
const newModifers = `${modifiers} banner-${loadingStatus}`;
|
|
28
30
|
return (
|
|
29
|
-
|
|
31
|
+
<Wrapper className="banner" modifiers={newModifers}>
|
|
30
32
|
{styles && <style>{styles.join('\n')}</style>}
|
|
31
|
-
<div className={className} style={{ minHeight }}>
|
|
33
|
+
<div className={className} style={{ minHeight }} data-testid="ad-slot">
|
|
32
34
|
{shouldShowBanner && (
|
|
33
35
|
<AdSlot
|
|
34
36
|
adUnit={parsedAdunit}
|
|
@@ -46,7 +48,7 @@ const AdSlotRender = ({
|
|
|
46
48
|
/>
|
|
47
49
|
)}
|
|
48
50
|
</div>
|
|
49
|
-
|
|
51
|
+
</Wrapper>
|
|
50
52
|
);
|
|
51
53
|
};
|
|
52
54
|
|
|
@@ -56,11 +58,13 @@ AdSlotRender.propTypes = {
|
|
|
56
58
|
sizeId: PropTypes.string.isRequired,
|
|
57
59
|
parsedAdunit: PropTypes.string.isRequired,
|
|
58
60
|
parsedSizes: PropTypes.array,
|
|
61
|
+
modifiers: PropTypes.string,
|
|
59
62
|
targetingArguments: PropTypes.object.isRequired
|
|
60
63
|
};
|
|
61
64
|
|
|
62
65
|
AdSlotRender.defaultProps = {
|
|
63
|
-
parsedSizes: null
|
|
66
|
+
parsedSizes: null,
|
|
67
|
+
modifiers: ''
|
|
64
68
|
};
|
|
65
69
|
|
|
66
70
|
export default AdSlotRender;
|
|
@@ -7,7 +7,6 @@ import { useQuery } from '@apollo/client';
|
|
|
7
7
|
import { useRouter } from 'next/router';
|
|
8
8
|
import { buildUserQuery, buildPropsData } from './helpers';
|
|
9
9
|
import { getSingleEntitySchema, getUser } from '../../application/query';
|
|
10
|
-
import Wrapper from '../Wrapper';
|
|
11
10
|
import BannerRender from './BannerRender';
|
|
12
11
|
import buildPropsQuery from '../../helpers/build-props-query';
|
|
13
12
|
import { getClassModifiers } from '../../utils';
|
|
@@ -47,16 +46,15 @@ const Banner = ({ type, ...otherProps }) => {
|
|
|
47
46
|
const bannerKey = `${sizeId}${asPath}`;
|
|
48
47
|
|
|
49
48
|
return (
|
|
50
|
-
<
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
</Wrapper>
|
|
49
|
+
<BannerRender
|
|
50
|
+
key={bannerKey}
|
|
51
|
+
{...otherProps}
|
|
52
|
+
action={action}
|
|
53
|
+
actionKey={actionKey}
|
|
54
|
+
asPath={asPath}
|
|
55
|
+
userPropsData={userPropsData}
|
|
56
|
+
modifiers={modifiers}
|
|
57
|
+
/>
|
|
60
58
|
);
|
|
61
59
|
};
|
|
62
60
|
|
|
@@ -34,6 +34,7 @@ const BannerRender = ({
|
|
|
34
34
|
actionKey,
|
|
35
35
|
renderCounter,
|
|
36
36
|
userPropsData,
|
|
37
|
+
modifiers,
|
|
37
38
|
...otherProps
|
|
38
39
|
}) => {
|
|
39
40
|
const { id } = otherProps;
|
|
@@ -90,6 +91,7 @@ const BannerRender = ({
|
|
|
90
91
|
sizeId={sizeId}
|
|
91
92
|
parsedAdunit={parsedAdunit}
|
|
92
93
|
parsedSizes={parsedSizes}
|
|
94
|
+
modifiers={modifiers}
|
|
93
95
|
targetingArguments={targetingArguments}
|
|
94
96
|
/>
|
|
95
97
|
);
|
|
@@ -108,6 +110,7 @@ BannerRender.propTypes = {
|
|
|
108
110
|
targetings: PropTypes.string,
|
|
109
111
|
sizes: PropTypes.string,
|
|
110
112
|
renderCounter: PropTypes.number,
|
|
113
|
+
modifiers: PropTypes.string,
|
|
111
114
|
userPropsData: PropTypes.object
|
|
112
115
|
};
|
|
113
116
|
|
|
@@ -120,6 +123,7 @@ BannerRender.defaultProps = {
|
|
|
120
123
|
targetings: '',
|
|
121
124
|
sizes: '',
|
|
122
125
|
renderCounter: null,
|
|
126
|
+
modifiers: '',
|
|
123
127
|
userPropsData: {}
|
|
124
128
|
};
|
|
125
129
|
|
|
@@ -45,11 +45,12 @@ const buildLoopPropsContent = (loopProps = [], propsToDisplay = [], limit = 0, d
|
|
|
45
45
|
|
|
46
46
|
return propertiesToDisplay.map(key => {
|
|
47
47
|
const loopValue = loopValues[key];
|
|
48
|
-
const
|
|
48
|
+
const loopValueItem = loopValue && loopValue[i];
|
|
49
|
+
const propValue = loopValueItem ? getLoopValue(loopValueItem) : regularValues[key];
|
|
49
50
|
if (!propValue) return null;
|
|
50
51
|
|
|
51
52
|
const processedValue = processDataSummaryValue(propValue, options);
|
|
52
|
-
const linkToPublishedContent = getLinkToPublishedContent(key, data);
|
|
53
|
+
const linkToPublishedContent = getLinkToPublishedContent(key, data, loopValueItem);
|
|
53
54
|
return [upperFirst(label), processedValue, linkToPublishedContent, modifier];
|
|
54
55
|
});
|
|
55
56
|
})
|
|
@@ -1,6 +1,9 @@
|
|
|
1
|
-
const getLinkToPublishedContent = (key = '', props = {}) => {
|
|
1
|
+
const getLinkToPublishedContent = (key = '', props = {}, currentValue = null) => {
|
|
2
2
|
const [baseKey] = key.split('.');
|
|
3
3
|
if (!props[baseKey]) return '';
|
|
4
|
+
|
|
5
|
+
if (currentValue && typeof currentValue.url !== 'undefined') return currentValue.url;
|
|
6
|
+
|
|
4
7
|
const content = Array.isArray(props[baseKey]) ? props[baseKey][0] : props[baseKey];
|
|
5
8
|
return content && content.url ? content.url : '';
|
|
6
9
|
};
|
|
@@ -15,7 +15,7 @@ const buildRawQuery = ({
|
|
|
15
15
|
azOptions
|
|
16
16
|
}) => {
|
|
17
17
|
const {
|
|
18
|
-
searchValuesText,
|
|
18
|
+
searchValuesText: { must: searchValuesText, should: shouldValuesText = [] },
|
|
19
19
|
searchValuesCheckboxSelectRange,
|
|
20
20
|
searchValuesCheckboxOr
|
|
21
21
|
} = searchValues;
|
|
@@ -47,7 +47,10 @@ const buildRawQuery = ({
|
|
|
47
47
|
: finalValueIfNoCheckboxOrValues;
|
|
48
48
|
} else {
|
|
49
49
|
finalValue = {
|
|
50
|
-
must: [
|
|
50
|
+
must: [
|
|
51
|
+
...searchValuesCheckboxSelectRange,
|
|
52
|
+
{ bool: { should: [...searchValuesTextCheckboxOr, ...shouldValuesText] } }
|
|
53
|
+
]
|
|
51
54
|
};
|
|
52
55
|
}
|
|
53
56
|
const mustValues = [
|
|
@@ -58,10 +61,20 @@ const buildRawQuery = ({
|
|
|
58
61
|
|
|
59
62
|
buildAzFilter(azFilter, mustValues, azSortProperty);
|
|
60
63
|
|
|
64
|
+
const { should: baseShould = [], ...baseQuery } = buildRawQueryBase({
|
|
65
|
+
docType,
|
|
66
|
+
id,
|
|
67
|
+
filterValues,
|
|
68
|
+
filterOperator,
|
|
69
|
+
relations,
|
|
70
|
+
stringProps
|
|
71
|
+
});
|
|
72
|
+
const shouldValue = [...baseShould, ...shouldValuesText];
|
|
61
73
|
const query = {
|
|
62
74
|
bool: {
|
|
63
75
|
must: mustValues,
|
|
64
|
-
|
|
76
|
+
should: shouldValue.length ? shouldValue : undefined,
|
|
77
|
+
...baseQuery
|
|
65
78
|
}
|
|
66
79
|
};
|
|
67
80
|
const azQueryBits = getExtraAzBits({ ...azOptions, azSortProperty, azFilter });
|
|
@@ -1,26 +1,29 @@
|
|
|
1
1
|
const buildSearchValuesText = ({ propsToDisplay }, { search_term: searchTerm }) =>
|
|
2
|
-
propsToDisplay.reduce(
|
|
3
|
-
|
|
4
|
-
if (
|
|
5
|
-
|
|
2
|
+
propsToDisplay.reduce(
|
|
3
|
+
(acc, field, index) => {
|
|
4
|
+
if (field && searchTerm) {
|
|
5
|
+
if (index === 0) {
|
|
6
|
+
acc.should.push({
|
|
7
|
+
match: {
|
|
8
|
+
pageBuilderIndexed: {
|
|
9
|
+
query: searchTerm,
|
|
10
|
+
fuzziness: 'AUTO'
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
});
|
|
14
|
+
}
|
|
15
|
+
acc.must.push({
|
|
6
16
|
match: {
|
|
7
|
-
|
|
17
|
+
[field]: {
|
|
8
18
|
query: searchTerm,
|
|
9
19
|
fuzziness: 'AUTO'
|
|
10
20
|
}
|
|
11
21
|
}
|
|
12
|
-
};
|
|
22
|
+
});
|
|
13
23
|
}
|
|
14
|
-
acc
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
fuzziness: 'AUTO'
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
};
|
|
22
|
-
}
|
|
23
|
-
return acc;
|
|
24
|
-
}, []);
|
|
24
|
+
return acc;
|
|
25
|
+
},
|
|
26
|
+
{ should: [], must: [] }
|
|
27
|
+
);
|
|
25
28
|
|
|
26
29
|
export default buildSearchValuesText;
|
package/tests/helpers/mocks.js
CHANGED
|
@@ -1006,7 +1006,7 @@ const ITEMS_TO_DISPLAY = [
|
|
|
1006
1006
|
const MOCKED_ARGS = {
|
|
1007
1007
|
docType: 'published_page',
|
|
1008
1008
|
operator: 'should',
|
|
1009
|
-
searchValuesText: [{ match: { name: 'search' } }, { match: { metaTitle: 'search' } }],
|
|
1009
|
+
searchValuesText: { must: [{ match: { name: 'search' } }, { match: { metaTitle: 'search' } }] },
|
|
1010
1010
|
searchValuesCheckboxSelectRange: [],
|
|
1011
1011
|
searchValuesCheckboxOrEmpty: [],
|
|
1012
1012
|
id: 'itemId',
|
|
@@ -1025,7 +1025,7 @@ const MOCKED_ARGS = {
|
|
|
1025
1025
|
]
|
|
1026
1026
|
};
|
|
1027
1027
|
|
|
1028
|
-
const SEARCH_VALUES_TEXT_EMPTY = [];
|
|
1028
|
+
const SEARCH_VALUES_TEXT_EMPTY = { must: [] };
|
|
1029
1029
|
|
|
1030
1030
|
const SEARCH_VALUES_CHECKBOX_SELECT = [
|
|
1031
1031
|
{ match: { metaDescription: 'test' } },
|
|
@@ -1034,7 +1034,11 @@ const SEARCH_VALUES_CHECKBOX_SELECT = [
|
|
|
1034
1034
|
|
|
1035
1035
|
const AND_OPERATOR = 'must';
|
|
1036
1036
|
|
|
1037
|
-
const
|
|
1037
|
+
const EXAMPLE_SHOULD_TEXT = [{ match: { pageBuilderIndexed: 'search' } }];
|
|
1038
|
+
const SEARCH_VALUES_TEXT = {
|
|
1039
|
+
should: EXAMPLE_SHOULD_TEXT,
|
|
1040
|
+
must: [{ match: { name: 'search' } }, { match: { metaTitle: 'search' } }]
|
|
1041
|
+
};
|
|
1038
1042
|
|
|
1039
1043
|
const SEARCH_PUBLISHED_MOCK = [
|
|
1040
1044
|
{
|
|
@@ -1339,6 +1343,7 @@ const RAW_QUERY_ALL_SEARCH_VALUE_SAME_OPERATOR = {
|
|
|
1339
1343
|
}
|
|
1340
1344
|
}
|
|
1341
1345
|
],
|
|
1346
|
+
should: EXAMPLE_SHOULD_TEXT,
|
|
1342
1347
|
filter: {
|
|
1343
1348
|
bool: {
|
|
1344
1349
|
should: [{ match: { docType: 'published_page' } }],
|
|
@@ -1359,12 +1364,19 @@ const RAW_QUERY_ALL_SEARCH_VALUE_DIFFERENT_OPERATOR = {
|
|
|
1359
1364
|
{ match: { metaDescription: 'test' } },
|
|
1360
1365
|
{ match: { category: 'cat' } },
|
|
1361
1366
|
{
|
|
1362
|
-
bool: {
|
|
1367
|
+
bool: {
|
|
1368
|
+
should: [
|
|
1369
|
+
{ match: { name: 'search' } },
|
|
1370
|
+
{ match: { metaTitle: 'search' } },
|
|
1371
|
+
...EXAMPLE_SHOULD_TEXT
|
|
1372
|
+
]
|
|
1373
|
+
}
|
|
1363
1374
|
}
|
|
1364
1375
|
]
|
|
1365
1376
|
}
|
|
1366
1377
|
}
|
|
1367
1378
|
],
|
|
1379
|
+
should: EXAMPLE_SHOULD_TEXT,
|
|
1368
1380
|
filter: {
|
|
1369
1381
|
bool: {
|
|
1370
1382
|
should: [{ match: { docType: 'published_page' } }],
|
|
@@ -1391,6 +1403,7 @@ const RAW_QUERY_ALL_SEARCH_VALUE_SAME_OPERATOR_TEXT_CHECKBOX_HAS_OR_OPERATOR = {
|
|
|
1391
1403
|
}
|
|
1392
1404
|
}
|
|
1393
1405
|
],
|
|
1406
|
+
should: EXAMPLE_SHOULD_TEXT,
|
|
1394
1407
|
filter: {
|
|
1395
1408
|
bool: {
|
|
1396
1409
|
should: [{ match: { docType: 'published_page' } }],
|
|
@@ -1416,7 +1429,8 @@ const RAW_QUERY_ALL_SEARCH_VALUE_DIFFERENT_OPERATOR_TEXT_CHECKBOX_HAS_OR_OPERATO
|
|
|
1416
1429
|
{ match: { name: 'search' } },
|
|
1417
1430
|
{ match: { metaTitle: 'search' } },
|
|
1418
1431
|
{ match: { name: 'someName' } },
|
|
1419
|
-
{ match: { name: 'another' } }
|
|
1432
|
+
{ match: { name: 'another' } },
|
|
1433
|
+
...EXAMPLE_SHOULD_TEXT
|
|
1420
1434
|
]
|
|
1421
1435
|
}
|
|
1422
1436
|
}
|
|
@@ -1424,6 +1438,7 @@ const RAW_QUERY_ALL_SEARCH_VALUE_DIFFERENT_OPERATOR_TEXT_CHECKBOX_HAS_OR_OPERATO
|
|
|
1424
1438
|
}
|
|
1425
1439
|
}
|
|
1426
1440
|
],
|
|
1441
|
+
should: EXAMPLE_SHOULD_TEXT,
|
|
1427
1442
|
filter: {
|
|
1428
1443
|
bool: {
|
|
1429
1444
|
should: [{ match: { docType: 'published_page' } }],
|