@blaze-cms/react-page-builder 0.146.0-node18-tooltips.33 → 0.146.0-node18-tooltips.34

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [0.146.0-node18-tooltips.34](https://github.com/thebyte9/blaze/compare/v0.146.0-node18-tooltips.33...v0.146.0-node18-tooltips.34) (2025-12-17)
+
+
+### Bug Fixes
+
+* carousel and relation image queries should handle root level properties ([#5052](https://github.com/thebyte9/blaze/issues/5052)) ([4307f5a](https://github.com/thebyte9/blaze/commit/4307f5a67e6de4ccf1ce6bab049c852f11650f72))
+
+
+
+
+
 # [0.146.0-node18-tooltips.33](https://github.com/thebyte9/blaze/compare/v0.146.0-node18-tooltips.32...v0.146.0-node18-tooltips.33) (2025-12-15)
 
 

package/lib/helpers/get-image-ids.js

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports["default"] = void 0;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 require("core-js/modules/es.array.filter.js");
 require("core-js/modules/es.array.is-array.js");
 require("core-js/modules/es.array.map.js");
@@ -16,6 +17,7 @@ var _lodash = _interopRequireDefault(require("lodash.isplainobject"));
 var getIdsFromArray = function getIdsFromArray(relationImageData, relationProp, imageId) {
   if (!relationImageData.length) return [imageId];
   return relationImageData.map(function (image) {
+    if ((0, _typeof2["default"])(image) !== 'object') return image;
     if (!Object.keys(image).length) return '';
     return image[relationProp];
   }).filter(Boolean);
@@ -35,6 +37,7 @@ var getImageIds = function getImageIds(imageRelation, relationData, imageId) {
     if ((0, _lodash["default"])(relationImageData) && Object.keys(relationImageData).length) {
       return Array.isArray(relationImageData[relationProp]) ? relationImageData[relationProp] : [relationImageData[relationProp]];
     }
+    if (relationImageData) return [relationImageData];
   }
   return imageIdArray;
 };

package/lib/helpers/get-image-ids.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-image-ids.js","names":["_lodash","_interopRequireDefault","require","getIdsFromArray","relationImageData","relationProp","imageId","length","map","image","Object","keys","filter","Boolean","getImageIds","imageRelation","relationData","imageIdArray","entityData","_imageRelation","_slicedToArray2","imageData","_imageData$split","split","_imageData$split2","relationName","Array","isArray","isPlainObject","_default","exports"],"sources":["../../src/helpers/get-image-ids.js"],"sourcesContent":["import isPlainObject from 'lodash.isplainobject';\n\nconst getIdsFromArray = (relationImageData, relationProp, imageId) => {\n  if (!relationImageData.length) return [imageId];\n  return relationImageData\n    .map(image => {\n      if (!Object.keys(image).length) return '';\n      return image[relationProp];\n    })\n    .filter(Boolean);\n};\n\nconst getImageIds = (imageRelation, relationData, imageId) => {\n  const imageIdArray = imageId ? [imageId] : [];\n  if (relationData && relationData.entityData) {\n    const [imageData] = imageRelation;\n    const [relationName, relationProp] = imageData.split('.');\n    const relationImageData = relationData.entityData[relationName];\n\n    if (!relationImageData) return imageIdArray;\n\n    if (Array.isArray(relationImageData))\n      return getIdsFromArray(relationImageData, relationProp, imageId);\n\n    if (isPlainObject(relationImageData) && Object.keys(relationImageData).length) {\n      return Array.isArray(relationImageData[relationProp])\n        ? relationImageData[relationProp]\n        : [relationImageData[relationProp]];\n    }\n  }\n\n  return imageIdArray;\n};\n\nexport default getImageIds;\n"],"mappings":";;;;;;;;;;;;;;AAAA,IAAAA,OAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAMC,eAAe,GAAG,SAAlBA,eAAeA,CAAIC,iBAAiB,EAAEC,YAAY,EAAEC,OAAO,EAAK;EACpE,IAAI,CAACF,iBAAiB,CAACG,MAAM,EAAE,OAAO,CAACD,OAAO,CAAC;EAC/C,OAAOF,iBAAiB,CACrBI,GAAG,CAAC,UAAAC,KAAK,EAAI;IACZ,IAAI,CAACC,MAAM,CAACC,IAAI,CAACF,KAAK,CAAC,CAACF,MAAM,EAAE,OAAO,EAAE;IACzC,OAAOE,KAAK,CAACJ,YAAY,CAAC;EAC5B,CAAC,CAAC,CACDO,MAAM,CAACC,OAAO,CAAC;AACpB,CAAC;AAED,IAAMC,WAAW,GAAG,SAAdA,WAAWA,CAAIC,aAAa,EAAEC,YAAY,EAAEV,OAAO,EAAK;EAC5D,IAAMW,YAAY,GAAGX,OAAO,GAAG,CAACA,OAAO,CAAC,GAAG,EAAE;EAC7C,IAAIU,YAAY,IAAIA,YAAY,CAACE,UAAU,EAAE;IAC3C,IAAAC,cAAA,OAAAC,eAAA,aAAoBL,aAAa;MAA1BM,SAAS,GAAAF,cAAA;IAChB,IAAAG,gBAAA,GAAqCD,SAAS,CAACE,KAAK,CAAC,GAAG,CAAC;MAAAC,iBAAA,OAAAJ,eAAA,aAAAE,gBAAA;MAAlDG,YAAY,GAAAD,iBAAA;MAAEnB,YAAY,GAAAmB,iBAAA;IACjC,IAAMpB,iBAAiB,GAAGY,YAAY,CAACE,UAAU,CAACO,YAAY,CAAC;IAE/D,IAAI,CAACrB,iBAAiB,EAAE,OAAOa,YAAY;IAE3C,IAAIS,KAAK,CAACC,OAAO,CAACvB,iBAAiB,CAAC,EAClC,OAAOD,eAAe,CAACC,iBAAiB,EAAEC,YAAY,EAAEC,OAAO,CAAC;IAElE,IAAI,IAAAsB,kBAAa,EAACxB,iBAAiB,CAAC,IAAIM,MAAM,CAACC,IAAI,CAACP,iBAAiB,CAAC,CAACG,MAAM,EAAE;MAC7E,OAAOmB,KAAK,CAACC,OAAO,CAACvB,iBAAiB,CAACC,YAAY,CAAC,CAAC,GACjDD,iBAAiB,CAACC,YAAY,CAAC,GAC/B,CAACD,iBAAiB,CAACC,YAAY,CAAC,CAAC;IACvC;EACF;EAEA,OAAOY,YAAY;AACrB,CAAC;AAAC,IAAAY,QAAA,GAAAC,OAAA,cAEahB,WAAW","ignoreList":[]}
+{"version":3,"file":"get-image-ids.js","names":["_lodash","_interopRequireDefault","require","getIdsFromArray","relationImageData","relationProp","imageId","length","map","image","_typeof2","Object","keys","filter","Boolean","getImageIds","imageRelation","relationData","imageIdArray","entityData","_imageRelation","_slicedToArray2","imageData","_imageData$split","split","_imageData$split2","relationName","Array","isArray","isPlainObject","_default","exports"],"sources":["../../src/helpers/get-image-ids.js"],"sourcesContent":["import isPlainObject from 'lodash.isplainobject';\n\nconst getIdsFromArray = (relationImageData, relationProp, imageId) => {\n  if (!relationImageData.length) return [imageId];\n  return relationImageData\n    .map(image => {\n      if (typeof image !== 'object') return image;\n      if (!Object.keys(image).length) return '';\n      return image[relationProp];\n    })\n    .filter(Boolean);\n};\n\nconst getImageIds = (imageRelation, relationData, imageId) => {\n  const imageIdArray = imageId ? [imageId] : [];\n  if (relationData && relationData.entityData) {\n    const [imageData] = imageRelation;\n    const [relationName, relationProp] = imageData.split('.');\n    const relationImageData = relationData.entityData[relationName];\n\n    if (!relationImageData) return imageIdArray;\n\n    if (Array.isArray(relationImageData))\n      return getIdsFromArray(relationImageData, relationProp, imageId);\n\n    if (isPlainObject(relationImageData) && Object.keys(relationImageData).length) {\n      return Array.isArray(relationImageData[relationProp])\n        ? relationImageData[relationProp]\n        : [relationImageData[relationProp]];\n    }\n\n    if (relationImageData) return [relationImageData];\n  }\n\n  return imageIdArray;\n};\n\nexport default getImageIds;\n"],"mappings":";;;;;;;;;;;;;;;AAAA,IAAAA,OAAA,GAAAC,sBAAA,CAAAC,OAAA;AAEA,IAAMC,eAAe,GAAG,SAAlBA,eAAeA,CAAIC,iBAAiB,EAAEC,YAAY,EAAEC,OAAO,EAAK;EACpE,IAAI,CAACF,iBAAiB,CAACG,MAAM,EAAE,OAAO,CAACD,OAAO,CAAC;EAC/C,OAAOF,iBAAiB,CACrBI,GAAG,CAAC,UAAAC,KAAK,EAAI;IACZ,IAAI,IAAAC,QAAA,aAAOD,KAAK,MAAK,QAAQ,EAAE,OAAOA,KAAK;IAC3C,IAAI,CAACE,MAAM,CAACC,IAAI,CAACH,KAAK,CAAC,CAACF,MAAM,EAAE,OAAO,EAAE;IACzC,OAAOE,KAAK,CAACJ,YAAY,CAAC;EAC5B,CAAC,CAAC,CACDQ,MAAM,CAACC,OAAO,CAAC;AACpB,CAAC;AAED,IAAMC,WAAW,GAAG,SAAdA,WAAWA,CAAIC,aAAa,EAAEC,YAAY,EAAEX,OAAO,EAAK;EAC5D,IAAMY,YAAY,GAAGZ,OAAO,GAAG,CAACA,OAAO,CAAC,GAAG,EAAE;EAC7C,IAAIW,YAAY,IAAIA,YAAY,CAACE,UAAU,EAAE;IAC3C,IAAAC,cAAA,OAAAC,eAAA,aAAoBL,aAAa;MAA1BM,SAAS,GAAAF,cAAA;IAChB,IAAAG,gBAAA,GAAqCD,SAAS,CAACE,KAAK,CAAC,GAAG,CAAC;MAAAC,iBAAA,OAAAJ,eAAA,aAAAE,gBAAA;MAAlDG,YAAY,GAAAD,iBAAA;MAAEpB,YAAY,GAAAoB,iBAAA;IACjC,IAAMrB,iBAAiB,GAAGa,YAAY,CAACE,UAAU,CAACO,YAAY,CAAC;IAE/D,IAAI,CAACtB,iBAAiB,EAAE,OAAOc,YAAY;IAE3C,IAAIS,KAAK,CAACC,OAAO,CAACxB,iBAAiB,CAAC,EAClC,OAAOD,eAAe,CAACC,iBAAiB,EAAEC,YAAY,EAAEC,OAAO,CAAC;IAElE,IAAI,IAAAuB,kBAAa,EAACzB,iBAAiB,CAAC,IAAIO,MAAM,CAACC,IAAI,CAACR,iBAAiB,CAAC,CAACG,MAAM,EAAE;MAC7E,OAAOoB,KAAK,CAACC,OAAO,CAACxB,iBAAiB,CAACC,YAAY,CAAC,CAAC,GACjDD,iBAAiB,CAACC,YAAY,CAAC,GAC/B,CAACD,iBAAiB,CAACC,YAAY,CAAC,CAAC;IACvC;IAEA,IAAID,iBAAiB,EAAE,OAAO,CAACA,iBAAiB,CAAC;EACnD;EAEA,OAAOc,YAAY;AACrB,CAAC;AAAC,IAAAY,QAAA,GAAAC,OAAA,cAEahB,WAAW","ignoreList":[]}

package/lib/hooks/use-get-image-id-from-relation.js

@@ -26,12 +26,19 @@ function useGetImageIdFromRelation(id, imageRelation, actions, isUsingRelationIm
     getPublished = _ref.getPublished,
     get = _ref.get;
   var getAction = isPreview ? get : getPublished || get;
-  var props = imageRelationData ? "".concat(relationName, " { ").concat(relationProp, " }") : 'id';
+  var props;
+  if (imageRelationData) {
+    if (relationProp) {
+      props = imageRelationData ? "".concat(relationName, " { ").concat(relationProp, " }") : 'id';
+    } else {
+      props = relationName;
+    }
+  }
   var _useQuery = (0, _client.useQuery)((0, _query.generateSingleItemQuery)(getAction, props), {
       variables: {
         id: id
       },
-      skip: skip
+      skip: skip || !imageRelationData
     }),
     _useQuery$data = _useQuery.data,
     data = _useQuery$data === void 0 ? {} : _useQuery$data,

package/lib/hooks/use-get-image-id-from-relation.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-get-image-id-from-relation.js","names":["_client","require","_query","useGetImageIdFromRelation","id","imageRelation","actions","isUsingRelationImage","isPreview","hasImgSrc","skip","Object","keys","length","_imageRelation","_slicedToArray2","_imageRelation$","imageRelationData","_imageRelationData$sp","split","_imageRelationData$sp2","_imageRelationData$sp3","relationName","_imageRelationData$sp4","relationProp","_ref","getPublished","get","getAction","props","concat","_useQuery","useQuery","generateSingleItemQuery","variables","_useQuery$data","data","loading","error","_default","exports"],"sources":["../../src/hooks/use-get-image-id-from-relation.js"],"sourcesContent":["import { useQuery } from '@apollo/client';\nimport { generateSingleItemQuery } from '../application/query';\n\nfunction useGetImageIdFromRelation(\n  id,\n  imageRelation,\n  actions,\n  isUsingRelationImage,\n  isPreview,\n  hasImgSrc\n) {\n  const skip =\n    !actions ||\n    !id ||\n    hasImgSrc ||\n    typeof id !== 'string' ||\n    !isUsingRelationImage ||\n    !Object.keys(actions).length;\n\n  const [imageRelationData = ''] = imageRelation;\n  const [relationName = '', relationProp = ''] = imageRelationData.split('.');\n  const { getPublished, get } = actions || {};\n  const getAction = isPreview ? get : getPublished || get;\n\n  const props = imageRelationData ? `${relationName} { ${relationProp} }` : 'id';\n  const {\n    data = {},\n    loading,\n    error\n  } = useQuery(generateSingleItemQuery(getAction, props), {\n    variables: { id },\n    skip\n  });\n  return { data, loading, error };\n}\n\nexport default useGetImageIdFromRelation;\n"],"mappings":";;;;;;;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AAEA,SAASE,yBAAyBA,CAChCC,EAAE,EACFC,aAAa,EACbC,OAAO,EACPC,oBAAoB,EACpBC,SAAS,EACTC,SAAS,EACT;EACA,IAAMC,IAAI,GACR,CAACJ,OAAO,IACR,CAACF,EAAE,IACHK,SAAS,IACT,OAAOL,EAAE,KAAK,QAAQ,IACtB,CAACG,oBAAoB,IACrB,CAACI,MAAM,CAACC,IAAI,CAACN,OAAO,CAAC,CAACO,MAAM;EAE9B,IAAAC,cAAA,OAAAC,eAAA,aAAiCV,aAAa;IAAAW,eAAA,GAAAF,cAAA;IAAvCG,iBAAiB,GAAAD,eAAA,cAAG,EAAE,GAAAA,eAAA;EAC7B,IAAAE,qBAAA,GAA+CD,iBAAiB,CAACE,KAAK,CAAC,GAAG,CAAC;IAAAC,sBAAA,OAAAL,eAAA,aAAAG,qBAAA;IAAAG,sBAAA,GAAAD,sBAAA;IAApEE,YAAY,GAAAD,sBAAA,cAAG,EAAE,GAAAA,sBAAA;IAAAE,sBAAA,GAAAH,sBAAA;IAAEI,YAAY,GAAAD,sBAAA,cAAG,EAAE,GAAAA,sBAAA;EAC3C,IAAAE,IAAA,GAA8BnB,OAAO,IAAI,CAAC,CAAC;IAAnCoB,YAAY,GAAAD,IAAA,CAAZC,YAAY;IAAEC,GAAG,GAAAF,IAAA,CAAHE,GAAG;EACzB,IAAMC,SAAS,GAAGpB,SAAS,GAAGmB,GAAG,GAAGD,YAAY,IAAIC,GAAG;EAEvD,IAAME,KAAK,GAAGZ,iBAAiB,MAAAa,MAAA,CAAMR,YAAY,SAAAQ,MAAA,CAAMN,YAAY,UAAO,IAAI;EAC9E,IAAAO,SAAA,GAII,IAAAC,gBAAQ,EAAC,IAAAC,8BAAuB,EAACL,SAAS,EAAEC,KAAK,CAAC,EAAE;MACtDK,SAAS,EAAE;QAAE9B,EAAE,EAAFA;MAAG,CAAC;MACjBM,IAAI,EAAJA;IACF,CAAC,CAAC;IAAAyB,cAAA,GAAAJ,SAAA,CANAK,IAAI;IAAJA,IAAI,GAAAD,cAAA,cAAG,CAAC,CAAC,GAAAA,cAAA;IACTE,OAAO,GAAAN,SAAA,CAAPM,OAAO;IACPC,KAAK,GAAAP,SAAA,CAALO,KAAK;EAKP,OAAO;IAAEF,IAAI,EAAJA,IAAI;IAAEC,OAAO,EAAPA,OAAO;IAAEC,KAAK,EAALA;EAAM,CAAC;AACjC;AAAC,IAAAC,QAAA,GAAAC,OAAA,cAEcrC,yBAAyB","ignoreList":[]}
+{"version":3,"file":"use-get-image-id-from-relation.js","names":["_client","require","_query","useGetImageIdFromRelation","id","imageRelation","actions","isUsingRelationImage","isPreview","hasImgSrc","skip","Object","keys","length","_imageRelation","_slicedToArray2","_imageRelation$","imageRelationData","_imageRelationData$sp","split","_imageRelationData$sp2","_imageRelationData$sp3","relationName","_imageRelationData$sp4","relationProp","_ref","getPublished","get","getAction","props","concat","_useQuery","useQuery","generateSingleItemQuery","variables","_useQuery$data","data","loading","error","_default","exports"],"sources":["../../src/hooks/use-get-image-id-from-relation.js"],"sourcesContent":["import { useQuery } from '@apollo/client';\nimport { generateSingleItemQuery } from '../application/query';\n\nfunction useGetImageIdFromRelation(\n  id,\n  imageRelation,\n  actions,\n  isUsingRelationImage,\n  isPreview,\n  hasImgSrc\n) {\n  const skip =\n    !actions ||\n    !id ||\n    hasImgSrc ||\n    typeof id !== 'string' ||\n    !isUsingRelationImage ||\n    !Object.keys(actions).length;\n\n  const [imageRelationData = ''] = imageRelation;\n  const [relationName = '', relationProp = ''] = imageRelationData.split('.');\n  const { getPublished, get } = actions || {};\n  const getAction = isPreview ? get : getPublished || get;\n\n  let props;\n  if (imageRelationData) {\n    if (relationProp) {\n      props = imageRelationData ? `${relationName} { ${relationProp} }` : 'id';\n    } else {\n      props = relationName;\n    }\n  }\n  const {\n    data = {},\n    loading,\n    error\n  } = useQuery(generateSingleItemQuery(getAction, props), {\n    variables: { id },\n    skip: skip || !imageRelationData\n  });\n  return { data, loading, error };\n}\n\nexport default useGetImageIdFromRelation;\n"],"mappings":";;;;;;;;;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,MAAA,GAAAD,OAAA;AAEA,SAASE,yBAAyBA,CAChCC,EAAE,EACFC,aAAa,EACbC,OAAO,EACPC,oBAAoB,EACpBC,SAAS,EACTC,SAAS,EACT;EACA,IAAMC,IAAI,GACR,CAACJ,OAAO,IACR,CAACF,EAAE,IACHK,SAAS,IACT,OAAOL,EAAE,KAAK,QAAQ,IACtB,CAACG,oBAAoB,IACrB,CAACI,MAAM,CAACC,IAAI,CAACN,OAAO,CAAC,CAACO,MAAM;EAE9B,IAAAC,cAAA,OAAAC,eAAA,aAAiCV,aAAa;IAAAW,eAAA,GAAAF,cAAA;IAAvCG,iBAAiB,GAAAD,eAAA,cAAG,EAAE,GAAAA,eAAA;EAC7B,IAAAE,qBAAA,GAA+CD,iBAAiB,CAACE,KAAK,CAAC,GAAG,CAAC;IAAAC,sBAAA,OAAAL,eAAA,aAAAG,qBAAA;IAAAG,sBAAA,GAAAD,sBAAA;IAApEE,YAAY,GAAAD,sBAAA,cAAG,EAAE,GAAAA,sBAAA;IAAAE,sBAAA,GAAAH,sBAAA;IAAEI,YAAY,GAAAD,sBAAA,cAAG,EAAE,GAAAA,sBAAA;EAC3C,IAAAE,IAAA,GAA8BnB,OAAO,IAAI,CAAC,CAAC;IAAnCoB,YAAY,GAAAD,IAAA,CAAZC,YAAY;IAAEC,GAAG,GAAAF,IAAA,CAAHE,GAAG;EACzB,IAAMC,SAAS,GAAGpB,SAAS,GAAGmB,GAAG,GAAGD,YAAY,IAAIC,GAAG;EAEvD,IAAIE,KAAK;EACT,IAAIZ,iBAAiB,EAAE;IACrB,IAAIO,YAAY,EAAE;MAChBK,KAAK,GAAGZ,iBAAiB,MAAAa,MAAA,CAAMR,YAAY,SAAAQ,MAAA,CAAMN,YAAY,UAAO,IAAI;IAC1E,CAAC,MAAM;MACLK,KAAK,GAAGP,YAAY;IACtB;EACF;EACA,IAAAS,SAAA,GAII,IAAAC,gBAAQ,EAAC,IAAAC,8BAAuB,EAACL,SAAS,EAAEC,KAAK,CAAC,EAAE;MACtDK,SAAS,EAAE;QAAE9B,EAAE,EAAFA;MAAG,CAAC;MACjBM,IAAI,EAAEA,IAAI,IAAI,CAACO;IACjB,CAAC,CAAC;IAAAkB,cAAA,GAAAJ,SAAA,CANAK,IAAI;IAAJA,IAAI,GAAAD,cAAA,cAAG,CAAC,CAAC,GAAAA,cAAA;IACTE,OAAO,GAAAN,SAAA,CAAPM,OAAO;IACPC,KAAK,GAAAP,SAAA,CAALO,KAAK;EAKP,OAAO;IAAEF,IAAI,EAAJA,IAAI;IAAEC,OAAO,EAAPA,OAAO;IAAEC,KAAK,EAALA;EAAM,CAAC;AACjC;AAAC,IAAAC,QAAA,GAAAC,OAAA,cAEcrC,yBAAyB","ignoreList":[]}

package/lib-es/helpers/get-image-ids.js

@@ -2,6 +2,7 @@ import isPlainObject from 'lodash.isplainobject';
 const getIdsFromArray = (relationImageData, relationProp, imageId) => {
   if (!relationImageData.length) return [imageId];
   return relationImageData.map(image => {
+    if (typeof image !== 'object') return image;
     if (!Object.keys(image).length) return '';
     return image[relationProp];
   }).filter(Boolean);
@@ -17,6 +18,7 @@ const getImageIds = (imageRelation, relationData, imageId) => {
     if (isPlainObject(relationImageData) && Object.keys(relationImageData).length) {
       return Array.isArray(relationImageData[relationProp]) ? relationImageData[relationProp] : [relationImageData[relationProp]];
     }
+    if (relationImageData) return [relationImageData];
   }
   return imageIdArray;
 };

package/lib-es/helpers/get-image-ids.js.map

@@ -1 +1 @@
-{"version":3,"file":"get-image-ids.js","names":["isPlainObject","getIdsFromArray","relationImageData","relationProp","imageId","length","map","image","Object","keys","filter","Boolean","getImageIds","imageRelation","relationData","imageIdArray","entityData","imageData","relationName","split","Array","isArray"],"sources":["../../src/helpers/get-image-ids.js"],"sourcesContent":["import isPlainObject from 'lodash.isplainobject';\n\nconst getIdsFromArray = (relationImageData, relationProp, imageId) => {\n  if (!relationImageData.length) return [imageId];\n  return relationImageData\n    .map(image => {\n      if (!Object.keys(image).length) return '';\n      return image[relationProp];\n    })\n    .filter(Boolean);\n};\n\nconst getImageIds = (imageRelation, relationData, imageId) => {\n  const imageIdArray = imageId ? [imageId] : [];\n  if (relationData && relationData.entityData) {\n    const [imageData] = imageRelation;\n    const [relationName, relationProp] = imageData.split('.');\n    const relationImageData = relationData.entityData[relationName];\n\n    if (!relationImageData) return imageIdArray;\n\n    if (Array.isArray(relationImageData))\n      return getIdsFromArray(relationImageData, relationProp, imageId);\n\n    if (isPlainObject(relationImageData) && Object.keys(relationImageData).length) {\n      return Array.isArray(relationImageData[relationProp])\n        ? relationImageData[relationProp]\n        : [relationImageData[relationProp]];\n    }\n  }\n\n  return imageIdArray;\n};\n\nexport default getImageIds;\n"],"mappings":"AAAA,OAAOA,aAAa,MAAM,sBAAsB;AAEhD,MAAMC,eAAe,GAAGA,CAACC,iBAAiB,EAAEC,YAAY,EAAEC,OAAO,KAAK;EACpE,IAAI,CAACF,iBAAiB,CAACG,MAAM,EAAE,OAAO,CAACD,OAAO,CAAC;EAC/C,OAAOF,iBAAiB,CACrBI,GAAG,CAACC,KAAK,IAAI;IACZ,IAAI,CAACC,MAAM,CAACC,IAAI,CAACF,KAAK,CAAC,CAACF,MAAM,EAAE,OAAO,EAAE;IACzC,OAAOE,KAAK,CAACJ,YAAY,CAAC;EAC5B,CAAC,CAAC,CACDO,MAAM,CAACC,OAAO,CAAC;AACpB,CAAC;AAED,MAAMC,WAAW,GAAGA,CAACC,aAAa,EAAEC,YAAY,EAAEV,OAAO,KAAK;EAC5D,MAAMW,YAAY,GAAGX,OAAO,GAAG,CAACA,OAAO,CAAC,GAAG,EAAE;EAC7C,IAAIU,YAAY,IAAIA,YAAY,CAACE,UAAU,EAAE;IAC3C,MAAM,CAACC,SAAS,CAAC,GAAGJ,aAAa;IACjC,MAAM,CAACK,YAAY,EAAEf,YAAY,CAAC,GAAGc,SAAS,CAACE,KAAK,CAAC,GAAG,CAAC;IACzD,MAAMjB,iBAAiB,GAAGY,YAAY,CAACE,UAAU,CAACE,YAAY,CAAC;IAE/D,IAAI,CAAChB,iBAAiB,EAAE,OAAOa,YAAY;IAE3C,IAAIK,KAAK,CAACC,OAAO,CAACnB,iBAAiB,CAAC,EAClC,OAAOD,eAAe,CAACC,iBAAiB,EAAEC,YAAY,EAAEC,OAAO,CAAC;IAElE,IAAIJ,aAAa,CAACE,iBAAiB,CAAC,IAAIM,MAAM,CAACC,IAAI,CAACP,iBAAiB,CAAC,CAACG,MAAM,EAAE;MAC7E,OAAOe,KAAK,CAACC,OAAO,CAACnB,iBAAiB,CAACC,YAAY,CAAC,CAAC,GACjDD,iBAAiB,CAACC,YAAY,CAAC,GAC/B,CAACD,iBAAiB,CAACC,YAAY,CAAC,CAAC;IACvC;EACF;EAEA,OAAOY,YAAY;AACrB,CAAC;AAED,eAAeH,WAAW","ignoreList":[]}
+{"version":3,"file":"get-image-ids.js","names":["isPlainObject","getIdsFromArray","relationImageData","relationProp","imageId","length","map","image","Object","keys","filter","Boolean","getImageIds","imageRelation","relationData","imageIdArray","entityData","imageData","relationName","split","Array","isArray"],"sources":["../../src/helpers/get-image-ids.js"],"sourcesContent":["import isPlainObject from 'lodash.isplainobject';\n\nconst getIdsFromArray = (relationImageData, relationProp, imageId) => {\n  if (!relationImageData.length) return [imageId];\n  return relationImageData\n    .map(image => {\n      if (typeof image !== 'object') return image;\n      if (!Object.keys(image).length) return '';\n      return image[relationProp];\n    })\n    .filter(Boolean);\n};\n\nconst getImageIds = (imageRelation, relationData, imageId) => {\n  const imageIdArray = imageId ? [imageId] : [];\n  if (relationData && relationData.entityData) {\n    const [imageData] = imageRelation;\n    const [relationName, relationProp] = imageData.split('.');\n    const relationImageData = relationData.entityData[relationName];\n\n    if (!relationImageData) return imageIdArray;\n\n    if (Array.isArray(relationImageData))\n      return getIdsFromArray(relationImageData, relationProp, imageId);\n\n    if (isPlainObject(relationImageData) && Object.keys(relationImageData).length) {\n      return Array.isArray(relationImageData[relationProp])\n        ? relationImageData[relationProp]\n        : [relationImageData[relationProp]];\n    }\n\n    if (relationImageData) return [relationImageData];\n  }\n\n  return imageIdArray;\n};\n\nexport default getImageIds;\n"],"mappings":"AAAA,OAAOA,aAAa,MAAM,sBAAsB;AAEhD,MAAMC,eAAe,GAAGA,CAACC,iBAAiB,EAAEC,YAAY,EAAEC,OAAO,KAAK;EACpE,IAAI,CAACF,iBAAiB,CAACG,MAAM,EAAE,OAAO,CAACD,OAAO,CAAC;EAC/C,OAAOF,iBAAiB,CACrBI,GAAG,CAACC,KAAK,IAAI;IACZ,IAAI,OAAOA,KAAK,KAAK,QAAQ,EAAE,OAAOA,KAAK;IAC3C,IAAI,CAACC,MAAM,CAACC,IAAI,CAACF,KAAK,CAAC,CAACF,MAAM,EAAE,OAAO,EAAE;IACzC,OAAOE,KAAK,CAACJ,YAAY,CAAC;EAC5B,CAAC,CAAC,CACDO,MAAM,CAACC,OAAO,CAAC;AACpB,CAAC;AAED,MAAMC,WAAW,GAAGA,CAACC,aAAa,EAAEC,YAAY,EAAEV,OAAO,KAAK;EAC5D,MAAMW,YAAY,GAAGX,OAAO,GAAG,CAACA,OAAO,CAAC,GAAG,EAAE;EAC7C,IAAIU,YAAY,IAAIA,YAAY,CAACE,UAAU,EAAE;IAC3C,MAAM,CAACC,SAAS,CAAC,GAAGJ,aAAa;IACjC,MAAM,CAACK,YAAY,EAAEf,YAAY,CAAC,GAAGc,SAAS,CAACE,KAAK,CAAC,GAAG,CAAC;IACzD,MAAMjB,iBAAiB,GAAGY,YAAY,CAACE,UAAU,CAACE,YAAY,CAAC;IAE/D,IAAI,CAAChB,iBAAiB,EAAE,OAAOa,YAAY;IAE3C,IAAIK,KAAK,CAACC,OAAO,CAACnB,iBAAiB,CAAC,EAClC,OAAOD,eAAe,CAACC,iBAAiB,EAAEC,YAAY,EAAEC,OAAO,CAAC;IAElE,IAAIJ,aAAa,CAACE,iBAAiB,CAAC,IAAIM,MAAM,CAACC,IAAI,CAACP,iBAAiB,CAAC,CAACG,MAAM,EAAE;MAC7E,OAAOe,KAAK,CAACC,OAAO,CAACnB,iBAAiB,CAACC,YAAY,CAAC,CAAC,GACjDD,iBAAiB,CAACC,YAAY,CAAC,GAC/B,CAACD,iBAAiB,CAACC,YAAY,CAAC,CAAC;IACvC;IAEA,IAAID,iBAAiB,EAAE,OAAO,CAACA,iBAAiB,CAAC;EACnD;EAEA,OAAOa,YAAY;AACrB,CAAC;AAED,eAAeH,WAAW","ignoreList":[]}

package/lib-es/hooks/use-get-image-id-from-relation.js

@@ -9,7 +9,14 @@ function useGetImageIdFromRelation(id, imageRelation, actions, isUsingRelationIm
     get
   } = actions || {};
   const getAction = isPreview ? get : getPublished || get;
-  const props = imageRelationData ? `${relationName} { ${relationProp} }` : 'id';
+  let props;
+  if (imageRelationData) {
+    if (relationProp) {
+      props = imageRelationData ? `${relationName} { ${relationProp} }` : 'id';
+    } else {
+      props = relationName;
+    }
+  }
   const {
     data = {},
     loading,
@@ -18,7 +25,7 @@ function useGetImageIdFromRelation(id, imageRelation, actions, isUsingRelationIm
     variables: {
       id
     },
-    skip
+    skip: skip || !imageRelationData
   });
   return {
     data,

package/lib-es/hooks/use-get-image-id-from-relation.js.map

@@ -1 +1 @@
-{"version":3,"file":"use-get-image-id-from-relation.js","names":["useQuery","generateSingleItemQuery","useGetImageIdFromRelation","id","imageRelation","actions","isUsingRelationImage","isPreview","hasImgSrc","skip","Object","keys","length","imageRelationData","relationName","relationProp","split","getPublished","get","getAction","props","data","loading","error","variables"],"sources":["../../src/hooks/use-get-image-id-from-relation.js"],"sourcesContent":["import { useQuery } from '@apollo/client';\nimport { generateSingleItemQuery } from '../application/query';\n\nfunction useGetImageIdFromRelation(\n  id,\n  imageRelation,\n  actions,\n  isUsingRelationImage,\n  isPreview,\n  hasImgSrc\n) {\n  const skip =\n    !actions ||\n    !id ||\n    hasImgSrc ||\n    typeof id !== 'string' ||\n    !isUsingRelationImage ||\n    !Object.keys(actions).length;\n\n  const [imageRelationData = ''] = imageRelation;\n  const [relationName = '', relationProp = ''] = imageRelationData.split('.');\n  const { getPublished, get } = actions || {};\n  const getAction = isPreview ? get : getPublished || get;\n\n  const props = imageRelationData ? `${relationName} { ${relationProp} }` : 'id';\n  const {\n    data = {},\n    loading,\n    error\n  } = useQuery(generateSingleItemQuery(getAction, props), {\n    variables: { id },\n    skip\n  });\n  return { data, loading, error };\n}\n\nexport default useGetImageIdFromRelation;\n"],"mappings":"AAAA,SAASA,QAAQ,QAAQ,gBAAgB;AACzC,SAASC,uBAAuB,QAAQ,sBAAsB;AAE9D,SAASC,yBAAyBA,CAChCC,EAAE,EACFC,aAAa,EACbC,OAAO,EACPC,oBAAoB,EACpBC,SAAS,EACTC,SAAS,EACT;EACA,MAAMC,IAAI,GACR,CAACJ,OAAO,IACR,CAACF,EAAE,IACHK,SAAS,IACT,OAAOL,EAAE,KAAK,QAAQ,IACtB,CAACG,oBAAoB,IACrB,CAACI,MAAM,CAACC,IAAI,CAACN,OAAO,CAAC,CAACO,MAAM;EAE9B,MAAM,CAACC,iBAAiB,GAAG,EAAE,CAAC,GAAGT,aAAa;EAC9C,MAAM,CAACU,YAAY,GAAG,EAAE,EAAEC,YAAY,GAAG,EAAE,CAAC,GAAGF,iBAAiB,CAACG,KAAK,CAAC,GAAG,CAAC;EAC3E,MAAM;IAAEC,YAAY;IAAEC;EAAI,CAAC,GAAGb,OAAO,IAAI,CAAC,CAAC;EAC3C,MAAMc,SAAS,GAAGZ,SAAS,GAAGW,GAAG,GAAGD,YAAY,IAAIC,GAAG;EAEvD,MAAME,KAAK,GAAGP,iBAAiB,GAAG,GAAGC,YAAY,MAAMC,YAAY,IAAI,GAAG,IAAI;EAC9E,MAAM;IACJM,IAAI,GAAG,CAAC,CAAC;IACTC,OAAO;IACPC;EACF,CAAC,GAAGvB,QAAQ,CAACC,uBAAuB,CAACkB,SAAS,EAAEC,KAAK,CAAC,EAAE;IACtDI,SAAS,EAAE;MAAErB;IAAG,CAAC;IACjBM;EACF,CAAC,CAAC;EACF,OAAO;IAAEY,IAAI;IAAEC,OAAO;IAAEC;EAAM,CAAC;AACjC;AAEA,eAAerB,yBAAyB","ignoreList":[]}
+{"version":3,"file":"use-get-image-id-from-relation.js","names":["useQuery","generateSingleItemQuery","useGetImageIdFromRelation","id","imageRelation","actions","isUsingRelationImage","isPreview","hasImgSrc","skip","Object","keys","length","imageRelationData","relationName","relationProp","split","getPublished","get","getAction","props","data","loading","error","variables"],"sources":["../../src/hooks/use-get-image-id-from-relation.js"],"sourcesContent":["import { useQuery } from '@apollo/client';\nimport { generateSingleItemQuery } from '../application/query';\n\nfunction useGetImageIdFromRelation(\n  id,\n  imageRelation,\n  actions,\n  isUsingRelationImage,\n  isPreview,\n  hasImgSrc\n) {\n  const skip =\n    !actions ||\n    !id ||\n    hasImgSrc ||\n    typeof id !== 'string' ||\n    !isUsingRelationImage ||\n    !Object.keys(actions).length;\n\n  const [imageRelationData = ''] = imageRelation;\n  const [relationName = '', relationProp = ''] = imageRelationData.split('.');\n  const { getPublished, get } = actions || {};\n  const getAction = isPreview ? get : getPublished || get;\n\n  let props;\n  if (imageRelationData) {\n    if (relationProp) {\n      props = imageRelationData ? `${relationName} { ${relationProp} }` : 'id';\n    } else {\n      props = relationName;\n    }\n  }\n  const {\n    data = {},\n    loading,\n    error\n  } = useQuery(generateSingleItemQuery(getAction, props), {\n    variables: { id },\n    skip: skip || !imageRelationData\n  });\n  return { data, loading, error };\n}\n\nexport default useGetImageIdFromRelation;\n"],"mappings":"AAAA,SAASA,QAAQ,QAAQ,gBAAgB;AACzC,SAASC,uBAAuB,QAAQ,sBAAsB;AAE9D,SAASC,yBAAyBA,CAChCC,EAAE,EACFC,aAAa,EACbC,OAAO,EACPC,oBAAoB,EACpBC,SAAS,EACTC,SAAS,EACT;EACA,MAAMC,IAAI,GACR,CAACJ,OAAO,IACR,CAACF,EAAE,IACHK,SAAS,IACT,OAAOL,EAAE,KAAK,QAAQ,IACtB,CAACG,oBAAoB,IACrB,CAACI,MAAM,CAACC,IAAI,CAACN,OAAO,CAAC,CAACO,MAAM;EAE9B,MAAM,CAACC,iBAAiB,GAAG,EAAE,CAAC,GAAGT,aAAa;EAC9C,MAAM,CAACU,YAAY,GAAG,EAAE,EAAEC,YAAY,GAAG,EAAE,CAAC,GAAGF,iBAAiB,CAACG,KAAK,CAAC,GAAG,CAAC;EAC3E,MAAM;IAAEC,YAAY;IAAEC;EAAI,CAAC,GAAGb,OAAO,IAAI,CAAC,CAAC;EAC3C,MAAMc,SAAS,GAAGZ,SAAS,GAAGW,GAAG,GAAGD,YAAY,IAAIC,GAAG;EAEvD,IAAIE,KAAK;EACT,IAAIP,iBAAiB,EAAE;IACrB,IAAIE,YAAY,EAAE;MAChBK,KAAK,GAAGP,iBAAiB,GAAG,GAAGC,YAAY,MAAMC,YAAY,IAAI,GAAG,IAAI;IAC1E,CAAC,MAAM;MACLK,KAAK,GAAGN,YAAY;IACtB;EACF;EACA,MAAM;IACJO,IAAI,GAAG,CAAC,CAAC;IACTC,OAAO;IACPC;EACF,CAAC,GAAGvB,QAAQ,CAACC,uBAAuB,CAACkB,SAAS,EAAEC,KAAK,CAAC,EAAE;IACtDI,SAAS,EAAE;MAAErB;IAAG,CAAC;IACjBM,IAAI,EAAEA,IAAI,IAAI,CAACI;EACjB,CAAC,CAAC;EACF,OAAO;IAAEQ,IAAI;IAAEC,OAAO;IAAEC;EAAM,CAAC;AACjC;AAEA,eAAerB,yBAAyB","ignoreList":[]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blaze-cms/react-page-builder",
-  "version": "0.146.0-node18-tooltips.33",
+  "version": "0.146.0-node18-tooltips.34",
   "description": "Blaze react page builder",
   "main": "lib/index.js",
   "module": "lib-es/index.js",
@@ -32,7 +32,7 @@
     "@blaze-cms/core-errors-ui": "0.146.0-node18-tooltips.0",
     "@blaze-cms/image-cdn-react": "0.3.0-alpha.7",
     "@blaze-cms/nextjs-components": "0.146.0-node18-tooltips.32",
-    "@blaze-cms/plugin-search-ui": "0.146.0-node18-tooltips.33",
+    "@blaze-cms/plugin-search-ui": "0.146.0-node18-tooltips.34",
     "@blaze-cms/setup-ui": "0.146.0-node18-tooltips.0",
     "@blaze-cms/utils": "0.146.0-node18-tooltips.32",
     "@blaze-cms/utils-handlebars": "0.146.0-node18-tooltips.32",
@@ -92,5 +92,5 @@
     "lib/*",
     "lib-es/*"
   ],
-  "gitHead": "716b7ae2c9ac96e4515eaf2d64f9c85f6d0458d1"
+  "gitHead": "df92551425c4ca0c3e68ae30e83c97c94572280c"
 }

package/src/helpers/get-image-ids.js

@@ -4,6 +4,7 @@ const getIdsFromArray = (relationImageData, relationProp, imageId) => {
   if (!relationImageData.length) return [imageId];
   return relationImageData
     .map(image => {
+      if (typeof image !== 'object') return image;
       if (!Object.keys(image).length) return '';
       return image[relationProp];
     })
@@ -27,6 +28,8 @@ const getImageIds = (imageRelation, relationData, imageId) => {
         ? relationImageData[relationProp]
         : [relationImageData[relationProp]];
     }
+
+    if (relationImageData) return [relationImageData];
   }
 
   return imageIdArray;

package/src/hooks/use-get-image-id-from-relation.js

@@ -22,14 +22,21 @@ function useGetImageIdFromRelation(
   const { getPublished, get } = actions || {};
   const getAction = isPreview ? get : getPublished || get;
 
-  const props = imageRelationData ? `${relationName} { ${relationProp} }` : 'id';
+  let props;
+  if (imageRelationData) {
+    if (relationProp) {
+      props = imageRelationData ? `${relationName} { ${relationProp} }` : 'id';
+    } else {
+      props = relationName;
+    }
+  }
   const {
     data = {},
     loading,
     error
   } = useQuery(generateSingleItemQuery(getAction, props), {
     variables: { id },
-    skip
+    skip: skip || !imageRelationData
   });
   return { data, loading, error };
 }

package/tests/unit/src/helpers/get-image-ids.test.js

@@ -42,10 +42,10 @@ describe('getImageIds helper', () => {
     expect(getImageIds(relationNameProp, relationData, '')).toEqual(['test', 'test3']);
   });
 
-  it('should return expected value if relationName is an empty object', () => {
+  it('should return the relation object itself when relationName is an empty object', () => {
     expect(
       getImageIds(relationNameProp, { entityData: { relationName: {} } }, 'test-id-not-array')
-    ).toEqual(['test-id-not-array']);
+    ).toEqual([{}]);
   });
 
   it('should return expected value if relationName is not an empty object', () => {
@@ -58,16 +58,10 @@ describe('getImageIds helper', () => {
     ).toEqual(['prop-value']);
   });
 
-  it('should return expected value if relationName is not an object or array', () => {
+  it('should return primitive relationName when it is not an object or array', () => {
     expect(
       getImageIds(relationNameProp, { entityData: { relationName: 'relationName' } }, imageId)
-    ).toEqual([imageId]);
-  });
-
-  it('should return empty array', () => {
-    expect(
-      getImageIds(relationNameProp, { entityData: { relationName: 'relationName' } }, '')
-    ).toEqual([]);
+    ).toEqual(['relationName']);
   });
 
   it('should return data from object with non array property', () => {
@@ -77,4 +71,22 @@ describe('getImageIds helper', () => {
   it('should return data from object with array property', () => {
     expect(getImageIds(['objectRelation.imageIds'], relationData, '')).toEqual(['test5']);
   });
+
+  it('should return an empty array when no imageId and relation produces no ids', () => {
+    const dataWithNoMatches = {
+      entityData: {
+        relationName: [{ otherProp: 'x' }, { otherProp: 'y' }]
+      }
+    };
+    expect(getImageIds(['relationName.relationProp'], dataWithNoMatches, '')).toEqual([]);
+  });
+
+  it('should return multiple ids when relation property is an array', () => {
+    const dataWithPropArray = {
+      entityData: {
+        gallery: { imageIds: ['id1', 'id2'] }
+      }
+    };
+    expect(getImageIds(['gallery.imageIds'], dataWithPropArray, '')).toEqual(['id1', 'id2']);
+  });
 });

package/tests/unit/src/hooks/use-get-image-id-from-relation.test.js

@@ -41,11 +41,21 @@ describe('useGetImageIdFromRelation', () => {
   it('should use `get` query when preview is true', async () => {
     const spy = jest.spyOn(query, 'generateSingleItemQuery');
 
-    renderHook(() => useGetImageIdFromRelation(mockProps.id, [], mockProps.actions, true, true), {
-      wrapper
-    });
+    renderHook(
+      () =>
+        useGetImageIdFromRelation(
+          mockProps.id,
+          mockProps.imageRelation,
+          mockProps.actions,
+          true,
+          true
+        ),
+      {
+        wrapper
+      }
+    );
 
-    expect(spy).toHaveBeenCalledWith('getPage', 'id');
+    expect(spy).toHaveBeenCalledWith('getPage', 'publishedPages { imageId }');
   });
 
   it('should use `getPublished` query when preview is false', async () => {
@@ -73,6 +83,65 @@ describe('useGetImageIdFromRelation', () => {
     expect(result.current.error).toBeUndefined();
     expect(result.current.data).toEqual({});
   });
+
+  it('should skip when hasImgSrc is true', async () => {
+    const { result } = renderHook(
+      () =>
+        useGetImageIdFromRelation(
+          mockProps.id,
+          mockProps.imageRelation,
+          mockProps.actions,
+          true,
+          false,
+          true
+        ),
+      { wrapper }
+    );
+
+    expect(result.current.loading).toBeFalsy();
+    expect(result.current.error).toBeUndefined();
+    expect(result.current.data).toEqual({});
+  });
+
+  it('should skip when id is not a string', async () => {
+    const { result } = renderHook(
+      () =>
+        useGetImageIdFromRelation(
+          12345,
+          mockProps.imageRelation,
+          mockProps.actions,
+          true,
+          false,
+          false
+        ),
+      { wrapper }
+    );
+
+    expect(result.current.loading).toBeFalsy();
+    expect(result.current.error).toBeUndefined();
+    expect(result.current.data).toEqual({});
+  });
+
+  it('should fallback to `get` when `getPublished` is missing', async () => {
+    const actionsWithoutPublished = { ...mockProps.actions };
+    delete actionsWithoutPublished.getPublished;
+
+    const spy = jest.spyOn(query, 'generateSingleItemQuery');
+
+    renderHook(
+      () =>
+        useGetImageIdFromRelation(
+          mockProps.id,
+          mockProps.imageRelation,
+          actionsWithoutPublished,
+          true,
+          false
+        ),
+      { wrapper }
+    );
+
+    expect(spy).toHaveBeenCalledWith('getPage', 'publishedPages { imageId }');
+  });
 });
 
 function renderCustomHook() {