revert reordering

Author: mertbagt

components/search/bills/BillSearch.tsx

@@ -102,8 +102,7 @@ const useSearchStatus = () => {
 const Layout: FC<
   React.PropsWithChildren<{ items: SortByWithConfigurationItem[] }>
 > = ({ items }) => {
-  const courtRefinements = useBillRefinements(1)
-  const refinements = useBillRefinements(2)
+  const refinements = useBillRefinements()
   const hierarchicalMenu = useBillHierarchicalMenu()
   const status = useSearchStatus()
 
@@ -116,15 +115,13 @@ const Layout: FC<
       </Row>
       <Row>
         <Col xs={3} lg={3}>
-          {courtRefinements.options}
           {hierarchicalMenu.options}
           {refinements.options}
         </Col>
         <Col className="d-flex flex-column">
           <RefinementRow>
             <ResultCount className="flex-grow-1 m-1" />
             <SortBy items={items} />
-            {courtRefinements.show}
             {hierarchicalMenu.show}
             {refinements.show}
           </RefinementRow>

components/search/bills/useBillRefinements.tsx

@@ -16,9 +16,9 @@ import { useRefinements } from "../useRefinements"
 //   attribute: "court",
 //   searchablePlaceholder: "Legislative Session",
 
-export const useBillRefinements = (list: Number) => {
+export const useBillRefinements = () => {
   const baseProps = { limit: 500, searchable: true }
-  const propsList1 = [
+  const propsList = [
     {
       transformItems: useCallback(
         (i: RefinementListItem[]) =>
@@ -33,9 +33,7 @@ export const useBillRefinements = (list: Number) => {
       attribute: "court",
       searchablePlaceholder: "Legislative Session",
       ...baseProps
-    }
-  ]
-  const propsList2 = [
+    },
     {
       attribute: "currentCommittee",
       ...baseProps,
@@ -58,12 +56,5 @@ export const useBillRefinements = (list: Number) => {
     }
   ]
 
-  let propsList = []
-  if (list === 1) {
-    propsList = propsList1
-  } else {
-    propsList = propsList2
-  }
-
   return useRefinements({ refinementProps: propsList })
 }

components/search/useHierarchicalMenu.tsx

@@ -1,3 +1,4 @@
+import { useTranslation } from "next-i18next"
 import { useInstantSearch } from "react-instantsearch"
 import { faFilter } from "@fortawesome/free-solid-svg-icons"
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
@@ -42,13 +43,15 @@ export const useHierarchicalMenu = ({
   )
   const hasRefinements = useHasRefinements()
 
+  const { t } = useTranslation("billSearch")
+
   return {
     options: inline ? (
       <div>{hierarchicalMenu}</div>
     ) : (
       <Offcanvas show={show} onHide={handleClose}>
         <Offcanvas.Header closeButton>
-          <Offcanvas.Title>Filter</Offcanvas.Title>
+          <Offcanvas.Title>{t("topics")}</Offcanvas.Title>
         </Offcanvas.Header>
         <Offcanvas.Body>
           <SearchContainer>{hierarchicalMenu}</SearchContainer>
@@ -62,7 +65,7 @@ export const useHierarchicalMenu = ({
         onClick={handleOpen}
         className={hasRefinements ? "ais-FilterButton-has-refinements" : ""}
       >
-        <FontAwesomeIcon icon={faFilter} /> Filter
+        <FontAwesomeIcon icon={faFilter} /> {t("topics")}
       </FilterButton>
     )
   }

components/search/useRefinements.tsx

@@ -1,3 +1,4 @@
+import { useTranslation } from "next-i18next"
 import { RefinementList, useInstantSearch } from "react-instantsearch"
 import { faFilter } from "@fortawesome/free-solid-svg-icons"
 import { FontAwesomeIcon } from "@fortawesome/react-fontawesome"
@@ -39,13 +40,15 @@ export const useRefinements = ({
   )
   const hasRefinements = useHasRefinements()
 
+  const { t } = useTranslation("billSearch")
+
   return {
     options: inline ? (
       <div>{refinements}</div>
     ) : (
       <Offcanvas show={show} onHide={handleClose}>
         <Offcanvas.Header closeButton>
-          <Offcanvas.Title>Filter</Offcanvas.Title>
+          <Offcanvas.Title>{t("filter")}</Offcanvas.Title>
         </Offcanvas.Header>
         <Offcanvas.Body>
           <SearchContainer>{refinements}</SearchContainer>
@@ -59,7 +62,7 @@ export const useRefinements = ({
         onClick={handleOpen}
         className={hasRefinements ? "ais-FilterButton-has-refinements" : ""}
       >
-        <FontAwesomeIcon icon={faFilter} /> Filter
+        <FontAwesomeIcon icon={faFilter} /> {t("filter")}
       </FilterButton>
     )
   }

public/locales/en/billSearch.json

@@ -1,5 +1,7 @@
 {
   "another_term" : "Try another search term",
   "browse_bills" : "Browse Bills",
+  "filter" : "Filter",
+  "topics" : "Topics",
   "zero_results" : "Your search has yielded zero results!"
 }