@configuratorware/configurator-frontendgui 1.46.5 → 1.46.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/App/Services/InteractionService.js +70 -41
- package/App/Shared/Components/PdfDownload/index.js +25 -1
- package/App/configuration.js +1 -1
- package/package.json +4 -4
- package/src/App/Services/InteractionService.js +3 -2
- package/src/App/Services/__tests__/InteractionService.test.js +4 -4
- package/src/App/Shared/Components/PdfDownload/index.js +5 -1
- package/src/App/configuration.js +1 -1
|
@@ -531,44 +531,68 @@ var InteractionService = exports["default"] = /*#__PURE__*/function (_AbstractIn
|
|
|
531
531
|
}
|
|
532
532
|
}, {
|
|
533
533
|
key: "createPdfUrl",
|
|
534
|
-
value: function
|
|
535
|
-
var
|
|
536
|
-
|
|
537
|
-
|
|
538
|
-
|
|
539
|
-
|
|
540
|
-
|
|
541
|
-
|
|
542
|
-
|
|
543
|
-
|
|
544
|
-
|
|
545
|
-
|
|
546
|
-
return
|
|
547
|
-
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
551
|
-
|
|
552
|
-
|
|
534
|
+
value: function () {
|
|
535
|
+
var _createPdfUrl = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee10() {
|
|
536
|
+
var documentType,
|
|
537
|
+
configuration,
|
|
538
|
+
queryParams,
|
|
539
|
+
params,
|
|
540
|
+
customKeys,
|
|
541
|
+
keys,
|
|
542
|
+
mergedKeys,
|
|
543
|
+
query,
|
|
544
|
+
queryString,
|
|
545
|
+
_args10 = arguments;
|
|
546
|
+
return _regeneratorRuntime().wrap(function _callee10$(_context10) {
|
|
547
|
+
while (1) switch (_context10.prev = _context10.next) {
|
|
548
|
+
case 0:
|
|
549
|
+
documentType = _args10.length > 0 && _args10[0] !== undefined ? _args10[0] : 'user';
|
|
550
|
+
configuration = _args10.length > 1 && _args10[1] !== undefined ? _args10[1] : (0, _Selectors.getConfiguration)(_ServiceLocator.Services.configurator.state);
|
|
551
|
+
queryParams = _args10.length > 2 && _args10[2] !== undefined ? _args10[2] : {};
|
|
552
|
+
params = _objectSpread(_objectSpread({}, _Api["default"].getGETParameters()), queryParams);
|
|
553
|
+
customKeys = Object.keys(queryParams);
|
|
554
|
+
keys = ['_language', '_client', '_channel', '_display_net_prices', '_share_url'];
|
|
555
|
+
mergedKeys = keys.concat(customKeys);
|
|
556
|
+
query = new URLSearchParams(location.search);
|
|
557
|
+
queryString = Object.keys(params).filter(function (key) {
|
|
558
|
+
return mergedKeys.indexOf(key) !== -1;
|
|
559
|
+
}).map(function (key) {
|
|
560
|
+
return key === '_share_url' ? key + '=' + encodeURIComponent(params[key]) : key + '=' + params[key];
|
|
561
|
+
}).join('&');
|
|
562
|
+
if (query.has('_hide_prices')) {
|
|
563
|
+
queryString = queryString.concat('&_hide_prices=' + query.get('_hide_prices'));
|
|
564
|
+
}
|
|
565
|
+
if (query.has('_cta_element')) {
|
|
566
|
+
queryString = queryString.concat('&_cta_element=' + query.get('_cta_element'));
|
|
567
|
+
}
|
|
568
|
+
return _context10.abrupt("return", "".concat((0, _configuration.getConf)('network.baseURL', '/'), "configurations/pdf/").concat(documentType, "/").concat(configuration.code, "?").concat(queryString));
|
|
569
|
+
case 12:
|
|
570
|
+
case "end":
|
|
571
|
+
return _context10.stop();
|
|
572
|
+
}
|
|
573
|
+
}, _callee10);
|
|
574
|
+
}));
|
|
575
|
+
function createPdfUrl() {
|
|
576
|
+
return _createPdfUrl.apply(this, arguments);
|
|
553
577
|
}
|
|
554
|
-
return
|
|
555
|
-
}
|
|
578
|
+
return createPdfUrl;
|
|
579
|
+
}()
|
|
556
580
|
}, {
|
|
557
581
|
key: "printConfigurationAndOpenPdf",
|
|
558
582
|
value: function () {
|
|
559
|
-
var _printConfigurationAndOpenPdf = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function
|
|
560
|
-
return _regeneratorRuntime().wrap(function
|
|
561
|
-
while (1) switch (
|
|
583
|
+
var _printConfigurationAndOpenPdf = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee11() {
|
|
584
|
+
return _regeneratorRuntime().wrap(function _callee11$(_context11) {
|
|
585
|
+
while (1) switch (_context11.prev = _context11.next) {
|
|
562
586
|
case 0:
|
|
563
|
-
|
|
587
|
+
_context11.next = 2;
|
|
564
588
|
return this.printConfiguration();
|
|
565
589
|
case 2:
|
|
566
590
|
_ServiceLocator.Services.interaction.showPdfDownloadDialog();
|
|
567
591
|
case 3:
|
|
568
592
|
case "end":
|
|
569
|
-
return
|
|
593
|
+
return _context11.stop();
|
|
570
594
|
}
|
|
571
|
-
},
|
|
595
|
+
}, _callee11, this);
|
|
572
596
|
}));
|
|
573
597
|
function printConfigurationAndOpenPdf() {
|
|
574
598
|
return _printConfigurationAndOpenPdf.apply(this, arguments);
|
|
@@ -578,19 +602,24 @@ var InteractionService = exports["default"] = /*#__PURE__*/function (_AbstractIn
|
|
|
578
602
|
}, {
|
|
579
603
|
key: "saveWidgetConfigurationAndOpenPdf",
|
|
580
604
|
value: function () {
|
|
581
|
-
var _saveWidgetConfigurationAndOpenPdf = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function
|
|
582
|
-
|
|
583
|
-
|
|
605
|
+
var _saveWidgetConfigurationAndOpenPdf = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee12() {
|
|
606
|
+
var pdfUrl;
|
|
607
|
+
return _regeneratorRuntime().wrap(function _callee12$(_context12) {
|
|
608
|
+
while (1) switch (_context12.prev = _context12.next) {
|
|
584
609
|
case 0:
|
|
585
|
-
|
|
610
|
+
_context12.next = 2;
|
|
586
611
|
return this.saveWidgetConfiguration();
|
|
587
612
|
case 2:
|
|
588
|
-
|
|
589
|
-
|
|
613
|
+
_context12.next = 4;
|
|
614
|
+
return this.createPdfUrl('widget');
|
|
615
|
+
case 4:
|
|
616
|
+
pdfUrl = _context12.sent;
|
|
617
|
+
window.open(pdfUrl);
|
|
618
|
+
case 6:
|
|
590
619
|
case "end":
|
|
591
|
-
return
|
|
620
|
+
return _context12.stop();
|
|
592
621
|
}
|
|
593
|
-
},
|
|
622
|
+
}, _callee12, this);
|
|
594
623
|
}));
|
|
595
624
|
function saveWidgetConfigurationAndOpenPdf() {
|
|
596
625
|
return _saveWidgetConfigurationAndOpenPdf.apply(this, arguments);
|
|
@@ -600,19 +629,19 @@ var InteractionService = exports["default"] = /*#__PURE__*/function (_AbstractIn
|
|
|
600
629
|
}, {
|
|
601
630
|
key: "saveWidgetConfigurationAndOpenConfigurator",
|
|
602
631
|
value: function () {
|
|
603
|
-
var _saveWidgetConfigurationAndOpenConfigurator = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function
|
|
604
|
-
return _regeneratorRuntime().wrap(function
|
|
605
|
-
while (1) switch (
|
|
632
|
+
var _saveWidgetConfigurationAndOpenConfigurator = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee13() {
|
|
633
|
+
return _regeneratorRuntime().wrap(function _callee13$(_context13) {
|
|
634
|
+
while (1) switch (_context13.prev = _context13.next) {
|
|
606
635
|
case 0:
|
|
607
|
-
|
|
636
|
+
_context13.next = 2;
|
|
608
637
|
return this.saveWidgetConfiguration();
|
|
609
638
|
case 2:
|
|
610
639
|
this.openConfigurator();
|
|
611
640
|
case 3:
|
|
612
641
|
case "end":
|
|
613
|
-
return
|
|
642
|
+
return _context13.stop();
|
|
614
643
|
}
|
|
615
|
-
},
|
|
644
|
+
}, _callee13, this);
|
|
616
645
|
}));
|
|
617
646
|
function saveWidgetConfigurationAndOpenConfigurator() {
|
|
618
647
|
return _saveWidgetConfigurationAndOpenConfigurator.apply(this, arguments);
|
|
@@ -18,6 +18,9 @@ var _propTypes = _interopRequireDefault(require("prop-types"));
|
|
|
18
18
|
var _CustomDialog = _interopRequireDefault(require("../../../../Shared/Components/CustomDialog"));
|
|
19
19
|
var _MainButton = _interopRequireDefault(require("../../../../Shared/Components/MainButton"));
|
|
20
20
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
21
|
+
function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
|
|
22
|
+
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); } }
|
|
23
|
+
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); }); }; }
|
|
21
24
|
function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
|
|
22
25
|
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, _toPropertyKey(descriptor.key), descriptor); } }
|
|
23
26
|
function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
|
|
@@ -77,6 +80,27 @@ var PdfDownload = /*#__PURE__*/function (_React$Component) {
|
|
|
77
80
|
classes = _this$props.classes,
|
|
78
81
|
show = _this$props.show,
|
|
79
82
|
onClose = _this$props.onClose;
|
|
83
|
+
var creatPdfUrl = /*#__PURE__*/function () {
|
|
84
|
+
var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
|
|
85
|
+
var pdfUrl;
|
|
86
|
+
return _regeneratorRuntime().wrap(function _callee$(_context) {
|
|
87
|
+
while (1) switch (_context.prev = _context.next) {
|
|
88
|
+
case 0:
|
|
89
|
+
_context.next = 2;
|
|
90
|
+
return _ServiceLocator.Services.interaction.createPdfUrl('user');
|
|
91
|
+
case 2:
|
|
92
|
+
pdfUrl = _context.sent;
|
|
93
|
+
return _context.abrupt("return", pdfUrl);
|
|
94
|
+
case 4:
|
|
95
|
+
case "end":
|
|
96
|
+
return _context.stop();
|
|
97
|
+
}
|
|
98
|
+
}, _callee);
|
|
99
|
+
}));
|
|
100
|
+
return function creatPdfUrl() {
|
|
101
|
+
return _ref.apply(this, arguments);
|
|
102
|
+
};
|
|
103
|
+
}();
|
|
80
104
|
return /*#__PURE__*/_react["default"].createElement(_CustomDialog["default"], {
|
|
81
105
|
open: show,
|
|
82
106
|
onClose: onClose,
|
|
@@ -93,7 +117,7 @@ var PdfDownload = /*#__PURE__*/function (_React$Component) {
|
|
|
93
117
|
},
|
|
94
118
|
id: "alert-dialog-description"
|
|
95
119
|
}, (0, _i18n.t)('pdfDownloadDialog.content'))), /*#__PURE__*/_react["default"].createElement(_DialogActions["default"], null, /*#__PURE__*/_react["default"].createElement(_MainButton["default"], {
|
|
96
|
-
href:
|
|
120
|
+
href: creatPdfUrl(),
|
|
97
121
|
target: "_blank",
|
|
98
122
|
variant: "contained",
|
|
99
123
|
classes: {
|
package/App/configuration.js
CHANGED
|
@@ -23,7 +23,7 @@ var _Translations = require("./Translations");
|
|
|
23
23
|
var _hyphenatedDe = _interopRequireDefault(require("hyphenated-de"));
|
|
24
24
|
var _Reducer = require("./Reducers/Configurator/Reducer");
|
|
25
25
|
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
|
|
26
|
-
var DEVELOPMENT_HOST_INT = 'http://int.configuratorware.local';
|
|
26
|
+
var DEVELOPMENT_HOST_INT = 'http://int.configuratorware-dev.local';
|
|
27
27
|
|
|
28
28
|
// eslint-disable-next-line no-unused-vars
|
|
29
29
|
var DEVELOPMENT_HOST_LOCAL = 'http://localhost:10030';
|
package/package.json
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@configuratorware/configurator-frontendgui",
|
|
3
|
-
"version": "1.46.
|
|
3
|
+
"version": "1.46.7",
|
|
4
4
|
"license": "UNLICENSED",
|
|
5
5
|
"private": false,
|
|
6
6
|
"main": "./index.js",
|
|
7
7
|
"dependencies": {
|
|
8
8
|
"@babel/polyfill": "^7.12.1",
|
|
9
|
-
"@configuratorware/scripts": "1.46.
|
|
9
|
+
"@configuratorware/scripts": "1.46.7",
|
|
10
10
|
"@material-ui/core": "^4.12.4",
|
|
11
11
|
"@material-ui/icons": "^4.11.3",
|
|
12
12
|
"@material-ui/lab": "^4.0.0-alpha.61",
|
|
@@ -36,8 +36,8 @@
|
|
|
36
36
|
"react-router-dom": "^5.3.4",
|
|
37
37
|
"react-swipeable": "^5.5.1",
|
|
38
38
|
"react-zoom-pan-pinch": "^2.1.3",
|
|
39
|
-
"redhotmagma-graphics-editor": "1.46.
|
|
40
|
-
"redhotmagma-visualization": "1.46.
|
|
39
|
+
"redhotmagma-graphics-editor": "1.46.7",
|
|
40
|
+
"redhotmagma-visualization": "1.46.7",
|
|
41
41
|
"redux": "^4.1.0",
|
|
42
42
|
"redux-logger": "^3.0.6",
|
|
43
43
|
"redux-persist": "^5.10.0",
|
|
@@ -300,7 +300,7 @@ export default class InteractionService extends AbstractInteractionService {
|
|
|
300
300
|
}
|
|
301
301
|
}
|
|
302
302
|
|
|
303
|
-
createPdfUrl(
|
|
303
|
+
async createPdfUrl(
|
|
304
304
|
documentType = 'user',
|
|
305
305
|
configuration = getConfiguration(Services.configurator.state),
|
|
306
306
|
queryParams = {}
|
|
@@ -334,7 +334,8 @@ export default class InteractionService extends AbstractInteractionService {
|
|
|
334
334
|
|
|
335
335
|
async saveWidgetConfigurationAndOpenPdf() {
|
|
336
336
|
await this.saveWidgetConfiguration();
|
|
337
|
-
|
|
337
|
+
const pdfUrl = await this.createPdfUrl('widget');
|
|
338
|
+
window.open(pdfUrl);
|
|
338
339
|
}
|
|
339
340
|
|
|
340
341
|
async saveWidgetConfigurationAndOpenConfigurator() {
|
|
@@ -41,13 +41,13 @@ describe('Services/InteractionService', () => {
|
|
|
41
41
|
'*'
|
|
42
42
|
);
|
|
43
43
|
});
|
|
44
|
-
test('createPdfUrl creates the correct url from the configuration', () => {
|
|
45
|
-
const url = interactionSrvc.createPdfUrl('widget', { code: 'abc123' });
|
|
44
|
+
test('createPdfUrl creates the correct url from the configuration', async () => {
|
|
45
|
+
const url = await interactionSrvc.createPdfUrl('widget', { code: 'abc123' });
|
|
46
46
|
expect(typeof url).toEqual('string');
|
|
47
47
|
expect(url.indexOf('frontendapi/configurations/pdf/widget/abc123')).not.toBe(-1);
|
|
48
48
|
});
|
|
49
|
-
test('createPdfUrl includes the necessary query parameters in the url', () => {
|
|
50
|
-
const url = interactionSrvc.createPdfUrl('widget', { code: 'abc123' });
|
|
49
|
+
test('createPdfUrl includes the necessary query parameters in the url', async () => {
|
|
50
|
+
const url = await interactionSrvc.createPdfUrl('widget', { code: 'abc123' });
|
|
51
51
|
expect(url.indexOf('_display_net_prices=1')).not.toBe(-1);
|
|
52
52
|
expect(url.indexOf('_language=de_DE')).not.toBe(-1);
|
|
53
53
|
expect(url.indexOf('_channel=_default')).not.toBe(-1);
|
|
@@ -51,6 +51,10 @@ class PdfDownload extends React.Component {
|
|
|
51
51
|
render() {
|
|
52
52
|
const { classes, show, onClose } = this.props;
|
|
53
53
|
|
|
54
|
+
const creatPdfUrl = async () => {
|
|
55
|
+
const pdfUrl = await Services.interaction.createPdfUrl('user');
|
|
56
|
+
return pdfUrl;
|
|
57
|
+
};
|
|
54
58
|
return (
|
|
55
59
|
<CustomDialog
|
|
56
60
|
open={show}
|
|
@@ -71,7 +75,7 @@ class PdfDownload extends React.Component {
|
|
|
71
75
|
</DialogContent>
|
|
72
76
|
<DialogActions>
|
|
73
77
|
<MainButton
|
|
74
|
-
href={
|
|
78
|
+
href={creatPdfUrl()}
|
|
75
79
|
target="_blank"
|
|
76
80
|
variant="contained"
|
|
77
81
|
classes={{
|
package/src/App/configuration.js
CHANGED
|
@@ -9,7 +9,7 @@ import hyphensDeDE from 'hyphenated-de';
|
|
|
9
9
|
|
|
10
10
|
import { setStateChangeReducers, setSubReducers } from './Reducers/Configurator/Reducer';
|
|
11
11
|
|
|
12
|
-
const DEVELOPMENT_HOST_INT = 'http://int.configuratorware.local';
|
|
12
|
+
const DEVELOPMENT_HOST_INT = 'http://int.configuratorware-dev.local';
|
|
13
13
|
|
|
14
14
|
// eslint-disable-next-line no-unused-vars
|
|
15
15
|
const DEVELOPMENT_HOST_LOCAL = 'http://localhost:10030';
|