Merge branch 'main' into 186435580-backport-codap-plugin-api

src/components/dropdown.scss

@@ -7,7 +7,7 @@
 .dropdownBody {
   padding-left: 0;
   padding-right: 0;
-  max-height: 1000px;
+  max-height: fit-content;
   transition: max-height;
   transition-duration: .5s;
   transition-timing-function: ease-in;
@@ -56,8 +56,6 @@
   }
 }
 
-
-
 .userSelection {
   font-family: 'Montserrat', sans-serif;
   font-size: 12px;
@@ -81,4 +79,4 @@
   display: flex;
   flex-direction: column;
   padding: 12px 0px;
-}
+}

src/constants/queryHeaders.ts

@@ -119,10 +119,10 @@ export const queryData: Array<IQueryHeaders> = [
         "FARM OPERATIONS, ORGANIZATION, TAX PURPOSES, PARTNERSHIP - NUMBER OF OPERATIONS"
       ],
       domain_desc: "Total",
-      geographicAreas: ["County"],
+      geographicAreas: ["State", "County"],
       years: {
         "County": ["1997", "2002", "2007", "2012", "2017"],
-        "State": []
+        "State": ["1997", "2002", "2007", "2012", "2017"]
       }
   },
   {

src/constants/types.ts

@@ -1,5 +1,7 @@
+export type GeographicLevel = "County"|"State";
+
 export interface IStateOptions {
-  geographicLevel: "County"|"State",
+  geographicLevel: GeographicLevel,
   states: string[],
   farmerDemographics: string[],
   farmDemographics: string[],
@@ -91,3 +93,17 @@ export interface IReqCount {
   total: number;
   completed: number;
 }
+ export interface Attribute {
+  name: string;
+  formula?: string;
+  formulaDependents?: string;
+  description?: string;
+  type?: string;
+  cid?: string;
+  precision?: string;
+  unit?: string;
+  editable?: boolean;
+  renameable?: boolean;
+  deleteable?: boolean;
+  hidden?: boolean;
+}

src/scripts/api.ts

@@ -8,7 +8,7 @@ import {
   createItems,
   createTable,
 } from "@concord-consortium/codap-plugin-api";
-import { ICropCategory, ICropDataItem, ISetReqCount, IStateOptions } from "../constants/types";
+import { Attribute, GeographicLevel, ICropCategory, ICropDataItem, ISetReqCount, IStateOptions } from "../constants/types";
 import { multiRegions } from "../constants/regionData";
 import { cropOptions, fiftyStates } from "../constants/constants";
 import { countyData } from "../constants/counties";
@@ -34,7 +34,6 @@ interface IAcreTotals {
   }
 }
 
-
 export const createRequest = ({attribute, geographicLevel, years, states, cropUnits}: IGetAttrDataParams) => {
   const queryParams = getQueryParams(attribute);
 
@@ -108,7 +107,7 @@ export const createRequest = ({attribute, geographicLevel, years, states, cropUn
 
 export const getAllAttrs = (selectedOptions: IStateOptions) => {
   const {geographicLevel, states, cropUnits, years, ...subOptions} = selectedOptions;
-  const allAttrs: Array<string|keyof ICropDataItem> = ["Year"];
+  const allAttrs: Array<Attribute> = [{"name": "Year"}, {"name": geographicLevel}, {"name": "Boundary"}];
 
   for (const key in subOptions) {
     const selections = subOptions[key as keyof typeof subOptions];
@@ -121,21 +120,27 @@ export const getAllAttrs = (selectedOptions: IStateOptions) => {
       if (attribute === "Economic Class") {
         for (const econAttr of economicClassAttirbutes) {
           const codapColumnName = attrToCODAPColumnName[econAttr].attributeNameInCodapTable;
-          allAttrs.push(codapColumnName);
+          const codapColumnUnit = attrToCODAPColumnName[econAttr].unitInCodapTable;
+          allAttrs.push({"name": codapColumnName, "unit": codapColumnUnit});
         }
       } else if (attribute === "Acres Operated") {
         for (const acresAttr of acresOperatedAttributes) {
           const codapColumnName = attrToCODAPColumnName[acresAttr].attributeNameInCodapTable;
-          allAttrs.push(codapColumnName);
+          const codapColumnUnit = attrToCODAPColumnName[acresAttr].unitInCodapTable;
+          allAttrs.push({"name": codapColumnName, "unit": codapColumnUnit});
         }
       } else if (Array.isArray(short_desc)) {
         for (const desc of short_desc) {
           const codapColumnName = attrToCODAPColumnName[desc].attributeNameInCodapTable;
-          allAttrs.push(codapColumnName);
+          const codapColumnUnit = attrToCODAPColumnName[desc].unitInCodapTable;
+          allAttrs.push({"name": codapColumnName, "unit": codapColumnUnit});
         }
       } else if (typeof short_desc === "object" && cropUnits) {
         const attr = short_desc[cropUnits as keyof ICropDataItem][0];
-        allAttrs.push(attrToCODAPColumnName[attr].attributeNameInCodapTable);
+        allAttrs.push({"name": attrToCODAPColumnName[attr].attributeNameInCodapTable});
+        const codapColumnName = attrToCODAPColumnName[attr].attributeNameInCodapTable;
+        const codapColumnUnit = attrToCODAPColumnName[attr].unitInCodapTable;
+          allAttrs.push({"name": codapColumnName, "unit": codapColumnUnit});
       }
     }
   }
@@ -157,71 +162,68 @@ const getNewDataContext = async () => {
   await createDataContext(dataSetName);
 };
 
-type IAttrs = Array<{
-  name: string,
-  formula?: string,
-  formulaDependents?: string
-}>;
+const makeCODAPAttributeDef = (attr: Attribute, geoLevel: GeographicLevel) => {
+  const {name, unit} = attr;
+  if (attr.name === "Boundary") {
+    const formula = geoLevel === "County" ? `lookupBoundary(US_county_boundaries, County, State)`
+    : `lookupBoundary(US_state_boundaries, State)`;
+    return {
+      name,
+      type: "boundary",
+      formula,
+      formulaDependents: "State"
+    };
+  } else {
+    return {
+      name,
+      unit,
+      type: name === "State" || name === "County" ? "string" : "numeric"
+    };
+  }
+};
 
 const createStateCollection = async  (createBoundaries: boolean) => {
-  const attrs: IAttrs = [{"name": "State"}];
-
+  const attrs: Array<Attribute> = [{"name": "State"}];
   if (createBoundaries) {
-    attrs.push({
-      "name": "Boundary",
-      "formula": `lookupBoundary(US_state_boundaries, State)`,
-      "formulaDependents": "State"
-    });
+    const boundaryDef = makeCODAPAttributeDef({"name": "Boundary"}, "State");
+    attrs.push(boundaryDef);
   }
-
   await createParentCollection(dataSetName, "States", attrs);
 };
 
-const createCountyCollection = async () => {
-  const attrs: IAttrs = [{
-    "name": "County",
-  },
-  {
-    "name": "Boundary",
-    "formula": `lookupBoundary(US_county_boundaries, County + ', ' + State)`,
-    "formulaDependents": "State"
-  }];
-  await createChildCollection(dataSetName, "Counties", "States", attrs);
-};
-
-const createSubCollection = async (geoLevel: "State" | "County", attrs: (string | keyof ICropDataItem)[]) => {
+const createSubCollection = async (geoLevel: GeographicLevel, attrs: Array<Attribute>) => {
   const plural = geoLevel === "State" ? "States" : "Counties";
-  const attrDefs = attrs.map((attr) => {
-    return {
-      name: attr,
-      type: "numeric",
-    };
-  });
+  const attrDefs = attrs.map((attr) => makeCODAPAttributeDef(attr, geoLevel));
   await createChildCollection(dataSetName, "Data", plural, attrDefs);
 };
 
 export const createTableFromSelections = async (selectedOptions: IStateOptions, setReqCount: ISetReqCount) => {
   const {geographicLevel} = selectedOptions;
+
   try {
     const allAttrs = getAllAttrs(selectedOptions);
     const items = await getItems(selectedOptions, setReqCount);
     await getNewDataContext();
-    await createStateCollection(geographicLevel === "State");
     if (geographicLevel === "County") {
-      await createCountyCollection();
+      await createStateCollection(true);
+      await createSubCollection(geographicLevel, allAttrs);
+      await createItems(dataSetName, items);
+      await createTable(dataSetName, dataSetName);
+      return "success";
+    } else {
+      const attrDefinitions = allAttrs.map((attr) => makeCODAPAttributeDef(attr, geographicLevel));
+      await createParentCollection(dataSetName, "Data", attrDefinitions);
+      await createItems(dataSetName, items);
+      await createTable(dataSetName, dataSetName);
+      return "success";
     }
-    await createSubCollection(geographicLevel, allAttrs);
-    await createItems(dataSetName, items);
-    await createTable(dataSetName, dataSetName);
-    return "success";
   } catch (error) {
     // eslint-disable-next-line no-console
     console.log("Error creating CODAP Table from API data:", error);
     return error;
   }
 };
 
-
 const getItems = async (selectedOptions: IStateOptions, setReqCount: ISetReqCount) => {
   const {geographicLevel, states, years, cropUnits, ...subOptions} = selectedOptions;
   const items: any = [];
@@ -283,7 +285,7 @@ const getItems = async (selectedOptions: IStateOptions, setReqCount: ISetReqCoun
 
           if (isMultiStateRegion) {
             if (item.State !== "Alaska") {
-              const { Value } = matchingData[0];
+              const { Value } = matchingData.length > 0 && matchingData[0];
               const codapColumnName = attrToCODAPColumnName[matchingData[0].short_desc].attributeNameInCodapTable;
               item[codapColumnName] = Value;
             }