diff --git a/src/components/BMDashboard/WeeklyProjectSummary/GroupedBarGraphInjurySeverity/InjuryCategoryBarChart.jsx b/src/components/BMDashboard/WeeklyProjectSummary/GroupedBarGraphInjurySeverity/InjuryCategoryBarChart.jsx index 38b7820ee2..db52e8def1 100644 --- a/src/components/BMDashboard/WeeklyProjectSummary/GroupedBarGraphInjurySeverity/InjuryCategoryBarChart.jsx +++ b/src/components/BMDashboard/WeeklyProjectSummary/GroupedBarGraphInjurySeverity/InjuryCategoryBarChart.jsx @@ -8,7 +8,6 @@ import { Legend, LabelList, ResponsiveContainer, - CartesianGrid, } from 'recharts'; import Select from 'react-select'; import DatePicker from 'react-datepicker'; @@ -142,39 +141,38 @@ function InjuryCategoryBarChart() { '#38BDF8', // cyan ]; - const selectStyles = darkMode - ? { - control: base => ({ - ...base, - backgroundColor: '#2b3e59', - color: 'white', - }), - menu: base => ({ - ...base, - backgroundColor: '#2b3e59', - color: 'white', - }), - option: (base, state) => ({ - ...base, - color: 'white', - backgroundColor: state.isSelected - ? 'rgba(255, 255, 255, 0.15)' - : state.isFocused - ? 'rgba(255, 255, 255, 0.1)' - : 'transparent', - '&:active': { - backgroundColor: 'rgba(255, 255, 255, 0.2)', - }, - }), - singleValue: base => ({ - ...base, - color: 'white', - }), - } - : {}; + const selectStyles = darkMode && { + control: base => ({ + ...base, + backgroundColor: '#2b3e59', + color: 'white', + }), + menu: base => ({ + ...base, + backgroundColor: '#2b3e59', + color: 'white', + }), + option: (base, state) => ({ + ...base, + color: 'white', + backgroundColor: state.isSelected + ? 'rgba(255, 255, 255, 0.15)' + : state.isFocused + ? 'rgba(255, 255, 255, 0.1)' + : 'transparent', + '&:active': { + backgroundColor: 'rgba(255, 255, 255, 0.2)', + }, + }), + singleValue: base => ({ + ...base, + color: 'white', + }), + }; + // : {}; return ( -
+

Injury Severity by Category of Worker Injured

@@ -266,68 +264,80 @@ function InjuryCategoryBarChart() { {loading &&

Loading…

} {!loading && error &&

Error: {String(error)}

} - {!loading && !error && ( -
- - - - - - [ - value, - projectNameById.get(String(name)) || 'Unknown Project', - ]} - /> - ({ - id: pid, - type: 'square', - color: COLOR_PALETTE[index % COLOR_PALETTE.length], - value: projectNameById.get(pid) || 'Unknown Project', - }))} - /> - {seriesProjectIds.map((pid, index) => ( - - {showLabels && ( - (v > 0 ? v : '')} /> - )} - - ))} - - -
+ {!loading && !error && chartData.length > 0 && ( + + + + + [ + value, + projectNameById.get(String(name)) || 'Unknown Project', + ]} + /> + ({ + id: pid, + type: 'square', + color: COLOR_PALETTE[index % COLOR_PALETTE.length], + value: projectNameById.get(pid) || 'Unknown Project', + }))} + /> + {seriesProjectIds.map((pid, index) => ( + + {showLabels && ( + (v > 0 ? v : '')} + // fill={darkMode ? '#fff' : '#000'} + /> + )} + + ))} + + )} {!loading && !error && chartData.length === 0 && ( diff --git a/yarn.lock b/yarn.lock index 9e982aba12..9b1aaddb6c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12119,4 +12119,4 @@ yocto-queue@^0.1.0: yoctocolors-cjs@^2.1.2: version "2.1.3" resolved "https://registry.npmjs.org/yoctocolors-cjs/-/yoctocolors-cjs-2.1.3.tgz" - integrity sha512-U/PBtDf35ff0D8X8D0jfdzHYEPFxAI7jJlxZXwCSez5M3190m+QobIfh+sWDWSHMCWWJN2AWamkegn6vr6YBTw== + integrity sha512-U/PBtDf35ff0D8X8D0jfdzHYEPFxAI7jJlxZXwCSez5M3190m+QobIfh+sWDWSHMCWWJN2AWamkegn6vr6YBTw== \ No newline at end of file