Skip to content

Commit 29acdf7

Browse files
committed
fix(finjs): making main chart sample work by upgrading charts
1 parent 5d14a31 commit 29acdf7

4 files changed

Lines changed: 45 additions & 46 deletions

File tree

package-lock.json

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

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@
7373
"file-saver": "^2.0.2",
7474
"hammerjs": "^2.0.8",
7575
"igniteui-angular": "^20.1.4",
76-
"igniteui-angular-charts": "^19.0.1",
77-
"igniteui-angular-core": "^19.0.1",
76+
"igniteui-angular-charts": "^20.1.0",
77+
"igniteui-angular-core": "^20.1.0",
7878
"igniteui-angular-extras": "^20.0.0",
7979
"igniteui-angular-i18n": "^20.1.4",
8080
"igniteui-dockmanager": "^1.17.0",
Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
import { RenderMode, ServerRoute } from '@angular/ssr';
22

33
export const serverRoutes: ServerRoute[] = [
4-
{
5-
path: 'grid/grid',
6-
renderMode: RenderMode.Client // TODO: Fails with Prerender
7-
},
8-
{
9-
path: 'treegrid-finjs',
10-
renderMode: RenderMode.Client // TODO: Fails with Prerender
11-
},
12-
{
13-
path: 'samples/treegrid-finjs',
14-
renderMode: RenderMode.Client // TODO: Fails with Prerender
15-
},
16-
{
17-
path: 'grid-finjs-dock-manager/**',
18-
renderMode: RenderMode.Client // TODO: Fails with Prerender
19-
},
20-
{
21-
path: 'samples/grid-finjs-dock-manager/**',
22-
renderMode: RenderMode.Client // TODO: Fails with Prerender
23-
},
4+
// {
5+
// path: 'grid/grid',
6+
// renderMode: RenderMode.Client // TODO: Fails with Prerender
7+
// },
8+
// {
9+
// path: 'treegrid-finjs',
10+
// renderMode: RenderMode.Client // TODO: Fails with Prerender
11+
// },
12+
// {
13+
// path: 'samples/treegrid-finjs',
14+
// renderMode: RenderMode.Client // TODO: Fails with Prerender
15+
// },
16+
// {
17+
// path: 'grid-finjs-dock-manager/**',
18+
// renderMode: RenderMode.Client // TODO: Fails with Prerender
19+
// },
20+
// {
21+
// path: 'samples/grid-finjs-dock-manager/**',
22+
// renderMode: RenderMode.Client // TODO: Fails with Prerender
23+
// },
2424
{
2525
path: '**',
26-
renderMode: RenderMode.Prerender
26+
renderMode: RenderMode.Client // SSR disabled for all routes
2727
}
2828
];

projects/app-lob/src/app/grid-finjs/main.component.ts

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
11
import { AfterViewInit, Component, HostBinding, OnDestroy, ViewChild } from '@angular/core';
2-
import { Router } from '@angular/router';
32
import { IgxDialogComponent, IgxOverlayOutletDirective, OverlaySettings, IgxDialogTitleDirective, IgxDialogActionsDirective, IgxButtonDirective, IgxFocusDirective } from 'igniteui-angular';
4-
import { IgxCategoryChartComponent, IgxCategoryChartCoreModule } from 'igniteui-angular-charts';
3+
import { IgxCategoryChartComponent, IgxCategoryChartModule } from 'igniteui-angular-charts';
54
import { Stock } from '../data/financialData';
65
import { ControllerComponent } from './controllers.component';
76
import { GridFinJSComponent } from './grid-finjs.component';
87

9-
@Component({
10-
selector: 'app-finjs-main',
11-
styleUrls: ['./main.component.scss'],
12-
templateUrl: './main.component.html',
13-
imports: [ControllerComponent, GridFinJSComponent, IgxOverlayOutletDirective, IgxDialogComponent, IgxDialogTitleDirective, IgxCategoryChartCoreModule, IgxDialogActionsDirective, IgxButtonDirective, IgxFocusDirective]
8+
@Component({
9+
selector: 'app-finjs-main',
10+
styleUrls: ['./main.component.scss'],
11+
templateUrl: './main.component.html',
12+
imports: [ControllerComponent, GridFinJSComponent, IgxOverlayOutletDirective, IgxDialogComponent, IgxDialogTitleDirective, IgxCategoryChartModule, IgxDialogActionsDirective, IgxButtonDirective, IgxFocusDirective]
1413
})
1514
export class FinJSDemoComponent implements OnDestroy, AfterViewInit {
1615
@ViewChild('finGrid', { static: true }) public finGrid: GridFinJSComponent;
@@ -99,7 +98,7 @@ export class FinJSDemoComponent implements OnDestroy, AfterViewInit {
9998
public setChartData(args: Stock[]): void {
10099
this.chartData = [];
101100
args.forEach(rowKey => {
102-
const row: Stock = this.finGrid.grid.getRowByKey(rowKey).data;
101+
const row: Stock = this.finGrid.grid.getRowByKey(rowKey.id).data;
103102
this.chartData.push(row);
104103
this.chart.notifyInsertItem(this.chartData, this.chartData.length - 1, row);
105104
});

0 commit comments

Comments
 (0)