Skip to content

Commit 450d58c

Browse files
silviyabotevasilviyaboteva
authored
Merge pull request #3194 from telerik/dependabot/npm_and_yarn/examples/kendo-react-homepage-demo/kendo-dependencies-97c9e0b6b6
chore: bump the kendo-dependencies group across 1 directory with 24 updates
2 parents 7ac6452 + 879ba95 commit 450d58c

File tree

8 files changed

+5062
-4806
lines changed

8 files changed

+5062
-4806
lines changed

‎examples/kendo-react-homepage-demo/package-lock.json‎

Lines changed: 237 additions & 166 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/kendo-react-homepage-demo/package.json‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@
77
"@apollo/client": "^3.8.10",
88
"@progress/kendo-data-query": "^1.7.1",
99
"@progress/kendo-drawing": "^1.21.2",
10-
"@progress/kendo-react-charts": "^10.0.0",
11-
"@progress/kendo-react-dateinputs": "^10.0.0",
12-
"@progress/kendo-react-dropdowns": "^10.0.0",
13-
"@progress/kendo-react-grid": "^10.0.0",
14-
"@progress/kendo-react-inputs": "^10.0.0",
15-
"@progress/kendo-react-intl": "^10.0.0",
16-
"@progress/kendo-react-layout": "^10.0.0",
17-
"@progress/kendo-theme-material": "^10.3.1",
10+
"@progress/kendo-react-charts": "^11.1.0",
11+
"@progress/kendo-react-dateinputs": "^11.1.0",
12+
"@progress/kendo-react-dropdowns": "^11.1.0",
13+
"@progress/kendo-react-grid": "^11.1.0",
14+
"@progress/kendo-react-inputs": "^11.1.0",
15+
"@progress/kendo-react-intl": "^11.1.0",
16+
"@progress/kendo-react-layout": "^11.1.0",
17+
"@progress/kendo-theme-material": "^11.0.2",
1818
"bootstrap": "5.2.1",
1919
"dotenv": "^16.3.2",
2020
"graphql": "^16.8.1",

‎examples/kendo-react-homepage-demo/src/components/Author.jsx‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
import React from 'react';
2+
3+
export const Author = (props) => {
4+
return (
5+
<td>
6+
<p className="author-container">
7+
<span>
8+
<img
9+
className="img-circle"
10+
alt="User Avatar"
11+
src={props.dataItem.node.author.avatarUrl} style={{ width: 30, height: 30 }}
12+
/>
13+
</span>
14+
{props.dataItem.node.author.login}
15+
</p>
16+
</td>
17+
)
18+
}

‎examples/kendo-react-homepage-demo/src/components/DetailComponent.jsx‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ export class DetailComponent extends React.Component {
1616
render() {
1717
const dataItem = this.props.dataItem;
1818
const data = this.props.makeChartData(dataItem.node.labels.edges);
19-
2019
const defaultTooltipRender = (item) => {
2120
if (item.point) {
2221
return (`${item.point.category} : ${item.point.value}`)
@@ -25,7 +24,7 @@ export class DetailComponent extends React.Component {
2524
};
2625

2726
return (
28-
<div style={{ padding: 0 }}>
27+
<div key={dataItem.node.number} style={{ padding: 0 }}>
2928
<div className="row" style={{ height: 300 }}>
3029
<div className="col-2" >
3130
<strong>Author: {dataItem.node.author.login}</strong>

‎examples/kendo-react-homepage-demo/src/components/KendoGridContainer.jsx‎

Lines changed: 10 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
import React from "react";
22
import { Query } from '@apollo/client/react/components';
33
import { Grid, GridColumn } from '@progress/kendo-react-grid';
4-
import { process } from '@progress/kendo-data-query';
54
import { ColumnMenu } from './ColumnMenu';
65
import { DetailComponent } from './DetailComponent';
76
import { StateCell } from './StateCell';
8-
import { АssignedTo } from './АssignedTo';
7+
import { Author } from './Author';
98
import { LoadingPanel } from './LoadingPanel';
109

1110
import { getQuery } from '../queries/github';
@@ -15,17 +14,9 @@ import reactIssues from '../data/fallBackDataReact.json';
1514

1615

1716
export class KendoGridContainer extends React.Component {
18-
state = {
19-
skip: 0,
20-
take: 10
21-
}
2217
allLabels = [];
2318
uniqueLabels = [];
2419
initialLoad = true;
25-
expandChange = (event) => {
26-
event.dataItem.expanded = !event.dataItem.expanded;
27-
this.forceUpdate();
28-
}
2920

3021
getOccurrence = (array, value) => {
3122
var count = 0;
@@ -84,10 +75,6 @@ export class KendoGridContainer extends React.Component {
8475
this.allLabels = [];
8576

8677
gridData.map((item, index) => {
87-
if (this.initialLoad) {
88-
index === 0 ? item.expanded = true : item.expanded = false
89-
this.initialLoad = false
90-
}
9178
item.node.createdAt = new Date(item.node.createdAt)
9279
item.node.labels.edges.forEach(item => {
9380
this.allLabels.push({
@@ -106,20 +93,22 @@ export class KendoGridContainer extends React.Component {
10693
return (
10794
<React.Fragment>
10895
<Grid
109-
data={process(gridData, this.state)}
96+
data={gridData}
97+
autoProcessData={true}
98+
dataItemKey='id'
11099
sortable
111100
pageable
112-
{...this.state}
113-
onDataStateChange={(e) => { this.setState(e.dataState); }}
114-
expandField="expanded"
115-
onExpandChange={this.expandChange}
101+
defaultSkip={0}
102+
defaultTake={10}
116103
style={{ height: '100%', overflow: 'auto', borderInline: 0 }}
104+
scrollable={'scrollable'}
105+
onDetailExpandChange={(e) => { console.log(e) }}
117106
detail={(props) => <DetailComponent {...props} makeChartData={this.makeChartData} />}
118107
>
119108
<GridColumn field="node.number" title="ID" width={100} />
120-
<GridColumn field="node.state" title="State" cell={StateCell} width={100} />
109+
<GridColumn field="node.state" title="State" cells={{ data: StateCell }} width={100} />
121110
<GridColumn field="node.title" title="Issue" columnMenu={ColumnMenu} />
122-
<GridColumn field="node.assignees.node" title="Assigned to" width={200} cell={АssignedTo} sortable={false} />
111+
<GridColumn field="node.author.label" title="Author" width={200} cells={{ data: Author }} sortable={false} />
123112
<GridColumn field="node.createdAt" title="Created on" width={200} format='{0:yyyy/MM/dd hh:mm a}' filter="date" columnMenu={ColumnMenu} />
124113
</Grid>
125114
{loading && <LoadingPanel />}

‎examples/kendo-react-homepage-demo/src/components/АssignedTo.jsx‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

0 commit comments

Comments
 (0)