Merge pull request #90 from caktus/develop

copelco · web-flow · commit 616daf2d5acf · 2022-01-20T09:29:02.000-05:00
Production Deploy 1/20/2022
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',
   },
 ];

Original file line number	Diff line number	Diff line change
`@@ -272,27 +272,27 @@ const TABLE_COLUMNS = [`
`272`	`272`	`accessor: 'purpose',`
`273`	`273`	`},`
`274`	`274`	`{`
`275`		`- Header: 'White',`
	`275`	`+ Header: 'White*',`
`276`	`276`	`accessor: 'white',`
`277`	`277`	`},`
`278`	`278`	`{`
`279`		`- Header: 'Black',`
	`279`	`+ Header: 'Black*',`
`280`	`280`	`accessor: 'black',`
`281`	`281`	`},`
`282`	`282`	`{`
`283`	`283`	`Header: 'Hispanic',`
`284`	`284`	`accessor: 'hispanic',`
`285`	`285`	`},`
`286`	`286`	`{`
`287`		`- Header: 'Asian',`
	`287`	`+ Header: 'Asian*',`
`288`	`288`	`accessor: 'asian',`
`289`	`289`	`},`
`290`	`290`	`{`
`291`		`- Header: 'Native American',`
	`291`	`+ Header: 'Native American*',`
`292`	`292`	`accessor: 'native_american',`
`293`	`293`	`},`
`294`	`294`	`{`
`295`		`- Header: 'Other',`
	`295`	`+ Header: 'Other*',`
`296`	`296`	`accessor: 'other',`
`297`	`297`	`},`
`298`	`298`	`];`
Original file line number	Diff line number	Diff line change
`@@ -294,27 +294,27 @@ const STOPS_TABLE_COLUMNS = [`
`294`	`294`	`accessor: 'year',`
`295`	`295`	`},`
`296`	`296`	`{`
`297`		`- Header: 'White',`
	`297`	`+ Header: 'White*',`
`298`	`298`	`accessor: 'white',`
`299`	`299`	`},`
`300`	`300`	`{`
`301`		`- Header: 'Black',`
	`301`	`+ Header: 'Black*',`
`302`	`302`	`accessor: 'black',`
`303`	`303`	`},`
`304`	`304`	`{`
`305`	`305`	`Header: 'Hispanic',`
`306`	`306`	`accessor: 'hispanic',`
`307`	`307`	`},`
`308`	`308`	`{`
`309`		`- Header: 'Asian',`
	`309`	`+ Header: 'Asian*',`
`310`	`310`	`accessor: 'asian',`
`311`	`311`	`},`
`312`	`312`	`{`
`313`		`- Header: 'Native American',`
	`313`	`+ Header: 'Native American*',`
`314`	`314`	`accessor: 'native_american',`
`315`	`315`	`},`
`316`	`316`	`{`
`317`		`- Header: 'Other',`
	`317`	`+ Header: 'Other*',`
`318`	`318`	`accessor: 'other',`
`319`	`319`	`},`
`320`	`320`	`{`
`@@ -333,27 +333,27 @@ const BY_REASON_TABLE_COLUMNS = [`
`333`	`333`	`accessor: 'purpose',`
`334`	`334`	`},`
`335`	`335`	`{`
`336`		`- Header: 'White',`
	`336`	`+ Header: 'White*',`
`337`	`337`	`accessor: 'white',`
`338`	`338`	`},`
`339`	`339`	`{`
`340`		`- Header: 'Black',`
	`340`	`+ Header: 'Black*',`
`341`	`341`	`accessor: 'black',`
`342`	`342`	`},`
`343`	`343`	`{`
`344`	`344`	`Header: 'Hispanic',`
`345`	`345`	`accessor: 'hispanic',`
`346`	`346`	`},`
`347`	`347`	`{`
`348`		`- Header: 'Asian',`
	`348`	`+ Header: 'Asian*',`
`349`	`349`	`accessor: 'asian',`
`350`	`350`	`},`
`351`	`351`	`{`
`352`		`- Header: 'Native American',`
	`352`	`+ Header: 'Native American*',`
`353`	`353`	`accessor: 'native_american',`
`354`	`354`	`},`
`355`	`355`	`{`
`356`		`- Header: 'Other',`
	`356`	`+ Header: 'Other*',`
`357`	`357`	`accessor: 'other',`
`358`	`358`	`},`
`359`	`359`	`];`