Merge pull request #90 from caktus/develop

Production Deploy 1/20/2022
caktus · Jan 20, 2022 · 616daf2 · 616daf2
2 parents 8f6096a + c2a85c6
commit 616daf2
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 32 deletions.
diff --git a/frontend/src/Components/AgencyData/AgencyHeader.js b/frontend/src/Components/AgencyData/AgencyHeader.js
@@ -71,10 +71,10 @@ function AgencyHeader({ agencyHeaderOpen, agencyDetails }) {
                     <S.ReportedDate size={SIZES[0]} color={COLORS[0]} weight={WEIGHTS[1]}>
                       {agencyDetails.last_reported_stop
                         ? new Intl.DateTimeFormat('en-US', {
-                            year: 'numeric',
-                            month: 'short',
-                            day: 'numeric',
-                          }).format(new Date(agencyDetails.last_reported_stop))
+                          year: 'numeric',
+                          month: 'short',
+                          day: 'numeric',
+                        }).format(new Date(agencyDetails.last_reported_stop))
                         : 'Unknown'}
                     </S.ReportedDate>
                   </S.ReportedDate>
@@ -89,7 +89,7 @@ function AgencyHeader({ agencyHeaderOpen, agencyDetails }) {
                       return (
                         <S.CensusDatum key={race}>
                           <S.CensusRace color={COLORS[0]} size={SIZES[0]}>
-                            {toTitleCase(race)}*
+                            {toTitleCase(race)}{race !== 'hispanic' && "*"}
                           </S.CensusRace>
                           <S.Datum size={SIZES[0]}>
                             {calculatePercentage(profile[race], profile.total)}%

diff --git a/frontend/src/Components/Charts/ChartSections/Legend/Legend.js b/frontend/src/Components/Charts/ChartSections/Legend/Legend.js
@@ -33,7 +33,7 @@ function Legend({ keys, onKeySelect, isStatic, showNonHispanic, heading, row })
               <S.Icon {...iconProps} />
               <S.KeyLabel selected={key.selected}>
                 {key.label}
-                {showNonHispanic && '*'}
+                {showNonHispanic && key.label !== 'Hispanic' && '*'}
               </S.KeyLabel>
             </S.Key>
           );

diff --git a/frontend/src/Components/Charts/Overview/Overview.js b/frontend/src/Components/Charts/Overview/Overview.js
@@ -25,7 +25,6 @@ import useDataset, { AGENCY_DETAILS, STOPS, SEARCHES, USE_OF_FORCE } from 'Hooks
 
 // Children
 import ChartHeader from 'Components/Charts/ChartSections/ChartHeader';
-import DataSubsetPicker from 'Components/Charts/ChartSections/DataSubsetPicker/DataSubsetPicker';
 import Pie from 'Components/Charts/ChartPrimitives/Pie';
 import Legend from 'Components/Charts/ChartSections/Legend/Legend';
 

diff --git a/frontend/src/Components/Charts/SearchRate/SearchRate.js b/frontend/src/Components/Charts/SearchRate/SearchRate.js
@@ -272,27 +272,27 @@ const TABLE_COLUMNS = [
     accessor: 'purpose',
   },
   {
-    Header: 'White',
+    Header: 'White*',
     accessor: 'white',
   },
   {
-    Header: 'Black',
+    Header: 'Black*',
     accessor: 'black',
   },
   {
     Header: 'Hispanic',
     accessor: 'hispanic',
   },
   {
-    Header: 'Asian',
+    Header: 'Asian*',
     accessor: 'asian',
   },
   {
-    Header: 'Native American',
+    Header: 'Native American*',
     accessor: 'native_american',
   },
   {
-    Header: 'Other',
+    Header: 'Other*',
     accessor: 'other',
   },
 ];
diff --git a/frontend/src/Components/Charts/Searches/Searches.js b/frontend/src/Components/Charts/Searches/Searches.js
@@ -241,27 +241,27 @@ const PERCENTAGE_COLUMNS = [
     accessor: 'year',
   },
   {
-    Header: 'White',
+    Header: 'White*',
     accessor: 'white',
   },
   {
-    Header: 'Black',
+    Header: 'Black*',
     accessor: 'black',
   },
   {
     Header: 'Hispanic',
     accessor: 'hispanic',
   },
   {
-    Header: 'Asian',
+    Header: 'Asian*',
     accessor: 'asian',
   },
   {
-    Header: 'Native American',
+    Header: 'Native American*',
     accessor: 'native_american',
   },
   {
-    Header: 'Other',
+    Header: 'Other*',
     accessor: 'other',
   },
 ];
@@ -276,27 +276,27 @@ const COUNT_COLUMNS = [
     accessor: 'search_type',
   },
   {
-    Header: 'White',
+    Header: 'White*',
     accessor: 'white',
   },
   {
-    Header: 'Black',
+    Header: 'Black*',
     accessor: 'black',
   },
   {
     Header: 'Hispanic',
     accessor: 'hispanic',
   },
   {
-    Header: 'Asian',
+    Header: 'Asian*',
     accessor: 'asian',
   },
   {
-    Header: 'Native American',
+    Header: 'Native American*',
     accessor: 'native_american',
   },
   {
-    Header: 'Other',
+    Header: 'Other*',
     accessor: 'other',
   },
 ];
diff --git a/frontend/src/Components/Charts/TrafficStops/TrafficStops.js b/frontend/src/Components/Charts/TrafficStops/TrafficStops.js
@@ -294,27 +294,27 @@ const STOPS_TABLE_COLUMNS = [
     accessor: 'year',
   },
   {
-    Header: 'White',
+    Header: 'White*',
     accessor: 'white',
   },
   {
-    Header: 'Black',
+    Header: 'Black*',
     accessor: 'black',
   },
   {
     Header: 'Hispanic',
     accessor: 'hispanic',
   },
   {
-    Header: 'Asian',
+    Header: 'Asian*',
     accessor: 'asian',
   },
   {
-    Header: 'Native American',
+    Header: 'Native American*',
     accessor: 'native_american',
   },
   {
-    Header: 'Other',
+    Header: 'Other*',
     accessor: 'other',
   },
   {
@@ -333,27 +333,27 @@ const BY_REASON_TABLE_COLUMNS = [
     accessor: 'purpose',
   },
   {
-    Header: 'White',
+    Header: 'White*',
     accessor: 'white',
   },
   {
-    Header: 'Black',
+    Header: 'Black*',
     accessor: 'black',
   },
   {
     Header: 'Hispanic',
     accessor: 'hispanic',
   },
   {
-    Header: 'Asian',
+    Header: 'Asian*',
     accessor: 'asian',
   },
   {
-    Header: 'Native American',
+    Header: 'Native American*',
     accessor: 'native_american',
   },
   {
-    Header: 'Other',
+    Header: 'Other*',
     accessor: 'other',
   },
 ];