@crystaldesign/diva-backoffice 25.2.0-beta.3 → 25.2.0-beta.30

package/build/esm/index.js

@@ -1969,17 +1969,14 @@ function loadConfiguration(t, root, config, lang) {
         width: 160
       }],
       apiInterface: {
-        read: {
-          list: '${analyticsService}/businessevents?organizationId=${organizationId}',
-          filterServerSide: true
-        }
+        read: '${analyticsService}/businessevents?organizationId=${organizationId}'
       },
       filter: {
         period: {
           title: t('backoffice.FilterBoxAnalytics.filter.zeitraum'),
           fromField: 'fromTimeStamp',
           toField: 'toTimeStamp',
-          "default": '30'
+          "default": 30
         },
         select: {
           filterField: 'status',
@@ -2025,138 +2022,43 @@ function loadConfiguration(t, root, config, lang) {
     DetailApplicationState: {
       type: 'JsonEditor'
     },
-    TableClientRenderJobs: {
+    TableClientOEOverview: {
       type: 'Table',
-      title: t('backoffice.table.renderjobs.title'),
-      canRefresh: true,
+      title: t('backoffice.table.roe.title'),
       columns: [{
-        title: t('backoffice.table.renderjobs.columns.state'),
-        field: 'state',
-        sorter: 1,
-        filter: {
-          type: 'multiselect',
-          values: [{
-            value: 0,
-            label: 'renderjob.stateincart'
-          }, {
-            value: 1,
-            groupedValues: [1, 2, 3],
-            label: 'renderjob.state.1'
-          }, {
-            value: 2,
-            groupedValues: [4, 5, 6, 7, 8, 9, 11],
-            label: 'renderjob.stateinprogress'
-          }, {
-            value: 10,
-            label: 'renderjob.state.10'
-          }, {
-            value: 12,
-            label: 'renderjob.state.12'
-          }]
-        },
-        translationPrefix: 'renderjob.state',
-        type: 'string',
-        groupedValuesDisplayString: [{
-          values: [0],
-          text: t('renderjob.stateincart')
-        }, {
-          values: [1, 2, 3],
-          text: t('renderjob.state.1')
-        }, {
-          values: [4, 5, 6, 7, 9, 8, 11],
-          text: t('renderjob.stateinprogress')
-        }],
-        width: 130
-      }, {
-        title: t('backoffice.table.renderjobs.columns.divaNr'),
-        field: 'divaNr',
+        title: t('backoffice.table.roe.name'),
+        field: '_id',
         filter: 'advanced',
-        sorter: 2,
-        width: 120
+        sorter: 2
       }, {
-        title: t('backoffice.table.renderjobs.columns.VariantId'),
-        field: 'divaNrVariantId',
+        title: t('backoffice.table.roe.countHQ'),
+        field: 'countHQ',
         filter: 'advanced',
         sorter: 2,
-        width: 120
-      }, {
-        title: t('backoffice.table.renderjobs.columns.fileUrl'),
-        field: 'fileUrl',
-        type: 'media',
-        align: 'center',
-        width: 100
-      }, {
-        title: t('backoffice.table.renderjobs.columns.realTimeRenderUrl'),
-        field: 'realTimeRenderUrl',
-        type: 'media',
-        align: 'center',
-        width: 100
+        width: 50
       }, {
-        title: t('backoffice.table.renderjobs.columns.job'),
-        field: 'job',
-        sorter: 3,
+        title: t('backoffice.table.roe.countAR'),
+        field: 'countAR',
         filter: 'advanced',
-        width: 100
-      }, {
-        title: t('backoffice.table.renderjobs.columns.fileName'),
-        field: 'fileName',
-        sorter: 3,
-        filter: 'advanced',
-        width: 220
-      }, {
-        title: t('backoffice.table.renderjobs.columns.viewPoint'),
-        field: 'viewPoint',
-        sorter: 4,
-        filter: 'advanced',
-        width: 100
+        sorter: 2,
+        width: 50
       }, {
-        title: t('backoffice.table.renderjobs.columns.renderScene'),
-        field: 'renderScene_displayText',
-        sorter: 4,
+        title: t('backoffice.table.roe.countAmbient'),
+        field: 'countAmbient',
         filter: 'advanced',
-        width: 200
-      }, {
-        title: t('backoffice.table.renderjobs.columns.group'),
-        field: 'group',
-        sorter: 11,
-        filter: 'advanced',
-        width: 200
+        sorter: 2,
+        width: 50
       }, {
-        title: t('backoffice.table.renderjobs.columns.productName'),
-        field: 'productName',
-        sorter: 12,
+        title: t('backoffice.table.roe.count3DExport'),
+        field: 'count3DExport',
         filter: 'advanced',
-        width: 180
-      }, {
-        title: t('backoffice.table.invitations.organization'),
-        field: 'organizationName',
-        sorter: 1,
-        width: 200,
-        hidden: function hidden(_, globalFilter) {
-          var _globalFilter$toggle;
-          return !(globalFilter !== null && globalFilter !== void 0 && (_globalFilter$toggle = globalFilter.toggle) !== null && _globalFilter$toggle !== void 0 && (_globalFilter$toggle = _globalFilter$toggle['hierarchy']) !== null && _globalFilter$toggle !== void 0 && _globalFilter$toggle[0]);
-        }
-      }, {
-        title: t('backoffice.table.renderjobs.columns.created'),
-        field: 'created',
-        sorter: 15,
-        type: 'unixTimeStamp',
-        defaultSortOrder: 'descend',
-        width: 160,
-        filter: 'interval'
-      }, {
-        title: t('backoffice.table.renderjobs.columns.lastUpdated'),
-        field: 'lastUpdated',
-        sorter: 15,
-        type: 'unixTimeStamp',
-        defaultSortOrder: 'descend',
-        width: 160,
-        filter: 'interval'
+        sorter: 2,
+        width: 50
       }],
       apiInterface: {
         read: {
-          list: '${mediaService}/renderjobs?organizationId=${organizationId}',
-          filterServerSide: true
+          list: '${mediaService}/renderjobs/overview?from=${from}&to=${to}',
+          filterServerSide: false
         },
         update: {
           url: '${mediaService}/renderjobs/{_id}/state',
@@ -2166,83 +2068,32 @@ function loadConfiguration(t, root, config, lang) {
       mapping: {
         type: 'query',
         map: [{
-          sourceField: 'hierarchy',
-          targetField: 'hierarchy'
+          sourceField: 'from',
+          targetField: 'from'
         }, {
-          globalValue: 'selectedOrganizationId',
-          targetField: 'organizationId'
+          sourceField: 'to',
+          targetField: 'to'
         }]
       },
       filter: {
         toggle: {
-          fields: ['hierarchy'],
-          label: t('backoffice.table.allorgusers.filter.toggle.label'),
-          labelOff: t('backoffice.table.allorgusers.filter.toggle.labelOff'),
-          inQuery: true
-        }
-      },
-      rowAction: [{
-        actionType: 'SimpleChangeValueButton',
-        label: t('backoffice.renderjobs.order'),
-        id: 'OrderClientRenderJob',
-        rule: [
-        //only created renderjobs can be ordered
-        {
-          match: {
-            sourceField: 'state',
-            value: 0
-          }
-        }],
-        newValues: [{
-          field: 'state',
-          value: 1
-        }],
-        apiInterface: {
-          update: {
-            url: '${mediaService}/renderjobs/{_id}/state',
-            method: 'PATCH'
-          }
-        }
-      }, {
-        actionType: 'SimpleChangeValueButton',
-        label: t('backoffice.cancel'),
-        id: 'CancelClientRenderJob',
-        rule: [
-        //only ordered and created renderjobs can bbe canceled
-        {
-          or: [{
-            match: {
-              sourceField: 'state',
-              value: 0
-            }
-          }, {
-            match: {
-              sourceField: 'state',
-              value: 1
-            }
-          }, {
-            match: {
-              sourceField: 'state',
-              value: 2
-            }
-          }, {
-            match: {
-              sourceField: 'state',
-              value: 3
-            }
-          }]
-        }],
-        newValues: [{
-          field: 'state',
-          value: 10
-        }],
-        apiInterface: {
-          update: {
-            url: '${mediaService}/renderjobs/{_id}/state',
-            method: 'PATCH'
-          }
+          globalValue: 'organizationId',
+          fields: ['organizationId'],
+          label: t('backoffice.table.clientrelations.filter.label.allorgs'),
+          labelOff: t('backoffice.table.clientrelations.filter.label.allorgs'),
+          inverted: true,
+          inQuery: true,
+          permission: 'backoffice_taskstatus_allorgs',
+          isAnd: true
+        },
+        period: {
+          title: t('backoffice.FilterBoxAnalytics.filter.zeitraum'),
+          fromField: 'from',
+          toField: 'to',
+          "default": 30,
+          onlyAsMappingData: true
         }
-      }]
+      }
     },
     TableAllUsers: {
       type: 'Table',
@@ -4899,8 +4750,8 @@ function loadConfiguration(t, root, config, lang) {
         sorter: 1,
         width: 200,
         hidden: function hidden(_, globalFilter) {
-          var _globalFilter$toggle2;
-          return !(globalFilter !== null && globalFilter !== void 0 && (_globalFilter$toggle2 = globalFilter.toggle) !== null && _globalFilter$toggle2 !== void 0 && (_globalFilter$toggle2 = _globalFilter$toggle2['hierarchy']) !== null && _globalFilter$toggle2 !== void 0 && _globalFilter$toggle2[0]);
+          var _globalFilter$toggle;
+          return !(globalFilter !== null && globalFilter !== void 0 && (_globalFilter$toggle = globalFilter.toggle) !== null && _globalFilter$toggle !== void 0 && (_globalFilter$toggle = _globalFilter$toggle['hierarchy']) !== null && _globalFilter$toggle !== void 0 && _globalFilter$toggle[0]);
         }
       }, {
         title: t('backoffice.table.invitations.mailsend'),
@@ -5137,8 +4988,8 @@ function loadConfiguration(t, root, config, lang) {
         field: 'organizationDisplayName',
         width: 150,
         hidden: function hidden(_, globalFilter) {
-          var _globalFilter$toggle3;
-          return !(globalFilter !== null && globalFilter !== void 0 && (_globalFilter$toggle3 = globalFilter.toggle) !== null && _globalFilter$toggle3 !== void 0 && (_globalFilter$toggle3 = _globalFilter$toggle3['hierarchy']) !== null && _globalFilter$toggle3 !== void 0 && _globalFilter$toggle3[0]);
+          var _globalFilter$toggle2;
+          return !(globalFilter !== null && globalFilter !== void 0 && (_globalFilter$toggle2 = globalFilter.toggle) !== null && _globalFilter$toggle2 !== void 0 && (_globalFilter$toggle2 = _globalFilter$toggle2['hierarchy']) !== null && _globalFilter$toggle2 !== void 0 && _globalFilter$toggle2[0]);
         }
       }, {
         title: t('backoffice.table.allorgusers.created'),
@@ -7817,10 +7668,7 @@ function loadConfiguration(t, root, config, lang) {
         style: {
           marginBottom: '20px'
         },
-        permission: 'backoffice_admin_organizations',
-        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;
-        }
+        permission: 'backoffice_admin_organizations'
       }, {
         name: 'Info',
         type: 'text',
@@ -7828,10 +7676,7 @@ function loadConfiguration(t, root, config, lang) {
           marginBottom: '30px'
         },
         text: t('backoffice.form.organizationdetails.items.licensesdesc'),
-        permission: 'backoffice_admin_organizations',
-        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;
-        }
+        permission: 'backoffice_admin_organizations'
       }, {
         name: ['settings', 'enable3DExport'],
         label: t('backoffice.form.organizationdetails.items.settings.enable3DExport'),
@@ -7848,6 +7693,22 @@ function loadConfiguration(t, root, config, lang) {
           value: false
         }],
         permission: 'backoffice_sys_admin_organizations'
+      }, {
+        name: ['settings', 'renderjobSeparateMaterials'],
+        label: t('backoffice.form.organizationdetails.items.settings.renderjobSeparateMaterials'),
+        permission: 'backoffice_admin_organizations',
+        type: 'radio',
+        optionType: 'button',
+        options: [{
+          label: t('backoffice.form.organizationdetails.items.vererbt'),
+          value: undefined
+        }, {
+          label: t('backoffice.form.organizationdetails.items.ja'),
+          value: true
+        }, {
+          label: t('backoffice.form.organizationdetails.items.nein'),
+          value: false
+        }]
       }, {
         name: ['settings', 'enableAR'],
         label: t('backoffice.form.organizationdetails.items.settings.enableAR'),
@@ -7938,10 +7799,7 @@ function loadConfiguration(t, root, config, lang) {
         style: {
           marginBottom: '40px'
         },
-        permission: 'backoffice_admin_organizations',
-        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;
-        }
+        permission: 'backoffice_admin_organizations'
       }, {
         name: 'iln',
         label: t('backoffice.form.organizationdetails.items.iln'),
@@ -13534,10 +13392,11 @@ var menu = [{
   permission: 'backoffice_current_organization',
   icon: 'ApartmentOutlined'
 }, {
-  id: 'TableClientRenderJobs',
-  path: 'renderjobs',
-  label: 'backoffice.menu.items.label.renderjobs',
-  icon: 'FileImageOutlined'
+  id: 'TableClientOEOverview',
+  path: 'orderentry',
+  label: 'backoffice.menu.items.label.oeoverview',
+  icon: 'FileImageOutlined',
+  permission: 'backoffice_renderjobs_overview'
 }, {
   id: 'catalogArea',
   path: 'catalogs',
@@ -16759,6 +16618,7 @@ function parseDataEntry(item, selectMapping) {
  * Returns the data of the selected option(s) based on the selectMapping configuration
  */
 function parseReturnData(options, selectMapping) {
+  if (!options) return undefined;
   if (Array.isArray(options)) return options.map(function (option) {
     return parseReturnData(option, selectMapping);
   });
@@ -25375,7 +25235,7 @@ var TableWrapper = function TableWrapper(_ref) {
                   state.onGlobalFilterPeriod(values[0].valueOf(), values[1].valueOf());
                 }
               },
-              value: [(_state$globalFilter2 = state.globalFilter) !== null && _state$globalFilter2 !== void 0 && (_state$globalFilter2 = _state$globalFilter2.timeStamp) !== null && _state$globalFilter2 !== void 0 && (_state$globalFilter2 = _state$globalFilter2['fromTimeStamp']) !== null && _state$globalFilter2 !== void 0 && _state$globalFilter2[0] ? dayjs((_state$globalFilter3 = state.globalFilter) === null || _state$globalFilter3 === void 0 || (_state$globalFilter3 = _state$globalFilter3.timeStamp) === null || _state$globalFilter3 === void 0 || (_state$globalFilter3 = _state$globalFilter3['fromTimeStamp']) === null || _state$globalFilter3 === void 0 ? void 0 : _state$globalFilter3[0]) : dayjs(new Date(Date.now() - 30 * 24 * 60 * 60 * 1000)),
+              defaultValue: [(_state$globalFilter2 = state.globalFilter) !== null && _state$globalFilter2 !== void 0 && (_state$globalFilter2 = _state$globalFilter2.timeStamp) !== null && _state$globalFilter2 !== void 0 && (_state$globalFilter2 = _state$globalFilter2['fromTimeStamp']) !== null && _state$globalFilter2 !== void 0 && _state$globalFilter2[0] ? dayjs((_state$globalFilter3 = state.globalFilter) === null || _state$globalFilter3 === void 0 || (_state$globalFilter3 = _state$globalFilter3.timeStamp) === null || _state$globalFilter3 === void 0 || (_state$globalFilter3 = _state$globalFilter3['fromTimeStamp']) === null || _state$globalFilter3 === void 0 ? void 0 : _state$globalFilter3[0]) : dayjs(new Date(Date.now() - 30 * 24 * 60 * 60 * 1000)),
               // Convert to Dayjs
               (_state$globalFilter4 = state.globalFilter) !== null && _state$globalFilter4 !== void 0 && (_state$globalFilter4 = _state$globalFilter4.timeStamp) !== null && _state$globalFilter4 !== void 0 && (_state$globalFilter4 = _state$globalFilter4['toTimeStamp']) !== null && _state$globalFilter4 !== void 0 && _state$globalFilter4[0] ? dayjs((_state$globalFilter5 = state.globalFilter) === null || _state$globalFilter5 === void 0 || (_state$globalFilter5 = _state$globalFilter5.timeStamp) === null || _state$globalFilter5 === void 0 || (_state$globalFilter5 = _state$globalFilter5['toTimeStamp']) === null || _state$globalFilter5 === void 0 ? void 0 : _state$globalFilter5[0]) : dayjs(new Date()) // Convert to Dayjs
               ]
@@ -27040,7 +26900,7 @@ function ownKeys$o(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymb
 function _objectSpread$o(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$o(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$o(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 var LOG$2 = getLogger('Backoffice', 'TableData');
 function useTableData (_ref) {
-  var _configuration$filter, _configuration$filter2, _configuration$filter3, _configuration$bulkAc, _configuration$apiInt;
+  var _configuration$filter, _configuration$filter2, _configuration$filter3, _configuration$filter4, _configuration$bulkAc, _configuration$apiInt;
   var id = _ref.id,
     i18n = _ref.i18n,
     parentData = _ref.parentData,
@@ -27070,6 +26930,11 @@ function useTableData (_ref) {
     _useState8 = _slicedToArray(_useState7, 2),
     catalogItem = _useState8[0],
     onSelectedCatalog = _useState8[1];
+  var filterHash = useRef();
+  var _useState9 = useState(),
+    _useState10 = _slicedToArray(_useState9, 2),
+    error = _useState10[0],
+    setError = _useState10[1];
   var toggleConfig = (_configuration$filter = configuration.filter) === null || _configuration$filter === void 0 ? void 0 : _configuration$filter.toggle;
   var toggleFilter = {};
   toggleConfig === null || toggleConfig === void 0 || toggleConfig.fields.forEach(function (f) {
@@ -27079,19 +26944,15 @@ function useTableData (_ref) {
   (_configuration$filter2 = configuration.filter) === null || _configuration$filter2 === void 0 || (_configuration$filter2 = _configuration$filter2["default"]) === null || _configuration$filter2 === void 0 || _configuration$filter2.fields.forEach(function (f) {
     return defaultFilter[f] = [configuration.filter["default"].globalValue ? root.getGlobalValue(configuration.filter["default"].globalValue) : true, 'eq'];
   });
-  var _useState9 = useState({
+  var _useState11 = useState({
       select: (_configuration$filter3 = configuration.filter) !== null && _configuration$filter3 !== void 0 && (_configuration$filter3 = _configuration$filter3.select) !== null && _configuration$filter3 !== void 0 && _configuration$filter3.defaultValue ? _defineProperty({}, configuration.filter.select.filterField, [configuration.filter.select.defaultValue, 'eq']) : undefined,
       toggle: toggleConfig !== null && toggleConfig !== void 0 && toggleConfig.defaultChecked && !(toggleConfig !== null && toggleConfig !== void 0 && toggleConfig.inverted) || !(toggleConfig !== null && toggleConfig !== void 0 && toggleConfig.defaultChecked) && toggleConfig !== null && toggleConfig !== void 0 && toggleConfig.inverted ? toggleFilter : undefined,
       "default": defaultFilter ? defaultFilter : undefined
     }),
-    _useState10 = _slicedToArray(_useState9, 2),
-    globalFilter = _useState10[0],
-    setGlobaFilter = _useState10[1];
-  var filterHash = useRef();
-  var _useState11 = useState(),
     _useState12 = _slicedToArray(_useState11, 2),
-    error = _useState12[0],
-    setError = _useState12[1];
+    globalFilter = _useState12[0],
+    setGlobaFilter = _useState12[1];
+  var periodDefaultValue = (_configuration$filter4 = configuration.filter) === null || _configuration$filter4 === void 0 || (_configuration$filter4 = _configuration$filter4.period) === null || _configuration$filter4 === void 0 ? void 0 : _configuration$filter4["default"];
   var _useState13 = useState({
       loading: true,
       deleting: false,
@@ -27107,13 +26968,15 @@ function useTableData (_ref) {
       mappingData: _objectSpread$o(_objectSpread$o({}, parentData), {}, {
         prefilter: {
           select: globalFilter.select
-        }
+        },
+        from: periodDefaultValue ? Date.now() - periodDefaultValue * 86400000 : undefined,
+        to: Date.now()
       })
     }),
     _useState14 = _slicedToArray(_useState13, 2),
     state = _useState14[0],
     setState = _useState14[1];
-  var mapping = _objectSpread$o(_objectSpread$o({}, parentData), {}, {
+  var mappingData = _objectSpread$o(_objectSpread$o(_objectSpread$o({}, parentData), state.data), {}, {
     catalogCodex: catalogItem === null || catalogItem === void 0 ? void 0 : catalogItem.codex,
     sessionGuID: catalogItem === null || catalogItem === void 0 ? void 0 : catalogItem.sessionGuid
   });
@@ -27126,8 +26989,8 @@ function useTableData (_ref) {
           case 0:
             fd = new FormData();
             fd.append('value', JSON.stringify([newData]));
-            fd.append('catalogCodex', mapping.catalogCodex);
-            fd.append('sessionGuid', mapping.sessionGuID);
+            fd.append('catalogCodex', mappingData.catalogCodex);
+            fd.append('sessionGuid', mappingData.sessionGuID);
             _context.next = 6;
             return apiHandler.create(undefined, undefined, undefined, fd);
           case 6:
@@ -27166,8 +27029,8 @@ function useTableData (_ref) {
     for (var i = 0; i < dataArray.length; i++) {
       var dataRow = dataArray[i];
       if (filterServerSide) {
-        var _configuration$filter4;
-        if ((_configuration$filter4 = configuration.filter) !== null && _configuration$filter4 !== void 0 && (_configuration$filter4 = _configuration$filter4.select) !== null && _configuration$filter4 !== void 0 && _configuration$filter4.filterField) {
+        var _configuration$filter5;
+        if ((_configuration$filter5 = configuration.filter) !== null && _configuration$filter5 !== void 0 && (_configuration$filter5 = _configuration$filter5.select) !== null && _configuration$filter5 !== void 0 && _configuration$filter5.filterField) {
           onGlobalFilterSelect(dataRow[configuration.filter.select.filterField]);
         } else {
           var _pagination;
@@ -27183,15 +27046,15 @@ function useTableData (_ref) {
           });
         }
       } else {
-        var _configuration$filter5, _configuration$filter6;
+        var _configuration$filter6, _configuration$filter7;
         var _updateData2 = updateData({
             data: newInitData,
             dataRow: dataRow
           }),
           nextInitData = _updateData2.data;
         var _applyFilterAndSortat = applyFilterAndSortation(_objectSpread$o(_objectSpread$o(_objectSpread$o({}, filterData), {}, {
-            filters: _objectSpread$o(_objectSpread$o(_objectSpread$o(_objectSpread$o(_objectSpread$o(_objectSpread$o({}, filterData.filters), globalFilter.search), !(configuration !== null && configuration !== void 0 && (_configuration$filter5 = configuration.filter) !== null && _configuration$filter5 !== void 0 && (_configuration$filter5 = _configuration$filter5.toggle) !== null && _configuration$filter5 !== void 0 && _configuration$filter5.inQuery) ? globalFilter.toggle : undefined), globalFilter.select), globalFilter.timeStamp), globalFilter["default"])
-          }, configuration !== null && configuration !== void 0 && (_configuration$filter6 = configuration.filter) !== null && _configuration$filter6 !== void 0 && (_configuration$filter6 = _configuration$filter6.toggle) !== null && _configuration$filter6 !== void 0 && _configuration$filter6.inQuery ? {
+            filters: _objectSpread$o(_objectSpread$o(_objectSpread$o(_objectSpread$o(_objectSpread$o(_objectSpread$o({}, filterData.filters), globalFilter.search), !(configuration !== null && configuration !== void 0 && (_configuration$filter6 = configuration.filter) !== null && _configuration$filter6 !== void 0 && (_configuration$filter6 = _configuration$filter6.toggle) !== null && _configuration$filter6 !== void 0 && _configuration$filter6.inQuery) ? globalFilter.toggle : undefined), globalFilter.select), globalFilter.timeStamp), globalFilter["default"])
+          }, configuration !== null && configuration !== void 0 && (_configuration$filter7 = configuration.filter) !== null && _configuration$filter7 !== void 0 && (_configuration$filter7 = _configuration$filter7.toggle) !== null && _configuration$filter7 !== void 0 && _configuration$filter7.inQuery ? {
             genericProps: globalFilter.toggle
           } : undefined), {}, {
             data: nextInitData,
@@ -27222,14 +27085,14 @@ function useTableData (_ref) {
     _useState16 = _slicedToArray(_useState15, 1),
     columns = _useState16[0];
   var triggerRefresh = function triggerRefresh() {
-    var _configuration$filter7;
+    var _configuration$filter8;
     setError(undefined);
     var newGlobalFilter = _objectSpread$o({}, globalFilter);
     //on refresh update default filter, since global value can change
-    if ((_configuration$filter7 = configuration.filter) !== null && _configuration$filter7 !== void 0 && _configuration$filter7["default"]) {
-      var _configuration$filter8;
+    if ((_configuration$filter8 = configuration.filter) !== null && _configuration$filter8 !== void 0 && _configuration$filter8["default"]) {
+      var _configuration$filter9;
       var _defaultFilter = {};
-      (_configuration$filter8 = configuration.filter) === null || _configuration$filter8 === void 0 || (_configuration$filter8 = _configuration$filter8["default"]) === null || _configuration$filter8 === void 0 || _configuration$filter8.fields.forEach(function (f) {
+      (_configuration$filter9 = configuration.filter) === null || _configuration$filter9 === void 0 || (_configuration$filter9 = _configuration$filter9["default"]) === null || _configuration$filter9 === void 0 || _configuration$filter9.fields.forEach(function (f) {
         return _defaultFilter[f] = [configuration.filter["default"].globalValue ? root.getGlobalValue(configuration.filter["default"].globalValue) : true, 'eq'];
       });
       newGlobalFilter["default"] = _defaultFilter;
@@ -27289,7 +27152,7 @@ function useTableData (_ref) {
   }, [configuration.title, parentData]);
   var getDataById = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(id) {
-      var _configuration$filter9;
+      var _configuration$filter10;
       var filters, ssf, data;
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -27303,11 +27166,11 @@ function useTableData (_ref) {
               },
               columns: configuration.columns,
               filters: filters
-            }, configuration !== null && configuration !== void 0 && (_configuration$filter9 = configuration.filter) !== null && _configuration$filter9 !== void 0 && (_configuration$filter9 = _configuration$filter9.toggle) !== null && _configuration$filter9 !== void 0 && _configuration$filter9.inQuery ? {
+            }, configuration !== null && configuration !== void 0 && (_configuration$filter10 = configuration.filter) !== null && _configuration$filter10 !== void 0 && (_configuration$filter10 = _configuration$filter10.toggle) !== null && _configuration$filter10 !== void 0 && _configuration$filter10.inQuery ? {
               genericProps: globalFilter.toggle
             } : undefined);
             _context2.next = 5;
-            return apiHandler.readList(parentMapping || configuration.mapping, mapping, ssf);
+            return apiHandler.readList(parentMapping || configuration.mapping, _objectSpread$o(_objectSpread$o({}, mappingData), state.mappingData), ssf);
           case 5:
             data = _context2.sent;
             return _context2.abrupt("return", data);
@@ -27323,17 +27186,18 @@ function useTableData (_ref) {
   }();
   var onChange = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(p) {
-      var _configuration$filter10, _configuration$filter11, _prefilter$select, _configuration$filter12, _configuration$filter13;
+      var _configuration$filter11, _configuration$filter12, _prefilter$select, _configuration$filter13, _configuration$filter14;
       var prefilter,
         refresh,
         clearSelection,
+        addMappingData,
         currentData,
         filterData,
         currentFilterHash,
         currentPagination,
         currentUrl,
-        _configuration$filter14,
         _configuration$filter15,
+        _configuration$filter16,
         _prefilter$toggle,
         _parseFilter,
         ssf,
@@ -27349,11 +27213,13 @@ function useTableData (_ref) {
             prefilter = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : globalFilter;
             refresh = _args3.length > 2 ? _args3[2] : undefined;
             clearSelection = _args3.length > 3 ? _args3[3] : undefined;
+            addMappingData = _args3.length > 4 ? _args3[4] : undefined;
             setState(_objectSpread$o(_objectSpread$o({}, state), {}, {
+              mappingData: _objectSpread$o(_objectSpread$o({}, state.mappingData), addMappingData),
               loading: true
             }));
             currentData = initData;
-            filterData = _objectSpread$o(_objectSpread$o(_objectSpread$o(_objectSpread$o({}, prefilter.search), ((_configuration$filter10 = configuration.filter) === null || _configuration$filter10 === void 0 || (_configuration$filter10 = _configuration$filter10.select) === null || _configuration$filter10 === void 0 ? void 0 : _configuration$filter10.applyDefaultValue) !== false || ((_configuration$filter11 = configuration.filter) === null || _configuration$filter11 === void 0 || (_configuration$filter11 = _configuration$filter11.select) === null || _configuration$filter11 === void 0 ? void 0 : _configuration$filter11.defaultValue) !== ((_prefilter$select = prefilter.select) === null || _prefilter$select === void 0 || (_prefilter$select = _prefilter$select[(_configuration$filter12 = (_configuration$filter13 = configuration.filter) === null || _configuration$filter13 === void 0 || (_configuration$filter13 = _configuration$filter13.select) === null || _configuration$filter13 === void 0 ? void 0 : _configuration$filter13.filterField) !== null && _configuration$filter12 !== void 0 ? _configuration$filter12 : '']) === null || _prefilter$select === void 0 ? void 0 : _prefilter$select[0]) ? prefilter.select : undefined), prefilter.timeStamp), prefilter["default"]); //remove all null values
+            filterData = _objectSpread$o(_objectSpread$o(_objectSpread$o(_objectSpread$o({}, prefilter.search), ((_configuration$filter11 = configuration.filter) === null || _configuration$filter11 === void 0 || (_configuration$filter11 = _configuration$filter11.select) === null || _configuration$filter11 === void 0 ? void 0 : _configuration$filter11.applyDefaultValue) !== false || ((_configuration$filter12 = configuration.filter) === null || _configuration$filter12 === void 0 || (_configuration$filter12 = _configuration$filter12.select) === null || _configuration$filter12 === void 0 ? void 0 : _configuration$filter12.defaultValue) !== ((_prefilter$select = prefilter.select) === null || _prefilter$select === void 0 || (_prefilter$select = _prefilter$select[(_configuration$filter13 = (_configuration$filter14 = configuration.filter) === null || _configuration$filter14 === void 0 || (_configuration$filter14 = _configuration$filter14.select) === null || _configuration$filter14 === void 0 ? void 0 : _configuration$filter14.filterField) !== null && _configuration$filter13 !== void 0 ? _configuration$filter13 : '']) === null || _prefilter$select === void 0 ? void 0 : _prefilter$select[0]) ? prefilter.select : undefined), prefilter.timeStamp), prefilter["default"]); //remove all null values
             filterData = Object.fromEntries(Object.entries(filterData).filter(function (_ref6) {
               var _ref7 = _slicedToArray(_ref6, 2);
                 _ref7[0];
@@ -27366,7 +27232,7 @@ function useTableData (_ref) {
             });
             filterHash.current = currentFilterHash;
             if (!filterServerSide) {
-              _context3.next = 20;
+              _context3.next = 21;
               break;
             }
             ssf = _objectSpread$o({
@@ -27374,32 +27240,32 @@ function useTableData (_ref) {
               columns: configuration.columns,
               filters: filterData,
               sorter: p.sorter
-            }, configuration !== null && configuration !== void 0 && (_configuration$filter14 = configuration.filter) !== null && _configuration$filter14 !== void 0 && (_configuration$filter14 = _configuration$filter14.toggle) !== null && _configuration$filter14 !== void 0 && _configuration$filter14.inQuery ? {
+            }, configuration !== null && configuration !== void 0 && (_configuration$filter15 = configuration.filter) !== null && _configuration$filter15 !== void 0 && (_configuration$filter15 = _configuration$filter15.toggle) !== null && _configuration$filter15 !== void 0 && _configuration$filter15.inQuery ? {
               genericProps: prefilter.toggle
             } : undefined);
-            _context3.next = 14;
-            return apiHandler.readList(parentMapping || configuration.mapping, mapping, ssf, catalogItem === null || catalogItem === void 0 ? void 0 : catalogItem.sessionGuid, parseFilter(!(configuration !== null && configuration !== void 0 && (_configuration$filter15 = configuration.filter) !== null && _configuration$filter15 !== void 0 && (_configuration$filter15 = _configuration$filter15.toggle) !== null && _configuration$filter15 !== void 0 && _configuration$filter15.inQuery) ? (_prefilter$toggle = prefilter.toggle) !== null && _prefilter$toggle !== void 0 ? _prefilter$toggle : {} : {}, (_parseFilter = parseFilter(p.filters, undefined)) === null || _parseFilter === void 0 ? void 0 : _parseFilter.slice(1, -1)));
-          case 14:
+            _context3.next = 15;
+            return apiHandler.readList(parentMapping || configuration.mapping, _objectSpread$o(_objectSpread$o(_objectSpread$o({}, mappingData), state.mappingData), addMappingData), ssf, catalogItem === null || catalogItem === void 0 ? void 0 : catalogItem.sessionGuid, parseFilter(!(configuration !== null && configuration !== void 0 && (_configuration$filter16 = configuration.filter) !== null && _configuration$filter16 !== void 0 && (_configuration$filter16 = _configuration$filter16.toggle) !== null && _configuration$filter16 !== void 0 && _configuration$filter16.inQuery) ? (_prefilter$toggle = prefilter.toggle) !== null && _prefilter$toggle !== void 0 ? _prefilter$toggle : {} : {}, (_parseFilter = parseFilter(p.filters, undefined)) === null || _parseFilter === void 0 ? void 0 : _parseFilter.slice(1, -1)));
+          case 15:
             data = _context3.sent;
-            currentUrl = apiHandler.getReadListUrl(parentMapping || configuration.mapping, mapping, ssf);
+            currentUrl = apiHandler.getReadListUrl(parentMapping || configuration.mapping, _objectSpread$o(_objectSpread$o({}, mappingData), state.mappingData), ssf);
             currentData = data.data;
             currentPagination = _objectSpread$o(_objectSpread$o({}, currentPagination), {}, {
               total: data.total
             });
-            _context3.next = 29;
+            _context3.next = 30;
             break;
-          case 20:
+          case 21:
             if (!(!currentData || currentData.length === 0 || refresh)) {
-              _context3.next = 26;
+              _context3.next = 27;
               break;
             }
-            _context3.next = 23;
-            return apiHandler.readList(parentMapping || configuration.mapping, mapping, undefined);
-          case 23:
+            _context3.next = 24;
+            return apiHandler.readList(parentMapping || configuration.mapping, _objectSpread$o(_objectSpread$o(_objectSpread$o({}, mappingData), state.mappingData), addMappingData), undefined);
+          case 24:
             _data3 = _context3.sent;
             currentData = _data3.data;
             setInitData(currentData);
-          case 26:
+          case 27:
             _applyFilterAndSortat2 = applyFilterAndSortation(_objectSpread$o(_objectSpread$o({}, p), {}, {
               pagination: currentPagination,
               filters: filterData,
@@ -27408,12 +27274,12 @@ function useTableData (_ref) {
             })), _data4 = _applyFilterAndSortat2.data, pagination = _applyFilterAndSortat2.pagination;
             currentData = _data4;
             currentPagination = pagination;
-          case 29:
+          case 30:
             setState(_objectSpread$o(_objectSpread$o({}, state), {}, {
               loading: false,
               data: currentData,
               pagination: currentPagination,
-              mappingData: _objectSpread$o(_objectSpread$o({}, parentData), {}, {
+              mappingData: _objectSpread$o(_objectSpread$o(_objectSpread$o(_objectSpread$o({}, parentData), state.mappingData), addMappingData), {}, {
                 prefilter: prefilter
               }),
               currentFetchUrl: currentUrl
@@ -27424,7 +27290,7 @@ function useTableData (_ref) {
               filters: p.filters,
               sorter: p.sorter
             });
-          case 31:
+          case 32:
           case "end":
             return _context3.stop();
         }
@@ -27442,7 +27308,7 @@ function useTableData (_ref) {
   var onDelete = /*#__PURE__*/function () {
     var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee4() {
       var _configuration$apiInt2;
-      var newData, newInitData, deleted, userPermissions, _loop, mappingData, deleteResult, _ret, index, total, pages, current, _configuration$filter16, _configuration$filter17, data;
+      var newData, newInitData, deleted, userPermissions, _loop, mappingData, deleteResult, _ret, index, total, pages, current, _configuration$filter17, _configuration$filter18, data;
       return _regeneratorRuntime.wrap(function _callee4$(_context5) {
         while (1) switch (_context5.prev = _context5.next) {
           case 0:
@@ -27457,7 +27323,7 @@ function useTableData (_ref) {
           case 6:
             userPermissions = _context5.sent;
             _loop = /*#__PURE__*/_regeneratorRuntime.mark(function _loop(index) {
-              var _configuration$filter18, _configuration$filter19;
+              var _configuration$filter19, _configuration$filter20;
               var id, _newData$filter, _newData$filter2, mapToggle, _iterator, _step, _globalFilter$toggle, field, _globalFilter$toggle2, _configuration$delete, _configuration$onErro, _configuration$onErro2, deletedIndex, initDeletedIndex;
               return _regeneratorRuntime.wrap(function _loop$(_context4) {
                 while (1) switch (_context4.prev = _context4.next) {
@@ -27473,7 +27339,7 @@ function useTableData (_ref) {
                       })) === null || _newData$filter2 === void 0 ? void 0 : _newData$filter2[0];
                     }
                     mapToggle = {};
-                    _iterator = _createForOfIteratorHelper$3((_configuration$filter18 = (_configuration$filter19 = configuration.filter) === null || _configuration$filter19 === void 0 || (_configuration$filter19 = _configuration$filter19.toggle) === null || _configuration$filter19 === void 0 ? void 0 : _configuration$filter19.fields) !== null && _configuration$filter18 !== void 0 ? _configuration$filter18 : []);
+                    _iterator = _createForOfIteratorHelper$3((_configuration$filter19 = (_configuration$filter20 = configuration.filter) === null || _configuration$filter20 === void 0 || (_configuration$filter20 = _configuration$filter20.toggle) === null || _configuration$filter20 === void 0 ? void 0 : _configuration$filter20.fields) !== null && _configuration$filter19 !== void 0 ? _configuration$filter19 : []);
                     try {
                       for (_iterator.s(); !(_step = _iterator.n()).done;) {
                         field = _step.value;
@@ -27576,14 +27442,14 @@ function useTableData (_ref) {
               break;
             }
             _context5.next = 25;
-            return apiHandler.readList(parentMapping || configuration.mapping, mapping, _objectSpread$o({
+            return apiHandler.readList(parentMapping || configuration.mapping, _objectSpread$o(_objectSpread$o({}, mappingData), state.mappingData), _objectSpread$o({
               pagination: _objectSpread$o(_objectSpread$o({}, state.pagination), {}, {
                 current: current
               }),
               columns: configuration.columns,
-              filters: _objectSpread$o(_objectSpread$o(_objectSpread$o(_objectSpread$o(_objectSpread$o(_objectSpread$o({}, filterData.filters), globalFilter.search), !(configuration !== null && configuration !== void 0 && (_configuration$filter16 = configuration.filter) !== null && _configuration$filter16 !== void 0 && (_configuration$filter16 = _configuration$filter16.toggle) !== null && _configuration$filter16 !== void 0 && _configuration$filter16.inQuery) ? globalFilter.toggle : undefined), globalFilter.select), globalFilter.timeStamp), globalFilter["default"]),
+              filters: _objectSpread$o(_objectSpread$o(_objectSpread$o(_objectSpread$o(_objectSpread$o(_objectSpread$o({}, filterData.filters), globalFilter.search), !(configuration !== null && configuration !== void 0 && (_configuration$filter17 = configuration.filter) !== null && _configuration$filter17 !== void 0 && (_configuration$filter17 = _configuration$filter17.toggle) !== null && _configuration$filter17 !== void 0 && _configuration$filter17.inQuery) ? globalFilter.toggle : undefined), globalFilter.select), globalFilter.timeStamp), globalFilter["default"]),
               sorter: filterData.sorter
-            }, configuration !== null && configuration !== void 0 && (_configuration$filter17 = configuration.filter) !== null && _configuration$filter17 !== void 0 && (_configuration$filter17 = _configuration$filter17.toggle) !== null && _configuration$filter17 !== void 0 && _configuration$filter17.inQuery ? {
+            }, configuration !== null && configuration !== void 0 && (_configuration$filter18 = configuration.filter) !== null && _configuration$filter18 !== void 0 && (_configuration$filter18 = _configuration$filter18.toggle) !== null && _configuration$filter18 !== void 0 && _configuration$filter18.inQuery ? {
               genericProps: globalFilter.toggle
             } : undefined));
           case 25:
@@ -27612,8 +27478,8 @@ function useTableData (_ref) {
     };
   }();
   var onGlobalFilterSelect = function onGlobalFilterSelect(value) {
-    var _configuration$filter20;
-    if (!((_configuration$filter20 = configuration.filter) !== null && _configuration$filter20 !== void 0 && _configuration$filter20.select)) {
+    var _configuration$filter21;
+    if (!((_configuration$filter21 = configuration.filter) !== null && _configuration$filter21 !== void 0 && _configuration$filter21.select)) {
       LOG$2.error(new DivaError('No global select filter defiend'));
       return;
     }
@@ -27629,8 +27495,8 @@ function useTableData (_ref) {
     }, filterData), newGlobalFilter);
   };
   var onGlobalFilterToggle = function onGlobalFilterToggle() {
-    var _configuration$filter21;
-    if (!((_configuration$filter21 = configuration.filter) !== null && _configuration$filter21 !== void 0 && _configuration$filter21.toggle)) {
+    var _configuration$filter22;
+    if (!((_configuration$filter22 = configuration.filter) !== null && _configuration$filter22 !== void 0 && _configuration$filter22.toggle)) {
       LOG$2.error(new DivaError('No global toggle filter defined'));
       return;
     }
@@ -27650,8 +27516,8 @@ function useTableData (_ref) {
     if (globalFilter !== null && globalFilter !== void 0 && globalFilter.toggle) onGlobalFilterToggle();
   };
   var onGlobalFilterSearch = function onGlobalFilterSearch(value) {
-    var _configuration$filter22;
-    if (!((_configuration$filter22 = configuration.filter) !== null && _configuration$filter22 !== void 0 && _configuration$filter22.search)) {
+    var _configuration$filter23;
+    if (!((_configuration$filter23 = configuration.filter) !== null && _configuration$filter23 !== void 0 && _configuration$filter23.search)) {
       LOG$2.error(new DivaError('No global search filter defiend'));
       return;
     }
@@ -27659,8 +27525,8 @@ function useTableData (_ref) {
       search: {}
     });
     if (value) {
-      var _configuration$filter23;
-      (_configuration$filter23 = configuration.filter) === null || _configuration$filter23 === void 0 || _configuration$filter23.search.fields.forEach(function (f) {
+      var _configuration$filter24;
+      (_configuration$filter24 = configuration.filter) === null || _configuration$filter24 === void 0 || _configuration$filter24.search.fields.forEach(function (f) {
         if (typeof f == 'string') {
           newGlobalFilter.search[f] = [value, 'contains', 1]; //normally global search should be or, so 1
         } else {
@@ -27674,8 +27540,8 @@ function useTableData (_ref) {
     }, filterData), newGlobalFilter);
   };
   var onGlobalFilterPeriod = function onGlobalFilterPeriod(from, to) {
-    var _configuration$filter24;
-    if (!((_configuration$filter24 = configuration.filter) !== null && _configuration$filter24 !== void 0 && _configuration$filter24.period)) {
+    var _configuration$filter25;
+    if (!((_configuration$filter25 = configuration.filter) !== null && _configuration$filter25 !== void 0 && _configuration$filter25.period)) {
       LOG$2.error(new DivaError('No global period filter defiend'));
       return;
     }
@@ -27684,10 +27550,13 @@ function useTableData (_ref) {
       fromTimeStamp: [from],
       toTimeStamp: [to]
     };
-    setGlobaFilter(newGlobalFilter);
+    if (!configuration.filter.period.onlyAsMappingData) setGlobaFilter(newGlobalFilter);
     onChange(_objectSpread$o({
       pagination: state.pagination
-    }, filterData), newGlobalFilter);
+    }, filterData), undefined, undefined, undefined, {
+      from: from,
+      to: to
+    });
   };
   return _objectSpread$o(_objectSpread$o({}, state), {}, {
     title: title,
@@ -30530,7 +30399,8 @@ function TableGroups () {
       }, {
         headerName: 'backoffice.idmEnricher.general.label._id',
         field: '_id',
-        editable: false
+        editable: false,
+        cellDataType: 'objectId'
       }]
     };
   }, [apiInterface, t]);
@@ -31143,7 +31013,8 @@ function TableProperties () {
       }, {
         headerName: 'backoffice.idmEnricher.general.label._id',
         field: '_id',
-        editable: false
+        editable: false,
+        cellDataType: 'objectId'
       }]
     };
   }, [apiInterface, t]);
@@ -31515,6 +31386,9 @@ function SeriesSelector$1(_ref) {
   var _useTranslation = useTranslation(),
     t = _useTranslation.t,
     i18n = _useTranslation.i18n;
+  useEffect(function () {
+    setSelectedSerie(undefined);
+  }, [packageId]);
   return /*#__PURE__*/jsx(SimpleSelect, {
     apiInterface: {
       read: enricherService + '/packages/' + packageId + '/' + dataSet + "/series?fields=seriesName[".concat(i18n.language.toLocaleUpperCase(), "];_id;serieNo").concat(additionalFields ? ";".concat(additionalFields.join(';')) : '')
@@ -31533,7 +31407,7 @@ function SeriesSelector$1(_ref) {
     style: {
       width: 200
     }
-  });
+  }, packageId);
 }
 
 function FeatureSelector$1(_ref) {
@@ -31545,6 +31419,9 @@ function FeatureSelector$1(_ref) {
   var _useTranslation = useTranslation(),
     t = _useTranslation.t,
     i18n = _useTranslation.i18n;
+  useEffect(function () {
+    setSelectedFeature(undefined);
+  }, [packageId]);
   return /*#__PURE__*/jsx(SimpleSelect, {
     apiInterface: {
       read: enricherService + '/packages/' + packageId + '/' + dataSet + "/features?fields=featureText[".concat(i18n.language.toLocaleUpperCase(), "];featureNo;_id")
@@ -31563,7 +31440,7 @@ function FeatureSelector$1(_ref) {
     style: {
       width: 200
     }
-  });
+  }, packageId);
 }
 
 function useConfiguration (configuration) {
@@ -31893,7 +31770,8 @@ var config = {
     }, {
       field: 'purchaseRetailId',
       headerName: 'backoffice.idmEnricher.exclusivity.label.purchaseRetailId',
-      editable: false
+      editable: false,
+      cellDataType: 'number'
     }, {
       headerName: 'backoffice.idmEnricher.exclusivity.label.validFrom',
       field: 'validFrom',
@@ -33032,7 +32910,8 @@ function PriceDisplayCellRenderer(props) {
   var _colDef$field, _data$origPrices, _data$manualPrices, _currentPrice$toFixed, _origPrice$toFixed;
   var value = props.value,
     colDef = props.colDef,
-    data = props.data;
+    data = props.data,
+    commas = props.commas;
   var priceGroup = colDef === null || colDef === void 0 || (_colDef$field = colDef.field) === null || _colDef$field === void 0 ? void 0 : _colDef$field.split('.')[1];
   var origPrice = priceGroup ? data === null || data === void 0 || (_data$origPrices = data.origPrices) === null || _data$origPrices === void 0 ? void 0 : _data$origPrices[priceGroup] : undefined;
   var currentPrice = value !== null && value !== void 0 ? value : undefined;
@@ -33042,10 +32921,10 @@ function PriceDisplayCellRenderer(props) {
     className: container$2,
     children: [/*#__PURE__*/jsxs("span", {
       className: classnames(price, _defineProperty({}, priceManual, isManualPrice)),
-      children: [(_currentPrice$toFixed = currentPrice === null || currentPrice === void 0 ? void 0 : currentPrice.toFixed(2)) !== null && _currentPrice$toFixed !== void 0 ? _currentPrice$toFixed : '-', isManualPrice && ' *']
+      children: [(_currentPrice$toFixed = currentPrice === null || currentPrice === void 0 ? void 0 : currentPrice.toFixed(commas !== null && commas !== void 0 ? commas : 2)) !== null && _currentPrice$toFixed !== void 0 ? _currentPrice$toFixed : '-', isManualPrice && ' *']
     }), /*#__PURE__*/jsxs("span", {
       className: originalPrice,
-      children: ["(", (_origPrice$toFixed = origPrice === null || origPrice === void 0 ? void 0 : origPrice.toFixed(2)) !== null && _origPrice$toFixed !== void 0 ? _origPrice$toFixed : '-', ")"]
+      children: ["(", (_origPrice$toFixed = origPrice === null || origPrice === void 0 ? void 0 : origPrice.toFixed(commas !== null && commas !== void 0 ? commas : 2)) !== null && _origPrice$toFixed !== void 0 ? _origPrice$toFixed : '-', ")"]
     }), /*#__PURE__*/jsx("span", {
       className: classnames(difference, _defineProperty(_defineProperty(_defineProperty({}, differencePositive, diffPercentage !== undefined && diffPercentage > 0), differenceNegative, diffPercentage !== undefined && diffPercentage < 0), differenceNeutral, diffPercentage === undefined || diffPercentage === 0)),
       children: diffPercentage !== undefined ? /*#__PURE__*/jsxs(Fragment, {
@@ -33136,27 +33015,95 @@ function Prices (_ref) {
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var updatePgPriceFactor = useCallback(function (priceFeatureGroupItem, value) {
-    var _pricelist$pgPricefac;
     if (!selectedSerie) return;
-    var newFactors = _objectSpread$a(_objectSpread$a({}, pricelist.pgPricefactors), {}, _defineProperty({}, selectedSerie.serieNo, _objectSpread$a(_objectSpread$a({}, (_pricelist$pgPricefac = pricelist.pgPricefactors) === null || _pricelist$pgPricefac === void 0 ? void 0 : _pricelist$pgPricefac[selectedSerie.serieNo]), {}, _defineProperty({}, priceFeatureGroupItem, value))));
+
+    // Create copies of the objects to modify
+    var newFactors = _objectSpread$a({}, pricelist.pgPricefactors);
+    var serieFactors = _objectSpread$a({}, newFactors[selectedSerie.serieNo]);
+    if (value.length === 0) {
+      // Remove the empty price feature group
+      delete serieFactors[priceFeatureGroupItem];
+
+      // If serie factors is now empty, remove the entire serie entry
+      if (Object.keys(serieFactors).length === 0) {
+        delete newFactors[selectedSerie.serieNo];
+      } else {
+        newFactors[selectedSerie.serieNo] = serieFactors;
+      }
+
+      // If no more series exist, set pgPricefactors to undefined
+      if (Object.keys(newFactors).length === 0) {
+        setNodeDataValue({
+          pgPricefactors: undefined
+        });
+        return;
+      }
+    } else {
+      // Add/update the value
+      serieFactors[priceFeatureGroupItem] = value;
+      newFactors[selectedSerie.serieNo] = serieFactors;
+    }
     setNodeDataValue({
       pgPricefactors: newFactors
     });
   }, [pricelist, selectedSerie, setNodeDataValue]);
   var updateArticlePriceFactor = useCallback(function (typeNo, value) {
-    var _pricelist$articlePri;
     if (!selectedSerie) return;
-    var newFactors = _objectSpread$a(_objectSpread$a({}, pricelist.articlePricefactors), {}, _defineProperty({}, selectedSerie.serieNo, _objectSpread$a(_objectSpread$a({}, (_pricelist$articlePri = pricelist.articlePricefactors) === null || _pricelist$articlePri === void 0 ? void 0 : _pricelist$articlePri[selectedSerie.serieNo]), {}, _defineProperty({}, typeNo, value))));
+
+    // Create copies of the objects to modify
+    var newFactors = _objectSpread$a({}, pricelist.articlePricefactors);
+    var serieFactors = _objectSpread$a({}, newFactors[selectedSerie.serieNo]);
+    if (value.length === 0) {
+      // Remove the empty article price factor
+      delete serieFactors[typeNo];
+
+      // If serie factors is now empty, remove the entire serie entry
+      if (Object.keys(serieFactors).length === 0) {
+        delete newFactors[selectedSerie.serieNo];
+      } else {
+        newFactors[selectedSerie.serieNo] = serieFactors;
+      }
+
+      // If no more series exist, set articlePricefactors to undefined
+      if (Object.keys(newFactors).length === 0) {
+        setNodeDataValue({
+          articlePricefactors: undefined
+        });
+        return;
+      }
+    } else {
+      // Add/update the value
+      serieFactors[typeNo] = value;
+      newFactors[selectedSerie.serieNo] = serieFactors;
+    }
     setNodeDataValue({
       articlePricefactors: newFactors
     });
   }, [pricelist, selectedSerie, setNodeDataValue]);
   var updateSeriePriceFactor = useCallback(function (value) {
     if (!selectedSerie) return;
+
+    // Create a copy of the object to modify
+    var newFactors = _objectSpread$a({}, pricelist.seriePricefactors);
+    if (value.length === 0) {
+      // Remove the empty serie price factor
+      delete newFactors[selectedSerie.serieNo];
+
+      // If no more series exist, set seriePricefactors to undefined
+      if (Object.keys(newFactors).length === 0) {
+        setNodeDataValue({
+          seriePricefactors: undefined
+        });
+        return;
+      }
+    } else {
+      // Add/update the value
+      newFactors[selectedSerie.serieNo] = value;
+    }
     setNodeDataValue({
-      seriePricefactors: _defineProperty({}, selectedSerie.serieNo, value)
+      seriePricefactors: newFactors
     });
-  }, [selectedSerie, setNodeDataValue]);
+  }, [pricelist, selectedSerie, setNodeDataValue]);
   var applicationData = useMemo(function () {
     return {
       organizationId: organizationId,
@@ -33164,7 +33111,7 @@ function Prices (_ref) {
       pricelistId: pricelist._id,
       serieNo: selectedSerie === null || selectedSerie === void 0 ? void 0 : selectedSerie.serieNo
     };
-  }, [organizationId, packageId, selectedSerie]);
+  }, [organizationId, packageId, selectedSerie, pricelist]);
   var apiInterface = useMemo(function () {
     return {
       read: apiConfig.enricherService + '/packages/${packageId}/pricelists/${pricelistId}/serie/${serieNo}/prices',
@@ -33198,10 +33145,10 @@ function Prices (_ref) {
         cellDataType: 'number',
         cellRenderer: PriceFactorCellRenderer,
         valueGetter: function valueGetter(_ref2) {
-          var _pricelist$articlePri2;
+          var _pricelist$articlePri;
           var data = _ref2.data;
           if (!data) return;
-          return (_pricelist$articlePri2 = pricelist.articlePricefactors) === null || _pricelist$articlePri2 === void 0 || (_pricelist$articlePri2 = _pricelist$articlePri2[selectedSerie === null || selectedSerie === void 0 ? void 0 : selectedSerie.serieNo]) === null || _pricelist$articlePri2 === void 0 ? void 0 : _pricelist$articlePri2[data.typeNo];
+          return (_pricelist$articlePri = pricelist.articlePricefactors) === null || _pricelist$articlePri === void 0 || (_pricelist$articlePri = _pricelist$articlePri[selectedSerie === null || selectedSerie === void 0 ? void 0 : selectedSerie.serieNo]) === null || _pricelist$articlePri === void 0 ? void 0 : _pricelist$articlePri[data.typeNo];
         },
         cellRendererParams: {
           onSave: function () {
@@ -33229,7 +33176,7 @@ function Prices (_ref) {
           headerName: priceFeatureGroup.displayText,
           marryChildren: true,
           children: _toConsumableArray((_priceFeatureGroup$ke = (_priceFeatureGroup$ke2 = priceFeatureGroup.keys) === null || _priceFeatureGroup$ke2 === void 0 ? void 0 : _priceFeatureGroup$ke2.map(function (priceFeatureGroupItem, j) {
-            var _priceFeatureGroup$ke3, _pricelist$pgPricefac2;
+            var _priceFeatureGroup$ke3, _pricelist$pgPricefac;
             return {
               headerName: priceFeatureGroupItem,
               field: "prices.".concat(priceFeatureGroupItem),
@@ -33238,6 +33185,9 @@ function Prices (_ref) {
               cellDataType: 'number',
               headerTooltip: (_priceFeatureGroup$ke3 = priceFeatureGroup.keysDisplayTexts) === null || _priceFeatureGroup$ke3 === void 0 ? void 0 : _priceFeatureGroup$ke3[j],
               cellRenderer: PriceDisplayCellRenderer,
+              cellRendererParams: {
+                commas: pricelist.commas
+              },
               additionalFields: ["origPrices.".concat(priceFeatureGroupItem)],
               headerClass: inputHeader,
               headerComponentParams: {
@@ -33258,7 +33208,7 @@ function Prices (_ref) {
                       return _ref3.apply(this, arguments);
                     };
                   }()),
-                  value: (_pricelist$pgPricefac2 = pricelist.pgPricefactors) === null || _pricelist$pgPricefac2 === void 0 || (_pricelist$pgPricefac2 = _pricelist$pgPricefac2[selectedSerie === null || selectedSerie === void 0 ? void 0 : selectedSerie.serieNo]) === null || _pricelist$pgPricefac2 === void 0 ? void 0 : _pricelist$pgPricefac2[priceFeatureGroupItem],
+                  value: (_pricelist$pgPricefac = pricelist.pgPricefactors) === null || _pricelist$pgPricefac === void 0 || (_pricelist$pgPricefac = _pricelist$pgPricefac[selectedSerie === null || selectedSerie === void 0 ? void 0 : selectedSerie.serieNo]) === null || _pricelist$pgPricefac === void 0 ? void 0 : _pricelist$pgPricefac[priceFeatureGroupItem],
                   className: factorInput,
                   tooltip: t('backoffice.idmCatalog.prices.priceFactor.label.pfg')
                 })
@@ -33307,7 +33257,8 @@ function Prices (_ref) {
       }, {
         headerName: 'backoffice.idmEnricher.general.label._id',
         field: '_id',
-        editable: false
+        editable: false,
+        cellDataType: 'objectId'
       }])
     };
   }, [apiInterface, selectedSerie, pricelist, priceFeatureGroups]);
@@ -33439,6 +33390,18 @@ function TablePriceList () {
       }
     };
   }, [selectedNodeId]);
+  var roundingOptions = useMemo(function () {
+    return [{
+      name: t('backoffice.idmEnricher.pricelists.rounding.r1'),
+      value: 1
+    }, {
+      name: t('backoffice.idmEnricher.pricelists.rounding.r2'),
+      value: 2
+    }, {
+      name: t('backoffice.idmEnricher.pricelists.rounding.r3'),
+      value: 3
+    }];
+  }, []);
   var configuration = useMemo(function () {
     return {
       type: 'dotnetSSM',
@@ -33482,7 +33445,11 @@ function TablePriceList () {
         headerName: 'backoffice.idmEnricher.pricelists.label.rounding',
         field: 'rounding',
         editable: true,
-        cellDataType: 'number'
+        cellDataType: 'enum',
+        customParams: {
+          enumData: roundingOptions,
+          displayLabelTemplate: '${name} (${value})'
+        }
       }, {
         headerName: 'backoffice.idmEnricher.pricelists.label.commas',
         field: 'commas',
@@ -33675,30 +33642,77 @@ function UploadButton (_ref) {
     title = _ref.title,
     disabled = _ref.disabled,
     contentType = _ref.contentType,
-    setProgress = _ref.setProgress;
+    setProgress = _ref.setProgress,
+    setFileList = _ref.setFileList,
+    fileList = _ref.fileList,
+    progress = _ref.progress;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   var root = useStore();
-  var _useState = useState([]),
-    _useState2 = _slicedToArray(_useState, 2),
-    fileList = _useState2[0],
-    setFileList = _useState2[1];
+  var ref = useRef();
   var handleUploadChange = function handleUploadChange(info) {
     var status = info.file.status;
     if (status === 'done') {
-      message.success("".concat(info.file.name, " file uploaded successfully."));
-      setFileList([]); // Clear the file list
-      setProgress('SUCCESS'); // Mark upload as successful
+      setFileList([]);
+      setProgress('SUCCESS');
+      if (ref.current) {
+        clearInterval(ref.current.interval);
+        ref.current = undefined;
+      }
+      if (info.fileList[0]) {
+        info.fileList[0].percent = 100;
+      }
     } else if (status === 'error') {
-      message.error("".concat(info.file.name, " file upload failed."));
-      setProgress('ERROR'); // Mark upload as failed
+      setProgress('ERROR');
+      if (ref.current) {
+        clearInterval(ref.current.interval);
+        ref.current = undefined;
+      }
+      if (info.fileList[0]) {
+        info.fileList[0].percent = 100;
+      }
     } else if (status === 'removed') {
-      setFileList([]); // Clear the file list
-      setProgress(undefined); // Reset the progress state
+      setFileList([]);
+      setProgress(undefined);
+      if (ref.current) {
+        clearInterval(ref.current.interval);
+        ref.current = undefined;
+      }
     } else {
-      setProgress('INPROGRESS'); // Mark upload as in progress
-      setFileList(info.fileList); // Update the file list during the upload
+      setProgress('INPROGRESS');
+      if (info.fileList[0]) {
+        var file = info.fileList[0];
+        if (status === 'uploading') {
+          // First 50%, the file is still uploading to browser
+          file.percent = (file.percent || 0) / 2;
+          if (file.percent === 50) {
+            // Calculate size-based progress for the second 50%
+            if (file.size) {
+              var _ref$current$startTim, _ref$current, _ref$current$interval, _ref$current2;
+              var fileSize = file.size;
+              var startTime = (_ref$current$startTim = (_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.startTime) !== null && _ref$current$startTim !== void 0 ? _ref$current$startTim : Date.now();
+              var interval = (_ref$current$interval = (_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.interval) !== null && _ref$current$interval !== void 0 ? _ref$current$interval : setInterval(function () {
+                // Assume 1MB takes about 4 seconds to upload
+                var estimatedTimeInSeconds = fileSize / (1024 * 1024) * 4;
+                var elapsedTime = (Date.now() - startTime) / 1000;
+                // Calculate progress for the second 50%
+                var sizeBasedProgress = Math.min(50 * (elapsedTime / estimatedTimeInSeconds), 49);
+                // Combine both progress values, ensuring we don't exceed 99
+                file.percent = Math.min(50 + sizeBasedProgress, 99);
+                setFileList(_toConsumableArray(info.fileList));
+              }, 10);
+              ref.current = {
+                startTime: startTime,
+                interval: interval
+              };
+            }
+          }
+        } else {
+          file.percent = 100; // Set to 100 if not uploading
+        }
+      }
     }
+    setFileList(info.fileList);
   };
   var props = {
     name: 'file',
@@ -33713,7 +33727,7 @@ function UploadButton (_ref) {
   };
   return /*#__PURE__*/jsx(Fragment, {
     children: /*#__PURE__*/jsx(Upload$2, _objectSpread$9(_objectSpread$9({}, props), {}, {
-      children: /*#__PURE__*/jsx(Button$1, {
+      children: progress !== 'SUCCESS' && /*#__PURE__*/jsx(Button$1, {
         icon: /*#__PURE__*/jsx(UploadOutlined$1, {}),
         disabled: disabled,
         children: title !== null && title !== void 0 ? title : t('backoffice.idmEnricher.import.upload')
@@ -33726,19 +33740,18 @@ function IDMImportForm (_ref) {
   var idmService = _ref.idmService,
     organizationId = _ref.organizationId,
     setProgress = _ref.setProgress,
-    progress = _ref.progress;
+    progress = _ref.progress,
+    name = _ref.name,
+    setName = _ref.setName,
+    setFileList = _ref.setFileList,
+    fileList = _ref.fileList;
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
-  var _useState = useState(''),
-    _useState2 = _slicedToArray(_useState, 2),
-    name = _useState2[0],
-    setName = _useState2[1];
   var uploadAction = "".concat(idmService, "/v3.0/catalogs/upload?organizationId=").concat(organizationId, "&name=").concat(encodeURIComponent(name));
   return /*#__PURE__*/jsxs(Form$1, {
     name: "basic",
     children: [/*#__PURE__*/jsx(Form$1.Item, {
       label: "Name",
-      name: "name",
       rules: [{
         required: true,
         message: t('backoffice.idmEnricher.import.namerequired')
@@ -33747,14 +33760,18 @@ function IDMImportForm (_ref) {
         onChange: function onChange(e) {
           return setName(e.target.value);
         },
-        value: name
+        value: name,
+        disabled: progress === 'INPROGRESS' || progress === 'SUCCESS'
       })
     }), /*#__PURE__*/jsx(Form$1.Item, {
       children: /*#__PURE__*/jsx(UploadButton, {
         action: uploadAction,
         contentType: "multipart/form-data",
         setProgress: setProgress,
-        disabled: !name.trim()
+        progress: progress,
+        disabled: !name.trim() || progress === 'INPROGRESS',
+        setFileList: setFileList,
+        fileList: fileList
       })
     }), /*#__PURE__*/jsxs(Form$1.Item, {
       style: {
@@ -33789,17 +33806,28 @@ function OpenModalButton (_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     progress = _useState4[0],
     setProgress = _useState4[1];
+  var _useState5 = useState(''),
+    _useState6 = _slicedToArray(_useState5, 2),
+    name = _useState6[0],
+    setName = _useState6[1];
+  var _useState7 = useState([]),
+    _useState8 = _slicedToArray(_useState7, 2),
+    fileList = _useState8[0],
+    setFileList = _useState8[1];
   var showModal = function showModal() {
     setIsModalOpen(true);
   };
-  var handleOk = function handleOk() {
-    setIsModalOpen(false);
-    onClose();
+  var resetProgress = function resetProgress() {
+    setProgress(undefined);
+    setName('');
+    setFileList([]);
   };
-  var handleCancel = function handleCancel() {
+  var handleOk = function handleOk() {
     setIsModalOpen(false);
+    resetProgress();
     onClose();
   };
+  var buttonText = progress == undefined || progress == 'ERROR' ? t('backoffice.idmEnricher.import.cancel') : progress === 'INPROGRESS' ? t('backoffice.idmEnricher.import.inprogress') : t('backoffice.idmEnricher.import.finish');
   return /*#__PURE__*/jsxs(Fragment, {
     children: [/*#__PURE__*/jsx(Button$1, {
       type: "primary",
@@ -33809,15 +33837,30 @@ function OpenModalButton (_ref) {
       title: title,
       open: isModalOpen,
       onOk: handleOk,
-      onCancel: handleCancel,
-      okText: progress === 'INPROGRESS' ? t('backoffice.idmEnricher.import.inprogress') : 'OK',
+      onCancel: handleOk,
+      cancelButtonProps: progress !== 'SUCCESS' ? {
+        style: {
+          display: 'none'
+        }
+      } : {
+        onClick: resetProgress
+      },
+      closable: progress !== 'INPROGRESS',
+      maskClosable: progress !== 'INPROGRESS',
+      okText: buttonText,
+      cancelText: progress === 'SUCCESS' ? t('backoffice.idmEnricher.import.new') : undefined,
       okButtonProps: {
         disabled: progress === 'INPROGRESS'
       } // Disable the button if progress is 'INPROGRESS'
       ,
+      destroyOnClose: true,
       children: type === 'IDM_IMPORT' && /*#__PURE__*/jsx(IDMImportForm, {
         setProgress: setProgress,
         progress: progress,
+        name: name,
+        setName: setName,
+        setFileList: setFileList,
+        fileList: fileList,
         idmService: idmService,
         organizationId: organizationId
       })
@@ -33983,13 +34026,13 @@ function TableCatalogs () {
       value: 1000000000
     }];
     var roundingType = [{
-      name: t('backoffice.idmCatalog.general.label.roundingType.r1'),
+      name: t('backoffice.idmCatalog.general.label.roundingTypeItem.r1'),
       value: 1
     }, {
-      name: t('backoffice.idmCatalog.general.label.roundingType.r2'),
+      name: t('backoffice.idmCatalog.general.label.roundingTypeItem.r2'),
       value: 2
     }, {
-      name: t('backoffice.idmCatalog.general.label.roundingType.r3'),
+      name: t('backoffice.idmCatalog.general.label.roundingTypeItem.r3'),
       value: 3
     }];
     return {
@@ -34219,11 +34262,11 @@ function TableCatalogs () {
           regex: '[0-9a-zA-Z]{0,10}'
         }, {
           headerName: 'backoffice.idmCatalog.general.label.telephone',
-          field: 'telephoneSwitchBoard',
+          field: 'telephoneSwitchboard',
           required: true
         }, {
           headerName: 'backoffice.idmCatalog.general.label.faxSwitchBoard',
-          field: 'faxSwitchBoard',
+          field: 'faxSwitchboard',
           required: true
         }]
       }, {
@@ -34288,7 +34331,7 @@ function TableCatalogs () {
         headerName: 'backoffice.idmCatalog.general.label.contact2',
         children: [{
           headerName: 'backoffice.idmCatalog.general.label.contactPersonNo',
-          field: 'contactPersonNo1'
+          field: 'contactPersonNo2'
         }, {
           headerName: 'backoffice.idmCatalog.general.label.contactName',
           field: 'contactName2'
@@ -34543,6 +34586,9 @@ function SeriesSelector(_ref) {
   var _useTranslation = useTranslation(),
     t = _useTranslation.t,
     i18n = _useTranslation.i18n;
+  useEffect(function () {
+    setSelectedSerie(undefined);
+  }, [catalogId]);
   return /*#__PURE__*/jsx(SimpleSelect, {
     apiInterface: {
       read: idmService + '/v3.0/catalogs/' + catalogId + "/series?fields=seriesName[".concat(i18n.language.toLocaleUpperCase(), "];_id;serieNo").concat(additionalFields ? ";".concat(additionalFields.join(';')) : '')
@@ -34837,11 +34883,6 @@ function Items(_ref) {
         field: 'typeNo',
         required: true,
         unique: true
-      }, {
-        headerName: 'backoffice.idmCatalogEditor.items.label.priceTypeRef',
-        field: 'priceTypeRef',
-        cellDataType: 'number',
-        required: true
       }, {
         headerName: 'backoffice.idmCatalogEditor.general.label.sequenceNo',
         field: 'sequenceNo',
@@ -34950,11 +34991,9 @@ function Items(_ref) {
           field: 'partListRef',
           cellDataType: 'lookup',
           customParams: {
-            nameField: 'partListRef',
             apiInterface: {
               read: apiConfig.idmService + '/v3.0/catalogs/${catalogId}/partlists'
             },
-            lookupValue: 'partlistKey',
             lookupKey: 'partlistKey'
           }
         }, {
@@ -35073,6 +35112,13 @@ function Items(_ref) {
         headerName: 'backoffice.idmCatalog.general.label.lastUpdatedByDisplayText',
         field: 'lastUpdatedByDisplayText',
         editable: false
+      }, {
+        field: 'priceTypeRef',
+        defaultValue: 1,
+        editable: false,
+        hide: true,
+        lockVisible: true,
+        suppressColumnsToolPanel: true
       }]
     };
   }, []);
@@ -35318,6 +35364,7 @@ function TableSeries () {
       }, {
         headerName: 'backoffice.idmCatalog.general.label._id',
         field: '_id',
+        cellDataType: 'objectId',
         editable: false
       }, {
         field: 'organizationId',
@@ -35476,7 +35523,8 @@ function Options(_ref) {
         headerName: 'backoffice.idmCatalog.options.label.measurement',
         children: [{
           headerName: 'backoffice.idmCatalog.options.label.measureNo',
-          field: 'measureNo'
+          field: 'measureNo',
+          cellDataType: 'number'
         }, {
           headerName: 'backoffice.idmCatalog.options.label.measureValue',
           field: 'measureValue',
@@ -35668,7 +35716,8 @@ function Features(_ref) {
       }, {
         headerName: 'backoffice.idmCatalog.general.label._id',
         field: '_id',
-        editable: false
+        editable: false,
+        cellDataType: 'objectId'
       }, {
         field: 'organizationId',
         editable: false,
@@ -35778,6 +35827,9 @@ function FeatureSelector(_ref) {
   var _useTranslation = useTranslation(),
     t = _useTranslation.t,
     i18n = _useTranslation.i18n;
+  useEffect(function () {
+    setSelectedFeature(undefined);
+  }, [catalogId]);
   return /*#__PURE__*/jsx(SimpleSelect, {
     apiInterface: {
       read: idmService + '/v3.0/catalogs/' + catalogId + "/features?fields=featureText[".concat(i18n.language.toLocaleUpperCase(), "];featureNo;_id")
@@ -35796,7 +35848,7 @@ function FeatureSelector(_ref) {
     style: {
       width: 200
     }
-  });
+  }, catalogId);
 }
 
 function TableOptions () {
@@ -35912,7 +35964,8 @@ function TableFeatureClasses () {
       colDef: [{
         field: 'featureClassNo',
         headerName: 'backoffice.idmCatalog.featureclasses.label.featureClassNo',
-        required: true
+        required: true,
+        cellDataType: 'number'
       }, {
         headerName: 'backoffice.idmCatalog.featureclasses.label.featureClassName',
         marryChildren: true,
@@ -35954,7 +36007,8 @@ function TableFeatureClasses () {
       }, {
         headerName: 'backoffice.idmCatalog.general.label._id',
         field: '_id',
-        editable: false
+        editable: false,
+        cellDataType: 'objectId'
       }, {
         field: 'organizationId',
         editable: false,
@@ -35970,7 +36024,11 @@ function TableFeatureClasses () {
         suppressColumnsToolPanel: true,
         defaultValue: '${catalogId}'
       }, {
-        field: 'featureRefs'
+        field: 'featureRefs',
+        editable: false,
+        hide: true,
+        lockVisible: true,
+        suppressColumnsToolPanel: true
       }]
     };
   }, []);
@@ -36395,7 +36453,8 @@ function OptionCombinations(_ref8) {
       }, {
         headerName: 'backoffice.idmCatalog.general.label._id',
         field: '_id',
-        editable: false
+        editable: false,
+        cellDataType: 'objectId'
       }, {
         field: 'organizationId',
         editable: false,
@@ -36578,10 +36637,6 @@ function TableDecisions () {
           },
           lookupValue: 'featureText',
           lookupKey: 'featureNo',
-          lookupKeyFilterType: {
-            type: 'equals',
-            filterType: 'number'
-          },
           multiple: true,
           translated: true
         },
@@ -36618,7 +36673,8 @@ function TableDecisions () {
       }, {
         headerName: 'backoffice.idmCatalog.general.label._id',
         field: '_id',
-        editable: false
+        editable: false,
+        cellDataType: 'objectId'
       }, {
         field: 'organizationId',
         editable: false,
@@ -36897,7 +36953,8 @@ function TableDetailInfos () {
       }, {
         headerName: 'backoffice.idmCatalog.general.label._id',
         field: '_id',
-        editable: false
+        editable: false,
+        cellDataType: 'objectId'
       }, {
         headerName: 'backoffice.idmCatalog.detailinfos.label.mediaItemId',
         field: 'mediaItemId'
@@ -37125,7 +37182,8 @@ function PartlistPos(_ref) {
       }, {
         headerName: 'backoffice.idmCatalog.general.label._id',
         field: '_id',
-        editable: false
+        editable: false,
+        cellDataType: 'objectId'
       }, {
         field: 'organizationId',
         editable: false,
@@ -37250,7 +37308,8 @@ function TablePartlists () {
       }, {
         headerName: 'backoffice.idmCatalog.general.label._id',
         field: '_id',
-        editable: false
+        editable: false,
+        cellDataType: 'objectId'
       }, {
         field: 'organizationId',
         editable: false,
@@ -37451,7 +37510,8 @@ function PriceFeatureGroupPercentageSurcharge(_ref) {
       }, {
         headerName: 'backoffice.idmCatalog.general.label._id',
         field: '_id',
-        editable: false
+        editable: false,
+        cellDataType: 'objectId'
       }, {
         field: 'organizationId',
         editable: false,
@@ -37631,7 +37691,8 @@ function PriceFeatureGroupFinishes(_ref) {
       }, {
         headerName: 'backoffice.idmCatalog.general.label._id',
         field: '_id',
-        editable: false
+        editable: false,
+        cellDataType: 'objectId'
       }, {
         field: 'organizationId',
         editable: false,
@@ -37829,7 +37890,8 @@ function TablePriceFeatureGroups () {
       }, {
         headerName: 'backoffice.idmCatalog.general.label._id',
         field: '_id',
-        editable: false
+        editable: false,
+        cellDataType: 'objectId'
       }, {
         field: 'organizationId',
         editable: false,
@@ -38140,7 +38202,8 @@ function CollectionMembers(_ref) {
       }, {
         headerName: 'backoffice.idmCatalog.general.label._id',
         field: '_id',
-        editable: false
+        editable: false,
+        cellDataType: 'objectId'
       }]
     };
   }, [apiInterface]);