elab_components 0.8.66 → 0.8.71

package/dist/components/DateInputs/MultiViewCalendar/props.d.ts

@@ -1,5 +1,5 @@
 declare const props: () => {
-    activeRangeEnd: "start" | "end";
+    activeRangeEnd: "end" | "start";
     allowReverse: import("@storybook/addon-knobs/dist/type-defs").Mutable<boolean>;
     bottomView: "month" | "year" | "decade" | "century";
     defaultActiveView: "month" | "year" | "decade" | "century";

package/dist/index.esm.js

@@ -32539,7 +32539,7 @@ var CustomCell = function (_a) {
         } }), props === null || props === void 0 ? void 0 : props.children));
 };
 var OkGrid = function (_a) {
-    var _b, _c;
+    var _b, _c, _d;
     var props = __rest(_a, []);
     var resizable = props.resizable, reorderable = props.reorderable, dataItemKey = props.dataItemKey, selectField = props.selectField, apiColumnConfig = props.apiColumnConfig, allColumnsField = props.allColumnsField, filtersInput = props.filtersInput, showFilter = props.showFilter; props.size; props.expandColumn; var isAction = props.isAction, queryShow = props.queryShow, filterAndGrouping = props.filterAndGrouping, editColumnOption = props.editColumnOption, gridDropdownlist = props.gridDropdownlist; props.childColumnConfig; props.childSelectField; var externalActionsButtons = props.externalActionsButtons, data = props.data, setSelectedFilterData = props.setSelectedFilterData, selectedFilterData = props.selectedFilterData, navigateToNewPage = props.navigateToNewPage, handleGridData = props.handleGridData, handleExternalButtons = props.handleExternalButtons, handleUpdatedColumnConfig = props.handleUpdatedColumnConfig; props.childData; var totalCount = props.totalCount, externalFilterShow = props.externalFilterShow, showSearchInput = props.showSearchInput, allData = props.allData, isLoading = props.isLoading; props.setGroup; var group = props.group, groupabable = props.groupabable, setFilterSubmittedData = props.setFilterSubmittedData, gridInlineButton = props.gridInlineButton, gridStatusCell = props.gridStatusCell, rowBackgroundColorChange = props.rowBackgroundColorChange, setResetSelectedData = props.setResetSelectedData, resetSelectedData = props.resetSelectedData, inlineFilterInputs = props.inlineFilterInputs, actionButtonItemsList = props.actionButtonItemsList, gridCopyPaste = props.gridCopyPaste, setSelectedRows = props.setSelectedRows; props.selectedRows;
     var initialDataState = {
@@ -32551,26 +32551,26 @@ var OkGrid = function (_a) {
     var roleName = loginData && ((_b = JSON.parse(loginData)) === null || _b === void 0 ? void 0 : _b.roleName);
     var isNotSOUser = (roleName === null || roleName === void 0 ? void 0 : roleName.toLowerCase()) === 'so' ||
         (roleName === null || roleName === void 0 ? void 0 : roleName.toLowerCase()) === 'scientific officer';
-    var _d = useState(initialDataState), dataState = _d[0], setDataState = _d[1];
+    var _e = useState(initialDataState), dataState = _e[0], setDataState = _e[1];
     var gridRef = useRef(null);
     var excelExport = useRef(null);
-    var _e = useState(false), isQueryShow = _e[0], setIsQueryShow = _e[1];
-    var _f = useState(''), searchKeyword = _f[0], setSearchKeyword = _f[1];
-    var _g = useState(false), filterShow = _g[0], setFilterShow = _g[1];
-    var _h = useState(), combBoxFilterData = _h[0], setCombBoxFilterData = _h[1];
-    var _j = useState(), combBoxInlineFilterData = _j[0], setCombBoxInlineFilterData = _j[1];
-    var _k = useState({}), selectedData = _k[0], setSelectedData = _k[1];
-    var _l = useState(), runQueriesFilter = _l[0], setRunQueries = _l[1];
-    var _m = useState({}), selectedState = _m[0], setSelectedState = _m[1];
+    var _f = useState(false), isQueryShow = _f[0], setIsQueryShow = _f[1];
+    var _g = useState(''), searchKeyword = _g[0], setSearchKeyword = _g[1];
+    var _h = useState(false), filterShow = _h[0], setFilterShow = _h[1];
+    var _j = useState(), combBoxFilterData = _j[0], setCombBoxFilterData = _j[1];
+    var _k = useState(), combBoxInlineFilterData = _k[0], setCombBoxInlineFilterData = _k[1];
+    var _l = useState({}), selectedData = _l[0], setSelectedData = _l[1];
+    var _m = useState(), runQueriesFilter = _m[0], setRunQueries = _m[1];
+    var _o = useState({}), selectedState = _o[0], setSelectedState = _o[1];
     var idGetter = getter(dataItemKey);
-    var _o = useState({}), editedData = _o[0]; _o[1];
+    var _p = useState({}), editedData = _p[0]; _p[1];
     var lowerSearchTerm = (searchKeyword === null || searchKeyword === void 0 ? void 0 : searchKeyword.toLowerCase()) || '';
     var hasSearchTerm = !!lowerSearchTerm.trim();
-    var _p = useState([]), manuallyExpandedGroups = _p[0], setManuallyExpandedGroups = _p[1];
-    var _q = React__default.useState({}); _q[0]; _q[1];
-    var _r = React__default.useState(''); _r[0]; var setCopiedText = _r[1];
-    var _s = React__default.useState([]); _s[0]; var setCopiedItems = _s[1];
-    var _t = React__default.useState([]); _t[0]; var setPastedItems = _t[1];
+    var _q = useState([]), manuallyExpandedGroups = _q[0], setManuallyExpandedGroups = _q[1];
+    var _r = React__default.useState({}); _r[0]; _r[1];
+    var _s = React__default.useState(''); _s[0]; var setCopiedText = _s[1];
+    var _t = React__default.useState([]); _t[0]; var setCopiedItems = _t[1];
+    var _u = React__default.useState([]); _u[0]; var setPastedItems = _u[1];
     var isMatch = function (value) {
         if (typeof value === 'object' && value !== null) {
             return Object.values(value).some(function (nestedValue) {
@@ -32586,10 +32586,10 @@ var OkGrid = function (_a) {
             return Object.values(item).some(isMatch);
         });
     };
-    var _u = useState({
+    var _v = useState({
         columnOptionModel: false,
         columnConfigsModel: false,
-    }), columnOption = _u[0], setColumnOption = _u[1];
+    }), columnOption = _v[0], setColumnOption = _v[1];
     var prepareDataWithSelection = function (data, selectedState, dataItemKey) {
         var idGetter = getter(dataItemKey);
         var updateItems = function (items) {
@@ -32602,9 +32602,9 @@ var OkGrid = function (_a) {
             return __assign(__assign({}, group), { selected: !!selectedState[idGetter(group)] });
         });
     };
-    var _v = useState(processWithGroups(data, dataState)), resultState = _v[0], setResultState = _v[1];
-    var _w = React__default.useState({ skip: 0, take: 10 }), page = _w[0], setPage = _w[1];
-    var _x = React__default.useState(10), pageSizeValue = _x[0], setPageSizeValue = _x[1];
+    var _w = useState(processWithGroups(data, dataState)), resultState = _w[0], setResultState = _w[1];
+    var _x = React__default.useState({ skip: 0, take: 10 }), page = _x[0], setPage = _x[1];
+    var _y = React__default.useState(10), pageSizeValue = _y[0], setPageSizeValue = _y[1];
     var pageChange = function (event) {
         var targetEvent = event.targetEvent;
         var take = targetEvent.value === 'All' ? totalCount : event.page.take;
@@ -32807,27 +32807,26 @@ var OkGrid = function (_a) {
     // Handle expand/collapse of groups
     var handleExpandChange = useCallback(function (event) {
         var item = event.dataItem;
-        if (item.groupGridId) {
+        if (item.groupId) {
             setManuallyExpandedGroups(function (prev) {
                 if (event.value) {
                     // Add to expanded groups if not already there
-                    return prev.includes(item.groupGridId)
-                        ? prev
-                        : __spreadArray(__spreadArray([], prev, true), [item.groupGridId], false);
+                    return prev.includes(item.groupId) ? prev : __spreadArray(__spreadArray([], prev, true), [item.groupId], false);
                 }
                 else {
                     // Remove from expanded groups
-                    return prev.filter(function (id) { return id !== item.groupGridId; });
+                    return prev.filter(function (id) { return id !== item.groupId; });
                 }
             });
         }
     }, []);
+    console.log('first', resultState.data);
     var expandedData = useMemo(function () {
         var allGroupIds = resultState.data
-            .filter(function (item) { return item.groupGridId; })
-            .map(function (item) { return item.groupGridId; });
+            .filter(function (item) { return item.groupId; })
+            .map(function (item) { return item.groupId; });
         // Collapse all groups except those manually expanded
-        var collapsedIds = allGroupIds.filter(function (groupGridId) { return !manuallyExpandedGroups.includes(groupGridId); });
+        var collapsedIds = allGroupIds.filter(function (groupId) { return !manuallyExpandedGroups.includes(groupId); });
         return setExpandedState({
             data: resultState.data,
             collapsedIds: collapsedIds,
@@ -32857,7 +32856,7 @@ var OkGrid = function (_a) {
         }
         return configs;
     }, [apiColumnConfig, isAction, selectField]);
-    var _y = useState(columnConfigs), columns = _y[0], setColumns = _y[1];
+    var _z = useState(columnConfigs), columns = _z[0], setColumns = _z[1];
     var GridDataInputChange = useCallback(function (e, cellProps) {
         var dataItem = cellProps.dataItem, field = cellProps.field;
         var newValue = e.value;
@@ -33074,7 +33073,7 @@ var OkGrid = function (_a) {
     var ActionCell = function (props) {
         var dataItem = props.dataItem; props.field;
         // Only render action button if it's not a group row
-        if (dataItem.hasOwnProperty('groupGridId')) {
+        if (dataItem.hasOwnProperty('groupId')) {
             return React__default.createElement("td", __assign({}, props.tdProps));
         }
         return (React__default.createElement("td", __assign({}, props.tdProps),
@@ -33085,39 +33084,39 @@ var OkGrid = function (_a) {
                 } })));
     };
     var getCellComponent = useCallback(function (props, col) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         if (col.navigate !== undefined &&
             col.navigate !== null &&
             col.navigate !== '')
-            return navigateToNewPage(props, col.navigate, selectedData === null || selectedData === void 0 ? void 0 : selectedData.startDateToEndDate);
+            return navigateToNewPage(props, col.navigate, (_a = selectedFilterData === null || selectedFilterData === void 0 ? void 0 : selectedFilterData.selectedData) === null || _a === void 0 ? void 0 : _a.startDateToEndDate);
         // if (col.function?.toLowerCase() === 'unitpricecell')
         //   return UnitPriceCell((props, col));
-        if (((_a = col.function) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'status')
+        if (((_b = col.function) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'status')
             return gridStatusCell(props);
-        if (((_b = col.function) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'chart')
+        if (((_c = col.function) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === 'chart')
             return GridDataCellChart(props);
-        if (((_c = col.function) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === 'input')
+        if (((_d = col.function) === null || _d === void 0 ? void 0 : _d.toLowerCase()) === 'input')
             return GridDataCellInput(props, col);
-        if (((_d = col.function) === null || _d === void 0 ? void 0 : _d.toLowerCase()) === 'datepicker')
+        if (((_e = col.function) === null || _e === void 0 ? void 0 : _e.toLowerCase()) === 'datepicker')
             return GridDataCellDatePicker(props, col);
-        if (((_e = col.function) === null || _e === void 0 ? void 0 : _e.toLowerCase()) === 'checkbox')
+        if (((_f = col.function) === null || _f === void 0 ? void 0 : _f.toLowerCase()) === 'checkbox')
             return GridDataCellCheckBox(props, col);
-        if (((_f = col.function) === null || _f === void 0 ? void 0 : _f.toLowerCase()) === 'button')
+        if (((_g = col.function) === null || _g === void 0 ? void 0 : _g.toLowerCase()) === 'button')
             return GridDataCellButton(props, col);
-        if (((_g = col.editor) === null || _g === void 0 ? void 0 : _g.toLowerCase()) === 'date')
+        if (((_h = col.editor) === null || _h === void 0 ? void 0 : _h.toLowerCase()) === 'date')
             return GridDataCellDate(props);
-        if (((_h = col.editor) === null || _h === void 0 ? void 0 : _h.toLowerCase()) === 'datetime')
+        if (((_j = col.editor) === null || _j === void 0 ? void 0 : _j.toLowerCase()) === 'datetime')
             return GridDataCellDateTime(props);
-        if (((_j = col.editor) === null || _j === void 0 ? void 0 : _j.toLowerCase()) === 'sign-minus')
+        if (((_k = col.editor) === null || _k === void 0 ? void 0 : _k.toLowerCase()) === 'sign-minus')
             return GridDataCellSignMinus(props);
-        if (((_k = col.editor) === null || _k === void 0 ? void 0 : _k.toLowerCase()) === 'switch')
+        if (((_l = col.editor) === null || _l === void 0 ? void 0 : _l.toLowerCase()) === 'switch')
             return GridDataCellSwitch(props, col);
-        if (((_l = col.function) === null || _l === void 0 ? void 0 : _l.toLowerCase()) === 'action')
+        if (((_m = col.function) === null || _m === void 0 ? void 0 : _m.toLowerCase()) === 'action')
             return ActionCell(props);
         if (gridCopyPaste && col.function === 'selected')
             return CustomCell(props);
         return (React__default.createElement("td", __assign({}, props.tdProps, { colSpan: 1 }), props.dataItem[props.field]));
-    }, [selectedData === null || selectedData === void 0 ? void 0 : selectedData.startDateToEndDate]);
+    }, [(_c = selectedFilterData === null || selectedFilterData === void 0 ? void 0 : selectedFilterData.selectedData) === null || _c === void 0 ? void 0 : _c.startDateToEndDate]);
     var onFilterChange = function (e) {
         setSearchKeyword(e.target.value);
     };
@@ -33268,10 +33267,11 @@ var OkGrid = function (_a) {
     //   const pageCount = (page.take + page.skip) / page.take;
     //   setPageAndSize({ page: pageCount - 1, size: page.take });
     // }, [page.skip, page.take]);
+    var exportedColumnConfigs = columnConfigs.filter(function (col) { return col.title !== 'Select' && col.title !== 'Actions'; });
     return (React__default.createElement("div", null,
         React__default.createElement(Filters, { isQueryShow: isQueryShow, setIsQueryShow: setIsQueryShow, 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, filterAndGrouping: filterAndGrouping, externalActionsButtons: externalActionsButtons, handleExternalButtons: handleExternalButtons, filtersInput: filtersInput, combBoxFilterData: combBoxFilterData, handleOnChange: handleOnChange, handleComboxChange: handleComboxChange, setCombBoxInlineFilterData: setCombBoxInlineFilterData, combBoxInlineFilterData: combBoxInlineFilterData, handleComboxInlineChange: handleComboxInlineChange, setFilterSubmittedData: setFilterSubmittedData, handleInputOnChange: handleInputOnChange, allColumnsField: allColumnsField, setRunQueries: setRunQueries, selectedState: selectedState, inlineFilterInputs: inlineFilterInputs, actionButtonItemsList: actionButtonItemsList }),
         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: (_c = allData === null || allData === void 0 ? void 0 : allData.data) !== null && _c !== void 0 ? _c : expandedData, ref: excelExport },
+            React__default.createElement(Loader$2, { size: "large", type: "converging-spinner" }))) : (React__default.createElement(ExcelExport, { columns: exportedColumnConfigs, data: (_d = allData === null || allData === void 0 ? void 0 : allData.data) !== null && _d !== void 0 ? _d : expandedData, ref: excelExport },
             React__default.createElement(StyledGrid, __assign({ ref: gridRef, filterable: true, groupable: groupabable, reorderable: reorderable, dataItemKey: dataItemKey, selectedField: selectField, onSelectionChange: onSelectionChange, onHeaderSelectionChange: handleHeaderSelectionChange, resizable: resizable, className: "grid-main", sortable: {
                     mode: 'single',
                     allowUnsort: true,

package/dist/index.js

@@ -32567,7 +32567,7 @@ var CustomCell = function (_a) {
         } }), props === null || props === void 0 ? void 0 : props.children));
 };
 var OkGrid = function (_a) {
-    var _b, _c;
+    var _b, _c, _d;
     var props = __rest(_a, []);
     var resizable = props.resizable, reorderable = props.reorderable, dataItemKey = props.dataItemKey, selectField = props.selectField, apiColumnConfig = props.apiColumnConfig, allColumnsField = props.allColumnsField, filtersInput = props.filtersInput, showFilter = props.showFilter; props.size; props.expandColumn; var isAction = props.isAction, queryShow = props.queryShow, filterAndGrouping = props.filterAndGrouping, editColumnOption = props.editColumnOption, gridDropdownlist = props.gridDropdownlist; props.childColumnConfig; props.childSelectField; var externalActionsButtons = props.externalActionsButtons, data = props.data, setSelectedFilterData = props.setSelectedFilterData, selectedFilterData = props.selectedFilterData, navigateToNewPage = props.navigateToNewPage, handleGridData = props.handleGridData, handleExternalButtons = props.handleExternalButtons, handleUpdatedColumnConfig = props.handleUpdatedColumnConfig; props.childData; var totalCount = props.totalCount, externalFilterShow = props.externalFilterShow, showSearchInput = props.showSearchInput, allData = props.allData, isLoading = props.isLoading; props.setGroup; var group = props.group, groupabable = props.groupabable, setFilterSubmittedData = props.setFilterSubmittedData, gridInlineButton = props.gridInlineButton, gridStatusCell = props.gridStatusCell, rowBackgroundColorChange = props.rowBackgroundColorChange, setResetSelectedData = props.setResetSelectedData, resetSelectedData = props.resetSelectedData, inlineFilterInputs = props.inlineFilterInputs, actionButtonItemsList = props.actionButtonItemsList, gridCopyPaste = props.gridCopyPaste, setSelectedRows = props.setSelectedRows; props.selectedRows;
     var initialDataState = {
@@ -32579,26 +32579,26 @@ var OkGrid = function (_a) {
     var roleName = loginData && ((_b = JSON.parse(loginData)) === null || _b === void 0 ? void 0 : _b.roleName);
     var isNotSOUser = (roleName === null || roleName === void 0 ? void 0 : roleName.toLowerCase()) === 'so' ||
         (roleName === null || roleName === void 0 ? void 0 : roleName.toLowerCase()) === 'scientific officer';
-    var _d = React.useState(initialDataState), dataState = _d[0], setDataState = _d[1];
+    var _e = React.useState(initialDataState), dataState = _e[0], setDataState = _e[1];
     var gridRef = React.useRef(null);
     var excelExport = React.useRef(null);
-    var _e = React.useState(false), isQueryShow = _e[0], setIsQueryShow = _e[1];
-    var _f = React.useState(''), searchKeyword = _f[0], setSearchKeyword = _f[1];
-    var _g = React.useState(false), filterShow = _g[0], setFilterShow = _g[1];
-    var _h = React.useState(), combBoxFilterData = _h[0], setCombBoxFilterData = _h[1];
-    var _j = React.useState(), combBoxInlineFilterData = _j[0], setCombBoxInlineFilterData = _j[1];
-    var _k = React.useState({}), selectedData = _k[0], setSelectedData = _k[1];
-    var _l = React.useState(), runQueriesFilter = _l[0], setRunQueries = _l[1];
-    var _m = React.useState({}), selectedState = _m[0], setSelectedState = _m[1];
+    var _f = React.useState(false), isQueryShow = _f[0], setIsQueryShow = _f[1];
+    var _g = React.useState(''), searchKeyword = _g[0], setSearchKeyword = _g[1];
+    var _h = React.useState(false), filterShow = _h[0], setFilterShow = _h[1];
+    var _j = React.useState(), combBoxFilterData = _j[0], setCombBoxFilterData = _j[1];
+    var _k = React.useState(), combBoxInlineFilterData = _k[0], setCombBoxInlineFilterData = _k[1];
+    var _l = React.useState({}), selectedData = _l[0], setSelectedData = _l[1];
+    var _m = React.useState(), runQueriesFilter = _m[0], setRunQueries = _m[1];
+    var _o = React.useState({}), selectedState = _o[0], setSelectedState = _o[1];
     var idGetter = kendoReactCommon.getter(dataItemKey);
-    var _o = React.useState({}), editedData = _o[0]; _o[1];
+    var _p = React.useState({}), editedData = _p[0]; _p[1];
     var lowerSearchTerm = (searchKeyword === null || searchKeyword === void 0 ? void 0 : searchKeyword.toLowerCase()) || '';
     var hasSearchTerm = !!lowerSearchTerm.trim();
-    var _p = React.useState([]), manuallyExpandedGroups = _p[0], setManuallyExpandedGroups = _p[1];
-    var _q = React__default["default"].useState({}); _q[0]; _q[1];
-    var _r = React__default["default"].useState(''); _r[0]; var setCopiedText = _r[1];
-    var _s = React__default["default"].useState([]); _s[0]; var setCopiedItems = _s[1];
-    var _t = React__default["default"].useState([]); _t[0]; var setPastedItems = _t[1];
+    var _q = React.useState([]), manuallyExpandedGroups = _q[0], setManuallyExpandedGroups = _q[1];
+    var _r = React__default["default"].useState({}); _r[0]; _r[1];
+    var _s = React__default["default"].useState(''); _s[0]; var setCopiedText = _s[1];
+    var _t = React__default["default"].useState([]); _t[0]; var setCopiedItems = _t[1];
+    var _u = React__default["default"].useState([]); _u[0]; var setPastedItems = _u[1];
     var isMatch = function (value) {
         if (typeof value === 'object' && value !== null) {
             return Object.values(value).some(function (nestedValue) {
@@ -32614,10 +32614,10 @@ var OkGrid = function (_a) {
             return Object.values(item).some(isMatch);
         });
     };
-    var _u = React.useState({
+    var _v = React.useState({
         columnOptionModel: false,
         columnConfigsModel: false,
-    }), columnOption = _u[0], setColumnOption = _u[1];
+    }), columnOption = _v[0], setColumnOption = _v[1];
     var prepareDataWithSelection = function (data, selectedState, dataItemKey) {
         var idGetter = kendoReactCommon.getter(dataItemKey);
         var updateItems = function (items) {
@@ -32630,9 +32630,9 @@ var OkGrid = function (_a) {
             return __assign(__assign({}, group), { selected: !!selectedState[idGetter(group)] });
         });
     };
-    var _v = React.useState(processWithGroups(data, dataState)), resultState = _v[0], setResultState = _v[1];
-    var _w = React__default["default"].useState({ skip: 0, take: 10 }), page = _w[0], setPage = _w[1];
-    var _x = React__default["default"].useState(10), pageSizeValue = _x[0], setPageSizeValue = _x[1];
+    var _w = React.useState(processWithGroups(data, dataState)), resultState = _w[0], setResultState = _w[1];
+    var _x = React__default["default"].useState({ skip: 0, take: 10 }), page = _x[0], setPage = _x[1];
+    var _y = React__default["default"].useState(10), pageSizeValue = _y[0], setPageSizeValue = _y[1];
     var pageChange = function (event) {
         var targetEvent = event.targetEvent;
         var take = targetEvent.value === 'All' ? totalCount : event.page.take;
@@ -32835,27 +32835,26 @@ var OkGrid = function (_a) {
     // Handle expand/collapse of groups
     var handleExpandChange = React.useCallback(function (event) {
         var item = event.dataItem;
-        if (item.groupGridId) {
+        if (item.groupId) {
             setManuallyExpandedGroups(function (prev) {
                 if (event.value) {
                     // Add to expanded groups if not already there
-                    return prev.includes(item.groupGridId)
-                        ? prev
-                        : __spreadArray(__spreadArray([], prev, true), [item.groupGridId], false);
+                    return prev.includes(item.groupId) ? prev : __spreadArray(__spreadArray([], prev, true), [item.groupId], false);
                 }
                 else {
                     // Remove from expanded groups
-                    return prev.filter(function (id) { return id !== item.groupGridId; });
+                    return prev.filter(function (id) { return id !== item.groupId; });
                 }
             });
         }
     }, []);
+    console.log('first', resultState.data);
     var expandedData = React.useMemo(function () {
         var allGroupIds = resultState.data
-            .filter(function (item) { return item.groupGridId; })
-            .map(function (item) { return item.groupGridId; });
+            .filter(function (item) { return item.groupId; })
+            .map(function (item) { return item.groupId; });
         // Collapse all groups except those manually expanded
-        var collapsedIds = allGroupIds.filter(function (groupGridId) { return !manuallyExpandedGroups.includes(groupGridId); });
+        var collapsedIds = allGroupIds.filter(function (groupId) { return !manuallyExpandedGroups.includes(groupId); });
         return kendoReactDataTools.setExpandedState({
             data: resultState.data,
             collapsedIds: collapsedIds,
@@ -32885,7 +32884,7 @@ var OkGrid = function (_a) {
         }
         return configs;
     }, [apiColumnConfig, isAction, selectField]);
-    var _y = React.useState(columnConfigs), columns = _y[0], setColumns = _y[1];
+    var _z = React.useState(columnConfigs), columns = _z[0], setColumns = _z[1];
     var GridDataInputChange = React.useCallback(function (e, cellProps) {
         var dataItem = cellProps.dataItem, field = cellProps.field;
         var newValue = e.value;
@@ -33102,7 +33101,7 @@ var OkGrid = function (_a) {
     var ActionCell = function (props) {
         var dataItem = props.dataItem; props.field;
         // Only render action button if it's not a group row
-        if (dataItem.hasOwnProperty('groupGridId')) {
+        if (dataItem.hasOwnProperty('groupId')) {
             return React__default["default"].createElement("td", __assign({}, props.tdProps));
         }
         return (React__default["default"].createElement("td", __assign({}, props.tdProps),
@@ -33113,39 +33112,39 @@ var OkGrid = function (_a) {
                 } })));
     };
     var getCellComponent = React.useCallback(function (props, col) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
         if (col.navigate !== undefined &&
             col.navigate !== null &&
             col.navigate !== '')
-            return navigateToNewPage(props, col.navigate, selectedData === null || selectedData === void 0 ? void 0 : selectedData.startDateToEndDate);
+            return navigateToNewPage(props, col.navigate, (_a = selectedFilterData === null || selectedFilterData === void 0 ? void 0 : selectedFilterData.selectedData) === null || _a === void 0 ? void 0 : _a.startDateToEndDate);
         // if (col.function?.toLowerCase() === 'unitpricecell')
         //   return UnitPriceCell((props, col));
-        if (((_a = col.function) === null || _a === void 0 ? void 0 : _a.toLowerCase()) === 'status')
+        if (((_b = col.function) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'status')
             return gridStatusCell(props);
-        if (((_b = col.function) === null || _b === void 0 ? void 0 : _b.toLowerCase()) === 'chart')
+        if (((_c = col.function) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === 'chart')
             return GridDataCellChart(props);
-        if (((_c = col.function) === null || _c === void 0 ? void 0 : _c.toLowerCase()) === 'input')
+        if (((_d = col.function) === null || _d === void 0 ? void 0 : _d.toLowerCase()) === 'input')
             return GridDataCellInput(props, col);
-        if (((_d = col.function) === null || _d === void 0 ? void 0 : _d.toLowerCase()) === 'datepicker')
+        if (((_e = col.function) === null || _e === void 0 ? void 0 : _e.toLowerCase()) === 'datepicker')
             return GridDataCellDatePicker(props, col);
-        if (((_e = col.function) === null || _e === void 0 ? void 0 : _e.toLowerCase()) === 'checkbox')
+        if (((_f = col.function) === null || _f === void 0 ? void 0 : _f.toLowerCase()) === 'checkbox')
             return GridDataCellCheckBox(props, col);
-        if (((_f = col.function) === null || _f === void 0 ? void 0 : _f.toLowerCase()) === 'button')
+        if (((_g = col.function) === null || _g === void 0 ? void 0 : _g.toLowerCase()) === 'button')
             return GridDataCellButton(props, col);
-        if (((_g = col.editor) === null || _g === void 0 ? void 0 : _g.toLowerCase()) === 'date')
+        if (((_h = col.editor) === null || _h === void 0 ? void 0 : _h.toLowerCase()) === 'date')
             return GridDataCellDate(props);
-        if (((_h = col.editor) === null || _h === void 0 ? void 0 : _h.toLowerCase()) === 'datetime')
+        if (((_j = col.editor) === null || _j === void 0 ? void 0 : _j.toLowerCase()) === 'datetime')
             return GridDataCellDateTime(props);
-        if (((_j = col.editor) === null || _j === void 0 ? void 0 : _j.toLowerCase()) === 'sign-minus')
+        if (((_k = col.editor) === null || _k === void 0 ? void 0 : _k.toLowerCase()) === 'sign-minus')
             return GridDataCellSignMinus(props);
-        if (((_k = col.editor) === null || _k === void 0 ? void 0 : _k.toLowerCase()) === 'switch')
+        if (((_l = col.editor) === null || _l === void 0 ? void 0 : _l.toLowerCase()) === 'switch')
             return GridDataCellSwitch(props, col);
-        if (((_l = col.function) === null || _l === void 0 ? void 0 : _l.toLowerCase()) === 'action')
+        if (((_m = col.function) === null || _m === void 0 ? void 0 : _m.toLowerCase()) === 'action')
             return ActionCell(props);
         if (gridCopyPaste && col.function === 'selected')
             return CustomCell(props);
         return (React__default["default"].createElement("td", __assign({}, props.tdProps, { colSpan: 1 }), props.dataItem[props.field]));
-    }, [selectedData === null || selectedData === void 0 ? void 0 : selectedData.startDateToEndDate]);
+    }, [(_c = selectedFilterData === null || selectedFilterData === void 0 ? void 0 : selectedFilterData.selectedData) === null || _c === void 0 ? void 0 : _c.startDateToEndDate]);
     var onFilterChange = function (e) {
         setSearchKeyword(e.target.value);
     };
@@ -33296,10 +33295,11 @@ var OkGrid = function (_a) {
     //   const pageCount = (page.take + page.skip) / page.take;
     //   setPageAndSize({ page: pageCount - 1, size: page.take });
     // }, [page.skip, page.take]);
+    var exportedColumnConfigs = columnConfigs.filter(function (col) { return col.title !== 'Select' && col.title !== 'Actions'; });
     return (React__default["default"].createElement("div", null,
         React__default["default"].createElement(Filters, { isQueryShow: isQueryShow, setIsQueryShow: setIsQueryShow, 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, filterAndGrouping: filterAndGrouping, externalActionsButtons: externalActionsButtons, handleExternalButtons: handleExternalButtons, filtersInput: filtersInput, combBoxFilterData: combBoxFilterData, handleOnChange: handleOnChange, handleComboxChange: handleComboxChange, setCombBoxInlineFilterData: setCombBoxInlineFilterData, combBoxInlineFilterData: combBoxInlineFilterData, handleComboxInlineChange: handleComboxInlineChange, setFilterSubmittedData: setFilterSubmittedData, handleInputOnChange: handleInputOnChange, allColumnsField: allColumnsField, setRunQueries: setRunQueries, selectedState: selectedState, inlineFilterInputs: inlineFilterInputs, actionButtonItemsList: actionButtonItemsList }),
         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: (_c = allData === null || allData === void 0 ? void 0 : allData.data) !== null && _c !== void 0 ? _c : expandedData, ref: excelExport },
+            React__default["default"].createElement(kendoReactIndicators.Loader, { size: "large", type: "converging-spinner" }))) : (React__default["default"].createElement(kendoReactExcelExport.ExcelExport, { columns: exportedColumnConfigs, data: (_d = allData === null || allData === void 0 ? void 0 : allData.data) !== null && _d !== void 0 ? _d : expandedData, ref: excelExport },
             React__default["default"].createElement(StyledGrid, __assign({ ref: gridRef, filterable: true, groupable: groupabable, reorderable: reorderable, dataItemKey: dataItemKey, selectedField: selectField, onSelectionChange: onSelectionChange, onHeaderSelectionChange: handleHeaderSelectionChange, resizable: resizable, className: "grid-main", sortable: {
                     mode: 'single',
                     allowUnsort: true,

package/package.json

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