@crystaldesign/diva-backoffice 24.12.0-beta.3 → 24.12.0-beta.31

package/build/esm/index.js

@@ -1,7 +1,7 @@
 import _defineProperty from '@babel/runtime/helpers/defineProperty';
-import React, { createElement, createContext, useState, useEffect, useRef, useMemo, useImperativeHandle, useCallback, createRef, useReducer, useContext, memo } from 'react';
+import React, { createElement, createContext, useState, useEffect, useRef, useMemo, forwardRef, useImperativeHandle, useCallback, createRef, useReducer, useContext, memo } from 'react';
 import 'antd/dist/reset.css';
-import { Form as Form$1, Button, Input, Popover, Typography, Divider, Select as Select$1, Avatar, Spin, Radio, Space, DatePicker, Checkbox, InputNumber, Modal as Modal$2, Progress, Cascader, Descriptions, Row, Col, Tooltip as Tooltip$1, Collapse, List as List$1, Skeleton, Alert, Card, Upload as Upload$2, Switch, Table as Table$1, Popconfirm, Tabs, Image, Slider, Breadcrumb, Result as Result$1, message, Layout, Drawer, ConfigProvider, theme } from 'antd';
+import { Form as Form$1, Button, Input, Popover, Typography, Divider, Progress, Select as Select$1, Avatar, Spin, Radio, Space, Dropdown, DatePicker, Checkbox, InputNumber, Modal as Modal$2, Cascader, Descriptions, Row, Col, Tooltip as Tooltip$1, Collapse, List as List$1, Skeleton, Alert, Card, Upload as Upload$2, Switch, Table as Table$1, Popconfirm, Tabs, Image, Slider, Breadcrumb, Result as Result$1, message, Layout, Drawer, ConfigProvider, theme } from 'antd';
 import _slicedToArray from '@babel/runtime/helpers/slicedToArray';
 import { observer } from 'mobx-react-lite';
 import { getLogger, DivaError, useTranslation, useDivaCore, DivaUtils } from '@crystaldesign/diva-core';
@@ -16,12 +16,12 @@ import _get from '@babel/runtime/helpers/get';
 import _inherits from '@babel/runtime/helpers/inherits';
 import _regeneratorRuntime from '@babel/runtime/regenerator';
 import _typeof from '@babel/runtime/helpers/typeof';
-import flat, { flatten, unflatten } from 'flat';
+import { flatten, unflatten } from 'flat';
 import { compare } from 'fast-json-patch';
 import { io } from 'socket.io-client';
 import _toConsumableArray from '@babel/runtime/helpers/toConsumableArray';
 import { toJS, makeAutoObservable, observable, action, makeObservable } from 'mobx';
-import merge from 'deepmerge';
+import mergeWith from 'lodash/mergeWith';
 import Tooltip from 'antd/es/tooltip';
 import RightOutlined from '@ant-design/icons/RightOutlined';
 import { jsx, jsxs, Fragment } from 'react/jsx-runtime';
@@ -64,8 +64,12 @@ import FileExcelOutlined from '@ant-design/icons/FileExcelOutlined';
 import FolderOutlined from '@ant-design/icons/FolderOutlined';
 import SettingOutlined from '@ant-design/icons/SettingOutlined';
 import PieChartOutlined from '@ant-design/icons/PieChartOutlined';
+import ClockCircleOutlined from '@ant-design/icons/ClockCircleOutlined';
+import FileZipOutlined from '@ant-design/icons/FileZipOutlined';
+import PlaySquareOutlined from '@ant-design/icons/PlaySquareOutlined';
 import InfoCircleOutlined from '@ant-design/icons/InfoCircleOutlined';
-import { cloneDeep, merge as merge$1, mergeWith } from 'lodash';
+import merge from 'lodash/merge';
+import cloneDeep from 'lodash/cloneDeep';
 import DivaUtils$1, { nanoid, DivaError as DivaError$1 } from '@crystaldesign/diva-utils';
 import DeleteOutlined from '@ant-design/icons/DeleteOutlined';
 import JSONEditor from 'jsoneditor';
@@ -73,10 +77,11 @@ import 'jsoneditor/dist/jsoneditor.css';
 import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProperties';
 import { MinusCircleOutlined, PlusOutlined, DownloadOutlined as DownloadOutlined$1, PlusSquareOutlined, DeleteOutlined as DeleteOutlined$1, FullscreenOutlined, FileUnknownOutlined, CloseOutlined as CloseOutlined$1, PlusCircleOutlined as PlusCircleOutlined$1, HomeOutlined as HomeOutlined$1, InboxOutlined, PushpinOutlined, PushpinFilled, ReloadOutlined as ReloadOutlined$1 } from '@ant-design/icons';
 import classnames from 'classnames';
-import { Editor } from '@tinymce/tinymce-react';
+import RTFEditor from '@crystaldesign/rtf-editor';
 import debounce from 'lodash/debounce';
 import Button$1 from 'antd/es/button';
 import Upload$1 from 'antd/es/upload';
+import DownOutlined from '@ant-design/icons/lib/icons/DownOutlined';
 import Space$1 from 'antd/es/space';
 import { stringify } from 'csv';
 import InfiniteScroll from 'react-infinite-scroll-component';
@@ -91,8 +96,9 @@ import QuestionCircleOutlined from '@ant-design/icons/QuestionCircleOutlined';
 import WarningTwoTone from '@ant-design/icons/WarningTwoTone';
 import CheckOutlined from '@ant-design/icons/lib/icons/CheckOutlined';
 import CloseOutlined from '@ant-design/icons/lib/icons/CloseOutlined';
+import merge$1 from 'deepmerge';
 import { ContentBoxComponent } from '@crystaldesign/content-box';
-import { AgChartsReact } from 'ag-charts-react';
+import { AgCharts } from 'ag-charts-react';
 import { Histogram } from '@crystaldesign/analytics';
 import dayjs from 'dayjs';
 import advancedFormat from 'dayjs/plugin/advancedFormat';
@@ -142,16 +148,16 @@ function _unsupportedIterableToArray$m(r, a) { if (r) { if ("string" == typeof r
 function _arrayLikeToArray$m(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function ownKeys$N(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$N(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$N(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$N(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var LOG$c = getLogger('Backoffice', 'AplyMapping');
-function aplyMapping (_ref) {
-  var mapable = _ref.mapable,
+var LOG$d = getLogger('Backoffice', 'ApplyMapping');
+function applyMapping (_ref) {
+  var mappable = _ref.mappable,
     mappingData = _ref.mappingData,
     mapping = _ref.mapping,
     rootStore = _ref.rootStore,
     _ref$fallBackToParams = _ref.fallBackToParams,
     fallBackToParams = _ref$fallBackToParams === void 0 ? true : _ref$fallBackToParams;
   var isFormData = false;
-  var returnValue = mapable;
+  var returnValue = mappable;
   function set(key, value, type) {
     if (isFormData) {
       returnValue.set(key, value);
@@ -191,10 +197,10 @@ function aplyMapping (_ref) {
     return false;
   }
   try {
-    if (mapable && mapping) {
+    if (mappable && mapping) {
       var flatMapping = mappingData ? flatten(mappingData) : {};
       if (mapping.type == 'filter') {
-        if (typeof mapable !== 'string') {
+        if (typeof mappable !== 'string') {
           throw new Error('Urls can only be processed with mappings of type "query" or "filter".');
         }
         var url = new URL(returnValue);
@@ -222,7 +228,7 @@ function aplyMapping (_ref) {
         }
         returnValue = url.toString();
       } else if (mapping.type == 'query') {
-        if (typeof mapable !== 'string') {
+        if (typeof mappable !== 'string') {
           throw new Error('Urls can only be processed with mappings of type "query" or "filter".');
         }
         var _url = new URL(returnValue);
@@ -265,10 +271,10 @@ function aplyMapping (_ref) {
         }
         returnValue = _url.toString();
       } else if (mapping.type == 'body') {
-        if (_typeof(mapable) !== 'object') {
+        if (_typeof(mappable) !== 'object') {
           throw new Error('Objects can only be processed with mappings of type "body".');
         }
-        if (mapable.entries) {
+        if (mappable.entries) {
           isFormData = true;
         }
         for (var _i = 0; _i < mapping.map.length; _i++) {
@@ -286,7 +292,7 @@ function aplyMapping (_ref) {
     }
     return returnValue;
   } catch (e) {
-    LOG$c.debug('Mapabledata', mapable);
+    LOG$d.debug('Mapabledata', mappable);
     throw e;
   }
 }
@@ -317,8 +323,21 @@ function parseServersideFilters (_ref) {
   if (Object.keys(filters !== null && filters !== void 0 ? filters : {}).length || Object.keys(prefilter !== null && prefilter !== void 0 ? prefilter : {}).length) {
     if (useFullTextSearch(filters !== null && filters !== void 0 ? filters : {})) {
       url = "".concat(url, "&search=").concat(encodeURIComponent(parseFilter(filters !== null && filters !== void 0 ? filters : {}, prefilter).replaceAll(' ', '%20')).replaceAll('(', '%28').replaceAll(')', '%29'));
-    } else {
+    } else if (!url.includes('filter=')) {
       url = "".concat(url, "&filter=").concat(encodeURIComponent(parseFilter(filters !== null && filters !== void 0 ? filters : {}, prefilter).replaceAll(' ', '%20')).replaceAll('(', '%28').replaceAll(')', '%29'));
+    } else {
+      var urlConstruct = new URL(url);
+      var params = new URLSearchParams(urlConstruct.search);
+
+      // Step 2: Get the existing filter parameter
+      var existingFilter = params.get('filter');
+
+      // Step 3: Add another filter parameter
+      params.set('filter', '[' + (existingFilter === null || existingFilter === void 0 ? void 0 : existingFilter.slice(1, -1)) + ',' + parseFilter(filters !== null && filters !== void 0 ? filters : {}, prefilter).replaceAll(' ', '%20').replaceAll('(', '%28').replaceAll(')', '%29').slice(1, -1) + ']');
+
+      // Step 4: Update the URL
+      urlConstruct.search = params.toString();
+      url = urlConstruct.toString();
     }
   }
   if (genericProps) {
@@ -355,7 +374,7 @@ function parseFilter(filters, prefilter) {
       }
     } else {
       var or = values[2]; //filter[1][2]; // [field, [value, operator, or?]]
-      var index = or === true ? 0 : or;
+      var index = or === true || or === 0 ? false : or;
       var inFilter = values[values.length - 1] === 'in';
       if (index == undefined || index === false || inFilter) {
         if (inFilter) {
@@ -448,7 +467,7 @@ function getLeafColumns(columns) {
 
 function ownKeys$M(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$M(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$M(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$M(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var LOG$b = getLogger('Backoffice', 'ApiHandler');
+var LOG$c = getLogger('Backoffice', 'ApiHandler');
 var jp = require('jsonpath');
 var _default$d = /*#__PURE__*/function () {
   function _default(configuration, _rootStore) {
@@ -593,8 +612,8 @@ var _default$d = /*#__PURE__*/function () {
                 _context2.next = 10;
                 break;
               }
-              data = aplyMapping({
-                mapable: data,
+              data = applyMapping({
+                mappable: data,
                 mappingData: data,
                 mapping: mapping,
                 rootStore: this._rootStore,
@@ -607,8 +626,8 @@ var _default$d = /*#__PURE__*/function () {
                 _context2.next = 14;
                 break;
               }
-              finalUrl = aplyMapping({
-                mapable: finalUrl,
+              finalUrl = applyMapping({
+                mappable: finalUrl,
                 mapping: mapping,
                 rootStore: this._rootStore,
                 fallBackToParams: false
@@ -712,8 +731,8 @@ var _default$d = /*#__PURE__*/function () {
               if (jwt) header['Authorization'] = 'Bearer ' + jwt;
               if (sessionGuid) header['SessionGuid'] = sessionGuid;
               if ((mapping === null || mapping === void 0 ? void 0 : mapping.type) == 'query') {
-                url = aplyMapping({
-                  mapable: this._createUrl,
+                url = applyMapping({
+                  mappable: this._createUrl,
                   mapping: mapping,
                   mappingData: mappingData,
                   rootStore: this._rootStore,
@@ -721,8 +740,8 @@ var _default$d = /*#__PURE__*/function () {
                 });
                 if (data) createData = _objectSpread$M({}, data);
               } else if (data !== undefined) {
-                createData = aplyMapping({
-                  mapable: data,
+                createData = applyMapping({
+                  mappable: data,
                   mapping: mapping,
                   mappingData: mappingData,
                   rootStore: this._rootStore,
@@ -733,8 +752,8 @@ var _default$d = /*#__PURE__*/function () {
               if (formData !== undefined) {
                 // set metadata doesn't work with content type set
                 delete header['Content-Type'];
-                createData = aplyMapping({
-                  mapable: formData,
+                createData = applyMapping({
+                  mappable: formData,
                   mappingData: mappingData,
                   mapping: mapping,
                   rootStore: this._rootStore,
@@ -831,8 +850,8 @@ var _default$d = /*#__PURE__*/function () {
               throw new Error('Delete endpoint is missing in configuration.');
             case 2:
               jwt = (_this$_rootStore3 = this._rootStore) === null || _this$_rootStore3 === void 0 ? void 0 : _this$_rootStore3.dataStore.jwt;
-              url = new URL(aplyMapping({
-                mapable: this._deleteUrl,
+              url = new URL(applyMapping({
+                mappable: this._deleteUrl,
                 mapping: mapping,
                 mappingData: mappingData,
                 rootStore: this._rootStore,
@@ -840,8 +859,8 @@ var _default$d = /*#__PURE__*/function () {
               }));
               if (id && this._applyIdField) {
                 if (this._deleteUrl.includes("${".concat(this._deleteIdField, "}"))) {
-                  url = new URL(aplyMapping({
-                    mapable: url.toString(),
+                  url = new URL(applyMapping({
+                    mappable: url.toString(),
                     mapping: {
                       type: 'query',
                       map: [{
@@ -1029,8 +1048,8 @@ var _default$d = /*#__PURE__*/function () {
         baseUrl: this._readListUrl,
         prefilter: prefilter
       })) : this._readListUrl;
-      url = aplyMapping({
-        mapable: url,
+      url = applyMapping({
+        mappable: url,
         mapping: mapping,
         mappingData: mappingData,
         rootStore: this._rootStore,
@@ -1046,8 +1065,8 @@ var _default$d = /*#__PURE__*/function () {
         return _regeneratorRuntime.wrap(function _callee9$(_context9) {
           while (1) switch (_context9.prev = _context9.next) {
             case 0:
-              url = aplyMapping({
-                mapable: baseUrl,
+              url = applyMapping({
+                mappable: baseUrl,
                 mapping: mapping,
                 mappingData: mappingData,
                 rootStore: this._rootStore,
@@ -1108,8 +1127,8 @@ var _default$d = /*#__PURE__*/function () {
     value: function createSocket(data, mapping, namespace) {
       var _this$_rootStore7;
       if (!this._socketUrl) throw new Error('no socket url configured');
-      var url = new URL(aplyMapping({
-        mapable: this._socketUrl,
+      var url = new URL(applyMapping({
+        mappable: this._socketUrl,
         mapping: mapping,
         mappingData: data,
         rootStore: this._rootStore,
@@ -1125,16 +1144,16 @@ var _default$d = /*#__PURE__*/function () {
         }
       });
       this._socket.on('error', function (error) {
-        LOG$b.error(new DivaError('Error on connection', error));
+        LOG$c.error(new DivaError('Error on connection', error));
       });
       this._socket.on('connect_error', function (error) {
-        LOG$b.log("connect_error due to ".concat(error.message));
+        LOG$c.log("connect_error due to ".concat(error.message));
       });
       this._socket.on('connect', function () {
-        LOG$b.debug('Successfully connected to socket');
+        LOG$c.debug('Successfully connected to socket');
       });
       this._socket.on('disconnect', function () {
-        LOG$b.debug('Disconnect from socket');
+        LOG$c.debug('Disconnect from socket');
       });
       return this._socket;
     }
@@ -1273,8 +1292,8 @@ var _default$b = /*#__PURE__*/function (_ApiHandler) {
                 _context.next = 8;
                 break;
               }
-              data = aplyMapping({
-                mapable: {},
+              data = applyMapping({
+                mappable: {},
                 mapping: this.configuration.targetMapping,
                 rootStore: this._rootStore
               });
@@ -1344,8 +1363,8 @@ var _default$b = /*#__PURE__*/function (_ApiHandler) {
                 _context2.next = 10;
                 break;
               }
-              _data = aplyMapping({
-                mapable: {},
+              _data = applyMapping({
+                mappable: {},
                 mapping: this.configuration.targetMapping,
                 mappingData: {
                   url: response.ref.url,
@@ -1389,8 +1408,8 @@ var _default$b = /*#__PURE__*/function (_ApiHandler) {
                 _context3.next = 6;
                 break;
               }
-              data = aplyMapping({
-                mapable: {},
+              data = applyMapping({
+                mappable: {},
                 mapping: this.configuration.targetMapping,
                 mappingData: {
                   url: '',
@@ -1580,8 +1599,8 @@ var _default$8 = /*#__PURE__*/function (_ApiHandler) {
                 // so we merge them into one in order to aply the mapping
                 var mergedMappingData = Object.assign({}, mappingData);
                 mergedMappingData = Object.assign(mergedMappingData, data);
-                var newEntry = aplyMapping({
-                  mapable: {},
+                var newEntry = applyMapping({
+                  mappable: {},
                   mapping: _this2.configuration.actionMapping,
                   mappingData: mergedMappingData,
                   rootStore: _this2._rootStore
@@ -1715,8 +1734,8 @@ var _default$7 = /*#__PURE__*/function () {
   function _default(root) {
     _classCallCheck(this, _default);
     this.root = root;
-    _defineProperty(this, "_configuration", void 0);
-    _defineProperty(this, "_apiConfig", void 0);
+    _defineProperty(this, "_configuration", undefined);
+    _defineProperty(this, "_apiConfig", undefined);
     makeAutoObservable(this, {
       root: false,
       fetchConfiguration: false
@@ -1760,10 +1779,9 @@ var _default$7 = /*#__PURE__*/function () {
 
       //merge with configuration so everything can changed by config
       if (config.configuration) {
-        configuration = merge(configuration, config.configuration, {
-          arrayMerge: function arrayMerge(_, s) {
-            return s;
-          }
+        configuration = mergeWith(configuration, config.configuration, function (obj, src) {
+          if (Array.isArray(obj) && Array.isArray(src) && obj.length != src.length) return src;
+          return undefined;
         });
       }
 
@@ -2512,211 +2530,841 @@ function loadConfiguration(t, root, config, lang) {
         }
       }
     },
-    TableClientRelations: {
+    TableTaskStatusVersioning: {
       type: 'Table',
       canRefresh: true,
-      title: t('backoffice.table.clientrelations.title'),
+      title: t('backoffice.table.taskstatusversioning.title.taskstatusversioninglist'),
       columns: [{
-        title: t('backoffice.table.clientrelations.columns.name'),
-        field: 'name',
-        defaultSortOrder: 'ascend',
-        sorter: 1,
+        title: 'ID',
+        field: '_id',
+        sorter: 2,
         filter: 'search',
         width: 200
       }, {
-        title: t('backoffice.table.clientrelations.columns.nameSource'),
-        field: 'nameSource',
-        sorter: 1,
+        title: t('backoffice.table.taskstatusversioning.columns.model'),
+        field: 'taskName',
+        sorter: 2,
+        filter: 'search',
+        width: 400
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.organisationid'),
+        field: 'organizationId',
+        sorter: 200,
         filter: 'search',
         width: 200
       }, {
-        title: t('backoffice.table.clientrelations.columns.nameTarget'),
-        field: 'nameTarget',
-        sorter: 2,
+        title: t('backoffice.table.taskstatusversioning.columns.organisation'),
+        field: 'organizationDisplayName',
+        sorter: 200,
         filter: 'search',
         width: 200
       }, {
-        title: t('backoffice.table.clientrelations.columns.externalCloudName'),
-        field: 'externalCloudName',
+        title: t('backoffice.table.taskstatusversioning.columns.user'),
+        field: 'user.mainEmail',
         sorter: 3,
         filter: 'search',
         width: 200
       }, {
-        title: t('backoffice.table.clientrelations.columns.state'),
-        field: 'state',
-        sorter: 4,
+        title: t('backoffice.table.taskstatusversioning.columns.user'),
+        field: 'cancelledByUser.mainEmail',
+        sorter: 3,
         filter: 'search',
-        width: 100
-      }, {
-        title: t('backoffice.table.clientrelations.columns.created'),
-        field: 'created',
-        sorter: 5,
         width: 200,
-        type: 'unixTimeStamp'
+        hidden: true
       }, {
-        title: t('backoffice.table.clientrelations.columns.lastUpdated'),
-        field: 'lastUpdated',
-        sorter: 6,
-        width: 200,
-        type: 'unixTimeStamp'
+        title: t('backoffice.table.taskstatusversioning.columns.status'),
+        field: 'progress.status',
+        filter: 'search',
+        width: 200
       }, {
-        title: 'ID',
-        field: '_id',
-        sorter: 7,
-        width: 50,
+        title: t('backoffice.table.taskstatusversioning.columns.status'),
+        field: 'progress.step',
+        filter: 'search',
+        width: 200,
         hidden: true
       }, {
-        title: t('backoffice.table.clientrelations.columns.externalCloudId'),
-        field: 'externalCloudId',
-        sorter: 8,
-        width: 50,
+        title: t('backoffice.table.taskstatusversioning.columns.status'),
+        field: 'progress.percentage',
+        filter: 'search',
+        width: 200,
         hidden: true
       }, {
-        title: t('backoffice.table.clientrelations.columns.type'),
-        field: 'type',
-        sorter: 9,
-        width: 50,
+        title: t('backoffice.table.taskstatusversioning.columns.created'),
+        field: 'created',
+        sorter: 1,
+        defaultSortOrder: 'descend',
+        type: 'unixTimeStamp',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.lastUpdated'),
+        field: 'lastUpdated',
+        type: 'unixTimeStamp',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.lastUpdated'),
+        field: 'startTime',
+        type: 'unixTimeStamp',
+        width: 200,
         hidden: true
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.finished'),
+        field: 'endTime',
+        type: 'unixTimeStamp',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.server'),
+        field: 'serverName',
+        filter: 'search',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.type'),
+        field: 'taskType',
+        filter: 'search',
+        width: 200
       }],
+      filter: {
+        toggle: {
+          globalValue: 'relevantTypeOrganizationId',
+          fields: ['organizationId'],
+          label: t('backoffice.table.taskstatusversioning.filter.label.allorgs'),
+          labelOff: t('backoffice.table.taskstatusversioning.filter.labelOff.allorgs'),
+          inverted: true,
+          permission: 'backoffice_taskstatus_allorgs',
+          isAnd: true
+        },
+        search: {
+          fields: ['_id', 'progress.dataItems', 'taskName', 'organizationId', 'user.mainEmail', 'status', 'serverName', 'taskType']
+        }
+      },
       apiInterface: {
         read: {
-          list: '${authService}/clientrelations',
+          list: '${adminService}/taskStatus?filter=%5B%2B%5B%7BtaskType%2Ceq%2CRETAIL_VERSIONING%7D%2C%7BtaskType%2Ceq%2CSUPPLIER_VERSIONING%7D%5D%5D',
+          fields: true,
           filterServerSide: true
         },
-        "delete": {
-          url: '${authService}/clientrelation/${_id}/type/${type}',
-          applyIdField: false
-        }
-      },
-      onError: {
-        AUTH_0030: t('errorcodes._source.labels.error.AUTH_0030'),
-        AUTH_0031: t('errorcodes._source.labels.error.AUTH_0031')
-      },
-      deleteMapping: {
-        type: 'query',
-        map: [{
-          sourceField: '_id',
-          targetField: '_id'
-        }, {
-          targetField: 'type',
-          sourceField: 'type'
-        }]
-      },
-      createAction: {
-        actionType: 'Detail',
-        label: t('backoffice.table.clientrelations.createAction.label.createnewclientrelation'),
-        title: t('backoffice.table.clientrelations.createAction.title.ewclientrelation'),
-        id: 'FromCreateClientRelation',
-        type: 'Form',
-        apiInterface: {
-          create: '${authService}/clientrelations'
-        }
+        "delete": '${adminService}/taskStatus?id=${id}'
       },
       mapping: {
         type: 'query',
         map: [{
-          sourceField: 'nameSource',
-          targetField: 'nameSource'
-        }, {
-          sourceField: 'nameTarget',
-          targetField: 'nameTarget'
+          globalValue: 'selectedOrganizationId',
+          targetField: 'organizationId'
         }]
       },
-      filter: {
-        toggle: {
-          globalValue: 'relevantTypeOrganizationId',
-          fields: ['sourceOrganizationId', 'targetOrganizationId'],
-          label: t('backoffice.table.clientrelations.filter.label.allorgs'),
-          labelOff: t('backoffice.table.clientrelations.filter.labelOff.allorgs'),
-          inverted: true
-        },
-        search: {
-          fields: ['nameSource', 'nameTarget', 'externalCloudName', 'state', 'name']
+      deleteAction: {
+        label: 'backoffice.table.taskstatusversioning.deleteAction.label.cancel',
+        labelDialog: 'backoffice.table.taskstatusversioning.deleteAction.labelDialog.cancel',
+        disabled: function disabled(datas) {
+          return datas === null || datas === void 0 ? void 0 : datas.find(function (d) {
+            return (d === null || d === void 0 ? void 0 : d.progress.status) != 'Created';
+          });
         }
       },
       rowAction: [{
         actionType: 'Detail',
         type: 'Form',
-        id: 'FormOrganizationDetailes',
-        title: t('backoffice.edit')
-      }]
-    },
-    FormOrganizationDetailes: {
-      type: 'Form',
-      title: t('backoffice.form.createclientrelation.title'),
-      apiInterface: {
-        update: {
-          url: '${authService}/clientrelation/{_id}/type/{type}',
-          method: 'PATCH',
-          jsonPatch: true
-        }
-      },
-      triggerRerender: true,
-      items: [{
-        name: 'name',
-        label: t('backoffice.form.createclientrelation.name'),
-        type: 'input',
-        required: true
-      }, {
-        label: t('backoffice.form.createclientrelation.aktivate'),
-        name: 'state',
-        type: 'radio',
-        optionType: 'button',
-        options: [{
-          label: 'INACTIVE',
-          value: 'INACTIVE'
-        }, {
-          label: 'ACTIVE',
-          value: 'ACTIVE'
-        }],
-        required: false
+        id: 'FormTaskStatusDetails',
+        title: t('backoffice.table.taskstatusversioning.rowAction.title')
       }]
     },
-    TableExternalClouds: {
+    TableTaskStatusCustom: {
       type: 'Table',
       canRefresh: true,
-      title: t('backoffice.table.externalclouds.title.listexternalclouds'),
+      title: t('backoffice.table.taskstatusversioning.title.taskstatuscustom'),
       columns: [{
-        title: t('backoffice.table.externalclouds.title.listexternalclouds'),
-        field: 'name',
-        sorter: 1,
+        title: 'ID',
+        field: '_id',
+        sorter: 2,
         filter: 'search',
         width: 200
       }, {
-        title: 'Base URL',
-        field: 'url',
+        title: t('backoffice.table.taskstatusversioning.columns.taskname'),
+        field: 'taskName',
         sorter: 2,
         filter: 'search',
+        width: 400
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.organisationid'),
+        field: 'organizationId',
+        sorter: 200,
+        filter: 'search',
         width: 200
       }, {
-        title: t('backoffice.table.externalclouds.columns.created'),
+        title: t('backoffice.table.taskstatusversioning.columns.organisation'),
+        field: 'organizationDisplayName',
+        sorter: 200,
+        filter: 'search',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.user'),
+        field: 'user.mainEmail',
+        sorter: 3,
+        filter: 'search',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.user'),
+        field: 'cancelledByUser.mainEmail',
+        sorter: 3,
+        filter: 'search',
+        width: 200,
+        hidden: true
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.status'),
+        field: 'progress.status',
+        filter: 'search',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.status'),
+        field: 'progress.step',
+        filter: 'search',
+        width: 200,
+        hidden: true
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.status'),
+        field: 'progress.percentage',
+        filter: 'search',
+        width: 200,
+        hidden: true
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.created'),
         field: 'created',
+        sorter: 1,
+        defaultSortOrder: 'descend',
         type: 'unixTimeStamp',
-        sorter: 8
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.lastUpdated'),
+        field: 'lastUpdated',
+        type: 'unixTimeStamp',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.lastUpdated'),
+        field: 'startTime',
+        type: 'unixTimeStamp',
+        width: 200,
+        hidden: true
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.finished'),
+        field: 'endTime',
+        type: 'unixTimeStamp',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.server'),
+        field: 'serverName',
+        filter: 'search',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.type'),
+        field: 'taskType',
+        filter: 'search',
+        width: 200
       }],
       filter: {
+        toggle: {
+          globalValue: 'relevantTypeOrganizationId',
+          fields: ['organizationId'],
+          label: t('backoffice.table.taskstatusversioning.filter.label.allorgs'),
+          labelOff: t('backoffice.table.taskstatusversioning.filter.labelOff.allorgs'),
+          inverted: true,
+          permission: 'backoffice_taskstatus_allorgs',
+          isAnd: true
+        },
         search: {
-          fields: ['_id', 'name', 'url', 'iln']
+          fields: ['_id', 'progress.dataItems', 'taskName', 'organizationId', 'user.mainEmail', 'status', 'serverName', 'taskType']
         }
       },
       apiInterface: {
         read: {
-          list: '${authService}/externalclouds',
+          list: '${adminService}/taskStatus?filter=%5B%2B%5B%7BtaskType%2Ceq%2CSAP_XML_IMPORT%7D%2C%7BtaskType%2Ceq%2CSAP_DROPDOWNITEMS%7D%2C%7BtaskType%2Ceq%2CSAP_TEMPLATEARTICLES%7D%2C%7BtaskType%2Ceq%2CSAP_ARTICLE_IMPORT%7D%2C%7BtaskType%2Ceq%2CSAP_SUPPLIERS%7D%2C%7BtaskType%2Ceq%2CSAP_PRODUCTGROUPS%7D%2C%7BtaskType%2Ceq%2CSAP_AUSP%7D%2C%7BtaskType%2Ceq%2CPIM_SEND_CLASSIFICATION%7D%2C%7BtaskType%2Ceq%2CSEND_SAP_ARTICLES%7D%5D%5D',
+          fields: true,
           filterServerSide: true
         },
-        "delete": '${authService}/externalclouds/${id}'
+        "delete": '${adminService}/taskStatus?id=${id}'
       },
-      rowAction: [{
-        actionType: 'Detail',
-        type: 'Form',
-        id: 'FormExternalCloudDetail',
-        title: t('backoffice.table.externalclouds.rowAction.title.externalcloud'),
-        width: '40%',
-        footer: true
-      }],
-      createAction: {
-        actionType: 'Detail',
-        label: t('backoffice.table.externalclouds.createaction.title.externalcloud'),
+      mapping: {
+        type: 'query',
+        map: [{
+          globalValue: 'selectedOrganizationId',
+          targetField: 'organizationId'
+        }]
+      },
+      deleteAction: {
+        label: 'backoffice.table.taskstatusversioning.deleteAction.label.cancel',
+        labelDialog: 'backoffice.table.taskstatusversioning.deleteAction.labelDialog.cancel',
+        disabled: function disabled(datas) {
+          return datas === null || datas === void 0 ? void 0 : datas.find(function (d) {
+            return (d === null || d === void 0 ? void 0 : d.progress.status) != 'Created';
+          });
+        }
+      },
+      rowAction: [{
+        actionType: 'Detail',
+        type: 'Form',
+        id: 'FormTaskStatusDetails',
+        title: t('backoffice.table.taskstatusversioning.rowAction.title')
+      }]
+    },
+    TableTaskStatusCronJobs: {
+      type: 'Table',
+      canRefresh: true,
+      title: t('backoffice.table.taskstatusversioning.title.taskstatusversioninglist'),
+      columns: [{
+        title: 'ID',
+        field: '_id',
+        sorter: 2,
+        filter: 'search',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.taskname'),
+        field: 'taskName',
+        sorter: 2,
+        filter: 'search',
+        width: 400
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.organisationid'),
+        field: 'organizationId',
+        sorter: 200,
+        filter: 'search',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.organisation'),
+        field: 'organizationDisplayName',
+        sorter: 200,
+        filter: 'search',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.user'),
+        field: 'user.mainEmail',
+        sorter: 3,
+        filter: 'search',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.user'),
+        field: 'cancelledByUser.mainEmail',
+        sorter: 3,
+        filter: 'search',
+        width: 200,
+        hidden: true
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.status'),
+        field: 'progress.status',
+        filter: 'search',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.status'),
+        field: 'progress.step',
+        filter: 'search',
+        width: 200,
+        hidden: true
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.status'),
+        field: 'progress.percentage',
+        filter: 'search',
+        width: 200,
+        hidden: true
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.created'),
+        field: 'created',
+        sorter: 1,
+        defaultSortOrder: 'descend',
+        type: 'unixTimeStamp',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.lastUpdated'),
+        field: 'lastUpdated',
+        type: 'unixTimeStamp',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.lastUpdated'),
+        field: 'startTime',
+        type: 'unixTimeStamp',
+        width: 200,
+        hidden: true
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.finished'),
+        field: 'endTime',
+        type: 'unixTimeStamp',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.server'),
+        field: 'serverName',
+        filter: 'search',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.type'),
+        field: 'taskType',
+        filter: 'search',
+        width: 200
+      }],
+      filter: {
+        toggle: {
+          globalValue: 'relevantTypeOrganizationId',
+          fields: ['organizationId'],
+          label: t('backoffice.table.taskstatusversioning.filter.label.allorgs'),
+          labelOff: t('backoffice.table.taskstatusversioning.filter.labelOff.allorgs'),
+          inverted: true,
+          permission: 'backoffice_taskstatus_allorgs',
+          isAnd: true
+        },
+        search: {
+          fields: ['_id', 'progress.dataItems', 'taskName', 'organizationId', 'user.mainEmail', 'status', 'serverName', 'taskType']
+        }
+      },
+      apiInterface: {
+        read: {
+          list: '${adminService}/taskStatus?filter=%5B%7BtaskType%2Ceq%2CCRON%7D%5D',
+          fields: true,
+          filterServerSide: true
+        },
+        "delete": '${adminService}/taskStatus?id=${id}'
+      },
+      mapping: {
+        type: 'query',
+        map: [{
+          globalValue: 'selectedOrganizationId',
+          targetField: 'organizationId'
+        }]
+      },
+      deleteAction: {
+        label: 'backoffice.table.taskstatusversioning.deleteAction.label.cancel',
+        labelDialog: 'backoffice.table.taskstatusversioning.deleteAction.labelDialog.cancel',
+        disabled: function disabled(datas) {
+          return datas === null || datas === void 0 ? void 0 : datas.find(function (d) {
+            return (d === null || d === void 0 ? void 0 : d.progress.status) != 'Created';
+          });
+        }
+      },
+      rowAction: [{
+        actionType: 'Detail',
+        type: 'Form',
+        id: 'FormTaskStatusDetails',
+        title: t('backoffice.table.taskstatusversioning.rowAction.title')
+      }]
+    },
+    TableTaskStatusOthers: {
+      type: 'Table',
+      canRefresh: true,
+      title: t('backoffice.table.taskstatusversioning.title.taskstatusothers'),
+      columns: [{
+        title: 'ID',
+        field: '_id',
+        sorter: 2,
+        filter: 'search',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.taskname'),
+        field: 'taskName',
+        sorter: 2,
+        filter: 'search',
+        width: 400
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.organisationid'),
+        field: 'organizationId',
+        sorter: 200,
+        filter: 'search',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.organisation'),
+        field: 'organizationDisplayName',
+        sorter: 200,
+        filter: 'search',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.user'),
+        field: 'user.mainEmail',
+        sorter: 3,
+        filter: 'search',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.user'),
+        field: 'cancelledByUser.mainEmail',
+        sorter: 3,
+        filter: 'search',
+        width: 200,
+        hidden: true
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.status'),
+        field: 'progress.status',
+        filter: 'search',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.status'),
+        field: 'progress.step',
+        filter: 'search',
+        width: 200,
+        hidden: true
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.status'),
+        field: 'progress.percentage',
+        filter: 'search',
+        width: 200,
+        hidden: true
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.created'),
+        field: 'created',
+        sorter: 1,
+        defaultSortOrder: 'descend',
+        type: 'unixTimeStamp',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.lastUpdated'),
+        field: 'lastUpdated',
+        type: 'unixTimeStamp',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.lastUpdated'),
+        field: 'startTime',
+        type: 'unixTimeStamp',
+        width: 200,
+        hidden: true
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.finished'),
+        field: 'endTime',
+        type: 'unixTimeStamp',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.server'),
+        field: 'serverName',
+        filter: 'search',
+        width: 200
+      }, {
+        title: t('backoffice.table.taskstatusversioning.columns.type'),
+        field: 'taskType',
+        filter: 'search',
+        width: 200
+      }],
+      filter: {
+        toggle: {
+          globalValue: 'relevantTypeOrganizationId',
+          fields: ['organizationId'],
+          label: t('backoffice.table.taskstatusversioning.filter.label.allorgs'),
+          labelOff: t('backoffice.table.taskstatusversioning.filter.labelOff.allorgs'),
+          inverted: true,
+          permission: 'backoffice_taskstatus_allorgs',
+          isAnd: true
+        },
+        search: {
+          fields: ['_id', 'progress.dataItems', 'taskName', 'organizationId', 'user.mainEmail', 'status', 'serverName', 'taskType']
+        }
+      },
+      apiInterface: {
+        read: {
+          list: '${adminService}/taskStatus?filter=%5B%7BtaskType%2Cne%2CSAP_XML_IMPORT%7D%2C%7BtaskType%2Cne%2CSAP_DROPDOWNITEMS%7D%2C%7BtaskType%2Cne%2CSAP_TEMPLATEARTICLES%7D%2C%7BtaskType%2Cne%2CSAP_ARTICLE_IMPORT%7D%2C%7BtaskType%2Cne%2CSAP_SUPPLIERS%7D%2C%7BtaskType%2Cne%2CSAP_PRODUCTGROUPS%7D%2C%7BtaskType%2Cne%2CSAP_AUSP%7D%2C%7BtaskType%2Cne%2CPIM_SEND_CLASSIFICATION%7D%2C%7BtaskType%2Cne%2CSEND_SAP_ARTICLES%7D%2C%7BtaskType%2Cne%2CCRON%7D%2C%7BtaskType%2Cne%2CRETAIL_VERSIONING%7D%2C%7BtaskType%2Cne%2CSUPPLIER_VERSIONING%7D%2C%7BtaskType%2Cne%2CBACKOFFICE_CE_EXPORT%7D%2C%7BtaskType%2Cne%2CBACKOFFICE_CE_IMPORT%7D%5D',
+          fields: true,
+          filterServerSide: true
+        },
+        "delete": '${adminService}/taskStatus?id=${id}'
+      },
+      mapping: {
+        type: 'query',
+        map: [{
+          globalValue: 'selectedOrganizationId',
+          targetField: 'organizationId'
+        }]
+      },
+      deleteAction: {
+        label: 'backoffice.table.taskstatusversioning.deleteAction.label.cancel',
+        labelDialog: 'backoffice.table.taskstatusversioning.deleteAction.labelDialog.cancel',
+        disabled: function disabled(datas) {
+          return datas === null || datas === void 0 ? void 0 : datas.find(function (d) {
+            return (d === null || d === void 0 ? void 0 : d.progress.status) != 'Created';
+          });
+        }
+      },
+      rowAction: [{
+        actionType: 'Detail',
+        type: 'Form',
+        id: 'FormTaskStatusDetails',
+        title: t('backoffice.table.taskstatusversioning.rowAction.title')
+      }]
+    },
+    FormTaskStatusDetails: {
+      type: 'Form',
+      title: t('backoffice.form.taskstatus.title'),
+      triggerRerender: true,
+      disableSave: true,
+      items: [{
+        name: '_id',
+        label: t('backoffice.form.taskstatus._id'),
+        type: 'input',
+        readonly: true
+      }, {
+        name: 'taskName',
+        label: t('backoffice.form.taskstatus.taskName'),
+        type: 'input',
+        readonly: true
+      }, {
+        name: 'created',
+        label: t('backoffice.form.taskstatus.created'),
+        type: 'dateinput',
+        disabled: true
+      }, {
+        name: 'startTime',
+        label: t('backoffice.form.taskstatus.startTime'),
+        type: 'dateinput',
+        readonly: true
+      }, {
+        name: 'endTime',
+        label: t('backoffice.form.taskstatus.endTime'),
+        type: 'dateinput',
+        readonly: true
+      }, {
+        name: 'lastUpdated',
+        label: t('backoffice.form.taskstatus.lastUpdated'),
+        type: 'dateinput',
+        readonly: true
+      }, {
+        name: ['user', 'mainEmail'],
+        label: t('backoffice.form.taskstatus.user'),
+        type: 'input',
+        readonly: true
+      }, {
+        name: 'organizationDisplayName',
+        label: t('backoffice.form.taskstatus.organizationDisplayName'),
+        type: 'input',
+        readonly: true
+      }, {
+        name: 'taskType',
+        label: t('backoffice.form.taskstatus.taskType'),
+        type: 'input',
+        readonly: true
+      }, {
+        label: t('backoffice.form.taskstatus.progress.status'),
+        name: ['progress', 'status'],
+        type: 'input',
+        readonly: true
+      }, {
+        name: ['progress', 'percentage'],
+        label: t('backoffice.form.taskstatus.progress.percentage'),
+        type: 'progress',
+        readonly: true
+      }, {
+        name: ['progress', 'step'],
+        label: t('backoffice.form.taskstatus.progress.step'),
+        type: 'input',
+        readonly: true
+      }, {
+        name: ['cancelledByUser', 'mainEmail'],
+        label: t('backoffice.form.taskstatus.cancelledByUser.mainEmail'),
+        type: 'input',
+        readonly: true
+      }, {
+        name: 'error',
+        label: t('backoffice.form.taskstatus.error'),
+        type: 'input',
+        readonly: true
+      }, {
+        name: 'warning',
+        label: t('backoffice.form.taskstatus.warning'),
+        type: 'input',
+        readonly: true
+      }]
+    },
+    TableClientRelations: {
+      type: 'Table',
+      canRefresh: true,
+      title: t('backoffice.table.clientrelations.title'),
+      columns: [{
+        title: t('backoffice.table.clientrelations.columns.name'),
+        field: 'name',
+        defaultSortOrder: 'ascend',
+        sorter: 1,
+        filter: 'search',
+        width: 200
+      }, {
+        title: t('backoffice.table.clientrelations.columns.nameSource'),
+        field: 'nameSource',
+        sorter: 1,
+        filter: 'search',
+        width: 200
+      }, {
+        title: t('backoffice.table.clientrelations.columns.nameTarget'),
+        field: 'nameTarget',
+        sorter: 2,
+        filter: 'search',
+        width: 200
+      }, {
+        title: t('backoffice.table.clientrelations.columns.externalCloudName'),
+        field: 'externalCloudName',
+        sorter: 3,
+        filter: 'search',
+        width: 200
+      }, {
+        title: t('backoffice.table.clientrelations.columns.state'),
+        field: 'state',
+        sorter: 4,
+        filter: 'search',
+        width: 100
+      }, {
+        title: t('backoffice.table.clientrelations.columns.created'),
+        field: 'created',
+        sorter: 5,
+        width: 200,
+        type: 'unixTimeStamp'
+      }, {
+        title: t('backoffice.table.clientrelations.columns.lastUpdated'),
+        field: 'lastUpdated',
+        sorter: 6,
+        width: 200,
+        type: 'unixTimeStamp'
+      }, {
+        title: 'ID',
+        field: '_id',
+        sorter: 7,
+        width: 50,
+        hidden: true
+      }, {
+        title: t('backoffice.table.clientrelations.columns.externalCloudId'),
+        field: 'externalCloudId',
+        sorter: 8,
+        width: 50,
+        hidden: true
+      }, {
+        title: t('backoffice.table.clientrelations.columns.type'),
+        field: 'type',
+        sorter: 9,
+        width: 50,
+        hidden: true
+      }],
+      apiInterface: {
+        read: {
+          list: '${authService}/clientrelations',
+          filterServerSide: true
+        },
+        "delete": {
+          url: '${authService}/clientrelation/${_id}/type/${type}',
+          applyIdField: false
+        }
+      },
+      onError: {
+        AUTH_0030: t('errorcodes._source.labels.error.AUTH_0030'),
+        AUTH_0031: t('errorcodes._source.labels.error.AUTH_0031')
+      },
+      deleteMapping: {
+        type: 'query',
+        map: [{
+          sourceField: '_id',
+          targetField: '_id'
+        }, {
+          targetField: 'type',
+          sourceField: 'type'
+        }]
+      },
+      createAction: {
+        actionType: 'Detail',
+        label: t('backoffice.table.clientrelations.createAction.label.createnewclientrelation'),
+        title: t('backoffice.table.clientrelations.createAction.title.ewclientrelation'),
+        id: 'FromCreateClientRelation',
+        type: 'Form',
+        apiInterface: {
+          create: '${authService}/clientrelations'
+        }
+      },
+      mapping: {
+        type: 'query',
+        map: [{
+          sourceField: 'nameSource',
+          targetField: 'nameSource'
+        }, {
+          sourceField: 'nameTarget',
+          targetField: 'nameTarget'
+        }]
+      },
+      filter: {
+        toggle: {
+          globalValue: 'relevantTypeOrganizationId',
+          fields: ['sourceOrganizationId', 'targetOrganizationId'],
+          label: t('backoffice.table.clientrelations.filter.label.allorgs'),
+          labelOff: t('backoffice.table.clientrelations.filter.labelOff.allorgs'),
+          inverted: true
+        },
+        search: {
+          fields: ['nameSource', 'nameTarget', 'externalCloudName', 'state', 'name']
+        }
+      },
+      rowAction: [{
+        actionType: 'Detail',
+        type: 'Form',
+        id: 'FormClientRelationDetails',
+        title: t('backoffice.edit')
+      }]
+    },
+    FormClientRelationDetails: {
+      type: 'Form',
+      title: t('backoffice.form.createclientrelation.title'),
+      apiInterface: {
+        update: {
+          url: '${authService}/clientrelation/{_id}/type/{type}',
+          method: 'PATCH',
+          jsonPatch: true
+        }
+      },
+      triggerRerender: true,
+      items: [{
+        name: 'name',
+        label: t('backoffice.form.createclientrelation.name'),
+        type: 'input',
+        required: true
+      }, {
+        label: t('backoffice.form.createclientrelation.aktivate'),
+        name: 'state',
+        type: 'radio',
+        optionType: 'button',
+        options: [{
+          label: 'INACTIVE',
+          value: 'INACTIVE'
+        }, {
+          label: 'ACTIVE',
+          value: 'ACTIVE'
+        }],
+        required: false
+      }]
+    },
+    TableExternalClouds: {
+      type: 'Table',
+      canRefresh: true,
+      title: t('backoffice.table.externalclouds.title.listexternalclouds'),
+      columns: [{
+        title: t('backoffice.table.externalclouds.title.listexternalclouds'),
+        field: 'name',
+        sorter: 1,
+        filter: 'search',
+        width: 200
+      }, {
+        title: 'Base URL',
+        field: 'url',
+        sorter: 2,
+        filter: 'search',
+        width: 200
+      }, {
+        title: t('backoffice.table.externalclouds.columns.created'),
+        field: 'created',
+        type: 'unixTimeStamp',
+        sorter: 8
+      }],
+      filter: {
+        search: {
+          fields: ['_id', 'name', 'url', 'iln']
+        }
+      },
+      apiInterface: {
+        read: {
+          list: '${authService}/externalclouds',
+          filterServerSide: true
+        },
+        "delete": '${authService}/externalclouds/${id}'
+      },
+      rowAction: [{
+        actionType: 'Detail',
+        type: 'Form',
+        id: 'FormExternalCloudDetail',
+        title: t('backoffice.table.externalclouds.rowAction.title.externalcloud'),
+        width: '40%',
+        footer: true
+      }],
+      createAction: {
+        actionType: 'Detail',
+        label: t('backoffice.table.externalclouds.createaction.title.externalcloud'),
         id: 'FormExternalCloudDetail',
         type: 'Form',
         apiInterface: {
@@ -3121,162 +3769,50 @@ function loadConfiguration(t, root, config, lang) {
           sourceField: 'sessionGuID',
           targetField: 'sessionGuID'
         }, {
-          sourceField: 'newData',
-          targetField: 'newData'
-        }]
-      },
-      downloadAction: {
-        actionType: 'Download',
-        id: 'DownloadAction',
-        rule: [{
-          match: {
-            sourceField: 'catalogItem',
-            value: undefined
-          }
-        }],
-        download: [{
-          type: 'prefab',
-          prefab: 'connectionFileRetail',
-          url: 'https://gwc-app-p-app-api3.azurewebsites.net/odataretail'
-        }, {
-          type: 'url',
-          url: 'https://cdn.diva-portal.com/static/xlsx/RETAIL-p.xlsx'
-        }]
-      }
-    },
-    GroupContentItems: {
-      type: 'Group',
-      items: [{
-        id: 'ContentItems',
-        type: 'Table'
-      }, {
-        id: 'ContentItemsTemplate',
-        type: 'Table'
-      }],
-      setSelectedOrganization: true
-    },
-    ContentItems: {
-      title: t('backoffice.table.contentitems.title'),
-      type: 'Table',
-      canRefresh: true,
-      pagination: {
-        pageSize: 50
-      },
-      copyAction: {
-        actionType: 'Detail',
-        type: 'Form',
-        id: 'FormEditContentItem',
-        title: t('backoffice.table.contentItem.copyAction.title'),
-        label: t('backoffice.table.services.copyAction.label'),
-        disableOnMultiselect: true,
-        mapping: {
-          type: 'body',
-          map: [{
-            targetField: 'content',
-            sourceField: 'content'
-          }, {
-            targetField: 'description',
-            sourceField: 'description'
-          }, {
-            targetField: 'organizationId',
-            globalValue: 'organizationId'
-          }]
-        }
-      },
-      deleteAction: {
-        disabled: function disabled(datas) {
-          return (datas === null || datas === void 0 ? void 0 : datas.find(function (d) {
-            return !d.organizationId;
-          })) && !root.actions.userHasPermission('backoffice_delete_contentitem_template');
-        }
-      },
-      columns: [{
-        title: t('backoffice.table.roles.columns.description'),
-        field: 'description',
-        sorter: 1,
-        filter: 'advanced',
-        width: 500
-      }, {
-        title: t('backoffice.table.roles.columns.supplier'),
-        field: 'supplierName',
-        sorter: 1,
-        filter: 'advanced',
-        width: 150
-      }, {
-        title: t('backoffice.table.roles.columns.catalogName'),
-        field: 'catalogName',
-        sorter: 1,
-        filter: 'advanced',
-        width: 150
-      }, {
-        title: t('backoffice._id'),
-        field: '_id',
-        sorter: 1,
-        filter: 'advanced',
-        width: 100
-      }, {
-        title: t('backoffice.table.views.lastUpdated'),
-        field: 'lastUpdated',
-        type: 'unixTimeStamp',
-        sorter: 1,
-        filter: 'advanced',
-        width: 200
-      }, {
-        title: t('backoffice.table.views.lastUpdatedBy'),
-        field: 'lastUpdatedBy_displayText',
-        sorter: 1,
-        filter: 'advanced',
-        width: 150
-      }, {
-        title: 'backoffice.content',
-        field: 'content',
-        hidden: true
-      }, {
-        title: t('backoffice.table.medien.columns.title.organizationId'),
-        field: 'organizationId',
-        sorter: 1,
-        filter: 'advanced',
-        width: 150
-      }],
-      rowAction: [{
-        actionType: 'Detail',
-        disabled: function disabled(data) {
-          return !(data !== null && data !== void 0 && data.organizationId) && !root.actions.userHasPermission('backoffice_edit_contentitem_template');
-        },
-        disableOnMultiselect: true,
-        type: 'Form',
-        id: 'FormEditContentItem',
-        title: t('backoffice.table.contentItem.edit'),
-        label: t('backoffice.edit')
-      }, {
-        disableOnMultiselect: true,
-        actionType: 'Detail',
-        permission: 'backoffice_edit_contentitem_template',
-        type: 'JsonEditor',
-        label: t('backoffice.table.contentItem.editjson'),
-        id: 'JsonEditorEditContentItem',
-        title: t('backoffice.table.contentItem.edit')
-      }],
-      apiInterface: {
-        read: {
-          list: '${catalogService}/contentItems',
-          filterServerSide: true
-        },
-        "delete": '${catalogService}/contentItems/${id}'
+          sourceField: 'newData',
+          targetField: 'newData'
+        }]
+      },
+      downloadAction: {
+        actionType: 'Download',
+        id: 'DownloadAction',
+        rule: [{
+          match: {
+            sourceField: 'catalogItem',
+            value: undefined
+          }
+        }],
+        download: [{
+          type: 'prefab',
+          prefab: 'connectionFileRetail',
+          url: 'https://gwc-app-p-app-api3.azurewebsites.net/odataretail'
+        }, {
+          type: 'url',
+          url: 'https://cdn.diva-portal.com/static/xlsx/RETAIL-p.xlsx'
+        }]
       }
     },
-    ContentItemsTemplate: {
-      title: t('backoffice.table.contentitemstemplate.title'),
+    ContentItems: {
+      title: t('backoffice.table.contentitems.title'),
       type: 'Table',
       canRefresh: true,
       pagination: {
         pageSize: 50
       },
+      filter: {
+        toggle: {
+          fields: ['onlyTemplates'],
+          label: t('backoffice.table.contentitemstemplate.title'),
+          labelOff: t('backoffice.table.contentitems.toggleOff'),
+          inQuery: true
+        }
+      },
       copyAction: {
         actionType: 'Detail',
         type: 'Form',
         id: 'FormEditContentItem',
         disableOnMultiselect: true,
+        resetToggleAfter: true,
         title: t('backoffice.table.contentItem.copyAction.title'),
         label: t('backoffice.table.services.copyAction.label'),
         mapping: {
@@ -3284,6 +3820,12 @@ function loadConfiguration(t, root, config, lang) {
           map: [{
             targetField: 'content',
             sourceField: 'content'
+          }, {
+            targetField: 'catalogName',
+            sourceField: 'catalogName'
+          }, {
+            targetField: 'supplierName',
+            sourceField: 'supplierName'
           }, {
             targetField: 'description',
             sourceField: 'description'
@@ -3304,7 +3846,7 @@ function loadConfiguration(t, root, config, lang) {
       deleteAction: {
         disabled: function disabled(datas) {
           return (datas === null || datas === void 0 ? void 0 : datas.find(function (d) {
-            return !d.organizationId;
+            return !(d !== null && d !== void 0 && d.organizationId);
           })) && !root.actions.userHasPermission('backoffice_delete_contentitem_template');
         }
       },
@@ -3315,28 +3857,47 @@ function loadConfiguration(t, root, config, lang) {
         filter: 'advanced',
         width: 500
       }, {
-        title: t('backoffice.table.views.lastUpdatedBy'),
-        field: 'lastUpdatedBy_displayText',
+        title: t('backoffice.table.roles.columns.supplier'),
+        field: 'supplierName',
+        sorter: 1,
+        filter: 'advanced',
+        width: 150
+      }, {
+        title: t('backoffice.table.roles.columns.catalogName'),
+        field: 'catalogName',
         sorter: 1,
         filter: 'advanced',
         width: 150
+      }, {
+        title: t('backoffice._id'),
+        field: '_id',
+        sorter: 1,
+        filter: 'advanced',
+        width: 100
       }, {
         title: t('backoffice.table.views.lastUpdated'),
         field: 'lastUpdated',
+        defaultSortOrder: 'descend',
         type: 'unixTimeStamp',
         sorter: 1,
         filter: 'advanced',
         width: 200
+      }, {
+        title: t('backoffice.table.views.lastUpdatedBy'),
+        field: 'lastUpdatedBy_displayText',
+        sorter: 1,
+        filter: 'advanced',
+        width: 150
       }, {
         title: 'backoffice.content',
         field: 'content',
         hidden: true
       }, {
-        title: t('backoffice._id'),
-        field: '_id',
+        title: t('backoffice.table.medien.columns.title.organizationId'),
+        field: 'organizationId',
         sorter: 1,
         filter: 'advanced',
-        width: 100
+        width: 150
       }],
       rowAction: [{
         actionType: 'Detail',
@@ -3369,7 +3930,7 @@ function loadConfiguration(t, root, config, lang) {
       }],
       apiInterface: {
         read: {
-          list: '${catalogService}/contentItems?onlyTemplates=true',
+          list: '${catalogService}/contentItems',
           filterServerSide: true
         },
         "delete": '${catalogService}/contentItems/${id}'
@@ -7624,6 +8185,7 @@ function loadConfiguration(t, root, config, lang) {
                   }, {
                     name: 'mediaItemImage',
                     type: 'media',
+                    hideTrash: true,
                     allowedTypes: ['image/*'],
                     mediaItemRefField: 'mediaItemRefImage',
                     urlField: 'image',
@@ -7644,6 +8206,7 @@ function loadConfiguration(t, root, config, lang) {
                   }, {
                     name: 'mediaItemVideo',
                     type: 'media',
+                    hideTrash: true,
                     allowedTypes: ['video/*'],
                     mediaItemRefField: 'mediaItemRefVideo',
                     urlField: 'video',
@@ -8214,6 +8777,9 @@ function loadConfiguration(t, root, config, lang) {
           options: [{
             value: 'HQ',
             label: 'HQ'
+          }, {
+            value: 'MASTER',
+            label: 'MASTER'
           }, {
             value: 'SPIN',
             label: 'SPIN'
@@ -8403,7 +8969,7 @@ function loadConfiguration(t, root, config, lang) {
         label: t('backoffice.form.renderjob.itemSelector'),
         mode: 'single',
         type: 'select',
-        values: ['HQ', 'AR', 'SPIN', 'CUTOUT'],
+        values: ['HQ', 'AR', 'MASTER', 'SPIN', 'CUTOUT'],
         readonly: {
           field: 'state',
           op: 'gt',
@@ -8514,7 +9080,7 @@ function loadConfiguration(t, root, config, lang) {
         mode: 'single',
         type: 'select',
         marker: true,
-        values: ['png', 'jpg', 'tif', 'glb', 'gltf', 'fbx'],
+        values: ['png', 'jpg', 'tif', 'glb', 'gltf', 'fbx', 'blend'],
         readonly: {
           field: 'state',
           op: 'gt',
@@ -8758,6 +9324,148 @@ function loadConfiguration(t, root, config, lang) {
           op: 'gt',
           value: 3
         }
+      }, {
+        name: 'fileFormat',
+        label: t('backoffice.form.renderjob.items.fileFormat'),
+        mode: 'single',
+        type: 'select',
+        marker: true,
+        values: ['glb', 'gltf', 'fbx', 'blend'],
+        readonly: {
+          field: 'state',
+          op: 'gt',
+          value: 3
+        },
+        placeholder: 'z.B.: jpg, png, tif'
+      }, {
+        name: 'fileName',
+        label: t('backoffice.form.renderjob.items.fileName'),
+        type: 'input',
+        readonly: {
+          field: 'state',
+          op: 'gt',
+          value: 3
+        },
+        placeholder: 'z.B.: testrendering',
+        dynamic: {
+          seperator: '_',
+          fields: ['job', 'divaNr', 'divaNrVariantId']
+        }
+      }, {
+        name: 'group',
+        label: t('backoffice.form.renderjob.items.group'),
+        type: 'input',
+        readonly: {
+          field: 'state',
+          op: 'gt',
+          value: 3
+        }
+      }, {
+        name: 'product',
+        label: t('backoffice.form.renderjob.items.product'),
+        type: 'input',
+        readonly: true
+      }, {
+        name: 'organizationName',
+        label: t('backoffice.form.renderjob.items.organizationName'),
+        type: 'input',
+        readonly: true
+      }, {
+        name: 'organization',
+        label: t('backoffice.form.renderjob.items.organization'),
+        type: 'input',
+        readonly: true
+      }, {
+        name: 'createdByName',
+        label: t('backoffice.form.renderjob.items.createdByName'),
+        type: 'input',
+        readonly: true
+      }, {
+        name: 'createdByEmail',
+        label: t('backoffice.form.renderjob.items.createdByEmail'),
+        type: 'input',
+        readonly: true
+      }, {
+        name: 'createdBy',
+        label: t('backoffice.form.renderjob.items.createdBy'),
+        type: 'input',
+        readonly: true
+      }], [{
+        name: '_id',
+        label: 'ID',
+        type: 'input',
+        readonly: true
+      }, {
+        name: 'debugUser',
+        label: t('backoffice.form.renderjob.items.debugUser'),
+        type: 'checkbox',
+        valueOnEnabled: {
+          globalValue: 'userId'
+        }
+      }, {
+        name: 'state',
+        label: t('backoffice.form.renderjob.items.state'),
+        type: 'display',
+        translationPrefix: 'renderjob.state',
+        readonly: true
+      }, {
+        name: 'productName',
+        label: t('backoffice.form.renderjob.items.productName'),
+        type: 'input',
+        readonly: true
+      }, {
+        name: 'functionType',
+        label: t('backoffice.form.renderjob.items.functionType'),
+        type: 'select',
+        mode: 'single',
+        readonly: {
+          field: 'state',
+          op: 'gt',
+          value: 3
+        },
+        allowClear: true,
+        values: ['PROD', 'PROD_SEC', 'PROD_CLOSE', 'PROD_MILIEU', 'SHO', 'CONFIG_INFO', 'AR_INFO', 'PROD_DETAIL', 'CAT', 'PLN', 'LOG', 'FUNC', 'COMMERCIAL', 'TPL', 'ASI', 'PLT', 'CAI', 'BAN', 'INF', 'OTH', 'ART', 'OPV']
+      }, {
+        name: 'priority',
+        label: t('backoffice.form.renderjob.items.priority'),
+        readonly: {
+          field: 'state',
+          op: 'gt',
+          value: 3
+        }
+      }, {
+        label: t('backoffice.form.renderjob.items.dracoCompression'),
+        name: 'dracoCompression',
+        type: 'checkbox',
+        readonly: {
+          field: 'state',
+          op: 'gt',
+          value: 3
+        }
+      }, {
+        label: t('backoffice.form.renderjob.items.originPosition'),
+        name: 'originPosition',
+        type: 'select',
+        mode: 'single',
+        translationPrefix: 'backoffice.form.renderjob.items',
+        values: ['leftbackbottom', 'center'],
+        readonly: {
+          field: 'state',
+          op: 'gt',
+          value: 3
+        }
+      }, {
+        name: 'engine',
+        label: t('backoffice.form.renderjob.items.engine'),
+        type: 'select',
+        mode: 'single',
+        marker: true,
+        values: ['blender', 'unity', 'max'],
+        readonly: {
+          field: 'state',
+          op: 'gt',
+          value: 3
+        }
       }, {
         name: 'arBakedMapsResolution',
         label: t('backoffice.form.renderjob.items.arBakedMapsResolution'),
@@ -8775,7 +9483,7 @@ function loadConfiguration(t, root, config, lang) {
         mode: 'single',
         type: 'select',
         marker: true,
-        values: ['png', 'jpg', 'tif', 'glb', 'gltf', 'fbx'],
+        values: ['png', 'jpg', 'tif', 'glb', 'gltf', 'fbx', 'blend'],
         readonly: {
           field: 'state',
           op: 'gt',
@@ -8910,7 +9618,7 @@ function loadConfiguration(t, root, config, lang) {
         mode: 'single',
         type: 'select',
         marker: true,
-        values: ['png', 'jpg', 'tif', 'glb', 'gltf', 'fbx'],
+        values: ['png', 'jpg', 'tif', 'glb', 'gltf', 'fbx', 'blend'],
         readonly: {
           field: 'state',
           op: 'gt',
@@ -9095,7 +9803,7 @@ function loadConfiguration(t, root, config, lang) {
         mode: 'single',
         type: 'select',
         marker: true,
-        values: ['png', 'jpg', 'tif', 'glb', 'gltf', 'fbx'],
+        values: ['png', 'jpg', 'tif', 'glb', 'gltf', 'fbx', 'blend'],
         readonly: true,
         placeholder: 'z.B.: jpg, png, tif'
       }, {
@@ -9221,8 +9929,18 @@ function loadConfiguration(t, root, config, lang) {
           },
           requiredFields: ['engine', {
             field: 'fileFormat',
-            value: ['glb', 'gltf', 'fbx']
+            value: ['glb', 'gltf', 'fbx', 'blend']
           }, 'arBakedMapsResolution']
+        }, {
+          value: 3,
+          onField: {
+            field: 'job',
+            value: 'MASTER'
+          },
+          requiredFields: ['engine', {
+            field: 'fileFormat',
+            value: ['glb', 'blend', 'fbx', 'glb']
+          }]
         }],
         flow: {
           0: [1, 10],
@@ -11569,7 +12287,7 @@ function MenuLabel (_ref) {
 function _createForOfIteratorHelper$l(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$l(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, 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 o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray$l(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$l(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$l(r, a) : void 0; } }
 function _arrayLikeToArray$l(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-function aplyRule(_ref) {
+function applyRule(_ref) {
   var rules = _ref.rules,
     data = _ref.data,
     rootStore = _ref.rootStore,
@@ -11601,7 +12319,7 @@ function aplyRule(_ref) {
             result = rule.match.value == sourceValue;
           }
         } else if (rule.or) {
-          result = aplyRule({
+          result = applyRule({
             rules: rule.or,
             data: data,
             rootStore: rootStore,
@@ -11635,7 +12353,7 @@ function aplyRules(_ref2) {
   try {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var dt = _step2.value;
-      if (aplyRule({
+      if (applyRule({
         rules: rules,
         data: dt,
         rootStore: rootStore,
@@ -11654,6 +12372,12 @@ function getIcon(icon) {
   switch (icon) {
     case 'StopFilled':
       return /*#__PURE__*/jsx(StopFilled, {});
+    case 'FileZipOutlined':
+      return /*#__PURE__*/jsx(FileZipOutlined, {});
+    case 'PlaySquareOutlined':
+      return /*#__PURE__*/jsx(PlaySquareOutlined, {});
+    case 'ClockCircleOutlined':
+      return /*#__PURE__*/jsx(ClockCircleOutlined, {});
     case 'ExclamationCircleFilled':
       return /*#__PURE__*/jsx(ExclamationCircleFilled, {});
     case 'ApartmentOutlined':
@@ -12108,7 +12832,7 @@ var _default$6 = /*#__PURE__*/function () {
     value: function getMenuItem(item) {
       var _this3 = this;
       if (item.items) {
-        var disabled = item.rules ? !aplyRule({
+        var disabled = item.rules ? !applyRule({
           rules: item.rules,
           data: undefined,
           rootStore: this.root
@@ -12127,7 +12851,7 @@ var _default$6 = /*#__PURE__*/function () {
         };
         return menuItem;
       } else {
-        var _disabled = item.rules ? !aplyRule({
+        var _disabled = item.rules ? !applyRule({
           rules: item.rules,
           data: undefined,
           rootStore: this.root
@@ -12250,16 +12974,10 @@ var menu = [{
       }
     }]
   }, {
-    id: 'GroupContentItems',
+    id: 'ContentItems',
     path: 'contentitems',
     label: 'backoffice.menu.items.label.ContentItems',
-    icon: 'OrderedListOutlined',
-    rules: [{
-      match: {
-        value: ['RETAILER', 'ASSOCIATION'],
-        globalValue: 'organization.parentType'
-      }
-    }]
+    icon: 'OrderedListOutlined'
   }, {
     id: 'idmTables',
     path: 'idm',
@@ -12350,6 +13068,32 @@ var menu = [{
     label: 'backoffice.menu.items.label.organizationAdmin',
     icon: 'ApartmentOutlined',
     permission: 'backoffice_admin_organizations'
+  }, {
+    id: 'taskStatusAdmin',
+    label: 'backoffice.menu.items.label.taskStatusAdmin',
+    icon: 'ClockCircleOutlined',
+    permission: 'backoffice_admin_taskstatus',
+    items: [{
+      id: 'TableTaskStatusVersioning',
+      path: 'taskstatusversioning',
+      label: 'backoffice.menu.items.label.taskStatusAdminVersioning',
+      icon: 'FileZipOutlined'
+    }, {
+      id: 'TableTaskStatusCustom',
+      path: 'taskstatuscustom',
+      label: 'backoffice.table.taskstatusversioning.title.taskstatuscustom',
+      icon: 'SwapOutlined'
+    }, {
+      id: 'TableTaskStatusCronJobs',
+      path: 'taskstatuscronjobs',
+      label: 'backoffice.menu.items.label.taskStatusAdminCronJobs',
+      icon: 'ClockCircleOutlined'
+    }, {
+      id: 'TableTaskStatusOthers',
+      path: 'taskstatuscronothers',
+      label: 'backoffice.table.taskstatusversioning.title.taskstatusothers',
+      icon: 'PlaySquareOutlined'
+    }]
   }, {
     id: 'TableAllUsers',
     path: 'users',
@@ -12787,7 +13531,7 @@ var _default$3 = /*#__PURE__*/function () {
 function _createForOfIteratorHelper$k(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$k(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, 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 o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray$k(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$k(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$k(r, a) : void 0; } }
 function _arrayLikeToArray$k(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
-var LOG$a = getLogger('Backoffice', 'DownloadStore');
+var LOG$b = getLogger('Backoffice', 'DownloadStore');
 var DownloadStore = /*#__PURE__*/function () {
   function DownloadStore(_rootStore) {
     var _this = this;
@@ -12817,7 +13561,7 @@ var DownloadStore = /*#__PURE__*/function () {
               _iterator = _createForOfIteratorHelper$k(action.download);
               _context2.prev = 8;
               _loop = /*#__PURE__*/_regeneratorRuntime.mark(function _loop() {
-                var _download$params, _ref3, _data$fileUrl;
+                var _download$params, _data$fileFormat, _data$fileUrl;
                 var url;
                 return _regeneratorRuntime.wrap(function _loop$(_context) {
                   while (1) switch (_context.prev = _context.next) {
@@ -12847,7 +13591,7 @@ var DownloadStore = /*#__PURE__*/function () {
                         url.searchParams.append(param.name, param.value);
                       });
                       _context.next = 14;
-                      return _this.donwloadFile(url, (_ref3 = (data === null || data === void 0 ? void 0 : data.fileName) + '.' + data.fileFormat) !== null && _ref3 !== void 0 ? _ref3 : data === null || data === void 0 || (_data$fileUrl = data.fileUrl) === null || _data$fileUrl === void 0 ? void 0 : _data$fileUrl.substring((data === null || data === void 0 ? void 0 : data.fileUrl.lastIndexOf('.')) + 1));
+                      return _this.donwloadFile(url, (data === null || data === void 0 ? void 0 : data.fileName) + '.' + ((_data$fileFormat = data.fileFormat) !== null && _data$fileFormat !== void 0 ? _data$fileFormat : data === null || data === void 0 || (_data$fileUrl = data.fileUrl) === null || _data$fileUrl === void 0 ? void 0 : _data$fileUrl.substring((data === null || data === void 0 ? void 0 : data.fileUrl.lastIndexOf('.')) + 1)));
                     case 14:
                       return _context.abrupt("break", 24);
                     case 15:
@@ -13003,7 +13747,7 @@ var DownloadStore = /*#__PURE__*/function () {
                 _context5.next = 4;
                 break;
               }
-              LOG$a.debug("The organization ".concat(data._id, " has no parentType of ").concat(validTypes.join(' or ')));
+              LOG$b.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;
@@ -13022,7 +13766,7 @@ var DownloadStore = /*#__PURE__*/function () {
                 _context5.next = 14;
                 break;
               }
-              LOG$a.debug("The organization ".concat(data._id, " has no type of ").concat(validTypes.join(' or '), " nor a parent organization"));
+              LOG$b.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;
@@ -13063,8 +13807,8 @@ var DownloadStore = /*#__PURE__*/function () {
         return _regeneratorRuntime.wrap(function _callee5$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
-              url = aplyMapping({
-                mapable: download.request,
+              url = applyMapping({
+                mappable: download.request,
                 mapping: download.mapping,
                 //download.mapping,
                 mappingData: data,
@@ -13638,24 +14382,34 @@ function isExternalVid(file) {
 }
 
 var VIDEO_THUMB_PLACEHOLDER = 'data:image/svg+xml;base64,PHN2ZyBmaWxsPSIjMDAwMDAwIiBoZWlnaHQ9IjgwMHB4IiB3aWR0aD0iODAwcHgiIHZlcnNpb249IjEuMSIgaWQ9IkNhcGFfMSIgeG1sbnM9Imh0dHA6Ly93d3cudzMub3JnLzIwMDAvc3ZnIiB4bWxuczp4bGluaz0iaHR0cDovL3d3dy53My5vcmcvMTk5OS94bGluayIgCgkgdmlld0JveD0iMCAwIDQ5IDQ5IiB4bWw6c3BhY2U9InByZXNlcnZlIj4KPGc+Cgk8Zz4KCQk8cGF0aCBkPSJNMzkuMjU2LDYuNUg5Ljc0NEM0LjM3MSw2LjUsMCwxMC44ODUsMCwxNi4yNzR2MTYuNDUxYzAsNS4zOSw0LjM3MSw5Ljc3NCw5Ljc0NCw5Ljc3NGgyOS41MTIKCQkJYzUuMzczLDAsOS43NDQtNC4zODUsOS43NDQtOS43NzRWMTYuMjc0QzQ5LDEwLjg4NSw0NC42MjksNi41LDM5LjI1Niw2LjV6IE00NywzMi43MjZjMCw0LjI4Ny0zLjQ3NCw3Ljc3NC03Ljc0NCw3Ljc3NEg5Ljc0NAoJCQlDNS40NzQsNDAuNSwyLDM3LjAxMiwyLDMyLjcyNlYxNi4yNzRDMiwxMS45ODgsNS40NzQsOC41LDkuNzQ0LDguNWgyOS41MTJjNC4yNywwLDcuNzQ0LDMuNDg4LDcuNzQ0LDcuNzc0VjMyLjcyNnoiLz4KCQk8cGF0aCBkPSJNMzMuMzYsMjQuMTM4bC0xMy44NTUtOC4xMTVjLTAuMzA4LTAuMTgtMC42OTEtMC4xODMtMS4wMDItMC4wMDVTMTgsMTYuNTI3LDE4LDE2Ljg4NnYxNi4yMjkKCQkJYzAsMC4zNTgsMC4xOTIsMC42OSwwLjUwMiwwLjg2OGMwLjE1NCwwLjA4OCwwLjMyNiwwLjEzMiwwLjQ5OCwwLjEzMmMwLjE3NSwwLDAuMzQ5LTAuMDQ2LDAuNTA1LTAuMTM3bDEzLjg1NS04LjExMwoJCQljMC4zMDYtMC4xNzksMC40OTUtMC41MDgsMC40OTUtMC44NjNTMzMuNjY3LDI0LjMxNywzMy4zNiwyNC4xMzh6IE0yMCwzMS4zN1YxOC42M2wxMC44NzYsNi4zNzFMMjAsMzEuMzd6Ii8+Cgk8L2c+CjwvZz4KPC9zdmc+';
+var LOG$a = getLogger('Backoffice', 'MediaItem');
 var MediaItem = /*#__PURE__*/function () {
-  function MediaItem(media, config, mediaItemId, medaItemRefId) {
+  function MediaItem(_ref) {
+    var media = _ref.media,
+      remoteUrl = _ref.remoteUrl,
+      config = _ref.config,
+      mediaItemId = _ref.mediaItemId,
+      mediaItemRefId = _ref.mediaItemRefId;
     _classCallCheck(this, MediaItem);
-    this.config = config;
     _defineProperty(this, "_url", void 0);
     _defineProperty(this, "_file", void 0);
     _defineProperty(this, "_mediaItemId", void 0);
     _defineProperty(this, "_mediaItemRefId", void 0);
     _defineProperty(this, "_itemRef", void 0);
     _defineProperty(this, "_isRemoteUrl", void 0);
+    _defineProperty(this, "_config", void 0);
+    this._config = config;
     if (typeof media === 'string') {
       this._url = media;
-      this._isRemoteUrl = isExternalVid(media);
+      if (!this._url.startsWith('http')) {
+        this._url = "https://".concat(this._url);
+      }
+      this._isRemoteUrl = remoteUrl ? true : isExternalVid(media);
     } else {
       this._file = media;
     }
     this._mediaItemId = mediaItemId;
-    this._mediaItemRefId = medaItemRefId;
+    this._mediaItemRefId = mediaItemRefId;
   }
   return _createClass(MediaItem, [{
     key: "file",
@@ -13680,10 +14434,10 @@ var MediaItem = /*#__PURE__*/function () {
   }, {
     key: "antdFile",
     get: function get() {
-      var _this$_itemRef$_id, _this$_itemRef, _ref, _this$_itemRef$fileNa, _this$_itemRef2, _this$_file, _this$_url;
+      var _this$_itemRef$_id, _this$_itemRef, _ref2, _this$_itemRef$fileNa, _this$_itemRef2, _this$_file, _this$_url;
       return {
         uid: (_this$_itemRef$_id = (_this$_itemRef = this._itemRef) === null || _this$_itemRef === void 0 ? void 0 : _this$_itemRef._id) !== null && _this$_itemRef$_id !== void 0 ? _this$_itemRef$_id : nanoid(),
-        name: this._isRemoteUrl ? this._url : (_ref = (_this$_itemRef$fileNa = (_this$_itemRef2 = this._itemRef) === null || _this$_itemRef2 === void 0 ? void 0 : _this$_itemRef2.fileName) !== null && _this$_itemRef$fileNa !== void 0 ? _this$_itemRef$fileNa : (_this$_file = this._file) === null || _this$_file === void 0 ? void 0 : _this$_file.name) !== null && _ref !== void 0 ? _ref : nameFromUrl((_this$_url = this._url) !== null && _this$_url !== void 0 ? _this$_url : ''),
+        name: this._isRemoteUrl ? this._url : (_ref2 = (_this$_itemRef$fileNa = (_this$_itemRef2 = this._itemRef) === null || _this$_itemRef2 === void 0 ? void 0 : _this$_itemRef2.fileName) !== null && _this$_itemRef$fileNa !== void 0 ? _this$_itemRef$fileNa : (_this$_file = this._file) === null || _this$_file === void 0 ? void 0 : _this$_file.name) !== null && _ref2 !== void 0 ? _ref2 : nameFromUrl((_this$_url = this._url) !== null && _this$_url !== void 0 ? _this$_url : ''),
         url: this._url,
         thumbUrl: this._isRemoteUrl ? VIDEO_THUMB_PLACEHOLDER : undefined
       };
@@ -13704,7 +14458,7 @@ var MediaItem = /*#__PURE__*/function () {
               return _context.abrupt("return");
             case 4:
               _context.next = 6;
-              return removeMediaItemRef(this.config.baseUrl, this.config.jwt, this._mediaItemRefId);
+              return removeMediaItemRef(this._config.baseUrl, this._config.jwt, this._mediaItemRefId);
             case 6:
               this._mediaItemId = undefined;
               this._mediaItemRefId = undefined;
@@ -13728,45 +14482,55 @@ var MediaItem = /*#__PURE__*/function () {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               if (!this._mediaItemRefId) {
-                _context2.next = 5;
+                _context2.next = 12;
                 break;
               }
-              _context2.next = 3;
-              return getMediaItemRef(this.config.baseUrl, this.config.jwt, this._mediaItemRefId);
-            case 3:
+              _context2.prev = 1;
+              _context2.next = 4;
+              return getMediaItemRef(this._config.baseUrl, this._config.jwt, this._mediaItemRefId);
+            case 4:
               this._itemRef = _context2.sent;
               this._url = this._itemRef.url;
-            case 5:
+              _context2.next = 12;
+              break;
+            case 8:
+              _context2.prev = 8;
+              _context2.t0 = _context2["catch"](1);
+              this._mediaItemRefId = undefined;
+              LOG$a.error(new DivaError$1('Failed to get media item ref, on next upload a new ref will be created', {
+                cause: _context2.t0
+              }));
+            case 12:
               if (!(this.file && !this._url)) {
-                _context2.next = 11;
+                _context2.next = 18;
                 break;
               }
-              _context2.next = 8;
+              _context2.next = 15;
               return getFileAsDataUri(this.file);
-            case 8:
+            case 15:
               this._url = _context2.sent;
-              _context2.next = 15;
+              _context2.next = 22;
               break;
-            case 11:
+            case 18:
               if (!(this._url && !this._file && !this._isRemoteUrl)) {
-                _context2.next = 15;
+                _context2.next = 22;
                 break;
               }
-              _context2.next = 14;
+              _context2.next = 21;
               return fetchFileData(this._url);
-            case 14:
+            case 21:
               this._file = _context2.sent;
-            case 15:
+            case 22:
               if (!(this.file && !isFileOfType(this.file, allowedTypes))) {
-                _context2.next = 17;
+                _context2.next = 24;
                 break;
               }
               throw new Error('File type is not allowed');
-            case 17:
+            case 24:
             case "end":
               return _context2.stop();
           }
-        }, _callee2, this);
+        }, _callee2, this, [[1, 8]]);
       }));
       function init(_x) {
         return _init.apply(this, arguments);
@@ -13811,7 +14575,7 @@ var MediaItem = /*#__PURE__*/function () {
               }));
               formData.append('file', this._file, this._file.name);
               _context3.next = 12;
-              return uploadMediaItem(this.config.baseUrl, this.config.jwt, formData);
+              return uploadMediaItem(this._config.baseUrl, this._config.jwt, formData);
             case 12:
               response = _context3.sent;
               this._mediaItemRefId = response.ref._id;
@@ -13879,6 +14643,7 @@ function useFormData (_ref) {
     removedMedias = _useState12[0],
     setRemovedMedias = _useState12[1];
   var _useMemo = useMemo(function () {
+      setCanSave === null || setCanSave === void 0 || setCanSave(true);
       var c = {
         apiHandler: root.getApiHandler(id, apiInterface),
         configuration: root.configurationStore.getConfiguration(id, 'Form')
@@ -13894,7 +14659,7 @@ function useFormData (_ref) {
     if (configuration.disableSave) setCanSave === null || setCanSave === void 0 || setCanSave(false);
   }, [configuration]);
   var _onLoadFields = function onLoadFields(data) {
-    var items = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : selectedItems !== null && selectedItems !== void 0 ? selectedItems : configuration.items;
+    var items = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : (selectedItems !== null && selectedItems !== void 0 ? selectedItems : configuration.itemSelector && Array.isArray(configuration.items[0])) ? configuration.items[0] : configuration.items;
     var _iterator = _createForOfIteratorHelper$j(items),
       _step;
     try {
@@ -13909,10 +14674,15 @@ function useFormData (_ref) {
           var ref = typeof item.mediaItemRefField == 'string' ? [item.mediaItemRefField] : item.mediaItemRefField;
           var media = getData(itemName, data);
           if (media) {
-            var mediaItem = new MediaItem(getData(urlName, data), {
-              baseUrl: root.configurationStore.apiConfig.mediaService,
-              jwt: root.dataStore.jwt
-            }, media, getData(ref, data));
+            var mediaItem = new MediaItem({
+              media: getData(urlName, data),
+              config: {
+                baseUrl: root.configurationStore.apiConfig.mediaService,
+                jwt: root.dataStore.jwt
+              },
+              mediaItemId: media,
+              mediaItemRefId: getData(ref, data)
+            });
             mediaItem.init(item.allowedTypes);
             setFieldInObject(itemName, data, mediaItem);
           }
@@ -14015,21 +14785,25 @@ function useFormData (_ref) {
               _context.next = 17;
               break;
             }
+            if (configuration.showProgressBar) setProgressBarPercentage(i > 0 ? Math.floor(i / multipleEditingData.length * 100) : 1);
             original = multipleEditingData[i];
             _newData = setNewData(newData, JSON.parse(JSON.stringify(original)));
             _context.t0 = response;
-            _context.next = 11;
+            _context.next = 12;
             return apiHandler.update(_newData, original, configuration.mapping);
-          case 11:
+          case 12:
             _context.t1 = _context.sent;
             _context.t0.push.call(_context.t0, _context.t1);
-            if (configuration.showProgressBar) setProgressBarPercentage(Math.abs((i + 1 / multipleEditingData.length) * 100));
           case 14:
             i++;
             _context.next = 5;
             break;
           case 17:
-            if (configuration.showProgressBar) setProgressBarOpen(false);
+            if (configuration.showProgressBar) {
+              if (configuration.showProgressBar) setProgressBarPercentage(100);
+              setProgressBarOpen(false);
+              setProgressBarPercentage(0);
+            }
             _context.next = 23;
             break;
           case 20:
@@ -14084,34 +14858,44 @@ function useFormData (_ref) {
       return _regeneratorRuntime.wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            newData = merge$1(_objectSpread$I({}, state.data), values);
+            newData = merge(_objectSpread$I({}, state.data), values);
             if (!skipApi) {
               _context2.next = 3;
               break;
             }
             return _context2.abrupt("return", newData);
           case 3:
-            _context2.next = 5;
+            root.actions.toggleLoading('saving_form');
+            _context2.prev = 4;
+            _context2.next = 7;
             return setDynamicFields(_objectSpread$I({}, state.data), newData);
-          case 5:
+          case 7:
             newData = _context2.sent;
-            _context2.next = 8;
+            _context2.next = 10;
             return preSaveProcess(newData, selectedItems !== null && selectedItems !== void 0 ? selectedItems : configuration.items);
-          case 8:
+          case 10:
             newData = removeEmpty(newData);
+            _context2.next = 17;
+            break;
+          case 13:
+            _context2.prev = 13;
+            _context2.t0 = _context2["catch"](4);
+            root.actions.toggleLoading('saving_form');
+            throw _context2.t0;
+          case 17:
             setState(_objectSpread$I(_objectSpread$I({}, state), {}, {
               loading: true
             }));
             finalData = state.data;
-            _context2.prev = 11;
-            _context2.next = 14;
+            _context2.prev = 19;
+            _context2.next = 22;
             return apiCall(newData);
-          case 14:
+          case 22:
             response = _context2.sent;
             i = 0;
-          case 16:
+          case 24:
             if (!(i < (((_configuration$additi = configuration.additionals) === null || _configuration$additi === void 0 ? void 0 : _configuration$additi.length) || 0))) {
-              _context2.next = 26;
+              _context2.next = 34;
               break;
             }
             // perform additional server actions before returning the data
@@ -14123,47 +14907,52 @@ function useFormData (_ref) {
             if (additional.addBaseUrl) {
               data[additional.addBaseUrl] = window.location.origin;
             }
-            _context2.next = 23;
+            _context2.next = 31;
             return additionalApi.create(data, additional.mapping, response);
-          case 23:
+          case 31:
             i++;
-            _context2.next = 16;
+            _context2.next = 24;
             break;
-          case 26:
+          case 34:
             finalData = response;
             return _context2.abrupt("return", response);
-          case 30:
-            _context2.prev = 30;
-            _context2.t0 = _context2["catch"](11);
-            if (!(_context2.t0 instanceof DivaError && _context2.t0.name)) {
-              _context2.next = 38;
+          case 38:
+            _context2.prev = 38;
+            _context2.t1 = _context2["catch"](19);
+            if (configuration.showProgressBar) {
+              setProgressBarOpen(false);
+              setProgressBarPercentage(0);
+            }
+            if (!(_context2.t1 instanceof DivaError && _context2.t1.name)) {
+              _context2.next = 47;
               break;
             }
-            errorCode = _context2.t0.name;
+            errorCode = _context2.t1.name;
             item = selectedItems === null || selectedItems === void 0 ? void 0 : selectedItems.find(function (item) {
               var _item$onError;
               return (_item$onError = item.onError) === null || _item$onError === void 0 ? void 0 : _item$onError[errorCode];
             });
             if (!item) {
-              _context2.next = 38;
+              _context2.next = 47;
               break;
             }
             setFieldErrors(_objectSpread$I(_objectSpread$I({}, fieldErrors), {}, _defineProperty({}, item.name.toString(), item.onError[errorCode])));
             return _context2.abrupt("return", undefined);
-          case 38:
-            throw _context2.t0;
-          case 39:
-            _context2.prev = 39;
+          case 47:
+            throw _context2.t1;
+          case 48:
+            _context2.prev = 48;
+            root.actions.toggleLoading('saving_form');
             setState(_objectSpread$I(_objectSpread$I({}, state), {}, {
               data: finalData,
               loading: false
             }));
-            return _context2.finish(39);
-          case 42:
+            return _context2.finish(48);
+          case 52:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[11, 30, 39, 42]]);
+      }, _callee2, null, [[4, 13], [19, 38, 48, 52]]);
     }));
     return function onSave(_x2) {
       return _ref3.apply(this, arguments);
@@ -14212,7 +15001,7 @@ function useFormData (_ref) {
 
   //if at an array an entry got added or deleted, its handeled by and so we take the data from the formdata
   var mergeCustomizer = function mergeCustomizer(obj, src) {
-    if (Array.isArray(obj) && obj.length != src.length) return src;
+    if (Array.isArray(obj) && Array.isArray(src) && obj.length != src.length) return src;
     return undefined;
   };
   var setNewData = function setNewData(newData, orig) {
@@ -14552,7 +15341,7 @@ function useFormData (_ref) {
     }
     return;
   }, [state.data]);
-  var _keepRemovedMeidaItem = /*#__PURE__*/function () {
+  var _keepRemovedMediaItem = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(data, items) {
       var _iterator2, _step2, item, itemName, media, arrayData, i;
       return _regeneratorRuntime.wrap(function _callee3$(_context3) {
@@ -14582,7 +15371,7 @@ function useFormData (_ref) {
               break;
             }
             _context3.next = 14;
-            return _keepRemovedMeidaItem(data, item.items);
+            return _keepRemovedMediaItem(data, item.items);
           case 14:
             _context3.next = 26;
             break;
@@ -14603,7 +15392,7 @@ function useFormData (_ref) {
               break;
             }
             _context3.next = 23;
-            return _keepRemovedMeidaItem(arrayData[i], item.items);
+            return _keepRemovedMediaItem(arrayData[i], item.items);
           case 23:
             i++;
             _context3.next = 20;
@@ -14628,7 +15417,7 @@ function useFormData (_ref) {
         }
       }, _callee3, null, [[1, 30, 33, 36]]);
     }));
-    return function keepRemovedMeidaItem(_x7, _x8) {
+    return function keepRemovedMediaItem(_x7, _x8) {
       return _ref7.apply(this, arguments);
     };
   }();
@@ -14661,7 +15450,7 @@ function useFormData (_ref) {
     getRules: getRules,
     progressBarOpen: progressBarOpen,
     progressBarPercentage: progressBarPercentage,
-    keepRemovedMeidaItem: _keepRemovedMeidaItem,
+    keepRemovedMediaItem: _keepRemovedMediaItem,
     pushRemovedMeidaItem: pushRemovedMeidaItem
   });
 }
@@ -14773,7 +15562,7 @@ var FormList$2 = function FormList(_ref) {
   var remove = function remove(index, r) {
     var _state$getData;
     var data = (_state$getData = state.getData(absoluteName, state.data)) === null || _state$getData === void 0 ? void 0 : _state$getData[index];
-    state.keepRemovedMeidaItem(data, item.items);
+    state.keepRemovedMediaItem(data, item.items);
     r(index);
     state.onInputChanged();
   };
@@ -14842,9 +15631,7 @@ var FormList$2 = function FormList(_ref) {
     }
   });
 };
-var FormList$3 = observer(FormList$2, {
-  forwardRef: true
-});
+var FormList$3 = observer(FormList$2);
 
 var ApiKey = function ApiKey(_ref) {
   var value = _ref.value,
@@ -14940,8 +15727,8 @@ function useButtonData (_ref) {
                 message: configuration.resultTranslation ? t(configuration.resultTranslation.success) : result !== null && result !== void 0 && result.result ? result.result : 'Success'
               });
               if (callback) {
-                newData = aplyMapping({
-                  mapable: {},
+                newData = applyMapping({
+                  mappable: {},
                   mappingData: result,
                   mapping: configuration.resultMapping,
                   rootStore: root,
@@ -15049,9 +15836,7 @@ var CustomButton = function CustomButton(_ref) {
     })
   });
 };
-var CustomButton$1 = observer(CustomButton, {
-  forwardRef: true
-});
+var CustomButton$1 = observer(CustomButton);
 
 var wrapper$5 = "wrapper-GVe2h";
 var buttonGroup = "button-group-GYt-T";
@@ -15089,8 +15874,8 @@ var SubTitle = function SubTitle(_ref) {
 };
 var SubTitle$1 = observer(SubTitle);
 
-var InputComponent = function InputComponent(_ref) {
-  var _item$value, _item$value4;
+var InputComponent = function InputComponent(_ref, ref) {
+  var _item$value, _item$value5, _item$value6;
   var item = _ref.item,
     data = _ref.data,
     value = _ref.value,
@@ -15126,6 +15911,7 @@ var InputComponent = function InputComponent(_ref) {
   };
   if (item.type === 'password') {
     return /*#__PURE__*/jsx(Input.Password, {
+      ref: ref,
       addonBefore: item.prefix,
       addonAfter: item.suffix,
       disabled: isReadonly(item, data),
@@ -15137,20 +15923,25 @@ var InputComponent = function InputComponent(_ref) {
       onBlur: onBlur
     });
   }
+  if (item.type === 'progress') {
+    var _item$value4;
+    return /*#__PURE__*/jsx(Progress, {
+      percent: (_item$value4 = item.value) !== null && _item$value4 !== void 0 ? _item$value4 : value
+    });
+  }
   return /*#__PURE__*/jsx(Input, {
+    ref: ref,
     addonBefore: item.prefix,
     addonAfter: item.suffix,
-    disabled: isReadonly(item, data),
-    value: (_item$value4 = item.value) !== null && _item$value4 !== void 0 ? _item$value4 : value,
+    disabled: isReadonly(item, data) || (typeof item.disabled === 'function' ? item.disabled(data) : item.disabled),
+    value: item.type === 'dateinput' ? new Date((_item$value5 = item.value) !== null && _item$value5 !== void 0 ? _item$value5 : value).toLocaleString().replace('Invalid Date', '') : (_item$value6 = item.value) !== null && _item$value6 !== void 0 ? _item$value6 : value,
     placeholder: item.placeholder,
     onChange: function onChange(e) {
       return _onChange === null || _onChange === void 0 ? void 0 : _onChange(item.name, e.target.value);
     }
   });
 };
-var InputComponent$1 = observer(InputComponent, {
-  forwardRef: true
-});
+var InputComponent$1 = observer(/*#__PURE__*/React.forwardRef(InputComponent));
 
 function _createForOfIteratorHelper$i(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$i(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, 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 o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray$i(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$i(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$i(r, a) : void 0; } }
@@ -15166,7 +15957,7 @@ function getCombinedValues(data, pattern) {
     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$ : '');
+      value = value.replace(match[0], (_flatten$match$ = flatten(data)[match[1]]) !== null && _flatten$match$ !== void 0 ? _flatten$match$ : '');
     }
   } catch (err) {
     _iterator.e(err);
@@ -15314,7 +16105,7 @@ styleInject(css_248z$m);
 var _excluded$2 = ["apiInterface", "selectMapping", "apiMapping", "onChange", "value", "search", "options", "autoSelectFirst", "title"];
 function ownKeys$F(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$F(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$F(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$F(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-var SelectWrapper$1 = function SelectWrapper(_ref) {
+var SelectWrapper$1 = function SelectWrapper(_ref, ref) {
   var apiInterface = _ref.apiInterface,
     selectMapping = _ref.selectMapping,
     apiMapping = _ref.apiMapping,
@@ -15336,6 +16127,7 @@ var SelectWrapper$1 = function SelectWrapper(_ref) {
     autoSelectFirst: autoSelectFirst
   });
   return /*#__PURE__*/jsxs("div", {
+    ref: ref,
     className: classnames(title ? wrapper$4 : undefined),
     children: [title, /*#__PURE__*/jsx(Select$1, _objectSpread$F(_objectSpread$F({}, selectProps), {}, {
       showSearch: search,
@@ -15348,9 +16140,7 @@ var SelectWrapper$1 = function SelectWrapper(_ref) {
     }))]
   });
 };
-var SimpleSelect = observer(SelectWrapper$1, {
-  forwardRef: true
-});
+var SimpleSelect = observer(/*#__PURE__*/forwardRef(SelectWrapper$1));
 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());
@@ -15360,28 +16150,16 @@ var RichTextEditor = function RichTextEditor(_ref) {
   var initValue = _ref.initValue,
     onChange = _ref.onChange,
     name = _ref.name;
-  var _useDivaCore = useDivaCore(),
-    tinyMceApiKey = _useDivaCore.state.tinyMceApiKey;
   var val = useRef(initValue);
-  return /*#__PURE__*/jsx(Editor, {
-    apiKey: tinyMceApiKey,
-    onEditorChange: function onEditorChange(val, e) {
-      onChange === null || onChange === void 0 || onChange(name, val);
-    },
+  function handleChange(val) {
+    onChange(name, val);
+  }
+  return /*#__PURE__*/jsx(RTFEditor, {
     initialValue: val.current,
-    textareaName: "text",
-    init: {
-      height: 500,
-      menubar: false,
-      plugins: ['advlist autolink lists link table paste'],
-      contextmenu: '',
-      resize: false,
-      statusbar: false,
-      toolbar: 'undo redo | formatselect | ' + 'bold italic backcolor | alignleft aligncenter ' + 'alignright alignjustify | bullist numlist outdent indent | table ',
-      content_style: 'body { font-family:Helvetica,Arial,sans-serif; font-size:14px }'
-    }
+    onChange: handleChange
   });
 };
+var RichTextEditor$1 = /*#__PURE__*/React.forwardRef(RichTextEditor);
 
 function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstructorReturn(t, _isNativeReflectConstruct() ? Reflect.construct(o, e || [], _getPrototypeOf(t).constructor) : o.apply(t, e)); }
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
@@ -16204,7 +16982,7 @@ var customSelect = "custom-select-ESUJX";
 var customSelectOption = "custom-select-option-dUA7N";
 var avatarWrapper = "avatar-wrapper-Vg-xe";
 var selectTextWrapper = "select-text-wrapper-hPSZW";
-var css_248z$l = ".custom-select-ESUJX {\n  width: 300px;\n}\n\n.custom-select-option-dUA7N {\n  margin: 0px 12px;\n  padding: 5px 0px;\n  border-bottom: 1px solid #ddd;\n}\n\n.avatar-wrapper-Vg-xe {\n  margin-right: 5px;\n  height: 100%;\n  width: 24px;\n  float: left;\n  position: relative;\n}\n\n.avatar-wrapper-Vg-xe > span {\n  position: absolute;\n  left: 50%;\n  top: 50%;\n  transform: translate(-50%, -50%);\n}\n\n.select-text-wrapper-hPSZW {\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: normal;\n  width: calc(100% - 29px);\n}\n";
+var css_248z$l = ".custom-select-ESUJX {\n  width: 300px;\n}\n\n.custom-select-option-dUA7N {\n  margin: 0px 12px;\n  padding: 5px 0px;\n  border-bottom: 1px solid #ddd;\n}\n\n.avatar-wrapper-Vg-xe {\n  margin-right: 5px;\n  height: 30px;\n  width: 24px;\n  float: left;\n  position: relative;\n}\n\n.avatar-wrapper-Vg-xe > span {\n  position: absolute;\n  left: 50%;\n  top: 50%;\n  transform: translate(-50%, -50%);\n}\n\n.select-text-wrapper-hPSZW {\n  overflow: hidden;\n  text-overflow: ellipsis;\n  white-space: normal;\n  width: calc(100% - 29px);\n}\n";
 styleInject(css_248z$l);
 
 var Selector = function Selector(_ref) {
@@ -16483,14 +17261,6 @@ function useSelectData (_ref) {
           disabled: false
         };
       });
-      var val = value.length == 1 ? value[0].data : value;
-      if (Array.isArray(val) && val.length) {
-        val = val.map(function (v) {
-          return v.data;
-        });
-      } else if (Array.isArray(val)) {
-        val = initData;
-      }
       if (flow && initData.length) {
         var _value$, _flow$value$0$value, _value$2;
         if (mode != 'single') {
@@ -16522,7 +17292,7 @@ function useSelectData (_ref) {
         }
         setOptions(_toConsumableArray(flowData));
       }
-      onChange === null || onChange === void 0 || onChange(val, applyDefaultValue, defaultValue);
+      onChange === null || onChange === void 0 || onChange(data, applyDefaultValue, defaultValue);
       setSelected(value);
     }
   }
@@ -16807,7 +17577,7 @@ var SelectWrapper = function SelectWrapper(_ref) {
     filterOption: false,
     placeholder: placeholder !== null && placeholder !== void 0 ? placeholder : t('filter.global'),
     allowClear: allowClear !== null && allowClear !== void 0 ? allowClear : filterServerSide,
-    showArrow: !filterServerSide || allowCreate || search,
+    suffixIcon: filterServerSide && !allowCreate && !search ? null : undefined,
     mode: mode == 'single' ? undefined : mode,
     showSearch: filterServerSide || allowCreate || search,
     onSearch: filterServerSide || allowCreate || search ? state.fetch : undefined,
@@ -16823,9 +17593,7 @@ var SelectWrapper = function SelectWrapper(_ref) {
     value: selected
   });
 };
-var Select = observer(SelectWrapper, {
-  forwardRef: true
-});
+var Select = observer(SelectWrapper);
 
 var wrapper$3 = "wrapper-WStAk";
 var headerWrapper = "header-wrapper-gWQuH";
@@ -17089,9 +17857,7 @@ var Translation = function Translation(_ref) {
     })]
   });
 };
-var Translation$1 = observer(Translation, {
-  forwardRef: true
-});
+var Translation$1 = observer(Translation);
 
 function FileFromWeb (_ref) {
   var _onEnter = _ref.onEnter;
@@ -17101,8 +17867,8 @@ function FileFromWeb (_ref) {
     setUploadFromWeb = _useState2[1];
   if (uploadFromWeb) {
     return /*#__PURE__*/jsx(FileInput, {
-      onEnter: function onEnter(f) {
-        _onEnter(f);
+      onEnter: function onEnter(f, copy) {
+        _onEnter(f, copy);
         setUploadFromWeb(false);
       },
       onAbort: function onAbort() {
@@ -17136,6 +17902,8 @@ function FileInput(_ref3) {
     _useState4 = _slicedToArray(_useState3, 2),
     value = _useState4[0],
     setValue = _useState4[1];
+  var _useTranslation2 = useTranslation(),
+    t = _useTranslation2.t;
   return /*#__PURE__*/jsxs(Space, {
     direction: "horizontal",
     onClick: function onClick(e) {
@@ -17151,17 +17919,26 @@ function FileInput(_ref3) {
           value ? onEnter(value) : undefined;
         },
         allowClear: true
-      }), /*#__PURE__*/jsx(Button, {
-        onClick: function onClick() {
-          onEnter(value);
+      }), /*#__PURE__*/jsx(Dropdown.Button, {
+        icon: /*#__PURE__*/jsx(DownOutlined, {}),
+        menu: {
+          items: [{
+            key: 'use',
+            label: t('backoffice.mediaupload.upload'),
+            onClick: function onClick() {
+              onEnter(value);
+            }
+          }],
+          onClick: function onClick() {
+            return onEnter(value, true);
+          }
         },
-        disabled: !value,
-        children: "\xDCbernehmen"
+        children: t('backoffice.mediaupload.use')
       })]
     }), /*#__PURE__*/jsx(Button, {
       type: "link",
       onClick: onAbort,
-      children: "Abbrechen"
+      children: t('backoffice.mediaupload.cancel')
     })]
   });
 }
@@ -17186,6 +17963,12 @@ function Upload (_ref) {
       return f.antdFile;
     });
   }, [files]);
+  var _useState = useState(),
+    _useState2 = _slicedToArray(_useState, 2),
+    error = _useState2[0],
+    setError = _useState2[1];
+  var _useTranslation = useTranslation(),
+    t = _useTranslation.t;
   useEffect(function () {
     _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
       return _regeneratorRuntime.wrap(function _callee$(_context) {
@@ -17234,21 +18017,22 @@ function Upload (_ref) {
           case 4:
             setFiles([media]);
             onAdd === null || onAdd === void 0 || onAdd(media);
-            _context2.next = 11;
+            _context2.next = 12;
             break;
           case 8:
             _context2.prev = 8;
             _context2.t0 = _context2["catch"](1);
             onError === null || onError === void 0 || onError(_context2.t0);
-          case 11:
-            _context2.prev = 11;
+            setError(_context2.t0.message);
+          case 12:
+            _context2.prev = 12;
             setLoading(false);
-            return _context2.finish(11);
-          case 14:
+            return _context2.finish(12);
+          case 15:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[1, 8, 11, 14]]);
+      }, _callee2, null, [[1, 8, 12, 15]]);
     }));
     return function addMediaItem(_x) {
       return _ref3.apply(this, arguments);
@@ -17262,31 +18046,45 @@ function Upload (_ref) {
     }
   };
   var beforeUpload = function beforeUpload(file) {
-    var mediaItem = new MediaItem(file, config);
+    var mediaItem = new MediaItem({
+      media: file,
+      config: config
+    });
     addMediaItem(mediaItem);
     return Upload$1.LIST_IGNORE;
   };
-  var onFileFormWeb = function onFileFormWeb(url) {
-    var mediaItem = new MediaItem(url, config);
+  var onFileFormWeb = function onFileFormWeb(url, copy) {
+    var mediaItem = new MediaItem({
+      media: url,
+      remoteUrl: !copy,
+      config: config
+    });
     addMediaItem(mediaItem);
   };
-  return /*#__PURE__*/jsx(Upload$1, {
-    listType: "picture",
-    maxCount: 1,
-    fileList: fileList,
-    beforeUpload: beforeUpload,
-    onRemove: onRemoveMedia,
-    accept: allowedTypes === null || allowedTypes === void 0 ? void 0 : allowedTypes.join(','),
-    children: /*#__PURE__*/jsxs(Space$1, {
-      direction: "horizontal",
-      children: [/*#__PURE__*/jsx(Button$1, {
-        type: "primary",
-        icon: /*#__PURE__*/jsx(UploadOutlined, {}),
-        loading: loading,
-        children: "Upload"
-      }), /*#__PURE__*/jsx(FileFromWeb, {
-        onEnter: onFileFormWeb
-      })]
+  return /*#__PURE__*/jsx(Form$1.Item, {
+    validateStatus: error ? 'error' : '',
+    help: error ? t(error) : undefined,
+    children: /*#__PURE__*/jsx(Upload$1, {
+      listType: "picture",
+      maxCount: 1,
+      fileList: fileList,
+      beforeUpload: beforeUpload,
+      onRemove: onRemoveMedia,
+      accept: allowedTypes === null || allowedTypes === void 0 ? void 0 : allowedTypes.join(','),
+      showUploadList: {
+        showRemoveIcon: !config.hideTrash
+      },
+      children: /*#__PURE__*/jsxs(Space$1, {
+        direction: "horizontal",
+        children: [/*#__PURE__*/jsx(Button$1, {
+          type: "primary",
+          icon: /*#__PURE__*/jsx(UploadOutlined, {}),
+          loading: loading,
+          children: "Upload"
+        }), /*#__PURE__*/jsx(FileFromWeb, {
+          onEnter: onFileFormWeb
+        })]
+      })
     })
   });
 }
@@ -17300,10 +18098,15 @@ function Media (_ref) {
   var urlPath = item.urlField ? absoluteName.slice(0, -1).concat(item.urlField) : undefined;
   var mediaItemRefId = mediaItemRefIdPath ? state.getData(mediaItemRefIdPath, state.data) : undefined;
   var url = urlPath ? state.getData(urlPath, state.data) : undefined;
-  var _React$useState = React.useState(value ? new MediaItem(url, {
-      baseUrl: state.root.configurationStore.apiConfig.mediaService,
-      jwt: state.root.dataStore.jwt
-    }, value, mediaItemRefId) : undefined),
+  var _React$useState = React.useState(value ? new MediaItem({
+      media: url,
+      config: {
+        baseUrl: state.root.configurationStore.apiConfig.mediaService,
+        jwt: state.root.dataStore.jwt
+      },
+      mediaItemId: value,
+      mediaItemRefId: mediaItemRefId
+    }) : undefined),
     _React$useState2 = _slicedToArray(_React$useState, 2),
     media = _React$useState2[0],
     setMedia = _React$useState2[1];
@@ -17339,7 +18142,8 @@ function Media (_ref) {
     onError: onError,
     config: {
       baseUrl: state.root.configurationStore.apiConfig.mediaService,
-      jwt: state.root.dataStore.jwt
+      jwt: state.root.dataStore.jwt,
+      hideTrash: item.hideTrash
     }
   });
 }
@@ -17356,6 +18160,7 @@ function getElement(item, setCanSave, state, absoluteName, _onChange, _onError,
   switch (item.type) {
     case 'select':
       return /*#__PURE__*/jsx(Select, {
+        value: item.value,
         initialValue: item.defaultValue,
         apiInterface: item.apiInterface,
         mode: item.mode,
@@ -17467,7 +18272,7 @@ function getElement(item, setCanSave, state, absoluteName, _onChange, _onError,
         children: item.label
       });
     case 'richText':
-      return /*#__PURE__*/jsx(RichTextEditor, {
+      return /*#__PURE__*/jsx(RichTextEditor$1, {
         initValue: state.getData(absoluteName, state.data),
         name: absoluteName,
         onChange: _onChange
@@ -17527,6 +18332,18 @@ function getElement(item, setCanSave, state, absoluteName, _onChange, _onError,
       return /*#__PURE__*/jsx(DatePicker, {
         disabled: disabled
       });
+    case 'progress':
+      return /*#__PURE__*/jsx(InputComponent$1, {
+        item: item,
+        data: state.data,
+        onChange: state.onInputChanged
+      });
+    case 'dateinput':
+      return /*#__PURE__*/jsx(InputComponent$1, {
+        item: item,
+        data: state.data,
+        onChange: state.onInputChanged
+      });
     case 'subTitle':
       return /*#__PURE__*/jsx(SubTitle$1, {
         item: item,
@@ -17569,6 +18386,7 @@ function getElement(item, setCanSave, state, absoluteName, _onChange, _onError,
       });
     case 'radio':
       return /*#__PURE__*/jsx(Radio.Group, {
+        defaultValue: item.defaultValue,
         value: item.value,
         options: item.options.map(function (o) {
           var _o$disabled;
@@ -17607,14 +18425,15 @@ function getElement(item, setCanSave, state, absoluteName, _onChange, _onError,
       return /*#__PURE__*/jsx(Fragment, {});
   }
 }
-function DisplayInput(props) {
+var DisplayInput = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _useTranslation = useTranslation(),
     t = _useTranslation.t;
   return /*#__PURE__*/jsx(Input, _objectSpread$A(_objectSpread$A({}, props), {}, {
+    ref: ref,
     disabled: true,
     value: t(props.translationPrefix + '.' + props.value)
   }));
-}
+});
 function isReadonly(item, data) {
   if (_typeof(item.readonly) != 'object') {
     return item.readonly;
@@ -18025,9 +18844,7 @@ function getLabel(item, t) {
   if (!item.label && item.type === 'button') return undefined;
   return item.label ? t(item.label, item.label) : item.name;
 }
-var Form = observer(FormWrapper$1, {
-  forwardRef: true
-});
+var Form = observer(/*#__PURE__*/React.forwardRef(FormWrapper$1));
 
 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; }
@@ -18781,9 +19598,7 @@ var RoleSelector = function RoleSelector(_ref, ref) {
     })
   });
 };
-var RoleSelector$1 = observer(RoleSelector, {
-  forwardRef: true
-});
+var RoleSelector$1 = observer(/*#__PURE__*/React.forwardRef(RoleSelector));
 
 var permissionButton = "permission-Button-XctsZ";
 var select$1 = "select-lzft-";
@@ -19575,7 +20390,7 @@ function ActionButton (_ref) {
     try {
       for (_iterator.s(); !(_step = _iterator.n()).done;) {
         var dt = _step.value;
-        if ((action.rule ? !aplyRule({
+        if ((action.rule ? !applyRule({
           rules: action.rule,
           data: dt,
           rootStore: root
@@ -19590,7 +20405,7 @@ function ActionButton (_ref) {
       _iterator.f();
     }
   } else {
-    disable = disabled !== null && disabled !== void 0 ? disabled : action.rule ? !aplyRule({
+    disable = disabled !== null && disabled !== void 0 ? disabled : action.rule ? !applyRule({
       rules: action.rule,
       data: ruleData !== null && ruleData !== void 0 ? ruleData : data,
       rootStore: root
@@ -20285,9 +21100,7 @@ var RelationSelector = function RelationSelector(_ref, ref) {
     })]
   });
 };
-var RelationSelector$1 = observer(RelationSelector, {
-  forwardRef: true
-});
+var RelationSelector$1 = observer(/*#__PURE__*/React.forwardRef(RelationSelector));
 
 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; }
@@ -20505,9 +21318,7 @@ var FormList = function FormList(_ref, ref) {
     })]
   });
 };
-var FormList$1 = observer(FormList, {
-  forwardRef: true
-});
+var FormList$1 = observer(/*#__PURE__*/React.forwardRef(FormList));
 
 function ownKeys$s(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$s(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$s(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$s(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -20844,7 +21655,7 @@ var FormWrapper = function FormWrapper(_ref, ref) {
           placeholder: t('filter.global'),
           mode: mode == 'single' ? undefined : mode,
           allowClear: true,
-          showArrow: false,
+          suffixIcon: null,
           showSearch: true,
           onSearch: state.fetch,
           notFoundContent: state.fetching ? /*#__PURE__*/jsx(Spin, {
@@ -20864,9 +21675,7 @@ var FormWrapper = function FormWrapper(_ref, ref) {
     })]
   });
 };
-var SelectOrCreate = observer(FormWrapper, {
-  forwardRef: true
-});
+var SelectOrCreate = observer(/*#__PURE__*/React.forwardRef(FormWrapper));
 var Single = function Single(_ref2) {
   var _state$selected$;
   var state = _ref2.state;
@@ -21233,9 +22042,7 @@ var ListWrapper = function ListWrapper(props, ref) {
     }
   });
 };
-var List = observer(ListWrapper, {
-  forwardRef: true
-});
+var List = observer(/*#__PURE__*/React.forwardRef(ListWrapper));
 
 var LOG$5 = getLogger('Backoffice', 'JsonEditor');
 function useJsonEditorData (id, setCanSave, onChange, onError) {
@@ -21485,9 +22292,7 @@ var JsonEditor = function JsonEditor(_ref, ref) {
     })
   });
 };
-var JsonEditor$1 = observer(JsonEditor, {
-  forwardRef: true
-});
+var JsonEditor$1 = observer(/*#__PURE__*/React.forwardRef(JsonEditor));
 
 function ConfirmationPopup(props) {
   var _useTranslation = useTranslation(),
@@ -21728,7 +22533,7 @@ var ImageCropper = function ImageCropper(_ref, ref) {
         onChange: function onChange(e) {
           return aspect ? setKeepAspect(undefined) : setKeepAspect(crop.width / crop.height);
         }
-      }), "Echte Gr\xF6\xDFe x: ", realSize.x, "px y: ", realSize.y, "px"]
+      }), "Echte Gr\xF6\xDFe x: ", realSize.x.toString(), "px y: ", realSize.y.toString(), "px"]
     }), /*#__PURE__*/jsx(ReactCrop, {
       crop: crop,
       onChange: function onChange(_, percentCrop) {
@@ -21763,9 +22568,7 @@ var ImageCropper = function ImageCropper(_ref, ref) {
     })]
   });
 };
-var ImageCropper$1 = observer(ImageCropper, {
-  forwardRef: true
-});
+var ImageCropper$1 = observer(/*#__PURE__*/React.forwardRef(ImageCropper));
 
 function _createForOfIteratorHelper$9(r, e) { var t = "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (!t) { if (Array.isArray(r) || (t = _unsupportedIterableToArray$9(r)) || e && r && "number" == typeof r.length) { t && (r = t); var _n = 0, F = function F() {}; return { s: F, n: function n() { return _n >= r.length ? { done: !0 } : { done: !1, value: r[_n++] }; }, e: function e(r) { throw r; }, 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 o, a = !0, u = !1; return { s: function s() { t = t.call(r); }, n: function n() { var r = t.next(); return a = r.done, r; }, e: function e(r) { u = !0, o = r; }, f: function f() { try { a || null == t["return"] || t["return"](); } finally { if (u) throw o; } } }; }
 function _unsupportedIterableToArray$9(r, a) { if (r) { if ("string" == typeof r) return _arrayLikeToArray$9(r, a); var t = {}.toString.call(r).slice(8, -1); return "Object" === t && r.constructor && (t = r.constructor.name), "Map" === t || "Set" === t ? Array.from(r) : "Arguments" === t || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(t) ? _arrayLikeToArray$9(r, a) : void 0; } }
@@ -22213,8 +23016,10 @@ var ToolTipInfo = function ToolTipInfo(props) {
     className: wrapper$2,
     children: /*#__PURE__*/jsx(Card, {
       title: t('backoffice.tooltipinfo.useroverview'),
-      bodyStyle: {
-        padding: 10
+      styles: {
+        body: {
+          padding: 10
+        }
       },
       bordered: false,
       style: {
@@ -22405,7 +23210,7 @@ var useMediaUpload = function useMediaUpload(_ref) {
 var small = "small-NY1-k";
 var medium = "medium---QcO";
 var big = "big--E39S";
-var css_248z$d = ".diva-component-DIVA_BACKOFFICE_NEW .ant-upload-wrapper {\n  width: 100%;\n  height: 100%;\n}\n\n.diva-component-DIVA_BACKOFFICE_NEW .ant-spin-nested-loading {\n  width: 100%;\n  height: 100%;\n}\n.diva-component-DIVA_BACKOFFICE_NEW .ant-table-wrapper, .diva-component-DIVA_BACKOFFICE_NEW .ant-table {\n  height: inherit;\n  overflow: auto;\n}\n\n.diva-component-DIVA_BACKOFFICE_NEW .ant-spin-container {\n  width: 100%;\n  height: 100%;\n}\n\n.diva-component-DIVA_BACKOFFICE_NEW .andt-table .ant-spin-container {\n  display: flex;\n  flex-direction: column;\n}\n\n.diva-component-DIVA_BACKOFFICE_NEW .ant-space-item .andt-table .ant-spin-container {\n  height: calc(60vh - 90px);\n}\n\n.diva-component-DIVA_BACKOFFICE_NEW .andt-table .ant-table-container {\n  height: calc(100% - 80px);\n}\n.diva-component-DIVA_BACKOFFICE_NEW .ant-upload-list {\n  width: 100%;\n  height: 100%;\n}\n\n.diva-component-DIVA_BACKOFFICE_NEW .ant-upload-list-item-container {\n  width: 100% !important;\n  height: 100% !important;\n}\n\n.diva-component-DIVA_BACKOFFICE_NEW .ant-upload-select {\n  width: 100% !important;\n  height: 100% !important;\n}\n\n.diva-component-DIVA_BACKOFFICE_NEW .small-NY1-k {\n  width: 104px;\n  height: 104px;\n}\n\n.diva-component-DIVA_BACKOFFICE_NEW .medium---QcO {\n  width: 200px;\n  height: 200px;\n}\n\n.diva-component-DIVA_BACKOFFICE_NEW .big--E39S {\n  width: 400px;\n  height: 400px;\n}\n";
+var css_248z$d = ".diva-component-DIVA_BACKOFFICE_NEW .ant-upload-wrapper {\n  width: 100%;\n  height: 100%;\n}\n\n.diva-component-DIVA_BACKOFFICE_NEW .ant-spin-nested-loading {\n  width: 100%;\n  height: 100%;\n}\n.diva-component-DIVA_BACKOFFICE_NEW .ant-table-wrapper, .diva-component-DIVA_BACKOFFICE_NEW .ant-table {\n  height: inherit;\n  overflow: auto;\n}\n\n.diva-component-DIVA_BACKOFFICE_NEW .ant-drawer-body .ant-spin-nested-loading {\n  width: 100%;\n  height: 80%;\n}\n\n.diva-component-DIVA_BACKOFFICE_NEW .ant-spin-container {\n  width: 100%;\n  height: 100%;\n}\n\n.diva-component-DIVA_BACKOFFICE_NEW .andt-table .ant-spin-container {\n  display: flex;\n  flex-direction: column;\n}\n\n.diva-component-DIVA_BACKOFFICE_NEW .ant-space-item .andt-table .ant-spin-container {\n  height: calc(60vh - 90px);\n}\n\n.diva-component-DIVA_BACKOFFICE_NEW .andt-table .ant-table-container {\n  height: calc(100% - 80px);\n}\n.diva-component-DIVA_BACKOFFICE_NEW .ant-upload-list {\n  width: 100%;\n  height: 100%;\n}\n\n.diva-component-DIVA_BACKOFFICE_NEW .ant-upload-list-item-container {\n  width: 100% !important;\n  height: 100% !important;\n}\n\n.diva-component-DIVA_BACKOFFICE_NEW .ant-upload-select {\n  width: 100% !important;\n  height: 100% !important;\n}\n\n.diva-component-DIVA_BACKOFFICE_NEW .small-NY1-k {\n  width: 104px;\n  height: 104px;\n}\n\n.diva-component-DIVA_BACKOFFICE_NEW .medium---QcO {\n  width: 200px;\n  height: 200px;\n}\n\n.diva-component-DIVA_BACKOFFICE_NEW .big--E39S {\n  width: 400px;\n  height: 400px;\n}\n";
 styleInject(css_248z$d);
 
 var MediaUpload = observer(function (_ref) {
@@ -22448,8 +23253,8 @@ function getExpandedRowRenderer (config, root) {
   return function (record) {
     var data = record;
     if (config.mapping) {
-      data = aplyMapping({
-        mapable: {},
+      data = applyMapping({
+        mappable: {},
         mapping: config.mapping,
         mappingData: record,
         rootStore: root
@@ -22769,7 +23574,7 @@ function DropdownCell (_ref) {
           width: column.width - 20
         },
         onChange: save,
-        bordered: false,
+        variant: "borderless",
         disabled: !((_column$flow = column.flow) !== null && _column$flow !== void 0 && (_column$flow = _column$flow[children[1]]) !== null && _column$flow !== void 0 && _column$flow.length),
         options: (_column$flow2 = column.flow) === null || _column$flow2 === void 0 || (_column$flow2 = _column$flow2[children[1]]) === null || _column$flow2 === void 0 ? void 0 : _column$flow2.map(function (opt) {
           return {
@@ -22804,6 +23609,8 @@ if (!window.customElements.get('model-viewer')) {
 function MediaViewerCell (_ref) {
   var children = _ref.children,
     column = _ref.column;
+  var _useDivaCore = useDivaCore(),
+    isFirefox = _useDivaCore.state.isFirefox;
   if (!(children !== null && children !== void 0 && children[1])) {
     return /*#__PURE__*/jsx(Fragment, {});
   }
@@ -22849,7 +23656,7 @@ function MediaViewerCell (_ref) {
         src: children[1],
         ar: true,
         "ar-scale": 'fixed',
-        "ar-modes": 'webxr quick-look',
+        "ar-modes": !isFirefox ? 'webxr quick-look' : '',
         "shadow-intensity": "1",
         "camera-controls": true,
         "touch-action": "pan-y",
@@ -22915,12 +23722,12 @@ function UnixTimeStampCell (_ref) {
 }
 
 function UnixTimeStampCheckCell (_ref) {
-  var _ref2;
+  var _checkTime;
   var children = _ref.children,
     column = _ref.column;
     _ref.dataIndex;
     _ref.save;
-  if ((_ref2 = (Date.now() - children[1]) / 1000 / 60 >= column.checkTime) !== null && _ref2 !== void 0 ? _ref2 : 15) {
+  if ((Date.now() - children[1]) / 1000 / 60 >= ((_checkTime = column.checkTime) !== null && _checkTime !== void 0 ? _checkTime : 15)) {
     return /*#__PURE__*/jsx("span", {
       style: {
         whiteSpace: 'nowrap'
@@ -22989,6 +23796,8 @@ function MediaItemViewerCell (_ref) {
     timeStamp = _useState4[0],
     setTimeStamp = _useState4[1];
   var id;
+  var _useDivaCore = useDivaCore(),
+    isFirefox = _useDivaCore.state.isFirefox;
 
   //! for renderjob table mediaItems because can't filter mediaItems.0
   if (Array.isArray(children[1])) {
@@ -23020,9 +23829,9 @@ function MediaItemViewerCell (_ref) {
     });
   }, [timeStamp, id]);
   if (!id) return /*#__PURE__*/jsx(FileUnknownOutlined, {});
-  var _useDivaCore = useDivaCore(),
-    handler = _useDivaCore.handler,
-    actions = _useDivaCore.actions;
+  var _useDivaCore2 = useDivaCore(),
+    handler = _useDivaCore2.handler,
+    actions = _useDivaCore2.actions;
   var openModelViewer = function openModelViewer() {
     actions.openFullscreen({
       content: /*#__PURE__*/jsx("model-viewer", {
@@ -23030,7 +23839,7 @@ function MediaItemViewerCell (_ref) {
         src: children[1],
         ar: true,
         "ar-scale": 'fixed',
-        "ar-modes": 'webxr quick-look',
+        "ar-modes": !isFirefox ? 'webxr quick-look' : '',
         "shadow-intensity": "1",
         "camera-controls": true,
         "touch-action": "pan-y",
@@ -23150,7 +23959,7 @@ var CustomCell = function CustomCell(_ref2) {
             return form.validateFields();
           case 3:
             values = _context.sent;
-            handleSave(merge(record, values));
+            handleSave(merge$1(record, values));
             _context.next = 10;
             break;
           case 7:
@@ -23463,7 +24272,6 @@ function AGHistogram (_ref) {
       if (subtitle) parseSubTitle = subtitle.text + eval(subtitle.variable);
       setOptions({
         data: data.bulks,
-        autoSize: true,
         theme: {
           baseTheme: root.contentStore.theme == 'darkmode' ? 'ag-default-dark' : 'ag-default'
         },
@@ -23534,7 +24342,7 @@ function AGHistogram (_ref) {
               height: height,
               width: width
             },
-            children: options && /*#__PURE__*/jsx(AgChartsReact, {
+            children: options && /*#__PURE__*/jsx(AgCharts, {
               options: options
             })
           }), loadingHistogram && /*#__PURE__*/jsx("div", {
@@ -23587,7 +24395,7 @@ dayjs.extend(weekYear);
 Select$1.Option;
 var LOG$3 = getLogger('Backoffice', 'BaseTable');
 var TableWrapper = function TableWrapper(_ref) {
-  var _state$configuration$, _state$configuration$2, _state$configuration$3, _state$configuration$4, _state$configuration$5, _state$configuration$6, _state$globalFilter, _state$globalFilter2, _state$globalFilter3, _state$globalFilter4, _state$configuration$7, _state$configuration$8, _state$globalFilter$s, _state$configuration$9, _state$configuration$10, _state$configuration$11, _state$selected2, _state$configuration$12, _state$configuration$13, _state$configuration$14, _state$configuration$17, _state$configuration$18, _state$configuration$19;
+  var _state$configuration$, _toggleConfig$label, _toggleConfig$labelOf, _state$globalFilter, _state$configuration$2, _state$configuration$3, _state$globalFilter2, _state$globalFilter3, _state$globalFilter4, _state$globalFilter5, _state$configuration$4, _state$configuration$5, _state$globalFilter$s, _state$configuration$6, _state$configuration$7, _state$configuration$8, _state$configuration$9, _state$configuration$10, _state$selected2, _state$configuration$11, _state$configuration$12, _state$configuration$13, _state$configuration$16, _state$configuration$17, _state$configuration$18;
   var state = _ref.state;
   var root = useStore();
   var _useState = useState(0),
@@ -23681,6 +24489,7 @@ var TableWrapper = function TableWrapper(_ref) {
     if (!permission) return true;
     return root.actions.userHasPermission(permission);
   }
+  var toggleConfig = (_state$configuration$ = state.configuration.filter) === null || _state$configuration$ === void 0 ? void 0 : _state$configuration$.toggle;
   return /*#__PURE__*/jsxs(Fragment, {
     children: [(state.canDelete || state.configuration.createAction || state.title || state.configuration.canRefresh || state.configuration.clientRelations) && /*#__PURE__*/jsx(Fragment, {
       children: /*#__PURE__*/jsx(Descriptions, {
@@ -23739,16 +24548,17 @@ var TableWrapper = function TableWrapper(_ref) {
                 state.triggerRefresh();
               },
               children: /*#__PURE__*/jsx(ReloadOutlined, {})
-            }), ((_state$configuration$ = state.configuration.filter) === null || _state$configuration$ === void 0 ? void 0 : _state$configuration$.toggle) && (!state.configuration.filter.toggle.permission || root.actions.userHasPermission(state.configuration.filter.toggle.permission)) && /*#__PURE__*/jsx("div", {
+            }), toggleConfig && (!toggleConfig.permission || root.actions.userHasPermission(toggleConfig.permission)) && /*#__PURE__*/jsx("div", {
               children: /*#__PURE__*/jsx(Switch, {
-                defaultChecked: (_state$configuration$2 = state.configuration.filter) === null || _state$configuration$2 === void 0 ? void 0 : _state$configuration$2.toggle.defaultChecked,
-                checkedChildren: (_state$configuration$3 = state.configuration.filter.toggle.label) !== null && _state$configuration$3 !== void 0 ? _state$configuration$3 : 'unfiltered',
-                unCheckedChildren: (_state$configuration$4 = state.configuration.filter.toggle.labelOff) !== null && _state$configuration$4 !== void 0 ? _state$configuration$4 : 'filtered',
+                defaultChecked: toggleConfig.defaultChecked,
+                checkedChildren: (_toggleConfig$label = toggleConfig.label) !== null && _toggleConfig$label !== void 0 ? _toggleConfig$label : 'unfiltered',
+                unCheckedChildren: (_toggleConfig$labelOf = toggleConfig.labelOff) !== null && _toggleConfig$labelOf !== void 0 ? _toggleConfig$labelOf : 'filtered',
                 onChange: function onChange() {
                   return state.onGlobalFilterToggle();
-                }
+                },
+                checked: !!((_state$globalFilter = state.globalFilter) !== null && _state$globalFilter !== void 0 && _state$globalFilter.toggle) != !!toggleConfig.inverted
               })
-            }), ((_state$configuration$5 = state.configuration.filter) === null || _state$configuration$5 === void 0 ? void 0 : _state$configuration$5.search) && /*#__PURE__*/jsx(Input.Search, {
+            }), ((_state$configuration$2 = state.configuration.filter) === null || _state$configuration$2 === void 0 ? void 0 : _state$configuration$2.search) && /*#__PURE__*/jsx(Input.Search, {
               placeholder: t('filter.global'),
               onSearch: function onSearch(v) {
                 return state.onGlobalFilterSearch(v);
@@ -23757,17 +24567,17 @@ var TableWrapper = function TableWrapper(_ref) {
               style: {
                 width: 200
               }
-            }), ((_state$configuration$6 = state.configuration.filter) === null || _state$configuration$6 === void 0 ? void 0 : _state$configuration$6.period) && /*#__PURE__*/jsx(DatePicker.RangePicker, {
+            }), ((_state$configuration$3 = state.configuration.filter) === null || _state$configuration$3 === void 0 ? void 0 : _state$configuration$3.period) && /*#__PURE__*/jsx(DatePicker.RangePicker, {
               onCalendarChange: function onCalendarChange(values) {
                 if (values && values[0] && values[1]) {
                   state.onGlobalFilterPeriod(values[0].valueOf(), values[1].valueOf());
                 }
               },
-              value: [(_state$globalFilter = state.globalFilter) !== null && _state$globalFilter !== void 0 && (_state$globalFilter = _state$globalFilter.timeStamp) !== null && _state$globalFilter !== void 0 && (_state$globalFilter = _state$globalFilter['fromTimeStamp']) !== null && _state$globalFilter !== void 0 && _state$globalFilter[0] ? dayjs((_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 ? void 0 : _state$globalFilter2[0]) : dayjs(new Date(Date.now() - 30 * 24 * 60 * 60 * 1000)),
+              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)),
               // Convert to Dayjs
-              (_state$globalFilter3 = state.globalFilter) !== null && _state$globalFilter3 !== void 0 && (_state$globalFilter3 = _state$globalFilter3.timeStamp) !== null && _state$globalFilter3 !== void 0 && (_state$globalFilter3 = _state$globalFilter3['toTimeStamp']) !== null && _state$globalFilter3 !== void 0 && _state$globalFilter3[0] ? 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 ? void 0 : _state$globalFilter4[0]) : dayjs(new Date()) // 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
               ]
-            }), ((_state$configuration$7 = state.configuration.filter) === null || _state$configuration$7 === void 0 ? void 0 : _state$configuration$7.select) && /*#__PURE__*/jsx(SimpleSelect, _objectSpread$l(_objectSpread$l({}, (_state$configuration$8 = state.configuration.filter) === null || _state$configuration$8 === void 0 ? void 0 : _state$configuration$8.select.settings), {}, {
+            }), ((_state$configuration$4 = state.configuration.filter) === null || _state$configuration$4 === void 0 ? void 0 : _state$configuration$4.select) && /*#__PURE__*/jsx(SimpleSelect, _objectSpread$l(_objectSpread$l({}, (_state$configuration$5 = state.configuration.filter) === null || _state$configuration$5 === void 0 ? void 0 : _state$configuration$5.select.settings), {}, {
               style: {
                 minWidth: '200px'
               },
@@ -23780,17 +24590,19 @@ var TableWrapper = function TableWrapper(_ref) {
             }), state.canDelete && /*#__PURE__*/jsx(DeleteButton, {
               selected: state.selected,
               total: state.pagination.total,
-              min: (_state$configuration$9 = state.configuration.rules) === null || _state$configuration$9 === void 0 ? void 0 : _state$configuration$9.min,
+              min: (_state$configuration$6 = state.configuration.rules) === null || _state$configuration$6 === void 0 ? void 0 : _state$configuration$6.min,
               deleting: state.deleting,
               onDelete: state.onDelete,
-              disabled: !!((_state$configuration$10 = state.configuration.deleteAction) !== null && _state$configuration$10 !== void 0 && (_state$configuration$11 = _state$configuration$10.disabled) !== null && _state$configuration$11 !== void 0 && _state$configuration$11.call(_state$configuration$10, ((_state$selected2 = state.selected) !== null && _state$selected2 !== void 0 ? _state$selected2 : []).map(function (id) {
+              label: (_state$configuration$7 = state.configuration.deleteAction) === null || _state$configuration$7 === void 0 ? void 0 : _state$configuration$7.label,
+              labelDialog: (_state$configuration$8 = state.configuration.deleteAction) === null || _state$configuration$8 === void 0 ? void 0 : _state$configuration$8.labelDialog,
+              disabled: !!((_state$configuration$9 = state.configuration.deleteAction) !== null && _state$configuration$9 !== void 0 && (_state$configuration$10 = _state$configuration$9.disabled) !== null && _state$configuration$10 !== void 0 && _state$configuration$10.call(_state$configuration$9, ((_state$selected2 = state.selected) !== null && _state$selected2 !== void 0 ? _state$selected2 : []).map(function (id) {
                 return state.data.find(function (d) {
                   return d._id == id;
                 });
               })))
             }), state.configuration.copyAction !== undefined && /*#__PURE__*/jsx(CopyButton, {
               state: state
-            }), (_state$configuration$12 = state.configuration.bulkActions) === null || _state$configuration$12 === void 0 ? void 0 : _state$configuration$12.map(function (action) {
+            }), (_state$configuration$11 = state.configuration.bulkActions) === null || _state$configuration$11 === void 0 ? void 0 : _state$configuration$11.map(function (action) {
               return /*#__PURE__*/jsx(BulkAction, {
                 action: action,
                 state: state,
@@ -23801,26 +24613,26 @@ var TableWrapper = function TableWrapper(_ref) {
                   setProgressBarPercentage: setProgressBarPercentage
                 } : undefined
               }, action.id);
-            }), state.configuration.createAction && checkPermission(state.configuration.createAction.permission) && !((_state$configuration$13 = (_state$configuration$14 = state.configuration.createAction).hidden) !== null && _state$configuration$13 !== void 0 && _state$configuration$13.call(_state$configuration$14, data)) && /*#__PURE__*/jsx(ActionButton, {
+            }), state.configuration.createAction && checkPermission(state.configuration.createAction.permission) && !((_state$configuration$12 = (_state$configuration$13 = state.configuration.createAction).hidden) !== null && _state$configuration$12 !== void 0 && _state$configuration$12.call(_state$configuration$13, data)) && /*#__PURE__*/jsx(ActionButton, {
               action: state.configuration.createAction,
               callback: function callback(data) {
-                var _state$onUpdate, _state$configuration$15, _state$configuration$16;
+                var _state$onUpdate, _state$configuration$14, _state$configuration$15;
                 (_state$onUpdate = state.onUpdate) === null || _state$onUpdate === void 0 || _state$onUpdate.call(state, data);
-                (_state$configuration$15 = state.configuration.createAction) === null || _state$configuration$15 === void 0 || (_state$configuration$16 = _state$configuration$15.callback) === null || _state$configuration$16 === void 0 || _state$configuration$16.call(_state$configuration$15, data);
+                (_state$configuration$14 = state.configuration.createAction) === null || _state$configuration$14 === void 0 || (_state$configuration$15 = _state$configuration$14.callback) === null || _state$configuration$15 === void 0 || _state$configuration$15.call(_state$configuration$14, data);
               },
               type: "Button",
               id: 'create',
               defaultLabel: t('backoffice.table.emailtemplates.createAction.title'),
               isCreateButton: true,
-              disabled: state.configuration.createAction.disableOnToggle === !!state.globalFilter.toggle || ((_state$configuration$17 = (_state$configuration$18 = state.configuration.createAction).disabled) === null || _state$configuration$17 === void 0 ? void 0 : _state$configuration$17.call(_state$configuration$18, data)),
-              data: state.configuration.createActionMapping ? aplyMapping({
-                mapable: {},
+              disabled: state.configuration.createAction.disableOnToggle === !!state.globalFilter.toggle || ((_state$configuration$16 = (_state$configuration$17 = state.configuration.createAction).disabled) === null || _state$configuration$16 === void 0 ? void 0 : _state$configuration$16.call(_state$configuration$17, data)),
+              data: state.configuration.createActionMapping ? applyMapping({
+                mappable: {},
                 mapping: state.configuration.createActionMapping,
                 mappingData: state.mappingData,
                 rootStore: root
               }) : undefined,
-              ruleData: state.configuration.createActionRuleMapping ? aplyMapping({
-                mapable: {},
+              ruleData: state.configuration.createActionRuleMapping ? applyMapping({
+                mappable: {},
                 mapping: state.configuration.createActionRuleMapping,
                 mappingData: state.mappingData,
                 rootStore: root
@@ -23860,13 +24672,13 @@ var TableWrapper = function TableWrapper(_ref) {
       className: "andt-table",
       scroll: {
         x: '100%',
-        y: (_state$configuration$19 = state.configuration.height) !== null && _state$configuration$19 !== void 0 ? _state$configuration$19 : '100%'
+        y: (_state$configuration$18 = state.configuration.height) !== null && _state$configuration$18 !== void 0 ? _state$configuration$18 : '100%'
       },
       rowClassName: editableRow,
       components: cellRenderer,
       rowKey: function rowKey(dataRow) {
-        var _state$configuration$20, _state$configuration$21;
-        return goTroughObject(dataRow, (_state$configuration$20 = (_state$configuration$21 = state.configuration.rowKey) === null || _state$configuration$21 === void 0 ? void 0 : _state$configuration$21.split('.')) !== null && _state$configuration$20 !== void 0 ? _state$configuration$20 : ['_id'], 0);
+        var _state$configuration$19, _state$configuration$20;
+        return goTroughObject(dataRow, (_state$configuration$19 = (_state$configuration$20 = state.configuration.rowKey) === null || _state$configuration$20 === void 0 ? void 0 : _state$configuration$20.split('.')) !== null && _state$configuration$19 !== void 0 ? _state$configuration$19 : ['_id'], 0);
       },
       dataSource: data,
       loading: state.loading,
@@ -23907,13 +24719,15 @@ function DeleteButton(_ref2) {
     min = _ref2$min === void 0 ? 0 : _ref2$min,
     deleting = _ref2.deleting,
     onDelete = _ref2.onDelete,
-    disabled = _ref2.disabled;
+    disabled = _ref2.disabled,
+    label = _ref2.label,
+    labelDialog = _ref2.labelDialog;
   var _useTranslation2 = useTranslation(),
     t = _useTranslation2.t;
   var hasSelected = (selected === null || selected === void 0 ? void 0 : selected.length) > 0;
   var leftAfterDelete = total - selected.length;
   var allowDelete = leftAfterDelete >= min;
-  var popupText = !allowDelete ? t('backoffice.basezable.allowdelete-false') + " ".concat(min) : t('backoffice.basezable.allowdelete-true') + " ".concat(selected.length, " ");
+  var popupText = !allowDelete ? t('backoffice.basezable.allowdelete-false') + " ".concat(min) : t(labelDialog !== null && labelDialog !== void 0 ? labelDialog : 'backoffice.basezable.allowdelete-true') + " ".concat(selected.length, " ");
   return /*#__PURE__*/jsx(Fragment, {
     children: /*#__PURE__*/jsx(Popconfirm, {
       title: popupText,
@@ -23930,28 +24744,28 @@ function DeleteButton(_ref2) {
         disabled: !hasSelected || disabled,
         loading: deleting,
         danger: true,
-        children: t('action.delete')
+        children: t(label !== null && label !== void 0 ? label : 'action.delete')
       })
     })
   });
 }
 function CopyButton(_ref3) {
-  var _state$configuration$25;
+  var _state$configuration$24;
   var state = _ref3.state;
   var root = useStore();
-  var apiHandler = new _default$d({
+  new _default$d({
     apiInterface: state.configuration.apiInterface,
     type: 'Table'
   }, root);
   var onCopy = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var _state$configuration$22;
+      var _state$configuration$21;
       var copyAction, _iterator3, _step3, selectedRow;
       return _regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             copyAction = state.configuration.copyAction;
-            if (((_state$configuration$22 = state.configuration.copyAction) === null || _state$configuration$22 === void 0 ? void 0 : _state$configuration$22.apiInterface) != undefined) {
+            if (((_state$configuration$21 = state.configuration.copyAction) === null || _state$configuration$21 === void 0 ? void 0 : _state$configuration$21.apiInterface) != undefined) {
               _iterator3 = _createForOfIteratorHelper$4(state.selected);
               try {
                 for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
@@ -23986,31 +24800,25 @@ function CopyButton(_ref3) {
   }();
   var onCopyAction = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-      var _state$configuration$23, _state$configuration$24;
-      var copyAction, id, filter, data;
+      var _state$configuration$22, _state$configuration$23;
+      var copyAction, id, data;
       return _regeneratorRuntime.wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
             copyAction = state.configuration.copyAction;
-            if (!(copyAction.id == undefined || copyAction.actionType != 'Detail' || ((_state$configuration$23 = state.configuration.createAction) === null || _state$configuration$23 === void 0 ? void 0 : _state$configuration$23.actionType) != 'Detail')) {
+            if (!(copyAction.id == undefined || copyAction.actionType != 'Detail' || ((_state$configuration$22 = state.configuration.createAction) === null || _state$configuration$22 === void 0 ? void 0 : _state$configuration$22.actionType) != 'Detail')) {
               _context3.next = 3;
               break;
             }
             throw new Error('configuration needs to be of type Detail');
           case 3:
             id = state.selected[0];
-            filter = {};
-            filter['_id'] = [id, 'eq', false];
-            _context3.next = 8;
-            return apiHandler.readList(undefined, undefined, {
-              pagination: {},
-              columns: [],
-              filters: filter
-            });
-          case 8:
+            _context3.next = 6;
+            return state.getDataById(id);
+          case 6:
             data = _context3.sent;
-            data.data[0] = aplyMapping({
-              mapable: {},
+            data.data[0] = applyMapping({
+              mappable: {},
               mappingData: data.data[0],
               mapping: copyAction.mapping,
               rootStore: root
@@ -24022,7 +24830,7 @@ function CopyButton(_ref3) {
               configurationId: copyAction === null || copyAction === void 0 ? void 0 : copyAction.id,
               data: data.data[0],
               type: copyAction === null || copyAction === void 0 ? void 0 : copyAction.type,
-              mapping: (_state$configuration$24 = state.configuration.createAction) === null || _state$configuration$24 === void 0 ? void 0 : _state$configuration$24.mapping,
+              mapping: (_state$configuration$23 = state.configuration.createAction) === null || _state$configuration$23 === void 0 ? void 0 : _state$configuration$23.mapping,
               mappingData: data.data[0],
               callback: function () {
                 var _callback = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(e) {
@@ -24032,6 +24840,8 @@ function CopyButton(_ref3) {
                         _context2.next = 2;
                         return state.onUpdate(e);
                       case 2:
+                        if (copyAction.resetToggleAfter) state.resetToggle();
+                      case 3:
                       case "end":
                         return _context2.stop();
                     }
@@ -24043,7 +24853,7 @@ function CopyButton(_ref3) {
                 return callback;
               }()
             });
-          case 11:
+          case 9:
           case "end":
             return _context3.stop();
         }
@@ -24058,7 +24868,7 @@ function CopyButton(_ref3) {
   return /*#__PURE__*/jsx(Button, {
     type: "primary",
     onClick: onCopy,
-    disabled: state.selected.length == 0 || state.selected.length > 1 && ((_state$configuration$25 = state.configuration.copyAction) === null || _state$configuration$25 === void 0 ? void 0 : _state$configuration$25.disableOnMultiselect),
+    disabled: state.selected.length == 0 || state.selected.length > 1 && ((_state$configuration$24 = state.configuration.copyAction) === null || _state$configuration$24 === void 0 ? void 0 : _state$configuration$24.disableOnMultiselect),
     children: t('backoffice.basetable.copy')
   });
 }
@@ -24210,7 +25020,7 @@ function BulkAction(_ref6) {
             _context4.t5 = _context4.sent;
             _context4.t4.push.call(_context4.t4, _context4.t5);
           case 29:
-            if (progressBar) progressBar.setProgressBarPercentage(Math.floor((i + 1 / selectedData.length) * 100));
+            if (progressBar) progressBar.setProgressBarPercentage(Math.floor(i / selectedData.length * 100));
           case 30:
             i++;
             _context4.next = 4;
@@ -24218,22 +25028,27 @@ function BulkAction(_ref6) {
           case 33:
             state.onUpdate(data);
             if (progressBar) {
+              progressBar.setProgressBarPercentage(100);
               progressBar.setProgressBarOpen(false);
               progressBar.setProgressBarPercentage(0);
             }
-            _context4.next = 41;
+            _context4.next = 42;
             break;
           case 37:
             _context4.prev = 37;
             _context4.t6 = _context4["catch"](2);
+            if (progressBar) {
+              progressBar.setProgressBarOpen(false);
+              progressBar.setProgressBarPercentage(0);
+            }
             LOG$3.error(new DivaError('Error changing data', {
               cause: _context4.t6,
               code: 'BACKO_0002'
             }));
             setShowPopover(t('errorcodes._source.labels.error.BACKO_0002'));
-          case 41:
-            (_action$callback = action.callback) === null || _action$callback === void 0 || _action$callback.call(action, updatedData);
           case 42:
+            (_action$callback = action.callback) === null || _action$callback === void 0 || _action$callback.call(action, updatedData);
+          case 43:
           case "end":
             return _context4.stop();
         }
@@ -24272,6 +25087,8 @@ function BulkAction(_ref6) {
 }
 function SelectionText(_ref8) {
   var selected = _ref8.selected;
+  var _useTranslation5 = useTranslation(),
+    t = _useTranslation5.t;
   if (!(selected !== null && selected !== void 0 && selected.length)) {
     return /*#__PURE__*/jsx(Fragment, {});
   }
@@ -24281,7 +25098,7 @@ function SelectionText(_ref8) {
       fontWeight: 'normal',
       fontSize: 'small'
     },
-    children: "".concat(selected.length, " Eintr\xE4ge ausgew\xE4hlt")
+    children: "".concat(selected.length, " ") + t('backoffice.table.selected_entries')
   });
 }
 
@@ -24551,10 +25368,10 @@ var searchProps = function searchProps(title, filter) {
         confirm = _ref4.confirm,
         clearFilters = _ref4.clearFilters,
         visible = _ref4.visible;
-      var ref = useRef(null);
+      var ref1 = useRef(null);
       useEffect(function () {
         if (visible) {
-          ref.current.select();
+          ref1.current.select();
         }
       }, [visible]);
       return /*#__PURE__*/jsxs("div", {
@@ -24562,7 +25379,7 @@ var searchProps = function searchProps(title, filter) {
           padding: 8
         },
         children: [/*#__PURE__*/jsx(Input, {
-          ref: ref,
+          ref: ref1,
           placeholder: "Filter ".concat(title),
           value: selectedKeys[0],
           onChange: function onChange(e) {
@@ -24827,6 +25644,7 @@ function mapColumns(configuration, userHasPermission, onUpdate, data, globalFilt
 function mapColumn(column, onUpdate) {
   var _column$field, _column$children;
   return _objectSpread$j(_objectSpread$j(_objectSpread$j({}, column), {}, {
+    hidden: false,
     width: column.width || 100,
     dataIndex: (_column$field = column.field) === null || _column$field === void 0 ? void 0 : _column$field.split('.'),
     key: column.field || column.title,
@@ -24877,7 +25695,7 @@ function updateData (_ref) {
 
 function ownKeys$i(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$i(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$i(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$i(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function aplyFilterAndSortation (_ref) {
+function applyFilterAndSortation (_ref) {
   var data = _ref.data,
     filters = _ref.filters,
     sorter = _ref.sorter,
@@ -24906,7 +25724,7 @@ function aplyFilterAndSortation (_ref) {
  */
 function sort(s, data) {
   var flatData = data.map(function (d) {
-    return flat.flatten(d);
+    return flatten(d);
   });
   var sorters = Array.of(s).flat().sort(function (a, b) {
     var _a$column, _b$column;
@@ -24917,7 +25735,7 @@ function sort(s, data) {
       return d[s.columnKey];
     });
   })).map(function (r) {
-    return flat.unflatten(r);
+    return unflatten(r);
   });
 }
 
@@ -24936,7 +25754,7 @@ function filter(f, data) {
     return k.includes('.');
   })) {
     filterableData = data.map(function (d) {
-      return flat.flatten(d);
+      return flatten(d);
     });
     isFlatted = true;
   }
@@ -24971,7 +25789,7 @@ function filter(f, data) {
     });
   });
   return isFlatted ? result.map(function (r) {
-    return flat.unflatten(r);
+    return unflatten(r);
   }) : result;
 }
 
@@ -25032,7 +25850,7 @@ function useTableData$1 (_ref) {
     var _configuration$create;
     if (!dataRow) return;
     var id = v4();
-    var processedDataRow = flat.unflatten(_objectSpread$h({
+    var processedDataRow = unflatten(_objectSpread$h({
       _id: id,
       ID: id
     }, dataRow));
@@ -25048,7 +25866,7 @@ function useTableData$1 (_ref) {
       data: newData
     });
     if (!filterServerSide) {
-      var res = aplyFilterAndSortation(_objectSpread$h(_objectSpread$h({}, filterData), {}, {
+      var res = applyFilterAndSortation(_objectSpread$h(_objectSpread$h({}, filterData), {}, {
         data: newData
       }));
       newState.data = res.data;
@@ -25091,11 +25909,10 @@ function useTableData$1 (_ref) {
           sorter: mapColumns(configuration, root.actions.userHasPermission, onUpdate).filter(function (c) {
             return c.defaultSortOrder;
           }).map(function (c) {
-            var _c$dataIndex;
             return {
               column: c,
               field: c.dataIndex,
-              columnKey: (_c$dataIndex = c.dataIndex) === null || _c$dataIndex === void 0 ? void 0 : _c$dataIndex.join('.'),
+              columnKey: c.key,
               order: c.defaultSortOrder
             };
           })
@@ -25108,11 +25925,10 @@ function useTableData$1 (_ref) {
         sorter: mapColumns(configuration, root.actions.userHasPermission, onUpdate).filter(function (c) {
           return c.defaultSortOrder;
         }).map(function (c) {
-          var _c$dataIndex2;
           return {
             column: c,
             field: c.dataIndex,
-            columnKey: (_c$dataIndex2 = c.dataIndex) === null || _c$dataIndex2 === void 0 ? void 0 : _c$dataIndex2.join('.'),
+            columnKey: c.key,
             order: c.defaultSortOrder
           };
         })
@@ -25125,11 +25941,11 @@ function useTableData$1 (_ref) {
     }));
     if (!filterServerSide) {
       var unfilteredData = dataParam ? dataParam : state.unfilteredData;
-      var _aplyFilterAndSortati = aplyFilterAndSortation(_objectSpread$h(_objectSpread$h({}, p), {}, {
+      var _applyFilterAndSortat = applyFilterAndSortation(_objectSpread$h(_objectSpread$h({}, p), {}, {
           data: unfilteredData
         })),
-        data = _aplyFilterAndSortati.data,
-        pagination = _aplyFilterAndSortati.pagination;
+        data = _applyFilterAndSortat.data,
+        pagination = _applyFilterAndSortat.pagination;
       setState(_objectSpread$h(_objectSpread$h({}, state), {}, {
         data: data,
         pagination: pagination,
@@ -25165,16 +25981,44 @@ function useTableData$1 (_ref) {
       });
     }
   };
+  var getDataById = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee(id) {
+      var filters, data;
+      return _regeneratorRuntime.wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            filters = {};
+            filters['_id'] = [id, 'eq', false];
+            _context.next = 4;
+            return apiHandler.readList(configuration.mapping, {
+              pagination: _objectSpread$h({}, state.pagination),
+              columns: configuration.columns,
+              filters: filters,
+              sorter: filterData.sorter
+            });
+          case 4:
+            data = _context.sent;
+            return _context.abrupt("return", data);
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function getDataById(_x) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
   var onSelect = function onSelect(keys) {
     setState(_objectSpread$h(_objectSpread$h({}, state), {}, {
       selected: keys
     }));
   };
   var onDelete = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2() {
       var newData, deleted, _loop, mappingData, index, total, pages, current, data;
-      return _regeneratorRuntime.wrap(function _callee$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+      return _regeneratorRuntime.wrap(function _callee2$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
             setState(_objectSpread$h(_objectSpread$h({}, state), {}, {
               deleting: true
@@ -25184,24 +26028,24 @@ function useTableData$1 (_ref) {
             _loop = /*#__PURE__*/_regeneratorRuntime.mark(function _loop(index) {
               var _newData$filter, _configuration$delete;
               var id, deleteResult, deletedIndex;
-              return _regeneratorRuntime.wrap(function _loop$(_context) {
-                while (1) switch (_context.prev = _context.next) {
+              return _regeneratorRuntime.wrap(function _loop$(_context2) {
+                while (1) switch (_context2.prev = _context2.next) {
                   case 0:
                     id = state.selected[index];
                     mappingData = (_newData$filter = newData.filter(function (nd) {
                       return nd._id === state.selected[index];
                     })) === null || _newData$filter === void 0 ? void 0 : _newData$filter[0];
                     mappingData = _objectSpread$h(_objectSpread$h({}, mappingData), state.mappingData);
-                    _context.next = 5;
+                    _context2.next = 5;
                     return apiHandler["delete"](id, (_configuration$delete = configuration.deleteMapping) !== null && _configuration$delete !== void 0 ? _configuration$delete : configuration.mapping, mappingData, true);
                   case 5:
-                    deleteResult = _context.sent;
+                    deleteResult = _context2.sent;
                     if (deleteResult) {
-                      _context.next = 9;
+                      _context2.next = 9;
                       break;
                     }
                     setError('Fehler beim löschen eines Elementes.');
-                    return _context.abrupt("return", 1);
+                    return _context2.abrupt("return", 1);
                   case 9:
                     deletedIndex = newData.findIndex(function (d) {
                       return (d === null || d === void 0 ? void 0 : d._id) == id;
@@ -25210,36 +26054,36 @@ function useTableData$1 (_ref) {
                     deleted++;
                   case 12:
                   case "end":
-                    return _context.stop();
+                    return _context2.stop();
                 }
               }, _loop);
             });
             index = 0;
           case 5:
             if (!(index < state.selected.length)) {
-              _context2.next = 12;
+              _context3.next = 12;
               break;
             }
-            return _context2.delegateYield(_loop(index), "t0", 7);
+            return _context3.delegateYield(_loop(index), "t0", 7);
           case 7:
-            if (!_context2.t0) {
-              _context2.next = 9;
+            if (!_context3.t0) {
+              _context3.next = 9;
               break;
             }
-            return _context2.abrupt("continue", 9);
+            return _context3.abrupt("continue", 9);
           case 9:
             index++;
-            _context2.next = 5;
+            _context3.next = 5;
             break;
           case 12:
             total = state.pagination.total - deleted;
             pages = Math.ceil(total / state.pagination.pageSize);
             current = state.pagination.current > pages ? pages || 1 : state.pagination.current;
             if (!(pages > 0 && state.pagination.current > pages && filterServerSide || state.selected.length === 0)) {
-              _context2.next = 21;
+              _context3.next = 21;
               break;
             }
-            _context2.next = 18;
+            _context3.next = 18;
             return apiHandler.readList(configuration.mapping, {
               pagination: _objectSpread$h(_objectSpread$h({}, state.pagination), {}, {
                 current: current
@@ -25249,7 +26093,7 @@ function useTableData$1 (_ref) {
               sorter: filterData.sorter
             });
           case 18:
-            data = _context2.sent;
+            data = _context3.sent;
             newData = data.data;
             total = data.total;
           case 21:
@@ -25264,12 +26108,12 @@ function useTableData$1 (_ref) {
             }));
           case 22:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee);
+      }, _callee2);
     }));
     return function onDelete() {
-      return _ref2.apply(this, arguments);
+      return _ref3.apply(this, arguments);
     };
   }();
   function setLoading() {
@@ -25289,6 +26133,10 @@ function useTableData$1 (_ref) {
     onChange: onChange,
     onUpdate: onUpdate,
     onDelete: onDelete,
+    getDataById: getDataById,
+    resetToggle: function resetToggle() {
+      throw new Error('not implemented for CatalogTable');
+    },
     triggerRefresh: function triggerRefresh() {
       throw new Error('not implemented for CatalogTable');
     },
@@ -25423,7 +26271,8 @@ function useTableData (_ref) {
   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) {
-    return toggleFilter[f] = [toggleConfig.globalValue ? root.getGlobalValue(toggleConfig.globalValue) : true, 'eq', 1];
+    var _toggleConfig$isAnd;
+    return toggleFilter[f] = [toggleConfig.globalValue ? root.getGlobalValue(toggleConfig.globalValue) : true, 'eq', ((_toggleConfig$isAnd = toggleConfig.isAnd) !== null && _toggleConfig$isAnd !== void 0 ? _toggleConfig$isAnd : false) ? 0 : 1];
   });
   var defaultFilter = {};
   (_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) {
@@ -25539,7 +26388,7 @@ function useTableData (_ref) {
             dataRow: dataRow
           }),
           nextInitData = _updateData2.data;
-        var _aplyFilterAndSortati = aplyFilterAndSortation(_objectSpread$g(_objectSpread$g(_objectSpread$g({}, filterData), {}, {
+        var _applyFilterAndSortat = applyFilterAndSortation(_objectSpread$g(_objectSpread$g(_objectSpread$g({}, filterData), {}, {
             filters: _objectSpread$g(_objectSpread$g(_objectSpread$g(_objectSpread$g(_objectSpread$g(_objectSpread$g({}, 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 ? {
             genericProps: globalFilter.toggle
@@ -25547,8 +26396,8 @@ function useTableData (_ref) {
             data: nextInitData,
             filterServerSide: filterServerSide
           })),
-          _data2 = _aplyFilterAndSortati.data,
-          _pagination2 = _aplyFilterAndSortati.pagination;
+          _data2 = _applyFilterAndSortat.data,
+          _pagination2 = _applyFilterAndSortat.pagination;
         newInitData = nextInitData;
         newState = _objectSpread$g(_objectSpread$g({}, newState), {}, {
           pagination: _pagination2,
@@ -25596,11 +26445,10 @@ function useTableData (_ref) {
     var sorter = columns.filter(function (c) {
       return c.defaultSortOrder;
     }).map(function (c) {
-      var _c$dataIndex;
       return {
         column: c,
         field: c.dataIndex,
-        columnKey: (_c$dataIndex = c.dataIndex) === null || _c$dataIndex === void 0 ? void 0 : _c$dataIndex.join('.'),
+        columnKey: c.key,
         order: c.defaultSortOrder
       };
     });
@@ -25638,38 +26486,77 @@ function useTableData (_ref) {
     }
     return title;
   }, [configuration.title, parentData]);
+  var getDataById = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(id) {
+      var _configuration$filter9;
+      var filters, ssf, data;
+      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            filters = {};
+            filters['_id'] = [id, 'eq', false];
+            ssf = _objectSpread$g({
+              pagination: {
+                current: 1,
+                pageSize: 1
+              },
+              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 ? {
+              genericProps: globalFilter.toggle
+            } : undefined);
+            _context2.next = 5;
+            return apiHandler.readList(parentMapping || configuration.mapping, mapping, ssf);
+          case 5:
+            data = _context2.sent;
+            return _context2.abrupt("return", data);
+          case 7:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function getDataById(_x2) {
+      return _ref4.apply(this, arguments);
+    };
+  }();
   var onChange = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee2(p) {
-      var _configuration$filter9, _configuration$filter10, _configuration$filter11, _prefilter$select, _configuration$filter12, _configuration$filter13;
+    var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(p) {
+      var _configuration$filter10, _configuration$filter11, _prefilter$select, _configuration$filter12, _configuration$filter13;
       var prefilter,
         refresh,
+        clearSelection,
         currentData,
         filterData,
         currentFilterHash,
         currentPagination,
         currentUrl,
         _configuration$filter14,
+        _configuration$filter15,
+        _prefilter$toggle,
+        _parseFilter,
         ssf,
         data,
         _data3,
-        _aplyFilterAndSortati2,
+        _applyFilterAndSortat2,
         _data4,
         pagination,
-        _args2 = arguments;
-      return _regeneratorRuntime.wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
+        _args3 = arguments;
+      return _regeneratorRuntime.wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
           case 0:
-            prefilter = _args2.length > 1 && _args2[1] !== undefined ? _args2[1] : globalFilter;
-            refresh = _args2.length > 2 ? _args2[2] : undefined;
+            prefilter = _args3.length > 1 && _args3[1] !== undefined ? _args3[1] : globalFilter;
+            refresh = _args3.length > 2 ? _args3[2] : undefined;
+            clearSelection = _args3.length > 3 ? _args3[3] : undefined;
             setState(_objectSpread$g(_objectSpread$g({}, state), {}, {
               loading: true
             }));
             currentData = initData;
-            filterData = _objectSpread$g(_objectSpread$g(_objectSpread$g(_objectSpread$g(_objectSpread$g(_objectSpread$g({}, p.filters), prefilter.search), !(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) ? prefilter.toggle : undefined), ((_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 = Object.fromEntries(Object.entries(filterData).filter(function (_ref5) {
-              var _ref6 = _slicedToArray(_ref5, 2);
-                _ref6[0];
-                var v = _ref6[1];
+            filterData = _objectSpread$g(_objectSpread$g(_objectSpread$g(_objectSpread$g({}, 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 = Object.fromEntries(Object.entries(filterData).filter(function (_ref6) {
+              var _ref7 = _slicedToArray(_ref6, 2);
+                _ref7[0];
+                var v = _ref7[1];
               return v != null;
             }));
             currentFilterHash = objectHash(filterData);
@@ -25678,7 +26565,7 @@ function useTableData (_ref) {
             });
             filterHash.current = currentFilterHash;
             if (!filterServerSide) {
-              _context2.next = 19;
+              _context3.next = 20;
               break;
             }
             ssf = _objectSpread$g({
@@ -25689,38 +26576,38 @@ function useTableData (_ref) {
             }, 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 ? {
               genericProps: prefilter.toggle
             } : undefined);
-            _context2.next = 13;
-            return apiHandler.readList(parentMapping || configuration.mapping, mapping, ssf);
-          case 13:
-            data = _context2.sent;
+            _context3.next = 14;
+            return apiHandler.readList(parentMapping || configuration.mapping, mapping, ssf, undefined, 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:
+            data = _context3.sent;
             currentUrl = apiHandler.getReadListUrl(parentMapping || configuration.mapping, mapping, ssf);
             currentData = data.data;
             currentPagination = _objectSpread$g(_objectSpread$g({}, currentPagination), {}, {
               total: data.total
             });
-            _context2.next = 28;
+            _context3.next = 29;
             break;
-          case 19:
+          case 20:
             if (!(!currentData || currentData.length === 0 || refresh)) {
-              _context2.next = 25;
+              _context3.next = 26;
               break;
             }
-            _context2.next = 22;
+            _context3.next = 23;
             return apiHandler.readList(parentMapping || configuration.mapping, mapping, undefined);
-          case 22:
-            _data3 = _context2.sent;
+          case 23:
+            _data3 = _context3.sent;
             currentData = _data3.data;
             setInitData(currentData);
-          case 25:
-            _aplyFilterAndSortati2 = aplyFilterAndSortation(_objectSpread$g(_objectSpread$g({}, p), {}, {
+          case 26:
+            _applyFilterAndSortat2 = applyFilterAndSortation(_objectSpread$g(_objectSpread$g({}, p), {}, {
               pagination: currentPagination,
               filters: filterData,
               data: currentData,
               filterServerSide: filterServerSide
-            })), _data4 = _aplyFilterAndSortati2.data, pagination = _aplyFilterAndSortati2.pagination;
+            })), _data4 = _applyFilterAndSortat2.data, pagination = _applyFilterAndSortat2.pagination;
             currentData = _data4;
             currentPagination = pagination;
-          case 28:
+          case 29:
             setState(_objectSpread$g(_objectSpread$g({}, state), {}, {
               loading: false,
               data: currentData,
@@ -25729,19 +26616,21 @@ function useTableData (_ref) {
                 prefilter: prefilter
               }),
               currentFetchUrl: currentUrl
-            }));
+            }, clearSelection ? {
+              selected: []
+            } : {}));
             setFilter({
               filters: p.filters,
               sorter: p.sorter
             });
-          case 30:
+          case 31:
           case "end":
-            return _context2.stop();
+            return _context3.stop();
         }
-      }, _callee2);
+      }, _callee3);
     }));
-    return function onChange(_x2) {
-      return _ref4.apply(this, arguments);
+    return function onChange(_x3) {
+      return _ref5.apply(this, arguments);
     };
   }();
   var onSelect = function onSelect(keys) {
@@ -25750,11 +26639,11 @@ function useTableData (_ref) {
     }));
   };
   var onDelete = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
+    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$filter15, _configuration$filter16, data;
-      return _regeneratorRuntime.wrap(function _callee3$(_context4) {
-        while (1) switch (_context4.prev = _context4.next) {
+      var newData, newInitData, deleted, userPermissions, _loop, mappingData, deleteResult, _ret, index, total, pages, current, _configuration$filter16, _configuration$filter17, data;
+      return _regeneratorRuntime.wrap(function _callee4$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
           case 0:
             setState(_objectSpread$g(_objectSpread$g({}, state), {}, {
               deleting: true
@@ -25762,15 +26651,15 @@ function useTableData (_ref) {
             newData = _toConsumableArray(state.data);
             newInitData = initData ? _toConsumableArray(initData) : undefined;
             deleted = 0;
-            _context4.next = 6;
+            _context5.next = 6;
             return _typeof(configuration.apiInterface) == 'object' && _typeof(configuration.apiInterface["delete"]) == 'object' ? (_configuration$apiInt2 = configuration.apiInterface["delete"]) === null || _configuration$apiInt2 === void 0 ? void 0 : _configuration$apiInt2.permission : undefined;
           case 6:
-            userPermissions = _context4.sent;
+            userPermissions = _context5.sent;
             _loop = /*#__PURE__*/_regeneratorRuntime.mark(function _loop(index) {
-              var _configuration$rowKey, _configuration$filter17, _configuration$filter18;
+              var _configuration$filter18, _configuration$filter19;
               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$(_context3) {
-                while (1) switch (_context3.prev = _context3.next) {
+              return _regeneratorRuntime.wrap(function _loop$(_context4) {
+                while (1) switch (_context4.prev = _context4.next) {
                   case 0:
                     id = state.selected[index];
                     if (configuration.rowKey) {
@@ -25783,7 +26672,7 @@ function useTableData (_ref) {
                       })) === null || _newData$filter2 === void 0 ? void 0 : _newData$filter2[0];
                     }
                     mapToggle = {};
-                    _iterator = _createForOfIteratorHelper$3((_configuration$filter17 = (_configuration$filter18 = configuration.filter) === null || _configuration$filter18 === void 0 || (_configuration$filter18 = _configuration$filter18.toggle) === null || _configuration$filter18 === void 0 ? void 0 : _configuration$filter18.fields) !== null && _configuration$filter17 !== void 0 ? _configuration$filter17 : []);
+                    _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 : []);
                     try {
                       for (_iterator.s(); !(_step = _iterator.n()).done;) {
                         field = _step.value;
@@ -25798,107 +26687,106 @@ function useTableData (_ref) {
                     }
                     mappingData = _objectSpread$g(_objectSpread$g(_objectSpread$g({}, mappingData), state.mappingData), mapToggle);
                     deleteResult = undefined;
-                    _context3.prev = 7;
+                    _context4.prev = 7;
                     if (!(userPermissions && !root.actions.userHasPermission(userPermissions))) {
-                      _context3.next = 11;
+                      _context4.next = 11;
                       break;
                     }
                     setError('Sie haben keine Berechtigung ein Mediaitem zu löschen.');
-                    return _context3.abrupt("return", 0);
+                    return _context4.abrupt("return", 0);
                   case 11:
-                    _context3.next = 13;
+                    _context4.next = 13;
                     return apiHandler["delete"](id, (_configuration$delete = configuration.deleteMapping) !== null && _configuration$delete !== void 0 ? _configuration$delete : configuration.mapping, mappingData);
                   case 13:
-                    deleteResult = _context3.sent;
-                    _context3.next = 24;
+                    deleteResult = _context4.sent;
+                    _context4.next = 24;
                     break;
                   case 16:
-                    _context3.prev = 16;
-                    _context3.t0 = _context3["catch"](7);
-                    if (!(_context3.t0 instanceof DivaError && _context3.t0.name)) {
-                      _context3.next = 22;
+                    _context4.prev = 16;
+                    _context4.t0 = _context4["catch"](7);
+                    if (!(_context4.t0 instanceof DivaError && _context4.t0.name)) {
+                      _context4.next = 22;
                       break;
                     }
-                    if (!((_configuration$onErro = configuration.onError) !== null && _configuration$onErro !== void 0 && _configuration$onErro[_context3.t0.name])) {
-                      _context3.next = 22;
+                    if (!((_configuration$onErro = configuration.onError) !== null && _configuration$onErro !== void 0 && _configuration$onErro[_context4.t0.name])) {
+                      _context4.next = 22;
                       break;
                     }
-                    setError((_configuration$onErro2 = configuration.onError) === null || _configuration$onErro2 === void 0 ? void 0 : _configuration$onErro2[_context3.t0.name]);
-                    return _context3.abrupt("return", 0);
+                    setError((_configuration$onErro2 = configuration.onError) === null || _configuration$onErro2 === void 0 ? void 0 : _configuration$onErro2[_context4.t0.name]);
+                    return _context4.abrupt("return", 0);
                   case 22:
-                    setError(_context3.t0.message);
-                    return _context3.abrupt("return", 0);
+                    setError(_context4.t0.message);
+                    return _context4.abrupt("return", 0);
                   case 24:
                     if (deleteResult) {
-                      _context3.next = 27;
+                      _context4.next = 27;
                       break;
                     }
                     setError('Fehler beim löschen eines Elementes.');
-                    return _context3.abrupt("return", 1);
+                    return _context4.abrupt("return", 1);
                   case 27:
-                    (_configuration$rowKey = configuration.rowKey) !== null && _configuration$rowKey !== void 0 ? _configuration$rowKey : '_id';
                     deletedIndex = newData.findIndex(function (d) {
-                      var _configuration$rowKey2, _configuration$rowKey3;
-                      return goTroughObject(d, (_configuration$rowKey2 = (_configuration$rowKey3 = configuration.rowKey) === null || _configuration$rowKey3 === void 0 ? void 0 : _configuration$rowKey3.split('.')) !== null && _configuration$rowKey2 !== void 0 ? _configuration$rowKey2 : ['_id']) == id;
+                      var _configuration$rowKey, _configuration$rowKey2;
+                      return goTroughObject(d, (_configuration$rowKey = (_configuration$rowKey2 = configuration.rowKey) === null || _configuration$rowKey2 === void 0 ? void 0 : _configuration$rowKey2.split('.')) !== null && _configuration$rowKey !== void 0 ? _configuration$rowKey : ['_id']) == id;
                     });
                     newData.splice(deletedIndex, 1);
                     initDeletedIndex = newInitData === null || newInitData === void 0 ? void 0 : newInitData.findIndex(function (d) {
-                      var _configuration$rowKey4, _configuration$rowKey5;
-                      return goTroughObject(d, (_configuration$rowKey4 = (_configuration$rowKey5 = configuration.rowKey) === null || _configuration$rowKey5 === void 0 ? void 0 : _configuration$rowKey5.split('.')) !== null && _configuration$rowKey4 !== void 0 ? _configuration$rowKey4 : ['_id']) == id;
+                      var _configuration$rowKey3, _configuration$rowKey4;
+                      return goTroughObject(d, (_configuration$rowKey3 = (_configuration$rowKey4 = configuration.rowKey) === null || _configuration$rowKey4 === void 0 ? void 0 : _configuration$rowKey4.split('.')) !== null && _configuration$rowKey3 !== void 0 ? _configuration$rowKey3 : ['_id']) == id;
                     });
                     newInitData === null || newInitData === void 0 || newInitData.splice(initDeletedIndex, 1);
                     deleted++;
-                  case 33:
+                  case 32:
                   case "end":
-                    return _context3.stop();
+                    return _context4.stop();
                 }
               }, _loop, null, [[7, 16]]);
             });
             index = 0;
           case 9:
             if (!(index < state.selected.length)) {
-              _context4.next = 19;
+              _context5.next = 19;
               break;
             }
-            return _context4.delegateYield(_loop(index), "t0", 11);
+            return _context5.delegateYield(_loop(index), "t0", 11);
           case 11:
-            _ret = _context4.t0;
+            _ret = _context5.t0;
             if (!(_ret === 0)) {
-              _context4.next = 14;
+              _context5.next = 14;
               break;
             }
-            return _context4.abrupt("break", 19);
+            return _context5.abrupt("break", 19);
           case 14:
             if (!(_ret === 1)) {
-              _context4.next = 16;
+              _context5.next = 16;
               break;
             }
-            return _context4.abrupt("continue", 16);
+            return _context5.abrupt("continue", 16);
           case 16:
             index++;
-            _context4.next = 9;
+            _context5.next = 9;
             break;
           case 19:
             total = state.pagination.total - deleted;
             pages = Math.ceil(total / state.pagination.pageSize);
             current = state.pagination.current > pages ? pages : state.pagination.current;
             if (!(state.pagination.current > pages && filterServerSide || state.selected.length === 0)) {
-              _context4.next = 28;
+              _context5.next = 28;
               break;
             }
-            _context4.next = 25;
+            _context5.next = 25;
             return apiHandler.readList(parentMapping || configuration.mapping, mapping, _objectSpread$g({
               pagination: _objectSpread$g(_objectSpread$g({}, state.pagination), {}, {
                 current: current
               }),
               columns: configuration.columns,
-              filters: _objectSpread$g(_objectSpread$g(_objectSpread$g(_objectSpread$g(_objectSpread$g(_objectSpread$g({}, filterData.filters), globalFilter.search), !(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) ? globalFilter.toggle : undefined), globalFilter.select), globalFilter.timeStamp), globalFilter["default"]),
+              filters: _objectSpread$g(_objectSpread$g(_objectSpread$g(_objectSpread$g(_objectSpread$g(_objectSpread$g({}, 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"]),
               sorter: filterData.sorter
-            }, 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 ? {
+            }, 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 ? {
               genericProps: globalFilter.toggle
             } : undefined));
           case 25:
-            data = _context4.sent;
+            data = _context5.sent;
             newData = data.data;
             total = data.total;
           case 28:
@@ -25914,17 +26802,17 @@ function useTableData (_ref) {
             }));
           case 30:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee3);
+      }, _callee4);
     }));
     return function onDelete() {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
   var onGlobalFilterSelect = function onGlobalFilterSelect(value) {
-    var _configuration$filter19;
-    if (!((_configuration$filter19 = configuration.filter) !== null && _configuration$filter19 !== void 0 && _configuration$filter19.select)) {
+    var _configuration$filter20;
+    if (!((_configuration$filter20 = configuration.filter) !== null && _configuration$filter20 !== void 0 && _configuration$filter20.select)) {
       LOG$2.error(new DivaError('No global select filter defiend'));
       return;
     }
@@ -25940,14 +26828,14 @@ function useTableData (_ref) {
     }, filterData), newGlobalFilter);
   };
   var onGlobalFilterToggle = function onGlobalFilterToggle() {
-    var _configuration$filter20;
-    if (!((_configuration$filter20 = configuration.filter) !== null && _configuration$filter20 !== void 0 && _configuration$filter20.toggle)) {
+    var _configuration$filter21;
+    if (!((_configuration$filter21 = configuration.filter) !== null && _configuration$filter21 !== void 0 && _configuration$filter21.toggle)) {
       LOG$2.error(new DivaError('No global toggle filter defined'));
       return;
     }
     var toggleFilter = {};
     configuration.filter.toggle.fields.forEach(function (f) {
-      return toggleFilter[f] = [configuration.filter.toggle.globalValue ? root.getGlobalValue(configuration.filter.toggle.globalValue) : true, 'eq', 1];
+      return toggleFilter[f] = [configuration.filter.toggle.globalValue ? root.getGlobalValue(configuration.filter.toggle.globalValue) : true, 'eq', configuration.filter.toggle.isAnd ? 0 : 1];
     });
     var newGlobalFilter = _objectSpread$g(_objectSpread$g({}, globalFilter), {}, {
       toggle: globalFilter.toggle ? undefined : toggleFilter
@@ -25955,11 +26843,14 @@ function useTableData (_ref) {
     setGlobaFilter(newGlobalFilter);
     onChange(_objectSpread$g({
       pagination: state.pagination
-    }, filterData), newGlobalFilter);
+    }, filterData), newGlobalFilter, undefined, true);
+  };
+  var resetToggle = function resetToggle() {
+    if (globalFilter !== null && globalFilter !== void 0 && globalFilter.toggle) onGlobalFilterToggle();
   };
   var onGlobalFilterSearch = function onGlobalFilterSearch(value) {
-    var _configuration$filter21;
-    if (!((_configuration$filter21 = configuration.filter) !== null && _configuration$filter21 !== void 0 && _configuration$filter21.search)) {
+    var _configuration$filter22;
+    if (!((_configuration$filter22 = configuration.filter) !== null && _configuration$filter22 !== void 0 && _configuration$filter22.search)) {
       LOG$2.error(new DivaError('No global search filter defiend'));
       return;
     }
@@ -25967,12 +26858,12 @@ function useTableData (_ref) {
       search: {}
     });
     if (value) {
-      var _configuration$filter22;
-      (_configuration$filter22 = configuration.filter) === null || _configuration$filter22 === void 0 || _configuration$filter22.search.fields.forEach(function (f) {
+      var _configuration$filter23;
+      (_configuration$filter23 = configuration.filter) === null || _configuration$filter23 === void 0 || _configuration$filter23.search.fields.forEach(function (f) {
         if (typeof f == 'string') {
-          newGlobalFilter.search[f] = [value, 'contains', 0];
+          newGlobalFilter.search[f] = [value, 'contains', 1]; //normally global search should be or, so 1
         } else {
-          newGlobalFilter.search[f[0]] = [value, f[1], 0];
+          newGlobalFilter.search[f[0]] = [value, f[1], 1];
         }
       });
     }
@@ -25982,8 +26873,8 @@ function useTableData (_ref) {
     }, filterData), newGlobalFilter);
   };
   var onGlobalFilterPeriod = function onGlobalFilterPeriod(from, to) {
-    var _configuration$filter23;
-    if (!((_configuration$filter23 = configuration.filter) !== null && _configuration$filter23 !== void 0 && _configuration$filter23.period)) {
+    var _configuration$filter24;
+    if (!((_configuration$filter24 = configuration.filter) !== null && _configuration$filter24 !== void 0 && _configuration$filter24.period)) {
       LOG$2.error(new DivaError('No global period filter defiend'));
       return;
     }
@@ -26005,7 +26896,9 @@ function useTableData (_ref) {
     onUpdate: onUpdate,
     onDelete: onDelete,
     onSelect: onSelect,
+    getDataById: getDataById,
     triggerRefresh: triggerRefresh,
+    resetToggle: resetToggle,
     onSelectedCatalog: onSelectedCatalog,
     error: error,
     catalogItem: catalogItem,
@@ -26324,7 +27217,7 @@ var AGChart = function AGChart(_ref) {
           padding: '50px'
         },
         className: root.contentStore.theme == 'darkmode' ? 'ag-theme-alpine-dark' : 'ag-theme-alpine',
-        children: /*#__PURE__*/jsx(AgChartsReact, {
+        children: /*#__PURE__*/jsx(AgCharts, {
           options: {
             data: dt,
             title: {
@@ -26673,9 +27566,7 @@ var CustomInput = function CustomInput(_ref) {
     })]
   });
 };
-var CustomInput$1 = observer(CustomInput, {
-  forwardRef: true
-});
+var CustomInput$1 = observer(CustomInput);
 
 function useTextData (_ref) {
   var id = _ref.id;
@@ -26709,9 +27600,7 @@ var CustomText = function CustomText(_ref) {
     });
   }
 };
-var CustomText$1 = observer(CustomText, {
-  forwardRef: true
-});
+var CustomText$1 = observer(CustomText);
 
 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; }
@@ -27488,15 +28377,16 @@ var BreadCrumbsTrigger = function BreadCrumbsTrigger(_ref) {
         return e.stopPropagation();
       },
       children: /*#__PURE__*/jsx(Breadcrumb, {
-        children: breadcrumbs.map(function (data) {
-          return /*#__PURE__*/jsx(Breadcrumb.Item, {
-            className: classnames(breadcrumb, root.dataStore.selectedOrganizationId === data.id ? selected : undefined, !data.readPermission ? disabled : undefined),
+        items: breadcrumbs.map(function (data) {
+          return {
+            key: data.id,
+            breadcrumbName: data.displayName,
             onClick: function onClick() {
               var _root$dataStore;
               return root === null || root === void 0 || (_root$dataStore = root.dataStore) === null || _root$dataStore === void 0 ? void 0 : _root$dataStore.setSelectedOrganizationId(data.id);
             },
-            children: data.displayName
-          }, data.id);
+            className: classnames(breadcrumb, root.dataStore.selectedOrganizationId === data.id ? selected : undefined, !data.readPermission ? disabled : undefined)
+          };
         })
       })
     })]
@@ -27709,6 +28599,7 @@ var ZoomWrapper = function ZoomWrapper(_ref) {
         }), /*#__PURE__*/jsx(TransformComponent, {
           wrapperStyle: {
             width: '100%',
+            maxHeight: 'calc(60vh - 135px)',
             cursor: isZooming ? 'nesw-resize' : isGrapping ? 'grabbing' : 'grab'
           },
           wrapperProps: {
@@ -28835,7 +29726,8 @@ function useModule (currentModules) {
       },
       type: 'Configurator',
       id: 'WYSIWYG',
-      startWidth: 600
+      startWidth: 600,
+      defaultPinned: true
     });
     root.contentStore.tools = tools;
     return function () {
@@ -29960,7 +30852,7 @@ var ExclusivityFeatureOption = function ExclusivityFeatureOption() {
   });
 };
 var ExclusivityTable = function ExclusivityTable(_ref) {
-  var _ref2;
+  var _selectedSerie$series;
   var type = _ref.type,
     config = _ref.config;
   var _useTranslation = useTranslation(),
@@ -30024,7 +30916,7 @@ var ExclusivityTable = function ExclusivityTable(_ref) {
         })]
       })
     }), showTable() && /*#__PURE__*/jsx(Spreadsheet, {
-      gridId: (_ref2 = 'crud-grid_exclusivity_' + type + (selectedSerie === null || selectedSerie === void 0 ? void 0 : selectedSerie.seriesName.DE)) !== null && _ref2 !== void 0 ? _ref2 : '',
+      gridId: 'crud-grid_exclusivity_' + type + ((_selectedSerie$series = selectedSerie === null || selectedSerie === void 0 ? void 0 : selectedSerie.seriesName.DE) !== null && _selectedSerie$series !== void 0 ? _selectedSerie$series : ''),
       jwt: jwt,
       applicationData: applicationData,
       configuration: {
@@ -30401,8 +31293,8 @@ function Detail(_ref) {
           targetField: (_ob$sourceField = ob.sourceField) !== null && _ob$sourceField !== void 0 ? _ob$sourceField : ob.sourceValue
         });
       });
-      data = aplyMapping({
-        mapable: {},
+      data = applyMapping({
+        mappable: {},
         mappingData: data,
         mapping: {
           map: map,
@@ -30456,8 +31348,10 @@ function Detail(_ref) {
       },
       width: (_info$width = info.width) !== null && _info$width !== void 0 ? _info$width : left ? '800px' : '1000px',
       title: info.title,
-      bodyStyle: {
-        padding: 0
+      styles: {
+        body: {
+          padding: 0
+        }
       },
       footer: info.footer != false ? /*#__PURE__*/jsxs("div", {
         style: {
@@ -30503,8 +31397,8 @@ function Detail(_ref) {
             apiInterface: info.apiInterface,
             ref: ref,
             id: info.configurationId,
-            data: info.mapping ? aplyMapping({
-              mapable: {},
+            data: info.mapping ? applyMapping({
+              mappable: {},
               mapping: info.mapping,
               mappingData: info.data,
               rootStore: root
@@ -30515,8 +31409,8 @@ function Detail(_ref) {
             setCanSave: setCanSave
           }), info.type == 'RoleSelector' && /*#__PURE__*/jsx(RoleSelector$1, {
             ref: ref,
-            data: info.mapping ? aplyMapping({
-              mapable: {},
+            data: info.mapping ? applyMapping({
+              mappable: {},
               mapping: info.mapping,
               mappingData: info.data,
               rootStore: root
@@ -30525,8 +31419,8 @@ function Detail(_ref) {
             onChange: onChange
           }), info.type == 'RelationSelector' && /*#__PURE__*/jsx(RelationSelector$1, {
             ref: ref,
-            data: info.mapping ? aplyMapping({
-              mapable: {},
+            data: info.mapping ? applyMapping({
+              mappable: {},
               mapping: info.mapping,
               mappingData: info.data,
               rootStore: root
@@ -30539,8 +31433,8 @@ function Detail(_ref) {
             ref: ref,
             id: info.configurationId,
             onChange: onChange,
-            data: info.mapping ? aplyMapping({
-              mapable: {},
+            data: info.mapping ? applyMapping({
+              mappable: {},
               mapping: info.mapping,
               mappingData: info.data,
               rootStore: root
@@ -30634,8 +31528,8 @@ function Modal() {
   };
   var data = useMemo(function () {
     var _info$action;
-    return (_info$action = info.action) !== null && _info$action !== void 0 && _info$action.mapping ? aplyMapping({
-      mapable: {},
+    return (_info$action = info.action) !== null && _info$action !== void 0 && _info$action.mapping ? applyMapping({
+      mappable: {},
       mapping: info.action.mapping,
       mappingData: info.data,
       rootStore: root
@@ -30898,7 +31792,8 @@ var ArticleSelection = function ArticleSelection(_ref) {
     }), root.contentStore.toolPinned && /*#__PURE__*/jsx(PushpinFilled, {
       onClick: function onClick() {
         return root.contentStore.toolPinned = !root.contentStore.toolPinned;
-      }
+      },
+      className: button
     }), /*#__PURE__*/jsx(Select$2, {
       value: articleList.find(function (a) {
         return a.value == articleCodex;
@@ -31085,6 +31980,7 @@ function useWysiwyg$1(_ref) {
         hideMobileFolder: true,
         showSettingsFolder: true,
         hideRalColorFilter: false,
+        showOptionCodexInOptionHeader: true,
         hideSearchBar: false,
         alwaysShowSearchBar: true,
         displayMetaDatas: ['codex'],
@@ -31445,6 +32341,7 @@ var Toolbar = function Toolbar(_ref) {
       });
       if (_tool) {
         root.contentStore.openedToolId = _tool.id;
+        root.contentStore.toolPinned = !!_tool.defaultPinned;
         root.contentStore.hideTools = false;
       }
     }
@@ -31474,6 +32371,7 @@ var Toolbar = function Toolbar(_ref) {
           onClick: function onClick() {
             if (root.contentStore.openedToolId != t.id) {
               root.contentStore.openedToolId = t.id;
+              root.contentStore.toolPinned = !!t.defaultPinned;
               root.contentStore.hideTools = false;
             } else {
               root.contentStore.hideTools = !root.contentStore.hideTools;