comments added re: need to update Typesense server

Author: mertbagt

components/search/bills/BillSearch.tsx

@@ -6,7 +6,7 @@ import {
   SearchBox,
   useInstantSearch
 } from "react-instantsearch"
-import { currentGeneralCourt } from "functions/src/shared"
+import { currentLegislativeSession } 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, useSessionRefinements } from "./useBillRefinements"
 import { useBillHierarchicalMenu } from "./useBillHierarchicalMenu"
 import { SortBy, SortByWithConfigurationItem } from "../SortBy"
 import { getServerConfig } from "../common"
@@ -66,7 +66,14 @@ export const BillSearch = () => {
         indexName={initialSortByValue}
         initialUiState={{
           [initialSortByValue]: {
-            refinementList: { court: [String(currentGeneralCourt)] }
+            refinementList: { court: [String(currentLegislativeSession)] }
+            // `court:` should be `session:` but 404 - Could not find a facet field named `session` in the schema.
+            //
+            // needs adjusting? :
+            // node_modules\typesense-instantsearch-adapter\lib\TypesenseInstantsearchAdapter.js
+            //
+            // see also useBillRefinements.tsx:
+            //   attribute: "court",
           }
         }}
         searchClient={searchClient}
@@ -101,28 +108,27 @@ const useSearchStatus = () => {
 const Layout: FC<
   React.PropsWithChildren<{ items: SortByWithConfigurationItem[] }>
 > = ({ items }) => {
-  const courtRefinements = useCourtRefinements()
+  const sessionRefinements = useSessionRefinements()
   const refinements = useBillRefinements()
   const hierarchicalMenu = useBillHierarchicalMenu()
   const status = useSearchStatus()
 
-  console.log("Refinement Options", refinements.options)
-
   return (
     <SearchContainer>
       <Row>
         <SearchBox placeholder="Search For Bills" className="mt-2 mb-3" />
       </Row>
       <Row>
         <Col xs={3} lg={3}>
-          {courtRefinements.options}
+          {sessionRefinements.options}
           {hierarchicalMenu.options}
           {refinements.options}
         </Col>
         <Col className="d-flex flex-column">
           <RefinementRow>
             <ResultCount className="flex-grow-1 m-1" />
             <SortBy items={items} />
+            {sessionRefinements.show}
             {hierarchicalMenu.show}
             {refinements.show}
           </RefinementRow>

components/search/bills/useBillRefinements.tsx

@@ -1,9 +1,9 @@
-import { generalCourts } from "functions/src/shared"
+import { legislativeSessions } from "functions/src/shared"
 import { RefinementListItem } from "instantsearch.js/es/connectors/refinement-list/connectRefinementList"
 import { useCallback } from "react"
 import { useRefinements } from "../useRefinements"
 
-export const useCourtRefinements = () => {
+export const useSessionRefinements = () => {
   const baseProps = { limit: 500, searchable: true }
   const propsList = [
     {
@@ -12,12 +12,19 @@ export const useCourtRefinements = () => {
           i
             .map(i => ({
               ...i,
-              label: generalCourts[i.value as any]?.Name ?? i.label
+              label: legislativeSessions[i.value as any]?.Name ?? i.label
             }))
             .sort((a, b) => Number(b.value) - Number(a.value)),
         []
       ),
       attribute: "court",
+      // `court` should be `session` but 404 - Could not find a facet field named `session` in the schema.
+      //
+      // needs adjusting? :
+      // node_modules\typesense-instantsearch-adapter\lib\TypesenseInstantsearchAdapter.js
+      //
+      // see also BillSearch.tsx:
+      //   refinementList: { court: [String(currentLegislativeSession)] }
       searchablePlaceholder: "Legislative Session",
       ...baseProps
     }

functions/src/shared/constants.ts

@@ -1,11 +1,14 @@
-export type GeneralCourt = {
+export type LegislativeSession = {
   Name: string
   Number: number
   FirstYear: number
   SecondYear: number
 }
 
-export const generalCourts: Record<number, GeneralCourt | undefined> = {
+export const legislativeSessions: Record<
+  number,
+  LegislativeSession | undefined
+> = {
   194: {
     Name: "194th (Current)",
     Number: 194,
@@ -26,12 +29,12 @@ export const generalCourts: Record<number, GeneralCourt | undefined> = {
   }
 }
 
-export const supportedGeneralCourts = Object.keys(generalCourts)
+export const supportedLegislativeSessions = Object.keys(legislativeSessions)
   .map(n => Number.parseInt(n))
   .sort()
   .reverse()
 
-export const currentGeneralCourt = supportedGeneralCourts[0]
+export const currentLegislativeSession = supportedLegislativeSessions[0]
 
-export const isCurrentCourt = (courtNumber: number) =>
-  courtNumber === currentGeneralCourt
+export const isCurrentSession = (courtSession: number) =>
+  courtSession === currentLegislativeSession