@crystaldesign/diva-backoffice 24.12.0-rc.7 → 24.12.0-rc.9

package/build/esm/index.js

@@ -356,6 +356,7 @@ function useFullTextSearch(filters) {
   });
 }
 function parseFilter(filters, prefilter) {
+  var _prefilter, _prefilter2;
   var ors = [];
   var ands = [];
   var res = '';
@@ -424,14 +425,18 @@ function parseFilter(filters, prefilter) {
       return "{".concat(field, ",").concat(type, ",").concat(value, "}");
     }).join(','));
   }
-  if (prefilter && res) {
-    return '[' + res + ',' + prefilter + ']';
+
+  //remove enclosing brackets so it can be added to the existing filter
+  if ((_prefilter = prefilter) !== null && _prefilter !== void 0 && _prefilter.startsWith('[') && (_prefilter2 = prefilter) !== null && _prefilter2 !== void 0 && _prefilter2.endsWith(']')) {
+    prefilter = prefilter.slice(1, -1);
   }
-  if (prefilter) {
-    return '[' + prefilter + ']';
+  if (prefilter && res) {
+    res = res + ',' + prefilter;
+  } else if (prefilter) {
+    res = prefilter;
   }
   if (res) {
-    return '[' + res + ']';
+    res = '[' + res + ']';
   }
   return res;
 }
@@ -17094,7 +17099,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: 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";
+var css_248z$l = ".custom-select-ESUJX {\n  width: 300px;\n}\n\n.custom-select-option-dUA7N.ant-select-item {\n  margin: 0px 12px;\n  padding: 0px;\n  border-bottom: 1px solid #ddd;\n}\n\n.custom-select-option-dUA7N .ant-select-item-option-content {\n  display: flex;\n  align-items: center;\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) {
@@ -26428,8 +26433,7 @@ 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) {
-    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];
+    return toggleFilter[f] = [toggleConfig.globalValue ? root.getGlobalValue(toggleConfig.globalValue) : true, 'eq', !toggleConfig.isAnd];
   });
   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) {
@@ -26992,7 +26996,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', configuration.filter.toggle.isAnd ? 0 : 1];
+      return toggleFilter[f] = [configuration.filter.toggle.globalValue ? root.getGlobalValue(configuration.filter.toggle.globalValue) : true, 'eq', !configuration.filter.toggle.isAnd];
     });
     var newGlobalFilter = _objectSpread$h(_objectSpread$h({}, globalFilter), {}, {
       toggle: globalFilter.toggle ? undefined : toggleFilter

package/build/types/backoffice/src/ui/Table/StandardTable/useTableData.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useTableData.d.ts","sourceRoot":"","sources":["../../../../../../../src/ui/Table/StandardTable/useTableData.ts"],"names":[],"mappings":"AAEA,OAAO,EAAsB,KAAK,EAAc,UAAU,EAA8B,MAAM,UAAU,CAAC;AAuBzG,MAAM,CAAC,OAAO,WAAW,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,EAAE,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAojBzF"}
+{"version":3,"file":"useTableData.d.ts","sourceRoot":"","sources":["../../../../../../../src/ui/Table/StandardTable/useTableData.ts"],"names":[],"mappings":"AAEA,OAAO,EAAsB,KAAK,EAAc,UAAU,EAA8B,MAAM,UAAU,CAAC;AAuBzG,MAAM,CAAC,OAAO,WAAW,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,EAAE,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CA+iBzF"}

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,UA2FpF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystaldesign/diva-backoffice",
-  "version": "24.12.0-rc.7",
+  "version": "24.12.0-rc.9",
   "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.7",
-    "@crystaldesign/content-item": "24.12.0-rc.7",
-    "@crystaldesign/diva-core": "24.12.0-rc.7",
-    "@crystaldesign/diva-utils": "24.12.0-rc.7",
-    "@crystaldesign/media-upload": "24.12.0-rc.7",
-    "@crystaldesign/rtf-editor": "24.12.0-rc.7",
-    "@crystaldesign/spreadsheet": "24.12.0-rc.7",
+    "@crystaldesign/content-box": "24.12.0-rc.9",
+    "@crystaldesign/content-item": "24.12.0-rc.9",
+    "@crystaldesign/diva-core": "24.12.0-rc.9",
+    "@crystaldesign/diva-utils": "24.12.0-rc.9",
+    "@crystaldesign/media-upload": "24.12.0-rc.9",
+    "@crystaldesign/rtf-editor": "24.12.0-rc.9",
+    "@crystaldesign/spreadsheet": "24.12.0-rc.9",
     "@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": "a4c7151630eec15f6bdca8b558a6ecc548f2077c"
+  "gitHead": "4f6977c9b6a78576cd6d8041773a17957bfc5fa9"
 }