@blaze-cms/react-page-builder 0.144.0-core-styles.0 → 0.145.0-alpha.0

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

@@ -32,10 +32,15 @@ const separateValues = (propsToDisplay, loopProps, data) => {
   return [regularValues, loopValues];
 };
 
-const buildLoopPropsContent = (loopProps = [], propsToDisplay = [], limit = 0, data = {}) => {
+const buildLoopPropsContent = (
+  loopProps = [],
+  propsToDisplay = [],
+  limit = 0,
+  data = {},
+  isSlider = false
+) => {
   const loopPropsWithContent = [];
   const [regularValues, loopValues] = separateValues(propsToDisplay, loopProps, data);
-
   const loopLimit = getLoopPropsLimit(loopValues, limit);
 
   for (let i = 0; i < loopLimit; i += 1) {
@@ -57,7 +62,7 @@ const buildLoopPropsContent = (loopProps = [], propsToDisplay = [], limit = 0, d
     ).filter(Boolean);
     loopPropsWithContent.push(propsArray);
   }
-
+  if (isSlider) return loopPropsWithContent;
   return flatten(loopPropsWithContent);
 };
 

package/src/components/DateTime/DateTime.js

@@ -11,11 +11,11 @@ const DateTime = ({ format, customFormat, modifier }) => {
 
   if (!dateFormat) return null;
 
-  const formattedDate = dayjs().format(dateFormat);
+  const formatedDate = dayjs().format(dateFormat);
 
   return (
     <Wrapper className="date" modifiers={modifier}>
-      {formattedDate}
+      {formatedDate}
     </Wrapper>
   );
 };
@@ -27,8 +27,8 @@ DateTime.propTypes = {
 };
 
 DateTime.defaultProps = {
-  customFormat: '',
-  modifier: null
+  modifier: null,
+  customFormat: ''
 };
 
 export default DateTime;

package/src/components/List/ListRender.js

@@ -3,7 +3,6 @@ import { useQuery } from '@apollo/client';
 import PropTypes from 'prop-types';
 import ListPagination from './components/Pagination';
 import ListHeader from './components/Header';
-import { sortResponseData } from '../../helpers';
 import { LOAD_MORE } from '../../constants';
 import { useAppSyncEventHook } from '../../hooks';
 import { buildQueryBooster } from './helpers';
@@ -46,9 +45,9 @@ const ListRender = props => {
 
   const listData = data[actionKey].results;
   const listTotal = data[actionKey].total;
-  const orderedListData = sortResponseData(listData, itemsToDisplay);
-  if (!orderedListData || !orderedListData.length) return null;
-  const { length: currentListLength } = orderedListData;
+
+  if (!listData || !listData.length) return null;
+  const { length: currentListLength } = listData;
   const currentPage = Math.ceil((initialOffset + currentListLength) / itemsPerPageToUse);
   const totalDisplay = limitToUse && listTotal > limitToUse ? limitToUse : listTotal;
 
@@ -60,7 +59,7 @@ const ListRender = props => {
         <div className="list_total_results w-full text-left p-4">Total results: {totalDisplay}</div>
       )}
       <ListComponent
-        orderedListData={orderedListData}
+        orderedListData={listData}
         isInfinite={isInfinite}
         initialOffset={initialOffset}
         actionKey={actionKey}

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

@@ -7,7 +7,7 @@ const getSortProps = ({
   isTextSearchFilterApplied
 }) => {
   const updatedSortProperties = [...sortProperties];
-  if (!querySort && !sortProperties.length) {
+  if (!querySort && !sortProperties.length && defaultSortBy && defaultSortBy.length) {
     updatedSortProperties.unshift({ sort: defaultSort, propsToDisplay: defaultSortBy });
   }
   if (isTextSearchFilterApplied) updatedSortProperties.unshift({ isScore: true });

package/src/components/SearchFilter/SearchFilter/SearchFilter.js

@@ -193,8 +193,6 @@ const SearchFilter = ({
               </>
             )}
 
-            <br />
-
             {!displaySearchFilter && (
               <button className="button button--full-width" type="submit">
                 {SEARCH}

package/src/helpers/build-inherited-filters.js

@@ -50,8 +50,6 @@ const buildInheritedFilters = (
       shouldIgnoreFilter
     } = getFilterProps(filter, currentSchema, filterEntitySchema);
 
-    if (filterName === ID) return;
-
     const relationData = getRelationData(entityData, relationName, relationForeignKeys);
     if (
       (currentEntityId === entityName && isFilterEntitysId(filterName, currentEntityId)) ||
@@ -70,14 +68,16 @@ const buildInheritedFilters = (
         isDataArray,
         arrayHasData,
         relationData,
-        relationName
+        filterName === ID ? filterName : relationName
       );
       relationFilters.push(...filtersNoRelation);
     }
 
     if (arrayHasData) {
       const filterValues = relationData.reduce((acc, relationValue) => {
-        if (relationValue[relationProp]) acc.push(`${filterName}/${relationValue[relationProp]}`);
+        const filterNameToUse = filterName === ID ? 'ids' : filterName;
+        if (relationValue[relationProp])
+          acc.push(`${filterNameToUse}/${relationValue[relationProp]}`);
         return acc;
       }, []);
       relationFilters.push(...filterValues);

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/src/helpers/get-filter-props.js

@@ -1,4 +1,5 @@
 import getFilterRelationKeys from './get-filter-relation-keys';
+import { ID } from '../constants';
 
 const getFilterLocalKeys = (relationName, relations) => {
   const { entityIdentifier } =
@@ -23,7 +24,17 @@ const getFilterProps = (
   { relations: filterEntityRelations = [], identifier: filteryEntityId } = {}
 ) => {
   const [filterName] = filter.split('/');
-  const [relationName, relationProp] = filterName.split('.');
+  let [relationName, relationProp] = filterName.split('.');
+
+  if (filterName === ID) {
+    const idRelation = currentEntityRelations.find(
+      ({ entityIdentifier }) => entityIdentifier === filteryEntityId
+    );
+    if (idRelation) {
+      relationName = idRelation.foreignKey;
+    }
+  }
+
   const hasProperty = !!(
     currentEntityProperties[filterName] || currentEntityDynamicProperties[filterName]
   );

package/src/hooks/helpers/getVariant.js

@@ -5,6 +5,7 @@ export default function getVariant(settings) {
   if (!variant) return [null, {}];
 
   const { VariantComponent, getSettings } = variantHandler.get(variant) || {};
+
   const variantSettings =
     !!getSettings && typeof getSettings === 'function' ? getSettings(settings) : settings;
 

package/src/variants/SlideSummary/SlideSummary.js

@@ -0,0 +1,20 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import CarouselWrapper from '../../components/CarouselWrapper';
+
+const SlideSummary = ({ children, ...otherProps }) => (
+  <CarouselWrapper
+    {...otherProps}
+    modifier="slide-summary"
+    pauseScrollOnHover
+    enableAutoScroll
+    autoScrollTimer={3500}>
+    {children}
+  </CarouselWrapper>
+);
+
+SlideSummary.propTypes = {
+  children: PropTypes.object.isRequired
+};
+
+export default SlideSummary;

package/src/variants/SlideSummary/index.js

@@ -0,0 +1,11 @@
+import dynamic from 'next/dynamic';
+
+const SlideSummary = {
+  getSettings: componentSettings => ({
+    ...componentSettings
+  }),
+  VariantComponent: dynamic(() =>
+    import(/* webpackChunkName: "blazePbVariantSlideSummary" */ './SlideSummary')
+  )
+};
+export default SlideSummary;

package/src/variants/index.js

@@ -4,6 +4,7 @@ import longformGallery from './LongformGallery';
 import longformRow from './LongformRow';
 import parallaxImageTextRight from './ParallaxImageTextRight';
 import thumbnailCarousel from './ThumbnailCarousel';
+import slideSummary from './SlideSummary';
 
 export default {
   heroImage,
@@ -11,5 +12,6 @@ export default {
   longformGallery,
   longformRow,
   parallaxImageTextRight,
-  thumbnailCarousel
+  thumbnailCarousel,
+  slideSummary
 };

package/tests/helpers/mocks.js

@@ -78,6 +78,19 @@ const MOCKED_SCHEMA_FOR_FILTERS = {
       searchable: true,
       onDeleteAction: 'unset'
     },
+    {
+      relationType: 'hasMany',
+      entityIdentifier: 'page',
+      foreignKey: 'relatedPageIds',
+      localField: 'relatedPages',
+      description: 'Related pages',
+      label: 'Related Profiles',
+      showInForm: true,
+      displayFormName: 'Related Profiles',
+      formPriority: 3.11,
+      formFieldType: 'relationStandard',
+      searchable: false
+    },
     {
       relationType: 'hasMany',
       entityIdentifier: 'profile',
@@ -1976,23 +1989,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([]);
+  });
 });

package/tests/unit/src/components/SearchFilter/SearchFilter/__snapshots__/SearchFilter.test.js.snap

@@ -46,7 +46,6 @@ exports[`SearchFilter component should render without throwing error and match s
       <div
         class="filter__wrapper filter__wrapper--search-refine"
       >
-        <br />
         <button
           class="button button--full-width"
           type="submit"
@@ -224,7 +223,6 @@ exports[`SearchFilter component when groupAfterMobile = 0 and groupAfterDesktop
             </button>
           </div>
         </div>
-        <br />
         <button
           class="button button--full-width"
           type="submit"
@@ -402,7 +400,6 @@ exports[`SearchFilter component when groupAfterMobile > 0 and groupAfterDesktop
             </button>
           </div>
         </div>
-        <br />
         <button
           class="button button--full-width"
           type="submit"
@@ -587,7 +584,6 @@ exports[`SearchFilter component when groupAfterMobile > 0 and groupAfterDesktop
             </button>
           </div>
         </div>
-        <br />
         <button
           class="button button--full-width"
           type="submit"
@@ -657,7 +653,6 @@ exports[`SearchFilter component when isCollapsedOnResponsive = false, displaySea
       <div
         class="filter__wrapper filter__wrapper--search-refine"
       >
-        <br />
         <button
           class="button button--full-width"
           type="submit"
@@ -744,9 +739,7 @@ exports[`SearchFilter component when isCollapsedOnResponsive = true, displaySear
       </div>
       <div
         class="filter__wrapper filter__wrapper--search-refine"
-      >
-        <br />
-      </div>
+      />
     </div>
     <div
       class="filter__refine filter__refine--mobile-open"

package/tests/unit/src/helpers/build-inherited-filters.test.js

@@ -13,11 +13,13 @@ const entityData = {
   yachts: [{ id: 'some' }],
   image: { name: 'image name' },
   tags: [{ name: 'tag1' }, { name: 'tag2' }],
-  brokers: [{ price: 1 }]
+  brokers: [{ price: 1 }],
+  relatedPageIds: ['related-page-id']
 };
 
 const filterByProperty = ['category.name/category'];
 const filterByPropertyMoreData = [
+  'id/page',
   'category.name/category',
   'image.name/image',
   'tags.name/tags',
@@ -84,6 +86,8 @@ describe('build inherited filters', () => {
 
   it('should return an array with filter set for more relations', () => {
     expect(relationFiltersMoreData).toEqual([
+      'id/page-id',
+      'id/related-page-id',
       'category.name/cat',
       'image.name/page-id',
       'image.name/image name',

package/tests/unit/src/helpers/get-filter-props.test.js

@@ -65,6 +65,15 @@ describe('getFilterProps function', () => {
     expect(dyanmicPropFilter).toHaveProperty('shouldIgnoreFilter', false);
   });
 
+  it('should return relation foriegnKey for matching relaiton entity for id propery', () => {
+    const dyanmicPropFilter = getFilterProps(
+      'id',
+      MOCKED_SCHEMA_FOR_FILTERS,
+      MOCKED_SCHEMA_FOR_FILTERS
+    );
+    expect(dyanmicPropFilter).toHaveProperty('relationName', 'relatedPageIds');
+  });
+
   // todo: add test case
   // it('should return relationForeignKeys array with values if it isnt a schema or relation prop', () => {
   //   expect(withRelationKeys.relationForeignKeys).toBeDefined();