Merge pull request #28 from concord-consortium/186629802-select-both-…

…acres-yield User can select both Yield and Acres Harvested options.
concord-consortium · Feb 15, 2024 · 5f1025d · 5f1025d
2 parents 7a0fd66 + 40487b1
commit 5f1025d
Show file tree

Hide file tree

Showing 6 changed files with 214 additions and 131 deletions.
diff --git a/src/components/attribute-options.tsx b/src/components/attribute-options.tsx
@@ -45,7 +45,7 @@ export const AttributeOptions: React.FC<IProps> = (props) => {
             <div key={`options-container-${attr.key}`} className={classnames(getClasses(attr.key))}>
               <Options
                 key={`options-${attr.key}`}
-                inputType={attr.key === "cropUnits" ? "radio" : "checkbox"}
+                inputType={"checkbox"}
                 options={attr.options}
                 optionKey={attr.key}
                 {...commonProps}

diff --git a/src/components/options.tsx b/src/components/options.tsx
@@ -1,5 +1,5 @@
 import React from "react";
-import { IStateOptions, OptionKey } from "../constants/types";
+import { GeographicLevel, IStateOptions, OptionKey } from "../constants/types";
 
 import css from "./options.scss";
 
@@ -39,7 +39,7 @@ export const Options: React.FC<IOptions> = (props) => {
         }
         // If user selects a crop and no unit is selected, auto-select Yield
         if (optionKey === "crops" && !selectedOptions.cropUnits) {
-          newSelection.cropUnits = "Yield";
+          newSelection.cropUnits = ["Yield"];
         }
         // If user selects a state, de-select "All States"
         if (optionKey === "states" && newArray.includes("All States")) {
@@ -68,16 +68,16 @@ export const Options: React.FC<IOptions> = (props) => {
             // Otherwise deselect crop units, too
             newSelection.crops = newArray.filter((o) => o !== e.target.value);
             if (newSelection.crops.length === 0) {
-              newSelection.cropUnits = "";
+              newSelection.cropUnits = [];
             }
           } else {
             newSelection[optionKey] = newArray.filter((o) => o !== e.target.value);
           }
         }
       }
       handleSetSelectedOptions(newSelection);
-    } else if (optionKey === "geographicLevel" || optionKey === "cropUnits") {
-      handleSetSelectedOptions({[optionKey]: e.target.value});
+    } else if (optionKey === "geographicLevel") {
+      handleSetSelectedOptions({geographicLevel: e.target.value as GeographicLevel});
     }
   };
 

diff --git a/src/constants/constants.ts b/src/constants/constants.ts
@@ -128,7 +128,7 @@ export const defaultSelectedOptions: IStateOptions = {
   farmerDemographics: [],
   farmDemographics: [],
   economicsAndWages: [],
-  cropUnits: "",
+  cropUnits: [],
   crops: [],
   years: []
 };
diff --git a/src/constants/queryHeaders.ts b/src/constants/queryHeaders.ts
@@ -30,11 +30,7 @@ const sharedLaborHeaders = {
 const sharedCropHeaders = {
   sect_desc: "Crops",
   domain_desc: "Total",
-  geographicAreas: ["State", "County"],
-  years: {
-    "County": allYears,
-    "State": allYears
-  }
+  geographicAreas: ["State", "County"]
 };
 
 export const queryData: Array<IQueryHeaders> = [
@@ -133,7 +129,7 @@ export const queryData: Array<IQueryHeaders> = [
       geographicAreas: ["State"],
       years: {
         "County": [],
-        "State": allYears.filter(y => Number(y) >= 1998)
+        "State": allYears.filter(y => Number(y) >= 1987)
       }
   },
   {
@@ -213,6 +209,10 @@ export const queryData: Array<IQueryHeaders> = [
         ["Area Harvested"]: ["CORN, GRAIN - ACRES HARVESTED"],
         ["Yield"]: ["CORN, GRAIN - YIELD, MEASURED IN BU / ACRE"]
       },
+      years: {
+        "County": allYears,
+        "State": allYears
+      },
       ...sharedCropHeaders
   },
   {
@@ -227,6 +227,10 @@ export const queryData: Array<IQueryHeaders> = [
       ["Area Harvested"]: ["COTTON - ACRES HARVESTED"],
       ["Yield"]: ["COTTON - YIELD, MEASURED IN LB / ACRE"]
     },
+    years: {
+      "County": allYears,
+      "State": allYears
+    },
     ...sharedCropHeaders
   },
   {
@@ -241,6 +245,10 @@ export const queryData: Array<IQueryHeaders> = [
       ["Area Harvested"]: ["GRAPES - ACRES BEARING"],
       ["Yield"]: ["GRAPES - YIELD, MEASURED IN TONS / ACRE"]
     },
+    years: {
+      "County": allYears.filter(y => y === "2002" || Number(y) >= 2007),
+      "State": allYears.filter(y => y === "2002" || Number(y) >= 2007)
+    },
     ...sharedCropHeaders
   },
   {
@@ -255,6 +263,10 @@ export const queryData: Array<IQueryHeaders> = [
       ["Area Harvested"]: ["OATS - ACRES HARVESTED"],
       ["Yield"]: ["OATS - YIELD, MEASURED IN BU / ACRE"]
     },
+    years: {
+      "County": allYears,
+      "State": allYears
+    },
     ...sharedCropHeaders
   },
   {
@@ -269,6 +281,10 @@ export const queryData: Array<IQueryHeaders> = [
       ["Area Harvested"]: ["SOYBEANS - ACRES HARVESTED"],
       ["Yield"]: ["SOYBEANS - YIELD, MEASURED IN BU / ACRE"]
     },
+    years: {
+      "County": allYears,
+      "State": allYears
+    },
     ...sharedCropHeaders
   },
   {
@@ -283,6 +299,10 @@ export const queryData: Array<IQueryHeaders> = [
       ["Area Harvested"]: ["WHEAT - ACRES HARVESTED"],
       ["Yield"]: ["WHEAT - YIELD, MEASURED IN BU / ACRE"]
     },
+    years: {
+      "County": allYears,
+      "State": allYears
+    },
     ...sharedCropHeaders
   }
 ];
diff --git a/src/constants/types.ts b/src/constants/types.ts
@@ -6,7 +6,7 @@ export interface IStateOptions {
   farmerDemographics: string[],
   farmDemographics: string[],
   economicsAndWages: string[],
-  cropUnits: string,
+  cropUnits: string[],
   crops: string[]
   years: string[]
 }
@@ -106,4 +106,4 @@ export interface IReqCount {
   renameable?: boolean;
   deleteable?: boolean;
   hidden?: boolean;
-}
+}