@configuratorware/configurator-frontendgui 1.49.5 → 1.49.7

package/App/Store.js

@@ -15,7 +15,6 @@ var _configuration = require("./configuration");
 var _Reducers = _interopRequireDefault(require("./Reducers"));
 var _Reducer = _interopRequireDefault(require("./Reducers/Device/Reducer"));
 var _Reducer2 = _interopRequireDefault(require("./Reducers/Reducer"));
-var _i18n = require("../Framework/i18n");
 var _GeneralActions = require("./Reducers/GeneralActions");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
@@ -61,6 +60,4 @@ store.dispatch((0, _GeneralActions.setInitialState)());
 
 // translation setup
 (0, _reactReduxI18n.syncTranslationWithStore)(store);
-// setup
-(0, _i18n.setStore)(store, (0, _configuration.getConf)('language'));
 var _default = exports["default"] = store;

package/App/Translations.js

@@ -3,18 +3,22 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.findInitialLanguage = findInitialLanguage;
 exports.initLanguage = initLanguage;
-var _i18n = require("../Framework/i18n");
+exports.loadTranslationFile = loadTranslationFile;
 var _configuration = require("./configuration");
+var _Api = _interopRequireDefault(require("../Framework/Api"));
+var _i18n = require("../Framework/i18n");
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 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; }
 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 initLanguage(_x, _x2) {
-  return _initLanguage.apply(this, arguments);
+function loadTranslationFile(_x, _x2) {
+  return _loadTranslationFile.apply(this, arguments);
 }
-function _initLanguage() {
-  _initLanguage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(lang, baseURL) {
+function _loadTranslationFile() {
+  _loadTranslationFile = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(lang, baseURL) {
     var fileKey, langKey, results;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -40,13 +44,14 @@ function _initLanguage() {
         case 11:
           results = _context.t0;
           results.forEach(_i18n.use);
-        case 13:
+          return _context.abrupt("return", results);
+        case 14:
         case "end":
           return _context.stop();
       }
     }, _callee);
   }));
-  return _initLanguage.apply(this, arguments);
+  return _loadTranslationFile.apply(this, arguments);
 }
 function loadLanguageJson(filename, langKey) {
   return new Promise(function (resolve) {
@@ -71,4 +76,85 @@ function loadLanguageJson(filename, langKey) {
     });
     request.send();
   });
+}
+function findInitialLanguage() {
+  return _findInitialLanguage.apply(this, arguments);
+}
+function _findInitialLanguage() {
+  _findInitialLanguage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _languages$find;
+    var languages, language, _navigator$languages, _ref, browserLanguage, matchToBrowserLanguage;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _context2.next = 2;
+          return _Api["default"].request({
+            url: 'languages'
+          });
+        case 2:
+          languages = _context2.sent.data;
+          language = languages === null || languages === void 0 || (_languages$find = languages.find(function (lang) {
+            return lang.isDefault;
+          })) === null || _languages$find === void 0 ? void 0 : _languages$find.iso; // priority for api default language
+          if (!language && languages !== null && languages !== void 0 && languages.length) {
+            browserLanguage = (((_navigator$languages = navigator.languages) === null || _navigator$languages === void 0 ? void 0 : _navigator$languages[0]) || navigator.language).replace('-', '_');
+            matchToBrowserLanguage = languages.find(function (lang) {
+              return lang.iso === browserLanguage;
+            });
+            language = (_ref = matchToBrowserLanguage || languages[0]) === null || _ref === void 0 ? void 0 : _ref.iso;
+          }
+          return _context2.abrupt("return", language || 'de_DE');
+        case 6:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return _findInitialLanguage.apply(this, arguments);
+}
+function initLanguage() {
+  return _initLanguage.apply(this, arguments);
+}
+function _initLanguage() {
+  _initLanguage = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    var options,
+      language,
+      translations,
+      _args3 = arguments;
+    return _regeneratorRuntime().wrap(function _callee3$(_context3) {
+      while (1) switch (_context3.prev = _context3.next) {
+        case 0:
+          options = _args3.length > 0 && _args3[0] !== undefined ? _args3[0] : {};
+          _context3.t0 = (0, _configuration.getConf)('language');
+          if (_context3.t0) {
+            _context3.next = 6;
+            break;
+          }
+          _context3.next = 5;
+          return findInitialLanguage();
+        case 5:
+          _context3.t0 = _context3.sent;
+        case 6:
+          language = _context3.t0.replace('_', '-');
+          (0, _configuration.setConf)('language', language);
+          _Api["default"].setLanguage(language);
+          document.documentElement.lang = language.substring(0, 2);
+          _context3.next = 12;
+          return loadTranslationFile(language, (0, _configuration.getConf)('network.baseURL'));
+        case 12:
+          translations = _context3.sent;
+          if (options !== null && options !== void 0 && options.store) {
+            (0, _i18n.setStore)(options.store, language);
+          }
+          return _context3.abrupt("return", {
+            language: language,
+            translations: translations
+          });
+        case 15:
+        case "end":
+          return _context3.stop();
+      }
+    }, _callee3);
+  }));
+  return _initLanguage.apply(this, arguments);
 }

package/App/configuration.js

@@ -14,12 +14,9 @@ exports.setConf = setConf;
 exports.setConfiguration = setConfiguration;
 exports.setCustomApplicationConfiguration = void 0;
 var _get = _interopRequireDefault(require("lodash/get"));
-var _find = _interopRequireDefault(require("lodash/find"));
-var _first = _interopRequireDefault(require("lodash/first"));
 var _merge = _interopRequireDefault(require("lodash/merge"));
 var _set = _interopRequireDefault(require("lodash/set"));
 var _Api = _interopRequireDefault(require("../Framework/Api"));
-var _Translations = require("./Translations");
 var _hyphenatedDe = _interopRequireDefault(require("hyphenated-de"));
 var _Reducer = require("./Reducers/Configurator/Reducer");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -258,7 +255,6 @@ function init() {
   }
   applicationConfiguration = (0, _merge["default"])(applicationConfiguration, getQueryParams());
   _Api["default"].init(applicationConfiguration.network);
-  setLanguage();
   setDocumentDomain();
   preventLeavingPage();
   return applicationConfiguration;
@@ -340,7 +336,6 @@ function getQueryParams() {
 }
 function setConfiguration(customApplicationConfiguration) {
   applicationConfiguration = (0, _merge["default"])(applicationConfiguration, customApplicationConfiguration, getQueryParams());
-  setLanguage();
 
   // if there is a config for network Api instance defaults must be updated
   if (applicationConfiguration.network) {
@@ -356,50 +351,6 @@ function setConfiguration(customApplicationConfiguration) {
     (0, _Reducer.setStateChangeReducers)(stateChangeReducers);
   }
 }
-function setLanguage() {
-  var language;
-  // if the default language is defined in the configuration
-  if (applicationConfiguration.language) {
-    language = applicationConfiguration.language;
-  }
-  // if there is a locales array in the configuration...
-  else if (applicationConfiguration.locales) {
-    var browserLanguage = (0, _get["default"])(navigator, 'languages[0]', navigator.language).replace('-', '_');
-    var matchToBrowserLanguage = (0, _find["default"])(applicationConfiguration.locales, {
-      code: browserLanguage
-    });
-    var preferred = (0, _find["default"])(applicationConfiguration.locales, {
-      preferred: true
-    });
-
-    // if there is a match with the browser language use that
-    if (matchToBrowserLanguage) {
-      language = matchToBrowserLanguage.code;
-    }
-    // if the preferred language is set use it
-    else if (preferred) {
-      language = preferred.code;
-    }
-    // otherwise use the first from the locales list
-    else {
-      language = (0, _first["default"])(applicationConfiguration.locales).code;
-    }
-  }
-  // we have no info about the language, so try to use the browser language
-  else {
-    language = (0, _get["default"])(navigator, 'languages[0]', navigator.language).replace('-', '_') || 'de_DE';
-  }
-  if (!(0, _find["default"])(applicationConfiguration.locales, {
-    code: language
-  })) {
-    // eslint-disable-next-line no-console
-    console.warn("The selected language (".concat(language, ") is not listed in the available languages!"));
-  }
-  applicationConfiguration.language = language.replace('_', '-');
-  _Api["default"].setLanguage(applicationConfiguration.language);
-  document.documentElement.lang = language.substring(0, 2);
-  (0, _Translations.initLanguage)(applicationConfiguration.language, applicationConfiguration.network.baseURL);
-}
 
 // backward compatibility alias
 var setCustomApplicationConfiguration = exports.setCustomApplicationConfiguration = setConfiguration;

package/App/index.js

@@ -1,9 +1,10 @@
 "use strict";
 
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.render = exports.main = exports["default"] = exports.App = void 0;
+exports.render = exports.main = exports.languageInitPromise = exports["default"] = exports.App = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _client = require("react-dom/client");
 var _reactRedux = require("react-redux");
@@ -13,18 +14,58 @@ var _initServices = require("./initServices");
 var _Routing = _interopRequireDefault(require("./Routing"));
 var _Store = require("./Store");
 var _ServiceLocator = require("./ServiceLocator");
+var _Translations = require("./Translations");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+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; }
+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); }); }; }
 var App = exports.App = function App() {
   return /*#__PURE__*/_react["default"].createElement(_reactRedux.Provider, {
     store: _Store.store
   }, /*#__PURE__*/_react["default"].createElement(_Routing["default"], null));
 };
-var render = exports.render = function render() {
-  (0, _client.createRoot)(document.getElementById('root')).render( /*#__PURE__*/_react["default"].createElement(App, null));
-};
-var main = exports.main = function main() {
-  var services = (0, _initServices.initServices)();
-  _ServiceLocator.Services.store.setStore(_Store.store);
-  services.configurator.initialize();
-};
+var languageInitPromise = exports.languageInitPromise = (0, _Translations.initLanguage)({
+  store: _Store.store
+});
+var render = exports.render = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) switch (_context.prev = _context.next) {
+        case 0:
+          _context.next = 2;
+          return languageInitPromise;
+        case 2:
+          (0, _client.createRoot)(document.getElementById('root')).render( /*#__PURE__*/_react["default"].createElement(App, null));
+        case 3:
+        case "end":
+          return _context.stop();
+      }
+    }, _callee);
+  }));
+  return function render() {
+    return _ref.apply(this, arguments);
+  };
+}();
+var main = exports.main = /*#__PURE__*/function () {
+  var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var services;
+    return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+      while (1) switch (_context2.prev = _context2.next) {
+        case 0:
+          _context2.next = 2;
+          return languageInitPromise;
+        case 2:
+          services = (0, _initServices.initServices)();
+          _ServiceLocator.Services.store.setStore(_Store.store);
+          services.configurator.initialize();
+        case 5:
+        case "end":
+          return _context2.stop();
+      }
+    }, _callee2);
+  }));
+  return function main() {
+    return _ref2.apply(this, arguments);
+  };
+}();
 var _default = exports["default"] = App;

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@configuratorware/configurator-frontendgui",
-  "version": "1.49.5",
+  "version": "1.49.7",
   "license": "UNLICENSED",
   "private": false,
   "main": "./index.js",
   "dependencies": {
     "@babel/polyfill": "^7.12.1",
-    "@configuratorware/scripts": "1.49.5",
+    "@configuratorware/scripts": "1.49.7",
     "@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.49.5",
-    "redhotmagma-visualization": "1.49.5",
+    "redhotmagma-graphics-editor": "1.49.7",
+    "redhotmagma-visualization": "1.49.7",
     "redux": "^4.1.0",
     "redux-logger": "^3.0.6",
     "redux-persist": "^5.10.0",

package/src/App/Store.js

@@ -13,7 +13,6 @@ import combinedReducers from './Reducers';
 import deviceReducer from './Reducers/Device/Reducer';
 import apiReducer from './Reducers/Reducer';
 
-import { setStore as i18nSetStore } from '../Framework/i18n';
 import { setInitialState } from './Reducers/GeneralActions';
 
 const reduxPersistConfig = getConf('reduxPersist', { enabled: false });
@@ -60,7 +59,5 @@ store.dispatch(setInitialState());
 
 // translation setup
 syncTranslationWithStore(store);
-// setup
-i18nSetStore(store, getConf('language'));
 
 export default store;

package/src/App/Translations.js

@@ -1,6 +1,8 @@
-import { use } from 'Framework/i18n';
-import { isProduction } from './configuration';
-export async function initLanguage(lang, baseURL) {
+import { isProduction, getConf, setConf } from './configuration';
+import Api from '../Framework/Api';
+import { use, setStore } from '../Framework/i18n';
+
+export async function loadTranslationFile(lang, baseURL) {
     // ensure that the filename always has an underscore and no dash
     const fileKey = lang.replace('-', '_');
     const langKey = lang.substring(0, 2);
@@ -12,6 +14,7 @@ export async function initLanguage(lang, baseURL) {
               loadLanguageJson('/translations_custom/' + fileKey + '.json', langKey),
           ]);
     results.forEach(use);
+    return results;
 }
 
 function loadLanguageJson(filename, langKey) {
@@ -39,3 +42,29 @@ function loadLanguageJson(filename, langKey) {
         request.send();
     });
 }
+
+export async function findInitialLanguage() {
+    const languages = (await Api.request({ url: 'languages' })).data;
+    let language = languages?.find(lang => lang.isDefault)?.iso; // priority for api default language
+    if (!language && languages?.length) {
+        const browserLanguage = (navigator.languages?.[0] || navigator.language).replace('-', '_');
+        const matchToBrowserLanguage = languages.find(lang => lang.iso === browserLanguage);
+        language = (matchToBrowserLanguage || languages[0])?.iso;
+    }
+    return language || 'de_DE';
+}
+
+export async function initLanguage(options = {}) {
+    const language = (getConf('language') || (await findInitialLanguage())).replace('_', '-');
+    setConf('language', language);
+    Api.setLanguage(language);
+    document.documentElement.lang = language.substring(0, 2);
+    const translations = await loadTranslationFile(language, getConf('network.baseURL'));
+    if (options?.store) {
+        setStore(options.store, language);
+    }
+    return {
+        language,
+        translations,
+    };
+}

package/src/App/configuration.js

@@ -1,10 +1,7 @@
 import get from 'lodash/get';
-import find from 'lodash/find';
-import first from 'lodash/first';
 import merge from 'lodash/merge';
 import set from 'lodash/set';
 import Api from '../Framework/Api';
-import { initLanguage } from './Translations';
 import hyphensDeDE from 'hyphenated-de';
 
 import { setStateChangeReducers, setSubReducers } from './Reducers/Configurator/Reducer';
@@ -283,7 +280,6 @@ export function init() {
 
     Api.init(applicationConfiguration.network);
 
-    setLanguage();
     setDocumentDomain();
     preventLeavingPage();
 
@@ -387,8 +383,6 @@ export function setConfiguration(customApplicationConfiguration) {
         getQueryParams()
     );
 
-    setLanguage();
-
     // if there is a config for network Api instance defaults must be updated
     if (applicationConfiguration.network) {
         Api.init(applicationConfiguration.network);
@@ -402,45 +396,6 @@ export function setConfiguration(customApplicationConfiguration) {
     }
 }
 
-function setLanguage() {
-    let language;
-    // if the default language is defined in the configuration
-    if (applicationConfiguration.language) {
-        language = applicationConfiguration.language;
-    }
-    // if there is a locales array in the configuration...
-    else if (applicationConfiguration.locales) {
-        const browserLanguage = get(navigator, 'languages[0]', navigator.language).replace('-', '_');
-        const matchToBrowserLanguage = find(applicationConfiguration.locales, { code: browserLanguage });
-        const preferred = find(applicationConfiguration.locales, { preferred: true });
-
-        // if there is a match with the browser language use that
-        if (matchToBrowserLanguage) {
-            language = matchToBrowserLanguage.code;
-        }
-        // if the preferred language is set use it
-        else if (preferred) {
-            language = preferred.code;
-        }
-        // otherwise use the first from the locales list
-        else {
-            language = first(applicationConfiguration.locales).code;
-        }
-    }
-    // we have no info about the language, so try to use the browser language
-    else {
-        language = get(navigator, 'languages[0]', navigator.language).replace('-', '_') || 'de_DE';
-    }
-    if (!find(applicationConfiguration.locales, { code: language })) {
-        // eslint-disable-next-line no-console
-        console.warn(`The selected language (${language}) is not listed in the available languages!`);
-    }
-    applicationConfiguration.language = language.replace('_', '-');
-    Api.setLanguage(applicationConfiguration.language);
-    document.documentElement.lang = language.substring(0, 2);
-    initLanguage(applicationConfiguration.language, applicationConfiguration.network.baseURL);
-}
-
 // backward compatibility alias
 export const setCustomApplicationConfiguration = setConfiguration;
 

package/src/App/index.js

@@ -10,17 +10,23 @@ import Routing from './Routing';
 import { store } from './Store';
 import { Services } from './ServiceLocator';
 
+import { initLanguage } from './Translations';
+
 export const App = () => (
     <Provider store={store}>
         <Routing />
     </Provider>
 );
 
-export const render = () => {
+export const languageInitPromise = initLanguage({ store });
+
+export const render = async () => {
+    await languageInitPromise;
     createRoot(document.getElementById('root')).render(<App />);
 };
 
-export const main = () => {
+export const main = async () => {
+    await languageInitPromise;
     const services = initServices();
     Services.store.setStore(store);
     services.configurator.initialize();