Skip to content

Commit 0fdde98

Browse files
Joelius300mmuffins
andcommitted
Safeguard removing data if empty, remove unnecessary Random instances
Fixes #167 Co-Authored-By: Michael Kellner <16214627+mmuffins@users.noreply.github.com>
1 parent bfa6b62 commit 0fdde98

5 files changed

Lines changed: 12 additions & 6 deletions

File tree

ChartJs.Blazor.Samples/Client/Pages/Charts/Bar/Horizontal.razor

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,11 @@
122122

123123
private void RemoveData()
124124
{
125-
if (_config.Data.Datasets.Count == 0)
125+
if (_config.Data.Datasets.Count == 0 ||
126+
_config.Data.Labels.Count == 0)
127+
{
126128
return;
129+
}
127130

128131
_config.Data.Labels.RemoveAt(_config.Data.Labels.Count - 1);
129132

ChartJs.Blazor.Samples/Client/Pages/Charts/Bar/Stacked.razor

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
@code {
1111
private const int InitalCount = 7;
1212
private BarConfig _config;
13-
private Random _rng = new Random();
1413
private Chart _chart;
1514

1615
protected override void OnInitialized()

ChartJs.Blazor.Samples/Client/Pages/Charts/Bar/Vertical.razor

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,11 @@
122122

123123
private void RemoveData()
124124
{
125-
if (_config.Data.Datasets.Count == 0)
125+
if (_config.Data.Datasets.Count == 0 ||
126+
_config.Data.Labels.Count == 0)
127+
{
126128
return;
129+
}
127130

128131
_config.Data.Labels.RemoveAt(_config.Data.Labels.Count - 1);
129132

ChartJs.Blazor.Samples/Client/Pages/Charts/Line/Basic.razor

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
@code {
1414
private const int InitalCount = 7;
1515
private LineConfig _config;
16-
private Random _rng = new Random();
1716
private Chart _chart;
1817

1918
protected override void OnInitialized()
@@ -140,8 +139,11 @@
140139

141140
private void RemoveData()
142141
{
143-
if (_config.Data.Datasets.Count == 0)
142+
if (_config.Data.Datasets.Count == 0 ||
143+
_config.Data.Labels.Count == 0)
144+
{
144145
return;
146+
}
145147

146148
_config.Data.Labels.RemoveAt(_config.Data.Labels.Count - 1);
147149

ChartJs.Blazor.Samples/Client/Pages/Charts/Pie.razor

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
@code {
1313
private const int InitalCount = 5;
1414
private PieConfig _config;
15-
private Random _rng = new Random();
1615
private Chart _chart;
1716

1817
protected override void OnInitialized()

0 commit comments

Comments
 (0)