@crystaldesign/diva-backoffice 24.4.0-beta.2 → 24.4.0-beta.20

package/build/esm/index.js

@@ -332,9 +332,9 @@ function parseFilter(filters, prefilter) {
         ands.push([field, [values[i], values[i + 1]]]);
       }
     } else {
-      var or = typeof values[2] == 'boolean'; //filter[1][2]; // [field, [value, operator, or?]]
-      var inFilter = !or && values[values.length - 1] === 'in';
+      var or = values[2]; //filter[1][2]; // [field, [value, operator, or?]]
       var index = or === true ? 0 : or;
+      var inFilter = values[values.length - 1] === 'in';
       if (index == undefined || index === false || inFilter) {
         if (inFilter) {
           var inValues = values.slice(0, values.length - 1);
@@ -1977,7 +1977,7 @@ function loadConfiguration(t, root, config, lang) {
           type: 'multiselect',
           values: [{
             value: 0,
-            label: 'renderjob.state.0'
+            label: 'renderjob.stateincart'
           }, {
             value: 1,
             groupedValues: [1, 2, 3],
@@ -1997,6 +1997,9 @@ function loadConfiguration(t, root, config, lang) {
         translationPrefix: 'renderjob.state',
         type: 'string',
         groupedValuesDisplayString: [{
+          values: [0],
+          text: t('renderjob.stateincart')
+        }, {
           values: [1, 2, 3],
           text: t('renderjob.state.1')
         }, {
@@ -2043,6 +2046,15 @@ function loadConfiguration(t, root, config, lang) {
         field: 'productName',
         sorter: 12,
         filter: 'advanced'
+      }, {
+        title: t('backoffice.table.invitations.organization'),
+        field: 'organizationName',
+        sorter: 1,
+        width: 200,
+        hidden: function hidden(_, globalFilter) {
+          var _globalFilter$toggle;
+          return !(globalFilter !== null && globalFilter !== void 0 && (_globalFilter$toggle = globalFilter.toggle) !== null && _globalFilter$toggle !== void 0 && (_globalFilter$toggle = _globalFilter$toggle['hierarchy']) !== null && _globalFilter$toggle !== void 0 && _globalFilter$toggle[0]);
+        }
       }, {
         title: t('backoffice.table.renderjobs.columns.created'),
         field: 'created',
@@ -2060,7 +2072,7 @@ function loadConfiguration(t, root, config, lang) {
       }],
       apiInterface: {
         read: {
-          list: '${mediaService}/renderjobs',
+          list: '${mediaService}/renderjobs?organizationId=${organizationId}',
           filterServerSide: true
         },
         update: {
@@ -2068,10 +2080,22 @@ function loadConfiguration(t, root, config, lang) {
           method: 'PATCH'
         }
       },
-      filter: {
-        "default": {
+      mapping: {
+        type: 'query',
+        map: [{
+          sourceField: 'hierarchy',
+          targetField: 'hierarchy'
+        }, {
           globalValue: 'selectedOrganizationId',
-          fields: ['organization']
+          targetField: 'organizationId'
+        }]
+      },
+      filter: {
+        toggle: {
+          fields: ['hierarchy'],
+          label: t('backoffice.table.allorgusers.filter.toggle.label'),
+          labelOff: t('backoffice.table.allorgusers.filter.toggle.labelOff'),
+          inQuery: true
         }
       },
       rowAction: [{
@@ -3903,8 +3927,8 @@ function loadConfiguration(t, root, config, lang) {
         sorter: 1,
         width: 200,
         hidden: function hidden(_, globalFilter) {
-          var _globalFilter$toggle;
-          return !(globalFilter !== null && globalFilter !== void 0 && (_globalFilter$toggle = globalFilter.toggle) !== null && _globalFilter$toggle !== void 0 && (_globalFilter$toggle = _globalFilter$toggle['hierarchy']) !== null && _globalFilter$toggle !== void 0 && _globalFilter$toggle[0]);
+          var _globalFilter$toggle2;
+          return !(globalFilter !== null && globalFilter !== void 0 && (_globalFilter$toggle2 = globalFilter.toggle) !== null && _globalFilter$toggle2 !== void 0 && (_globalFilter$toggle2 = _globalFilter$toggle2['hierarchy']) !== null && _globalFilter$toggle2 !== void 0 && _globalFilter$toggle2[0]);
         }
       }, {
         title: t('backoffice.table.invitations.mailsend'),
@@ -4104,8 +4128,8 @@ function loadConfiguration(t, root, config, lang) {
         field: 'organizationDisplayName',
         width: 150,
         hidden: function hidden(_, globalFilter) {
-          var _globalFilter$toggle2;
-          return !(globalFilter !== null && globalFilter !== void 0 && (_globalFilter$toggle2 = globalFilter.toggle) !== null && _globalFilter$toggle2 !== void 0 && (_globalFilter$toggle2 = _globalFilter$toggle2['hierarchy']) !== null && _globalFilter$toggle2 !== void 0 && _globalFilter$toggle2[0]);
+          var _globalFilter$toggle3;
+          return !(globalFilter !== null && globalFilter !== void 0 && (_globalFilter$toggle3 = globalFilter.toggle) !== null && _globalFilter$toggle3 !== void 0 && (_globalFilter$toggle3 = _globalFilter$toggle3['hierarchy']) !== null && _globalFilter$toggle3 !== void 0 && _globalFilter$toggle3[0]);
         }
       }, {
         title: t('backoffice.table.allorgusers.created'),
@@ -8609,6 +8633,15 @@ function loadConfiguration(t, root, config, lang) {
         defaultValue: true
       }]]
     },
+    FormPartlistArticlePrefix: {
+      type: 'Form',
+      title: 'Stücklisten Prefix',
+      items: [{
+        name: 'RetailPrefix',
+        label: 'Prefix',
+        type: 'input'
+      }]
+    },
     OrgTree: {
       type: 'OrgTree',
       expandAll: true,
@@ -12605,6 +12638,7 @@ var FileUploadWrapper = function FileUploadWrapper(_ref) {
     }), /*#__PURE__*/jsx(Spin, {
       spinning: loading,
       children: /*#__PURE__*/jsxs(AssetEditor, {
+        theme: root.contentStore.theme,
         createRef: false,
         disabled: !organizations.length,
         onChange: ( /*#__PURE__*/function () {
@@ -16836,7 +16870,7 @@ function StringCell (_ref) {
   };
   function getValueString(column) {
     var groupedValuesDisplayString = column.groupedValuesDisplayString;
-    if (groupedValuesDisplayString && record[column.field]) {
+    if (groupedValuesDisplayString !== undefined && record[column.field] !== undefined) {
       var foundValue = groupedValuesDisplayString.find(function (group) {
         return group.values.includes(record[column.field]);
       });

package/build/types/backoffice/src/ui/FileUploadBeta/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/FileUploadBeta/index.tsx"],"names":[],"mappings":"AASA,UAAU,KAAK;IACb,EAAE,EAAE,MAAM,CAAC;CACZ;;;;AAkFD,wBAA2C"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../src/ui/FileUploadBeta/index.tsx"],"names":[],"mappings":"AASA,UAAU,KAAK;IACb,EAAE,EAAE,MAAM,CAAC;CACZ;;;;AAmFD,wBAA2C"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystaldesign/diva-backoffice",
-  "version": "24.4.0-beta.2",
+  "version": "24.4.0-beta.20",
   "license": "COMMERCIAL",
   "devDependencies": {
     "@testing-library/jest-dom": "^5.15.0",
@@ -50,5 +50,5 @@
   },
   "module": "build/esm/index.js",
   "types": "./build/types/backoffice/src/index.d.ts",
-  "gitHead": "3d009878baffa37422e6682b4a289f332ed79aa8"
+  "gitHead": "b8af72521b2a2a407e05e506de1dd402a209d5e5"
 }