@crystaldesign/diva-backoffice 25.15.0-beta.4 → 25.15.0-beta.5

package/build/esm/index.js

@@ -76,7 +76,7 @@ import DeleteOutlined from '@ant-design/icons/DeleteOutlined';
 import JSONEditor from 'jsoneditor';
 import 'jsoneditor/dist/jsoneditor.css';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
-import { MinusCircleOutlined, PlusOutlined, DownloadOutlined as DownloadOutlined$1, PlusSquareOutlined, DeleteOutlined as DeleteOutlined$1, FullscreenOutlined, FileUnknownOutlined, CloseOutlined as CloseOutlined$1, PlusCircleOutlined as PlusCircleOutlined$1, HomeOutlined as HomeOutlined$1, InboxOutlined, EditOutlined, EyeOutlined, InfoCircleOutlined as InfoCircleOutlined$1, FilePdfOutlined, LoadingOutlined, DownOutlined as DownOutlined$1, UploadOutlined as UploadOutlined$2, GlobalOutlined, DatabaseOutlined as DatabaseOutlined$1, DatabaseFilled, ReloadOutlined as ReloadOutlined$1 } from '@ant-design/icons';
+import { MinusCircleOutlined, PlusOutlined, DownloadOutlined as DownloadOutlined$1, PlusSquareOutlined, DeleteOutlined as DeleteOutlined$1, FullscreenOutlined, CloseOutlined as CloseOutlined$1, PlusCircleOutlined as PlusCircleOutlined$1, HomeOutlined as HomeOutlined$1, InboxOutlined, EditOutlined, EyeOutlined, InfoCircleOutlined as InfoCircleOutlined$1, FilePdfOutlined, LoadingOutlined, DownOutlined as DownOutlined$1, UploadOutlined as UploadOutlined$2, GlobalOutlined, DatabaseOutlined as DatabaseOutlined$1, DatabaseFilled, ReloadOutlined as ReloadOutlined$1 } from '@ant-design/icons';
 import classnames from 'classnames';
 import RTFEditor from '@crystaldesign/rtf-editor';
 import debounce from 'lodash/debounce';
@@ -6088,10 +6088,9 @@ function loadConfiguration(t, root, config, lang, apiConfig) {
         width: 150
       }, {
         title: t('backoffice.table.renderjobs.columns.fileUrl'),
-        field: 'fileUrl',
-        imageEnding: '_low',
+        field: 'mediaItems',
         width: 99,
-        type: 'media',
+        type: 'mediaItem',
         align: 'center'
       }, {
         title: t('backoffice.table.renderjobs.columns.realTimeRenderUrl'),
@@ -26667,7 +26666,7 @@ _defineProperty(UtilStore, "viewConfig", void 0);
 function MediaItemViewerCell (_ref) {
   var children = _ref.children;
     _ref.column;
-  var _useState = useState(undefined),
+  var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     media = _useState2[0],
     setMedia = _useState2[1];
@@ -26693,32 +26692,38 @@ function MediaItemViewerCell (_ref) {
   useEffect(function () {
     if (!id) return;
     handler.mediaHandler.getMediaById(id).then(function (res) {
-      var _mediaItem$urlVariant, _url;
+      var _mediaItem$variants;
       var mediaItem = res.data[0];
-      if (!(mediaItem !== null && mediaItem !== void 0 && mediaItem.url)) return;
-      var url = new URL(mediaItem.url);
-      var mediaType = url.pathname.endsWith('.glb') ? 'AR' : 'PCT';
-      if (url.pathname.endsWith('.tif') || url.pathname.endsWith('.tiff') && (_mediaItem$urlVariant = mediaItem.urlVariants) !== null && _mediaItem$urlVariant !== void 0 && _mediaItem$urlVariant[0]) {
-        url = mediaItem.urlVariants[0];
-      }
-      if (mediaType == 'AR') {
+      var mediaUrl;
+      if (mediaItem.thumbnailUrl) {
+        mediaUrl = mediaItem.thumbnailUrl;
+      } else if ((_mediaItem$variants = mediaItem.variants) !== null && _mediaItem$variants !== void 0 && _mediaItem$variants[0]) {
+        mediaUrl = mediaItem.variants[0];
+      } else if (mediaItem.url && mediaItem.mediaType !== 'AR') {
+        mediaUrl = mediaItem.url;
+      }
+      if (mediaItem.mediaType == 'AR' && mediaUrl) {
+        var url = new URL(mediaUrl);
         url.searchParams.append('v', timeStamp.toString());
+        mediaUrl = url.toString();
+      }
+      if (mediaItem.mediaType === 'AR' && mediaItem.mimeType === 'application/octet-stream') {
+        setMedia(undefined);
+        return;
       }
       setMedia({
-        url: (_url = url) === null || _url === void 0 ? void 0 : _url.toString(),
-        mediaType: mediaType,
-        functionType: 'ART',
-        storage: 'OTHER',
-        arViewerSettings: UtilStore.getArViewerSettings()
+        thumbnailUrl: mediaUrl,
+        originalUrl: mediaItem.url,
+        mediaType: mediaItem.mediaType
       });
     });
   }, [timeStamp, id]);
-  if (!id) return /*#__PURE__*/jsx(FileUnknownOutlined, {});
+  if (!id) return /*#__PURE__*/jsx(Fragment, {});
   var openModelViewer = function openModelViewer() {
     actions.openFullscreen({
       content: /*#__PURE__*/jsx("model-viewer", {
         id: "model-viewer",
-        src: children[1],
+        src: media === null || media === void 0 ? void 0 : media.originalUrl,
         ar: true,
         "ar-scale": 'fixed',
         "ar-modes": !isFirefox ? 'webxr quick-look' : '',
@@ -26743,7 +26748,13 @@ function MediaItemViewerCell (_ref) {
         settings: {
           contentBoxProps: {
             type: 'MediaViewer',
-            medias: media ? [media] : undefined,
+            medias: media !== null && media !== void 0 && media.originalUrl ? [{
+              url: media.originalUrl,
+              mediaType: media.mediaType,
+              functionType: 'ART',
+              storage: 'OTHER',
+              arViewerSettings: UtilStore.getArViewerSettings()
+            }] : undefined,
             defaultDataOptions: 'fullscreen.enable:false;'
           }
         }
@@ -26754,7 +26765,10 @@ function MediaItemViewerCell (_ref) {
     children: (media === null || media === void 0 ? void 0 : media.mediaType) === 'AR' ? /*#__PURE__*/jsx(FullscreenOutlined, {
       onClick: openModelViewer
     }) : /*#__PURE__*/jsx("img", {
-      src: media === null || media === void 0 ? void 0 : media.url,
+      style: {
+        cursor: 'pointer'
+      },
+      src: media === null || media === void 0 ? void 0 : media.thumbnailUrl,
       width: 39,
       onClick: openContentBox
     })

package/build/types/backoffice/src/ui/Table/BaseTable/cellRenderer/MediaItemViewerCell/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/ui/Table/BaseTable/cellRenderer/MediaItemViewerCell/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAC;AAOxC,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,GAAG,CAAC;QACZ,UAAU,iBAAiB;YACzB,cAAc,EAAE,GAAG,CAAC;SACrB;KACF;CACF;AAED,MAAM,CAAC,OAAO,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,kBAAkB,qBAqFhE"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../../../src/ui/Table/BaseTable/cellRenderer/MediaItemViewerCell/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AACnD,OAAO,EAAE,kBAAkB,EAAE,MAAM,IAAI,CAAC;AAOxC,OAAO,CAAC,MAAM,CAAC;IACb,UAAU,GAAG,CAAC;QACZ,UAAU,iBAAiB;YACzB,cAAc,EAAE,GAAG,CAAC;SACrB;KACF;CACF;AAED,MAAM,CAAC,OAAO,WAAW,EAAE,QAAQ,EAAE,MAAM,EAAE,EAAE,kBAAkB,qBAgHhE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystaldesign/diva-backoffice",
-  "version": "25.15.0-beta.4",
+  "version": "25.15.0-beta.5",
   "license": "COMMERCIAL",
   "devDependencies": {
     "@testing-library/jest-dom": "^6.5.0",
@@ -15,13 +15,13 @@
   "dependencies": {
     "@ant-design/icons": "5.4.0",
     "@babel/runtime": "7.24.7",
-    "@crystaldesign/content-box": "25.15.0-beta.4",
-    "@crystaldesign/content-item": "25.15.0-beta.4",
-    "@crystaldesign/diva-core": "25.15.0-beta.4",
-    "@crystaldesign/diva-utils": "25.15.0-beta.4",
-    "@crystaldesign/media-upload": "25.15.0-beta.4",
-    "@crystaldesign/rtf-editor": "25.15.0-beta.4",
-    "@crystaldesign/spreadsheet": "25.15.0-beta.4",
+    "@crystaldesign/content-box": "25.15.0-beta.5",
+    "@crystaldesign/content-item": "25.15.0-beta.5",
+    "@crystaldesign/diva-core": "25.15.0-beta.5",
+    "@crystaldesign/diva-utils": "25.15.0-beta.5",
+    "@crystaldesign/media-upload": "25.15.0-beta.5",
+    "@crystaldesign/rtf-editor": "25.15.0-beta.5",
+    "@crystaldesign/spreadsheet": "25.15.0-beta.5",
     "@google/model-viewer": "3.5.0",
     "ag-charts-community": "^10.1.0",
     "ag-charts-react": "^10.1.0",
@@ -51,5 +51,5 @@
   },
   "module": "build/esm/index.js",
   "types": "./build/types/backoffice/src/index.d.ts",
-  "gitHead": "82a7544bd1b3dd32c808cfce692e81a3be6ca088"
+  "gitHead": "3d00a0b451b05b9bb8c06a06778fcca56d1ccd18"
 }