@crystaldesign/diva-backoffice 24.1.2-beta.1 → 24.1.2-beta.10

package/build/esm/index.js

@@ -31,13 +31,13 @@ import InfoCircleOutlined from '@ant-design/icons/InfoCircleOutlined';
 import DeleteOutlined from '@ant-design/icons/DeleteOutlined';
 import JSONEditor from 'jsoneditor';
 import 'jsoneditor/dist/jsoneditor.css';
+import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import PlusOutlined from '@ant-design/icons/PlusOutlined';
 import CheckCircleOutlined from '@ant-design/icons/CheckCircleOutlined';
 import DivaUtils$1, { nanoid } from '@crystaldesign/diva-utils';
 import ReloadOutlined from '@ant-design/icons/ReloadOutlined';
 import QuestionCircleOutlined from '@ant-design/icons/QuestionCircleOutlined';
 import WarningTwoTone from '@ant-design/icons/WarningTwoTone';
-import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import CheckOutlined from '@ant-design/icons/lib/icons/CheckOutlined';
 import CloseOutlined from '@ant-design/icons/lib/icons/CloseOutlined';
 import { ContentBoxComponent } from '@crystaldesign/content-box';
@@ -114,12 +114,12 @@ import RoomSelection from '@crystaldesign/room-selection';
     globalThis.process = { env:env };
 })();
 
-function _createForOfIteratorHelper$l(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$l(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray$l(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$l(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$l(o, minLen); }
-function _arrayLikeToArray$l(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function ownKeys$D(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$D(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$D(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$D(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var LOG$a = getLogger('Backoffice', 'AplyMapping');
+function _createForOfIteratorHelper$m(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$m(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray$m(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$m(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$m(o, minLen); }
+function _arrayLikeToArray$m(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function ownKeys$E(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$E(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$E(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$E(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var LOG$b = getLogger('Backoffice', 'AplyMapping');
 function aplyMapping (_ref) {
   var mapable = _ref.mapable,
     mappingData = _ref.mappingData,
@@ -139,10 +139,10 @@ function aplyMapping (_ref) {
         var newValue = {};
         newValue[newKey] = valueToAdd;
         if ((startValue === null || startValue === void 0 ? void 0 : startValue[newKey]) != undefined) {
-          if (_typeof(startValue[newKey]) == 'object') startValue[newKey] = _objectSpread$D(_objectSpread$D({}, startValue[newKey]), valueToAdd);else startValue[newKey] = type == 'addToSourceValue' ? startValue[newKey] + valueToAdd : valueToAdd;
+          if (_typeof(startValue[newKey]) == 'object') startValue[newKey] = _objectSpread$E(_objectSpread$E({}, startValue[newKey]), valueToAdd);else startValue[newKey] = type == 'addToSourceValue' ? startValue[newKey] + valueToAdd : valueToAdd;
           return startValue;
         }
-        if (newIdx == 1) return _objectSpread$D(_objectSpread$D({}, startValue), newValue);
+        if (newIdx == 1) return _objectSpread$E(_objectSpread$E({}, startValue), newValue);
         return getTarget(idx + 1, keys, startValue, newValue);
       };
       returnValue = getTarget(0, key.split('.'), returnValue, value);
@@ -151,7 +151,7 @@ function aplyMapping (_ref) {
   function meetsCondition(map) {
     if (!map.condition) return true;
     var value = mappingData[map.condition.field];
-    var _iterator = _createForOfIteratorHelper$l(map.condition.values),
+    var _iterator = _createForOfIteratorHelper$m(map.condition.values),
       _step;
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -228,7 +228,7 @@ function aplyMapping (_ref) {
             }
           }
         }
-        var _iterator2 = _createForOfIteratorHelper$l(_url.searchParams.entries()),
+        var _iterator2 = _createForOfIteratorHelper$m(_url.searchParams.entries()),
           _step2;
         try {
           for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
@@ -263,7 +263,7 @@ function aplyMapping (_ref) {
     }
     return returnValue;
   } catch (e) {
-    LOG$a.debug('Mapabledata', mapable);
+    LOG$b.debug('Mapabledata', mapable);
     throw e;
   }
 }
@@ -405,9 +405,9 @@ function getLeafColumns(columns) {
   });
 }
 
-function ownKeys$C(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$C(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$C(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$C(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var LOG$9 = getLogger('Backoffice', 'ApiHandler');
+function ownKeys$D(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$D(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$D(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$D(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var LOG$a = getLogger('Backoffice', 'ApiHandler');
 var jp = require('jsonpath');
 var _default$d = /*#__PURE__*/function () {
   function _default(configuration, _rootStore) {
@@ -426,6 +426,7 @@ var _default$d = /*#__PURE__*/function () {
     _defineProperty(this, "_readListUrl", void 0);
     _defineProperty(this, "_fallBackToParams", true);
     _defineProperty(this, "_readJsonPath", void 0);
+    _defineProperty(this, "_readPublicData", false);
     _defineProperty(this, "_filterFields", void 0);
     _defineProperty(this, "_socketUrl", void 0);
     _defineProperty(this, "_socket", undefined);
@@ -463,7 +464,7 @@ var _default$d = /*#__PURE__*/function () {
         this._readOneUrl = configuration.apiInterface.read;
         this._fallBackToParams = true;
       } else {
-        var _configuration$apiInt10, _configuration$apiInt11, _configuration$apiInt12, _configuration$apiInt14, _configuration$apiInt15, _configuration$apiInt16;
+        var _configuration$apiInt10, _configuration$apiInt11, _configuration$apiInt12, _configuration$apiInt14, _configuration$apiInt15, _configuration$apiInt16, _configuration$apiInt17;
         this._readListUrl = (_configuration$apiInt10 = configuration.apiInterface.read) === null || _configuration$apiInt10 === void 0 ? void 0 : _configuration$apiInt10.list;
         this._readOneUrl = (_configuration$apiInt11 = configuration.apiInterface.read) === null || _configuration$apiInt11 === void 0 ? void 0 : _configuration$apiInt11.one;
 
@@ -485,6 +486,7 @@ var _default$d = /*#__PURE__*/function () {
         this._readJsonPath = (_configuration$apiInt14 = configuration.apiInterface.read) === null || _configuration$apiInt14 === void 0 ? void 0 : _configuration$apiInt14.jsonPath;
         this._filterFields = (_configuration$apiInt15 = configuration.apiInterface.read) === null || _configuration$apiInt15 === void 0 ? void 0 : _configuration$apiInt15.fields;
         this._fallBackToParams = !!((_configuration$apiInt16 = configuration.apiInterface.read) !== null && _configuration$apiInt16 !== void 0 && _configuration$apiInt16.fallBackToParams);
+        this._readPublicData = !!((_configuration$apiInt17 = configuration.apiInterface.read) !== null && _configuration$apiInt17 !== void 0 && _configuration$apiInt17["public"]);
       }
       this._socketUrl = configuration.apiInterface.socket;
     }
@@ -558,7 +560,7 @@ var _default$d = /*#__PURE__*/function () {
               _context2.next = 13;
               return fetch(finalUrl, {
                 method: this._updateMethod,
-                headers: _objectSpread$C(_objectSpread$C({}, jwt ? {
+                headers: _objectSpread$D(_objectSpread$D({}, jwt ? {
                   Authorization: 'Bearer ' + jwt
                 } : {}), {}, {
                   'Content-Type': 'application/json'
@@ -649,7 +651,7 @@ var _default$d = /*#__PURE__*/function () {
                   rootStore: this._rootStore,
                   fallBackToParams: true
                 });
-                if (data) createData = _objectSpread$C({}, data);
+                if (data) createData = _objectSpread$D({}, data);
               } else if (data !== undefined) {
                 createData = aplyMapping({
                   mapable: data,
@@ -790,7 +792,7 @@ var _default$d = /*#__PURE__*/function () {
               _context6.next = 7;
               return fetch((_url = url) === null || _url === void 0 ? void 0 : _url.toString(), {
                 method: isApi2 ? 'POST' : 'DELETE',
-                headers: _objectSpread$C({}, jwt ? {
+                headers: _objectSpread$D({}, jwt ? {
                   Authorization: 'Bearer ' + jwt
                 } : {})
               }).then( /*#__PURE__*/function () {
@@ -906,7 +908,7 @@ var _default$d = /*#__PURE__*/function () {
               throw new Error('Read List endpoint is missing in configuration.');
             case 2:
               jwt = (_this$_rootStore5 = this._rootStore) === null || _this$_rootStore5 === void 0 ? void 0 : _this$_rootStore5.dataStore.jwt;
-              url = filterServerSide ? parseServersideFilters(_objectSpread$C(_objectSpread$C({}, filterServerSide), {}, {
+              url = filterServerSide ? parseServersideFilters(_objectSpread$D(_objectSpread$D({}, filterServerSide), {}, {
                 columns: this._filterFields ? filterServerSide.columns : undefined,
                 baseUrl: this._readListUrl,
                 prefilter: prefilter
@@ -926,7 +928,7 @@ var _default$d = /*#__PURE__*/function () {
               });
             case 6:
               response = _context8.sent;
-              return _context8.abrupt("return", _objectSpread$C(_objectSpread$C({}, response), {}, {
+              return _context8.abrupt("return", _objectSpread$D(_objectSpread$D({}, response), {}, {
                 data: response.data.map(function (d) {
                   return _this2.aplyJsonPath(d, _this2._readJsonPath);
                 })
@@ -950,7 +952,7 @@ var _default$d = /*#__PURE__*/function () {
         throw new Error('Read List endpoint is missing in configuration.');
       }
       (_this$_rootStore6 = this._rootStore) === null || _this$_rootStore6 === void 0 ? void 0 : _this$_rootStore6.dataStore.jwt;
-      var url = filterServerSide ? parseServersideFilters(_objectSpread$C(_objectSpread$C({}, filterServerSide), {}, {
+      var url = filterServerSide ? parseServersideFilters(_objectSpread$D(_objectSpread$D({}, filterServerSide), {}, {
         columns: this._filterFields ? filterServerSide.columns : undefined,
         baseUrl: this._readListUrl,
         prefilter: prefilter
@@ -982,9 +984,11 @@ var _default$d = /*#__PURE__*/function () {
               headers = {
                 'content-type': 'application/json'
               };
-              if (sessionGuid) headers['SessionGuid'] = sessionGuid;
-              if (jwt) headers['Authorization'] = 'Bearer ' + jwt;
-              _context9.next = 6;
+              if (!this._readPublicData) {
+                if (sessionGuid) headers['SessionGuid'] = sessionGuid;
+                if (jwt) headers['Authorization'] = 'Bearer ' + jwt;
+              }
+              _context9.next = 5;
               return fetch(url.toString(), {
                 headers: headers
               }).then(function (r) {
@@ -996,10 +1000,10 @@ var _default$d = /*#__PURE__*/function () {
                   return undefined;
                 }
               });
-            case 6:
+            case 5:
               response = _context9.sent;
               return _context9.abrupt("return", response);
-            case 8:
+            case 7:
             case "end":
               return _context9.stop();
           }
@@ -1049,16 +1053,16 @@ var _default$d = /*#__PURE__*/function () {
         }
       });
       this._socket.on('error', function (error) {
-        LOG$9.error('Error on connection!', error);
+        LOG$a.error('Error on connection!', error);
       });
       this._socket.on('connect_error', function (error) {
-        LOG$9.log("connect_error due to ".concat(error.message));
+        LOG$a.log("connect_error due to ".concat(error.message));
       });
       this._socket.on('connect', function () {
-        LOG$9.debug('Successfully connected to socket');
+        LOG$a.debug('Successfully connected to socket');
       });
       this._socket.on('disconnect', function () {
-        LOG$9.debug('Disconnect from socket');
+        LOG$a.debug('Disconnect from socket');
       });
       return this._socket;
     }
@@ -1156,8 +1160,8 @@ var _default$c = /*#__PURE__*/function (_ApiHandler) {
   return _default;
 }(_default$d);
 
-function ownKeys$B(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$B(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$B(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$B(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$C(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$C(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$C(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$C(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _callSuper$6(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct$6() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct$6() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct$6 = function _isNativeReflectConstruct() { return !!t; })(); }
 var _default$b = /*#__PURE__*/function (_ApiHandler) {
@@ -1256,7 +1260,7 @@ var _default$b = /*#__PURE__*/function (_ApiHandler) {
               _context2.next = 5;
               return fetch(this._createUrl + '?ref=true', {
                 method: this._createMethod,
-                headers: _objectSpread$B({}, jwt ? {
+                headers: _objectSpread$C({}, jwt ? {
                   Authorization: 'Bearer ' + jwt
                 } : {}),
                 body: data
@@ -1636,8 +1640,8 @@ var _default$8 = /*#__PURE__*/function (_ApiHandler) {
   return _default;
 }(_default$d);
 
-function ownKeys$A(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$A(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$A(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$A(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$B(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$B(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$B(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$B(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var _default$7 = /*#__PURE__*/function () {
   function _default(root) {
     _classCallCheck(this, _default);
@@ -1664,7 +1668,7 @@ var _default$7 = /*#__PURE__*/function () {
       }
       if (config.type == 'Menu') {
         var filteredItems = filterMenuByPermission(this.root.actions.userHasPermission, config.items);
-        config = _objectSpread$A(_objectSpread$A({}, config), {}, {
+        config = _objectSpread$B(_objectSpread$B({}, config), {}, {
           items: filteredItems
         });
       } else if (config.type == 'Group') {
@@ -1673,7 +1677,7 @@ var _default$7 = /*#__PURE__*/function () {
           var _i$permission;
           return !i.permission || _this.root.actions.userHasPermission((_i$permission = i.permission) === null || _i$permission === void 0 ? void 0 : _i$permission.toLocaleLowerCase());
         });
-        config = _objectSpread$A(_objectSpread$A({}, config), {}, {
+        config = _objectSpread$B(_objectSpread$B({}, config), {}, {
           items: _filteredItems
         });
       }
@@ -1681,9 +1685,9 @@ var _default$7 = /*#__PURE__*/function () {
     }
   }, {
     key: "setConfiguration",
-    value: function setConfiguration(config, apiConfig, t) {
+    value: function setConfiguration(config, apiConfig, t, lang) {
       this._apiConfig = apiConfig;
-      var configuration = loadConfiguration(t, this.root, config);
+      var configuration = loadConfiguration(t, this.root, config, lang);
 
       //merge with configuration so everything can changed by config
       if (config.configuration) {
@@ -1744,14 +1748,14 @@ function filterMenuByPermission(hasPermission, items) {
   return items.filter(function (item) {
     return !item.permission || hasPermission(item.permission.toLocaleLowerCase());
   }).map(function (item) {
-    return _objectSpread$A(_objectSpread$A({}, item), {}, {
+    return _objectSpread$B(_objectSpread$B({}, item), {}, {
       items: filterMenuByPermission(hasPermission, item.items)
     });
   }).filter(function (item) {
     return !item.items || item.items.length > 0;
   });
 }
-function loadConfiguration(t, root, config) {
+function loadConfiguration(t, root, config, lang) {
   var _organization$setting, _organization$setting2, _organization$setting3, _organization$setting4, _parentOrganizations, _parentOrganizations2, _parentOrganizations3, _parentOrganizations4, _parentOrganizations5, _parentOrganizations6, _parentOrganizations7, _parentOrganizations8, _parentOrganizations9, _parentOrganizations10, _parentOrganizations11, _parentOrganizations12, _parentOrganizations13;
   var organization = toJS(root.dataStore.currentOrganization);
   return {
@@ -2738,62 +2742,61 @@ function loadConfiguration(t, root, config) {
         field: 'ArticleName',
         sorter: 1,
         filter: 'advanced',
-        width: 50
+        width: 150
       }, {
         title: t('backoffice.table.partlists.columns.GroupName'),
         field: 'GroupName',
         sorter: 2,
         filter: 'advanced',
-        width: 150
+        width: 100
       }, {
         title: t('backoffice.table.partlists.columns.ItemRefArticleCodex'),
         field: 'ItemRefArticleCodex',
         sorter: 3,
         filter: 'advanced',
-        width: 50
+        width: 100
       }, {
         title: t('backoffice.table.partlists.columns.RefWidth'),
         field: 'RefWidth',
         sorter: 4,
         filter: 'advanced',
-        width: 50
+        width: 60
       }, {
         title: t('backoffice.table.partlists.columns.RefHeight'),
         field: 'RefHeight',
         filter: 'advanced',
         sorter: 5,
-        width: 50
+        width: 60
       }, {
         title: t('backoffice.table.partlists.columns.RefDepth'),
         field: 'RefDepth',
         sorter: 6,
         filter: 'advanced',
-        width: 50
+        width: 60
       }, {
         title: t('backoffice.table.partlists.columns.GroupedFormula'),
         field: 'GroupedFormula',
         sorter: 7,
-        filter: 'advanced',
-        width: 200
+        filter: 'advanced'
       }, {
         title: t('backoffice.table.partlists.columns.Formula'),
         field: 'Formula',
         sorter: 8,
-        filter: 'advanced',
-        width: 200
+        filter: 'advanced'
       }, {
         title: t('backoffice.table.partlists.columns.RetailPrefix'),
         field: 'RetailPrefix',
         sorter: 9,
         filter: 'advanced',
-        width: 50
+        width: 110
       }, {
         title: t('backoffice.table.partlists.columns.RetailArticleNr'),
         field: 'RetailArticleNr',
         editable: true,
         sorter: 9,
         filter: 'advanced',
-        width: 150
+        width: 150,
+        fixed: 'right'
       }],
       apiInterface: {
         read: {
@@ -6123,13 +6126,21 @@ function loadConfiguration(t, root, config) {
       }, {
         name: 'countryCode',
         label: t('backoffice.form.organizationdetails.items.countryCode'),
-        required: function required(data) {
-          return !((data === null || data === void 0 ? void 0 : data.parentType) === 'SUPPLIER' && (data === null || data === void 0 ? void 0 : data.type) === undefined);
+        type: 'selectSimple',
+        apiInterface: {
+          read: {
+            list: '/country_codes.json',
+            "public": true
+          }
         },
-        type: 'input',
-        hidden: function hidden(data) {
-          return (data === null || data === void 0 ? void 0 : data.parentType) === 'SUPPLIER' && (data === null || data === void 0 ? void 0 : data.type) === undefined;
-        }
+        selectMapping: {
+          label: "${".concat(lang, "}"),
+          value: '${code}',
+          externalValue: 'value'
+        },
+        placeholder: t('backoffice.form.organizationdetails.items.selectCountryCode'),
+        allowClear: true,
+        search: true
       }, {
         name: 'contact',
         label: 'backoffice.organization.contact',
@@ -8319,7 +8330,17 @@ function loadConfiguration(t, root, config) {
       }, {
         name: 'countryCode',
         label: t('backoffice.description.currentorg.items.countryCode'),
-        span: 2
+        span: 2,
+        value: {
+          apiInterface: {
+            read: {
+              list: '/country_codes.json',
+              "public": true
+            }
+          },
+          label: "".concat(lang),
+          value: 'code'
+        }
       }, {
         name: 'contact',
         label: 'backoffice.organization.contact',
@@ -10031,9 +10052,9 @@ function loadConfiguration(t, root, config) {
   };
 }
 
-function _createForOfIteratorHelper$k(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$k(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray$k(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$k(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$k(o, minLen); }
-function _arrayLikeToArray$k(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _createForOfIteratorHelper$l(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$l(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray$l(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$l(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$l(o, minLen); }
+function _arrayLikeToArray$l(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function aplyRule(_ref) {
   var rules = _ref.rules,
     data = _ref.data,
@@ -10042,7 +10063,7 @@ function aplyRule(_ref) {
   //if or we start with false until the first time some result is true
   //if and we start with true until the frist time some result is false
   var result = !or;
-  var _iterator = _createForOfIteratorHelper$k(rules),
+  var _iterator = _createForOfIteratorHelper$l(rules),
     _step;
   try {
     var _loop = function _loop() {
@@ -10095,7 +10116,7 @@ function aplyRules(_ref2) {
     rootStore = _ref2.rootStore,
     or = _ref2.or;
   if (!data || data.length == 0) return false;
-  var _iterator2 = _createForOfIteratorHelper$k(data),
+  var _iterator2 = _createForOfIteratorHelper$l(data),
     _step2;
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
@@ -10438,10 +10459,10 @@ var _default$3 = /*#__PURE__*/function () {
   return _default;
 }();
 
-function _createForOfIteratorHelper$j(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$j(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray$j(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$j(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$j(o, minLen); }
-function _arrayLikeToArray$j(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-var LOG$8 = getLogger('Backoffice', 'DownloadStore');
+function _createForOfIteratorHelper$k(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$k(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray$k(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$k(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$k(o, minLen); }
+function _arrayLikeToArray$k(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+var LOG$9 = getLogger('Backoffice', 'DownloadStore');
 var DownloadStore = /*#__PURE__*/function () {
   function DownloadStore(_rootStore) {
     var _this = this;
@@ -10468,7 +10489,7 @@ var DownloadStore = /*#__PURE__*/function () {
                 _context2.next = 23;
                 break;
               }
-              _iterator = _createForOfIteratorHelper$j(action.download);
+              _iterator = _createForOfIteratorHelper$k(action.download);
               _context2.prev = 8;
               _loop = /*#__PURE__*/_regeneratorRuntime.mark(function _loop() {
                 var _download$params, _ref3, _data$fileUrl;
@@ -10657,7 +10678,7 @@ var DownloadStore = /*#__PURE__*/function () {
                 _context5.next = 4;
                 break;
               }
-              LOG$8.debug("The organization ".concat(data._id, " has no parentType of ").concat(validTypes.join(' or ')));
+              LOG$9.debug("The organization ".concat(data._id, " has no parentType of ").concat(validTypes.join(' or ')));
               throw new Error("Current organization is no ".concat(type == 'RETAILER' ? 'retailer,  retailer channel or association' : 'supplier or dealer'));
             case 4:
               orgData = data;
@@ -10676,7 +10697,7 @@ var DownloadStore = /*#__PURE__*/function () {
                 _context5.next = 14;
                 break;
               }
-              LOG$8.debug("The organization ".concat(data._id, " has no type of ").concat(validTypes.join(' or '), " nor a parent organization"));
+              LOG$9.debug("The organization ".concat(data._id, " has no type of ").concat(validTypes.join(' or '), " nor a parent organization"));
               throw new Error("Current organization is no ".concat(type == 'RETAILER' ? 'retailer channel or association' : 'supplier or dealer'));
             case 14:
               _context5.prev = 14;
@@ -10796,7 +10817,7 @@ var DownloadStore = /*#__PURE__*/function () {
                 break;
               }
               promises = [];
-              _iterator2 = _createForOfIteratorHelper$j(props.data);
+              _iterator2 = _createForOfIteratorHelper$k(props.data);
               _context7.prev = 3;
               _iterator2.s();
             case 5:
@@ -11024,7 +11045,7 @@ var StoreProvider = function StoreProvider(_ref) {
   useEffect(function () {
     store.dataStore.setUserData(jwt, nToken, user);
     store.dataStore.setOrganizationData(organization);
-    store.configurationStore.setConfiguration(settings, apiConfig, t);
+    store.configurationStore.setConfiguration(settings, apiConfig, t, i18n.language);
   }, [jwt, nToken, user, organization, settings, apiConfig, i18n.language]);
   useEffect(function () {
     store.updateHandlers(handler);
@@ -11042,8 +11063,35 @@ var useStore = function useStore() {
   return store;
 };
 
-function ownKeys$z(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$z(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$z(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$z(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _createForOfIteratorHelper$j(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$j(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray$j(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$j(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$j(o, minLen); }
+function _arrayLikeToArray$j(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function getCombinedValues(data, pattern) {
+  if (!pattern || !data) {
+    return data;
+  }
+  var value = pattern;
+  var _iterator = _createForOfIteratorHelper$j(pattern.matchAll(/\$\{(.*?)\}/g)),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var _flatten$match$;
+      var match = _step.value;
+      value = value.replace(match[0], (_flatten$match$ = flat(data)[match[1]]) !== null && _flatten$match$ !== void 0 ? _flatten$match$ : '');
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return value;
+}
+
+function _createForOfIteratorHelper$i(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$i(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray$i(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$i(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$i(o, minLen); }
+function _arrayLikeToArray$i(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function ownKeys$A(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$A(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$A(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$A(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function useDescriptions (_ref) {
   var id = _ref.id;
   var root = useStore();
@@ -11055,39 +11103,168 @@ function useDescriptions (_ref) {
     }, []),
     apiHandler = _useMemo.apiHandler,
     configuration = _useMemo.configuration;
-  var _useState = useState({
-      loading: false
-    }),
+  var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
-    state = _useState2[0],
-    setState = _useState2[1];
+    loading = _useState2[0],
+    setLoading = _useState2[1];
+  var _useState3 = useState({}),
+    _useState4 = _slicedToArray(_useState3, 2),
+    data = _useState4[0],
+    setData = _useState4[1];
+  var _useState5 = useState({}),
+    _useState6 = _slicedToArray(_useState5, 2),
+    displayData = _useState6[0],
+    setDisplayData = _useState6[1];
   useEffect(function () {
-    setState(_objectSpread$z(_objectSpread$z({}, state), {}, {
-      loading: true
-    }));
-    apiHandler.read(configuration.mapping).then(function (data) {
-      setState(_objectSpread$z(_objectSpread$z({}, state), {}, {
-        loading: false,
-        data: data
+    setLoading(true);
+    apiHandler.read(configuration.mapping).then( /*#__PURE__*/function () {
+      var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(data) {
+        return _regeneratorRuntime.wrap(function _callee$(_context) {
+          while (1) switch (_context.prev = _context.next) {
+            case 0:
+              _context.t0 = setDisplayData;
+              _context.next = 3;
+              return getDisplayData(configuration.items, data, root);
+            case 3:
+              _context.t1 = _context.sent;
+              (0, _context.t0)(_context.t1);
+              setData(data);
+              setLoading(false);
+            case 7:
+            case "end":
+              return _context.stop();
+          }
+        }, _callee);
       }));
-    });
+      return function (_x) {
+        return _ref2.apply(this, arguments);
+      };
+    }());
   }, [root.dataStore.selectedOrganizationId]);
-  var onUpdate = function onUpdate(data) {
-    setState(_objectSpread$z(_objectSpread$z({}, state), {}, {
-      data: data
+  var onUpdate = /*#__PURE__*/function () {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(data) {
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            setData(data);
+            _context2.t0 = setDisplayData;
+            _context2.next = 4;
+            return getDisplayData(configuration.items, data, root);
+          case 4:
+            _context2.t1 = _context2.sent;
+            (0, _context2.t0)(_context2.t1);
+          case 6:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
     }));
-  };
-  return _objectSpread$z(_objectSpread$z({}, state), {}, {
+    return function onUpdate(_x2) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+  return {
+    loading: loading,
+    data: data,
+    displayData: displayData,
     configuration: configuration,
     onUpdate: onUpdate
-  });
+  };
 }
 
-function ownKeys$y(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$y(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$y(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$y(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _createForOfIteratorHelper$i(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$i(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray$i(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$i(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$i(o, minLen); }
-function _arrayLikeToArray$i(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+/**
+ * Apply the display value options to the data
+ */
+function getDisplayData(_x3, _x4, _x5) {
+  return _getDisplayData.apply(this, arguments);
+}
+function _getDisplayData() {
+  _getDisplayData = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(items, data, root) {
+    var displayData, _iterator, _step, _loop;
+    return _regeneratorRuntime.wrap(function _callee3$(_context4) {
+      while (1) switch (_context4.prev = _context4.next) {
+        case 0:
+          displayData = _objectSpread$A({}, data);
+          _iterator = _createForOfIteratorHelper$i(items);
+          _context4.prev = 2;
+          _loop = /*#__PURE__*/_regeneratorRuntime.mark(function _loop() {
+            var item, itemWithMappingData, apiHandler, response, mappingData;
+            return _regeneratorRuntime.wrap(function _loop$(_context3) {
+              while (1) switch (_context3.prev = _context3.next) {
+                case 0:
+                  item = _step.value;
+                  if (!(_typeof(item.value) == 'object')) {
+                    _context3.next = 13;
+                    break;
+                  }
+                  itemWithMappingData = item;
+                  apiHandler = new _default$d({
+                    type: 'Description',
+                    apiInterface: item.value.apiInterface
+                  }, root); // Only fetch the mapping data once
+                  if (itemWithMappingData.mappingData) {
+                    _context3.next = 9;
+                    break;
+                  }
+                  _context3.next = 7;
+                  return apiHandler.readList();
+                case 7:
+                  response = _context3.sent;
+                  itemWithMappingData.mappingData = response.data;
+                case 9:
+                  mappingData = itemWithMappingData.mappingData.find(function (mappingData) {
+                    return mappingData[item.value.value] == displayData[item.name];
+                  });
+                  displayData[item.name] = mappingData ? mappingData[item.value.label] : displayData[item.name];
+                  _context3.next = 14;
+                  break;
+                case 13:
+                  if (typeof item.value == 'string') {
+                    displayData[item.name] = getCombinedValues(displayData === null || displayData === void 0 ? void 0 : displayData[item.name], item.value);
+                  }
+                case 14:
+                case "end":
+                  return _context3.stop();
+              }
+            }, _loop);
+          });
+          _iterator.s();
+        case 5:
+          if ((_step = _iterator.n()).done) {
+            _context4.next = 9;
+            break;
+          }
+          return _context4.delegateYield(_loop(), "t0", 7);
+        case 7:
+          _context4.next = 5;
+          break;
+        case 9:
+          _context4.next = 14;
+          break;
+        case 11:
+          _context4.prev = 11;
+          _context4.t1 = _context4["catch"](2);
+          _iterator.e(_context4.t1);
+        case 14:
+          _context4.prev = 14;
+          _iterator.f();
+          return _context4.finish(14);
+        case 17:
+          return _context4.abrupt("return", displayData);
+        case 18:
+        case "end":
+          return _context4.stop();
+      }
+    }, _callee3, null, [[2, 11, 14, 17]]);
+  }));
+  return _getDisplayData.apply(this, arguments);
+}
+
+function ownKeys$z(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$z(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$z(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$z(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function _createForOfIteratorHelper$h(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$h(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
+function _unsupportedIterableToArray$h(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$h(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$h(o, minLen); }
+function _arrayLikeToArray$h(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function ActionButton (_ref) {
   var action = _ref.action,
     callback = _ref.callback,
@@ -11107,7 +11284,7 @@ function ActionButton (_ref) {
   var ButtonType = type == 'Button' ? Button : A;
   var disable = false;
   if ((data === null || data === void 0 ? void 0 : data.length) > 0) {
-    var _iterator = _createForOfIteratorHelper$i(ruleData !== null && ruleData !== void 0 ? ruleData : data),
+    var _iterator = _createForOfIteratorHelper$h(ruleData !== null && ruleData !== void 0 ? ruleData : data),
       _step;
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
@@ -11213,7 +11390,7 @@ function ActionButton (_ref) {
               _context.next = 24;
               break;
             }
-            _iterator2 = _createForOfIteratorHelper$i(action.switchValues);
+            _iterator2 = _createForOfIteratorHelper$h(action.switchValues);
             try {
               for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
                 element = _step2.value;
@@ -11225,7 +11402,7 @@ function ActionButton (_ref) {
               _iterator2.f();
             }
             _context.next = 23;
-            return apiInterface.update(_objectSpread$y(_objectSpread$y({}, data), {}, {
+            return apiInterface.update(_objectSpread$z(_objectSpread$z({}, data), {}, {
               state: toSwitch
             }), data);
           case 23:
@@ -11253,7 +11430,7 @@ function ActionButton (_ref) {
   switch (action.actionType) {
     case 'SwitchButton':
       var lable;
-      var _iterator3 = _createForOfIteratorHelper$i(action.switchLable),
+      var _iterator3 = _createForOfIteratorHelper$h(action.switchLable),
         _step3;
       try {
         for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
@@ -11325,31 +11502,7 @@ function ActionButton (_ref) {
   }
 }
 function A(props) {
-  return /*#__PURE__*/jsx("a", _objectSpread$y({}, props));
-}
-
-function _createForOfIteratorHelper$h(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$h(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
-function _unsupportedIterableToArray$h(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$h(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$h(o, minLen); }
-function _arrayLikeToArray$h(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function getCombinedValues(data, pattern) {
-  if (!pattern || !data) {
-    return data;
-  }
-  var value = pattern;
-  var _iterator = _createForOfIteratorHelper$h(pattern.matchAll(/\$\{(.*?)\}/g)),
-    _step;
-  try {
-    for (_iterator.s(); !(_step = _iterator.n()).done;) {
-      var _flatten$match$;
-      var match = _step.value;
-      value = value.replace(match[0], (_flatten$match$ = flat(data)[match[1]]) !== null && _flatten$match$ !== void 0 ? _flatten$match$ : '');
-    }
-  } catch (err) {
-    _iterator.e(err);
-  } finally {
-    _iterator.f();
-  }
-  return value;
+  return /*#__PURE__*/jsx("a", _objectSpread$z({}, props));
 }
 
 var DescriptionWrapper = function DescriptionWrapper(_ref) {
@@ -11381,11 +11534,11 @@ var DescriptionWrapper = function DescriptionWrapper(_ref) {
       }),
       bordered: true,
       children: state.configuration.items.map(function (item) {
-        var _state$data, _state$data2;
+        var _state$displayData;
         return /*#__PURE__*/jsx(Descriptions.Item, {
           label: item.label ? t(item.label, item.label) : item.name,
           span: item.span,
-          children: item.value ? getCombinedValues((_state$data = state.data) === null || _state$data === void 0 ? void 0 : _state$data[item.name], item.value) : (_state$data2 = state.data) === null || _state$data2 === void 0 ? void 0 : _state$data2[item.name]
+          children: (_state$displayData = state.displayData) === null || _state$displayData === void 0 ? void 0 : _state$displayData[item.name]
         }, item.name);
       })
     })
@@ -11396,8 +11549,8 @@ var Description = observer(DescriptionWrapper);
 function _createForOfIteratorHelper$g(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$g(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray$g(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$g(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$g(o, minLen); }
 function _arrayLikeToArray$g(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function ownKeys$x(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$x(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$x(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$x(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$y(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$y(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$y(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$y(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function useSelectData (_ref) {
   var data = _ref.data,
     onChange = _ref.onChange,
@@ -11578,7 +11731,7 @@ function useSelectData (_ref) {
             setFetching(true);
             serverSideParams = {
               filters: selectMapping !== null && selectMapping !== void 0 && selectMapping.searchField ? selectMapping === null || selectMapping === void 0 ? void 0 : selectMapping.searchField.reduce(function (filter, field) {
-                return _objectSpread$x(_objectSpread$x({}, filter), value !== undefined ? _defineProperty({}, field.field, [value, field.filter, true]) : {});
+                return _objectSpread$y(_objectSpread$y({}, filter), value !== undefined ? _defineProperty({}, field.field, [value, field.filter, true]) : {});
               }, {}) : {
                 _id: [value, 'contains']
               },
@@ -11814,7 +11967,7 @@ function styleInject(css, ref) {
 var css_248z$j = ".darkmode .ant-select-selection-search-input {\n  color: #fff;\n}\n";
 styleInject(css_248z$j);
 
-var SelectWrapper = function SelectWrapper(_ref) {
+var SelectWrapper$1 = function SelectWrapper(_ref) {
   var onChange = _ref.onChange,
     onError = _ref.onError,
     value = _ref.value,
@@ -11889,7 +12042,7 @@ var SelectWrapper = function SelectWrapper(_ref) {
     })
   });
 };
-var Select = observer(SelectWrapper, {
+var Select = observer(SelectWrapper$1, {
   forwardRef: true
 });
 
@@ -12076,8 +12229,8 @@ function removeEmpty(data) {
   return undefined;
 }
 
-function ownKeys$w(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$w(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$w(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$w(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$x(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$x(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$x(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$x(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createForOfIteratorHelper$e(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$e(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray$e(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$e(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$e(o, minLen); }
 function _arrayLikeToArray$e(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
@@ -12170,7 +12323,7 @@ function useFormData (_ref) {
         multipleEditingData = inboundData;
       }
       return {
-        loadedData: onLoadFields(_objectSpread$w({}, dt)),
+        loadedData: onLoadFields(_objectSpread$x({}, dt)),
         multipleEditingData: multipleEditingData
       };
     }, [inboundData, selectedItemsIndex]),
@@ -12207,7 +12360,7 @@ function useFormData (_ref) {
     setFieldErrors = _useState14[1];
   useEffect(function () {
     var _loadedData$_id2;
-    setState(_objectSpread$w(_objectSpread$w({}, state), {}, {
+    setState(_objectSpread$x(_objectSpread$x({}, state), {}, {
       data: loadedData,
       origData: JSON.parse(JSON.stringify(inboundData !== null && inboundData !== void 0 ? inboundData : {})),
       update: !!((_loadedData$_id2 = loadedData === null || loadedData === void 0 ? void 0 : loadedData._id) !== null && _loadedData$_id2 !== void 0 ? _loadedData$_id2 : loadedData === null || loadedData === void 0 ? void 0 : loadedData.ID),
@@ -12302,7 +12455,7 @@ function useFormData (_ref) {
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            newData = _objectSpread$w({}, state.data);
+            newData = _objectSpread$x({}, state.data);
             Object.keys(values).forEach(function (k) {
               var _values$k$value, _values$k;
               return newData[k] = (_values$k$value = (_values$k = values[k]) === null || _values$k === void 0 ? void 0 : _values$k.value) !== null && _values$k$value !== void 0 ? _values$k$value : values[k];
@@ -12314,12 +12467,12 @@ function useFormData (_ref) {
             return _context2.abrupt("return", newData);
           case 4:
             _context2.next = 6;
-            return setDynamicFields(_objectSpread$w({}, state.data), newData);
+            return setDynamicFields(_objectSpread$x({}, state.data), newData);
           case 6:
             newData = _context2.sent;
-            newData = onSaveFields(_objectSpread$w({}, state.data), newData);
+            newData = onSaveFields(_objectSpread$x({}, state.data), newData);
             newData = removeEmpty(newData);
-            setState(_objectSpread$w(_objectSpread$w({}, state), {}, {
+            setState(_objectSpread$x(_objectSpread$x({}, state), {}, {
               loading: true
             }));
             finalData = state.data;
@@ -12368,13 +12521,13 @@ function useFormData (_ref) {
               _context2.next = 38;
               break;
             }
-            setFieldErrors(_objectSpread$w(_objectSpread$w({}, fieldErrors), {}, _defineProperty({}, item.name.toString(), item.onError[errorCode])));
+            setFieldErrors(_objectSpread$x(_objectSpread$x({}, fieldErrors), {}, _defineProperty({}, item.name.toString(), item.onError[errorCode])));
             return _context2.abrupt("return", undefined);
           case 38:
             throw _context2.t0;
           case 39:
             _context2.prev = 39;
-            setState(_objectSpread$w(_objectSpread$w({}, state), {}, {
+            setState(_objectSpread$x(_objectSpread$x({}, state), {}, {
               data: finalData,
               loading: false
             }));
@@ -12404,7 +12557,7 @@ function useFormData (_ref) {
   }
   var updateHiddenRequiredDisabled = function updateHiddenRequiredDisabled(data, changedFields) {
     if (!(selectedItems !== null && selectedItems !== void 0 && selectedItems.length)) return;
-    var wholeData = Object.assign(_objectSpread$w({}, state.data), _objectSpread$w({}, changedFields !== null && changedFields !== void 0 ? changedFields : data));
+    var wholeData = Object.assign(_objectSpread$x({}, state.data), _objectSpread$x({}, changedFields !== null && changedFields !== void 0 ? changedFields : data));
     var newState = getHiddenRequredDisabled(wholeData, selectedItems);
     if (JSON.stringify(newState) !== JSON.stringify(hiddenRequiredDisabled)) {
       setHiddenRequiredDisabled(newState);
@@ -12417,12 +12570,12 @@ function useFormData (_ref) {
     }
   };
   var onInputChanged = function onInputChanged(id, value, d) {
-    var data = d !== null && d !== void 0 ? d : Object.assign(_objectSpread$w({}, state.data), _objectSpread$w({}, state.form.getFieldsValue()));
+    var data = d !== null && d !== void 0 ? d : Object.assign(_objectSpread$x({}, state.data), _objectSpread$x({}, state.form.getFieldsValue()));
     setFieldInObject(id, data, value);
-    var newFieldErrors = _objectSpread$w({}, fieldErrors);
+    var newFieldErrors = _objectSpread$x({}, fieldErrors);
     delete newFieldErrors[id.toString()];
     setFieldErrors(newFieldErrors);
-    setState(_objectSpread$w(_objectSpread$w({}, state), {}, {
+    setState(_objectSpread$x(_objectSpread$x({}, state), {}, {
       data: data
     }));
     return data;
@@ -12448,12 +12601,12 @@ function useFormData (_ref) {
       var _value$value;
       if (((_value$value = value === null || value === void 0 ? void 0 : value.value) !== null && _value$value !== void 0 ? _value$value : value) === val) {
         if (configuration.itemSelectorReset) {
-          setState(_objectSpread$w(_objectSpread$w({}, state), {}, {
+          setState(_objectSpread$x(_objectSpread$x({}, state), {}, {
             data: _defineProperty({}, name, val)
           }));
         } else {
-          setState(_objectSpread$w(_objectSpread$w({}, state), {}, {
-            data: _objectSpread$w(_objectSpread$w({}, state.data), {}, _defineProperty({}, name, val))
+          setState(_objectSpread$x(_objectSpread$x({}, state), {}, {
+            data: _objectSpread$x(_objectSpread$x({}, state.data), {}, _defineProperty({}, name, val))
           }));
         }
         setSelectedItemsIndex(idx);
@@ -12463,12 +12616,12 @@ function useFormData (_ref) {
       var val = _ref6.value;
       if (value === val) {
         if (configuration.itemSelectorReset) {
-          setState(_objectSpread$w(_objectSpread$w({}, state), {}, {
+          setState(_objectSpread$x(_objectSpread$x({}, state), {}, {
             data: _defineProperty({}, name, val)
           }));
         } else {
-          setState(_objectSpread$w(_objectSpread$w({}, state), {}, {
-            data: _objectSpread$w(_objectSpread$w({}, state.data), {}, _defineProperty({}, name, val))
+          setState(_objectSpread$x(_objectSpread$x({}, state), {}, {
+            data: _objectSpread$x(_objectSpread$x({}, state.data), {}, _defineProperty({}, name, val))
           }));
         }
         setSelectedItemsIndex(idx);
@@ -12582,7 +12735,7 @@ function useFormData (_ref) {
     }));
     return _setDynamicFields.apply(this, arguments);
   }
-  return _objectSpread$w(_objectSpread$w({}, state), {}, {
+  return _objectSpread$x(_objectSpread$x({}, state), {}, {
     setUsedPreset: setUsedPreset,
     configuration: configuration,
     changedFields: changedFields,
@@ -12640,8 +12793,8 @@ function getData(id, data) {
   }
 }
 
-function ownKeys$v(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$v(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$v(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$v(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$w(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$w(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$w(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$w(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _createForOfIteratorHelper$d(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$d(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray$d(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$d(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$d(o, minLen); }
 function _arrayLikeToArray$d(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
@@ -12691,13 +12844,13 @@ var Presets = function Presets(_ref) {
     } finally {
       _iterator.f();
     }
-    var data = _objectSpread$v(_objectSpread$v({}, form.getFieldsValue(names)), {}, {
+    var data = _objectSpread$w(_objectSpread$w({}, form.getFieldsValue(names)), {}, {
       newPresetName: newPresetName
     });
     data.dpi = parseInt(data.dpi);
     data.organization = root.getGlobalValue('organizationId');
     apiHandler.create({}, state.configuration.createPresetMapping, data);
-    var dt = _objectSpread$v(_objectSpread$v({}, form.getFieldsValue(names)), {}, {
+    var dt = _objectSpread$w(_objectSpread$w({}, form.getFieldsValue(names)), {}, {
       name: newPresetName
     });
     setPresets({
@@ -13080,8 +13233,8 @@ var buttonGroup = "button-group-GYt-T";
 var css_248z$h = ".wrapper-GVe2h {\n  display: flex;\n  flex-direction: row;\n  gap: 12px;\n}\n\n.button-group-GYt-T {\n  display: flex;\n  flex-direction: row;\n  gap: 12px;\n  margin: 0 12px;\n}\n";
 styleInject(css_248z$h);
 
-function ownKeys$u(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$u(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$u(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$u(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$v(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$v(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$v(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$v(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var SubTitle = function SubTitle(_ref) {
   var _item$orientation, _item$buttonIds;
   var item = _ref.item,
@@ -13090,7 +13243,7 @@ var SubTitle = function SubTitle(_ref) {
     t = _useTranslation.t;
   return /*#__PURE__*/jsx(Divider, {
     orientation: (_item$orientation = item.orientation) !== null && _item$orientation !== void 0 ? _item$orientation : 'left',
-    style: _objectSpread$u({}, item.style),
+    style: _objectSpread$v({}, item.style),
     children: /*#__PURE__*/jsxs("div", {
       className: wrapper$2,
       children: [t(item.name), ((_item$buttonIds = item.buttonIds) === null || _item$buttonIds === void 0 ? void 0 : _item$buttonIds.length) && item.buttonIds.map(function (b) {
@@ -13768,8 +13921,8 @@ var _default = /*#__PURE__*/function (_ApiHandler) {
   return _default;
 }(_default$d);
 
-function ownKeys$t(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread$t(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$t(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$t(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+function ownKeys$u(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$u(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$u(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$u(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 getLogger('Backoffice', 'SelectClientRelationCatalog');
 function useSelectClientRelationCatalog (_ref) {
   var onSelectedCatalog = _ref.onSelectedCatalog,
@@ -13938,7 +14091,7 @@ function useSelectClientRelationCatalog (_ref) {
           case 22:
             _supplierData = _context2.sent;
           case 23:
-            onSelectedSupplier === null || onSelectedSupplier === void 0 || onSelectedSupplier(_objectSpread$t(_objectSpread$t({}, _selectedSupplier), {}, {
+            onSelectedSupplier === null || onSelectedSupplier === void 0 || onSelectedSupplier(_objectSpread$u(_objectSpread$u({}, _selectedSupplier), {}, {
               supplierGuid: catalogList === null || catalogList === void 0 || (_catalogList$ = catalogList[0]) === null || _catalogList$ === void 0 ? void 0 : _catalogList$.Subfolder
             }), _supplierData);
             if (catalogId && catalogList.find(function (c) {
@@ -14156,6 +14309,165 @@ function SelectClientRelationCatalog (_ref) {
   });
 }
 
+var LOG$8 = getLogger('Backoffice', 'SelectSimple');
+function useSelectSimpleData (_ref) {
+  var apiInterface = _ref.apiInterface,
+    selectMapping = _ref.selectMapping,
+    onChange = _ref.onChange,
+    value = _ref.value;
+  var root = useStore();
+  var _useMemo = useMemo(function () {
+      return {
+        apiHandler: new _default$d({
+          type: 'SelectSimple',
+          apiInterface: apiInterface
+        }, root)
+      };
+    }, []),
+    apiHandler = _useMemo.apiHandler;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    loading = _useState2[0],
+    setLoading = _useState2[1];
+  // used to skip the first render, because antd for some reason sets the value only on the second render
+  var _useState3 = useState(true),
+    _useState4 = _slicedToArray(_useState3, 2),
+    skipOnRender = _useState4[0],
+    setSkipOnRender = _useState4[1];
+  var _useState5 = useState([]),
+    _useState6 = _slicedToArray(_useState5, 2),
+    options = _useState6[0],
+    setOptions = _useState6[1];
+  var _useState7 = useState(),
+    _useState8 = _slicedToArray(_useState7, 2),
+    selected = _useState8[0],
+    setSelected = _useState8[1];
+  var currentValue = useMemo(function () {
+    if (!selected) return undefined;
+    if (Array.isArray(selected)) return selected.map(function (item) {
+      return item.value;
+    });
+    return selected.value;
+  }, [selected]);
+  useEffect(function () {
+    if (skipOnRender) {
+      setSkipOnRender(false);
+      return;
+    }
+    if (!apiHandler.canReadList) throw Error('SelectSimple: apiInterface must have readList method');
+    setLoading(true);
+    apiHandler.readList().then(function (data) {
+      var _data$data;
+      if (_typeof((_data$data = data.data) === null || _data$data === void 0 ? void 0 : _data$data[0]) == 'object' && !selectMapping) throw Error('SelectSimple: selectMapping is required when data is an object');
+      var options = data.data.map(function (item) {
+        return parseDataEntry(item, selectMapping);
+      });
+      setOptions(options);
+      if (value) {
+        setSelected(findByValue(value, options, selectMapping));
+      }
+    })["finally"](function () {
+      setLoading(false);
+    });
+  }, [skipOnRender]);
+  var onSelectionChanged = function onSelectionChanged(value, option) {
+    setSelected(option);
+    onChange === null || onChange === void 0 || onChange(parseReturnData(option, selectMapping));
+  };
+  var onClear = function onClear() {
+    setSelected(undefined);
+    onChange === null || onChange === void 0 || onChange(undefined);
+  };
+  return {
+    loading: loading,
+    options: options,
+    value: currentValue,
+    onChange: onSelectionChanged,
+    onClear: onClear
+  };
+}
+
+/**
+ * Returns the option(s) that match the given external value
+ */
+function findByValue(value, options, selectMapping) {
+  if (!value) return undefined;
+  if (Array.isArray(value)) return value.map(function (item) {
+    return findByValue(item, options, selectMapping);
+  });
+  // if the externalValue is value we can compare it directly, otherwise we have to parse both option.data and value with the selectMapping.value
+  var option = options.find(function (option) {
+    return (selectMapping === null || selectMapping === void 0 ? void 0 : selectMapping.externalValue) == 'value' ? option.value == value : getCombinedValues(option.data, selectMapping === null || selectMapping === void 0 ? void 0 : selectMapping.value) == getCombinedValues(value, selectMapping === null || selectMapping === void 0 ? void 0 : selectMapping.value);
+  });
+  if (!option) {
+    LOG$8.debug('findByValue: option not found, add dummy option for current value', value, options);
+    //TODO: if we and server side filtering, the dummy option must be handled differently
+    option = {
+      label: (selectMapping === null || selectMapping === void 0 ? void 0 : selectMapping.externalValue) == 'value' ? value : getCombinedValues(value, selectMapping === null || selectMapping === void 0 ? void 0 : selectMapping.label),
+      value: (selectMapping === null || selectMapping === void 0 ? void 0 : selectMapping.externalValue) == 'value' ? value : getCombinedValues(value, selectMapping === null || selectMapping === void 0 ? void 0 : selectMapping.value),
+      data: value,
+      isDummy: true
+    };
+  }
+  return option;
+}
+
+/**
+ * Returns an option entry based on the selectMapping configuration
+ */
+function parseDataEntry(item, selectMapping) {
+  return {
+    label: selectMapping ? getCombinedValues(item, selectMapping.label) : item,
+    value: selectMapping ? getCombinedValues(item, selectMapping.value) : item,
+    data: item
+  };
+}
+
+/**
+ * Returns the data of the selected option(s) based on the selectMapping configuration
+ */
+function parseReturnData(options, selectMapping) {
+  if (Array.isArray(options)) return options.map(function (option) {
+    return parseReturnData(option, selectMapping);
+  });
+  return (selectMapping === null || selectMapping === void 0 ? void 0 : selectMapping.externalValue) == 'value' ? options.value : options.data;
+}
+
+var _excluded$2 = ["apiInterface", "selectMapping", "onChange", "value", "search"];
+function ownKeys$t(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
+function _objectSpread$t(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$t(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$t(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
+var SelectWrapper = function SelectWrapper(_ref) {
+  var apiInterface = _ref.apiInterface,
+    selectMapping = _ref.selectMapping,
+    onChange = _ref.onChange,
+    value = _ref.value,
+    search = _ref.search,
+    selectProps = _objectWithoutProperties(_ref, _excluded$2);
+  var state = useSelectSimpleData({
+    apiInterface: apiInterface,
+    selectMapping: selectMapping,
+    onChange: onChange,
+    value: value,
+    type: 'SelectSimple'
+  });
+  return /*#__PURE__*/jsx(Select$1, _objectSpread$t(_objectSpread$t({}, selectProps), {}, {
+    showSearch: search,
+    loading: state.loading,
+    options: state.options,
+    value: state.value,
+    onChange: state.onChange,
+    onClear: state.onClear,
+    filterOption: filterOption
+  }));
+};
+var SelectSimple = observer(SelectWrapper, {
+  forwardRef: true
+});
+var filterOption = function filterOption(input, option) {
+  var _option$label;
+  return ((_option$label = option === null || option === void 0 ? void 0 : option.label) !== null && _option$label !== void 0 ? _option$label : '').toLowerCase().includes(input.toLowerCase());
+};
+
 function _createForOfIteratorHelper$c(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray$c(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it["return"] != null) it["return"](); } finally { if (didErr) throw err; } } }; }
 function _unsupportedIterableToArray$c(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray$c(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray$c(o, minLen); }
 function _arrayLikeToArray$c(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
@@ -14361,6 +14673,13 @@ var FormWrapper$1 = function FormWrapper(_ref, ref) {
             return onErrorInternal(text, text);
           }
         }, state.selectedItemsIndex);
+      case 'selectSimple':
+        return /*#__PURE__*/jsx(SelectSimple, _objectSpread$s(_objectSpread$s({}, item), {}, {
+          disabled: disabled,
+          onChange: function onChange(value) {
+            _onChange(item.name, value);
+          }
+        }));
       case 'textarea':
         return /*#__PURE__*/jsx(Input.TextArea, {
           disabled: disabled,
@@ -21181,11 +21500,11 @@ function useCatalogEditor (id) {
     }));
     return _exportOptionTree.apply(this, arguments);
   }
-  function startImport(_x3, _x4, _x5) {
+  function startImport(_x3, _x4, _x5, _x6) {
     return _startImport.apply(this, arguments);
   }
   function _startImport() {
-    _startImport = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(fileName, catalogId, deleteExistingOPVChilds) {
+    _startImport = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(fileName, catalogId, deleteExistingOPVChilds, deleteDataNotExistingInExcel) {
       var formData;
       return _regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -21195,7 +21514,8 @@ function useCatalogEditor (id) {
             formData.append('filename', fileName);
             formData.append('catalogGuid', catalogId);
             formData.append('deleteExistingOPVChilds', deleteExistingOPVChilds ? 'True' : 'False');
-            _context3.next = 7;
+            formData.append('deleteDataNotExistingInExcel', deleteDataNotExistingInExcel ? 'True' : 'False');
+            _context3.next = 8;
             return fetch("".concat(api2BaseUrl.replace('aspx', 'asmx'), "/ImportCatalogEditorExcel"), {
               method: 'POST',
               headers: {
@@ -21205,9 +21525,9 @@ function useCatalogEditor (id) {
             })["catch"](function (error) {
               return error;
             });
-          case 7:
-            return _context3.abrupt("return", true);
           case 8:
+            return _context3.abrupt("return", true);
+          case 9:
           case "end":
             return _context3.stop();
         }
@@ -21252,8 +21572,12 @@ function DragDropUpload(_ref) {
     setDeleteExistingOPVChilds = _useState6[1];
   var _useState7 = useState(false),
     _useState8 = _slicedToArray(_useState7, 2),
-    importStarted = _useState8[0],
-    setImportStarted = _useState8[1];
+    deleteDataNotExistingInExcel = _useState8[0],
+    setDeleteDataNotExistingInExcel = _useState8[1];
+  var _useState9 = useState(false),
+    _useState10 = _slicedToArray(_useState9, 2),
+    importStarted = _useState10[0],
+    setImportStarted = _useState10[1];
   var props = {
     name: 'file',
     multiple: false,
@@ -21297,7 +21621,7 @@ function DragDropUpload(_ref) {
           case 0:
             _context.prev = 0;
             _context.next = 3;
-            return startImport(fileName, catalogId, deleteExistingOPVChilds);
+            return startImport(fileName, catalogId, deleteExistingOPVChilds, deleteDataNotExistingInExcel);
           case 3:
             result = _context.sent;
             if (result === true) {
@@ -21343,11 +21667,17 @@ function DragDropUpload(_ref) {
           children: t('backoffice.catalogeditor.classimport.acceptedfiles')
         })]
       })), /*#__PURE__*/jsx(Checkbox, {
-        value: deleteExistingOPVChilds,
+        checked: deleteExistingOPVChilds,
         onChange: function onChange(e) {
           return setDeleteExistingOPVChilds(e.target.checked);
         },
         children: t('backoffice.catalogeditor.classexportdeleteopvchilds')
+      }), /*#__PURE__*/jsx(Checkbox, {
+        checked: deleteDataNotExistingInExcel,
+        onChange: function onChange(e) {
+          return setDeleteDataNotExistingInExcel(e.target.checked);
+        },
+        children: t('backoffice.catalogeditor.classexportdeletedatanotexistinginexcel')
       }), /*#__PURE__*/jsx(Button, {
         type: "primary",
         onClick: onClickImport,