@crystaldesign/diva-backoffice 26.10.0-beta.16 → 26.10.0-beta.17

package/build/esm/index.js

@@ -58731,13 +58731,14 @@ function _fetchJson() {
   return _fetchJson.apply(this, arguments);
 }
 function toMedia(item) {
-  var _ref, _ref2, _ref3, _item$cdnUrl, _item$ref, _ref4, _item$thumbnailUrl, _item$variants, _item$_id;
+  var _getImageVariantUrl, _ref, _ref2, _ref3, _ref4, _item$ref, _ref5, _item$thumbnailUrl, _item$_id;
   if (!item) return null;
-  var url = (_ref = (_ref2 = (_ref3 = (_item$cdnUrl = item.cdnUrl) !== null && _item$cdnUrl !== void 0 ? _item$cdnUrl : item.url) !== null && _ref3 !== void 0 ? _ref3 : item.fileUrl) !== null && _ref2 !== void 0 ? _ref2 : (_item$ref = item.ref) === null || _item$ref === void 0 ? void 0 : _item$ref.url) !== null && _ref !== void 0 ? _ref : null;
+  var bigUrl = (_getImageVariantUrl = getImageVariantUrl(item.variants, 'big')) !== null && _getImageVariantUrl !== void 0 ? _getImageVariantUrl : undefined;
+  var url = (_ref = (_ref2 = (_ref3 = (_ref4 = bigUrl !== null && bigUrl !== void 0 ? bigUrl : item.cdnUrl) !== null && _ref4 !== void 0 ? _ref4 : item.url) !== null && _ref3 !== void 0 ? _ref3 : item.fileUrl) !== null && _ref2 !== void 0 ? _ref2 : (_item$ref = item.ref) === null || _item$ref === void 0 ? void 0 : _item$ref.url) !== null && _ref !== void 0 ? _ref : null;
   if (typeof url !== 'string' || url.length === 0) return null;
   return {
     url: url,
-    thumbnailUrl: (_ref4 = (_item$thumbnailUrl = item.thumbnailUrl) !== null && _item$thumbnailUrl !== void 0 ? _item$thumbnailUrl : (_item$variants = item.variants) === null || _item$variants === void 0 ? void 0 : _item$variants.gal) !== null && _ref4 !== void 0 ? _ref4 : null,
+    thumbnailUrl: (_ref5 = (_item$thumbnailUrl = item.thumbnailUrl) !== null && _item$thumbnailUrl !== void 0 ? _item$thumbnailUrl : getImageVariantUrl(item.variants, 'gal')) !== null && _ref5 !== void 0 ? _ref5 : null,
     mediaType: item.mediaType,
     mimeType: item.mimeType,
     fileSize: typeof item.fileSize === 'number' ? item.fileSize : undefined,
@@ -58747,6 +58748,31 @@ function toMedia(item) {
     variants: item.variants && _typeof(item.variants) === 'object' ? item.variants : undefined
   };
 }
+
+/**
+ * Returns the URL of the given image variant.
+ * Some legacy items have the variant URLs shifted under the wrong dict key, so the key itself
+ * can't be trusted - match on the `_<variant>.` file-name suffix that the storage upload wrote instead.
+ * URLs without one of the known variant suffixes (gal/low/std/big) aren't tied to a specific variant
+ * (e.g. generic fallback images, or filenames that happen to end in `_<word>.<ext>`), so they're
+ * trusted under whichever key they're stored.
+ * @param variants
+ * @param variant
+ */
+function getImageVariantUrl(variants, variant) {
+  if (!variants) {
+    return undefined;
+  }
+  var suffix = "_".concat(variant, ".");
+  var imgurl = variants[variant];
+  var hasKnownVariantSuffix = imgurl && /_(gal|low|std|big)\./.test(imgurl);
+  if (imgurl && (!hasKnownVariantSuffix || imgurl.includes(suffix))) {
+    return imgurl;
+  }
+  return Object.values(variants).find(function (url) {
+    return url.includes(suffix);
+  });
+}
 var EXCLUDED_FUNCTION_TYPES = new Set(['LOG', 'OPV']);
 var ALLOWED_MEDIA_TYPES = new Set(['PCT', 'AR']);
 
@@ -58854,12 +58880,13 @@ function _fetchProductMedia() {
         case 40:
           _context4.next = 42;
           return Promise.all(result.map(/*#__PURE__*/function () {
-            var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref7) {
-              var media, ref, _yield$Promise$allSet, _yield$Promise$allSet2, mediaItemRes, refRes, _media$variants, _ref9, _item$thumbnailUrl2, _item$variants2, item, _media$metadata, payload, refDoc, _media$metadata2;
+            var _ref9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(_ref8) {
+              var _getImageVariantUrl3;
+              var media, ref, _yield$Promise$allSet, _yield$Promise$allSet2, mediaItemRes, refRes, _media$variants, _ref10, _item$thumbnailUrl2, item, _media$metadata, payload, refDoc, _media$metadata2, _media$variants2, _getImageVariantUrl2;
               return _regeneratorRuntime.wrap(function _callee3$(_context3) {
                 while (1) switch (_context3.prev = _context3.next) {
                   case 0:
-                    media = _ref7.media, ref = _ref7.ref;
+                    media = _ref8.media, ref = _ref8.ref;
                     if (ref) {
                       _context3.next = 3;
                       break;
@@ -58884,7 +58911,7 @@ function _fetchProductMedia() {
                       // variants to show the PNG stand-in for a TIFF.
                       if (!media.mimeType && typeof (item === null || item === void 0 ? void 0 : item.mimeType) === 'string') media.mimeType = item.mimeType;
                       if (item !== null && item !== void 0 && item.variants && _typeof(item.variants) === 'object') media.variants = _objectSpread$i(_objectSpread$i({}, (_media$variants = media.variants) !== null && _media$variants !== void 0 ? _media$variants : {}), item.variants);
-                      if (!media.thumbnailUrl) media.thumbnailUrl = (_ref9 = (_item$thumbnailUrl2 = item === null || item === void 0 ? void 0 : item.thumbnailUrl) !== null && _item$thumbnailUrl2 !== void 0 ? _item$thumbnailUrl2 : item === null || item === void 0 || (_item$variants2 = item.variants) === null || _item$variants2 === void 0 ? void 0 : _item$variants2.gal) !== null && _ref9 !== void 0 ? _ref9 : null;
+                      if (!media.thumbnailUrl) media.thumbnailUrl = (_ref10 = (_item$thumbnailUrl2 = item === null || item === void 0 ? void 0 : item.thumbnailUrl) !== null && _item$thumbnailUrl2 !== void 0 ? _item$thumbnailUrl2 : getImageVariantUrl(media.variants, 'gal')) !== null && _ref10 !== void 0 ? _ref10 : null;
                     }
                     if (refRes.status === 'fulfilled') {
                       payload = refRes.value;
@@ -58892,15 +58919,20 @@ function _fetchProductMedia() {
                       if (refDoc !== null && refDoc !== void 0 && refDoc.metadata && _typeof(refDoc.metadata) === 'object') {
                         media.metadata = _objectSpread$i(_objectSpread$i({}, (_media$metadata2 = media.metadata) !== null && _media$metadata2 !== void 0 ? _media$metadata2 : {}), refDoc.metadata);
                       }
+                      if (refDoc !== null && refDoc !== void 0 && refDoc.variants && _typeof(refDoc.variants) === 'object') {
+                        media.variants = _objectSpread$i(_objectSpread$i({}, (_media$variants2 = media.variants) !== null && _media$variants2 !== void 0 ? _media$variants2 : {}), refDoc.variants);
+                        if (!media.thumbnailUrl) media.thumbnailUrl = (_getImageVariantUrl2 = getImageVariantUrl(media.variants, 'gal')) !== null && _getImageVariantUrl2 !== void 0 ? _getImageVariantUrl2 : null;
+                      }
                     }
-                  case 11:
+                    if (media.variants) media.url = (_getImageVariantUrl3 = getImageVariantUrl(media.variants, 'big')) !== null && _getImageVariantUrl3 !== void 0 ? _getImageVariantUrl3 : media.url;
+                  case 12:
                   case "end":
                     return _context3.stop();
                 }
               }, _callee3);
             }));
             return function (_x19) {
-              return _ref8.apply(this, arguments);
+              return _ref9.apply(this, arguments);
             };
           }()));
         case 42:
@@ -58999,10 +59031,10 @@ function buildLeftSlides(left, renderImages, productMedia) {
   } finally {
     _iterator.f();
   }
-  var renderImageSlides = renderImages.map(function (_ref5) {
+  var renderImageSlides = renderImages.map(function (_ref6) {
     var _productByUrl$get;
-    var url = _ref5.url,
-      mediaItemRefId = _ref5.mediaItemRefId;
+    var url = _ref6.url,
+      mediaItemRefId = _ref6.mediaItemRefId;
     return url === left.url ? left : (_productByUrl$get = productByUrl.get(url)) !== null && _productByUrl$get !== void 0 ? _productByUrl$get : {
       url: url,
       mediaType: 'PCT',
@@ -59044,7 +59076,7 @@ function _withResolvedSlideNames() {
           return _context7.abrupt("return", slides);
         case 2:
           return _context7.abrupt("return", Promise.all(slides.map(/*#__PURE__*/function () {
-            var _ref10 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee6(slide) {
+            var _ref11 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee6(slide) {
               var item;
               return _regeneratorRuntime.wrap(function _callee6$(_context6) {
                 while (1) switch (_context6.prev = _context6.next) {
@@ -59082,7 +59114,7 @@ function _withResolvedSlideNames() {
               }, _callee6, null, [[2, 10]]);
             }));
             return function (_x20) {
-              return _ref10.apply(this, arguments);
+              return _ref11.apply(this, arguments);
             };
           }())));
         case 3:
@@ -59127,7 +59159,7 @@ function _resolveVariants() {
         case 3:
           _context9.next = 5;
           return Promise.all(variants.map(/*#__PURE__*/function () {
-            var _ref11 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee8(variant, position) {
+            var _ref12 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee8(variant, position) {
               var _media2, _variant$url;
               var mediaItemId, media;
               return _regeneratorRuntime.wrap(function _callee8$(_context8) {
@@ -59162,7 +59194,7 @@ function _resolveVariants() {
               }, _callee8, null, [[2, 8]]);
             }));
             return function (_x21, _x22) {
-              return _ref11.apply(this, arguments);
+              return _ref12.apply(this, arguments);
             };
           }()));
         case 5:

package/build/types/backoffice/src/ui/TableRenderJobs/components/RenderApprove/hooks/useRenderJobData.d.ts

@@ -8,6 +8,17 @@ interface UseRenderJobDataResult {
     applyRenderImages: (renderImages: RenderImage[]) => void;
 }
 export declare function getMediaItemId(job: RenderJob | undefined): string | undefined;
+/**
+ * Returns the URL of the given image variant.
+ * Some legacy items have the variant URLs shifted under the wrong dict key, so the key itself
+ * can't be trusted - match on the `_<variant>.` file-name suffix that the storage upload wrote instead.
+ * URLs without one of the known variant suffixes (gal/low/std/big) aren't tied to a specific variant
+ * (e.g. generic fallback images, or filenames that happen to end in `_<word>.<ext>`), so they're
+ * trusted under whichever key they're stored.
+ * @param variants
+ * @param variant
+ */
+export declare function getImageVariantUrl(variants: Record<string, string> | undefined, variant: string): string | undefined;
 export declare function resolveMediaItem(baseUrl: string, jwt: string | undefined, mediaItemId?: string, mediaItemRef?: string): Promise<RenderApproveMedia | null>;
 /**
  * Loads the render job by id together with the left (real-time render) and

package/build/types/backoffice/src/ui/TableRenderJobs/components/RenderApprove/hooks/useRenderJobData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useRenderJobData.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/ui/TableRenderJobs/components/RenderApprove/hooks/useRenderJobData.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAwB,WAAW,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAIvH,UAAU,sBAAsB;IAC9B,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,8JAA8J;IAC9J,iBAAiB,EAAE,CAAC,YAAY,EAAE,WAAW,EAAE,KAAK,IAAI,CAAC;CAC1D;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,SAAS,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAM7E;AA8HD,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,WAAW,CAAC,EAAE,MAAM,EACpB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAapC;AA2FD;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,sBAAsB,CA2HjG"}
+{"version":3,"file":"useRenderJobData.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/ui/TableRenderJobs/components/RenderApprove/hooks/useRenderJobData.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,mBAAmB,EAAE,kBAAkB,EAAwB,WAAW,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAIvH,UAAU,sBAAsB;IAC9B,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,mBAAmB,CAAC;IAC5B,OAAO,EAAE,OAAO,CAAC;IACjB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,8JAA8J;IAC9J,iBAAiB,EAAE,CAAC,YAAY,EAAE,WAAW,EAAE,KAAK,IAAI,CAAC;CAC1D;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,SAAS,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAM7E;AAmCD;;;;;;;;;GASG;AACH,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,SAAS,EAAE,OAAO,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAapH;AAqGD,wBAAsB,gBAAgB,CACpC,OAAO,EAAE,MAAM,EACf,GAAG,EAAE,MAAM,GAAG,SAAS,EACvB,WAAW,CAAC,EAAE,MAAM,EACpB,YAAY,CAAC,EAAE,MAAM,GACpB,OAAO,CAAC,kBAAkB,GAAG,IAAI,CAAC,CAapC;AA2FD;;;;;;;;;;;;;GAaG;AACH,MAAM,CAAC,OAAO,UAAU,gBAAgB,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,UAAU,CAAC,EAAE,MAAM,GAAG,sBAAsB,CA2HjG"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystaldesign/diva-backoffice",
-  "version": "26.10.0-beta.16",
+  "version": "26.10.0-beta.17",
   "license": "COMMERCIAL",
   "devDependencies": {
     "@testing-library/jest-dom": "^6.5.0",
@@ -15,13 +15,13 @@
   "dependencies": {
     "@ant-design/icons": "6.1.0",
     "@babel/runtime": "7.24.7",
-    "@crystaldesign/content-box": "26.10.0-beta.16",
-    "@crystaldesign/content-item": "26.10.0-beta.16",
-    "@crystaldesign/diva-core": "26.10.0-beta.16",
-    "@crystaldesign/diva-utils": "26.10.0-beta.16",
-    "@crystaldesign/media-upload": "26.10.0-beta.16",
-    "@crystaldesign/rtf-editor": "26.10.0-beta.16",
-    "@crystaldesign/spreadsheet": "26.10.0-beta.16",
+    "@crystaldesign/content-box": "26.10.0-beta.17",
+    "@crystaldesign/content-item": "26.10.0-beta.17",
+    "@crystaldesign/diva-core": "26.10.0-beta.17",
+    "@crystaldesign/diva-utils": "26.10.0-beta.17",
+    "@crystaldesign/media-upload": "26.10.0-beta.17",
+    "@crystaldesign/rtf-editor": "26.10.0-beta.17",
+    "@crystaldesign/spreadsheet": "26.10.0-beta.17",
     "@dnd-kit/core": "^6.1.0",
     "@dnd-kit/sortable": "^8.0.0",
     "@dnd-kit/utilities": "^3.2.2",
@@ -56,5 +56,5 @@
   },
   "module": "build/esm/index.js",
   "types": "./build/types/backoffice/src/index.d.ts",
-  "gitHead": "beec02ae96051a9c9644255809ac8f2e093442df"
+  "gitHead": "fe5831397819585561448b4b5f1bfa8c147eadad"
 }