@crystaldesign/diva-backoffice 24.3.0-beta.3 → 24.3.0-beta.5

package/build/esm/index.js

@@ -3866,13 +3866,6 @@ function loadConfiguration(t, root, config, lang) {
           fields: true
         }
       },
-      mapping: {
-        type: 'query',
-        map: [{
-          globalValue: 'organizationId',
-          targetField: 'id'
-        }]
-      },
       filter: {
         "default": {
           globalValue: 'selectedOrganizationId',
@@ -9016,7 +9009,7 @@ function loadConfiguration(t, root, config, lang) {
       type: 'SelectOrCreate',
       mode: 'single',
       apiInterface: {
-        create: '${authService}/v2/organizations/{organizationId}/members/{userId}?roleId=seller',
+        create: '${authService}/v2/organizations/{organizationId}/members/{userId}',
         read: {
           list: '${authService}/v2/organizations/${organizationId}/members?all=true',
           filterServerSide: true,
@@ -19567,10 +19560,22 @@ function useTableData (_ref) {
     _useState16 = _slicedToArray(_useState15, 1),
     columns = _useState16[0];
   var triggerRefresh = function triggerRefresh() {
+    var _configuration$filter7;
     setError(undefined);
+    var newGlobalFilter = _objectSpread$g({}, globalFilter);
+    //on refresh update default filter, since global value can change
+    if ((_configuration$filter7 = configuration.filter) !== null && _configuration$filter7 !== void 0 && _configuration$filter7["default"]) {
+      var _configuration$filter8;
+      var _defaultFilter = {};
+      (_configuration$filter8 = configuration.filter) === null || _configuration$filter8 === void 0 || (_configuration$filter8 = _configuration$filter8["default"]) === null || _configuration$filter8 === void 0 || _configuration$filter8.fields.forEach(function (f) {
+        return _defaultFilter[f] = [configuration.filter["default"].globalValue ? root.getGlobalValue(configuration.filter["default"].globalValue) : true, 'eq'];
+      });
+      newGlobalFilter["default"] = _defaultFilter;
+      setGlobaFilter(newGlobalFilter);
+    }
     onChange(_objectSpread$g({
       pagination: state.pagination
-    }, filterData), undefined, true);
+    }, filterData), newGlobalFilter, true);
   };
   useEffect(function () {
     if (_typeof(configuration.apiInterface) !== 'object') {
@@ -19623,7 +19628,7 @@ function useTableData (_ref) {
   }, [configuration.title, parentData]);
   var onChange = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee2(p) {
-      var _configuration$filter7, _configuration$filter8, _configuration$filter9, _prefilter$select, _configuration$filter10, _configuration$filter11;
+      var _configuration$filter9, _configuration$filter10, _configuration$filter11, _prefilter$select, _configuration$filter12, _configuration$filter13;
       var prefilter,
         refresh,
         currentData,
@@ -19631,7 +19636,7 @@ function useTableData (_ref) {
         currentFilterHash,
         currentPagination,
         currentUrl,
-        _configuration$filter12,
+        _configuration$filter14,
         ssf,
         data,
         _data3,
@@ -19648,7 +19653,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$filter7 = configuration.filter) !== null && _configuration$filter7 !== void 0 && (_configuration$filter7 = _configuration$filter7.toggle) !== null && _configuration$filter7 !== void 0 && _configuration$filter7.inQuery) ? prefilter.toggle : undefined), ((_configuration$filter8 = configuration.filter) === null || _configuration$filter8 === void 0 || (_configuration$filter8 = _configuration$filter8.select) === null || _configuration$filter8 === void 0 ? void 0 : _configuration$filter8.applyDefaultValue) !== false || ((_configuration$filter9 = configuration.filter) === null || _configuration$filter9 === void 0 || (_configuration$filter9 = _configuration$filter9.select) === null || _configuration$filter9 === void 0 ? void 0 : _configuration$filter9.defaultValue) !== ((_prefilter$select = prefilter.select) === null || _prefilter$select === void 0 || (_prefilter$select = _prefilter$select[(_configuration$filter10 = (_configuration$filter11 = configuration.filter) === null || _configuration$filter11 === void 0 || (_configuration$filter11 = _configuration$filter11.select) === null || _configuration$filter11 === void 0 ? void 0 : _configuration$filter11.filterField) !== null && _configuration$filter10 !== void 0 ? _configuration$filter10 : '']) === 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(_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];
@@ -19669,7 +19674,7 @@ function useTableData (_ref) {
               columns: configuration.columns,
               filters: filterData,
               sorter: p.sorter
-            }, configuration !== null && configuration !== void 0 && (_configuration$filter12 = configuration.filter) !== null && _configuration$filter12 !== void 0 && (_configuration$filter12 = _configuration$filter12.toggle) !== null && _configuration$filter12 !== void 0 && _configuration$filter12.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);
             _context2.next = 13;
@@ -19735,7 +19740,7 @@ function useTableData (_ref) {
   var onDelete = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3() {
       var _configuration$apiInt2;
-      var newData, newInitData, deleted, userPermissions, _loop, mappingData, deleteResult, _ret, index, total, pages, current, _configuration$filter13, _configuration$filter14, data;
+      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) {
           case 0:
@@ -19750,7 +19755,7 @@ function useTableData (_ref) {
           case 6:
             userPermissions = _context4.sent;
             _loop = /*#__PURE__*/_regeneratorRuntime.mark(function _loop(index) {
-              var _configuration$rowKey, _configuration$filter15, _configuration$filter16;
+              var _configuration$rowKey, _configuration$filter17, _configuration$filter18;
               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) {
@@ -19766,7 +19771,7 @@ function useTableData (_ref) {
                       })) === null || _newData$filter2 === void 0 ? void 0 : _newData$filter2[0];
                     }
                     mapToggle = {};
-                    _iterator = _createForOfIteratorHelper$7((_configuration$filter15 = (_configuration$filter16 = configuration.filter) === null || _configuration$filter16 === void 0 || (_configuration$filter16 = _configuration$filter16.toggle) === null || _configuration$filter16 === void 0 ? void 0 : _configuration$filter16.fields) !== null && _configuration$filter15 !== void 0 ? _configuration$filter15 : []);
+                    _iterator = _createForOfIteratorHelper$7((_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 : []);
                     try {
                       for (_iterator.s(); !(_step = _iterator.n()).done;) {
                         field = _step.value;
@@ -19875,9 +19880,9 @@ function useTableData (_ref) {
                 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$filter13 = configuration.filter) !== null && _configuration$filter13 !== void 0 && (_configuration$filter13 = _configuration$filter13.toggle) !== null && _configuration$filter13 !== void 0 && _configuration$filter13.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$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"]),
               sorter: filterData.sorter
-            }, 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 ? {
+            }, 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 ? {
               genericProps: globalFilter.toggle
             } : undefined));
           case 25:
@@ -19906,8 +19911,8 @@ function useTableData (_ref) {
     };
   }();
   var onGlobalFilterSelect = function onGlobalFilterSelect(value) {
-    var _configuration$filter17;
-    if (!((_configuration$filter17 = configuration.filter) !== null && _configuration$filter17 !== void 0 && _configuration$filter17.select)) {
+    var _configuration$filter19;
+    if (!((_configuration$filter19 = configuration.filter) !== null && _configuration$filter19 !== void 0 && _configuration$filter19.select)) {
       LOG$3.error('No global select filter defiend');
       return;
     }
@@ -19923,8 +19928,8 @@ function useTableData (_ref) {
     }, filterData), newGlobalFilter);
   };
   var onGlobalFilterToggle = function onGlobalFilterToggle() {
-    var _configuration$filter18;
-    if (!((_configuration$filter18 = configuration.filter) !== null && _configuration$filter18 !== void 0 && _configuration$filter18.toggle)) {
+    var _configuration$filter20;
+    if (!((_configuration$filter20 = configuration.filter) !== null && _configuration$filter20 !== void 0 && _configuration$filter20.toggle)) {
       LOG$3.error('No global toggle filter defiend');
       return;
     }
@@ -19941,8 +19946,8 @@ function useTableData (_ref) {
     }, filterData), newGlobalFilter);
   };
   var onGlobalFilterSearch = function onGlobalFilterSearch(value) {
-    var _configuration$filter19;
-    if (!((_configuration$filter19 = configuration.filter) !== null && _configuration$filter19 !== void 0 && _configuration$filter19.search)) {
+    var _configuration$filter21;
+    if (!((_configuration$filter21 = configuration.filter) !== null && _configuration$filter21 !== void 0 && _configuration$filter21.search)) {
       LOG$3.error('No global search filter defiend');
       return;
     }
@@ -19950,8 +19955,8 @@ function useTableData (_ref) {
       search: {}
     });
     if (value) {
-      var _configuration$filter20;
-      (_configuration$filter20 = configuration.filter) === null || _configuration$filter20 === void 0 || _configuration$filter20.search.fields.forEach(function (f) {
+      var _configuration$filter22;
+      (_configuration$filter22 = configuration.filter) === null || _configuration$filter22 === void 0 || _configuration$filter22.search.fields.forEach(function (f) {
         if (typeof f == 'string') {
           newGlobalFilter.search[f] = [value, 'contains', 0];
         } else {
@@ -19965,8 +19970,8 @@ function useTableData (_ref) {
     }, filterData), newGlobalFilter);
   };
   var onGlobalFilterPeriod = function onGlobalFilterPeriod(from, to) {
-    var _configuration$filter21;
-    if (!((_configuration$filter21 = configuration.filter) !== null && _configuration$filter21 !== void 0 && _configuration$filter21.period)) {
+    var _configuration$filter23;
+    if (!((_configuration$filter23 = configuration.filter) !== null && _configuration$filter23 !== void 0 && _configuration$filter23.period)) {
       LOG$3.error('No global period filter defiend');
       return;
     }

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;AAsBzG,MAAM,CAAC,OAAO,WAAW,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,EAAE,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAggBzF"}
+{"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;AAsBzG,MAAM,CAAC,OAAO,WAAW,CAAC,EAAE,EAAE,EAAE,EAAE,IAAI,EAAE,UAAU,EAAE,aAAa,EAAE,EAAE,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAkhBzF"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@crystaldesign/diva-backoffice",
-  "version": "24.3.0-beta.3",
+  "version": "24.3.0-beta.5",
   "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": "afa9eb908333ef1de4b1521a49b27f1b7d9b2f2d"
+  "gitHead": "4e74273ffb66ed6593e5d75b4ddbdfa171013e95"
 }