@crystaldesign/diva-backoffice 24.12.0-rc.0 → 24.13.0-beta.1

package/build/esm/index.js

@@ -373,23 +373,21 @@ function parseFilter(filters, prefilter) {
         ands.push([field, [values[i], values[i + 1]]]);
       }
     } else {
-      //filter[1][2]; // [field, [value, operator, or?]]
-      //The third value is the 'or'-flag, unless it is a 'in'-operator,
-      //then the array can contain more than 3 values and the last value is the 'in'-operator.
-      //The 'or'-flag is either a boolean, or a number. If it is a number it defines to which 'or'-group the filter belongs.
+      var or = values[2]; //filter[1][2]; // [field, [value, operator, or?]]
+      var index = or === true || or === 0 ? false : or;
       var inFilter = values[values.length - 1] === 'in';
-      var or = !inFilter ? values[2] : undefined;
-      var orIndex = typeof or === 'number' ? or : 0;
-      if (inFilter) {
-        var inValues = values.slice(0, values.length - 1);
-        ands.push([field, [inValues, 'in']]);
-      } else if (or) {
-        while (ors.length <= orIndex) {
-          ors.push([]);
+      if (index == undefined || index === false || inFilter) {
+        if (inFilter) {
+          var inValues = values.slice(0, values.length - 1);
+          ands.push([field, [inValues, 'in']]);
+        } else {
+          ands.push(filter);
         }
-        ors[orIndex].push(filter);
       } else {
-        ands.push(filter);
+        while (ors.length <= index) {
+          ors.push([]);
+        }
+        ors[index].push(filter);
       }
     }
   });

package/build/types/backoffice/src/utils/parseServersideFilters.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"parseServersideFilters.d.ts","sourceRoot":"","sources":["../../../../../src/utils/parseServersideFilters.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,MAAM,WAAW,eAAe,CAAC,CAAC,GAAG,GAAG;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,GAAG,CAAC;IAChB,OAAO,CAAC,EAAE,EAAE,CAAC;IACb,MAAM,CAAC,EAAE,GAAG,CAAC;IAEb,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,CAAC,OAAO,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,EAAE,eAAe,UA2DnH;AAQD,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,EAAE,SAAS,CAAC,EAAE,MAAM,UAuFpF"}
+{"version":3,"file":"parseServersideFilters.d.ts","sourceRoot":"","sources":["../../../../../src/utils/parseServersideFilters.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,MAAM,WAAW,eAAe,CAAC,CAAC,GAAG,GAAG;IACtC,OAAO,EAAE,MAAM,CAAC;IAChB,UAAU,EAAE,GAAG,CAAC;IAChB,OAAO,CAAC,EAAE,EAAE,CAAC;IACb,MAAM,CAAC,EAAE,GAAG,CAAC;IAEb,OAAO,CAAC,EAAE,MAAM,EAAE,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,CAAC;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,CAAC,OAAO,WAAW,EAAE,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,EAAE,eAAe,UA2DnH;AAQD,wBAAgB,WAAW,CAAC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,EAAE,GAAG,IAAI,CAAC,EAAE,SAAS,CAAC,EAAE,MAAM,UAsFpF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystaldesign/diva-backoffice",
-  "version": "24.12.0-rc.0",
+  "version": "24.13.0-beta.1",
   "license": "COMMERCIAL",
   "devDependencies": {
     "@testing-library/jest-dom": "^6.5.0",
@@ -15,13 +15,13 @@
   "dependencies": {
     "@ant-design/icons": "5.4.0",
     "@babel/runtime": "7.24.7",
-    "@crystaldesign/content-box": "24.12.0-rc.0",
-    "@crystaldesign/content-item": "24.12.0-rc.0",
-    "@crystaldesign/diva-core": "24.12.0-rc.0",
-    "@crystaldesign/diva-utils": "24.12.0-rc.0",
-    "@crystaldesign/media-upload": "24.12.0-rc.0",
-    "@crystaldesign/rtf-editor": "24.12.0-rc.0",
-    "@crystaldesign/spreadsheet": "24.12.0-rc.0",
+    "@crystaldesign/content-box": "24.13.0-beta.1",
+    "@crystaldesign/content-item": "24.13.0-beta.1",
+    "@crystaldesign/diva-core": "24.13.0-beta.1",
+    "@crystaldesign/diva-utils": "24.13.0-beta.1",
+    "@crystaldesign/media-upload": "24.13.0-beta.1",
+    "@crystaldesign/rtf-editor": "24.13.0-beta.1",
+    "@crystaldesign/spreadsheet": "24.13.0-beta.1",
     "@google/model-viewer": "3.5.0",
     "ag-charts-community": "^10.1.0",
     "ag-charts-react": "^10.1.0",
@@ -51,5 +51,5 @@
   },
   "module": "build/esm/index.js",
   "types": "./build/types/backoffice/src/index.d.ts",
-  "gitHead": "e5a7158c3de0f65d1a1ce90e5c3a0f680fab56ed"
+  "gitHead": "890fd64a8b0f1f53b90abb01093113754c065b7e"
 }