@configuratorware/configurator-frontendgui 1.29.4 → 1.30.0

package/App/Modules/Designer/Utils/SvgFixers.js

@@ -0,0 +1,59 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.preparePrintDesignData = exports.prepareDesignDataSnapshots = exports.alterArrayValues = exports.alterObjectValues = exports.embeddedSvgImageToInlineSvgContent = exports.getMatchAt = void 0;
+
+var getMatchAt = function getMatchAt(str, regexp) {
+  var idx = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 1;
+  var defaultValue = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : '';
+  var matches = ('' + str).match(regexp);
+  return matches && matches[idx] || defaultValue;
+};
+
+exports.getMatchAt = getMatchAt;
+
+var embeddedSvgImageToInlineSvgContent = function embeddedSvgImageToInlineSvgContent(svgStr) {
+  return svgStr.replace(/<image([^>]+)xlink:href="data:image\/svg\+xml;base64,([^"]+)"[^>]*>/g, function (_, attributesStr, base64Str) {
+    var x = getMatchAt(attributesStr, /x="([^"]+)"/, 1, 0);
+    var y = getMatchAt(attributesStr, /y="([^"]+)"/, 1, 0);
+    var transform = getMatchAt(attributesStr, /transform="([^"]+)"/, 1, '');
+    var svgContent = atob(base64Str).replace(/(<\?xml[^>]+>)|(<!--[^>]+-->)/gi, '');
+    return "<g transform=\"".concat(transform, " translate(").concat(x, ",").concat(y, ")\">").concat(svgContent, "</g>");
+  });
+};
+
+exports.embeddedSvgImageToInlineSvgContent = embeddedSvgImageToInlineSvgContent;
+
+var alterObjectValues = function alterObjectValues(obj, fn) {
+  Object.keys(obj).forEach(function (key) {
+    obj[key] = fn(obj[key], key);
+  });
+  return obj;
+};
+
+exports.alterObjectValues = alterObjectValues;
+
+var alterArrayValues = function alterArrayValues(arr, fn) {
+  arr.forEach(function (value, key) {
+    arr[key] = fn(value, key);
+  });
+  return arr;
+};
+
+exports.alterArrayValues = alterArrayValues;
+
+var prepareDesignDataSnapshots = function prepareDesignDataSnapshots(svgArrMap) {
+  return alterObjectValues(svgArrMap, function (arr) {
+    return alterArrayValues(arr, embeddedSvgImageToInlineSvgContent);
+  });
+};
+
+exports.prepareDesignDataSnapshots = prepareDesignDataSnapshots;
+
+var preparePrintDesignData = function preparePrintDesignData(svgMap) {
+  return alterObjectValues(svgMap, embeddedSvgImageToInlineSvgContent);
+};
+
+exports.preparePrintDesignData = preparePrintDesignData;

package/App/Modules/Designer/Utils/Transformers.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.prepareCanvasData = exports.prepareObjectData = exports.prepareImageObjectData = exports.noCache = exports.getRasterURL = exports.fixSrcURL = exports.calculateScaleFactor = void 0;
+exports.prepareCanvasData = exports.prepareObjectData = exports.prepareImageObjectData = exports.noCache = exports.isOriginalVector = exports.getRasterURL = exports.fixSrcURL = exports.calculateScaleFactor = void 0;
 
 var _get = _interopRequireDefault(require("lodash/get"));
 
@@ -60,6 +60,12 @@ var getRasterURL = function getRasterURL(imageURL) {
 
 exports.getRasterURL = getRasterURL;
 
+var isOriginalVector = function isOriginalVector(imageData) {
+  return /svg|pdf|eps|ai/i.test((0, _get["default"])(imageData, 'original.format', ''));
+};
+
+exports.isOriginalVector = isOriginalVector;
+
 var noCache = function noCache(src) {
   return "".concat(src, "?").concat(Math.random());
 };
@@ -77,11 +83,11 @@ var prepareImageObjectData = function prepareImageObjectData(rawObject) {
   data.transformImageSrc = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(url) {
       var _ref2,
-          preview,
           operations,
           displayColorPreview,
           gallery,
           isPlaceHolderImage,
+          originalVector,
           svgContent,
           _args = arguments;
 
@@ -89,7 +95,7 @@ var prepareImageObjectData = function prepareImageObjectData(rawObject) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
-              _ref2 = _args.length > 1 && _args[1] !== undefined ? _args[1] : {}, preview = _ref2.preview, operations = _ref2.operations;
+              _ref2 = _args.length > 1 && _args[1] !== undefined ? _args[1] : {}, operations = _ref2.operations;
 
               if ((0, _Selectors.isEditableVectorImage)({
                 url: url
@@ -102,23 +108,24 @@ var prepareImageObjectData = function prepareImageObjectData(rawObject) {
 
             case 3:
               displayColorPreview = image.displayColorPreview, gallery = image.gallery, isPlaceHolderImage = image.isPlaceHolderImage;
+              originalVector = isOriginalVector(image);
 
-              if (!(!displayColorPreview && !gallery && !isPlaceHolderImage)) {
-                _context.next = 6;
+              if (!(!originalVector && !displayColorPreview && !gallery && !isPlaceHolderImage)) {
+                _context.next = 7;
                 break;
               }
 
               return _context.abrupt("return", noCache(fixSrcURL(getRasterURL((0, _get["default"])(image, 'preview.url', '')))));
 
-            case 6:
-              _context.next = 8;
+            case 7:
+              _context.next = 9;
               return (0, _DesignDataService.getSvgContent)(url, true);
 
-            case 8:
+            case 9:
               svgContent = _context.sent;
-              return _context.abrupt("return", (0, _DesignDataService.applySvgContentOperations)(preview ? preview : image.preview, displayColorPreview || gallery ? operations ? operations : image.operations : null, svgContent));
+              return _context.abrupt("return", (0, _DesignDataService.applySvgContentOperations)(image.preview, displayColorPreview || gallery ? operations ? operations : image.operations : null, svgContent));
 
-            case 10:
+            case 11:
             case "end":
               return _context.stop();
           }

package/App/Reducers/ImageGallery/Selectors.js

@@ -9,6 +9,8 @@ var _get = _interopRequireDefault(require("lodash/get"));
 
 var _find = _interopRequireDefault(require("lodash/find"));
 
+var _isString = _interopRequireDefault(require("lodash/isString"));
+
 var _flatten = _interopRequireDefault(require("lodash/flatten"));
 
 var _configuration = require("../../configuration");
@@ -27,14 +29,15 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 
 var getPreviewUrlFromImageData = function getPreviewUrlFromImageData(preview) {
   var options = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+  var previewUrl = (0, _isString["default"])(preview) ? preview : preview.url;
 
-  if (/^data:image/.test(preview.url)) {
-    return preview.url;
+  if (/^data:image/.test(previewUrl)) {
+    return previewUrl;
   }
 
   var _options$host = options.host,
       host = _options$host === void 0 ? (0, _configuration.getConf)('network.host', '') : _options$host;
-  return "".concat(host).concat(preview.url);
+  return "".concat(host).concat(previewUrl);
 };
 
 exports.getPreviewUrlFromImageData = getPreviewUrlFromImageData;

package/App/Services/AnalyticsService.js

@@ -17,10 +17,6 @@ var _lodash = require("lodash");
 
 var _actionsToTrack;
 
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
@@ -322,61 +318,10 @@ var AnalyticsService = /*#__PURE__*/function () {
 
   _createClass(AnalyticsService, [{
     key: "setDataLayer",
-    value: function () {
-      var _setDataLayer = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(dataLayer) {
-        var loadIdentifier;
-        return regeneratorRuntime.wrap(function _callee$(_context) {
-          while (1) {
-            switch (_context.prev = _context.next) {
-              case 0:
-                _context.next = 2;
-                return _ServiceLocator.Services.store.addMiddleware(this.createMiddleware(dataLayer));
-
-              case 2:
-                loadIdentifier = _ServiceLocator.Services.configurator.state.loadIdentifier;
-                loadIdentifier && this.triggerEvent(_Constant.EventTypes.load_item, _ServiceLocator.Services.configurator.state.loadIdentifier);
-
-              case 4:
-              case "end":
-                return _context.stop();
-            }
-          }
-        }, _callee, this);
-      }));
-
-      function setDataLayer(_x) {
-        return _setDataLayer.apply(this, arguments);
-      }
-
-      return setDataLayer;
-    }()
-  }, {
-    key: "createMiddleware",
-    value: function createMiddleware(dataLayer) {
-      var _this = this;
-
-      return function (store) {
-        return function (next) {
-          return function (action) {
-            var result = next(action);
-
-            var actionsToTrack = _this.getActionsToTrack();
-
-            if (!actionsToTrack[action.type]) {
-              return result;
-            }
-
-            var nextState = store.getState();
-
-            if (action.type) {
-              var data = actionsToTrack[action.type](action, nextState);
-              dataLayer.push(data);
-            }
-
-            return result;
-          };
-        };
-      };
+    value: function setDataLayer(dataLayer) {
+      this.dataLayer = dataLayer;
+      var loadIdentifier = _ServiceLocator.Services.configurator.state.loadIdentifier;
+      loadIdentifier && this.triggerEvent(_Constant.EventTypes.load_item, _ServiceLocator.Services.configurator.state.loadIdentifier);
     }
   }, {
     key: "getActionsToTrack",
@@ -387,11 +332,15 @@ var AnalyticsService = /*#__PURE__*/function () {
     key: "triggerEvent",
     value: function triggerEvent(type) {
       var data = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-
-      _ServiceLocator.Services.store.dispatch({
-        type: type,
-        data: data
-      });
+      var actionsToTrack = this.getActionsToTrack();
+
+      if (type && actionsToTrack[type]) {
+        var gaData = actionsToTrack[type]({
+          type: type,
+          data: data
+        }, _ServiceLocator.Services.store.state);
+        this.dataLayer && this.dataLayer.push(gaData);
+      }
     }
   }]);
 

package/App/Services/ConfiguratorService.js

@@ -49,6 +49,8 @@ var _Selectors4 = require("../Reducers/DesignData/Selectors");
 
 var _createMessageInterface = _interopRequireWildcard(require("../Utils/createMessageInterface"));
 
+var _SvgFixers = require("../Modules/Designer/Utils/SvgFixers");
+
 var _excluded = ["code"];
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -655,13 +657,13 @@ var ConfiguratorService = /*#__PURE__*/function (_AbstractConfigurator) {
 
               case 6:
                 svgs = _context6.sent;
-                mediaData.designDataSnapshots = svgs;
+                mediaData.designDataSnapshots = (0, _SvgFixers.prepareDesignDataSnapshots)(svgs);
                 _context6.next = 10;
                 return _ServiceLocator.Services.designData.getScreenshots(fontMapping);
 
               case 10:
                 fullSvgs = _context6.sent;
-                mediaData.printDesignData = fullSvgs;
+                mediaData.printDesignData = (0, _SvgFixers.preparePrintDesignData)(fullSvgs);
                 usedAreas = Object.keys(fullSvgs);
                 designArea = _ServiceLocator.Services.store.state.designArea;
                 filteredDesignAreas = designArea.filteredDesignAreas;