@configuratorware/configurator-frontendgui 1.51.0 → 1.51.1

package/App/Modules/Designer/Containers/AddGalleryImage.js

@@ -44,7 +44,7 @@ var getGalleryImages = (0, _createSelector["default"])(function (imageGallerySta
   var host = (0, _configuration.getConf)('network.host');
   return images.map(function (image) {
     return _objectSpread(_objectSpread({}, image), {}, {
-      url: "".concat(host).concat(image.thumbUrl)
+      url: image.thumbUrl.startsWith('http') ? image.thumbUrl : "".concat(host).concat(image.thumbUrl)
     });
   });
 });

package/App/Modules/Designer/Containers/ImageEditDialog.js

@@ -121,32 +121,33 @@ var ImageEditDialogContainer = exports.ImageEditDialogContainer = /*#__PURE__*/f
     });
     _defineProperty(_assertThisInitialized(_this), "lastImageUpdateData", null);
     _defineProperty(_assertThisInitialized(_this), "updateOriginalPreview", /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var image, previewUrl, isSvg, svgContent, preview;
+      var image, url, previewUrl, isSvg, svgContent, preview;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             image = _this.props.image;
-            previewUrl = "".concat((0, _configuration.getConf)('network.host')).concat(image.preview.url);
+            url = (0, _get["default"])(image, 'preview.url', '');
+            previewUrl = url.startsWith('http') ? url : "".concat((0, _configuration.getConf)('network.host')).concat(url);
             isSvg = previewUrl && /\.svg$/.test(previewUrl);
             if (!isSvg) {
-              _context.next = 11;
+              _context.next = 12;
               break;
             }
-            _context.next = 6;
+            _context.next = 7;
             return (0, _DesignDataService.getSvgContent)(previewUrl, true);
-          case 6:
+          case 7:
             svgContent = _context.sent;
             preview = (0, _DesignDataService.applySvgContentOperations)(image.preview, null, svgContent);
             _this.setState({
               originalImagePreview: preview
             });
-            _context.next = 12;
+            _context.next = 13;
             break;
-          case 11:
+          case 12:
             _this.setState({
               originalImagePreview: previewUrl
             });
-          case 12:
+          case 13:
           case "end":
             return _context.stop();
         }
@@ -425,7 +426,7 @@ var ImageEditDialogContainer = exports.ImageEditDialogContainer = /*#__PURE__*/f
                 break;
               }
               _context6.next = 13;
-              return (0, _DesignDataService.getSvgContent)(image.preview.url, false, forceFetch);
+              return (0, _DesignDataService.getSvgContent)(image.preview.url, image.preview.url.startsWith('http'), forceFetch);
             case 13:
               svgContent = _context6.sent;
             case 14:
@@ -876,7 +877,7 @@ var getUserImages = (0, _createSelector["default"])(function (imageGalleryState)
   });
   return userImages.map(function (image) {
     return _objectSpread(_objectSpread({}, image), {}, {
-      url: "".concat(host).concat(image.thumbnail.url)
+      url: image.thumbnail.url.startsWith('http') ? image.thumbnail.url : "".concat(host).concat(image.thumbnail.url)
     });
   });
 });

package/App/Reducers/ImageGallery/Selectors.js

@@ -23,7 +23,7 @@ var getPreviewUrlFromImageData = exports.getPreviewUrlFromImageData = function g
   }
   var _options$host = options.host,
     host = _options$host === void 0 ? (0, _configuration.getConf)('network.host', '') : _options$host;
-  return "".concat(host).concat(previewUrl);
+  return previewUrl.startsWith('http') ? previewUrl : "".concat(host).concat(previewUrl);
 };
 var isEditableVectorImage = exports.isEditableVectorImage = function isEditableVectorImage(preview) {
   return preview && preview.url && (/.svg$/.test(preview.url) || /^data:image\/svg\+xml/.test(preview.url));

package/App/Screens/DesignerProductPreview/DesignerProductPreviewManager.js

@@ -70,7 +70,7 @@ var prepareImageData = function createImageDataPreProcessor() {
               break;
             }
             _context.next = 11;
-            return (0, _DesignDataService.getSvgContent)(imageData.preview.url, false, true);
+            return (0, _DesignDataService.getSvgContent)(imageData.preview.url, imageData.preview.url.startsWith('http'), true);
           case 11:
             svgContent = _context.sent;
             svgColors = (0, _DesignDataService.getSvgColors)(svgContent, designProductionMethod);

package/App/Services/DesignDataService.js

@@ -153,7 +153,11 @@ var calculateImageBrightness = exports.calculateImageBrightness = function calcu
   if (!image) {
     return;
   }
-  var imageUrl = image.data && image.data.thumbnail ? "".concat((0, _configuration.getConf)('network.host')).concat(image.data.thumbnail.url) : null;
+  var thumbnail = (0, _get2["default"])(image, 'data.thumbnail.url', null);
+  var imageUrl = null;
+  if (thumbnail) {
+    imageUrl = thumbnail.startsWith('http') ? thumbnail : "".concat((0, _configuration.getConf)('network.host')).concat(thumbnail);
+  }
   var fuzzy = 0.1;
   return new Promise(function (resolve, reject) {
     var downloadedImg = new Image(200, 200);
@@ -2457,7 +2461,7 @@ var DesignDataService = exports["default"] = /*#__PURE__*/function () {
           while (1) switch (_context33.prev = _context33.next) {
             case 0:
               _context33.next = 2;
-              return getSvgContent(url);
+              return getSvgContent(url, url.startsWith('http'));
             case 2:
               svgContent = _context33.sent;
               designProductionMethod = (0, _Selectors.getSelectedDesignProductionMethod)(_ServiceLocator.Services.store.state);
@@ -2483,7 +2487,7 @@ var DesignDataService = exports["default"] = /*#__PURE__*/function () {
           while (1) switch (_context34.prev = _context34.next) {
             case 0:
               _context34.next = 2;
-              return getSvgContent(url);
+              return getSvgContent(url, url.startsWith('http'));
             case 2:
               svgContent = _context34.sent;
               svgTag = (_svgContent$match = svgContent.match(/<svg[^>]+>/)) === null || _svgContent$match === void 0 ? void 0 : _svgContent$match[0];
@@ -2688,7 +2692,7 @@ var DesignDataService = exports["default"] = /*#__PURE__*/function () {
               }
               _designProductionMethod = (0, _Selectors.getSelectedDesignProductionMethod)(_ServiceLocator.Services.store.state);
               _context36.next = 35;
-              return getSvgContent(preview.url, false, !operationsMatching);
+              return getSvgContent(preview.url, preview.url.startsWith('http'), !operationsMatching);
             case 35:
               svgContent = _context36.sent;
               svgColors = getSvgColors(svgContent, _designProductionMethod);

package/App/Services/DesignerService.js

@@ -40,9 +40,10 @@ function getCanvasImageScalingWithImageData(canvasImage, imageData) {
   return canvasImage.scaling * (currentPreview.width / nextPreview.width);
 }
 function updateCanvasImageWithImageData(canvasImage, imageData) {
+  var _imageData$preview$ur;
   return canvasImage.updateOptions((0, _Transformers.prepareImageObjectData)({
     imageData: imageData,
-    src: "".concat((0, _configuration.getConf)('network.host')).concat(imageData.preview.url),
+    src: (_imageData$preview$ur = imageData.preview.url) !== null && _imageData$preview$ur !== void 0 && _imageData$preview$ur.startsWith('http') ? imageData.preview.url : "".concat((0, _configuration.getConf)('network.host')).concat(imageData.preview.url),
     scaling: getCanvasImageScalingWithImageData(canvasImage, imageData)
   }));
 }
@@ -259,7 +260,7 @@ var DesignerService = exports["default"] = /*#__PURE__*/function () {
               throw new Error('Preview image url is not specified!');
             case 10:
               _ServiceLocator.Services.store.dispatch((0, _Actions.updateUploadDelayed)(false));
-              return _context5.abrupt("return", "".concat((0, _configuration.getConf)('network.host')).concat(url));
+              return _context5.abrupt("return", url.startsWith('http') ? url : "".concat((0, _configuration.getConf)('network.host')).concat(url));
             case 12:
             case "end":
               return _context5.stop();

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@configuratorware/configurator-frontendgui",
-  "version": "1.51.0",
+  "version": "1.51.1",
   "license": "UNLICENSED",
   "private": false,
   "main": "./index.js",
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
-    "@configuratorware/scripts": "1.51.0",
+    "@configuratorware/scripts": "1.51.1",
     "@material-ui/core": "^4.12.4",
     "@material-ui/icons": "^4.11.3",
     "@material-ui/lab": "^4.0.0-alpha.61",
@@ -36,8 +36,8 @@
     "react-router-dom": "^5.3.4",
     "react-swipeable": "^5.5.1",
     "react-zoom-pan-pinch": "^2.1.3",
-    "redhotmagma-graphics-editor": "1.51.0",
-    "redhotmagma-visualization": "1.51.0",
+    "redhotmagma-graphics-editor": "1.51.1",
+    "redhotmagma-visualization": "1.51.1",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",

package/src/App/Modules/Designer/Containers/AddGalleryImage.js

@@ -37,7 +37,7 @@ const getGalleryImages = createSelector(
         const host = getConf('network.host');
         return images.map(image => ({
             ...image,
-            url: `${host}${image.thumbUrl}`,
+            url: image.thumbUrl.startsWith('http') ? image.thumbUrl : `${host}${image.thumbUrl}`,
         }));
     }
 );

package/src/App/Modules/Designer/Containers/ImageEditDialog.js

@@ -318,7 +318,8 @@ export class ImageEditDialogContainer extends React.Component {
 
     updateOriginalPreview = async () => {
         const { image } = this.props;
-        const previewUrl = `${getConf('network.host')}${image.preview.url}`;
+        const url = get(image, 'preview.url', '');
+        const previewUrl = url.startsWith('http') ? url : `${getConf('network.host')}${url}`;
         const isSvg = previewUrl && /\.svg$/.test(previewUrl);
         if (isSvg) {
             const svgContent = await getSvgContent(previewUrl, true);
@@ -528,7 +529,11 @@ export class ImageEditDialogContainer extends React.Component {
 
             if (updateSVG) {
                 if (!svgContent) {
-                    svgContent = await getSvgContent(image.preview.url, false, forceFetch);
+                    svgContent = await getSvgContent(
+                        image.preview.url,
+                        image.preview.url.startsWith('http'),
+                        forceFetch
+                    );
                 }
 
                 preview = applySvgContentOperations(
@@ -820,7 +825,9 @@ const getUserImages = createSelector(
         return userImages.map(image => {
             return {
                 ...image,
-                url: `${host}${image.thumbnail.url}`,
+                url: image.thumbnail.url.startsWith('http')
+                    ? image.thumbnail.url
+                    : `${host}${image.thumbnail.url}`,
             };
         });
     }

package/src/App/Reducers/ImageGallery/Selectors.js

@@ -22,7 +22,7 @@ export const getPreviewUrlFromImageData = (preview, options = {}) => {
         return previewUrl;
     }
     const { host = getConf('network.host', '') } = options;
-    return `${host}${previewUrl}`;
+    return previewUrl.startsWith('http') ? previewUrl : `${host}${previewUrl}`;
 };
 
 export const isEditableVectorImage = preview => {

package/src/App/Screens/DesignerProductPreview/DesignerProductPreviewManager.js

@@ -55,7 +55,11 @@ const prepareImageData = (function createImageDataPreProcessor() {
 
         if (colorPreviewRequired) {
             // creating the color map, as it was added from the image edit dialog
-            const svgContent = await getSvgContent(imageData.preview.url, false, true);
+            const svgContent = await getSvgContent(
+                imageData.preview.url,
+                imageData.preview.url.startsWith('http'),
+                true
+            );
             const svgColors = getSvgColors(svgContent, designProductionMethod);
             const vectorizeColorsMap = createVectorizeColorsMap({}, svgColors);
             patchedImageData = {

package/src/App/Services/DesignDataService.js

@@ -228,9 +228,11 @@ export const calculateImageBrightness = image => {
     if (!image) {
         return;
     }
-
-    const imageUrl =
-        image.data && image.data.thumbnail ? `${getConf('network.host')}${image.data.thumbnail.url}` : null;
+    const thumbnail = get(image, 'data.thumbnail.url', null);
+    let imageUrl = null;
+    if (thumbnail) {
+        imageUrl = thumbnail.startsWith('http') ? thumbnail : `${getConf('network.host')}${thumbnail}`;
+    }
     const fuzzy = 0.1;
 
     return new Promise((resolve, reject) => {
@@ -1888,7 +1890,7 @@ export default class DesignDataService {
     }
 
     async getGalleryImageColors(url) {
-        const svgContent = await getSvgContent(url);
+        const svgContent = await getSvgContent(url, url.startsWith('http'));
 
         const designProductionMethod = getSelectedDesignProductionMethod(Services.store.state);
 
@@ -1896,7 +1898,7 @@ export default class DesignDataService {
     }
 
     async getSVGImageSize(url) {
-        const svgContent = await getSvgContent(url);
+        const svgContent = await getSvgContent(url, url.startsWith('http'));
         const svgTag = svgContent.match(/<svg[^>]+>/)?.[0];
         const width = svgContent.match(/width="([^"]+)"/)?.[1];
         const height = svgContent.match(/height="([^"]+)"/)?.[1];
@@ -2043,7 +2045,11 @@ export default class DesignDataService {
 
         if (isEditableVectorImage(preview)) {
             const designProductionMethod = getSelectedDesignProductionMethod(Services.store.state);
-            const svgContent = await getSvgContent(preview.url, false, !operationsMatching);
+            const svgContent = await getSvgContent(
+                preview.url,
+                preview.url.startsWith('http'),
+                !operationsMatching
+            );
             const svgColors = getSvgColors(svgContent, designProductionMethod);
 
             const vectorizeColorsMap = createVectorizeColorsMap(operations.vectorizeColorsMap, svgColors);

package/src/App/Services/DesignerService.js

@@ -48,7 +48,9 @@ function updateCanvasImageWithImageData(canvasImage, imageData) {
     return canvasImage.updateOptions(
         prepareImageObjectData({
             imageData,
-            src: `${getConf('network.host')}${imageData.preview.url}`,
+            src: imageData.preview.url?.startsWith('http')
+                ? imageData.preview.url
+                : `${getConf('network.host')}${imageData.preview.url}`,
             scaling: getCanvasImageScalingWithImageData(canvasImage, imageData),
         })
     );
@@ -184,7 +186,7 @@ export default class DesignerService {
             throw new Error('Preview image url is not specified!');
         }
         Services.store.dispatch(updateUploadDelayed(false));
-        return `${getConf('network.host')}${url}`;
+        return url.startsWith('http') ? url : `${getConf('network.host')}${url}`;
     }
 
     async addImageFromUrl(canvas, url, imageData, options = {}) {