From d322008c132dfa30124b07149632d2ae635a75de Mon Sep 17 00:00:00 2001
From: tylerbarna <tylerpbarna@gmail.com>
Date: Thu, 5 Oct 2023 14:26:54 -0500
Subject: [PATCH 01/55] added date range selector dropdown content from
 nasa-gcn:#1265 . This will be a new PR due to previous PR being stale

---
 app/routes/circulars._archive._index.tsx | 190 ++++++++++++++++++++++-
 1 file changed, 188 insertions(+), 2 deletions(-)

diff --git a/app/routes/circulars._archive._index.tsx b/app/routes/circulars._archive._index.tsx
index e6a615820..739b963a0 100644
--- a/app/routes/circulars._archive._index.tsx
+++ b/app/routes/circulars._archive._index.tsx
@@ -17,8 +17,10 @@ import {
 import {
   Button,
   ButtonGroup,
+  DateRangePicker,
   Icon,
   Label,
+  Radio,
   Select,
   TextInput,
 } from '@trussworks/react-uswds'
@@ -28,6 +30,7 @@ import { useState } from 'react'
 
 import { circularRedirect, search } from './circulars/circulars.server'
 import type { action } from './circulars/route'
+import DetailsDropdownContent from '~/components/DetailsDropdownContent'
 import Hint from '~/components/Hint'
 import { usePagination } from '~/lib/pagination'
 import { useFeature } from '~/root'
@@ -239,10 +242,40 @@ export default function () {
   if (searchString) searchString = `?${searchString}`
 
   const [inputQuery, setInputQuery] = useState(query)
-  const clean = inputQuery === query
+  const [inputDateGte, setInputDateGte] = useState(startDate)
+  const [inputDateLte, setInputDateLte] = useState(endDate)
+  const [showContent, setShowContent] = useState(false) // for the custom date range dropdown
+  const [showDateRange, setShowDateRange] = useState(false)
+  const clean =
+    inputQuery === query &&
+    inputDateGte === startDate &&
+    inputDateLte === endDate
 
   const submit = useSubmit()
 
+  const setFuzzyTime = (startDate?: string) => {
+    // console.log(startDate)
+    if (startDate === 'custom') {
+      setShowDateRange(true)
+    } else {
+      setShowDateRange(false)
+      setInputDateGte(startDate)
+    }
+    setInputDateLte('now')
+  }
+
+  const setDateRange = () => {
+    // setShowContent(false)
+    if (showDateRange) setShowDateRange(false)
+    const params = new URLSearchParams(location.search)
+    if (inputDateGte) params.set('startDate', inputDateGte)
+    if (inputDateLte) params.set('endDate', inputDateLte)
+    submit(params, {
+      method: 'get',
+      action: '/circulars',
+    })
+  }
+
   return (
     <>
       <h1>GCN Circulars</h1>
@@ -291,7 +324,160 @@ export default function () {
           </Button>
         </Form>
         {featureCircularsFilterByDate && (
-          <DateSelectorButton startDate={startDate} endDate={endDate} />
+          <>
+            <DateSelectorButton
+              startDate={startDate}
+              endDate={endDate}
+              onClick={() => setShowContent(!showContent)}
+              expanded={showContent}
+            />
+            {showContent && (
+              <DetailsDropdownContent className="margin-top-1">
+                <div className="usa-radio maxw-card-xlg">
+                  <div className="display-flex flex-row">
+                    <div className="display-flex flex-column flex-align-start margin-1">
+                      <Radio
+                        id="radio-alltime"
+                        name="radio-date"
+                        value="undefined"
+                        defaultChecked={true}
+                        label="All Time"
+                        className="usa-search__filter-button"
+                        onChange={(e) => {
+                          setFuzzyTime(e.target.value)
+                        }}
+                      ></Radio>
+                      <Radio
+                        id="radio-hour"
+                        name="radio-date"
+                        value="hour"
+                        label="Past hour"
+                        className="usa-search__filter-button"
+                        onChange={(e) => {
+                          setFuzzyTime(e.target.value)
+                        }}
+                      ></Radio>
+                      <Radio
+                        id="radio-today"
+                        name="radio-date"
+                        value="today"
+                        label="Today"
+                        className="usa-search__filter-button"
+                        onChange={(e) => {
+                          setFuzzyTime(e.target.value)
+                        }}
+                      ></Radio>
+                    </div>
+                    <div className="display-flex flex-column margin-1">
+                      <Radio
+                        id="radio-day"
+                        name="radio-date"
+                        value="day"
+                        label="Past 24 Hours"
+                        className="usa-search__filter-button"
+                        onChange={(e) => {
+                          setFuzzyTime(e.target.value)
+                        }}
+                      ></Radio>
+                      <Radio
+                        id="radio-week"
+                        name="radio-date"
+                        value="week"
+                        label="Past Week"
+                        className="usa-search__filter-button"
+                        onChange={(e) => {
+                          setFuzzyTime(e.target.value)
+                        }}
+                      ></Radio>
+                      <Radio
+                        id="radio-month"
+                        name="radio-date"
+                        value="month"
+                        label="Past Month"
+                        className="usa-search__filter-button"
+                        onChange={(e) => {
+                          setFuzzyTime(e.target.value)
+                        }}
+                      ></Radio>
+                    </div>
+
+                    <div className="display-flex flex-column margin-1">
+                      <Radio
+                        id="radio-year"
+                        name="radio-date"
+                        value="year"
+                        label="Past Year"
+                        className="usa-search__filter-button"
+                        onChange={(e) => {
+                          setFuzzyTime(e.target.value)
+                        }}
+                      ></Radio>
+                      <Radio
+                        id="radio-ytd"
+                        name="radio-date"
+                        value="ytd"
+                        label="Year to Date"
+                        className="usa-search__filter-button"
+                        onChange={(e) => {
+                          setFuzzyTime(e.target.value)
+                        }}
+                      ></Radio>
+                      <Radio
+                        id="radio-custom"
+                        name="radio-date"
+                        value="custom"
+                        label="Custom Range..."
+                        className="usa-search__filter-button"
+                        onChange={(e) => {
+                          setShowDateRange(e.target.checked)
+                        }}
+                      ></Radio>
+                    </div>
+                  </div>
+
+                  {showDateRange && (
+                    <DateRangePicker
+                      startDateHint="dd/mm/yyyy"
+                      startDateLabel="Start Date"
+                      className="margin-bottom-2"
+                      startDatePickerProps={{
+                        id: 'event-date-start',
+                        name: 'event-date-start',
+                        defaultValue: 'startDate',
+                        onChange: (value) => {
+                          setInputDateGte(value)
+                        },
+                        // style: { height: '15px' }, // Adjust the height as needed
+                      }}
+                      endDateHint="dd/mm/yyyy"
+                      endDateLabel="End Date"
+                      endDatePickerProps={{
+                        id: 'event-date-end',
+                        name: 'event-date-end',
+                        defaultValue: 'endDate',
+                        onChange: (value) => {
+                          setInputDateLte(value)
+                        },
+                        // style: { height: '15px' },
+                      }}
+                    />
+                  )}
+                  <div className="display-flex flex-row">
+                    <Button
+                      type="button"
+                      className=""
+                      form="searchForm"
+                      onClick={() => {
+                        setDateRange()
+                      }}
+                    >
+                      <Icon.CalendarToday /> Submit
+                    </Button>
+                  </div>
+                </div>
+              </DetailsDropdownContent>
+            )}
+          </>
         )}
         <Link to={`/circulars/new${searchString}`}>
           <Button

From 5ed8033bcac150cc3a9245fa6009a674a5166c90 Mon Sep 17 00:00:00 2001
From: Tyler Barna <57914086+tylerbarna@users.noreply.github.com>
Date: Fri, 6 Oct 2023 11:35:16 -0400
Subject: [PATCH 02/55] Update app/routes/circulars._archive._index.tsx

Co-authored-by: Leo Singer <leo.p.singer@nasa.gov>
---
 app/routes/circulars._archive._index.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/routes/circulars._archive._index.tsx b/app/routes/circulars._archive._index.tsx
index 739b963a0..30151c8a9 100644
--- a/app/routes/circulars._archive._index.tsx
+++ b/app/routes/circulars._archive._index.tsx
@@ -254,7 +254,6 @@ export default function () {
   const submit = useSubmit()
 
   const setFuzzyTime = (startDate?: string) => {
-    // console.log(startDate)
     if (startDate === 'custom') {
       setShowDateRange(true)
     } else {

From 8a26a4ee4ab4d1e98fc5a50458438633f7ddf4fb Mon Sep 17 00:00:00 2001
From: tylerbarna <tylerpbarna@gmail.com>
Date: Fri, 6 Oct 2023 11:00:43 -0500
Subject: [PATCH 03/55] radios use self-closing syntax

---
 app/routes/circulars._archive._index.tsx | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/app/routes/circulars._archive._index.tsx b/app/routes/circulars._archive._index.tsx
index 739b963a0..cb80867ec 100644
--- a/app/routes/circulars._archive._index.tsx
+++ b/app/routes/circulars._archive._index.tsx
@@ -346,7 +346,7 @@ export default function () {
                         onChange={(e) => {
                           setFuzzyTime(e.target.value)
                         }}
-                      ></Radio>
+                      />
                       <Radio
                         id="radio-hour"
                         name="radio-date"
@@ -356,7 +356,7 @@ export default function () {
                         onChange={(e) => {
                           setFuzzyTime(e.target.value)
                         }}
-                      ></Radio>
+                      />
                       <Radio
                         id="radio-today"
                         name="radio-date"
@@ -366,7 +366,7 @@ export default function () {
                         onChange={(e) => {
                           setFuzzyTime(e.target.value)
                         }}
-                      ></Radio>
+                      />
                     </div>
                     <div className="display-flex flex-column margin-1">
                       <Radio
@@ -378,7 +378,7 @@ export default function () {
                         onChange={(e) => {
                           setFuzzyTime(e.target.value)
                         }}
-                      ></Radio>
+                      />
                       <Radio
                         id="radio-week"
                         name="radio-date"
@@ -388,7 +388,7 @@ export default function () {
                         onChange={(e) => {
                           setFuzzyTime(e.target.value)
                         }}
-                      ></Radio>
+                      />
                       <Radio
                         id="radio-month"
                         name="radio-date"
@@ -398,7 +398,7 @@ export default function () {
                         onChange={(e) => {
                           setFuzzyTime(e.target.value)
                         }}
-                      ></Radio>
+                      />
                     </div>
 
                     <div className="display-flex flex-column margin-1">
@@ -411,7 +411,7 @@ export default function () {
                         onChange={(e) => {
                           setFuzzyTime(e.target.value)
                         }}
-                      ></Radio>
+                      />
                       <Radio
                         id="radio-ytd"
                         name="radio-date"
@@ -421,7 +421,7 @@ export default function () {
                         onChange={(e) => {
                           setFuzzyTime(e.target.value)
                         }}
-                      ></Radio>
+                      />
                       <Radio
                         id="radio-custom"
                         name="radio-date"
@@ -431,7 +431,7 @@ export default function () {
                         onChange={(e) => {
                           setShowDateRange(e.target.checked)
                         }}
-                      ></Radio>
+                      />
                     </div>
                   </div>
 

From 498830e38bc7dec6eafcd4929493950315fe91a3 Mon Sep 17 00:00:00 2001
From: tylerbarna <tylerpbarna@gmail.com>
Date: Mon, 9 Oct 2023 13:35:33 -0500
Subject: [PATCH 04/55] fixed z-index

setting button group to z-top index fixes issues regarding index for both other buttons and the footer
---
 app/routes/circulars._archive._index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/routes/circulars._archive._index.tsx b/app/routes/circulars._archive._index.tsx
index 1d44811a2..b165b7592 100644
--- a/app/routes/circulars._archive._index.tsx
+++ b/app/routes/circulars._archive._index.tsx
@@ -292,7 +292,7 @@ export default function () {
         </Link>{' '}
         for help with subscribing to or submitting Circulars.
       </p>
-      <ButtonGroup className="position-sticky top-0 bg-white margin-bottom-1 padding-top-1">
+      <ButtonGroup className="position-sticky top-0 bg-white margin-bottom-1 padding-top-1 z-top">
         <Form
           className="display-inline-block usa-search usa-search--small"
           role="search"

From aa2cff1c1bd36475487de1ebe7977bb63e5ce3cb Mon Sep 17 00:00:00 2001
From: Tyler Barna <57914086+tylerbarna@users.noreply.github.com>
Date: Mon, 9 Oct 2023 14:05:17 -0500
Subject: [PATCH 05/55] Update app/routes/circulars._archive._index.tsx

Co-authored-by: Leo Singer <leo.p.singer@nasa.gov>
---
 app/routes/circulars._archive._index.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/routes/circulars._archive._index.tsx b/app/routes/circulars._archive._index.tsx
index b165b7592..273a2cfc3 100644
--- a/app/routes/circulars._archive._index.tsx
+++ b/app/routes/circulars._archive._index.tsx
@@ -327,7 +327,7 @@ export default function () {
             <DateSelectorButton
               startDate={startDate}
               endDate={endDate}
-              onClick={() => setShowContent(!showContent)}
+              onClick={() => { setShowContent((shown) => !shown) }}
               expanded={showContent}
             />
             {showContent && (

From 8eb1668ad58588e15f4c3762d164d65c39f0464c Mon Sep 17 00:00:00 2001
From: tylerbarna <tylerpbarna@gmail.com>
Date: Mon, 9 Oct 2023 15:14:34 -0500
Subject: [PATCH 06/55] fix undefined label

no longer have undefined label, will now display All Time instead
---
 app/routes/circulars._archive._index.tsx | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/routes/circulars._archive._index.tsx b/app/routes/circulars._archive._index.tsx
index 273a2cfc3..03b5f8f30 100644
--- a/app/routes/circulars._archive._index.tsx
+++ b/app/routes/circulars._archive._index.tsx
@@ -187,6 +187,7 @@ const dateSelectorLabels: Record<string, string> = {
   today: 'Today',
   mtd: 'Month to date',
   ytd: 'Year to date',
+  undefined: 'All time',
 }
 
 function DateSelectorButton({

From 347d9d8123692d627461f503c1437904260565c5 Mon Sep 17 00:00:00 2001
From: tylerbarna <tylerpbarna@gmail.com>
Date: Tue, 10 Oct 2023 13:53:05 -0500
Subject: [PATCH 07/55] addressed various comments

removed radio button class that was not a uswds search component, removed commented out code, fixed card className, made the date range button match the labels for the radio buttons, made it so the date range filter dropdown is hidden upon submission
---
 app/routes/circulars._archive._index.tsx | 29 ++++++++----------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/app/routes/circulars._archive._index.tsx b/app/routes/circulars._archive._index.tsx
index 03b5f8f30..391328b96 100644
--- a/app/routes/circulars._archive._index.tsx
+++ b/app/routes/circulars._archive._index.tsx
@@ -265,7 +265,7 @@ export default function () {
   }
 
   const setDateRange = () => {
-    // setShowContent(false)
+    setShowContent(false)
     if (showDateRange) setShowDateRange(false)
     const params = new URLSearchParams(location.search)
     if (inputDateGte) params.set('startDate', inputDateGte)
@@ -328,12 +328,14 @@ export default function () {
             <DateSelectorButton
               startDate={startDate}
               endDate={endDate}
-              onClick={() => { setShowContent((shown) => !shown) }}
+              onClick={() => {
+                setShowContent((shown) => !shown)
+              }}
               expanded={showContent}
             />
             {showContent && (
               <DetailsDropdownContent className="margin-top-1">
-                <div className="usa-radio maxw-card-xlg">
+                <div className="maxw-card-xlg">
                   <div className="display-flex flex-row">
                     <div className="display-flex flex-column flex-align-start margin-1">
                       <Radio
@@ -342,7 +344,6 @@ export default function () {
                         value="undefined"
                         defaultChecked={true}
                         label="All Time"
-                        className="usa-search__filter-button"
                         onChange={(e) => {
                           setFuzzyTime(e.target.value)
                         }}
@@ -351,8 +352,7 @@ export default function () {
                         id="radio-hour"
                         name="radio-date"
                         value="hour"
-                        label="Past hour"
-                        className="usa-search__filter-button"
+                        label="Last hour"
                         onChange={(e) => {
                           setFuzzyTime(e.target.value)
                         }}
@@ -362,7 +362,6 @@ export default function () {
                         name="radio-date"
                         value="today"
                         label="Today"
-                        className="usa-search__filter-button"
                         onChange={(e) => {
                           setFuzzyTime(e.target.value)
                         }}
@@ -373,8 +372,7 @@ export default function () {
                         id="radio-day"
                         name="radio-date"
                         value="day"
-                        label="Past 24 Hours"
-                        className="usa-search__filter-button"
+                        label="Last 24 Hours"
                         onChange={(e) => {
                           setFuzzyTime(e.target.value)
                         }}
@@ -383,8 +381,7 @@ export default function () {
                         id="radio-week"
                         name="radio-date"
                         value="week"
-                        label="Past Week"
-                        className="usa-search__filter-button"
+                        label="Last Week"
                         onChange={(e) => {
                           setFuzzyTime(e.target.value)
                         }}
@@ -393,8 +390,7 @@ export default function () {
                         id="radio-month"
                         name="radio-date"
                         value="month"
-                        label="Past Month"
-                        className="usa-search__filter-button"
+                        label="Last Month"
                         onChange={(e) => {
                           setFuzzyTime(e.target.value)
                         }}
@@ -406,8 +402,7 @@ export default function () {
                         id="radio-year"
                         name="radio-date"
                         value="year"
-                        label="Past Year"
-                        className="usa-search__filter-button"
+                        label="Last Year"
                         onChange={(e) => {
                           setFuzzyTime(e.target.value)
                         }}
@@ -417,7 +412,6 @@ export default function () {
                         name="radio-date"
                         value="ytd"
                         label="Year to Date"
-                        className="usa-search__filter-button"
                         onChange={(e) => {
                           setFuzzyTime(e.target.value)
                         }}
@@ -427,7 +421,6 @@ export default function () {
                         name="radio-date"
                         value="custom"
                         label="Custom Range..."
-                        className="usa-search__filter-button"
                         onChange={(e) => {
                           setShowDateRange(e.target.checked)
                         }}
@@ -447,7 +440,6 @@ export default function () {
                         onChange: (value) => {
                           setInputDateGte(value)
                         },
-                        // style: { height: '15px' }, // Adjust the height as needed
                       }}
                       endDateHint="dd/mm/yyyy"
                       endDateLabel="End Date"
@@ -458,7 +450,6 @@ export default function () {
                         onChange: (value) => {
                           setInputDateLte(value)
                         },
-                        // style: { height: '15px' },
                       }}
                     />
                   )}

From 75e4340cba5093406c3bb2cb04a46deba28c7b75 Mon Sep 17 00:00:00 2001
From: tylerbarna <tylerpbarna@gmail.com>
Date: Tue, 10 Oct 2023 14:20:56 -0500
Subject: [PATCH 08/55] fixed radio button selection on submission

the radio button selected by the user will persist upon submission. Accomplished using a useEffect (thanks to Courey for the advice)
---
 app/routes/circulars._archive._index.tsx | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/routes/circulars._archive._index.tsx b/app/routes/circulars._archive._index.tsx
index 391328b96..ef544745f 100644
--- a/app/routes/circulars._archive._index.tsx
+++ b/app/routes/circulars._archive._index.tsx
@@ -26,7 +26,7 @@ import {
 } from '@trussworks/react-uswds'
 import classNames from 'classnames'
 import clamp from 'lodash/clamp'
-import { useState } from 'react'
+import { useEffect, useState } from 'react'
 
 import { circularRedirect, search } from './circulars/circulars.server'
 import type { action } from './circulars/route'
@@ -276,6 +276,15 @@ export default function () {
     })
   }
 
+  useEffect(() => {
+    const radiobuttons = document.querySelectorAll('input[name="radio-date"]')
+    radiobuttons.forEach((button) => {
+      if ((button as HTMLInputElement).value === inputDateGte) {
+        ;(button as HTMLInputElement).checked = true
+      } // may not address edge case of selecting custom range
+    })
+  })
+
   return (
     <>
       <h1>GCN Circulars</h1>
@@ -330,6 +339,7 @@ export default function () {
               endDate={endDate}
               onClick={() => {
                 setShowContent((shown) => !shown)
+                setShowDateRange(false)
               }}
               expanded={showContent}
             />

From 1c311225564993f36f90e9b48e5c2aca48f178cd Mon Sep 17 00:00:00 2001
From: tylerbarna <tylerpbarna@gmail.com>
Date: Tue, 10 Oct 2023 15:03:57 -0500
Subject: [PATCH 09/55] fixed check condition to handle custom range

useEffect will check through the buttons and set the correct one to be checked. however, the date range div will not be expanded
---
 app/routes/circulars._archive._index.tsx | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/routes/circulars._archive._index.tsx b/app/routes/circulars._archive._index.tsx
index ef544745f..65597e22e 100644
--- a/app/routes/circulars._archive._index.tsx
+++ b/app/routes/circulars._archive._index.tsx
@@ -245,7 +245,7 @@ export default function () {
   const [inputQuery, setInputQuery] = useState(query)
   const [inputDateGte, setInputDateGte] = useState(startDate)
   const [inputDateLte, setInputDateLte] = useState(endDate)
-  const [showContent, setShowContent] = useState(false) // for the custom date range dropdown
+  const [showContent, setShowContent] = useState(false)
   const [showDateRange, setShowDateRange] = useState(false)
   const clean =
     inputQuery === query &&
@@ -266,7 +266,6 @@ export default function () {
 
   const setDateRange = () => {
     setShowContent(false)
-    if (showDateRange) setShowDateRange(false)
     const params = new URLSearchParams(location.search)
     if (inputDateGte) params.set('startDate', inputDateGte)
     if (inputDateLte) params.set('endDate', inputDateLte)
@@ -278,11 +277,19 @@ export default function () {
 
   useEffect(() => {
     const radiobuttons = document.querySelectorAll('input[name="radio-date"]')
+    let radioSelected = false
     radiobuttons.forEach((button) => {
       if ((button as HTMLInputElement).value === inputDateGte) {
         ;(button as HTMLInputElement).checked = true
-      } // may not address edge case of selecting custom range
+        radioSelected = true
+      }
     })
+    if (!radioSelected) {
+      const customButton = document.getElementById('radio-custom')
+      if (customButton) {
+        ;(customButton as HTMLInputElement).checked = true
+      } // does not address the need for the custom date range button to be expanded if this button is checked
+    }
   })
 
   return (

From 6e9e986404f936793659a54f62ded3e8ac9186a7 Mon Sep 17 00:00:00 2001
From: Leo Singer <leo.singer@ligo.org>
Date: Thu, 28 Sep 2023 16:09:04 -0400
Subject: [PATCH 10/55] Add API for third parties to post GCN Circulars on
 behalf of users

---
 __tests__/cognito.server.ts                   |  32 ++-
 app/email-incoming/circulars/index.ts         |  17 +-
 app/lib/cognito.server.ts                     |  15 +-
 app/routes/_auth/user.server.ts               |  20 +-
 app/routes/api.circulars.ts                   | 190 ++++++++++++++++++
 .../circulars.$circularId/FrontMatter.tsx     |   1 +
 app/routes/circulars/circulars.lib.ts         |   2 +-
 app/routes/circulars/circulars.server.ts      |   5 +-
 app/routes/circulars/route.tsx                |   6 +-
 .../user.endorsements/endorsements.server.ts  |  12 +-
 10 files changed, 251 insertions(+), 49 deletions(-)
 create mode 100644 app/routes/api.circulars.ts

diff --git a/__tests__/cognito.server.ts b/__tests__/cognito.server.ts
index 97a3e251c..7e3549e8f 100644
--- a/__tests__/cognito.server.ts
+++ b/__tests__/cognito.server.ts
@@ -21,46 +21,40 @@ const mockUserAttribues: AttributeType[] = [
 
 describe('extractAttribute', () => {
   test('extracts name attribute', () => {
-    expect(extractAttribute({ Attributes: mockUserAttribues }, 'name')).toBe(
-      'Example User'
-    )
+    expect(extractAttribute(mockUserAttribues, 'name')).toBe('Example User')
   })
 
   test('extracts affiliation attribute', () => {
-    expect(
-      extractAttribute({ Attributes: mockUserAttribues }, 'custom:affiliation')
-    ).toBe('The Example Institute')
+    expect(extractAttribute(mockUserAttribues, 'custom:affiliation')).toBe(
+      'The Example Institute'
+    )
   })
 
   test('returns undefined if missing attribute', () => {
-    expect(
-      extractAttribute({ Attributes: mockUserAttribues }, 'username')
-    ).toBe(undefined)
+    expect(extractAttribute(mockUserAttribues, 'username')).toBe(undefined)
   })
 
   test('returns undefined if attributes array is undefined', () => {
-    expect(extractAttribute({ Attributes: undefined }, 'username')).toBe(
-      undefined
-    )
+    expect(extractAttribute(undefined, 'username')).toBe(undefined)
   })
 })
 
 describe('extractAttributeRequired', () => {
   test('extracts email attribute', () => {
-    expect(
-      extractAttributeRequired({ Attributes: mockUserAttribues }, 'email')
-    ).toBe('example@example.com')
+    expect(extractAttributeRequired(mockUserAttribues, 'email')).toBe(
+      'example@example.com'
+    )
   })
 
   test('extracts sub attribute', () => {
-    expect(
-      extractAttributeRequired({ Attributes: mockUserAttribues }, 'sub')
-    ).toBe('00000000-0000-0000-0000-000000000000')
+    expect(extractAttributeRequired(mockUserAttribues, 'sub')).toBe(
+      '00000000-0000-0000-0000-000000000000'
+    )
   })
 
   test('throws error when attribute key is missing', () => {
     expect(() =>
-      extractAttributeRequired({ Attributes: mockUserAttribues }, 'username')
+      extractAttributeRequired(mockUserAttribues, 'username')
     ).toThrow(new Error('required user attribute username is missing'))
   })
 })
diff --git a/app/email-incoming/circulars/index.ts b/app/email-incoming/circulars/index.ts
index 323ffe424..dbebd58b5 100644
--- a/app/email-incoming/circulars/index.ts
+++ b/app/email-incoming/circulars/index.ts
@@ -117,15 +117,16 @@ async function getCognitoUserData(
   userEmail: string
 ): Promise<UserData | undefined> {
   const users = await listUsersInGroup(group)
-  const userTypeData = users.find(
-    (user) => extractAttributeRequired(user, 'email') == userEmail
-  )
+  const Attributes = users.find(
+    ({ Attributes }) =>
+      extractAttributeRequired(Attributes, 'email') == userEmail
+  )?.Attributes
   return (
-    userTypeData && {
-      sub: extractAttributeRequired(userTypeData, 'sub'),
-      email: extractAttributeRequired(userTypeData, 'email'),
-      name: extractAttribute(userTypeData, 'name'),
-      affiliation: extractAttribute(userTypeData, 'custom:affiliation'),
+    Attributes && {
+      sub: extractAttributeRequired(Attributes, 'sub'),
+      email: extractAttributeRequired(Attributes, 'email'),
+      name: extractAttribute(Attributes, 'name'),
+      affiliation: extractAttribute(Attributes, 'custom:affiliation'),
       submit: true,
     }
   )
diff --git a/app/lib/cognito.server.ts b/app/lib/cognito.server.ts
index 0adac6f2f..170e824c6 100644
--- a/app/lib/cognito.server.ts
+++ b/app/lib/cognito.server.ts
@@ -6,6 +6,7 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import type {
+  AttributeType,
   CognitoIdentityProviderServiceException,
   UserType,
 } from '@aws-sdk/client-cognito-identity-provider'
@@ -22,8 +23,11 @@ export const cognito = new CognitoIdentityProviderClient({})
  * @param Attributes Derived from a provided user profile in a Amazon Cognito user pool.
  * @param key The string name of the Cognito Attribute
  */
-export function extractAttribute({ Attributes }: UserType, key: string) {
-  return Attributes?.find(({ Name }) => key === Name)?.Value
+export function extractAttribute(
+  attributes: AttributeType[] | undefined,
+  key: string
+) {
+  return attributes?.find(({ Name }) => key === Name)?.Value
 }
 
 /**
@@ -34,8 +38,11 @@ export function extractAttribute({ Attributes }: UserType, key: string) {
  * @param user A user profile in a Amazon Cognito user pool.
  * @param key The string name of the Cognito Attribute
  */
-export function extractAttributeRequired(user: UserType, key: string) {
-  const value = extractAttribute(user, key)
+export function extractAttributeRequired(
+  attributes: AttributeType[] | undefined,
+  key: string
+) {
+  const value = extractAttribute(attributes, key)
   if (value === undefined)
     throw new Error(`required user attribute ${key} is missing`)
   return value
diff --git a/app/routes/_auth/user.server.ts b/app/routes/_auth/user.server.ts
index 8e3755ad6..e4e36a9f0 100644
--- a/app/routes/_auth/user.server.ts
+++ b/app/routes/_auth/user.server.ts
@@ -21,6 +21,17 @@ export interface User {
   affiliation: string | undefined
 }
 
+export function parseIdp(identities: unknown) {
+  if (!(identities instanceof Array)) return null
+  const providerName = identities[0]?.providerName
+  if (!(typeof providerName === 'string')) return null
+  return providerName
+}
+
+export function parseGroups(groups?: string[]) {
+  return (groups ?? []).filter((group) => group.startsWith('gcn.nasa.gov/'))
+}
+
 export function parseTokenSet(tokenSet: TokenSet): {
   user: User
   accessToken?: string
@@ -47,13 +58,8 @@ export function parseTokenSet(tokenSet: TokenSet): {
   //
   // See https://openid.net/specs/openid-connect-core-1_0.html#ClaimStability
   const { sub, email, 'cognito:username': cognitoUserName } = claims
-  const idp =
-    claims.identities instanceof Array && claims.identities.length > 0
-      ? (claims.identities[0].providerName as string)
-      : null
-  const groups = ((claims['cognito:groups'] ?? []) as string[]).filter(
-    (group) => group.startsWith('gcn.nasa.gov/')
-  )
+  const idp = parseIdp(claims.identities)
+  const groups = parseGroups(claims['cognito:groups'] as string[] | undefined)
   const name = claims.name
   const affiliation = claims['affiliation'] as string | undefined
   const accessToken = tokenSet.access_token
diff --git a/app/routes/api.circulars.ts b/app/routes/api.circulars.ts
new file mode 100644
index 000000000..f7cce9d1e
--- /dev/null
+++ b/app/routes/api.circulars.ts
@@ -0,0 +1,190 @@
+/*!
+ * Copyright © 2023 United States Government as represented by the
+ * Administrator of the National Aeronautics and Space Administration.
+ * All Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import {
+  AdminGetUserCommand,
+  type AttributeType,
+} from '@aws-sdk/client-cognito-identity-provider'
+import type { ActionFunctionArgs } from '@remix-run/node'
+import type * as jose from 'jose'
+import invariant from 'tiny-invariant'
+
+import { getOpenIDClient } from './_auth/auth.server'
+import { type User, parseGroups, parseIdp } from './_auth/user.server'
+import { group, put } from './circulars/circulars.server'
+import {
+  cognito,
+  extractAttribute,
+  extractAttributeRequired,
+} from '~/lib/cognito.server'
+import { feature, getEnvOrDie } from '~/lib/env.server'
+
+// FIXME: BaseClient.validateJWT is non-private but undocumented.
+// openid-client doesn't provide a type for it.
+declare module 'openid-client' {
+  interface BaseClient {
+    validateJWT(
+      jwt: string,
+      expectedAlg: string,
+      required?: string[]
+    ): Promise<{
+      payload: any
+      protected: jose.CompactJWSHeaderParameters
+      key: jose.JWK
+    }>
+  }
+}
+
+/** Get the bearer token from an HTTP request. */
+function getBearer(request: Request) {
+  return request.headers.get('Authorization')?.match(/^Bearer (.*)$/)?.[1]
+}
+
+/**
+ * Validate and parse an access token from Cognito.
+ *
+ * Note that access tokens are usually supposed to be opaque, so this is not
+ * portable to other IdPs.
+ */
+async function parseAccessToken(jwt: string): Promise<{
+  iss: string
+  sub: string
+  exp: string
+  iat: string
+  scope: string
+  'cognito:groups': string[]
+  username: string
+}> {
+  const client = await getOpenIDClient()
+  const alg = client.metadata.authorization_signed_response_alg
+  invariant(alg)
+
+  const { payload } = await client.validateJWT(jwt, alg, [
+    'iss',
+    'sub',
+    'exp',
+    'iat',
+    'scope',
+    'cognito:groups',
+    'username',
+  ])
+  return payload
+}
+
+function extractIdp(attrs: AttributeType[]) {
+  const identities = extractAttribute(attrs, 'identities')
+  if (!identities) return null
+  return parseIdp(JSON.parse(identities))
+}
+
+async function getUserAttributes(Username: string) {
+  const UserPoolId = getEnvOrDie('COGNITO_USER_POOL_ID')
+
+  const { UserAttributes } = await cognito.send(
+    new AdminGetUserCommand({
+      UserPoolId,
+      Username,
+    })
+  )
+  invariant(UserAttributes)
+
+  return {
+    affiliation: extractAttribute(UserAttributes, 'custom:affiliation'),
+    email: extractAttributeRequired(UserAttributes, 'email'),
+    idp: extractIdp(UserAttributes),
+    name: extractAttribute(UserAttributes, 'name'),
+    existingIdp: extractAttribute(UserAttributes, 'dev:custom:existingIdp'),
+  }
+}
+
+/**
+ * GCN Circulars submission by third parties on behalf of users via an API.
+ *
+ * Here's how this works.
+ *
+ * 1. We configure a Cognito user pool [app client] for the third party.
+ *    The app client should have the following settings:
+ *
+ *    - Confidential client
+ *    - Generate a client secret
+ *    - Authentication flows: ALLOW_USER_SRP_AUTH
+ *    - Refresh token expiration: TBD, determines how often the third party
+ *      needs to "renew" permission for user account linking
+ *    - Allowed callback URLs: must be provided by the third party
+ *    - Identity providers: select all
+ *    - OpenID Connect Scopes: Phone, Email, OpenID. Do NOT select
+ *      aws.cognito.signin.user.admin.
+ *    - Custom scopes: gcn.nasa.gov/circular-submitter
+ *    - Attribute read and write permissions: turn off all write permissions
+ *
+ * 2. We send the client ID, client secret, and OIDC autodiscovery URL to the
+ *    third party. The client secret must be encrypted.
+ *
+ * 3. In order to link an account for posting GCN Circulars, the third party's
+ *    application does the following:
+ *
+ *    a. Do the [authorization code flow] to sign the user in with GCN's IdP.
+ *       When requesting the authorization endpoint, be sure to reuqest
+ *       scope=gcn.nasa.gov/circular-submitter. (Note: the name of this scope
+ *       may change in the future.)
+ *
+ *    b. For now, if resulting ID token contains the 'existingIdp' claim, then
+ *       the third party MUST redo the authentication code flow passing the
+ *       query string parameter identity_provider=${existingIdp} to the
+ *       authorization endpoint. GCN's IdP uses this claim to mark accounts
+ *       that have email addresses that have already been used before by a
+ *       different account from a different federated IdP (i.e., a Google user
+ *       who is attempting to sign in with username and password).
+ *
+ *    c. Save the resulting refresh token and auth token on the server side in
+ *       a record associated with the user's account.
+ *
+ *    d. To post a GCN Circular on behalf of the user, make a POST request to
+ *       https://<stage>.gcn.nasa.gov/api/circulars. Provide the access token
+ *       in the Authorization: Bearer header. The request body should be a JSON
+ *       document of the form '{"subject": "...", "body": "..."}'.
+ *
+ *    e. The application is responsible for renewing the access token as needed
+ *       using the refreshing token.
+ *
+ * [app client]: https://docs.aws.amazon.com/cognito/latest/developerguide/user-pool-settings-client-apps.html
+ * [authorization code flow]: https://auth0.com/docs/get-started/authentication-and-authorization-flow/authorization-code-flow
+ */
+export async function action({ request }: ActionFunctionArgs) {
+  if (!feature('CIRCULARS_API')) throw new Response(null, { status: 404 })
+  if (request.method !== 'POST') throw new Response(null, { status: 405 })
+
+  const bearer = getBearer(request)
+  if (!bearer) throw new Response('Bearer missing', { status: 403 })
+
+  const {
+    username: cognitoUserName,
+    'cognito:groups': groups,
+    sub,
+    scope,
+  } = await parseAccessToken(bearer)
+
+  // Make sure that the access token contains the required scope for this API
+  if (!scope.split(' ').includes(group))
+    throw new Response('Invalid scope', { status: 403 })
+
+  const { existingIdp, ...attrs } = await getUserAttributes(cognitoUserName)
+  if (existingIdp) throw new Response('Wrong IdP', { status: 400 })
+
+  const user: User = {
+    sub,
+    cognitoUserName,
+    groups: parseGroups(groups),
+    ...attrs,
+  }
+
+  const { subject, body } = await request.json()
+  if (!(typeof subject === 'string' && typeof body === 'string'))
+    throw new Response(null, { status: 400 })
+
+  return await put({ submittedHow: 'api', subject, body }, user)
+}
diff --git a/app/routes/circulars.$circularId/FrontMatter.tsx b/app/routes/circulars.$circularId/FrontMatter.tsx
index 6da50a970..93a1b9169 100644
--- a/app/routes/circulars.$circularId/FrontMatter.tsx
+++ b/app/routes/circulars.$circularId/FrontMatter.tsx
@@ -15,6 +15,7 @@ const submittedHowMap = {
   web: 'Web form',
   email: 'email',
   'email-legacy': 'legacy email',
+  api: 'API',
 }
 
 function FrontMatterItem({
diff --git a/app/routes/circulars/circulars.lib.ts b/app/routes/circulars/circulars.lib.ts
index 96e2450c3..dd82bece8 100644
--- a/app/routes/circulars/circulars.lib.ts
+++ b/app/routes/circulars/circulars.lib.ts
@@ -12,7 +12,7 @@ export interface CircularMetadata {
   subject: string
 }
 
-export type SubmittedHow = 'web' | 'email' | 'email-legacy'
+export type SubmittedHow = 'web' | 'email' | 'email-legacy' | 'api'
 
 export interface Circular extends CircularMetadata {
   sub?: string
diff --git a/app/routes/circulars/circulars.server.ts b/app/routes/circulars/circulars.server.ts
index b9a19cd33..cd63c673e 100644
--- a/app/routes/circulars/circulars.server.ts
+++ b/app/routes/circulars/circulars.server.ts
@@ -12,7 +12,7 @@ import { DynamoDBAutoIncrement } from '@nasa-gcn/dynamodb-autoincrement'
 import { redirect } from '@remix-run/node'
 import memoizee from 'memoizee'
 
-import { getUser } from '../_auth/user.server'
+import { type User, getUser } from '../_auth/user.server'
 import { bodyIsValid, formatAuthor, subjectIsValid } from './circulars.lib'
 import type { Circular, CircularMetadata } from './circulars.lib'
 import { search as getSearch } from '~/lib/search.server'
@@ -230,9 +230,8 @@ export async function put(
     Omit<Circular, 'sub' | 'submitter' | 'createdOn' | 'circularId'>,
     'submittedHow'
   >,
-  request: Request
+  user?: User
 ) {
-  const user = await getUser(request)
   if (!user?.groups.includes(group))
     throw new Response('User is not in the submitters group', {
       status: 403,
diff --git a/app/routes/circulars/route.tsx b/app/routes/circulars/route.tsx
index b44d5547c..bf05b606e 100644
--- a/app/routes/circulars/route.tsx
+++ b/app/routes/circulars/route.tsx
@@ -9,6 +9,7 @@ import type { DataFunctionArgs } from '@remix-run/node'
 import { Outlet } from '@remix-run/react'
 import { GridContainer } from '@trussworks/react-uswds'
 
+import { getUser } from '../_auth/user.server'
 import { put } from './circulars.server'
 import { getFormDataString } from '~/lib/utils'
 import type { BreadcrumbHandle } from '~/root/Title'
@@ -23,7 +24,10 @@ export async function action({ request }: DataFunctionArgs) {
   const subject = getFormDataString(data, 'subject')
   if (!body || !subject)
     throw new Response('Body and subject are required', { status: 400 })
-  return await put({ subject, body, submittedHow: 'web' }, request)
+  return await put(
+    { subject, body, submittedHow: 'web' },
+    await getUser(request)
+  )
 }
 
 export default function () {
diff --git a/app/routes/user.endorsements/endorsements.server.ts b/app/routes/user.endorsements/endorsements.server.ts
index 47d52ef4a..910bf4730 100644
--- a/app/routes/user.endorsements/endorsements.server.ts
+++ b/app/routes/user.endorsements/endorsements.server.ts
@@ -110,7 +110,7 @@ export class EndorsementsServer {
         status: 400,
       })
 
-    const endorserEmail = extractAttributeRequired(user, 'email')
+    const endorserEmail = extractAttributeRequired(user.Attributes, 'email')
 
     const db = await tables()
 
@@ -417,10 +417,10 @@ async function getUsersInGroup(): Promise<EndorsementUser[]> {
     ]
   }
 
-  return users.map((user) => ({
-    sub: extractAttributeRequired(user, 'sub'),
-    email: extractAttributeRequired(user, 'email'),
-    name: extractAttribute(user, 'name'),
-    affiliation: extractAttribute(user, 'custom:affiliation'),
+  return users.map(({ Attributes }) => ({
+    sub: extractAttributeRequired(Attributes, 'sub'),
+    email: extractAttributeRequired(Attributes, 'email'),
+    name: extractAttribute(Attributes, 'name'),
+    affiliation: extractAttribute(Attributes, 'custom:affiliation'),
   }))
 }

From 80502214e26d5f9ef616f86aa48c475814d02492 Mon Sep 17 00:00:00 2001
From: Leo Singer <leo.singer@ligo.org>
Date: Fri, 6 Oct 2023 08:23:49 -0400
Subject: [PATCH 11/55] Refactor root meta function as meta tags

This refactoring will make it simpler to add SEO metadata to
routes because it will avoid having to merge meta function outputs.

According to https://remix.run/docs/en/main/route/meta#global-meta:

> Nearly every app will have global meta like the viewport and
> charSet. We recommend using normal <meta> tags inside the root
> route instead of the meta export, so you simply don't have to
> deal with merging.
---
 app/root.tsx | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/app/root.tsx b/app/root.tsx
index 178c0701e..c2b6985b2 100644
--- a/app/root.tsx
+++ b/app/root.tsx
@@ -19,11 +19,7 @@
  *
  */
 import { cssBundleHref } from '@remix-run/css-bundle'
-import type {
-  DataFunctionArgs,
-  LinksFunction,
-  MetaFunction,
-} from '@remix-run/node'
+import type { DataFunctionArgs, LinksFunction } from '@remix-run/node'
 import {
   Link,
   Links,
@@ -98,17 +94,6 @@ export const handle: BreadcrumbHandle = {
   breadcrumb: 'GCN',
 }
 
-export const meta: MetaFunction<typeof loader> = ({ data }) => {
-  const result = [
-    { charset: 'utf-8' },
-    { name: 'viewport', content: 'width=device-width,initial-scale=1' },
-  ]
-  // Exclude non-production deployments from indexing by search engines
-  if (data && new URL(data.origin).hostname !== 'gcn.nasa.gov')
-    result.push({ name: 'robots', content: 'noindex' })
-  return result
-}
-
 export const links: LinksFunction = () => [
   {
     rel: 'stylesheet',
@@ -210,9 +195,14 @@ function Progress() {
 }
 
 function Document({ children }: { children?: React.ReactNode }) {
+  const noIndex = useHostname() !== 'gcn.nasa.gov'
+
   return (
     <html lang="en-US">
       <head>
+        <meta charSet="utf-8" />
+        <meta name="viewport" content="width=device-width,initial-scale=1" />
+        {noIndex && <meta name="robots" content="noindex" />}
         <Meta />
         <Links />
         <Title />

From 94dcd423f66ae1f446f1c51c01e285780c962976 Mon Sep 17 00:00:00 2001
From: Leo Singer <leo.singer@ligo.org>
Date: Thu, 5 Oct 2023 15:00:21 -0400
Subject: [PATCH 12/55] Clean up URL routing for schema browser

- Redirect from /docs/schema to /docs/schema/stable,
  from /docs/schema/stable to /docs/schema/<latest>,
  and from /docs/schema/$version to /docs/schema/$version/gcn/notices.
- The loader for /docs/schema can now be safely cached because its
  return value does not depend on the dynamic portions of the path
  from its child routes.
- The /docs/schema/<version> index route, which was only ever used
  as a component import, is gone.
---
 app/lib/schema-data.server.ts                 |   2 +-
 app/routes/docs.tsx                           |   2 +-
 .../BreadcrumbNav.tsx                         |   0
 .../SchemaDocumentation.tsx}                  |   2 +-
 .../TableColumns.module.scss                  |   0
 .../components.tsx                            |   0
 .../route.tsx                                 | 147 +++++++++++++-----
 app/routes/docs_._schema-browser.tsx          |  27 ++++
 app/routes/docs_.schema.stable.$.ts           |  18 ---
 app/routes/docs_.schema.tsx                   |  99 ------------
 10 files changed, 138 insertions(+), 159 deletions(-)
 rename app/routes/{docs_.schema.$version.$ => docs_._schema-browser.schema.($version).$}/BreadcrumbNav.tsx (100%)
 rename app/routes/{docs_.schema.$version._index.tsx => docs_._schema-browser.schema.($version).$/SchemaDocumentation.tsx} (97%)
 rename app/routes/{docs_.schema.$version.$ => docs_._schema-browser.schema.($version).$}/TableColumns.module.scss (100%)
 rename app/routes/{docs_.schema.$version.$ => docs_._schema-browser.schema.($version).$}/components.tsx (100%)
 rename app/routes/{docs_.schema.$version.$ => docs_._schema-browser.schema.($version).$}/route.tsx (64%)
 create mode 100644 app/routes/docs_._schema-browser.tsx
 delete mode 100644 app/routes/docs_.schema.stable.$.ts
 delete mode 100644 app/routes/docs_.schema.tsx

diff --git a/app/lib/schema-data.server.ts b/app/lib/schema-data.server.ts
index 0fc5c19b9..ad53bdb6f 100644
--- a/app/lib/schema-data.server.ts
+++ b/app/lib/schema-data.server.ts
@@ -15,7 +15,7 @@ import { getEnvOrDieInProduction } from './env.server'
 import type {
   ReferencedSchema,
   Schema,
-} from '~/routes/docs_.schema.$version.$/components'
+} from '~/routes/docs_._schema-browser.schema.($version).$/components'
 
 const GITHUB_API_TOKEN = getEnvOrDieInProduction('GITHUB_API_TOKEN')
 const octokit = new Octokit({ auth: GITHUB_API_TOKEN })
diff --git a/app/routes/docs.tsx b/app/routes/docs.tsx
index ba6b6b076..408b35f99 100644
--- a/app/routes/docs.tsx
+++ b/app/routes/docs.tsx
@@ -113,7 +113,7 @@ export default function () {
               </>,
               ...(enableSchemaBrowser
                 ? [
-                    <NavLink key="schema" to="schema/stable/gcn">
+                    <NavLink key="schema" to="schema">
                       Schema Browser
                     </NavLink>,
                   ]
diff --git a/app/routes/docs_.schema.$version.$/BreadcrumbNav.tsx b/app/routes/docs_._schema-browser.schema.($version).$/BreadcrumbNav.tsx
similarity index 100%
rename from app/routes/docs_.schema.$version.$/BreadcrumbNav.tsx
rename to app/routes/docs_._schema-browser.schema.($version).$/BreadcrumbNav.tsx
diff --git a/app/routes/docs_.schema.$version._index.tsx b/app/routes/docs_._schema-browser.schema.($version).$/SchemaDocumentation.tsx
similarity index 97%
rename from app/routes/docs_.schema.$version._index.tsx
rename to app/routes/docs_._schema-browser.schema.($version).$/SchemaDocumentation.tsx
index 7e7bcb95b..473f34c25 100644
--- a/app/routes/docs_.schema.$version._index.tsx
+++ b/app/routes/docs_._schema-browser.schema.($version).$/SchemaDocumentation.tsx
@@ -7,7 +7,7 @@
  */
 import { Link } from '@remix-run/react'
 
-export default function () {
+export function SchemaDocumentation() {
   return (
     <>
       <h2>Schema Browser</h2>
diff --git a/app/routes/docs_.schema.$version.$/TableColumns.module.scss b/app/routes/docs_._schema-browser.schema.($version).$/TableColumns.module.scss
similarity index 100%
rename from app/routes/docs_.schema.$version.$/TableColumns.module.scss
rename to app/routes/docs_._schema-browser.schema.($version).$/TableColumns.module.scss
diff --git a/app/routes/docs_.schema.$version.$/components.tsx b/app/routes/docs_._schema-browser.schema.($version).$/components.tsx
similarity index 100%
rename from app/routes/docs_.schema.$version.$/components.tsx
rename to app/routes/docs_._schema-browser.schema.($version).$/components.tsx
diff --git a/app/routes/docs_.schema.$version.$/route.tsx b/app/routes/docs_._schema-browser.schema.($version).$/route.tsx
similarity index 64%
rename from app/routes/docs_.schema.$version.$/route.tsx
rename to app/routes/docs_._schema-browser.schema.($version).$/route.tsx
index e304db535..8fc2fee0a 100644
--- a/app/routes/docs_.schema.$version.$/route.tsx
+++ b/app/routes/docs_._schema-browser.schema.($version).$/route.tsx
@@ -6,21 +6,26 @@
  * SPDX-License-Identifier: Apache-2.0
  */
 import type { DataFunctionArgs } from '@remix-run/node'
-import { json } from '@remix-run/node'
-import { Link, useLoaderData } from '@remix-run/react'
+import { json, redirect } from '@remix-run/node'
+import { Link, useLoaderData, useRouteLoaderData } from '@remix-run/react'
 import {
   Card,
   CardBody,
   CardGroup,
   CardHeader,
+  Grid,
   Icon,
   Table,
 } from '@trussworks/react-uswds'
 import { dirname } from 'path'
+import { useState } from 'react'
 import { useParams } from 'react-router'
+import invariant from 'tiny-invariant'
 import { useWindowSize } from 'usehooks-ts'
 
-import SchemaDefinition from '../docs_.schema.$version._index'
+import type { loader as parentLoader } from '../docs_._schema-browser'
+import BreadcrumbNav from './BreadcrumbNav'
+import { SchemaDocumentation } from './SchemaDocumentation'
 import type { Schema } from './components'
 import {
   ReferencedElementTable,
@@ -28,6 +33,8 @@ import {
   formatFieldName,
   formatFieldType,
 } from './components'
+import DetailsDropdownButton from '~/components/DetailsDropdownButton'
+import DetailsDropdownContent from '~/components/DetailsDropdownContent'
 import { Highlight } from '~/components/Highlight'
 import { Tab, Tabs } from '~/components/tabs/Tabs'
 import { publicStaticShortTermCacheControlHeaders } from '~/lib/headers.server'
@@ -37,6 +44,7 @@ import type {
 } from '~/lib/schema-data.server'
 import {
   getGithubDir,
+  getLatestRelease,
   loadJson,
   loadSchemaExamples,
 } from '~/lib/schema-data.server'
@@ -44,7 +52,15 @@ import {
 export async function loader({
   params: { version, '*': path },
 }: DataFunctionArgs) {
-  if (!version) throw new Response('Missing version', { status: 404 })
+  if (version === 'stable') version = undefined
+  if (!version || !path) {
+    version ||= await getLatestRelease()
+    path ||= 'gcn/notices'
+    return redirect(`/docs/schema/${version}/${path}`, {
+      headers: publicStaticShortTermCacheControlHeaders,
+    })
+  }
+
   let jsonContent
   let data: GitContentDataResponse[]
   let examples: ExampleFile[] = []
@@ -66,44 +82,97 @@ export async function loader({
 export default function () {
   const { version, '*': path } = useParams()
   const { data, jsonContent, examples } = useLoaderData<typeof loader>()
-  if (!path) {
-    throw new Error('Path is not defined.')
-  }
+  const [showVersions, setShowVersions] = useState(false)
+  const versions = useRouteLoaderData<typeof parentLoader>(
+    'routes/docs_._schema-browser'
+  )
+  const windowSize = useWindowSize()
+
+  invariant(version)
+  invariant(path)
+  invariant(versions)
+
+  const isSchema = path.endsWith('.schema.json')
 
   return (
-    <div className="grid-col-12">
-      {jsonContent ? (
-        <SchemaBody
-          path={path ?? ''}
-          result={jsonContent}
-          selectedVersion={version ?? ''}
-          examples={examples}
+    <>
+      <Grid
+        row
+        className="position-sticky top-0 usa-breadcrumb z-100 padding-y-0"
+      >
+        <BreadcrumbNav
+          path={path.replace('.schema.json', '')}
+          className="tablet:grid-col-fill"
+          pathPrepend={`/docs/schema/${version}`}
         />
-      ) : (
-        <>
-          <SchemaDefinition />
-          <CardGroup>
-            {...data.map((x) => (
-              <Link key={x.path} to={x.path} className="tablet:grid-col-3">
-                <Card key={x.path} className="">
-                  <CardHeader>
-                    <h3 className="display-flex flex-align-center">
-                      {x.type == 'dir' && (
-                        <span className="margin-top-05 padding-right-05">
-                          <Icon.FolderOpen />
-                        </span>
-                      )}
-                      <span>{x.name.replace('.schema.json', '')}</span>
-                    </h3>
-                  </CardHeader>
-                  <CardBody></CardBody>
-                </Card>
-              </Link>
-            ))}
-          </CardGroup>
-        </>
-      )}
-    </div>
+        {windowSize.width < 480 && !isSchema && (
+          <h2 className="margin-y-0">{path.split('/').slice(-1)[0]}</h2>
+        )}
+        <div className="tablet:grid-col-auto tablet:margin-top-2">
+          <DetailsDropdownButton
+            className="width-full"
+            onClick={() => setShowVersions(!showVersions)}
+          >
+            {<>Version: {version}</>}
+          </DetailsDropdownButton>
+          {showVersions && (
+            <DetailsDropdownContent>
+              <CardHeader>
+                <h3>Versions</h3>
+              </CardHeader>
+              <CardBody className="padding-y-0">
+                {versions.map(({ name, ref }) => (
+                  <div key={ref}>
+                    <Link
+                      className="usa-link"
+                      to={`/docs/schema/${ref}/${path}`}
+                      onClick={() => setShowVersions(!setShowVersions)}
+                    >
+                      {name || ref}
+                    </Link>
+                  </div>
+                ))}
+              </CardBody>
+            </DetailsDropdownContent>
+          )}
+        </div>
+      </Grid>
+      <div className="grid-row grid-gap">
+        <div className="grid-col-12">
+          {jsonContent ? (
+            <SchemaBody
+              path={path}
+              result={jsonContent}
+              selectedVersion={version}
+              examples={examples}
+            />
+          ) : (
+            <>
+              <SchemaDocumentation />
+              <CardGroup>
+                {...data.map((x) => (
+                  <Link key={x.path} to={x.path} className="tablet:grid-col-3">
+                    <Card key={x.path} className="">
+                      <CardHeader>
+                        <h3 className="display-flex flex-align-center">
+                          {x.type == 'dir' && (
+                            <span className="margin-top-05 padding-right-05">
+                              <Icon.FolderOpen />
+                            </span>
+                          )}
+                          <span>{x.name.replace('.schema.json', '')}</span>
+                        </h3>
+                      </CardHeader>
+                      <CardBody></CardBody>
+                    </Card>
+                  </Link>
+                ))}
+              </CardGroup>
+            </>
+          )}
+        </div>
+      </div>
+    </>
   )
 }
 
diff --git a/app/routes/docs_._schema-browser.tsx b/app/routes/docs_._schema-browser.tsx
new file mode 100644
index 000000000..aae269e0b
--- /dev/null
+++ b/app/routes/docs_._schema-browser.tsx
@@ -0,0 +1,27 @@
+/*!
+ * Copyright © 2023 United States Government as represented by the Administrator
+ * of the National Aeronautics and Space Administration. No copyright is claimed
+ * in the United States under Title 17, U.S. Code. All Other Rights Reserved.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ */
+import { json } from '@remix-run/node'
+import { Outlet } from '@remix-run/react'
+import { GridContainer } from '@trussworks/react-uswds'
+
+import { publicStaticShortTermCacheControlHeaders } from '~/lib/headers.server'
+import { getVersionRefs } from '~/lib/schema-data.server'
+
+export async function loader() {
+  return json(await getVersionRefs(), {
+    headers: publicStaticShortTermCacheControlHeaders,
+  })
+}
+
+export default function () {
+  return (
+    <GridContainer className="usa-section">
+      <Outlet />
+    </GridContainer>
+  )
+}
diff --git a/app/routes/docs_.schema.stable.$.ts b/app/routes/docs_.schema.stable.$.ts
deleted file mode 100644
index 9eb51246b..000000000
--- a/app/routes/docs_.schema.stable.$.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/*!
- * Copyright © 2023 United States Government as represented by the
- * Administrator of the National Aeronautics and Space Administration.
- * All Rights Reserved.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-import type { DataFunctionArgs } from '@remix-run/node'
-import { redirect } from '@remix-run/node'
-
-import { publicStaticShortTermCacheControlHeaders } from '~/lib/headers.server'
-import { getLatestRelease } from '~/lib/schema-data.server'
-
-export async function loader({ params: { '*': path } }: DataFunctionArgs) {
-  return redirect(`/docs/schema/${await getLatestRelease()}/${path}`, {
-    headers: publicStaticShortTermCacheControlHeaders,
-  })
-}
diff --git a/app/routes/docs_.schema.tsx b/app/routes/docs_.schema.tsx
deleted file mode 100644
index 501eaedd8..000000000
--- a/app/routes/docs_.schema.tsx
+++ /dev/null
@@ -1,99 +0,0 @@
-/*!
- * Copyright © 2023 United States Government as represented by the
- * Administrator of the National Aeronautics and Space Administration.
- * All Rights Reserved.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-import type { DataFunctionArgs } from '@remix-run/node'
-import { json, redirect } from '@remix-run/node'
-import { Link, Outlet, useLoaderData, useParams } from '@remix-run/react'
-import {
-  CardBody,
-  CardHeader,
-  Grid,
-  GridContainer,
-} from '@trussworks/react-uswds'
-import { useState } from 'react'
-import { useWindowSize } from 'usehooks-ts'
-
-import DetailsDropdownButton from '~/components/DetailsDropdownButton'
-import DetailsDropdownContent from '~/components/DetailsDropdownContent'
-import { publicStaticShortTermCacheControlHeaders } from '~/lib/headers.server'
-import { getVersionRefs } from '~/lib/schema-data.server'
-import BreadcrumbNav from '~/routes/docs_.schema.$version.$/BreadcrumbNav'
-
-export async function loader({
-  params: { version, '*': path },
-}: DataFunctionArgs) {
-  if (!version) throw new Response(null, { status: 404 })
-  if (path?.endsWith('/')) {
-    return redirect(`${path.slice(0, -1)}`)
-  }
-
-  const versions = await getVersionRefs()
-
-  return json(
-    { versions },
-    { headers: publicStaticShortTermCacheControlHeaders }
-  )
-}
-
-export default function Schema() {
-  const { version, '*': path } = useParams()
-  if (!path) throw new Error('Path is not defined.')
-
-  const [showVersions, setShowVersions] = useState(false)
-  const { versions } = useLoaderData<typeof loader>()
-  const windowSize = useWindowSize()
-  const isSchema = path.endsWith('.schema.json')
-
-  return (
-    <GridContainer>
-      <Grid
-        row
-        className="position-sticky top-0 usa-breadcrumb z-100 padding-y-0"
-      >
-        <BreadcrumbNav
-          path={path.replace('.schema.json', '')}
-          className="tablet:grid-col-fill"
-          pathPrepend={`/docs/schema/${version}`}
-        />
-        {windowSize.width < 480 && !isSchema && (
-          <h2 className="margin-y-0">{path.split('/').slice(-1)[0]}</h2>
-        )}
-        <div className="tablet:grid-col-auto tablet:margin-top-2">
-          <DetailsDropdownButton
-            className="width-full"
-            onClick={() => setShowVersions(!showVersions)}
-          >
-            {<>Version: {version}</>}
-          </DetailsDropdownButton>
-          {showVersions && (
-            <DetailsDropdownContent>
-              <CardHeader>
-                <h3>Versions</h3>
-              </CardHeader>
-              <CardBody className="padding-y-0">
-                {versions.map(({ name, ref }) => (
-                  <div key={ref}>
-                    <Link
-                      className="usa-link"
-                      to={`/docs/schema/${ref}/${path}`}
-                      onClick={() => setShowVersions(!setShowVersions)}
-                    >
-                      {name || ref}
-                    </Link>
-                  </div>
-                ))}
-              </CardBody>
-            </DetailsDropdownContent>
-          )}
-        </div>
-      </Grid>
-      <div className="grid-row grid-gap">
-        <Outlet />
-      </div>
-    </GridContainer>
-  )
-}

From 0e85a61a3f72674139e30acb9128563440bcc11b Mon Sep 17 00:00:00 2001
From: Leo Singer <leo.singer@ligo.org>
Date: Fri, 6 Oct 2023 12:19:37 -0400
Subject: [PATCH 13/55] Rewrite schema browser docs in Markdown, make some
 minor edits

---
 .../SchemaDocumentation.tsx                   | 39 -------------------
 .../documentation.md                          |  7 ++++
 .../route.tsx                                 |  4 +-
 3 files changed, 9 insertions(+), 41 deletions(-)
 delete mode 100644 app/routes/docs_._schema-browser.schema.($version).$/SchemaDocumentation.tsx
 create mode 100644 app/routes/docs_._schema-browser.schema.($version).$/documentation.md

diff --git a/app/routes/docs_._schema-browser.schema.($version).$/SchemaDocumentation.tsx b/app/routes/docs_._schema-browser.schema.($version).$/SchemaDocumentation.tsx
deleted file mode 100644
index 473f34c25..000000000
--- a/app/routes/docs_._schema-browser.schema.($version).$/SchemaDocumentation.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*!
- * Copyright © 2023 United States Government as represented by the
- * Administrator of the National Aeronautics and Space Administration.
- * All Rights Reserved.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-import { Link } from '@remix-run/react'
-
-export function SchemaDocumentation() {
-  return (
-    <>
-      <h2>Schema Browser</h2>
-      <p className="usa-paragraph">
-        Browse the schema definitions for GCN Notices as distributed by GCN
-        Kafka. Choose an option below to navigate through the schema directory
-        or inspect a schema for additional details.
-      </p>
-      <p className="usa-paragraph">
-        Schema are one step in the process for setting up New Notice Producers.
-        We have designed a set of core schema which serve as the building blocks
-        for new GCN Notices. Instrument-specific schema can also be created, but
-        we request that you utilize the core schema as much as possible.
-      </p>
-      <p className="usa-paragraph">
-        We welcome your feedback on the schema! Don't hesitate to open an issue
-        on{' '}
-        <Link
-          className="usa-link"
-          rel="external"
-          to="https://github.com/nasa-gcn/gcn-schema"
-        >
-          Github
-        </Link>{' '}
-        as our documentation is based on the content of the repository.
-      </p>
-    </>
-  )
-}
diff --git a/app/routes/docs_._schema-browser.schema.($version).$/documentation.md b/app/routes/docs_._schema-browser.schema.($version).$/documentation.md
new file mode 100644
index 000000000..224d9b0df
--- /dev/null
+++ b/app/routes/docs_._schema-browser.schema.($version).$/documentation.md
@@ -0,0 +1,7 @@
+## Schema Browser
+
+Browse the schema definitions for GCN Notices as distributed by GCN Kafka. Choose an option below to navigate through the schema directory or inspect a schema for additional details.
+
+If you are interested in adding a [new notice type to GCN](/docs/notices/producers), then you can [develop a new schema](/docs/notices/schema) for your instrument or mission using our core schema as building blocks. See our [primer on the GCN Unified Schema](/docs/notices/schema) for instructions.
+
+We welcome your feedback on the schema! Don't hesitate to [open an issue on GitHub](https://github.com/nasa-gcn/gcn-schema/issues) or [contact us](/contact).
diff --git a/app/routes/docs_._schema-browser.schema.($version).$/route.tsx b/app/routes/docs_._schema-browser.schema.($version).$/route.tsx
index 8fc2fee0a..83c7df5c8 100644
--- a/app/routes/docs_._schema-browser.schema.($version).$/route.tsx
+++ b/app/routes/docs_._schema-browser.schema.($version).$/route.tsx
@@ -25,7 +25,6 @@ import { useWindowSize } from 'usehooks-ts'
 
 import type { loader as parentLoader } from '../docs_._schema-browser'
 import BreadcrumbNav from './BreadcrumbNav'
-import { SchemaDocumentation } from './SchemaDocumentation'
 import type { Schema } from './components'
 import {
   ReferencedElementTable,
@@ -33,6 +32,7 @@ import {
   formatFieldName,
   formatFieldType,
 } from './components'
+import Documentation from './documentation.md'
 import DetailsDropdownButton from '~/components/DetailsDropdownButton'
 import DetailsDropdownContent from '~/components/DetailsDropdownContent'
 import { Highlight } from '~/components/Highlight'
@@ -148,7 +148,7 @@ export default function () {
             />
           ) : (
             <>
-              <SchemaDocumentation />
+              <Documentation />
               <CardGroup>
                 {...data.map((x) => (
                   <Link key={x.path} to={x.path} className="tablet:grid-col-3">

From 90daebb67f012f7c8db29fe8138880d9680916fe Mon Sep 17 00:00:00 2001
From: Leo Singer <leo.singer@ligo.org>
Date: Fri, 6 Oct 2023 12:29:39 -0400
Subject: [PATCH 14/55] Fix visual artifact due to doubled breadcrumb

---
 .../BreadcrumbNav.tsx                                       | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/routes/docs_._schema-browser.schema.($version).$/BreadcrumbNav.tsx b/app/routes/docs_._schema-browser.schema.($version).$/BreadcrumbNav.tsx
index 3f4d74265..da1b477f6 100644
--- a/app/routes/docs_._schema-browser.schema.($version).$/BreadcrumbNav.tsx
+++ b/app/routes/docs_._schema-browser.schema.($version).$/BreadcrumbNav.tsx
@@ -39,10 +39,8 @@ export default function BreadcrumbNav({
           )
         })}
       </>
-      <Breadcrumb>
-        <Breadcrumb current>
-          <h2 className="margin-y-0 display-inline">{lastBreadcrumb}</h2>
-        </Breadcrumb>
+      <Breadcrumb current>
+        <h2 className="margin-y-0 display-inline">{lastBreadcrumb}</h2>
       </Breadcrumb>
     </BreadcrumbBar>
   )

From 966378325463f06fe67738a34a26c52de5e6ff0c Mon Sep 17 00:00:00 2001
From: Leo Singer <leo.singer@ligo.org>
Date: Fri, 6 Oct 2023 14:20:52 -0400
Subject: [PATCH 15/55] Remove unnecessary spread syntax

---
 app/routes/docs_._schema-browser.schema.($version).$/route.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/routes/docs_._schema-browser.schema.($version).$/route.tsx b/app/routes/docs_._schema-browser.schema.($version).$/route.tsx
index 83c7df5c8..884881215 100644
--- a/app/routes/docs_._schema-browser.schema.($version).$/route.tsx
+++ b/app/routes/docs_._schema-browser.schema.($version).$/route.tsx
@@ -150,7 +150,7 @@ export default function () {
             <>
               <Documentation />
               <CardGroup>
-                {...data.map((x) => (
+                {data.map((x) => (
                   <Link key={x.path} to={x.path} className="tablet:grid-col-3">
                     <Card key={x.path} className="">
                       <CardHeader>

From fa6e3b505df0e8df7793f5cc92236f851061ceca Mon Sep 17 00:00:00 2001
From: Leo Singer <leo.singer@ligo.org>
Date: Fri, 6 Oct 2023 14:57:56 -0400
Subject: [PATCH 16/55] Make breadcrumb bar appearance more consistent across
 screen sizes

- The USWDS breadcrumb component only shows the link to the parent
  on mobile. However, our paths are never long enough that we need
  to do that. Create a new breadcrumb component that always shows
  all parts of the path.
- Remove all conditional rendering depending on screen size.
- Factor the version picker out into a separate component.
---
 .../BreadcrumbNav.tsx                         |  47 ------
 .../documentation.md                          |   2 +-
 .../route.tsx                                 | 138 +++++++++++-------
 3 files changed, 90 insertions(+), 97 deletions(-)
 delete mode 100644 app/routes/docs_._schema-browser.schema.($version).$/BreadcrumbNav.tsx

diff --git a/app/routes/docs_._schema-browser.schema.($version).$/BreadcrumbNav.tsx b/app/routes/docs_._schema-browser.schema.($version).$/BreadcrumbNav.tsx
deleted file mode 100644
index da1b477f6..000000000
--- a/app/routes/docs_._schema-browser.schema.($version).$/BreadcrumbNav.tsx
+++ /dev/null
@@ -1,47 +0,0 @@
-/*!
- * Copyright © 2023 United States Government as represented by the
- * Administrator of the National Aeronautics and Space Administration.
- * All Rights Reserved.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-import { Link, type LinkProps } from '@remix-run/react'
-import {
-  Breadcrumb,
-  BreadcrumbBar,
-  BreadcrumbLink,
-} from '@trussworks/react-uswds'
-
-export default function BreadcrumbNav({
-  path,
-  pathPrepend,
-  className,
-}: {
-  path: string
-  pathPrepend?: string
-  className?: string
-}) {
-  const breadcrumbs = path.split('/')
-  const lastBreadcrumb = breadcrumbs.pop()
-
-  let cumulativePath = pathPrepend
-  return (
-    <BreadcrumbBar className={className}>
-      <>
-        {...breadcrumbs.map((breadcrumb) => {
-          cumulativePath = `${cumulativePath}/${breadcrumb}`
-          return (
-            <Breadcrumb key={cumulativePath}>
-              <BreadcrumbLink<LinkProps> asCustom={Link} to={cumulativePath}>
-                {breadcrumb}
-              </BreadcrumbLink>
-            </Breadcrumb>
-          )
-        })}
-      </>
-      <Breadcrumb current>
-        <h2 className="margin-y-0 display-inline">{lastBreadcrumb}</h2>
-      </Breadcrumb>
-    </BreadcrumbBar>
-  )
-}
diff --git a/app/routes/docs_._schema-browser.schema.($version).$/documentation.md b/app/routes/docs_._schema-browser.schema.($version).$/documentation.md
index 224d9b0df..5390ea6c0 100644
--- a/app/routes/docs_._schema-browser.schema.($version).$/documentation.md
+++ b/app/routes/docs_._schema-browser.schema.($version).$/documentation.md
@@ -1,4 +1,4 @@
-## Schema Browser
+# Schema Browser
 
 Browse the schema definitions for GCN Notices as distributed by GCN Kafka. Choose an option below to navigate through the schema directory or inspect a schema for additional details.
 
diff --git a/app/routes/docs_._schema-browser.schema.($version).$/route.tsx b/app/routes/docs_._schema-browser.schema.($version).$/route.tsx
index 884881215..49c9aa94c 100644
--- a/app/routes/docs_._schema-browser.schema.($version).$/route.tsx
+++ b/app/routes/docs_._schema-browser.schema.($version).$/route.tsx
@@ -17,14 +17,13 @@ import {
   Icon,
   Table,
 } from '@trussworks/react-uswds'
+import classNames from 'classnames'
 import { dirname } from 'path'
 import { useState } from 'react'
 import { useParams } from 'react-router'
 import invariant from 'tiny-invariant'
-import { useWindowSize } from 'usehooks-ts'
 
 import type { loader as parentLoader } from '../docs_._schema-browser'
-import BreadcrumbNav from './BreadcrumbNav'
 import type { Schema } from './components'
 import {
   ReferencedElementTable,
@@ -79,63 +78,106 @@ export async function loader({
   )
 }
 
+function Breadcrumbs({
+  className,
+  path,
+}: {
+  className?: string
+  path: string
+}) {
+  const parts = path.split('/')
+  const last = parts.pop()
+  return (
+    <>
+      {parts.map((part, i) => (
+        <span key={`${part}-${i}`}>
+          <Link
+            className={classNames('usa-link text-no-underline', className)}
+            to={new Array(parts.length - i).fill('..').join('/')}
+            relative="path"
+          >
+            {part}
+          </Link>
+          <Icon.NavigateNext role="presentation" className="text-base" />
+        </span>
+      ))}
+      <b className={className}>{last}</b>
+    </>
+  )
+}
+
+function VersionSelector({
+  version,
+  versions,
+  path,
+}: {
+  version: string
+  versions: { name: string | null; ref: string }[]
+  path: string
+}) {
+  const [showVersions, setShowVersions] = useState(false)
+
+  return (
+    <>
+      <DetailsDropdownButton
+        onClick={() => {
+          setShowVersions((shown) => shown)
+        }}
+      >
+        {<>Version: {version}</>}
+      </DetailsDropdownButton>
+      {showVersions && (
+        <DetailsDropdownContent>
+          <CardHeader>
+            <h3>Versions</h3>
+          </CardHeader>
+          <CardBody className="padding-y-0">
+            {versions.map(({ name, ref }) => (
+              <div key={ref}>
+                <Link
+                  className="usa-link"
+                  to={`/docs/schema/${ref}/${path}`}
+                  onClick={() => {
+                    setShowVersions(false)
+                  }}
+                >
+                  {name || ref}
+                </Link>
+              </div>
+            ))}
+          </CardBody>
+        </DetailsDropdownContent>
+      )}
+    </>
+  )
+}
+
 export default function () {
   const { version, '*': path } = useParams()
   const { data, jsonContent, examples } = useLoaderData<typeof loader>()
-  const [showVersions, setShowVersions] = useState(false)
   const versions = useRouteLoaderData<typeof parentLoader>(
     'routes/docs_._schema-browser'
   )
-  const windowSize = useWindowSize()
 
   invariant(version)
   invariant(path)
   invariant(versions)
 
-  const isSchema = path.endsWith('.schema.json')
-
   return (
     <>
-      <Grid
-        row
-        className="position-sticky top-0 usa-breadcrumb z-100 padding-y-0"
-      >
-        <BreadcrumbNav
-          path={path.replace('.schema.json', '')}
-          className="tablet:grid-col-fill"
-          pathPrepend={`/docs/schema/${version}`}
-        />
-        {windowSize.width < 480 && !isSchema && (
-          <h2 className="margin-y-0">{path.split('/').slice(-1)[0]}</h2>
-        )}
-        <div className="tablet:grid-col-auto tablet:margin-top-2">
-          <DetailsDropdownButton
-            className="width-full"
-            onClick={() => setShowVersions(!showVersions)}
-          >
-            {<>Version: {version}</>}
-          </DetailsDropdownButton>
-          {showVersions && (
-            <DetailsDropdownContent>
-              <CardHeader>
-                <h3>Versions</h3>
-              </CardHeader>
-              <CardBody className="padding-y-0">
-                {versions.map(({ name, ref }) => (
-                  <div key={ref}>
-                    <Link
-                      className="usa-link"
-                      to={`/docs/schema/${ref}/${path}`}
-                      onClick={() => setShowVersions(!setShowVersions)}
-                    >
-                      {name || ref}
-                    </Link>
-                  </div>
-                ))}
-              </CardBody>
-            </DetailsDropdownContent>
-          )}
-        </div>
+      <Grid row className="position-sticky top-0 z-100 padding-y-0 bg-white">
+        <Grid
+          tablet={{ col: 'fill' }}
+          className="flex-align-self-center padding-y-1"
+        >
+          <Breadcrumbs
+            path={path.replace('.schema.json', '')}
+            className="font-ui-lg"
+          />
+        </Grid>
+        <Grid tablet={{ col: 'auto' }} className="padding-y-1">
+          <VersionSelector version={version} versions={versions} path={path} />
+        </Grid>
       </Grid>
       <div className="grid-row grid-gap">
         <div className="grid-col-12">
@@ -187,11 +229,9 @@ function SchemaBody({
   selectedVersion: string
   examples: ExampleFile[]
 }) {
-  const windowSize = useWindowSize()
-
   return (
     <>
-      {windowSize.width < 480 && <h1>{result.title}</h1>}
+      <h1>{result.title}</h1>
       <p className="usa-paragraph">{result.description}</p>
       <div>
         View the source on{' '}

From ebdbca186440d1815eb31b9d7844f55850a69698 Mon Sep 17 00:00:00 2001
From: Leo Singer <leo.singer@ligo.org>
Date: Fri, 6 Oct 2023 15:08:03 -0400
Subject: [PATCH 17/55] Remove schema feature flag

---
 app/routes/docs.notices._index.mdx            |  4 +-
 .../route.mdx => docs.notices.producers.mdx}  | 33 +++++++-----
 .../ProducerSampleCode.tsx                    | 50 -------------------
 app/routes/docs.notices.schema.mdx            |  6 ---
 app/routes/docs.tsx                           | 23 +++------
 5 files changed, 27 insertions(+), 89 deletions(-)
 rename app/routes/{docs.notices.producers/route.mdx => docs.notices.producers.mdx} (73%)
 delete mode 100644 app/routes/docs.notices.producers/ProducerSampleCode.tsx

diff --git a/app/routes/docs.notices._index.mdx b/app/routes/docs.notices._index.mdx
index f02b1f6c0..e158a879c 100644
--- a/app/routes/docs.notices._index.mdx
+++ b/app/routes/docs.notices._index.mdx
@@ -13,8 +13,6 @@ import {
   CardMedia,
 } from '@trussworks/react-uswds'
 
-import { WithFeature } from '~/root'
-
 import gcn_classic_over_kafka from './_index/gcn-classic-over-kafka.svg'
 import gcn_classic from './_index/gcn-classic.svg'
 import gcn_kafka from './_index/gcn-kafka.svg'
@@ -138,7 +136,7 @@ GCN Classic binary and text schema are bespoke for each notice type with some co
 
 The GCN team has created new JSON format custom schema designed specifically for the types of transients reported by current and upcoming GCN producer missions. The core schema are designed to be building blocks containing most of the common fields used by the majority of instruments. Additional parameters can be added, but we encourage only including fields useful for informing consumers about the properties of the event useful for alerting and follow-up observations. They should not include fields that can easily be calculated using common software packages (e.g. coordinate transformations, distance from Sun or Moon).
 
-More details on schema are available on the individual [Mission](/missions) pages<WithFeature schema> and in the [Schema Browser](schema/latest/gcn)</WithFeature>.
+More details on schema are available on the individual [Mission](/missions) pages and in the [Schema Browser](schema/latest/gcn).
 
 ## For more details on how to use GCN Notices, see:
 
diff --git a/app/routes/docs.notices.producers/route.mdx b/app/routes/docs.notices.producers.mdx
similarity index 73%
rename from app/routes/docs.notices.producers/route.mdx
rename to app/routes/docs.notices.producers.mdx
index 37d4f287d..f229c0147 100644
--- a/app/routes/docs.notices.producers/route.mdx
+++ b/app/routes/docs.notices.producers.mdx
@@ -9,10 +9,6 @@ import {
   ProcessListItem,
 } from '@trussworks/react-uswds'
 
-import { ProducerSampleCode } from './ProducerSampleCode'
-
-import { WithFeature } from '~/root'
-
 # New Notice Producers
 
 The following steps guide new instrument, mission, or observatory producers
@@ -48,14 +44,12 @@ also happy to work with the mission teams to help construct your alerts.
    your list of team members from Step 1 and your chosen Kafka topic prefix from Step 2.
       The GCN Team will reply after they have configured producer permissions for your team.
    </ProcessListItem>
-   <WithFeature schema>
-      <ProcessListItem>
-         <ProcessListHeading type="h3">
-            Draft Your Schema 
-         </ProcessListHeading>
-         As a GCN Notice producer, you can create your own instrument-specific schema. Please contribute your schema to our [GitHub repository](https://github.com/nasa-gcn/gcn-schema), placing it in a folder under <code>gcn/notices/<i>mission</i></code> and submit a pull request for the GCN Team to review. For details, please refer to the [schema documentation](/docs/producers/schema).
-      </ProcessListItem>
-   </WithFeature>
+   <ProcessListItem>
+      <ProcessListHeading type="h3">
+         Draft Your Schema
+      </ProcessListHeading>
+      As a GCN Notice producer, you can create your own instrument-specific schema. Please contribute your schema to our [GitHub repository](https://github.com/nasa-gcn/gcn-schema), placing it in a folder under <code>gcn/notices/<i>mission</i></code> and submit a pull request for the GCN Team to review. For details, please refer to the [schema documentation](/docs/producers/schema).
+   </ProcessListItem>
    <ProcessListItem>
       <ProcessListHeading type="h3">
          Build Producer Code
@@ -68,7 +62,20 @@ also happy to work with the mission teams to help construct your alerts.
       can be found in Step 4 client example code.
       - Start from this and adjust the `client_id`, `client_secret`, `topic` and `data` content:
 
-      <ProducerSampleCode />
+      ```python
+      from gcn_kafka import Producer
+      # Connect as a producer.
+      # Warning: don't share the client secret with others.
+      producer = Producer(client_id='fill me in', client_secret='fill me in')
+      # any topic starting with 'mission.'
+      topic = 'gcn.notices.mission'
+      # JSON data converted to byte string format
+      data = json.dumps({
+          '$schema': 'https://gcn.nasa.gov/schema/main/gcn/notices/mission/SchemaName.schema.json',
+          'key': 'value'
+      }).encode()
+      producer.produce(topic, data)
+      ```
 
    </ProcessListItem>
    <ProcessListItem>
diff --git a/app/routes/docs.notices.producers/ProducerSampleCode.tsx b/app/routes/docs.notices.producers/ProducerSampleCode.tsx
deleted file mode 100644
index b3651323c..000000000
--- a/app/routes/docs.notices.producers/ProducerSampleCode.tsx
+++ /dev/null
@@ -1,50 +0,0 @@
-/*!
- * Copyright © 2023 United States Government as represented by the
- * Administrator of the National Aeronautics and Space Administration.
- * All Rights Reserved.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-import { dedent } from 'ts-dedent'
-
-import { Highlight } from '~/components/Highlight'
-import { useFeature } from '~/root'
-
-export function ProducerSampleCode() {
-  const showSchema = useFeature('SCHEMA')
-  return (
-    <>
-      {showSchema ? (
-        <Highlight
-          language="py"
-          code={dedent(`
-          from gcn_kafka import Producer
-          # Connect as a producer.
-          # Warning: don't share the client secret with others.
-          producer = Producer(client_id='fill me in', client_secret='fill me in')
-          # any topic starting with 'mission.'
-          topic = 'gcn.notices.mission'
-          # JSON data converted to byte string format
-          data = json.dumps({
-            '$schema': 'https://gcn.nasa.gov/schema/main/gcn/notices/mission/SchemaName.schema.json',
-            'key': 'value'
-          }).encode()
-          producer.produce(topic, data)`)}
-        />
-      ) : (
-        <Highlight
-          language="py"
-          code={dedent(`
-          from gcn_kafka import Producer
-          # Connect as a producer.
-          # Warning: don't share the client secret with others.
-          producer = Producer(client_id='fill me in', client_secret='fill me in')
-          # any topic starting with 'mission.'
-          topic = 'gcn.notices.mission.example'
-          data = b'...'  # any bytes
-          producer.produce(topic, data)`)}
-        />
-      )}
-    </>
-  )
-}
diff --git a/app/routes/docs.notices.schema.mdx b/app/routes/docs.notices.schema.mdx
index 08a9413af..ce542da5c 100644
--- a/app/routes/docs.notices.schema.mdx
+++ b/app/routes/docs.notices.schema.mdx
@@ -6,12 +6,6 @@ handle:
 import { Highlight } from '~/components/Highlight'
 import { Tab, Tabs } from '~/components/tabs/Tabs'
 
-import { feature } from '~/lib/env.server'
-
-export function loader() {
-  return feature('SCHEMA') || new Response(null, { status: 404 })
-}
-
 # Unified Schema
 
 The GCN Unified Schema is a framework for defining GCN Notices types using a common format, standardized field names, uniform data types, and consistent physical units across multiple missions. If you are joining GCN as a [new notice producer](/docs/notices/producers), then you can contribute your own notice types to the Unified Schema present at [GitHub](https://github.com/nasa-gcn/gcn-schema).
diff --git a/app/routes/docs.tsx b/app/routes/docs.tsx
index 408b35f99..ac457a4b1 100644
--- a/app/routes/docs.tsx
+++ b/app/routes/docs.tsx
@@ -9,7 +9,6 @@ import { Link, NavLink, Outlet } from '@remix-run/react'
 import { GridContainer } from '@trussworks/react-uswds'
 
 import { SideNav, SideNavSub } from '~/components/SideNav'
-import { useFeature } from '~/root'
 import type { BreadcrumbHandle } from '~/root/Title'
 
 export const handle: BreadcrumbHandle = {
@@ -17,8 +16,6 @@ export const handle: BreadcrumbHandle = {
 }
 
 export default function () {
-  const enableSchemaBrowser = useFeature('SCHEMA')
-
   return (
     <GridContainer className="usa-section">
       <div className="grid-row grid-gap">
@@ -111,13 +108,6 @@ export default function () {
                   ]}
                 />
               </>,
-              ...(enableSchemaBrowser
-                ? [
-                    <NavLink key="schema" to="schema">
-                      Schema Browser
-                    </NavLink>,
-                  ]
-                : []),
               <NavLink key="history" to="history">
                 History
               </NavLink>,
@@ -163,13 +153,9 @@ export default function () {
                     <NavLink key="producing" to="notices/producers">
                       Producing
                     </NavLink>,
-                    ...(enableSchemaBrowser
-                      ? [
-                          <NavLink key="schema" to="notices/schema">
-                            Unified Schema
-                          </NavLink>,
-                        ]
-                      : []),
+                    <NavLink key="schema" to="notices/schema">
+                      Unified Schema
+                    </NavLink>,
                     <NavLink key="archive" to="notices/archive">
                       Archive
                     </NavLink>,
@@ -179,6 +165,9 @@ export default function () {
               <NavLink key="roadmap" to="roadmap">
                 Road Map
               </NavLink>,
+              <NavLink key="schema" to="schema">
+                Schema Browser
+              </NavLink>,
             ]}
           />
         </div>

From 6b5bf2c4b324d1cab3cc8f16c6301bc08a2cfc1f Mon Sep 17 00:00:00 2001
From: Leo Singer <leo.singer@ligo.org>
Date: Fri, 6 Oct 2023 15:20:58 -0400
Subject: [PATCH 18/55] Add page titles to schema browser

---
 .../docs_._schema-browser.schema.($version).$/route.tsx    | 7 +++++++
 app/routes/docs_._schema-browser.tsx                       | 5 +++++
 2 files changed, 12 insertions(+)

diff --git a/app/routes/docs_._schema-browser.schema.($version).$/route.tsx b/app/routes/docs_._schema-browser.schema.($version).$/route.tsx
index 49c9aa94c..3ac437712 100644
--- a/app/routes/docs_._schema-browser.schema.($version).$/route.tsx
+++ b/app/routes/docs_._schema-browser.schema.($version).$/route.tsx
@@ -47,6 +47,13 @@ import {
   loadJson,
   loadSchemaExamples,
 } from '~/lib/schema-data.server'
+import type { BreadcrumbHandle } from '~/root/Title'
+
+export const handle: BreadcrumbHandle = {
+  breadcrumb({ params: { version, '*': path } }) {
+    return `${version} - ${path?.replace('.schema.json', '')}`
+  },
+}
 
 export async function loader({
   params: { version, '*': path },
diff --git a/app/routes/docs_._schema-browser.tsx b/app/routes/docs_._schema-browser.tsx
index aae269e0b..76b91695b 100644
--- a/app/routes/docs_._schema-browser.tsx
+++ b/app/routes/docs_._schema-browser.tsx
@@ -11,6 +11,11 @@ import { GridContainer } from '@trussworks/react-uswds'
 
 import { publicStaticShortTermCacheControlHeaders } from '~/lib/headers.server'
 import { getVersionRefs } from '~/lib/schema-data.server'
+import type { BreadcrumbHandle } from '~/root/Title'
+
+export const handle: BreadcrumbHandle = {
+  breadcrumb: 'Documentation - Schema Browser',
+}
 
 export async function loader() {
   return json(await getVersionRefs(), {

From 93519b1fe32f074bcfef53dfdb287eee1ec529cd Mon Sep 17 00:00:00 2001
From: Judy Racusin <judith.racusin@nasa.gov>
Date: Fri, 6 Oct 2023 16:11:01 -0400
Subject: [PATCH 19/55] fixed schema browser link

---
 app/routes/docs.notices._index.mdx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/routes/docs.notices._index.mdx b/app/routes/docs.notices._index.mdx
index e158a879c..2a2834f0c 100644
--- a/app/routes/docs.notices._index.mdx
+++ b/app/routes/docs.notices._index.mdx
@@ -136,7 +136,7 @@ GCN Classic binary and text schema are bespoke for each notice type with some co
 
 The GCN team has created new JSON format custom schema designed specifically for the types of transients reported by current and upcoming GCN producer missions. The core schema are designed to be building blocks containing most of the common fields used by the majority of instruments. Additional parameters can be added, but we encourage only including fields useful for informing consumers about the properties of the event useful for alerting and follow-up observations. They should not include fields that can easily be calculated using common software packages (e.g. coordinate transformations, distance from Sun or Moon).
 
-More details on schema are available on the individual [Mission](/missions) pages and in the [Schema Browser](schema/latest/gcn).
+More details on schema are available on the individual [Mission](/missions) pages and in the [Schema Browser](schema/stable/gcn).
 
 ## For more details on how to use GCN Notices, see:
 

From 19d92e6e02e90b48a61f16c2f294dddb57f9c1e9 Mon Sep 17 00:00:00 2001
From: Leo Singer <leo.singer@ligo.org>
Date: Sun, 8 Oct 2023 07:42:55 -0400
Subject: [PATCH 20/55] Add FIXME comment

---
 app/theme.scss | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/theme.scss b/app/theme.scss
index 7bf0f529e..46ee062c9 100644
--- a/app/theme.scss
+++ b/app/theme.scss
@@ -306,7 +306,8 @@ input.react-tags__combobox-input:focus {
 }
 
 /*
- * Indeterminate checkboxes
+ * Indeterminate checkboxes.
+ * FIXME: remove if/when https://github.com/uswds/uswds/pull/5549 is merged
  */
 
 .usa-checkbox__input:indeterminate {

From b134fa5958df15f95a689647c67b0d2c3f818b15 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 6 Oct 2023 22:46:00 +0000
Subject: [PATCH 21/55] Bump @trussworks/react-uswds from 5.1.1 to 5.4.0

Bumps [@trussworks/react-uswds](https://github.com/trussworks/react-uswds) from 5.1.1 to 5.4.0.
- [Release notes](https://github.com/trussworks/react-uswds/releases)
- [Changelog](https://github.com/trussworks/react-uswds/blob/main/CHANGELOG.md)
- [Commits](https://github.com/trussworks/react-uswds/compare/5.1.1...5.4.0)

---
updated-dependencies:
- dependency-name: "@trussworks/react-uswds"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 23 ++++++++---------------
 package.json      |  2 +-
 2 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 746ec0ac4..60f64c795 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -19,7 +19,7 @@
         "@remix-run/css-bundle": "^2.0.1",
         "@remix-run/node": "^2.0.0",
         "@remix-run/react": "^2.0.1",
-        "@trussworks/react-uswds": "^5.1.1",
+        "@trussworks/react-uswds": "^5.4.0",
         "addresscompiler": "^1.0.1",
         "aws-lambda-ses-forwarder": "github:lpsinger/aws-lambda-ses-forwarder#aws-sdk-v3",
         "classnames": "^2.3.2",
@@ -6779,14 +6779,14 @@
       }
     },
     "node_modules/@trussworks/react-uswds": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/@trussworks/react-uswds/-/react-uswds-5.1.1.tgz",
-      "integrity": "sha512-SAlgEIFGCIKyV5aQjIi8dBUwLGdqNkbDHDvXPPWyySlhJkut5MNmZQ73BpFTxke6WqJreljkApPubMWUPiynlw==",
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/@trussworks/react-uswds/-/react-uswds-5.4.0.tgz",
+      "integrity": "sha512-2cAZ1xg36eCPP0nwsc9NblQYhPb6+KC0IqiEBB5Hwe9B6QyOWqbt2VODKgaqcCTGS7HXbwSpKPznERv+kr9eIA==",
       "engines": {
         "node": ">= 16.20.0"
       },
       "peerDependencies": {
-        "@uswds/uswds": "3.1.0",
+        "@uswds/uswds": "^3.6.0",
         "react": "^16.x || ^17.x || ^18.x",
         "react-dom": "^16.x || ^17.x || ^18.x"
       }
@@ -7402,13 +7402,12 @@
       "dev": true
     },
     "node_modules/@uswds/uswds": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@uswds/uswds/-/uswds-3.1.0.tgz",
-      "integrity": "sha512-6XTeaQD/ipc3x4713mud4Rrr+lRc4nJ1Qw5Oy35dbVEXuKr7DjN4EBoAkbze9OoV0UdmAIvoxolBF/UcpFVKOg==",
+      "version": "3.6.1",
+      "resolved": "https://registry.npmjs.org/@uswds/uswds/-/uswds-3.6.1.tgz",
+      "integrity": "sha512-KDr3r4xvbvQ1X05tfacid42m/vLjAAt8N3q2/LDuujjrrBxEdHgK9ROftsesuSBoaD2Fss4lKxS0dPojLzdbbw==",
       "peer": true,
       "dependencies": {
         "classlist-polyfill": "1.0.3",
-        "domready": "1.0.8",
         "object-assign": "4.1.1",
         "receptor": "1.0.0",
         "resolve-id-refs": "0.1.0"
@@ -9938,12 +9937,6 @@
         "url": "https://github.com/fb55/domhandler?sponsor=1"
       }
     },
-    "node_modules/domready": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/domready/-/domready-1.0.8.tgz",
-      "integrity": "sha512-uIzsOJUNk+AdGE9a6VDeessoMCzF8RrZvJCX/W8QtyfgdR6Uofn/MvRonih3OtCO79b2VDzDOymuiABrQ4z3XA==",
-      "peer": true
-    },
     "node_modules/domutils": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.1.0.tgz",
diff --git a/package.json b/package.json
index da5fe04f5..8150a13bd 100644
--- a/package.json
+++ b/package.json
@@ -38,7 +38,7 @@
     "@remix-run/css-bundle": "^2.0.1",
     "@remix-run/node": "^2.0.0",
     "@remix-run/react": "^2.0.1",
-    "@trussworks/react-uswds": "^5.1.1",
+    "@trussworks/react-uswds": "^5.4.0",
     "addresscompiler": "^1.0.1",
     "aws-lambda-ses-forwarder": "github:lpsinger/aws-lambda-ses-forwarder#aws-sdk-v3",
     "classnames": "^2.3.2",

From 502e51e94d12bd4d3f094868c4c0c51da5da018f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 11:37:48 +0000
Subject: [PATCH 22/55] Bump @opensearch-project/opensearch from 2.2.1 to 2.4.0

Bumps [@opensearch-project/opensearch](https://github.com/opensearch-project/opensearch-js) from 2.2.1 to 2.4.0.
- [Release notes](https://github.com/opensearch-project/opensearch-js/releases)
- [Changelog](https://github.com/opensearch-project/opensearch-js/blob/main/CHANGELOG.md)
- [Commits](https://github.com/opensearch-project/opensearch-js/compare/2.2.1...2.4.0)

---
updated-dependencies:
- dependency-name: "@opensearch-project/opensearch"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 60f64c795..ea8de037d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -14,7 +14,7 @@
         "@nasa-gcn/remix-seo": "^2.0.0",
         "@octokit/request-error": "^5.0.1",
         "@octokit/rest": "^20.0.2",
-        "@opensearch-project/opensearch": "^2.2.0",
+        "@opensearch-project/opensearch": "^2.4.0",
         "@remix-run/architect": "^2.0.1",
         "@remix-run/css-bundle": "^2.0.1",
         "@remix-run/node": "^2.0.0",
@@ -5346,9 +5346,9 @@
       }
     },
     "node_modules/@opensearch-project/opensearch": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/@opensearch-project/opensearch/-/opensearch-2.2.1.tgz",
-      "integrity": "sha512-8zfQX1acL9eWG+ohIc9nJVT9LSqXCdbVEJs0rCPRtji3XF6ahzsiKmGNTeWLxCPDxWCjAIWq9t95xP3Y5Egi6Q==",
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/@opensearch-project/opensearch/-/opensearch-2.4.0.tgz",
+      "integrity": "sha512-r0ZNIlDxAua1ZecOBJ8qOXshf2ZQhNKmfly7o0aNuACf0pDa6Et/8mWMZuaFOu7xlNEeRNB7IjDQUYFy2SPElw==",
       "dependencies": {
         "aws4": "^1.11.0",
         "debug": "^4.3.1",
diff --git a/package.json b/package.json
index 8150a13bd..3f07be94b 100644
--- a/package.json
+++ b/package.json
@@ -33,7 +33,7 @@
     "@nasa-gcn/remix-seo": "^2.0.0",
     "@octokit/request-error": "^5.0.1",
     "@octokit/rest": "^20.0.2",
-    "@opensearch-project/opensearch": "^2.2.0",
+    "@opensearch-project/opensearch": "^2.4.0",
     "@remix-run/architect": "^2.0.1",
     "@remix-run/css-bundle": "^2.0.1",
     "@remix-run/node": "^2.0.0",

From f5104db289b70d02b338bdcf3db93983bf33527c Mon Sep 17 00:00:00 2001
From: Courey Elliott <coureyelliott@gmail.com>
Date: Mon, 9 Oct 2023 11:28:41 -0400
Subject: [PATCH 23/55] ignoring .DS_Store

---
 .gitignore | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitignore b/.gitignore
index 4a9386872..780bbc08f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,5 +18,8 @@ sam.yaml
 /app/**/*.css
 /app/**/*.css.map
 
+# Generated by Mac
+.DS_Store
+
 .env
 .eslintcache

From 481c69613e09f621d49c1b74e1a0d41748fe8d1b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 13:15:20 +0000
Subject: [PATCH 24/55] Bump openid-client from 5.4.3 to 5.6.0

Bumps [openid-client](https://github.com/panva/node-openid-client) from 5.4.3 to 5.6.0.
- [Release notes](https://github.com/panva/node-openid-client/releases)
- [Changelog](https://github.com/panva/node-openid-client/blob/main/CHANGELOG.md)
- [Commits](https://github.com/panva/node-openid-client/compare/v5.4.3...v5.6.0)

---
updated-dependencies:
- dependency-name: openid-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 16 ++++++++--------
 package.json      |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ea8de037d..d33fa2e48 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -37,7 +37,7 @@
         "mailparser": "^3.6.5",
         "memoizee": "^0.4.15",
         "nodemailer": "^6.9.2",
-        "openid-client": "^5.4.3",
+        "openid-client": "^5.6.0",
         "pretty-bytes": "^6.1.1",
         "react": "^18.2.0",
         "react-copy-to-clipboard": "^5.0.4",
@@ -15096,9 +15096,9 @@
       }
     },
     "node_modules/jose": {
-      "version": "4.14.4",
-      "resolved": "https://registry.npmjs.org/jose/-/jose-4.14.4.tgz",
-      "integrity": "sha512-j8GhLiKmUAh+dsFXlX1aJCbt5KMibuKb+d7j1JaOJG6s2UjX1PQlW+OKB/sD4a/5ZYF4RcmYmLSndOoU3Lt/3g==",
+      "version": "4.15.2",
+      "resolved": "https://registry.npmjs.org/jose/-/jose-4.15.2.tgz",
+      "integrity": "sha512-IY73F228OXRl9ar3jJagh7Vnuhj/GzBunPiZP13K0lOl7Am9SoWW3kEzq3MCllJMTtZqHTiDXQvoRd4U95aU6A==",
       "funding": {
         "url": "https://github.com/sponsors/panva"
       }
@@ -18799,11 +18799,11 @@
       }
     },
     "node_modules/openid-client": {
-      "version": "5.4.3",
-      "resolved": "https://registry.npmjs.org/openid-client/-/openid-client-5.4.3.tgz",
-      "integrity": "sha512-sVQOvjsT/sbSfYsQI/9liWQGVZH/Pp3rrtlGEwgk/bbHfrUDZ24DN57lAagIwFtuEu+FM9Ev7r85s8S/yPjimQ==",
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/openid-client/-/openid-client-5.6.0.tgz",
+      "integrity": "sha512-uFTkN/iqgKvSnmpVAS/T6SNThukRMBcmymTQ71Ngus1F60tdtKVap7zCrleocY+fogPtpmoxi5Q1YdrgYuTlkA==",
       "dependencies": {
-        "jose": "^4.14.4",
+        "jose": "^4.15.1",
         "lru-cache": "^6.0.0",
         "object-hash": "^2.2.0",
         "oidc-token-hash": "^5.0.3"
diff --git a/package.json b/package.json
index 3f07be94b..36263c27b 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "mailparser": "^3.6.5",
     "memoizee": "^0.4.15",
     "nodemailer": "^6.9.2",
-    "openid-client": "^5.4.3",
+    "openid-client": "^5.6.0",
     "pretty-bytes": "^6.1.1",
     "react": "^18.2.0",
     "react-copy-to-clipboard": "^5.0.4",

From 3222dfe7920ee2ba511b86e5000e7b6f922c1282 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 9 Oct 2023 13:16:10 +0000
Subject: [PATCH 25/55] Bump eslint from 8.50.0 to 8.51.0

Bumps [eslint](https://github.com/eslint/eslint) from 8.50.0 to 8.51.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/main/CHANGELOG.md)
- [Commits](https://github.com/eslint/eslint/compare/v8.50.0...v8.51.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 16 ++++++++--------
 package.json      |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d33fa2e48..933423c47 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -92,7 +92,7 @@
         "@types/source-map-support": "^0.5.8",
         "@types/tar-stream": "^3.1.1",
         "autoprefixer": "^10.4.16",
-        "eslint": "^8.50.0",
+        "eslint": "^8.51.0",
         "eslint-config-prettier": "^9.0.0",
         "eslint-plugin-jest": "^27.4.2",
         "glob": "^10.3.4",
@@ -3989,9 +3989,9 @@
       }
     },
     "node_modules/@eslint/js": {
-      "version": "8.50.0",
-      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.50.0.tgz",
-      "integrity": "sha512-NCC3zz2+nvYd+Ckfh87rA47zfu2QsQpvc6k1yzTk+b9KzRj0wkGa8LSoGOXN6Zv4lRf/EIoZ80biDh9HOI+RNQ==",
+      "version": "8.51.0",
+      "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.51.0.tgz",
+      "integrity": "sha512-HxjQ8Qn+4SI3/AFv6sOrDB+g6PpUTDwSJiQqOrnneEk8L71161srI9gjzzZvYVbzHiVg/BvcH95+cK/zfIt4pg==",
       "dev": true,
       "engines": {
         "node": "^12.22.0 || ^14.17.0 || >=16.0.0"
@@ -10517,15 +10517,15 @@
       }
     },
     "node_modules/eslint": {
-      "version": "8.50.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.50.0.tgz",
-      "integrity": "sha512-FOnOGSuFuFLv/Sa+FDVRZl4GGVAAFFi8LecRsI5a1tMO5HIE8nCm4ivAlzt4dT3ol/PaaGC0rJEEXQmHJBGoOg==",
+      "version": "8.51.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.51.0.tgz",
+      "integrity": "sha512-2WuxRZBrlwnXi+/vFSJyjMqrNjtJqiasMzehF0shoLaW7DzS3/9Yvrmq5JiT66+pNjiX4UBnLDiKHcWAr/OInA==",
       "dev": true,
       "dependencies": {
         "@eslint-community/eslint-utils": "^4.2.0",
         "@eslint-community/regexpp": "^4.6.1",
         "@eslint/eslintrc": "^2.1.2",
-        "@eslint/js": "8.50.0",
+        "@eslint/js": "8.51.0",
         "@humanwhocodes/config-array": "^0.11.11",
         "@humanwhocodes/module-importer": "^1.0.1",
         "@nodelib/fs.walk": "^1.2.8",
diff --git a/package.json b/package.json
index 36263c27b..6fcc6156b 100644
--- a/package.json
+++ b/package.json
@@ -111,7 +111,7 @@
     "@types/source-map-support": "^0.5.8",
     "@types/tar-stream": "^3.1.1",
     "autoprefixer": "^10.4.16",
-    "eslint": "^8.50.0",
+    "eslint": "^8.51.0",
     "eslint-config-prettier": "^9.0.0",
     "eslint-plugin-jest": "^27.4.2",
     "glob": "^10.3.4",

From e180d51dde420afd4d2561acd0d162054f639eb3 Mon Sep 17 00:00:00 2001
From: Leo Singer <leo.singer@ligo.org>
Date: Fri, 6 Oct 2023 12:06:18 -0400
Subject: [PATCH 26/55] Colocate NoticeTypeCheckboxes with its data

---
 .../{ => NoticeTypeCheckboxes}/NoticeTypeCheckboxes.tsx     | 6 +++---
 app/{lib => components/NoticeTypeCheckboxes}/prometheus.ts  | 0
 app/routes/quickstart.alerts.tsx                            | 2 +-
 app/routes/user.email.edit.tsx                              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
 rename app/components/{ => NoticeTypeCheckboxes}/NoticeTypeCheckboxes.tsx (97%)
 rename app/{lib => components/NoticeTypeCheckboxes}/prometheus.ts (100%)

diff --git a/app/components/NoticeTypeCheckboxes.tsx b/app/components/NoticeTypeCheckboxes/NoticeTypeCheckboxes.tsx
similarity index 97%
rename from app/components/NoticeTypeCheckboxes.tsx
rename to app/components/NoticeTypeCheckboxes/NoticeTypeCheckboxes.tsx
index b7b555a89..5b75d1bfc 100644
--- a/app/components/NoticeTypeCheckboxes.tsx
+++ b/app/components/NoticeTypeCheckboxes/NoticeTypeCheckboxes.tsx
@@ -7,9 +7,9 @@
  */
 import { useState } from 'react'
 
-import type { NoticeFormat } from './NoticeFormat'
-import { NestedCheckboxes } from './nested-checkboxes/NestedCheckboxes'
-import { triggerRate } from '~/lib/prometheus'
+import type { NoticeFormat } from '../NoticeFormat'
+import { NestedCheckboxes } from '../nested-checkboxes/NestedCheckboxes'
+import { triggerRate } from './prometheus'
 
 function humanizedCount(count: number, singular: string, plural?: string) {
   const noun = count === 1 ? singular : plural ?? `${singular}s`
diff --git a/app/lib/prometheus.ts b/app/components/NoticeTypeCheckboxes/prometheus.ts
similarity index 100%
rename from app/lib/prometheus.ts
rename to app/components/NoticeTypeCheckboxes/prometheus.ts
diff --git a/app/routes/quickstart.alerts.tsx b/app/routes/quickstart.alerts.tsx
index 53d333545..ac0aeec8c 100644
--- a/app/routes/quickstart.alerts.tsx
+++ b/app/routes/quickstart.alerts.tsx
@@ -12,7 +12,7 @@ import { useState } from 'react'
 
 import type { NoticeFormat } from '~/components/NoticeFormat'
 import { NoticeFormatInput } from '~/components/NoticeFormat'
-import { NoticeTypeCheckboxes } from '~/components/NoticeTypeCheckboxes'
+import { NoticeTypeCheckboxes } from '~/components/NoticeTypeCheckboxes/NoticeTypeCheckboxes'
 import type { BreadcrumbHandle } from '~/root/Title'
 
 export const handle: BreadcrumbHandle & SEOHandle = {
diff --git a/app/routes/user.email.edit.tsx b/app/routes/user.email.edit.tsx
index 4ace057db..ee01ee2cf 100644
--- a/app/routes/user.email.edit.tsx
+++ b/app/routes/user.email.edit.tsx
@@ -28,7 +28,7 @@ import {
   updateEmailNotification,
 } from './user.email/email_notices.server'
 import { type NoticeFormat, NoticeFormatInput } from '~/components/NoticeFormat'
-import { NoticeTypeCheckboxes } from '~/components/NoticeTypeCheckboxes'
+import { NoticeTypeCheckboxes } from '~/components/NoticeTypeCheckboxes/NoticeTypeCheckboxes'
 import { ReCAPTCHA, verifyRecaptcha } from '~/components/ReCAPTCHA'
 import { formatAndNoticeTypeToTopic } from '~/lib/utils'
 import { useRecaptchaSiteKey } from '~/root'

From d43032fdd3ea9cb57f0b3bb20e9a01973180ecd4 Mon Sep 17 00:00:00 2001
From: Leo Singer <leo.singer@ligo.org>
Date: Tue, 10 Oct 2023 14:51:10 -0400
Subject: [PATCH 27/55] Fix version selector toggle

---
 app/routes/docs_._schema-browser.schema.($version).$/route.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/routes/docs_._schema-browser.schema.($version).$/route.tsx b/app/routes/docs_._schema-browser.schema.($version).$/route.tsx
index 3ac437712..4ba35ea02 100644
--- a/app/routes/docs_._schema-browser.schema.($version).$/route.tsx
+++ b/app/routes/docs_._schema-browser.schema.($version).$/route.tsx
@@ -128,7 +128,7 @@ function VersionSelector({
     <>
       <DetailsDropdownButton
         onClick={() => {
-          setShowVersions((shown) => shown)
+          setShowVersions((shown) => !shown)
         }}
       >
         {<>Version: {version}</>}

From 2cecc528943534fbd36bc97daf1bc1fdfca3a5b6 Mon Sep 17 00:00:00 2001
From: Leo Singer <leo.singer@ligo.org>
Date: Tue, 10 Oct 2023 15:16:58 -0400
Subject: [PATCH 28/55] Adjust handling of DetailsDropdownContent props

- Add a smidge of margin to the top.
- className passed from caller is sent to Card rather than CardGroup.
---
 app/components/DetailsDropdownContent.tsx | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/app/components/DetailsDropdownContent.tsx b/app/components/DetailsDropdownContent.tsx
index b65b35a29..8f7b64df0 100644
--- a/app/components/DetailsDropdownContent.tsx
+++ b/app/components/DetailsDropdownContent.tsx
@@ -9,16 +9,11 @@ import { Card, CardGroup } from '@trussworks/react-uswds'
 
 export default function DetailsDropdownContent({
   children,
-  className,
   ...props
-}: Omit<JSX.IntrinsicElements['ul'], 'role'>) {
+}: Parameters<typeof Card>[0]) {
   return (
-    <CardGroup
-      {...props}
-      className={`position-absolute z-top ${className ?? ''}`}
-      role="menu"
-    >
-      <Card>{children}</Card>
+    <CardGroup className="position-absolute margin-top-1 z-top" role="menu">
+      <Card {...props}>{children}</Card>
     </CardGroup>
   )
 }

From 0a9e1e054a5efd453225d41db9f8660142ed339f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Oct 2023 14:15:28 +0000
Subject: [PATCH 29/55] Bump @nasa-gcn/remark-rehype-astro from 1.0.0 to 1.1.0

Bumps [@nasa-gcn/remark-rehype-astro](https://github.com/nasa-gcn/remark-rehype-astro) from 1.0.0 to 1.1.0.
- [Release notes](https://github.com/nasa-gcn/remark-rehype-astro/releases)
- [Commits](https://github.com/nasa-gcn/remark-rehype-astro/compare/v1.0.0...v1.1.0)

---
updated-dependencies:
- dependency-name: "@nasa-gcn/remark-rehype-astro"
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 11 +++++++----
 package.json      |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 933423c47..dfeab2b07 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,7 +10,7 @@
         "@architect/functions": "^5.3.4",
         "@nasa-gcn/architect-functions-search": "^1.0.0",
         "@nasa-gcn/dynamodb-autoincrement": "^1.0.1",
-        "@nasa-gcn/remark-rehype-astro": "^1.0.0",
+        "@nasa-gcn/remark-rehype-astro": "^1.1.0",
         "@nasa-gcn/remix-seo": "^2.0.0",
         "@octokit/request-error": "^5.0.1",
         "@octokit/rest": "^20.0.2",
@@ -4895,13 +4895,16 @@
       }
     },
     "node_modules/@nasa-gcn/remark-rehype-astro": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@nasa-gcn/remark-rehype-astro/-/remark-rehype-astro-1.0.0.tgz",
-      "integrity": "sha512-Z0a623Q7Mizn04EA5vurhOgjl+9D6LViiYGExvQcc41ncTKMcE6IJJ8QIADn43AlolUqF33N0tC4nocwsIwU3g==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@nasa-gcn/remark-rehype-astro/-/remark-rehype-astro-1.1.0.tgz",
+      "integrity": "sha512-Kp1hR3Ss1PYkQCRcKQ/0bAU+qjDUgyGJQnnlZOaxP+kZYpW2uN5MlVO+kLxad7IJHu6GQ33j1ceG8hGl26xPZQ==",
       "dependencies": {
         "hast-util-find-and-replace": "^5.0.0",
         "hastscript": "^8.0.0",
         "mdast-util-find-and-replace": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=16"
       }
     },
     "node_modules/@nasa-gcn/remark-rehype-astro/node_modules/@types/unist": {
diff --git a/package.json b/package.json
index 6fcc6156b..a38430eff 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "@architect/functions": "^5.3.4",
     "@nasa-gcn/architect-functions-search": "^1.0.0",
     "@nasa-gcn/dynamodb-autoincrement": "^1.0.1",
-    "@nasa-gcn/remark-rehype-astro": "^1.0.0",
+    "@nasa-gcn/remark-rehype-astro": "^1.1.0",
     "@nasa-gcn/remix-seo": "^2.0.0",
     "@octokit/request-error": "^5.0.1",
     "@octokit/rest": "^20.0.2",

From 6e42b030b263e88c2982880e16219f5cfeace80b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 11 Oct 2023 14:15:06 +0000
Subject: [PATCH 30/55] Bump openid-client from 5.6.0 to 5.6.1

Bumps [openid-client](https://github.com/panva/node-openid-client) from 5.6.0 to 5.6.1.
- [Release notes](https://github.com/panva/node-openid-client/releases)
- [Changelog](https://github.com/panva/node-openid-client/blob/main/CHANGELOG.md)
- [Commits](https://github.com/panva/node-openid-client/compare/v5.6.0...v5.6.1)

---
updated-dependencies:
- dependency-name: openid-client
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index dfeab2b07..e8254b2e3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -37,7 +37,7 @@
         "mailparser": "^3.6.5",
         "memoizee": "^0.4.15",
         "nodemailer": "^6.9.2",
-        "openid-client": "^5.6.0",
+        "openid-client": "^5.6.1",
         "pretty-bytes": "^6.1.1",
         "react": "^18.2.0",
         "react-copy-to-clipboard": "^5.0.4",
@@ -18802,9 +18802,9 @@
       }
     },
     "node_modules/openid-client": {
-      "version": "5.6.0",
-      "resolved": "https://registry.npmjs.org/openid-client/-/openid-client-5.6.0.tgz",
-      "integrity": "sha512-uFTkN/iqgKvSnmpVAS/T6SNThukRMBcmymTQ71Ngus1F60tdtKVap7zCrleocY+fogPtpmoxi5Q1YdrgYuTlkA==",
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/openid-client/-/openid-client-5.6.1.tgz",
+      "integrity": "sha512-PtrWsY+dXg6y8mtMPyL/namZSYVz8pjXz3yJiBNZsEdCnu9miHLB4ELVC85WvneMKo2Rg62Ay7NkuCpM0bgiLQ==",
       "dependencies": {
         "jose": "^4.15.1",
         "lru-cache": "^6.0.0",
diff --git a/package.json b/package.json
index a38430eff..7244587bb 100644
--- a/package.json
+++ b/package.json
@@ -56,7 +56,7 @@
     "mailparser": "^3.6.5",
     "memoizee": "^0.4.15",
     "nodemailer": "^6.9.2",
-    "openid-client": "^5.6.0",
+    "openid-client": "^5.6.1",
     "pretty-bytes": "^6.1.1",
     "react": "^18.2.0",
     "react-copy-to-clipboard": "^5.0.4",

From 06f2d66a93f7d4faeadc7fce2e71b271cb8fe990 Mon Sep 17 00:00:00 2001
From: Leo Singer <leo.singer@ligo.org>
Date: Tue, 10 Oct 2023 19:04:13 -0400
Subject: [PATCH 31/55] Remove unnecessary fragment

---
 app/routes/docs_._schema-browser.schema.($version).$/route.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/routes/docs_._schema-browser.schema.($version).$/route.tsx b/app/routes/docs_._schema-browser.schema.($version).$/route.tsx
index 4ba35ea02..0ef3d4085 100644
--- a/app/routes/docs_._schema-browser.schema.($version).$/route.tsx
+++ b/app/routes/docs_._schema-browser.schema.($version).$/route.tsx
@@ -131,7 +131,7 @@ function VersionSelector({
           setShowVersions((shown) => !shown)
         }}
       >
-        {<>Version: {version}</>}
+        Version: {version}
       </DetailsDropdownButton>
       {showVersions && (
         <DetailsDropdownContent>

From 275071a96db8104be1a06b68f4650f1b947fd7c9 Mon Sep 17 00:00:00 2001
From: Leo Singer <leo.singer@ligo.org>
Date: Tue, 10 Oct 2023 19:07:12 -0400
Subject: [PATCH 32/55] Remove unnecessary reexport

---
 app/lib/search.server.ts                 | 9 ---------
 app/routes/circulars/circulars.server.ts | 2 +-
 app/table-streams/circulars/index.ts     | 2 +-
 3 files changed, 2 insertions(+), 11 deletions(-)
 delete mode 100644 app/lib/search.server.ts

diff --git a/app/lib/search.server.ts b/app/lib/search.server.ts
deleted file mode 100644
index a13d944ef..000000000
--- a/app/lib/search.server.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/*!
- * Copyright © 2023 United States Government as represented by the
- * Administrator of the National Aeronautics and Space Administration.
- * All Rights Reserved.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-
-export { search } from '@nasa-gcn/architect-functions-search'
diff --git a/app/routes/circulars/circulars.server.ts b/app/routes/circulars/circulars.server.ts
index cd63c673e..99ac2c6ad 100644
--- a/app/routes/circulars/circulars.server.ts
+++ b/app/routes/circulars/circulars.server.ts
@@ -8,6 +8,7 @@
 import { tables } from '@architect/functions'
 import type { DynamoDB } from '@aws-sdk/client-dynamodb'
 import { type DynamoDBDocument } from '@aws-sdk/lib-dynamodb'
+import { search as getSearch } from '@nasa-gcn/architect-functions-search'
 import { DynamoDBAutoIncrement } from '@nasa-gcn/dynamodb-autoincrement'
 import { redirect } from '@remix-run/node'
 import memoizee from 'memoizee'
@@ -15,7 +16,6 @@ import memoizee from 'memoizee'
 import { type User, getUser } from '../_auth/user.server'
 import { bodyIsValid, formatAuthor, subjectIsValid } from './circulars.lib'
 import type { Circular, CircularMetadata } from './circulars.lib'
-import { search as getSearch } from '~/lib/search.server'
 
 // A type with certain keys required.
 type Require<T, K extends keyof T> = Omit<T, K> & Required<Pick<T, K>>
diff --git a/app/table-streams/circulars/index.ts b/app/table-streams/circulars/index.ts
index 89da85d0d..29748925f 100644
--- a/app/table-streams/circulars/index.ts
+++ b/app/table-streams/circulars/index.ts
@@ -10,6 +10,7 @@ import type { AttributeValue } from '@aws-sdk/client-dynamodb'
 import { paginateQuery, paginateScan } from '@aws-sdk/lib-dynamodb'
 import type { DynamoDBDocument } from '@aws-sdk/lib-dynamodb'
 import { unmarshall } from '@aws-sdk/util-dynamodb'
+import { search as getSearchClient } from '@nasa-gcn/architect-functions-search'
 import { errors } from '@opensearch-project/opensearch'
 import type {
   DynamoDBRecord,
@@ -19,7 +20,6 @@ import type {
 import { sendEmailBulk } from '~/lib/email.server'
 import { origin } from '~/lib/env.server'
 import { createTriggerHandler } from '~/lib/lambdaTrigger.server'
-import { search as getSearchClient } from '~/lib/search.server'
 import type { Circular } from '~/routes/circulars/circulars.lib'
 import { formatCircularText } from '~/routes/circulars/circulars.lib'
 

From 60c790213f25070e15684358f2d83df98f1d33c4 Mon Sep 17 00:00:00 2001
From: Leo Singer <leo.singer@ligo.org>
Date: Wed, 11 Oct 2023 11:26:09 -0400
Subject: [PATCH 33/55] Create hyperlinks for TNS transients in Circulars

---
 .../circulars.$circularId/AstroData.components.tsx   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/app/routes/circulars.$circularId/AstroData.components.tsx b/app/routes/circulars.$circularId/AstroData.components.tsx
index b38e5e97c..9bcbeefce 100644
--- a/app/routes/circulars.$circularId/AstroData.components.tsx
+++ b/app/routes/circulars.$circularId/AstroData.components.tsx
@@ -37,3 +37,15 @@ export function Doi({ children, value }: JSX.IntrinsicElements['data']) {
     </a>
   )
 }
+
+export function Tns({ children, value }: JSX.IntrinsicElements['data']) {
+  return (
+    <a
+      className="usa-link"
+      rel="external"
+      href={`https://www.wis-tns.org/object/${value}`}
+    >
+      {children}
+    </a>
+  )
+}

From 2e1e70c0655a2ec87f12dac3384bede48db93da0 Mon Sep 17 00:00:00 2001
From: tylerbarna <tylerpbarna@gmail.com>
Date: Wed, 11 Oct 2023 14:43:19 -0500
Subject: [PATCH 34/55] enclosed content in CardBody

resolves https://github.com/nasa-gcn/gcn.nasa.gov/pull/1482#discussion_r1355582069
---
 app/routes/circulars._archive._index.tsx | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/app/routes/circulars._archive._index.tsx b/app/routes/circulars._archive._index.tsx
index 65597e22e..6249e82da 100644
--- a/app/routes/circulars._archive._index.tsx
+++ b/app/routes/circulars._archive._index.tsx
@@ -17,6 +17,7 @@ import {
 import {
   Button,
   ButtonGroup,
+  CardBody,
   DateRangePicker,
   Icon,
   Label,
@@ -351,8 +352,8 @@ export default function () {
               expanded={showContent}
             />
             {showContent && (
-              <DetailsDropdownContent className="margin-top-1">
-                <div className="maxw-card-xlg">
+              <DetailsDropdownContent className="maxw-card-xlg">
+                <CardBody>
                   <div className="display-flex flex-row">
                     <div className="display-flex flex-column flex-align-start margin-1">
                       <Radio
@@ -482,7 +483,7 @@ export default function () {
                       <Icon.CalendarToday /> Submit
                     </Button>
                   </div>
-                </div>
+                </CardBody>
               </DetailsDropdownContent>
             )}
           </>

From 53a30ab82ee4aefed43678d976f8716ec21eebbe Mon Sep 17 00:00:00 2001
From: tylerbarna <tylerpbarna@gmail.com>
Date: Wed, 11 Oct 2023 14:47:53 -0500
Subject: [PATCH 35/55] use cardfooter

resolves https://github.com/nasa-gcn/gcn.nasa.gov/pull/1482#discussion_r1355582953
---
 app/routes/circulars._archive._index.tsx | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/routes/circulars._archive._index.tsx b/app/routes/circulars._archive._index.tsx
index 6249e82da..f90f9d978 100644
--- a/app/routes/circulars._archive._index.tsx
+++ b/app/routes/circulars._archive._index.tsx
@@ -18,6 +18,7 @@ import {
   Button,
   ButtonGroup,
   CardBody,
+  CardFooter,
   DateRangePicker,
   Icon,
   Label,
@@ -471,7 +472,8 @@ export default function () {
                       }}
                     />
                   )}
-                  <div className="display-flex flex-row">
+
+                  <CardFooter>
                     <Button
                       type="button"
                       className=""
@@ -482,7 +484,7 @@ export default function () {
                     >
                       <Icon.CalendarToday /> Submit
                     </Button>
-                  </div>
+                  </CardFooter>
                 </CardBody>
               </DetailsDropdownContent>
             )}

From 8c3016d2cab1039b91024ea0e7a875cb3288a16b Mon Sep 17 00:00:00 2001
From: tylerbarna <tylerpbarna@gmail.com>
Date: Wed, 11 Oct 2023 16:16:42 -0500
Subject: [PATCH 36/55] switch to Grid usage

potentially resolves https://github.com/nasa-gcn/gcn.nasa.gov/pull/1482#discussion_r1355600360
---
 app/routes/circulars._archive._index.tsx | 30 +++++++++++++++++-------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/app/routes/circulars._archive._index.tsx b/app/routes/circulars._archive._index.tsx
index f90f9d978..461b07ad3 100644
--- a/app/routes/circulars._archive._index.tsx
+++ b/app/routes/circulars._archive._index.tsx
@@ -20,6 +20,7 @@ import {
   CardBody,
   CardFooter,
   DateRangePicker,
+  Grid,
   Icon,
   Label,
   Radio,
@@ -355,8 +356,8 @@ export default function () {
             {showContent && (
               <DetailsDropdownContent className="maxw-card-xlg">
                 <CardBody>
-                  <div className="display-flex flex-row">
-                    <div className="display-flex flex-column flex-align-start margin-1">
+                  <Grid row>
+                    <Grid col={4}>
                       <Radio
                         id="radio-alltime"
                         name="radio-date"
@@ -367,6 +368,8 @@ export default function () {
                           setFuzzyTime(e.target.value)
                         }}
                       />
+                    </Grid>
+                    <Grid col={4}>
                       <Radio
                         id="radio-hour"
                         name="radio-date"
@@ -376,6 +379,8 @@ export default function () {
                           setFuzzyTime(e.target.value)
                         }}
                       />
+                    </Grid>
+                    <Grid col={4}>
                       <Radio
                         id="radio-today"
                         name="radio-date"
@@ -385,8 +390,8 @@ export default function () {
                           setFuzzyTime(e.target.value)
                         }}
                       />
-                    </div>
-                    <div className="display-flex flex-column margin-1">
+                    </Grid>
+                    <Grid col={4}>
                       <Radio
                         id="radio-day"
                         name="radio-date"
@@ -396,6 +401,8 @@ export default function () {
                           setFuzzyTime(e.target.value)
                         }}
                       />
+                    </Grid>
+                    <Grid col={4}>
                       <Radio
                         id="radio-week"
                         name="radio-date"
@@ -405,6 +412,8 @@ export default function () {
                           setFuzzyTime(e.target.value)
                         }}
                       />
+                    </Grid>
+                    <Grid col={4}>
                       <Radio
                         id="radio-month"
                         name="radio-date"
@@ -414,9 +423,8 @@ export default function () {
                           setFuzzyTime(e.target.value)
                         }}
                       />
-                    </div>
-
-                    <div className="display-flex flex-column margin-1">
+                    </Grid>
+                    <Grid col={4}>
                       <Radio
                         id="radio-year"
                         name="radio-date"
@@ -426,6 +434,8 @@ export default function () {
                           setFuzzyTime(e.target.value)
                         }}
                       />
+                    </Grid>
+                    <Grid col={4}>
                       <Radio
                         id="radio-ytd"
                         name="radio-date"
@@ -435,6 +445,8 @@ export default function () {
                           setFuzzyTime(e.target.value)
                         }}
                       />
+                    </Grid>
+                    <Grid col={4}>
                       <Radio
                         id="radio-custom"
                         name="radio-date"
@@ -444,8 +456,8 @@ export default function () {
                           setShowDateRange(e.target.checked)
                         }}
                       />
-                    </div>
-                  </div>
+                    </Grid>
+                  </Grid>
 
                   {showDateRange && (
                     <DateRangePicker

From 4a98c1c4840d408402b26c4a8f49cf2a2f4eb902 Mon Sep 17 00:00:00 2001
From: tylerbarna <tylerpbarna@gmail.com>
Date: Wed, 11 Oct 2023 16:48:12 -0500
Subject: [PATCH 37/55] reduce code redundancy for radio buttons

---
 app/routes/circulars._archive._index.tsx | 144 +++++++----------------
 1 file changed, 41 insertions(+), 103 deletions(-)

diff --git a/app/routes/circulars._archive._index.tsx b/app/routes/circulars._archive._index.tsx
index 461b07ad3..c242be8e4 100644
--- a/app/routes/circulars._archive._index.tsx
+++ b/app/routes/circulars._archive._index.tsx
@@ -183,16 +183,38 @@ function Pagination({
 
 const dateSelectorLabels: Record<string, string> = {
   hour: 'Last hour',
+  today: 'Today',
   day: 'Last day',
   week: 'Last week',
   month: 'Last month',
   year: 'Last year',
-  today: 'Today',
-  mtd: 'Month to date',
+  // mtd: 'Month to date',
   ytd: 'Year to date',
   undefined: 'All time',
 }
 
+const radioOptions = [
+  {
+    // default/alltime option
+    id: 'radio-alltime',
+    value: 'undefined',
+    label: 'All Time',
+  },
+  ...Object.entries(dateSelectorLabels)
+    .filter(([value]) => value !== 'undefined') // don't include the undefined option as a button
+    .map(([value, label]) => ({
+      id: `radio-${value}`,
+      value,
+      label,
+    })),
+  {
+    // custom range option
+    id: 'radio-custom',
+    value: 'custom',
+    label: 'Custom Range...',
+  },
+]
+
 function DateSelectorButton({
   startDate,
   endDate,
@@ -357,108 +379,24 @@ export default function () {
               <DetailsDropdownContent className="maxw-card-xlg">
                 <CardBody>
                   <Grid row>
-                    <Grid col={4}>
-                      <Radio
-                        id="radio-alltime"
-                        name="radio-date"
-                        value="undefined"
-                        defaultChecked={true}
-                        label="All Time"
-                        onChange={(e) => {
-                          setFuzzyTime(e.target.value)
-                        }}
-                      />
-                    </Grid>
-                    <Grid col={4}>
-                      <Radio
-                        id="radio-hour"
-                        name="radio-date"
-                        value="hour"
-                        label="Last hour"
-                        onChange={(e) => {
-                          setFuzzyTime(e.target.value)
-                        }}
-                      />
-                    </Grid>
-                    <Grid col={4}>
-                      <Radio
-                        id="radio-today"
-                        name="radio-date"
-                        value="today"
-                        label="Today"
-                        onChange={(e) => {
-                          setFuzzyTime(e.target.value)
-                        }}
-                      />
-                    </Grid>
-                    <Grid col={4}>
-                      <Radio
-                        id="radio-day"
-                        name="radio-date"
-                        value="day"
-                        label="Last 24 Hours"
-                        onChange={(e) => {
-                          setFuzzyTime(e.target.value)
-                        }}
-                      />
-                    </Grid>
-                    <Grid col={4}>
-                      <Radio
-                        id="radio-week"
-                        name="radio-date"
-                        value="week"
-                        label="Last Week"
-                        onChange={(e) => {
-                          setFuzzyTime(e.target.value)
-                        }}
-                      />
-                    </Grid>
-                    <Grid col={4}>
-                      <Radio
-                        id="radio-month"
-                        name="radio-date"
-                        value="month"
-                        label="Last Month"
-                        onChange={(e) => {
-                          setFuzzyTime(e.target.value)
-                        }}
-                      />
-                    </Grid>
-                    <Grid col={4}>
-                      <Radio
-                        id="radio-year"
-                        name="radio-date"
-                        value="year"
-                        label="Last Year"
-                        onChange={(e) => {
-                          setFuzzyTime(e.target.value)
-                        }}
-                      />
-                    </Grid>
-                    <Grid col={4}>
-                      <Radio
-                        id="radio-ytd"
-                        name="radio-date"
-                        value="ytd"
-                        label="Year to Date"
-                        onChange={(e) => {
-                          setFuzzyTime(e.target.value)
-                        }}
-                      />
-                    </Grid>
-                    <Grid col={4}>
-                      <Radio
-                        id="radio-custom"
-                        name="radio-date"
-                        value="custom"
-                        label="Custom Range..."
-                        onChange={(e) => {
-                          setShowDateRange(e.target.checked)
-                        }}
-                      />
-                    </Grid>
+                    {radioOptions.map((option) => (
+                      <Grid col={4} key={option.id}>
+                        <Radio
+                          id={option.id}
+                          name="radio-date"
+                          value={option.value}
+                          label={option.label}
+                          onChange={(e) => {
+                            if (option.value === 'custom') {
+                              setShowDateRange(e.target.checked)
+                            } else {
+                              setFuzzyTime(option.value)
+                            }
+                          }}
+                        />
+                      </Grid>
+                    ))}
                   </Grid>
-
                   {showDateRange && (
                     <DateRangePicker
                       startDateHint="dd/mm/yyyy"

From d91d10b602abd944331f331c500e12f8804500ec Mon Sep 17 00:00:00 2001
From: tylerbarna <tylerpbarna@gmail.com>
Date: Wed, 11 Oct 2023 17:07:24 -0500
Subject: [PATCH 38/55] remove final merge issue

for some reason this one was not fixed by doing a proper merge, manually fixed it.
---
 .../circulars.$circularId/AstroData.components.tsx   | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/app/routes/circulars.$circularId/AstroData.components.tsx b/app/routes/circulars.$circularId/AstroData.components.tsx
index 42c1a9a9e..a03b29981 100644
--- a/app/routes/circulars.$circularId/AstroData.components.tsx
+++ b/app/routes/circulars.$circularId/AstroData.components.tsx
@@ -41,15 +41,3 @@ export function Tns({ children, value }: JSX.IntrinsicElements['data']) {
     </a>
   )
 }
-
-export function Tns({ children, value }: JSX.IntrinsicElements['data']) {
-  return (
-    <a
-      className="usa-link"
-      rel="external"
-      href={`https://www.wis-tns.org/object/${value}`}
-    >
-      {children}
-    </a>
-  )
-}

From 60733c61f57bb21a8699a7be83b30476cbf80752 Mon Sep 17 00:00:00 2001
From: tylerbarna <tylerpbarna@gmail.com>
Date: Wed, 11 Oct 2023 17:54:31 -0500
Subject: [PATCH 39/55] reduced radioOptions overhead

also removed the useEffect and implemented the checked check
---
 app/routes/circulars._archive._index.tsx | 48 ++++++------------------
 1 file changed, 11 insertions(+), 37 deletions(-)

diff --git a/app/routes/circulars._archive._index.tsx b/app/routes/circulars._archive._index.tsx
index c242be8e4..1a3c97d20 100644
--- a/app/routes/circulars._archive._index.tsx
+++ b/app/routes/circulars._archive._index.tsx
@@ -29,7 +29,7 @@ import {
 } from '@trussworks/react-uswds'
 import classNames from 'classnames'
 import clamp from 'lodash/clamp'
-import { useEffect, useState } from 'react'
+import { useState } from 'react'
 
 import { circularRedirect, search } from './circulars/circulars.server'
 import type { action } from './circulars/route'
@@ -182,24 +182,20 @@ function Pagination({
 }
 
 const dateSelectorLabels: Record<string, string> = {
-  hour: 'Last hour',
+  alltime: 'All Time',
+  hour: 'Last Hour',
   today: 'Today',
-  day: 'Last day',
-  week: 'Last week',
-  month: 'Last month',
-  year: 'Last year',
+  day: 'Last Day',
+  week: 'Last Week',
+  month: 'Last Month',
+  year: 'Last Year',
   // mtd: 'Month to date',
-  ytd: 'Year to date',
-  undefined: 'All time',
+  ytd: 'Year to Date',
+  custom: 'Custom Range',
+  undefined: 'All Time',
 }
 
 const radioOptions = [
-  {
-    // default/alltime option
-    id: 'radio-alltime',
-    value: 'undefined',
-    label: 'All Time',
-  },
   ...Object.entries(dateSelectorLabels)
     .filter(([value]) => value !== 'undefined') // don't include the undefined option as a button
     .map(([value, label]) => ({
@@ -207,12 +203,6 @@ const radioOptions = [
       value,
       label,
     })),
-  {
-    // custom range option
-    id: 'radio-custom',
-    value: 'custom',
-    label: 'Custom Range...',
-  },
 ]
 
 function DateSelectorButton({
@@ -300,23 +290,6 @@ export default function () {
     })
   }
 
-  useEffect(() => {
-    const radiobuttons = document.querySelectorAll('input[name="radio-date"]')
-    let radioSelected = false
-    radiobuttons.forEach((button) => {
-      if ((button as HTMLInputElement).value === inputDateGte) {
-        ;(button as HTMLInputElement).checked = true
-        radioSelected = true
-      }
-    })
-    if (!radioSelected) {
-      const customButton = document.getElementById('radio-custom')
-      if (customButton) {
-        ;(customButton as HTMLInputElement).checked = true
-      } // does not address the need for the custom date range button to be expanded if this button is checked
-    }
-  })
-
   return (
     <>
       <h1>GCN Circulars</h1>
@@ -386,6 +359,7 @@ export default function () {
                           name="radio-date"
                           value={option.value}
                           label={option.label}
+                          checked={option.value === inputDateGte}
                           onChange={(e) => {
                             if (option.value === 'custom') {
                               setShowDateRange(e.target.checked)

From 88b8669bc94388a57c4181b63505490563f55eeb Mon Sep 17 00:00:00 2001
From: tylerbarna <tylerpbarna@gmail.com>
Date: Wed, 11 Oct 2023 17:58:50 -0500
Subject: [PATCH 40/55] removed radioOptions constant

this was redundant, so integrated into map
---
 app/routes/circulars._archive._index.tsx | 53 +++++++++++-------------
 1 file changed, 25 insertions(+), 28 deletions(-)

diff --git a/app/routes/circulars._archive._index.tsx b/app/routes/circulars._archive._index.tsx
index 1a3c97d20..160d421a2 100644
--- a/app/routes/circulars._archive._index.tsx
+++ b/app/routes/circulars._archive._index.tsx
@@ -195,16 +195,6 @@ const dateSelectorLabels: Record<string, string> = {
   undefined: 'All Time',
 }
 
-const radioOptions = [
-  ...Object.entries(dateSelectorLabels)
-    .filter(([value]) => value !== 'undefined') // don't include the undefined option as a button
-    .map(([value, label]) => ({
-      id: `radio-${value}`,
-      value,
-      label,
-    })),
-]
-
 function DateSelectorButton({
   startDate,
   endDate,
@@ -352,24 +342,31 @@ export default function () {
               <DetailsDropdownContent className="maxw-card-xlg">
                 <CardBody>
                   <Grid row>
-                    {radioOptions.map((option) => (
-                      <Grid col={4} key={option.id}>
-                        <Radio
-                          id={option.id}
-                          name="radio-date"
-                          value={option.value}
-                          label={option.label}
-                          checked={option.value === inputDateGte}
-                          onChange={(e) => {
-                            if (option.value === 'custom') {
-                              setShowDateRange(e.target.checked)
-                            } else {
-                              setFuzzyTime(option.value)
-                            }
-                          }}
-                        />
-                      </Grid>
-                    ))}
+                    {Object.entries(dateSelectorLabels)
+                      .filter(([value]) => value !== 'undefined') // don't include the undefined option as a button
+                      .map(([value, label]) => ({
+                        id: `radio-${value}`,
+                        value,
+                        label,
+                      }))
+                      .map((option) => (
+                        <Grid col={4} key={option.id}>
+                          <Radio
+                            id={option.id}
+                            name="radio-date"
+                            value={option.value}
+                            label={option.label}
+                            checked={option.value === inputDateGte}
+                            onChange={(e) => {
+                              if (option.value === 'custom') {
+                                setShowDateRange(e.target.checked)
+                              } else {
+                                setFuzzyTime(option.value)
+                              }
+                            }}
+                          />
+                        </Grid>
+                      ))}
                   </Grid>
                   {showDateRange && (
                     <DateRangePicker

From 3d2faec3c8436c5af07a190e2fe8538cd326eeb8 Mon Sep 17 00:00:00 2001
From: tylerbarna <tylerpbarna@gmail.com>
Date: Wed, 11 Oct 2023 18:13:18 -0500
Subject: [PATCH 41/55] set defaultChecked

only issue is that radio button for custom range is not visually checked even though the onChange indicates that it is being registered as clicked
---
 app/routes/circulars._archive._index.tsx | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/routes/circulars._archive._index.tsx b/app/routes/circulars._archive._index.tsx
index 160d421a2..6d5cb1f33 100644
--- a/app/routes/circulars._archive._index.tsx
+++ b/app/routes/circulars._archive._index.tsx
@@ -191,7 +191,7 @@ const dateSelectorLabels: Record<string, string> = {
   year: 'Last Year',
   // mtd: 'Month to date',
   ytd: 'Year to Date',
-  custom: 'Custom Range',
+  custom: 'Custom Range...',
   undefined: 'All Time',
 }
 
@@ -357,6 +357,7 @@ export default function () {
                             value={option.value}
                             label={option.label}
                             checked={option.value === inputDateGte}
+                            defaultChecked={option.value === 'alltime'}
                             onChange={(e) => {
                               if (option.value === 'custom') {
                                 setShowDateRange(e.target.checked)

From 3c05f3cfd8ebc1718968e58f7c180ab0bb09bf67 Mon Sep 17 00:00:00 2001
From: tylerbarna <tylerpbarna@gmail.com>
Date: Thu, 12 Oct 2023 14:36:50 -0500
Subject: [PATCH 42/55] combined map calls into one

the two map calls are now one. Also removed an empty className in the submit button.
---
 app/routes/circulars._archive._index.tsx | 24 +++++++++---------------
 1 file changed, 9 insertions(+), 15 deletions(-)

diff --git a/app/routes/circulars._archive._index.tsx b/app/routes/circulars._archive._index.tsx
index 6d5cb1f33..4ef1e2a49 100644
--- a/app/routes/circulars._archive._index.tsx
+++ b/app/routes/circulars._archive._index.tsx
@@ -344,25 +344,20 @@ export default function () {
                   <Grid row>
                     {Object.entries(dateSelectorLabels)
                       .filter(([value]) => value !== 'undefined') // don't include the undefined option as a button
-                      .map(([value, label]) => ({
-                        id: `radio-${value}`,
-                        value,
-                        label,
-                      }))
-                      .map((option) => (
-                        <Grid col={4} key={option.id}>
+                      .map(([value, label]) => (
+                        <Grid col={4} key={`radio-${value}`}>
                           <Radio
-                            id={option.id}
+                            id={`radio-${value}`}
                             name="radio-date"
-                            value={option.value}
-                            label={option.label}
-                            checked={option.value === inputDateGte}
-                            defaultChecked={option.value === 'alltime'}
+                            value={value}
+                            label={label}
+                            checked={value === inputDateGte}
+                            defaultChecked={value === 'alltime'}
                             onChange={(e) => {
-                              if (option.value === 'custom') {
+                              if (value === 'custom') {
                                 setShowDateRange(e.target.checked)
                               } else {
-                                setFuzzyTime(option.value)
+                                setFuzzyTime(value)
                               }
                             }}
                           />
@@ -398,7 +393,6 @@ export default function () {
                   <CardFooter>
                     <Button
                       type="button"
-                      className=""
                       form="searchForm"
                       onClick={() => {
                         setDateRange()

From f159a4ee9725ba7fb707c4ab66f8a46f6d502616 Mon Sep 17 00:00:00 2001
From: tylerbarna <tylerpbarna@gmail.com>
Date: Thu, 12 Oct 2023 15:00:46 -0500
Subject: [PATCH 43/55] remove alltime from dateSelectorLabels

---
 app/routes/circulars._archive._index.tsx | 23 +++++++++++++++++------
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/app/routes/circulars._archive._index.tsx b/app/routes/circulars._archive._index.tsx
index 4ef1e2a49..d27cc5197 100644
--- a/app/routes/circulars._archive._index.tsx
+++ b/app/routes/circulars._archive._index.tsx
@@ -182,7 +182,6 @@ function Pagination({
 }
 
 const dateSelectorLabels: Record<string, string> = {
-  alltime: 'All Time',
   hour: 'Last Hour',
   today: 'Today',
   day: 'Last Day',
@@ -192,7 +191,6 @@ const dateSelectorLabels: Record<string, string> = {
   // mtd: 'Month to date',
   ytd: 'Year to Date',
   custom: 'Custom Range...',
-  undefined: 'All Time',
 }
 
 function DateSelectorButton({
@@ -342,9 +340,20 @@ export default function () {
               <DetailsDropdownContent className="maxw-card-xlg">
                 <CardBody>
                   <Grid row>
-                    {Object.entries(dateSelectorLabels)
-                      .filter(([value]) => value !== 'undefined') // don't include the undefined option as a button
-                      .map(([value, label]) => (
+                    <Grid col={4} key={`radio-alltime`}>
+                      <Radio
+                        id={`radio-alltime`}
+                        name="radio-date"
+                        value=""
+                        label="All Time"
+                        defaultChecked={true}
+                        onChange={(e) => {
+                          setInputDateGte(e.target.value)
+                        }}
+                      />
+                    </Grid>
+                    {Object.entries(dateSelectorLabels).map(
+                      ([value, label]) => (
                         <Grid col={4} key={`radio-${value}`}>
                           <Radio
                             id={`radio-${value}`}
@@ -356,13 +365,15 @@ export default function () {
                             onChange={(e) => {
                               if (value === 'custom') {
                                 setShowDateRange(e.target.checked)
+                                setInputDateGte('') // clear the start date
                               } else {
                                 setFuzzyTime(value)
                               }
                             }}
                           />
                         </Grid>
-                      ))}
+                      )
+                    )}
                   </Grid>
                   {showDateRange && (
                     <DateRangePicker

From a00c562f3179080d5bbaa9bb5bdf8e988a198b7a Mon Sep 17 00:00:00 2001
From: tylerbarna <tylerpbarna@gmail.com>
Date: Fri, 13 Oct 2023 13:22:49 -0500
Subject: [PATCH 44/55] removed custom date from dateSelectorLabels

---
 app/routes/circulars._archive._index.tsx | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/app/routes/circulars._archive._index.tsx b/app/routes/circulars._archive._index.tsx
index d27cc5197..f9e35d44f 100644
--- a/app/routes/circulars._archive._index.tsx
+++ b/app/routes/circulars._archive._index.tsx
@@ -190,7 +190,6 @@ const dateSelectorLabels: Record<string, string> = {
   year: 'Last Year',
   // mtd: 'Month to date',
   ytd: 'Year to Date',
-  custom: 'Custom Range...',
 }
 
 function DateSelectorButton({
@@ -361,19 +360,25 @@ export default function () {
                             value={value}
                             label={label}
                             checked={value === inputDateGte}
-                            defaultChecked={value === 'alltime'}
-                            onChange={(e) => {
-                              if (value === 'custom') {
-                                setShowDateRange(e.target.checked)
-                                setInputDateGte('') // clear the start date
-                              } else {
-                                setFuzzyTime(value)
-                              }
+                            onChange={() => {
+                              setFuzzyTime(value)
                             }}
                           />
                         </Grid>
                       )
                     )}
+                    <Grid col={4}>
+                      <Radio
+                        id="radio-custom"
+                        name="radio-date"
+                        value="custom"
+                        label="Custom Range..."
+                        checked={showDateRange}
+                        onChange={(e) => {
+                          setShowDateRange(e.target.checked)
+                        }}
+                      />
+                    </Grid>
                   </Grid>
                   {showDateRange && (
                     <DateRangePicker

From b3c2fa64924e4943c6ac4171a838e36640a24b41 Mon Sep 17 00:00:00 2001
From: tylerbarna <tylerpbarna@gmail.com>
Date: Fri, 13 Oct 2023 14:06:40 -0500
Subject: [PATCH 45/55] fix fuzzy date to custom date switch

going from a fuzzy date to a custom date where just the end date is set no longer has the issue of the start date still being set to the fuzzy date. Also added labels to the date range selector so that instances of selecting just a start date or just an end date will look better.
---
 app/routes/circulars._archive._index.tsx | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/app/routes/circulars._archive._index.tsx b/app/routes/circulars._archive._index.tsx
index f9e35d44f..def3f3b15 100644
--- a/app/routes/circulars._archive._index.tsx
+++ b/app/routes/circulars._archive._index.tsx
@@ -213,6 +213,8 @@ function DateSelectorButton({
               {startDate}—{endDate}
             </>
           )) ||
+          (startDate && <>After {startDate}</>) ||
+          (endDate && <>Before {endDate}</>) ||
           'Filter by date'}
       </Button>
       <Button type="button" className={`${slimClasses} padding-x-1`}>
@@ -263,14 +265,16 @@ export default function () {
       setShowDateRange(false)
       setInputDateGte(startDate)
     }
-    setInputDateLte('now')
+    setInputDateLte('')
   }
 
   const setDateRange = () => {
     setShowContent(false)
     const params = new URLSearchParams(location.search)
     if (inputDateGte) params.set('startDate', inputDateGte)
+    else params.delete('startDate')
     if (inputDateLte) params.set('endDate', inputDateLte)
+    else params.delete('endDate')
     submit(params, {
       method: 'get',
       action: '/circulars',

From e0976069025f00b234a2446ceddb17445f61f71a Mon Sep 17 00:00:00 2001
From: tylerbarna <tylerpbarna@gmail.com>
Date: Fri, 13 Oct 2023 14:39:59 -0500
Subject: [PATCH 46/55] removed commented out code

---
 app/routes/circulars._archive._index.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/routes/circulars._archive._index.tsx b/app/routes/circulars._archive._index.tsx
index def3f3b15..35b4faa65 100644
--- a/app/routes/circulars._archive._index.tsx
+++ b/app/routes/circulars._archive._index.tsx
@@ -188,7 +188,6 @@ const dateSelectorLabels: Record<string, string> = {
   week: 'Last Week',
   month: 'Last Month',
   year: 'Last Year',
-  // mtd: 'Month to date',
   ytd: 'Year to Date',
 }
 

From 547b93e2ff33806c90cdc77ece0fabac1474b9be Mon Sep 17 00:00:00 2001
From: tylerbarna <tylerpbarna@gmail.com>
Date: Fri, 13 Oct 2023 16:59:15 -0500
Subject: [PATCH 47/55] switch method of setting date range

---
 app/routes/circulars._archive._index.tsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/routes/circulars._archive._index.tsx b/app/routes/circulars._archive._index.tsx
index 35b4faa65..75326001a 100644
--- a/app/routes/circulars._archive._index.tsx
+++ b/app/routes/circulars._archive._index.tsx
@@ -274,10 +274,7 @@ export default function () {
     else params.delete('startDate')
     if (inputDateLte) params.set('endDate', inputDateLte)
     else params.delete('endDate')
-    submit(params, {
-      method: 'get',
-      action: '/circulars',
-    })
+    window.location.search = params.toString()
   }
 
   return (

From 135c4038d7b564f8b6a7bc4c060888714f0a081d Mon Sep 17 00:00:00 2001
From: tylerbarna <tylerpbarna@gmail.com>
Date: Mon, 16 Oct 2023 10:11:58 -0500
Subject: [PATCH 48/55] revert set date range method

---
 app/routes/circulars._archive._index.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/routes/circulars._archive._index.tsx b/app/routes/circulars._archive._index.tsx
index 75326001a..35b4faa65 100644
--- a/app/routes/circulars._archive._index.tsx
+++ b/app/routes/circulars._archive._index.tsx
@@ -274,7 +274,10 @@ export default function () {
     else params.delete('startDate')
     if (inputDateLte) params.set('endDate', inputDateLte)
     else params.delete('endDate')
-    window.location.search = params.toString()
+    submit(params, {
+      method: 'get',
+      action: '/circulars',
+    })
   }
 
   return (

From b9459fd591233b533966d66b4a728cc9b5d57be5 Mon Sep 17 00:00:00 2001
From: tylerbarna <tylerpbarna@gmail.com>
Date: Mon, 16 Oct 2023 11:14:29 -0500
Subject: [PATCH 49/55] remove vestigial file

---
 app/routes/circulars._archive._index.tsx | 499 -----------------------
 1 file changed, 499 deletions(-)
 delete mode 100644 app/routes/circulars._archive._index.tsx

diff --git a/app/routes/circulars._archive._index.tsx b/app/routes/circulars._archive._index.tsx
deleted file mode 100644
index 35b4faa65..000000000
--- a/app/routes/circulars._archive._index.tsx
+++ /dev/null
@@ -1,499 +0,0 @@
-/*!
- * Copyright © 2023 United States Government as represented by the
- * Administrator of the National Aeronautics and Space Administration.
- * All Rights Reserved.
- *
- * SPDX-License-Identifier: Apache-2.0
- */
-import type { DataFunctionArgs } from '@remix-run/node'
-import {
-  Form,
-  Link,
-  useActionData,
-  useLoaderData,
-  useSearchParams,
-  useSubmit,
-} from '@remix-run/react'
-import {
-  Button,
-  ButtonGroup,
-  CardBody,
-  CardFooter,
-  DateRangePicker,
-  Grid,
-  Icon,
-  Label,
-  Radio,
-  Select,
-  TextInput,
-} from '@trussworks/react-uswds'
-import classNames from 'classnames'
-import clamp from 'lodash/clamp'
-import { useState } from 'react'
-
-import { circularRedirect, search } from './circulars/circulars.server'
-import type { action } from './circulars/route'
-import DetailsDropdownContent from '~/components/DetailsDropdownContent'
-import Hint from '~/components/Hint'
-import { usePagination } from '~/lib/pagination'
-import { useFeature } from '~/root'
-
-import searchImg from 'nasawds/src/img/usa-icons-bg/search--white.svg'
-
-export async function loader({ request: { url } }: DataFunctionArgs) {
-  const { searchParams } = new URL(url)
-  const query = searchParams.get('query') || undefined
-  if (query) {
-    await circularRedirect(query)
-  }
-  const startDate = searchParams.get('startDate') || undefined
-  const endDate = searchParams.get('endDate') || undefined
-  const page = parseInt(searchParams.get('page') || '1')
-  const limit = clamp(parseInt(searchParams.get('limit') || '100'), 1, 100)
-  const results = await search({
-    query,
-    page: page - 1,
-    limit,
-    startDate,
-    endDate,
-  })
-
-  return { page, ...results }
-}
-
-function getPageLink({
-  page,
-  limit,
-  query,
-  startDate,
-  endDate,
-}: {
-  page: number
-  limit?: number
-  query?: string
-  startDate?: string
-  endDate?: string
-}) {
-  const searchParams = new URLSearchParams()
-  if (page > 1) searchParams.set('page', page.toString())
-  if (limit && limit != 100) searchParams.set('limit', limit.toString())
-  if (query) searchParams.set('query', query)
-  if (startDate) searchParams.set('startDate', startDate)
-  if (endDate) searchParams.set('endDate', endDate)
-
-  const searchString = searchParams.toString()
-  return searchString && `?${searchString}`
-}
-
-function Pagination({
-  page,
-  totalPages,
-  ...queryStringProps
-}: {
-  page: number
-  totalPages: number
-  limit?: number
-  query?: string
-  startDate?: string
-  endDate?: string
-}) {
-  const pages = usePagination({ currentPage: page, totalPages })
-
-  return (
-    <nav aria-label="Pagination" className="usa-pagination">
-      <ul className="usa-pagination__list">
-        {pages.map((pageProps, i) => {
-          switch (pageProps.type) {
-            case 'prev':
-              return (
-                <li
-                  className="usa-pagination__item usa-pagination__arrow"
-                  key={i}
-                >
-                  <Link
-                    to={getPageLink({
-                      page: pageProps.number,
-                      ...queryStringProps,
-                    })}
-                    className="usa-pagination__link usa-pagination__previous-page"
-                    aria-label="Previous page"
-                  >
-                    <Icon.NavigateBefore role="presentation" />
-                    <span className="usa-pagination__link-text">Previous</span>
-                  </Link>
-                </li>
-              )
-            case 'overflow':
-              return (
-                <li
-                  className="usa-pagination__item usa-pagination__overflow"
-                  role="presentation"
-                  key={i}
-                >
-                  <span>…</span>
-                </li>
-              )
-            case 'next':
-              return (
-                <li
-                  className="usa-pagination__item usa-pagination__arrow"
-                  key={i}
-                >
-                  <Link
-                    to={getPageLink({
-                      page: pageProps.number,
-                      ...queryStringProps,
-                    })}
-                    className="usa-pagination__link usa-pagination__next-page"
-                    aria-label="Next page"
-                  >
-                    <Icon.NavigateNext role="presentation" />
-                    <span className="usa-pagination__link-text">Next</span>
-                  </Link>
-                </li>
-              )
-            default:
-              return (
-                <li
-                  className="usa-pagination__item usa-pagination__page-no"
-                  key={i}
-                >
-                  <Link
-                    to={getPageLink({
-                      page: pageProps.number,
-                      ...queryStringProps,
-                    })}
-                    className={classNames('usa-pagination__button', {
-                      'usa-current': pageProps.isCurrent,
-                    })}
-                    prefetch="render"
-                    aria-label={`Page ${pageProps.number}`}
-                    aria-current={pageProps.isCurrent}
-                  >
-                    {pageProps.number}
-                  </Link>
-                </li>
-              )
-          }
-        })}
-      </ul>
-    </nav>
-  )
-}
-
-const dateSelectorLabels: Record<string, string> = {
-  hour: 'Last Hour',
-  today: 'Today',
-  day: 'Last Day',
-  week: 'Last Week',
-  month: 'Last Month',
-  year: 'Last Year',
-  ytd: 'Year to Date',
-}
-
-function DateSelectorButton({
-  startDate,
-  endDate,
-  expanded,
-  ...props
-}: {
-  startDate?: string
-  endDate?: string
-  expanded?: boolean
-} & Omit<Parameters<typeof ButtonGroup>[0], 'segmented' | 'children'>) {
-  const slimClasses = 'height-4 padding-y-0'
-
-  return (
-    <ButtonGroup type="segmented" {...props}>
-      <Button type="button" className={`${slimClasses} padding-x-2`}>
-        {(startDate && dateSelectorLabels[startDate]) ||
-          (startDate && endDate && (
-            <>
-              {startDate}—{endDate}
-            </>
-          )) ||
-          (startDate && <>After {startDate}</>) ||
-          (endDate && <>Before {endDate}</>) ||
-          'Filter by date'}
-      </Button>
-      <Button type="button" className={`${slimClasses} padding-x-1`}>
-        <Icon.CalendarToday role="presentation" />
-        {expanded ? (
-          <Icon.ExpandLess role="presentation" />
-        ) : (
-          <Icon.ExpandMore role="presentation" />
-        )}
-      </Button>
-    </ButtonGroup>
-  )
-}
-
-export default function () {
-  const newItem = useActionData<typeof action>()
-  const { items, page, totalPages, totalItems } = useLoaderData<typeof loader>()
-  const featureCircularsFilterByDate = useFeature('CIRCULARS_FILTER_BY_DATE')
-
-  // Concatenate items from the action and loader functions
-  const allItems = [...(newItem ? [newItem] : []), ...(items || [])]
-
-  const [searchParams] = useSearchParams()
-  const limit = searchParams.get('limit') || '100'
-  const query = searchParams.get('query') || undefined
-  const startDate = searchParams.get('startDate') || undefined
-  const endDate = searchParams.get('endDate') || undefined
-
-  let searchString = searchParams.toString()
-  if (searchString) searchString = `?${searchString}`
-
-  const [inputQuery, setInputQuery] = useState(query)
-  const [inputDateGte, setInputDateGte] = useState(startDate)
-  const [inputDateLte, setInputDateLte] = useState(endDate)
-  const [showContent, setShowContent] = useState(false)
-  const [showDateRange, setShowDateRange] = useState(false)
-  const clean =
-    inputQuery === query &&
-    inputDateGte === startDate &&
-    inputDateLte === endDate
-
-  const submit = useSubmit()
-
-  const setFuzzyTime = (startDate?: string) => {
-    if (startDate === 'custom') {
-      setShowDateRange(true)
-    } else {
-      setShowDateRange(false)
-      setInputDateGte(startDate)
-    }
-    setInputDateLte('')
-  }
-
-  const setDateRange = () => {
-    setShowContent(false)
-    const params = new URLSearchParams(location.search)
-    if (inputDateGte) params.set('startDate', inputDateGte)
-    else params.delete('startDate')
-    if (inputDateLte) params.set('endDate', inputDateLte)
-    else params.delete('endDate')
-    submit(params, {
-      method: 'get',
-      action: '/circulars',
-    })
-  }
-
-  return (
-    <>
-      <h1>GCN Circulars</h1>
-      <p className="usa-paragraph">
-        <b>
-          GCN Circulars are rapid astronomical bulletins submitted by and
-          distributed to community members worldwide.
-        </b>{' '}
-        They are used to share discoveries, observations, quantitative near-term
-        predictions, requests for follow-up observations, or future observing
-        plans related to high-energy, multi-messenger, and variable or transient
-        astrophysical events. See the{' '}
-        <Link className="usa-link" to="/docs/circulars">
-          documentation
-        </Link>{' '}
-        for help with subscribing to or submitting Circulars.
-      </p>
-      <ButtonGroup className="position-sticky top-0 bg-white margin-bottom-1 padding-top-1 z-top">
-        <Form
-          className="display-inline-block usa-search usa-search--small"
-          role="search"
-          id="searchForm"
-        >
-          <Label srOnly={true} htmlFor="query">
-            Search
-          </Label>
-          <TextInput
-            autoFocus
-            id="query"
-            name="query"
-            type="search"
-            defaultValue={inputQuery}
-            placeholder="Search"
-            aria-describedby="searchHint"
-            onChange={({ target: { form, value } }) => {
-              setInputQuery(value)
-              if (!value) submit(form)
-            }}
-          />
-          <Button type="submit">
-            <img
-              src={searchImg}
-              className="usa-search__submit-icon"
-              alt="Search"
-            />
-          </Button>
-        </Form>
-        {featureCircularsFilterByDate && (
-          <>
-            <DateSelectorButton
-              startDate={startDate}
-              endDate={endDate}
-              onClick={() => {
-                setShowContent((shown) => !shown)
-                setShowDateRange(false)
-              }}
-              expanded={showContent}
-            />
-            {showContent && (
-              <DetailsDropdownContent className="maxw-card-xlg">
-                <CardBody>
-                  <Grid row>
-                    <Grid col={4} key={`radio-alltime`}>
-                      <Radio
-                        id={`radio-alltime`}
-                        name="radio-date"
-                        value=""
-                        label="All Time"
-                        defaultChecked={true}
-                        onChange={(e) => {
-                          setInputDateGte(e.target.value)
-                        }}
-                      />
-                    </Grid>
-                    {Object.entries(dateSelectorLabels).map(
-                      ([value, label]) => (
-                        <Grid col={4} key={`radio-${value}`}>
-                          <Radio
-                            id={`radio-${value}`}
-                            name="radio-date"
-                            value={value}
-                            label={label}
-                            checked={value === inputDateGte}
-                            onChange={() => {
-                              setFuzzyTime(value)
-                            }}
-                          />
-                        </Grid>
-                      )
-                    )}
-                    <Grid col={4}>
-                      <Radio
-                        id="radio-custom"
-                        name="radio-date"
-                        value="custom"
-                        label="Custom Range..."
-                        checked={showDateRange}
-                        onChange={(e) => {
-                          setShowDateRange(e.target.checked)
-                        }}
-                      />
-                    </Grid>
-                  </Grid>
-                  {showDateRange && (
-                    <DateRangePicker
-                      startDateHint="dd/mm/yyyy"
-                      startDateLabel="Start Date"
-                      className="margin-bottom-2"
-                      startDatePickerProps={{
-                        id: 'event-date-start',
-                        name: 'event-date-start',
-                        defaultValue: 'startDate',
-                        onChange: (value) => {
-                          setInputDateGte(value)
-                        },
-                      }}
-                      endDateHint="dd/mm/yyyy"
-                      endDateLabel="End Date"
-                      endDatePickerProps={{
-                        id: 'event-date-end',
-                        name: 'event-date-end',
-                        defaultValue: 'endDate',
-                        onChange: (value) => {
-                          setInputDateLte(value)
-                        },
-                      }}
-                    />
-                  )}
-
-                  <CardFooter>
-                    <Button
-                      type="button"
-                      form="searchForm"
-                      onClick={() => {
-                        setDateRange()
-                      }}
-                    >
-                      <Icon.CalendarToday /> Submit
-                    </Button>
-                  </CardFooter>
-                </CardBody>
-              </DetailsDropdownContent>
-            )}
-          </>
-        )}
-        <Link to={`/circulars/new${searchString}`}>
-          <Button
-            type="button"
-            className="height-4 padding-top-0 padding-bottom-0"
-          >
-            <Icon.Edit role="presentation" /> New
-          </Button>
-        </Link>
-      </ButtonGroup>
-      <Hint id="searchHint">
-        Search for Circulars by submitter, subject, or body text (e.g. 'Fermi
-        GRB'). <br />
-        To navigate to a specific circular, enter the associated Circular ID
-        (e.g. 'gcn123', 'Circular 123', or '123').
-      </Hint>
-      {clean && (
-        <>
-          {query && (
-            <h3>
-              {totalItems} result{totalItems != 1 && 's'} found.
-            </h3>
-          )}
-          <ol>
-            {allItems.map(({ circularId, subject }) => (
-              <li key={circularId} value={circularId}>
-                <Link
-                  className="usa-link"
-                  to={`/circulars/${circularId}${searchString}`}
-                >
-                  {subject}
-                </Link>
-              </li>
-            ))}
-          </ol>
-          <div className="display-flex flex-row flex-wrap">
-            <div className="display-flex flex-align-self-center margin-right-2 width-auto">
-              <div>
-                <Select
-                  id="limit"
-                  className="width-auto height-5 padding-y-0 margin-y-0"
-                  name="limit"
-                  defaultValue="100"
-                  form="searchForm"
-                  onChange={({ target: { form } }) => {
-                    submit(form)
-                  }}
-                >
-                  <option value="10">10 / page</option>
-                  <option value="20">20 / page</option>
-                  <option value="50">50 / page</option>
-                  <option value="100">100 / page</option>
-                </Select>
-              </div>
-            </div>
-            <div className="display-flex flex-fill">
-              {totalPages > 1 && (
-                <Pagination
-                  query={query}
-                  page={page}
-                  limit={parseInt(limit)}
-                  totalPages={totalPages}
-                  startDate={startDate}
-                  endDate={endDate}
-                />
-              )}
-            </div>
-          </div>
-        </>
-      )}
-    </>
-  )
-}

From 5ebdd15a0fe8807eabbecd8340a998d140f04912 Mon Sep 17 00:00:00 2001
From: tylerbarna <tylerpbarna@gmail.com>
Date: Mon, 16 Oct 2023 11:19:36 -0500
Subject: [PATCH 50/55] restored button group z-order

---
 app/routes/circulars._archive._index/route.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/routes/circulars._archive._index/route.tsx b/app/routes/circulars._archive._index/route.tsx
index 5c335a972..5662daa64 100644
--- a/app/routes/circulars._archive._index/route.tsx
+++ b/app/routes/circulars._archive._index/route.tsx
@@ -128,7 +128,7 @@ export default function () {
   return (
     <>
       <CircularsHeader />
-      <ButtonGroup className="position-sticky top-0 bg-white margin-bottom-1 padding-top-1">
+      <ButtonGroup className="position-sticky top-0 bg-white margin-bottom-1 padding-top-1 z-top">
         <Form
           className="display-inline-block usa-search usa-search--small"
           role="search"

From b7161e74fddaee52b7fc8e214de14c0ed0b6a2d0 Mon Sep 17 00:00:00 2001
From: Tyler Barna <57914086+tylerbarna@users.noreply.github.com>
Date: Tue, 17 Oct 2023 12:11:28 -0400
Subject: [PATCH 51/55] Update app/routes/circulars._archive._index/route.tsx

Co-authored-by: Leo Singer <leo.p.singer@nasa.gov>
---
 app/routes/circulars._archive._index/route.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/routes/circulars._archive._index/route.tsx b/app/routes/circulars._archive._index/route.tsx
index 5662daa64..09a1c562d 100644
--- a/app/routes/circulars._archive._index/route.tsx
+++ b/app/routes/circulars._archive._index/route.tsx
@@ -102,7 +102,7 @@ export default function () {
     setInputDateLte('')
   }
 
-  const setDateRange = () => {
+  function setDateRange() {
     setShowContent(false)
     const params = new URLSearchParams(location.search)
     if (inputDateGte) params.set('startDate', inputDateGte)

From 9530b1094ccf0353edb5a307553c6b52f6090479 Mon Sep 17 00:00:00 2001
From: Tyler Barna <57914086+tylerbarna@users.noreply.github.com>
Date: Tue, 17 Oct 2023 12:12:44 -0400
Subject: [PATCH 52/55] Update app/routes/circulars._archive._index/route.tsx

Co-authored-by: Leo Singer <leo.p.singer@nasa.gov>
---
 app/routes/circulars._archive._index/route.tsx | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/app/routes/circulars._archive._index/route.tsx b/app/routes/circulars._archive._index/route.tsx
index 09a1c562d..aa728e4a9 100644
--- a/app/routes/circulars._archive._index/route.tsx
+++ b/app/routes/circulars._archive._index/route.tsx
@@ -85,10 +85,7 @@ export default function () {
   const [inputDateLte, setInputDateLte] = useState(endDate)
   const [showContent, setShowContent] = useState(false)
   const [showDateRange, setShowDateRange] = useState(false)
-  const clean =
-    inputQuery === query &&
-    inputDateGte === startDate &&
-    inputDateLte === endDate
+  const clean = inputQuery === query
 
   const submit = useSubmit()
 

From 28551c78b574bbf9335c1c17b22228effc586d31 Mon Sep 17 00:00:00 2001
From: Tyler Barna <57914086+tylerbarna@users.noreply.github.com>
Date: Tue, 17 Oct 2023 12:13:26 -0400
Subject: [PATCH 53/55] Update app/routes/circulars._archive._index/route.tsx

Co-authored-by: Leo Singer <leo.p.singer@nasa.gov>
---
 app/routes/circulars._archive._index/route.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/routes/circulars._archive._index/route.tsx b/app/routes/circulars._archive._index/route.tsx
index aa728e4a9..5ddf22d8d 100644
--- a/app/routes/circulars._archive._index/route.tsx
+++ b/app/routes/circulars._archive._index/route.tsx
@@ -89,7 +89,7 @@ export default function () {
 
   const submit = useSubmit()
 
-  const setFuzzyTime = (startDate?: string) => {
+  function setFuzzyTime(startDate?: string) {
     if (startDate === 'custom') {
       setShowDateRange(true)
     } else {

From c248cba8453d7526b4a7ad75fc55cf38d0567e47 Mon Sep 17 00:00:00 2001
From: tylerbarna <tylerpbarna@gmail.com>
Date: Tue, 17 Oct 2023 11:10:09 -0500
Subject: [PATCH 54/55] reuse searchParams

---
 app/routes/circulars._archive._index/route.tsx | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/routes/circulars._archive._index/route.tsx b/app/routes/circulars._archive._index/route.tsx
index 5ddf22d8d..fafbe18c1 100644
--- a/app/routes/circulars._archive._index/route.tsx
+++ b/app/routes/circulars._archive._index/route.tsx
@@ -101,12 +101,11 @@ export default function () {
 
   function setDateRange() {
     setShowContent(false)
-    const params = new URLSearchParams(location.search)
-    if (inputDateGte) params.set('startDate', inputDateGte)
-    else params.delete('startDate')
-    if (inputDateLte) params.set('endDate', inputDateLte)
-    else params.delete('endDate')
-    submit(params, {
+    if (inputDateGte) searchParams.set('startDate', inputDateGte)
+    else searchParams.delete('startDate')
+    if (inputDateLte) searchParams.set('endDate', inputDateLte)
+    else searchParams.delete('endDate')
+    submit(searchParams, {
       method: 'get',
       action: '/circulars',
     })

From c9266c7804380f15401426ec8519481bdd2c6142 Mon Sep 17 00:00:00 2001
From: tylerbarna <tylerpbarna@gmail.com>
Date: Tue, 17 Oct 2023 11:22:22 -0500
Subject: [PATCH 55/55] remove conditional from setFuzzyTime

---
 app/routes/circulars._archive._index/route.tsx | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/routes/circulars._archive._index/route.tsx b/app/routes/circulars._archive._index/route.tsx
index fafbe18c1..58e7d8fff 100644
--- a/app/routes/circulars._archive._index/route.tsx
+++ b/app/routes/circulars._archive._index/route.tsx
@@ -90,12 +90,8 @@ export default function () {
   const submit = useSubmit()
 
   function setFuzzyTime(startDate?: string) {
-    if (startDate === 'custom') {
-      setShowDateRange(true)
-    } else {
-      setShowDateRange(false)
-      setInputDateGte(startDate)
-    }
+    setShowDateRange(false)
+    setInputDateGte(startDate)
     setInputDateLte('')
   }