fix(FE): update dashboard line chart and types

This commit is contained in:
randy-ar
2026-01-18 16:15:18 +07:00
parent d31c1deaa2
commit c576933ba2
4 changed files with 18 additions and 12 deletions
+7
View File
@@ -17,6 +17,7 @@
"cmdk": "^1.1.1",
"embla-carousel-react": "^8.6.0",
"formik": "^2.4.6",
"html-to-image": "^1.11.13",
"input-otp": "^1.4.2",
"jspdf": "^3.0.4",
"jspdf-autotable": "^5.0.2",
@@ -7380,6 +7381,12 @@
"integrity": "sha512-LgOWAkrN0rFaQpfdWBQlv/VhkOxb5AsBjk6NQVx4yEzWS923T07X0M1Y0VNko2H52HeSpZrZNNMJ0aFqsdVzQg==",
"license": "ISC"
},
"node_modules/html-to-image": {
"version": "1.11.13",
"resolved": "https://registry.npmjs.org/html-to-image/-/html-to-image-1.11.13.tgz",
"integrity": "sha512-cuOPoI7WApyhBElTTb9oqsawRvZ0rHhaHwghRLlTuffoD1B2aDemlCruLeZrUIIdvG7gs9xeELEPm6PhuASqrg==",
"license": "MIT"
},
"node_modules/html2canvas": {
"version": "1.4.1",
"resolved": "https://registry.npmjs.org/html2canvas/-/html2canvas-1.4.1.tgz",
+1
View File
@@ -20,6 +20,7 @@
"cmdk": "^1.1.1",
"embla-carousel-react": "^8.6.0",
"formik": "^2.4.6",
"html-to-image": "^1.11.13",
"input-otp": "^1.4.2",
"jspdf": "^3.0.4",
"jspdf-autotable": "^5.0.2",
@@ -38,7 +38,7 @@ function isOverviewCharts(
function isComparisonCharts(
charts: DashboardOverviewCharts | DashboardComparisonCharts
): charts is DashboardComparisonCharts {
return 'location' in charts || 'flock' in charts || 'kandang' in charts;
return 'farm' in charts || 'flock' in charts || 'kandang' in charts;
}
const lineColors: Record<string, string> = {
@@ -123,7 +123,7 @@ const DashboardLineChart = ({
isComparisonCharts(data.charts)
) {
const comparisonChart =
data.charts.location || data.charts.flock || data.charts.kandang;
data.charts.farm || data.charts.flock || data.charts.kandang;
seriesData = comparisonChart?.series || [];
}
@@ -224,7 +224,7 @@ const DashboardLineChart = ({
isComparisonCharts(data.charts)
) {
const comparisonChart =
data.charts.location || data.charts.flock || data.charts.kandang;
data.charts.farm || data.charts.flock || data.charts.kandang;
seriesData = comparisonChart?.series || [];
}
@@ -303,7 +303,7 @@ const DashboardLineChart = ({
// For COMPARISON mode, use the first available comparison chart
if (isComparisonCharts(data.charts)) {
const chartData =
data.charts.location ||
data.charts.farm ||
data.charts.flock ||
data.charts.kandang;
@@ -353,7 +353,7 @@ const DashboardLineChart = ({
isComparisonCharts(data.charts)
) {
const comparisonChart =
data.charts.location ||
data.charts.farm ||
data.charts.flock ||
data.charts.kandang;
seriesData = comparisonChart?.series || [];
@@ -401,7 +401,7 @@ const DashboardLineChart = ({
isComparisonCharts(data.charts)
) {
const comparisonChart =
data.charts.location ||
data.charts.farm ||
data.charts.flock ||
data.charts.kandang;
seriesData = comparisonChart?.series || [];
@@ -470,7 +470,7 @@ const DashboardLineChart = ({
isComparisonCharts(data.charts)
) {
const comparisonChart =
data.charts.location ||
data.charts.farm ||
data.charts.flock ||
data.charts.kandang;
seriesData = comparisonChart?.series || [];
@@ -497,9 +497,7 @@ const DashboardLineChart = ({
isComparisonCharts(data.charts)
) {
const comparisonChart =
data.charts.location ||
data.charts.flock ||
data.charts.kandang;
data.charts.farm || data.charts.flock || data.charts.kandang;
seriesData = comparisonChart?.series || [];
}
@@ -557,7 +555,7 @@ const DashboardLineChart = ({
isComparisonCharts(data.charts)
) {
const comparisonChart =
data.charts.location || data.charts.flock || data.charts.kandang;
data.charts.farm || data.charts.flock || data.charts.kandang;
dataset = comparisonChart?.dataset || [];
}
+1 -1
View File
@@ -6,7 +6,7 @@ export interface Dashboard {
}
export interface DashboardComparisonCharts {
location: DashboardCharts;
farm: DashboardCharts;
flock: DashboardCharts;
kandang: DashboardCharts;
}