@blaze-cms/react-page-builder 0.132.0 → 0.133.0-admin-updates.0

package/lib-es/utils/get-class-modifiers.js

@@ -1,6 +1,6 @@
 import _defineProperty from "@babel/runtime/helpers/defineProperty";
-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; }
-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; }
+function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 import { BUTTON, BUTTON_ICON, CLASS_MODIFIERS, ICON_BUTTON, LINK, CODE } from '../constants';
 import COMPONENTS_DEFAULT_VALUES from '../constants/componentsDefaultValues';
 const {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaze-cms/react-page-builder",
-  "version": "0.132.0",
+  "version": "0.133.0-admin-updates.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.131.0",
-    "@blaze-cms/core-errors": "^0.131.0",
-    "@blaze-cms/core-errors-ui": "^0.131.0",
+    "@blaze-cms/core-auth-ui": "0.133.0-admin-updates.0",
+    "@blaze-cms/core-errors": "0.133.0-admin-updates.0",
+    "@blaze-cms/core-errors-ui": "0.133.0-admin-updates.0",
     "@blaze-cms/image-cdn-react": "0.3.0-alpha.5",
-    "@blaze-cms/nextjs-components": "^0.131.0",
-    "@blaze-cms/plugin-search-ui": "^0.132.0",
-    "@blaze-cms/setup-ui": "^0.131.0",
-    "@blaze-cms/utils": "^0.131.0",
-    "@blaze-cms/utils-handlebars": "^0.131.0",
+    "@blaze-cms/nextjs-components": "0.133.0-admin-updates.0",
+    "@blaze-cms/plugin-search-ui": "0.133.0-admin-updates.0",
+    "@blaze-cms/setup-ui": "0.133.0-admin-updates.0",
+    "@blaze-cms/utils": "0.133.0-admin-updates.0",
+    "@blaze-cms/utils-handlebars": "0.133.0-admin-updates.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": "d1a616228de279b4945be221c6175e297ac8ce94"
+  "gitHead": "ddc99c4cd4e1858a1985f581d2c010b31815ba82"
 }

package/src/components/Card/helpers/filter-query-setup.js

@@ -39,14 +39,13 @@ const filterQuerySetup = ({
   const { limit: settingsLimit } = variableProps;
   const limit = settingsLimit || DEFAULT_LIMIT; // all falsey should use default
   const requestLimit = entitySameAsCurrentItemEntity ? Number(limit) + 1 : limit;
-  const variables = getGenericRenderVariables(
-    filterEntityRelations,
-    { ...variableProps, limit: requestLimit },
+  const variables = getGenericRenderVariables({
+    relations: filterEntityRelations,
+    filterProps: { ...variableProps, limit: requestLimit },
     stringProps,
     rawQuery,
-    false,
     useRandomSort
-  );
+  });
 
   return { variables, limit };
 };

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

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

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

@@ -1,6 +1,9 @@
-const getLinkToPublishedContent = (key = '', props = {}) => {
+const getLinkToPublishedContent = (key = '', props = {}, currentValue = null) => {
   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/src/components/List/ListBuilder.js

@@ -27,7 +27,6 @@ const ListBuilder = props => {
     inheritedFilters,
     paginationType,
     entities,
-    isTextSearchFilterApplied,
     parent: { itemId },
     itemsPerPage,
     itemsToDisplay,
@@ -86,37 +85,42 @@ const ListBuilder = props => {
 
   const { relations = [] } = filterEntitySchema;
   const stringProps = getStringTypeProps(entity, relations, Object.values(requiredSchema));
-
-  const azRawQuery = buildRawQuery(
-    docTypes,
+  const filterData = {
+    filterValues,
+    filterOperator,
+    relations,
+    stringProps
+  };
+  const azRawQuery = buildRawQuery({
+    docType: docTypes,
     operator,
     searchValues,
-    {
-      filterValues,
-      filterOperator,
-      relations,
-      stringProps
-    },
-    itemId,
-    itemsToDisplayToUse,
-    shouldApplyDefaultSort,
-    { shouldReturnAggs: true, isAZ }
-  );
+    filterData,
+    id: itemId,
+    itemsToDisplay: itemsToDisplayToUse,
+    shouldApplySort: shouldApplyDefaultSort,
+    azOptions: { shouldReturnAggs: true, isAZ, sortProperties }
+  });
 
-  const azVariables = getGenericRenderVariables(
+  const filterProps = {
+    ...props,
+    limit: itemsPerPageToUse,
+    offset: initialOffset,
+    sort,
+    sortby,
+    sortProperties
+  };
+
+  const propsForVariables = {
     relations,
-    {
-      ...props,
-      limit: itemsPerPageToUse,
-      offset: initialOffset,
-      sort,
-      sortby,
-      sortProperties
-    },
-    stringProps,
-    azRawQuery,
-    isTextSearchFilterApplied
-  );
+    filterProps,
+    stringProps
+  };
+
+  const azVariables = getGenericRenderVariables({
+    ...propsForVariables,
+    rawQuery: azRawQuery
+  });
 
   const azAction = getSearchPublishedContent(RAW_RESULTS);
   const { data, error, loading } = useQuery(azAction, {
@@ -129,37 +133,25 @@ const ListBuilder = props => {
   const listAggregations = isAZ ? sortAggs(data) : [];
   const updatedAggregations = buildAzAggregations(listAggregations);
 
-  const rawQuery = buildRawQuery(
-    docTypes,
+  const rawQuery = buildRawQuery({
+    docType: docTypes,
     operator,
     searchValues,
-    {
-      filterValues,
-      filterOperator,
-      relations,
-      stringProps,
+    filterData: {
+      ...filterData,
       azFilter
     },
-    itemId,
-    itemsToDisplayToUse,
-    shouldApplyDefaultSort,
-    { shouldReturnAggs: false, isAZ }
-  );
+    id: itemId,
+    itemsToDisplay: itemsToDisplayToUse,
+    shouldApplySort: shouldApplyDefaultSort,
+    azOptions: { shouldReturnAggs: false, isAZ, sortProperties },
+    sortProperties
+  });
 
-  const variables = getGenericRenderVariables(
-    relations,
-    {
-      ...props,
-      limit: itemsPerPageToUse,
-      offset: initialOffset,
-      sort,
-      sortby,
-      sortProperties
-    },
-    stringProps,
-    rawQuery,
-    isTextSearchFilterApplied
-  );
+  const variables = getGenericRenderVariables({
+    ...propsForVariables,
+    rawQuery
+  });
 
   return (
     <ListRender
@@ -187,7 +179,6 @@ ListBuilder.propTypes = {
   mainSchemas: PropTypes.object.isRequired,
   isCard: PropTypes.bool.isRequired,
   isAZ: PropTypes.bool.isRequired,
-  isTextSearchFilterApplied: PropTypes.bool.isRequired,
   parent: PropTypes.object.isRequired,
   itemsPerPage: PropTypes.number.isRequired,
   paginationIndex: PropTypes.number.isRequired,

package/src/components/List/ListFactory.js

@@ -58,13 +58,21 @@ const ListFactory = props => {
   );
   const { query, url, query: { itemListId: queryItemListId } = {} } = parseUrl(parsedQuery);
   const updatedQuery = getListQuery(query, hasListSpecificFilters, name);
+  const isTextSearchFilterApplied = !!(
+    updatedQuery.search_term &&
+    searchFilter &&
+    getSearchFilterType(searchFilter, TEXT_SEARCH).length
+  );
+
   const { sort: querySort, sortby: querySortBy } = updatedQuery;
+
   const { sortbyFilters, updatedSortProperties } = getSortProps({
     querySort,
     sortProperties,
     defaultSort,
     querySortBy,
-    defaultSortBy
+    defaultSortBy,
+    isTextSearchFilterApplied
   });
 
   const itemListId = getItemListId(itemListName, queryItemListId);
@@ -135,11 +143,6 @@ const ListFactory = props => {
     ? buildSearchValuesText(textFilter, updatedQuery, name)
     : [];
   const { valuesAnd, valuesOr } = getQueryFilters(searchFilter, updatedQuery, name);
-  const isTextSearchFilterApplied = !!(
-    updatedQuery.search_term &&
-    searchFilter &&
-    getSearchFilterType(searchFilter, TEXT_SEARCH).length
-  );
 
   const searchValues = {
     searchValuesText: valuesText,
@@ -164,7 +167,6 @@ const ListFactory = props => {
     currentSchema,
     omitWrappers,
     operator,
-    isTextSearchFilterApplied,
     paginationIndex,
     entityData,
     inheritedFilters,

package/src/components/List/helpers/get-list-query.js

@@ -1,9 +1,11 @@
+import { AZ_QUERY_CONST, PB_QUERY_CONST } from '../../../constants';
 import stripQueryKey from './strip-query-key';
 
 const getListQuery = (query, hasListSpecificFilters, name) => {
   const updatedQuery = {};
-  const listKey = `pb[${name}]`;
+  const listKey = `${PB_QUERY_CONST}[${name}]`;
   const paginationKey = `${listKey}[page]`;
+  const azFilterKey = `${listKey}${AZ_QUERY_CONST}`;
   const sortKey = `${listKey}[sort]`;
   const sortByKey = `${listKey}[sortby]`;
 
@@ -16,8 +18,9 @@ const getListQuery = (query, hasListSpecificFilters, name) => {
       const strippedKey = stripQueryKey(queryKey, listKey, paginationKey);
       if (isListKey) updatedQuery[strippedKey] = decodedQueryValue;
     } else {
-      if (queryKey.indexOf('pb[') === -1) updatedQuery[queryKey] = decodedQueryValue;
+      if (queryKey.indexOf(`${PB_QUERY_CONST}[`) === -1) updatedQuery[queryKey] = decodedQueryValue;
       if (queryKey.indexOf(paginationKey) !== -1) updatedQuery[queryKey] = decodedQueryValue;
+      if (queryKey.indexOf(azFilterKey) !== -1) updatedQuery[queryKey] = decodedQueryValue;
     }
   });
   updatedQuery.sort = query[sortKey] || query.sort;

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

@@ -1,10 +1,18 @@
-const getSortProps = ({ querySort, sortProperties, defaultSort, querySortBy, defaultSortBy }) => {
+const getSortProps = ({
+  querySort,
+  sortProperties,
+  defaultSort,
+  querySortBy,
+  defaultSortBy,
+  isTextSearchFilterApplied
+}) => {
   const sort = querySort || (sortProperties.length ? null : defaultSort);
   let sortby = null;
   if (querySortBy) sortby = [querySortBy];
   else if (!sortProperties.length) sortby = defaultSortBy;
 
   const updatedSortProperties = [...sortProperties];
+  if (isTextSearchFilterApplied) updatedSortProperties.unshift({ isScore: true });
   if (sort) updatedSortProperties.unshift({ sort, propsToDisplay: sortby });
 
   const sortbyFilters = updatedSortProperties

package/src/constants/index.js

@@ -161,36 +161,7 @@ const AZ = [
   'Z'
 ];
 
-const AZ_AGGS = {
-  aggs: {
-    azCount: {
-      terms: {
-        script: "doc['name.keyword'].getValue().substring(0,1).toUpperCase()",
-        size: 500
-      }
-    }
-  },
-  sort: [{ 'name.keyword': 'asc' }]
-};
-const ALL_AZ_SORT = {
-  sort: [
-    {
-      _script: {
-        type: 'number',
-        script: {
-          lang: 'painless',
-          source:
-            "int charPos = params.letters.indexOf(doc['name.keyword'].value.substring(0,1).toUpperCase()); charPos > -1 ? charPos : 100",
-          params: {
-            letters: AZ
-          }
-        },
-        order: 'asc'
-      }
-    },
-    { 'name.keyword': 'asc' }
-  ]
-};
+const AZ_DEFAULT_PROP = 'name';
 
 const SCROLL_OFFSET = process.env.BLAZE_SCROLL_OFFSET || 50;
 
@@ -302,8 +273,7 @@ export {
   PREHEADER_PROP,
   HEADLINE_PROP,
   AZ_QUERY_CONST,
-  AZ_AGGS,
-  ALL_AZ_SORT,
+  AZ_DEFAULT_PROP,
   AZ,
   SCROLL_OFFSET,
   ANCHOR_TAG,

package/src/helpers/build-az-filter.js

@@ -1,9 +1,10 @@
-const buildAzFilter = (azFilter, mustFilters) => {
+const buildAzFilter = (azFilter, mustFilters, azSortProperty) => {
   if (!azFilter) return;
   const filterValue = azFilter === '0' ? '[^a-zA-Z]' : azFilter;
+  const azSortProp = `${azSortProperty}.keyword`;
   const azQuery = {
     regexp: {
-      'name.keyword': {
+      [azSortProp]: {
         value: `${filterValue}.*`,
         case_insensitive: true
       }

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

@@ -2,9 +2,9 @@ import buildRawQueryBase from './build-raw-query-base';
 import getItemsToDisplayIds from './get-items-to-display-ids';
 import getExtraAzBits from './get-extra-az-bits';
 import buildAzFilter from './build-az-filter';
-import { AND_OPERATOR } from '../constants';
+import { AND_OPERATOR, AZ_DEFAULT_PROP } from '../constants';
 
-const buildRawQuery = (
+const buildRawQuery = ({
   docType,
   operator,
   searchValues,
@@ -13,15 +13,17 @@ const buildRawQuery = (
   itemsToDisplay,
   shouldApplySort,
   azOptions
-) => {
+}) => {
   const {
     searchValuesText,
     searchValuesCheckboxSelectRange,
     searchValuesCheckboxOr
   } = searchValues;
-
   const { filterValues, filterOperator, relations, stringProps, azFilter } = filterData;
-  const { shouldReturnAggs, isAZ } = azOptions || {};
+  const { isAZ, sortProperties = [] } = azOptions || {};
+  const [{ propsToDisplay: [azSortProp] } = { propsToDisplay: [] }] = sortProperties;
+  const azSortProperty = azSortProp || AZ_DEFAULT_PROP;
+
   const searchValuesTextCheckboxSelectJoined =
     operator === AND_OPERATOR ? [...searchValuesText, ...searchValuesCheckboxSelectRange] : [];
   let searchValuesTextCheckboxOr = searchValuesText;
@@ -50,7 +52,7 @@ const buildRawQuery = (
     }
   ];
 
-  buildAzFilter(azFilter, mustValues);
+  buildAzFilter(azFilter, mustValues, azSortProperty);
 
   const query = {
     bool: {
@@ -58,7 +60,7 @@ const buildRawQuery = (
       ...buildRawQueryBase({ docType, id, filterValues, filterOperator, relations, stringProps })
     }
   };
-  const azQueryBits = getExtraAzBits(shouldReturnAggs, isAZ, azFilter);
+  const azQueryBits = getExtraAzBits({ ...azOptions, azSortProperty, azFilter });
 
   if (itemsToDisplay && itemsToDisplay.length) {
     const itemsToDisplayIds = getItemsToDisplayIds(itemsToDisplay);

package/src/helpers/build-sort-values.js

@@ -0,0 +1,32 @@
+import getSortbyFieldName from './get-sort-by-field-name';
+
+const buildAzSort = (sortFilters, relations, stringProps) => {
+  const sortValues = {};
+  sortFilters.forEach(({ sort, propsToDisplay }) => {
+    if (!sort) return;
+    const sortFieldName = getSortbyFieldName(relations, propsToDisplay, stringProps);
+    if (sortFieldName) sortValues[sortFieldName] = sort.toLowerCase();
+  });
+
+  return sortValues;
+};
+
+const buildSortValues = (sortFilters, relations, stringProps, useSortObject) => {
+  if (!sortFilters || !sortFilters.length) return useSortObject ? null : { sort: [] };
+  if (useSortObject) return buildAzSort(sortFilters, relations, stringProps);
+
+  const sortValues = sortFilters
+    .map(({ sort, propsToDisplay, isScore }) => {
+      if (isScore) return '_score';
+      if (!sort) return null;
+
+      const sortFieldName = getSortbyFieldName(relations, propsToDisplay, stringProps);
+      return sortFieldName ? `${sortFieldName}:${sort.toLowerCase()}` : null;
+    })
+    .filter(Boolean)
+    .join(',');
+
+  return { sort: sortValues };
+};
+
+export default buildSortValues;

package/src/helpers/get-extra-az-bits.js

@@ -1,7 +1,45 @@
-import { AZ_AGGS, ALL_AZ_SORT } from '../constants';
+import { AZ, AZ_DEFAULT_PROP } from '../constants';
 
-const getExtraAzBits = (shouldReturnAggs, isAZ, azFilter) => {
+function getAzArgs(azSortProperty) {
+  const azProp = `${azSortProperty}.keyword`;
+
+  const AZ_AGGS = {
+    aggs: {
+      azCount: {
+        terms: {
+          script: `doc['${azProp}'].getValue().substring(0,1).toUpperCase()`,
+          size: 500
+        }
+      }
+    },
+    sort: [{ [azProp]: 'asc' }]
+  };
+  const ALL_AZ_SORT = {
+    sort: [
+      {
+        _script: {
+          type: 'number',
+          script: {
+            lang: 'painless',
+            source: `int charPos = params.letters.indexOf(doc['${azProp}'].value.substring(0,1).toUpperCase()); charPos > -1 ? charPos : 100`,
+            params: {
+              letters: AZ
+            }
+          },
+          order: 'asc'
+        }
+      },
+      { [azProp]: 'asc' }
+    ]
+  };
+
+  return { ALL_AZ_SORT, AZ_AGGS };
+}
+
+const getExtraAzBits = ({ shouldReturnAggs, isAZ, azSortProperty = AZ_DEFAULT_PROP, azFilter }) => {
   if (!isAZ || (isAZ && azFilter)) return {};
+
+  const { AZ_AGGS, ALL_AZ_SORT } = getAzArgs(azSortProperty);
   if (shouldReturnAggs) return AZ_AGGS;
 
   return ALL_AZ_SORT;

package/src/helpers/get-generic-render-variables.js

@@ -1,42 +1,25 @@
-import getSortbyFieldName from './get-sort-by-field-name';
 import { DEFAULT_LIMIT, DEFAULT_OFFSET } from '../constants';
+import buildSortValues from './build-sort-values';
 
-const buildSortValues = (sortFilters, relations, stringProps) => {
-  if (!sortFilters || !sortFilters.length) return { sort: [] };
-
-  const sortValues = sortFilters
-    .map(({ sort, propsToDisplay }) => {
-      if (!sort) return null;
-
-      const sortFieldName = getSortbyFieldName(relations, propsToDisplay, stringProps);
-      return sortFieldName ? `${sortFieldName}:${sort.toLowerCase()}` : null;
-    })
-    .filter(Boolean)
-    .join(',');
-
-  return { sort: sortValues };
-};
-const getCorrectSort = (relations, filterProps, stringProps, isTextSearchApplied) => {
-  if (isTextSearchApplied) {
-    return {};
-  }
+const getCorrectSort = (relations, filterProps, stringProps, useSortObject) => {
   const { sort, sortby, sortProperties = [] } = filterProps;
 
   return buildSortValues(
     [{ sort, propsToDisplay: sortby }, ...sortProperties],
     relations,
-    stringProps
+    stringProps,
+    useSortObject
   );
 };
 
-const getGenericRenderVariables = (
+const getGenericRenderVariables = ({
   relations,
   filterProps = {},
   stringProps = [],
   rawQuery = {},
-  isTextSearchFilterApplied = false,
   useRandomSort = false
-) => {
+}) => {
+  const rawQueryCopy = { ...rawQuery };
   const { limit = DEFAULT_LIMIT, offset } = filterProps;
   const limitToUse = Number(limit || DEFAULT_LIMIT);
   const offsetToUse = Number(offset || DEFAULT_OFFSET);
@@ -45,7 +28,7 @@ const getGenericRenderVariables = (
     const rawQueryStringified = JSON.stringify({
       query: {
         function_score: {
-          query: rawQuery && rawQuery.query ? rawQuery.query : rawQuery,
+          query: rawQueryCopy && rawQueryCopy.query ? rawQueryCopy.query : rawQueryCopy,
           random_score: {},
           boost_mode: 'replace'
         }
@@ -59,13 +42,23 @@ const getGenericRenderVariables = (
     };
   }
 
-  const sort = getCorrectSort(relations, filterProps, stringProps, isTextSearchFilterApplied);
+  const sort = getCorrectSort(relations, filterProps, stringProps, !!rawQueryCopy.sort);
+
+  if (rawQueryCopy.sort && sort) {
+    rawQueryCopy.sort = [...rawQueryCopy.sort, sort];
+
+    return {
+      limit: limitToUse,
+      offset: offsetToUse,
+      rawQueryStringified: JSON.stringify(rawQueryCopy)
+    };
+  }
 
   return {
     limit: limitToUse,
     offset: offsetToUse,
     ...sort,
-    rawQueryStringified: JSON.stringify(rawQuery)
+    rawQueryStringified: JSON.stringify(rawQueryCopy)
   };
 };
 

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

@@ -90,4 +90,45 @@ 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,4 +38,25 @@ 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);
+  });
 });