@blaze-cms/react-page-builder 0.134.0-admin-updates.1 → 0.134.0-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaze-cms/react-page-builder",
-  "version": "0.134.0-admin-updates.1",
+  "version": "0.134.0-alpha.0",
   "description": "Blaze react page builder",
   "main": "lib/index.js",
   "module": "lib-es/index.js",
@@ -27,15 +27,15 @@
   },
   "license": "GPL-3.0",
   "dependencies": {
-    "@blaze-cms/core-auth-ui": "0.134.0-admin-updates.0",
-    "@blaze-cms/core-errors": "0.134.0-admin-updates.0",
-    "@blaze-cms/core-errors-ui": "0.134.0-admin-updates.0",
+    "@blaze-cms/core-auth-ui": "^0.131.0",
+    "@blaze-cms/core-errors": "^0.131.0",
+    "@blaze-cms/core-errors-ui": "^0.131.0",
     "@blaze-cms/image-cdn-react": "0.3.0-alpha.6",
-    "@blaze-cms/nextjs-components": "0.134.0-admin-updates.0",
-    "@blaze-cms/plugin-search-ui": "0.134.0-admin-updates.0",
-    "@blaze-cms/setup-ui": "0.134.0-admin-updates.0",
-    "@blaze-cms/utils": "0.134.0-admin-updates.0",
-    "@blaze-cms/utils-handlebars": "0.134.0-admin-updates.1",
+    "@blaze-cms/nextjs-components": "0.134.0-alpha.0",
+    "@blaze-cms/plugin-search-ui": "0.134.0-alpha.0",
+    "@blaze-cms/setup-ui": "^0.131.0",
+    "@blaze-cms/utils": "^0.131.0",
+    "@blaze-cms/utils-handlebars": "0.134.0-alpha.0",
     "@blaze-react/breadcrumb": "0.8.0-alpha.60",
     "@blaze-react/button": "0.5.19",
     "@blaze-react/checkboxes": "0.5.31",
@@ -89,5 +89,5 @@
     "lib/*",
     "lib-es/*"
   ],
-  "gitHead": "f07fa572d2e787a2ff1ec9084614d0ba8146fdf4"
+  "gitHead": "12915c7990880884e5ddfb2cd910a4080ce6a3d6"
 }

package/src/components/Banner/AdSlotRender.js

@@ -2,7 +2,6 @@ import React, { useState } from 'react';
 import { AdSlot } from 'react-dfp';
 import PropTypes from 'prop-types';
 import { BANNER_LOADING, BANNER_EMPTY, BANNER_LOADED } from '../../constants';
-import Wrapper from '../Wrapper';
 
 const AdSlotRender = ({
   shouldShowBanner,
@@ -10,7 +9,6 @@ const AdSlotRender = ({
   sizeId,
   parsedAdunit,
   parsedSizes,
-  modifiers,
   targetingArguments
 }) => {
   const [{ loadingStatus = BANNER_LOADING, minHeight }, setLoadingStatus] = useState({});
@@ -26,11 +24,11 @@ const AdSlotRender = ({
       })
       .sort();
   const className = `ad-slot ad-slot-${loadingStatus} ${bannerClass}`;
-  const newModifers = `${modifiers} banner-${loadingStatus}`;
+
   return (
-    <Wrapper className="banner" modifiers={newModifers}>
+    <>
       {styles && <style>{styles.join('\n')}</style>}
-      <div className={className} style={{ minHeight }} data-testid="ad-slot">
+      <div className={className} style={{ minHeight }}>
         {shouldShowBanner && (
           <AdSlot
             adUnit={parsedAdunit}
@@ -48,7 +46,7 @@ const AdSlotRender = ({
           />
         )}
       </div>
-    </Wrapper>
+    </>
   );
 };
 
@@ -58,13 +56,11 @@ AdSlotRender.propTypes = {
   sizeId: PropTypes.string.isRequired,
   parsedAdunit: PropTypes.string.isRequired,
   parsedSizes: PropTypes.array,
-  modifiers: PropTypes.string,
   targetingArguments: PropTypes.object.isRequired
 };
 
 AdSlotRender.defaultProps = {
-  parsedSizes: null,
-  modifiers: ''
+  parsedSizes: null
 };
 
 export default AdSlotRender;

package/src/components/Banner/Banner.js

@@ -7,6 +7,7 @@ import { useQuery } from '@apollo/client';
 import { useRouter } from 'next/router';
 import { buildUserQuery, buildPropsData } from './helpers';
 import { getSingleEntitySchema, getUser } from '../../application/query';
+import Wrapper from '../Wrapper';
 import BannerRender from './BannerRender';
 import buildPropsQuery from '../../helpers/build-props-query';
 import { getClassModifiers } from '../../utils';
@@ -46,15 +47,16 @@ const Banner = ({ type, ...otherProps }) => {
   const bannerKey = `${sizeId}${asPath}`;
 
   return (
-    <BannerRender
-      key={bannerKey}
-      {...otherProps}
-      action={action}
-      actionKey={actionKey}
-      asPath={asPath}
-      userPropsData={userPropsData}
-      modifiers={modifiers}
-    />
+    <Wrapper className={type} modifiers={modifiers}>
+      <BannerRender
+        key={bannerKey}
+        {...otherProps}
+        action={action}
+        actionKey={actionKey}
+        asPath={asPath}
+        userPropsData={userPropsData}
+      />
+    </Wrapper>
   );
 };
 

package/src/components/Banner/BannerRender.js

@@ -34,7 +34,6 @@ const BannerRender = ({
   actionKey,
   renderCounter,
   userPropsData,
-  modifiers,
   ...otherProps
 }) => {
   const { id } = otherProps;
@@ -91,7 +90,6 @@ const BannerRender = ({
       sizeId={sizeId}
       parsedAdunit={parsedAdunit}
       parsedSizes={parsedSizes}
-      modifiers={modifiers}
       targetingArguments={targetingArguments}
     />
   );
@@ -110,7 +108,6 @@ BannerRender.propTypes = {
   targetings: PropTypes.string,
   sizes: PropTypes.string,
   renderCounter: PropTypes.number,
-  modifiers: PropTypes.string,
   userPropsData: PropTypes.object
 };
 
@@ -123,7 +120,6 @@ BannerRender.defaultProps = {
   targetings: '',
   sizes: '',
   renderCounter: null,
-  modifiers: '',
   userPropsData: {}
 };
 

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

@@ -45,12 +45,11 @@ const buildLoopPropsContent = (loopProps = [], propsToDisplay = [], limit = 0, d
 
         return propertiesToDisplay.map(key => {
           const loopValue = loopValues[key];
-          const loopValueItem = loopValue && loopValue[i];
-          const propValue = loopValueItem ? getLoopValue(loopValueItem) : regularValues[key];
+          const propValue = loopValue ? getLoopValue(loopValue[i]) : regularValues[key];
           if (!propValue) return null;
 
           const processedValue = processDataSummaryValue(propValue, options);
-          const linkToPublishedContent = getLinkToPublishedContent(key, data, loopValueItem);
+          const linkToPublishedContent = getLinkToPublishedContent(key, data);
           return [upperFirst(label), processedValue, linkToPublishedContent, modifier];
         });
       })

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

@@ -1,9 +1,6 @@
-const getLinkToPublishedContent = (key = '', props = {}, currentValue = null) => {
+const getLinkToPublishedContent = (key = '', props = {}) => {
   const [baseKey] = key.split('.');
   if (!props[baseKey]) return '';
-
-  if (currentValue && typeof currentValue.url !== 'undefined') return currentValue.url;
-
   const content = Array.isArray(props[baseKey]) ? props[baseKey][0] : props[baseKey];
   return content && content.url ? content.url : '';
 };

package/tests/unit/src/components/Banner/AdSlotRender.test.js

@@ -50,17 +50,17 @@ describe('Banner render component', () => {
       <AdSlotRender {...defaultProps} shouldShowBanner={false} />
     );
 
-    expect(container.childNodes[0].nodeName).toEqual('DIV');
-    expect(getByTestId('ad-slot')).toHaveClass('ad-slot ad-slot-loading banner-sizeId');
+    expect(container.childNodes[0].nodeName).toEqual('STYLE');
+    expect(container.childNodes[1]).toHaveClass('ad-slot ad-slot-loading banner-sizeId');
     expect(() => getByTestId(slotTestId)).toThrow();
     expect(asFragment()).toMatchSnapshot();
   });
 
   describe('AdSlot loading', () => {
     it('should render AdSlot', () => {
-      const { asFragment, getByTestId } = render(<AdSlotRender {...defaultProps} />);
+      const { asFragment, container, getByTestId } = render(<AdSlotRender {...defaultProps} />);
       expect(getByTestId('adslot-test')).toBeDefined();
-      expect(getByTestId('ad-slot')).toHaveClass('ad-slot ad-slot-loading banner-sizeId');
+      expect(container.childNodes[1]).toHaveClass('ad-slot ad-slot-loading banner-sizeId');
       expect(asFragment()).toMatchSnapshot();
     });
 
@@ -69,11 +69,16 @@ describe('Banner render component', () => {
       const adSlot = getByTestId(slotTestId);
 
       fireEvent.mouseOver(adSlot);
-      await waitFor(() => expect(container.childNodes[0]).toHaveClass('banner banner-loaded'));
+      await waitFor(() =>
+        expect(container.childNodes[0]).toHaveClass('ad-slot ad-slot-loaded banner-sizeId')
+      );
+      expect(container.childNodes[0]).toHaveStyle('min-height: 250px');
       expect(asFragment()).toMatchSnapshot();
 
       fireEvent.mouseLeave(adSlot);
-      await waitFor(() => expect(container.childNodes[0]).toHaveClass('banner banner-empty'));
+      await waitFor(() =>
+        expect(container.childNodes[0]).toHaveClass('ad-slot ad-slot-empty banner-sizeId')
+      );
       expect(asFragment()).toMatchSnapshot();
     });
   });

package/tests/unit/src/components/Banner/__snapshots__/AdSlotRender.test.js.snap

@@ -3,18 +3,13 @@
 exports[`Banner render component AdSlot loading should change class and remove responsive styles after loaded events 1`] = `
 <DocumentFragment>
   <div
-    class="banner  banner-loaded"
+    class="ad-slot ad-slot-loaded banner-sizeId"
+    style="min-height: 250px;"
   >
     <div
-      class="ad-slot ad-slot-loaded banner-sizeId"
-      data-testid="ad-slot"
-      style="min-height: 250px;"
-    >
-      <div
-        data-testid="adslot-test"
-        role="button"
-      />
-    </div>
+      data-testid="adslot-test"
+      role="button"
+    />
   </div>
 </DocumentFragment>
 `;
@@ -22,59 +17,44 @@ exports[`Banner render component AdSlot loading should change class and remove r
 exports[`Banner render component AdSlot loading should change class and remove responsive styles after loaded events 2`] = `
 <DocumentFragment>
   <div
-    class="banner  banner-empty"
+    class="ad-slot ad-slot-empty banner-sizeId"
+    style=""
   >
     <div
-      class="ad-slot ad-slot-empty banner-sizeId"
-      data-testid="ad-slot"
-      style=""
-    >
-      <div
-        data-testid="adslot-test"
-        role="button"
-      />
-    </div>
+      data-testid="adslot-test"
+      role="button"
+    />
   </div>
 </DocumentFragment>
 `;
 
 exports[`Banner render component AdSlot loading should render AdSlot 1`] = `
 <DocumentFragment>
-  <div
-    class="banner  banner-loading"
-  >
-    <style>
-      @media(min-width:320px){.banner-sizeId{min-height:100px;}
+  <style>
+    @media(min-width:320px){.banner-sizeId{min-height:100px;}
 @media(min-width:728px){.banner-sizeId{min-height:100px;}
 @media(min-width:970px){.banner-sizeId{min-height:250px;}
-    </style>
+  </style>
+  <div
+    class="ad-slot ad-slot-loading banner-sizeId"
+  >
     <div
-      class="ad-slot ad-slot-loading banner-sizeId"
-      data-testid="ad-slot"
-    >
-      <div
-        data-testid="adslot-test"
-        role="button"
-      />
-    </div>
+      data-testid="adslot-test"
+      role="button"
+    />
   </div>
 </DocumentFragment>
 `;
 
 exports[`Banner render component should not render AdSlot if shouldShowBanner=false but should render styles and wrapper 1`] = `
 <DocumentFragment>
-  <div
-    class="banner  banner-loading"
-  >
-    <style>
-      @media(min-width:320px){.banner-sizeId{min-height:100px;}
+  <style>
+    @media(min-width:320px){.banner-sizeId{min-height:100px;}
 @media(min-width:728px){.banner-sizeId{min-height:100px;}
 @media(min-width:970px){.banner-sizeId{min-height:250px;}
-    </style>
-    <div
-      class="ad-slot ad-slot-loading banner-sizeId"
-      data-testid="ad-slot"
-    />
-  </div>
+  </style>
+  <div
+    class="ad-slot ad-slot-loading banner-sizeId"
+  />
 </DocumentFragment>
 `;

package/tests/unit/src/components/Banner/__snapshots__/BannerRender.test.js.snap

@@ -2,14 +2,9 @@
 
 exports[`Banner render component should render 1`] = `
 <DocumentFragment>
+  <style />
   <div
-    class="banner  banner-loading"
-  >
-    <style />
-    <div
-      class="ad-slot ad-slot-loading banner-sizeId"
-      data-testid="ad-slot"
-    />
-  </div>
+    class="ad-slot ad-slot-loading banner-sizeId"
+  />
 </DocumentFragment>
 `;

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/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();
-  });
-});