refactor

Author: mertbagt

components/search/bills/BillSearch.tsx

@@ -6,7 +6,7 @@ import {
   SearchBox,
   useInstantSearch
 } from "react-instantsearch"
-import { currentGeneralCourt } from "functions/src/shared"
+import { currentGeneralCourt, isCurrentCourt } from "functions/src/shared"
 import styled from "styled-components"
 import TypesenseInstantSearchAdapter from "typesense-instantsearch-adapter"
 import { Col, Row } from "../../bootstrap"
@@ -16,7 +16,7 @@ import { SearchContainer } from "../SearchContainer"
 import { SearchErrorBoundary } from "../SearchErrorBoundary"
 import { useRouting } from "../useRouting"
 import { BillHit } from "./BillHit"
-import { useBillRefinements, useCourtRefinements } from "./useBillRefinements"
+import { useBillRefinements } from "./useBillRefinements"
 import { useBillHierarchicalMenu } from "./useBillHierarchicalMenu"
 import { SortBy, SortByWithConfigurationItem } from "../SortBy"
 import { getServerConfig } from "../common"
@@ -101,8 +101,8 @@ const useSearchStatus = () => {
 const Layout: FC<
   React.PropsWithChildren<{ items: SortByWithConfigurationItem[] }>
 > = ({ items }) => {
-  const courtRefinements = useCourtRefinements()
-  const refinements = useBillRefinements()
+  const courtRefinements = useBillRefinements(1)
+  const refinements = useBillRefinements(2)
   const hierarchicalMenu = useBillHierarchicalMenu()
   const status = useSearchStatus()
 

components/search/bills/useBillRefinements.tsx

@@ -3,9 +3,9 @@ import { RefinementListItem } from "instantsearch.js/es/connectors/refinement-li
 import { useCallback } from "react"
 import { useRefinements } from "../useRefinements"
 
-export const useCourtRefinements = () => {
+export const useBillRefinements = (list: Number) => {
   const baseProps = { limit: 500, searchable: true }
-  const propsList = [
+  const propsList1 = [
     {
       transformItems: useCallback(
         (i: RefinementListItem[]) =>
@@ -18,17 +18,11 @@ export const useCourtRefinements = () => {
         []
       ),
       attribute: "court",
-      searchablePlaceholder: "Legislative Session",
+      searchablePlaceholder: "General Court",
       ...baseProps
     }
   ]
-
-  return useRefinements({ refinementProps: propsList })
-}
-
-export const useBillRefinements = () => {
-  const baseProps = { limit: 500, searchable: true }
-  const propsList = [
+  const propsList2 = [
     {
       attribute: "currentCommittee",
       ...baseProps,
@@ -51,5 +45,12 @@ export const useBillRefinements = () => {
     }
   ]
 
+  let propsList = []
+  if (list === 1) {
+    propsList = propsList1
+  } else {
+    propsList = propsList2
+  }
+
   return useRefinements({ refinementProps: propsList })
 }