add comments from PR

src/components/ItemFilters/testAggregations.js → __test__/fixtures/testAggregations.js

@@ -80,4 +80,4 @@ const aggs = [
   },
 ]
 
-export default aggs
+export default aggs

pages/search/advanced.tsx

@@ -39,7 +39,7 @@ import type {
 import { getQueryString } from "../../src/utils/searchUtils"
 
 import ItemFilterContainer from "../../src/components/ItemFilters/FiltersContainer"
-import testItemAggs from "../../src/components/ItemFilters/testAggregations"
+import testItemAggs from "../../__test__/fixtures/testAggregations"
 
 /**
  * The Advanced Search page is responsible for displaying the Advanced Search form fields and
@@ -125,7 +125,7 @@ export default function AdvancedSearch() {
             }
           />
         )}
-        <ItemFilterContainer itemAggs={testItemAggs} />
+        <ItemFilterContainer itemAggs={[testItemAggs[0]]} />
         <Heading level="two">Advanced Search</Heading>
         <Form
           id="advancedSearchForm"

src/components/ItemFilters/ItemFilter.tsx

@@ -6,17 +6,14 @@ import {
 import type { Dispatch } from "react"
 
 import type { ItemFilterData } from "../../models/itemFilterData"
-import type {
-  option as optionType,
-  selectedFilters as selectedFiltersType,
-} from "../../types/filterTypes"
+import type { Option, SelectedFilters } from "../../types/filterTypes"
 
 interface ItemFilterProps {
   itemFilterData: ItemFilterData
-  setSelectedFilters: Dispatch<React.SetStateAction<selectedFiltersType>>
-  selectedFilters: selectedFiltersType
+  setSelectedFilters: Dispatch<React.SetStateAction<SelectedFilters>>
+  selectedFilters: SelectedFilters
   // this type is temporary for dev use only. could end up being different.
-  submitFilters: Dispatch<React.SetStateAction<selectedFiltersType>>
+  submitFilters: Dispatch<React.SetStateAction<SelectedFilters>>
 }
 
 const ItemFilter = ({
@@ -28,13 +25,13 @@ const ItemFilter = ({
   const field = itemFilterData.field()
   const fieldFormatted = itemFilterData.field(true)
   const clearFilter = () => {
-    setSelectedFilters((prevFilters: selectedFiltersType) => {
+    setSelectedFilters((prevFilters: SelectedFilters) => {
       return { ...prevFilters, [field]: [] }
     })
   }
 
   const handleCheck = (selectedOptions: string[]) => {
-    setSelectedFilters((prevFilters: selectedFiltersType) => {
+    setSelectedFilters((prevFilters: SelectedFilters) => {
       const newFilterSelection = {
         ...prevFilters,
         [field]: selectedOptions,
@@ -57,7 +54,7 @@ const ItemFilter = ({
         // the CheckboxGroup value array are selected.
         value={selectedFilters[field]}
       >
-        {itemFilterData.displayOptions().map(({ value, label }: optionType) => {
+        {itemFilterData.displayOptions().map(({ value, label }: Option) => {
           return (
             <Checkbox id={value} key={value} value={value} labelText={label} />
           )

src/components/ItemFilters/ItemFilters.test.tsx

@@ -9,6 +9,11 @@ import userEvent from "@testing-library/user-event"
 jest.mock("next/router", () => jest.requireActual("next-router-mock"))
 
 describe("Filters container", () => {
+  it("renders a single filter", () => {
+    render(<FiltersContainer itemAggs={[aggs[0]]} />)
+    const filters = screen.getAllByTestId("item-filter")
+    expect(filters.length).toBe(1)
+  })
   it("renders three filter boxes", () => {
     render(<FiltersContainer itemAggs={aggs} />)
     const filters = screen.getAllByTestId("item-filter")

src/components/ItemFilters/utils.ts

@@ -1,4 +1,4 @@
-import type { selectedFilters as selectedFiltersType } from "../../types/filterTypes"
+import type { SelectedFilters } from "../../types/filterTypes"
 
 const isRecapLocation = (loc: string) => {
   return loc.split(":")[1].startsWith("rc")
@@ -11,7 +11,7 @@ export const combineRecapLocations = (locations: string[]) => {
   } else return locations
 }
 
-type bibPageQueryParams = {
+type BibPageQueryParams = {
   item_location?: string
   item_format?: string
   item_status?: string
@@ -21,7 +21,7 @@ export const parseQueryParams = ({
   item_status,
   item_format,
   item_location,
-}: bibPageQueryParams) => {
+}: BibPageQueryParams) => {
   return {
     location: item_location
       ? combineRecapLocations(item_location.split(","))
@@ -32,7 +32,7 @@ export const parseQueryParams = ({
 }
 
 export const buildQueryParams = (
-  { location, format, status }: selectedFiltersType,
+  { location, format, status }: SelectedFilters,
   recapLocations: string[]
 ) => {
   const locs = location.map((loc) => {

src/models/itemFilterData.ts

@@ -1,23 +1,23 @@
 import type {
   ItemAggregation,
   ItemAggregationOption,
-  option as optionType,
+  Option,
 } from "../types/filterTypes"
 
 export class ItemFilterData {
   options: ItemAggregationOption[]
-  _field: string
+  agg: ItemAggregation
   constructor(agg: ItemAggregation) {
-    this._field = agg.field
+    this.agg = agg
     this.options = agg.values
   }
 
-  displayOptions(): optionType[] {
+  displayOptions(): Option[] {
     return this.options
   }
 
   field(formatted = false) {
-    const f = this._field
+    const f = this.agg.field
     const upperCased = f[0].toUpperCase() + f.substring(1)
     return formatted ? upperCased : f
   }

src/types/filterTypes.ts

@@ -1,6 +1,6 @@
-export type locations = string[]
+export type Locations = string[]
 
-export type selectedFilters = {
+export type SelectedFilters = {
   location: string[]
   format: string[]
   status: string[]
@@ -21,7 +21,7 @@ export interface ItemAggregation {
   values: ItemAggregationOption[]
 }
 
-export type option = { value: string; label: string }
+export type Option = { value: string; label: string }
 
 export type ReducedItemAggregation = {
   field: string