Skip to content

chore: bump the kendo-dependencies group across 1 directory with 20 updates #3145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 3, 2025
Merged

chore: bump the kendo-dependencies group across 1 directory with 20 updates #3145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
111abef
chore: bump the kendo-dependencies group across 1 directory with 20 u…
dependabot[bot] Jun 2, 2025
c95d5aa
chore: update grid props
silviyaboteva Jun 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
170 changes: 44 additions & 126 deletions examples/coffee-warehouse-nextjs/app/components/Grid.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ import {
import { Button } from "@progress/kendo-react-buttons";
import { GridPDFExport } from "@progress/kendo-react-pdf";
import { ExcelExport } from "@progress/kendo-react-excel-export";
import { process } from "@progress/kendo-data-query";
import { Input } from "@progress/kendo-react-inputs";
import { useLocalization } from "@progress/kendo-react-intl";
import { filePdfIcon, fileExcelIcon } from "@progress/kendo-svg-icons";
import { filterBy } from '@progress/kendo-data-query';
const noMessage = "message not defined";

export const Column = GridColumn;
Expand All @@ -30,40 +30,17 @@ export const ColumnMenu = (props) => {
};

export const Grid = (props) => {
const { data, onDataChange, ...others } = props;
const { data, onDataChange, defaultFilter, ...others } = props;

const excelExportRef = React.useRef(null);
const pdfExportRef = React.useRef(null);

const [isPdfExporting, setIsPdfExporting] = React.useState(false);
const [take, setTake] = React.useState(10);
const [skip, setSkip] = React.useState(0);
const [sort, setSort] = React.useState([]);
const [group, setGroup] = React.useState([]);
const [filter, setFilter] = React.useState(null);
const lastSelectedIndexRef = React.useRef(0);
const [allColumnFilter, setAllColumnFilter] = React.useState("");
const [filter, setFilter] = React.useState(defaultFilter);
const filteredData = filterBy(data, filter);
const [select, setSelect] = React.useState({});
const localizationService = useLocalization();

const dataState = {
take,
skip,
sort,
group,
filter,
};

const onDataStateChange = React.useCallback(
(event) => {
setTake(event.dataState.take);
setSkip(event.dataState.skip);
setSort(event.dataState.sort);
setGroup(event.dataState.group);
setFilter(event.dataState.filter);
},
[setTake, setSkip, setSort, setGroup]
);

const onExcelExport = React.useCallback(() => {
if (excelExportRef.current) {
excelExportRef.current.save();
Expand All @@ -74,116 +51,64 @@ export const Grid = (props) => {
setIsPdfExporting(false);
}, []);

const onAllColumnFilterChange = React.useCallback(
(event) => {
setAllColumnFilter(event.value);
},
[setAllColumnFilter]
);

const onSelectionChange = React.useCallback(
(event) => {
let last = lastSelectedIndexRef.current;
const updatedData = data.map((dataItem) => {
return { ...dataItem };
});
const current = data.findIndex((dataItem) => dataItem === event.dataItem);

if (!event.nativeEvent.shiftKey) {
lastSelectedIndexRef.current = last = current;
}

if (!event.nativeEvent.ctrlKey) {
updatedData.forEach((item) => (item.selected = false));
}
const select = !event.dataItem.selected;
for (let i = Math.min(last, current); i <= Math.max(last, current); i++) {
updatedData[i].selected = select;
}

onDataChange(updatedData);
},
[data, onDataChange]
);
const onPdfExport = React.useCallback(() => {
if (pdfExportRef.current) {
setIsPdfExporting(true);
pdfExportRef.current.save(data, onPdfExportDone);
}
}, [data, onPdfExportDone]);

const onHeaderSelectionChange = React.useCallback(
const handleFilterChange = React.useCallback(
(event) => {
const checked = event.syntheticEvent.target.checked;
const updatedData = data.map((item) => {
return {
...item,
selected: checked,
let filter = {
logic: 'or',
filters: [
{ field: 'contactName', operator: 'contains', value: event.value },
{ field: 'jobTitle', operator: 'contains', value: event.value },
{ field: 'budget', operator: 'contains', value: event.value },
{ field: 'phone', operator: 'contains', value: event.value },
{ field: 'address', operator: 'contains', value: event.value }
]
};
});

onDataChange(updatedData);
setFilter(filter);
},
[data, onDataChange]
[setFilter]
);

const textColumns = props.children
.map((col) => {
if (col.props.children) {
return col.props.children.map((child) => {
if (!child.props.filter || child.props.filter === "text") {
return child.props.field;
}
return null;
});
} else if (col.props.field) {
if (!col.props.filter || col.props.filter === "text") {
return col.props.field;
}
}
return null;
})
.flat()
.filter((field) => field);

const allColumnsFilters = textColumns.map((column) => ({
field: column,
operator: "contains",
value: allColumnFilter,
}));

const allColumnFilteredData = allColumnFilter
? process(data, { filter: { logic: "or", filters: allColumnsFilters } })
.data
: data;

const processedData = process(allColumnFilteredData, dataState);

React.useEffect(() => {
if (!processedData.data.length) {
setSkip(0);
}
}, [processedData]);
const onSelectionChange = React.useCallback((event) => {
setSelect(event.select);
}, []);

const onPdfExport = React.useCallback(() => {
if (pdfExportRef.current) {
setIsPdfExporting(true);
pdfExportRef.current.save(processedData.data, onPdfExportDone);
}
}, [processedData, onPdfExportDone]);
const onHeaderSelectionChange = React.useCallback((event) => {
setSelect(event.select);
}, []);

const GridElement = (
<KendoGrid
{...dataState}
{...others}
rowHeight={40}
pageable={true}
defaultSkip={0}
defaultTake={10}
sortable={true}
groupable={true}
selectedField={"selected"}
data={processedData}
onDataStateChange={onDataStateChange}
filter={filter}
data={filteredData}
dataItemKey={'id'}
autoProcessData={true}
selectable={{
enabled: true,
drag: false,
cell: false,
mode: 'single'
}}
select={select}
onSelectionChange={onSelectionChange}
onHeaderSelectionChange={onHeaderSelectionChange}
>
<GridToolbar>
<Input
value={allColumnFilter}
onChange={onAllColumnFilterChange}
onChange={handleFilterChange}
placeholder={localizationService.toLanguageString(
"custom.gridSearch",
noMessage
Expand All @@ -203,14 +128,7 @@ export const Grid = (props) => {
{localizationService.toLanguageString("custom.exportPdf", noMessage)}
</Button>
</GridToolbar>
<Column
field={"selected"}
width={50}
title={" "}
headerSelectionValue={
data.findIndex((dataItem) => dataItem.selected === false) === -1
}
/>
<Column columnType="checkbox" />
{props.children}
</KendoGrid>
);
Expand Down
4 changes: 2 additions & 2 deletions examples/coffee-warehouse-nextjs/app/styles/_common.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ a {
}

.card-ranges {
text-align: right;
justify-self: flex-end;
grid-column: 2 / 3;
grid-row: 1;
}
Expand Down Expand Up @@ -122,7 +122,7 @@ a {
}

.card-ranges {
text-align: right;
justify-self: flex-end;
grid-column: 3 / 4;
}

Expand Down
12 changes: 6 additions & 6 deletions examples/coffee-warehouse-nextjs/app/warehouse/dashboard/dashboard-page.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ export default function DashBoard(props) {
)}
columnMenu={ColumnMenu}
width={230}
cell={FullNameCell}
cells={{ data: FullNameCell }}
/>
<Column
field={"jobTitle"}
Expand All @@ -184,7 +184,7 @@ export default function DashBoard(props) {
)}
columnMenu={ColumnMenu}
width={100}
cell={FlagCell}
cells={{ data: FlagCell }}
/>
<Column
field={"isOnline"}
Expand All @@ -194,7 +194,7 @@ export default function DashBoard(props) {
)}
columnMenu={ColumnMenu}
width={100}
cell={OnlineCell}
cells={{ data: OnlineCell }}
filter={"boolean"}
/>
</Column>
Expand All @@ -213,7 +213,7 @@ export default function DashBoard(props) {
)}
columnMenu={ColumnMenu}
width={110}
cell={RatingCell}
cells={{ data: RatingCell }}
filter={"numeric"}
/>
<Column
Expand All @@ -224,7 +224,7 @@ export default function DashBoard(props) {
)}
columnMenu={ColumnMenu}
width={200}
cell={EngagementCell}
cells={{ data: EngagementCell }}
filter={"numeric"}
/>
<Column
Expand All @@ -235,7 +235,7 @@ export default function DashBoard(props) {
)}
columnMenu={ColumnMenu}
width={100}
cell={CurrencyCell}
cells={{ data: CurrencyCell }}
filter={"numeric"}
/>
</Column>
Expand Down
44 changes: 22 additions & 22 deletions examples/coffee-warehouse-nextjs/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,30 +12,30 @@
"follow-redirects": ">=1.15.4"
},
"dependencies": {
"@progress/kendo-data-query": "^1.7.0",
"@progress/kendo-data-query": "^1.7.1",
"@progress/kendo-date-math": "^1.5.14",
"@progress/kendo-drawing": "^1.21.2",
"@progress/kendo-licensing": "^1.5.1",
"@progress/kendo-react-buttons": "^10.0.0",
"@progress/kendo-react-charts": "^10.0.0",
"@progress/kendo-react-data-tools": "^10.0.0",
"@progress/kendo-react-dateinputs": "^10.0.0",
"@progress/kendo-react-dialogs": "^10.0.0",
"@progress/kendo-react-dropdowns": "^10.0.0",
"@progress/kendo-react-editor": "^10.0.0",
"@progress/kendo-react-excel-export": "^10.0.0",
"@progress/kendo-react-form": "^10.0.0",
"@progress/kendo-react-grid": "^10.0.0",
"@progress/kendo-react-indicators": "^10.0.0",
"@progress/kendo-react-inputs": "^10.0.0",
"@progress/kendo-react-intl": "^10.0.0",
"@progress/kendo-react-layout": "^10.0.0",
"@progress/kendo-react-pdf": "^10.0.0",
"@progress/kendo-react-progressbars": "^10.0.0",
"@progress/kendo-react-scheduler": "^10.0.0",
"@progress/kendo-react-treeview": "^10.0.0",
"@progress/kendo-react-upload": "^10.0.0",
"@progress/kendo-theme-default": "^10.3.1",
"@progress/kendo-licensing": "^1.6.0",
"@progress/kendo-react-buttons": "^11.0.0",
"@progress/kendo-react-charts": "^11.0.0",
"@progress/kendo-react-data-tools": "^11.0.0",
"@progress/kendo-react-dateinputs": "^11.0.0",
"@progress/kendo-react-dialogs": "^11.0.0",
"@progress/kendo-react-dropdowns": "^11.0.0",
"@progress/kendo-react-editor": "^11.0.0",
"@progress/kendo-react-excel-export": "^11.0.0",
"@progress/kendo-react-form": "^11.0.0",
"@progress/kendo-react-grid": "^11.0.0",
"@progress/kendo-react-indicators": "^11.0.0",
"@progress/kendo-react-inputs": "^11.0.0",
"@progress/kendo-react-intl": "^11.0.0",
"@progress/kendo-react-layout": "^11.0.0",
"@progress/kendo-react-pdf": "^11.0.0",
"@progress/kendo-react-progressbars": "^11.0.0",
"@progress/kendo-react-scheduler": "^11.0.0",
"@progress/kendo-react-treeview": "^11.0.0",
"@progress/kendo-react-upload": "^11.0.0",
"@progress/kendo-theme-default": "^11.0.2",
"cldr-core": "44.0.1",
"cldr-dates-full": "44.0.1",
"cldr-numbers-full": "44.0.1",
Expand Down
1 change: 0 additions & 1 deletion examples/react-coffee-warehouse/src/components/Grid.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@ export const Grid = (props) => {
const [select, setSelect] = React.useState({});
const localizationService = useLocalization();


const onExcelExport = React.useCallback(
() => {
if (excelExportRef.current) {
Expand Down