Merge pull request #248 from caktus/develop

Production release v1.14.0
caktus · Dec 6, 2023 · d7b40d3 · d7b40d3
2 parents b117ebe + a908ebb
commit d7b40d3
Show file tree

Hide file tree

Showing 26 changed files with 6,557 additions and 150 deletions.
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -2,7 +2,7 @@ name: deploy
 
 on:
   push:
-    branches: [main, develop, 112-deploy-fix]
+    branches: [main, develop, CU-8686edfh0-performance]
 
 jobs:
   deploy:

diff --git a/frontend/src/Components/App.js b/frontend/src/Components/App.js
@@ -44,6 +44,7 @@ import * as S from './HomePage/HomePage.styled';
 // New Charts
 import {
   ArcElement,
+  BarElement,
   CategoryScale,
   Chart as ChartJS,
   Legend,
@@ -56,6 +57,7 @@ import {
 
 ChartJS.register(
   ArcElement,
+  BarElement,
   CategoryScale,
   LinearScale,
   PointElement,

diff --git a/frontend/src/Components/Charts/ChartSections/ChartsCommon.styled.js b/frontend/src/Components/Charts/ChartSections/ChartsCommon.styled.js
@@ -166,7 +166,7 @@ export const LegendSection = styled.div`
   margin-top: 2em;
   display: flex;
   flex-direction: column;
-  align-items: center;
+  align-items: start;
   width: 100%;
   flex: 0;
 

diff --git a/frontend/src/Components/Charts/ChartSections/Legend/Legend.js b/frontend/src/Components/Charts/ChartSections/Legend/Legend.js
@@ -5,15 +5,24 @@ import * as S from './Legend.styled';
 import { ICONS } from '../../../../img/icons/Icon';
 import { WEIGHTS } from '../../../../styles/StyledComponents/Typography';
 
-function Legend({ keys, onKeySelect, isStatic, showNonHispanic, heading, direction = 'row' }) {
+function Legend({
+  keys,
+  onKeySelect,
+  isStatic,
+  showNonHispanic,
+  heading,
+  direction = 'row',
+  legendColors = 'ethnicGroup',
+}) {
   const theme = useTheme();
 
   return (
     <S.Legend>
       {heading && <S.LegendHeading weight={WEIGHTS[1]}>{heading}</S.LegendHeading>}
       <S.KeysList direction={direction}>
         {keys?.map((key) => {
-          const fill = key.selected ? theme.colors.ethnicGroup[key.value] : theme.colors.grey;
+          const colors = theme.colors[legendColors];
+          const fill = key.selected ? colors[key.value] : theme.colors.grey;
           const iconProps = {
             fill,
             width: 25,