elab_components 0.4.36 → 0.4.41

package/dist/index.esm.js

@@ -6,7 +6,7 @@ import { Window, Dialog, DialogActionsBar } from '@progress/kendo-react-dialogs'
 import { MultiSelect, DropDownList, ComboBox } from '@progress/kendo-react-dropdowns';
 import { Editor } from '@progress/kendo-react-editor';
 import { GridToolbar, Grid as Grid$2, GridColumn } from '@progress/kendo-react-grid';
-import { filterBy } from '@progress/kendo-data-query';
+import { process as process$2, filterBy } from '@progress/kendo-data-query';
 import { ExcelExport } from '@progress/kendo-react-excel-export';
 import { Checkbox, Input as Input$2, TextBox, InputSuffix, Switch, NumericTextBox, MaskedTextBox } from '@progress/kendo-react-inputs';
 import { searchIcon, moreVerticalIcon } from '@progress/kendo-svg-icons';
@@ -31046,7 +31046,9 @@ var OkGrid = function (_a) {
         var newTakeSize = e.dataState.take === undefined || isNaN(e.dataState.take)
             ? 'All'
             : e.dataState.take;
-        setDataState(__assign(__assign({}, e.dataState), { take: newTake, sizeGrid: newTakeSize }));
+        console.log('ddddddd', e.dataState);
+        setDataState(__assign(__assign({}, dataState), { take: newTake, sizeGrid: newTakeSize, filter: e.dataState.filter, group: e.dataState.group, skip: e.dataState.skip, sort: e.dataState.sort }));
+        // setDataState(e.dataState);
         setDataResult(__assign(__assign({}, dataResult), { total: totalCount }));
     };
     var onSelectionChange = React__default.useCallback(function (event) {
@@ -31216,8 +31218,6 @@ var OkGrid = function (_a) {
     }, [setDataResult]);
     useEffect(function () {
         if ((dataResult === null || dataResult === void 0 ? void 0 : dataResult.data) && Object.values(selectedState).length > 0) {
-            console.log('Before Update - selectedState:', selectedState);
-            console.log('Updated Data - dataResult.data:', dataResult.data);
             var selectedIds_1 = Object.values(selectedState).map(function (item) { return item.id; });
             var filteredData = dataResult.data.filter(function (item) {
                 return selectedIds_1.includes(item.id);
@@ -31320,7 +31320,7 @@ var OkGrid = function (_a) {
         React__default.createElement(Filters, { isQueryShow: isQueryShow, searchKeyword: searchKeyword, setSearchKeyword: setSearchKeyword, onFilterChange: onFilterChange, editColumnOption: editColumnOption, setColumnOption: setColumnOption, showFilter: showFilter, externalFilterShow: externalFilterShow, showSearchInput: showSearchInput, setFilterShow: setFilterShow, filterShow: filterShow, excelExport: excelExportFunc, isExcelExportLoading: allData === null || allData === void 0 ? void 0 : allData.isLoading, selectedData: selectedData, queryShow: queryShow, setIsQueryShow: setIsQueryShow, filterAndGrouping: filterAndGrouping, externalActionsButtons: externalActionsButtons, handleExternalButtons: handleExternalButtons, filtersInput: filtersInput, combBoxFilterData: combBoxFilterData, handleOnChange: handleOnChange, handleComboxChange: handleComboxChange, setFilterSubmittedData: setFilterSubmittedData, allColumnsField: allColumnsField, setRunQueries: setRunQueries, selectedState: selectedState, detailSelectedState: detailSelectedState }),
         isLoading ? (React__default.createElement("div", { style: { textAlign: 'center', margin: 'auto', marginTop: '70px' } },
             React__default.createElement(Loader$2, { size: "large", type: "converging-spinner" }))) : (React__default.createElement(ExcelExport, { data: allData === null || allData === void 0 ? void 0 : allData.data, ref: excelExport },
-            React__default.createElement(StyledGrid, __assign({ ref: grid, filterable: gridOptions.filter, groupable: groupabable || gridOptions.groupable, reorderable: reorderable, resizable: resizable, data: dataResult, dataItemKey: dataItemKey, selectedField: selectField, editField: "inEdit", sortable: {
+            React__default.createElement(StyledGrid, __assign({ ref: grid, filterable: gridOptions.filter, groupable: groupabable || gridOptions.groupable, reorderable: reorderable, resizable: resizable, data: process$2(dataResult.data, dataState), dataItemKey: dataItemKey, selectedField: selectField, editField: "inEdit", sortable: {
                     mode: 'single',
                     allowUnsort: true,
                 }, expandField: "expanded", size: size, pageable: {

package/dist/index.js

@@ -31074,7 +31074,9 @@ var OkGrid = function (_a) {
         var newTakeSize = e.dataState.take === undefined || isNaN(e.dataState.take)
             ? 'All'
             : e.dataState.take;
-        setDataState(__assign(__assign({}, e.dataState), { take: newTake, sizeGrid: newTakeSize }));
+        console.log('ddddddd', e.dataState);
+        setDataState(__assign(__assign({}, dataState), { take: newTake, sizeGrid: newTakeSize, filter: e.dataState.filter, group: e.dataState.group, skip: e.dataState.skip, sort: e.dataState.sort }));
+        // setDataState(e.dataState);
         setDataResult(__assign(__assign({}, dataResult), { total: totalCount }));
     };
     var onSelectionChange = React__default["default"].useCallback(function (event) {
@@ -31244,8 +31246,6 @@ var OkGrid = function (_a) {
     }, [setDataResult]);
     React.useEffect(function () {
         if ((dataResult === null || dataResult === void 0 ? void 0 : dataResult.data) && Object.values(selectedState).length > 0) {
-            console.log('Before Update - selectedState:', selectedState);
-            console.log('Updated Data - dataResult.data:', dataResult.data);
             var selectedIds_1 = Object.values(selectedState).map(function (item) { return item.id; });
             var filteredData = dataResult.data.filter(function (item) {
                 return selectedIds_1.includes(item.id);
@@ -31348,7 +31348,7 @@ var OkGrid = function (_a) {
         React__default["default"].createElement(Filters, { isQueryShow: isQueryShow, searchKeyword: searchKeyword, setSearchKeyword: setSearchKeyword, onFilterChange: onFilterChange, editColumnOption: editColumnOption, setColumnOption: setColumnOption, showFilter: showFilter, externalFilterShow: externalFilterShow, showSearchInput: showSearchInput, setFilterShow: setFilterShow, filterShow: filterShow, excelExport: excelExportFunc, isExcelExportLoading: allData === null || allData === void 0 ? void 0 : allData.isLoading, selectedData: selectedData, queryShow: queryShow, setIsQueryShow: setIsQueryShow, filterAndGrouping: filterAndGrouping, externalActionsButtons: externalActionsButtons, handleExternalButtons: handleExternalButtons, filtersInput: filtersInput, combBoxFilterData: combBoxFilterData, handleOnChange: handleOnChange, handleComboxChange: handleComboxChange, setFilterSubmittedData: setFilterSubmittedData, allColumnsField: allColumnsField, setRunQueries: setRunQueries, selectedState: selectedState, detailSelectedState: detailSelectedState }),
         isLoading ? (React__default["default"].createElement("div", { style: { textAlign: 'center', margin: 'auto', marginTop: '70px' } },
             React__default["default"].createElement(kendoReactIndicators.Loader, { size: "large", type: "converging-spinner" }))) : (React__default["default"].createElement(kendoReactExcelExport.ExcelExport, { data: allData === null || allData === void 0 ? void 0 : allData.data, ref: excelExport },
-            React__default["default"].createElement(StyledGrid, __assign({ ref: grid, filterable: gridOptions.filter, groupable: groupabable || gridOptions.groupable, reorderable: reorderable, resizable: resizable, data: dataResult, dataItemKey: dataItemKey, selectedField: selectField, editField: "inEdit", sortable: {
+            React__default["default"].createElement(StyledGrid, __assign({ ref: grid, filterable: gridOptions.filter, groupable: groupabable || gridOptions.groupable, reorderable: reorderable, resizable: resizable, data: kendoDataQuery.process(dataResult.data, dataState), dataItemKey: dataItemKey, selectedField: selectField, editField: "inEdit", sortable: {
                     mode: 'single',
                     allowUnsort: true,
                 }, expandField: "expanded", size: size, pageable: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "elab_components",
-  "version": "0.4.36",
+  "version": "0.4.41",
   "private": false,
   "author": "Amar",
   "main": "dist/index.js",