@crystaldesign/diva-backoffice 24.12.0-beta.23 → 24.12.0-beta.25

package/build/esm/index.js

@@ -64,6 +64,8 @@ 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 InfoCircleOutlined from '@ant-design/icons/InfoCircleOutlined';
 import merge from 'lodash/merge';
 import cloneDeep from 'lodash/cloneDeep';
@@ -145,16 +147,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$d = 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);
@@ -194,10 +196,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);
@@ -225,7 +227,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);
@@ -268,10 +270,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++) {
@@ -289,7 +291,7 @@ function aplyMapping (_ref) {
     }
     return returnValue;
   } catch (e) {
-    LOG$d.debug('Mapabledata', mapable);
+    LOG$d.debug('Mapabledata', mappable);
     throw e;
   }
 }
@@ -320,8 +322,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) {
@@ -358,7 +373,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) {
@@ -596,8 +611,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,
@@ -610,8 +625,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
@@ -715,8 +730,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,
@@ -724,8 +739,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,
@@ -736,8 +751,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,
@@ -834,8 +849,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,
@@ -843,8 +858,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: [{
@@ -1032,8 +1047,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,
@@ -1049,8 +1064,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,
@@ -1111,8 +1126,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,
@@ -1276,8 +1291,8 @@ var _default$b = /*#__PURE__*/function (_ApiHandler) {
                 _context.next = 8;
                 break;
               }
-              data = aplyMapping({
-                mapable: {},
+              data = applyMapping({
+                mappable: {},
                 mapping: this.configuration.targetMapping,
                 rootStore: this._rootStore
               });
@@ -1347,8 +1362,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,
@@ -1392,8 +1407,8 @@ var _default$b = /*#__PURE__*/function (_ApiHandler) {
                 _context3.next = 6;
                 break;
               }
-              data = aplyMapping({
-                mapable: {},
+              data = applyMapping({
+                mappable: {},
                 mapping: this.configuration.targetMapping,
                 mappingData: {
                   url: '',
@@ -1583,8 +1598,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
@@ -2514,6 +2529,207 @@ function loadConfiguration(t, root, config, lang) {
         }
       }
     },
+    TableTaskStatusVersioning: {
+      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.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.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.status'),
+        field: 'progress.status',
+        filter: 'search',
+        width: 200
+      }, {
+        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.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%2B%5B%7BtaskType%2Ceq%2CRETAIL_VERSIONING%7D%2C%7BtaskType%2Ceq%2CSUPPLIER_VERSIONING%7D%5D%5D',
+          fields: true,
+          filterServerSide: true
+        },
+        "delete": '${adminService}/taskStatus/${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'),
+      apiInterface: {
+        update: {
+          url: '${adminService}/taskStatus/{_id}',
+          method: 'PATCH',
+          jsonPatch: true
+        }
+      },
+      triggerRerender: 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: 'date',
+        disabled: true
+      }, {
+        name: 'startTime',
+        label: t('backoffice.form.taskstatus.startTime'),
+        type: 'input',
+        readonly: true
+      }, {
+        name: 'endTime',
+        label: t('backoffice.form.taskstatus.endTime'),
+        type: 'input',
+        readonly: true
+      }, {
+        name: 'lastUpdated',
+        label: t('backoffice.form.taskstatus.lastUpdated'),
+        type: 'input',
+        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: 'select',
+        values: ['Created', 'Waiting', 'Cancel', 'Cancelled', 'InProgress', 'Done', 'Error', 'DoneWithWarnings'],
+        mode: 'single'
+      }, {
+        name: 'cancelledByUser.mainEmail',
+        label: t('backoffice.form.taskstatus.cancelledByUser.mainEmail'),
+        type: 'input',
+        readonly: true
+      }, {
+        name: 'progress.percentage',
+        label: t('backoffice.form.taskstatus.progress.percentage'),
+        type: 'input',
+        readonly: true
+      }, {
+        name: 'progress.step',
+        label: t('backoffice.form.taskstatus.progress.step'),
+        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,
@@ -2639,11 +2855,11 @@ function loadConfiguration(t, root, config, lang) {
       rowAction: [{
         actionType: 'Detail',
         type: 'Form',
-        id: 'FormOrganizationDetailes',
+        id: 'FormClientRelationDetails',
         title: t('backoffice.edit')
       }]
     },
-    FormOrganizationDetailes: {
+    FormClientRelationDetails: {
       type: 'Form',
       title: t('backoffice.form.createclientrelation.title'),
       apiInterface: {
@@ -7175,7 +7391,6 @@ function loadConfiguration(t, root, config, lang) {
         mode: 'multiple',
         values: ['de', 'en', 'fr', 'it'],
         permission: 'backoffice_admin_organizations',
-        canSetToUndefined: true,
         hidden: function hidden(data) {
           return (data === null || data === void 0 ? void 0 : data.type) === undefined || (data === null || data === void 0 ? void 0 : data.parentType) === 'SUPPLIER' && (data === null || data === void 0 ? void 0 : data.type) !== 'SUPPLIER';
         },
@@ -8132,6 +8347,9 @@ function loadConfiguration(t, root, config, lang) {
           options: [{
             value: 'HQ',
             label: 'HQ'
+          }, {
+            value: 'MASTER',
+            label: 'MASTER'
           }, {
             value: 'SPIN',
             label: 'SPIN'
@@ -8321,7 +8539,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',
@@ -8432,7 +8650,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',
@@ -8676,6 +8894,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'),
@@ -8693,7 +9053,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',
@@ -8828,7 +9188,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',
@@ -9013,7 +9373,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'
       }, {
@@ -9139,8 +9499,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],
@@ -11487,7 +11857,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,
@@ -11519,7 +11889,7 @@ function aplyRule(_ref) {
             result = rule.match.value == sourceValue;
           }
         } else if (rule.or) {
-          result = aplyRule({
+          result = applyRule({
             rules: rule.or,
             data: data,
             rootStore: rootStore,
@@ -11553,7 +11923,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,
@@ -11572,6 +11942,10 @@ function getIcon(icon) {
   switch (icon) {
     case 'StopFilled':
       return /*#__PURE__*/jsx(StopFilled, {});
+    case 'FileZipOutlined':
+      return /*#__PURE__*/jsx(FileZipOutlined, {});
+    case 'ClockCircleOutlined':
+      return /*#__PURE__*/jsx(ClockCircleOutlined, {});
     case 'ExclamationCircleFilled':
       return /*#__PURE__*/jsx(ExclamationCircleFilled, {});
     case 'ApartmentOutlined':
@@ -12026,7 +12400,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
@@ -12045,7 +12419,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
@@ -12262,6 +12636,17 @@ 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: 'TableAllUsers',
     path: 'users',
@@ -12975,8 +13360,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,
@@ -14895,8 +15280,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,
@@ -17492,6 +17877,7 @@ function getElement(item, setCanSave, state, absoluteName, _onChange, _onError,
       });
     case 'date':
       return /*#__PURE__*/jsx(DatePicker, {
+        format: "DD/MM/YYYY",
         disabled: disabled
       });
     case 'subTitle':
@@ -19540,7 +19926,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
@@ -19555,7 +19941,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
@@ -22403,8 +22789,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
@@ -23545,7 +23931,7 @@ dayjs.extend(weekYear);
 Select$1.Option;
 var LOG$3 = getLogger('Backoffice', 'BaseTable');
 var TableWrapper = function TableWrapper(_ref) {
-  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$selected2, _state$configuration$9, _state$configuration$10, _state$configuration$11, _state$configuration$14, _state$configuration$15, _state$configuration$16;
+  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),
@@ -23743,14 +24129,16 @@ var TableWrapper = function TableWrapper(_ref) {
               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$7 = state.configuration.deleteAction) !== null && _state$configuration$7 !== void 0 && (_state$configuration$8 = _state$configuration$7.disabled) !== null && _state$configuration$8 !== void 0 && _state$configuration$8.call(_state$configuration$7, ((_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$9 = state.configuration.bulkActions) === null || _state$configuration$9 === void 0 ? void 0 : _state$configuration$9.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,
@@ -23761,26 +24149,26 @@ var TableWrapper = function TableWrapper(_ref) {
                   setProgressBarPercentage: setProgressBarPercentage
                 } : undefined
               }, action.id);
-            }), state.configuration.createAction && checkPermission(state.configuration.createAction.permission) && !((_state$configuration$10 = (_state$configuration$11 = state.configuration.createAction).hidden) !== null && _state$configuration$10 !== void 0 && _state$configuration$10.call(_state$configuration$11, 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$12, _state$configuration$13;
+                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$12 = state.configuration.createAction) === null || _state$configuration$12 === void 0 || (_state$configuration$13 = _state$configuration$12.callback) === null || _state$configuration$13 === void 0 || _state$configuration$13.call(_state$configuration$12, 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$14 = (_state$configuration$15 = state.configuration.createAction).disabled) === null || _state$configuration$14 === void 0 ? void 0 : _state$configuration$14.call(_state$configuration$15, 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
@@ -23820,13 +24208,13 @@ var TableWrapper = function TableWrapper(_ref) {
       className: "andt-table",
       scroll: {
         x: '100%',
-        y: (_state$configuration$16 = state.configuration.height) !== null && _state$configuration$16 !== void 0 ? _state$configuration$16 : '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$17, _state$configuration$18;
-        return goTroughObject(dataRow, (_state$configuration$17 = (_state$configuration$18 = state.configuration.rowKey) === null || _state$configuration$18 === void 0 ? void 0 : _state$configuration$18.split('.')) !== null && _state$configuration$17 !== void 0 ? _state$configuration$17 : ['_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,
@@ -23867,13 +24255,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,
@@ -23890,13 +24280,13 @@ 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$22;
+  var _state$configuration$24;
   var state = _ref3.state;
   var root = useStore();
   new _default$d({
@@ -23905,13 +24295,13 @@ function CopyButton(_ref3) {
   }, root);
   var onCopy = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-      var _state$configuration$19;
+      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$19 = state.configuration.copyAction) === null || _state$configuration$19 === void 0 ? void 0 : _state$configuration$19.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;) {
@@ -23946,13 +24336,13 @@ function CopyButton(_ref3) {
   }();
   var onCopyAction = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
-      var _state$configuration$20, _state$configuration$21;
+      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$20 = state.configuration.createAction) === null || _state$configuration$20 === void 0 ? void 0 : _state$configuration$20.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;
             }
@@ -23963,8 +24353,8 @@ function CopyButton(_ref3) {
             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
@@ -23976,7 +24366,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$21 = state.configuration.createAction) === null || _state$configuration$21 === void 0 ? void 0 : _state$configuration$21.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) {
@@ -24014,7 +24404,7 @@ function CopyButton(_ref3) {
   return /*#__PURE__*/jsx(Button, {
     type: "primary",
     onClick: onCopy,
-    disabled: state.selected.length == 0 || state.selected.length > 1 && ((_state$configuration$22 = state.configuration.copyAction) === null || _state$configuration$22 === void 0 ? void 0 : _state$configuration$22.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')
   });
 }
@@ -24841,7 +25231,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,
@@ -25012,7 +25402,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;
@@ -25087,11 +25477,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,
@@ -25417,7 +25807,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) {
@@ -25533,7 +25924,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
@@ -25541,8 +25932,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,
@@ -25667,7 +26058,7 @@ function useTableData (_ref) {
   }();
   var onChange = /*#__PURE__*/function () {
     var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime.mark(function _callee3(p) {
-      var _configuration$filter10, _configuration$filter11, _configuration$filter12, _prefilter$select, _configuration$filter13, _configuration$filter14;
+      var _configuration$filter10, _configuration$filter11, _prefilter$select, _configuration$filter12, _configuration$filter13;
       var prefilter,
         refresh,
         clearSelection,
@@ -25676,11 +26067,14 @@ function useTableData (_ref) {
         currentFilterHash,
         currentPagination,
         currentUrl,
+        _configuration$filter14,
         _configuration$filter15,
+        _prefilter$toggle,
+        _parseFilter,
         ssf,
         data,
         _data3,
-        _aplyFilterAndSortati2,
+        _applyFilterAndSortat2,
         _data4,
         pagination,
         _args3 = arguments;
@@ -25694,7 +26088,7 @@ function useTableData (_ref) {
               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$filter10 = configuration.filter) !== null && _configuration$filter10 !== void 0 && (_configuration$filter10 = _configuration$filter10.toggle) !== null && _configuration$filter10 !== void 0 && _configuration$filter10.inQuery) ? prefilter.toggle : undefined), ((_configuration$filter11 = configuration.filter) === null || _configuration$filter11 === void 0 || (_configuration$filter11 = _configuration$filter11.select) === null || _configuration$filter11 === void 0 ? void 0 : _configuration$filter11.applyDefaultValue) !== false || ((_configuration$filter12 = configuration.filter) === null || _configuration$filter12 === void 0 || (_configuration$filter12 = _configuration$filter12.select) === null || _configuration$filter12 === void 0 ? void 0 : _configuration$filter12.defaultValue) !== ((_prefilter$select = prefilter.select) === null || _prefilter$select === void 0 || (_prefilter$select = _prefilter$select[(_configuration$filter13 = (_configuration$filter14 = configuration.filter) === null || _configuration$filter14 === void 0 || (_configuration$filter14 = _configuration$filter14.select) === null || _configuration$filter14 === void 0 ? void 0 : _configuration$filter14.filterField) !== null && _configuration$filter13 !== void 0 ? _configuration$filter13 : '']) === null || _prefilter$select === void 0 ? void 0 : _prefilter$select[0]) ? prefilter.select : undefined), prefilter.timeStamp), prefilter["default"]); //remove all null values
+            filterData = _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];
@@ -25715,11 +26109,11 @@ function useTableData (_ref) {
               columns: configuration.columns,
               filters: filterData,
               sorter: p.sorter
-            }, 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 ? {
+            }, 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);
             _context3.next = 14;
-            return apiHandler.readList(parentMapping || configuration.mapping, mapping, ssf);
+            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);
@@ -25741,12 +26135,12 @@ function useTableData (_ref) {
             currentData = _data3.data;
             setInitData(currentData);
           case 26:
-            _aplyFilterAndSortati2 = aplyFilterAndSortation(_objectSpread$g(_objectSpread$g({}, p), {}, {
+            _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 29:
@@ -25977,7 +26371,7 @@ function useTableData (_ref) {
     }
     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
@@ -26003,9 +26397,9 @@ function useTableData (_ref) {
       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];
         }
       });
     }
@@ -30434,8 +30828,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,
@@ -30538,8 +30932,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
@@ -30550,8 +30944,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
@@ -30560,8 +30954,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
@@ -30574,8 +30968,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
@@ -30669,8 +31063,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