Skip to content

Commit ec4ab8a

Browse files
committed
fix(samples): data id fix and some code cleaning
1 parent f671402 commit ec4ab8a

2 files changed

Lines changed: 30 additions & 31 deletions

File tree

  • samples/grids

samples/grids/grid/data-exporting-indicator/src/index.tsx

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import React, { useEffect, useState } from "react";
1+
import React, { useEffect, useMemo, useState } from "react";
22
import ReactDOM from "react-dom/client";
33
import "./index.css";
44
import "igniteui-react-grids/grids/themes/light/bootstrap.css";
5-
import { AthletesData } from "./AthletesData";
5+
import { AthletesData, AthletesDataItem } from "./AthletesData";
66

77
import { IgrButton } from "igniteui-react";
88
import {
@@ -16,19 +16,20 @@ import {
1616

1717

1818
export default function GridDataExportingIndicatorSample() {
19-
const athletesData = new AthletesData();
19+
const athletesData = useMemo(() => new AthletesData(), []);
2020
const [localData, setLocalData] = useState([]);
2121
const [showProgress, setShowProgress] = useState(false);
2222

2323
useEffect(() => {
24-
const data: any[] = [];
25-
for (let i = 0; i < 2000; i += 3) {
24+
const data: AthletesDataItem[] = [];
25+
let uniqueId = 0;
26+
for (let i = 0; i < 2000; i ++) {
2627
for (let c = 0; c < athletesData.length; c++) {
27-
data.push(athletesData[c]);
28+
data.push({ ...athletesData[c], Id: uniqueId++ });
2829
}
2930
}
3031
setLocalData(data);
31-
}, []);
32+
}, [athletesData]);
3233

3334

3435
const setupProgressVisibility = () => {
@@ -37,7 +38,7 @@ export default function GridDataExportingIndicatorSample() {
3738
setTimeout(() => {
3839
setShowProgress(false);
3940
}, 5000);
40-
}
41+
};
4142

4243
return (
4344
<div className="container sample ig-typography">
@@ -46,7 +47,6 @@ export default function GridDataExportingIndicatorSample() {
4647
data={localData}
4748
autoGenerate={false}
4849
primaryKey="Id"
49-
height="350px"
5050
>
5151
<IgrGridToolbar key="toolbar" showProgress={showProgress}>
5252
<IgrGridToolbarTitle key="toolbarTitle">
@@ -60,13 +60,13 @@ export default function GridDataExportingIndicatorSample() {
6060
</IgrGridToolbarActions>
6161
</IgrGridToolbar>
6262

63-
<IgrColumn field="Id" header="ID" dataType="number"></IgrColumn>
64-
<IgrColumn field="Name" header="Name"></IgrColumn>
65-
<IgrColumn field="Position" header="Position"></IgrColumn>
66-
<IgrColumn field="AthleteNumber" header="Athlete Number" dataType="number"></IgrColumn>
67-
<IgrColumn field="BeatsPerMinute" header="Beats Per Minute" dataType="number"></IgrColumn>
68-
<IgrColumn field="TopSpeed" header="Top Speed" dataType="number"></IgrColumn>
69-
<IgrColumn field="CountryName" header="Country"></IgrColumn>
63+
<IgrColumn field="Id" header="ID" dataType="number" />
64+
<IgrColumn field="Name" header="Name" />
65+
<IgrColumn field="Position" header="Position" />
66+
<IgrColumn field="AthleteNumber" header="Athlete Number" dataType="number" />
67+
<IgrColumn field="BeatsPerMinute" header="Beats Per Minute" dataType="number" />
68+
<IgrColumn field="TopSpeed" header="Top Speed" dataType="number" />
69+
<IgrColumn field="CountryName" header="Country" />
7070
</IgrGrid>
7171
</div>
7272
</div>

samples/grids/tree-grid/data-exporting-indicator/src/index.tsx

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import React, { useEffect, useRef, useState } from "react";
1+
import React, { useEffect, useMemo, useState } from "react";
22
import ReactDOM from "react-dom/client";
33
import "./index.css";
44
import "igniteui-react-grids/grids/themes/light/bootstrap.css";
5-
import { OrdersTreeData } from "./OrdersData";
5+
import { OrdersTreeData, OrdersTreeDataItem } from "./OrdersData";
66

77
import { IgrButton } from "igniteui-react";
88
import {
@@ -16,13 +16,13 @@ import {
1616

1717

1818
export default function TreeGridDataExportingIndicatorSample() {
19-
const ordersData = new OrdersTreeData();
19+
const ordersData = useMemo(() => new OrdersTreeData(), []);
2020
const [localData, setLocalData] = useState([]);
2121
const [showProgress, setShowProgress] = useState(false);
2222

2323
useEffect(() => {
24-
const data: any[] = [];
25-
for (let i = 0; i < 1000; i++) {
24+
const data: OrdersTreeDataItem[] = [];
25+
for (let i = 0; i < 2000; i++) {
2626
for (let c = 0; c < ordersData.length; c++) {
2727
const original = ordersData[c];
2828
data.push({
@@ -33,15 +33,15 @@ export default function TreeGridDataExportingIndicatorSample() {
3333
}
3434
}
3535
setLocalData(data);
36-
}, []);
36+
}, [ordersData]);
3737

3838
const setupProgressVisibility = () => {
3939
setShowProgress(true);
4040

4141
setTimeout(() => {
4242
setShowProgress(false);
4343
}, 5000);
44-
}
44+
};
4545

4646
return (
4747
<div className="container sample ig-typography">
@@ -51,7 +51,6 @@ export default function TreeGridDataExportingIndicatorSample() {
5151
autoGenerate={false}
5252
primaryKey="ID"
5353
foreignKey="ParentID"
54-
height="350px"
5554
>
5655
<IgrGridToolbar key="toolbar" showProgress={showProgress}>
5756
<IgrGridToolbarTitle key="toolbarTitle">
@@ -65,13 +64,13 @@ export default function TreeGridDataExportingIndicatorSample() {
6564
</IgrGridToolbarActions>
6665
</IgrGridToolbar>
6766

68-
<IgrColumn field="ID" header="Order ID"></IgrColumn>
69-
<IgrColumn field="Name" header="Order Product"></IgrColumn>
70-
<IgrColumn field="Category" header="Category"></IgrColumn>
71-
<IgrColumn field="Units" header="Units" dataType="number"></IgrColumn>
72-
<IgrColumn field="UnitPrice" header="Unit Price" dataType="currency"></IgrColumn>
73-
<IgrColumn field="Price" header="Price" dataType="currency"></IgrColumn>
74-
<IgrColumn field="OrderDate" header="Order Date" dataType="date"></IgrColumn>
67+
<IgrColumn field="ID" header="Order ID" />
68+
<IgrColumn field="Name" header="Order Product" />
69+
<IgrColumn field="Category" header="Category" />
70+
<IgrColumn field="Units" header="Units" dataType="number" />
71+
<IgrColumn field="UnitPrice" header="Unit Price" dataType="currency" />
72+
<IgrColumn field="Price" header="Price" dataType="currency" />
73+
<IgrColumn field="OrderDate" header="Order Date" dataType="date" />
7574
</IgrTreeGrid>
7675
</div>
7776
</div>

0 commit comments

Comments
 (0)