appointment option in time filter, infer country when state is us/canada (code4recovery#443)

joshreisner · web-flow · commit 88b96cb85c3d · 2025-04-29T07:46:17.000-07:00
* add appointment filter to time dropdown, imfer usa when state is in usa

* include canada

* update comment

* remove test file for district 80

* bump dependencies

* fix tests

* bump node version in github action

* bump github action versions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,12 +11,12 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v4
 
       - name: Setup Node
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v4
         with:
-          node-version: '16'
+          node-version: '22'
           cache: 'npm'
       - run: npm install
       - run: npm run test-coverage
diff --git a/index.d.ts b/index.d.ts
@@ -47,7 +47,7 @@ interface TSMLReactConfig {
   strings: {
     [lang in Lang]: Translation;
   };
-  times: Array<'morning' | 'midday' | 'evening' | 'night'>;
+  times: Array<'morning' | 'midday' | 'evening' | 'night' | 'appointment'>;
   weekdays: string[];
 }
 
diff --git a/jest.setup.js b/jest.setup.js
@@ -1,5 +1,14 @@
 import '@testing-library/jest-dom/extend-expect';
 import React from 'react';
+import { TextEncoder, TextDecoder } from 'node:util';
+
+if (!global.TextEncoder) {
+  global.TextEncoder = TextEncoder;
+}
+
+if (!global.TextDecoder) {
+  global.TextDecoder = TextDecoder;
+}
 
 global.React = React;
 
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -49,7 +49,7 @@
     "react-dom": "^18.2.0",
     "react-infinite-scroller": "^1.2.6",
     "react-map-gl": "^7.1.7",
-    "react-router-dom": "^6.18.0",
+    "react-router-dom": "^7.5.2",
     "viewport-mercator-project": "^7.0.4"
   },
   "babel": {
diff --git a/public/app.js b/public/app.js
diff --git a/public/app.js.LICENSE.txt b/public/app.js.LICENSE.txt
@@ -41,29 +41,7 @@
  */
 
 /**
- * @remix-run/router v1.14.2
- *
- * Copyright (c) Remix Software Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE.md file in the root directory of this source tree.
- *
- * @license MIT
- */
-
-/**
- * React Router DOM v6.21.3
- *
- * Copyright (c) Remix Software Inc.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE.md file in the root directory of this source tree.
- *
- * @license MIT
- */
-
-/**
- * React Router v6.21.3
+ * react-router v7.5.3
  *
  * Copyright (c) Remix Software Inc.
  *
diff --git a/public/tests/river-cities.html b/public/tests/river-cities.html
@@ -0,0 +1,31 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
+    <meta name="description" content="React JS recovery meeting finder demo" />
+    <link rel="icon" type="image/png" href="/logo.png" />
+    <title>Meetings</title>
+    <style type="text/css">
+      body {
+        margin: 0;
+      }
+      #tsml-ui {
+        min-height: 100vh;
+        min-height: -webkit-fill-available;
+      }
+    </style>
+  </head>
+  <body>
+    <div
+      id="tsml-ui"
+      data-src="https://docs.google.com/spreadsheets/d/1lqDzi6bS8zJoWe2WuHNh4V-8nkn205ufgtRgvX9niiA/edit?gid=1811591486#gid=1811591486"
+      data-mapbox="pk.eyJ1Ijoiam9zaHJlaXNuZXIiLCJhIjoiY2tvYXA0YnZxMGRldDJxbzdta25uNGphdiJ9.eay-UKgIT99ALmdw08xBPw"
+      data-google="AIzaSyCS9M8Dqk5cMFqA7xvUrQEzT1u5IvcbT7c"
+    ></div>
+    <script src="/app.js" async></script>
+  </body>
+</html>
diff --git a/src/helpers/load-meeting-data.ts b/src/helpers/load-meeting-data.ts
@@ -5,6 +5,7 @@ import { formatAddress } from './format-address';
 import { formatConferenceProvider } from './format-conference-provider';
 import { formatFeedbackEmail } from './format-feedback-email';
 import { formatSlug } from './format-slug';
+import { states } from './states';
 
 import type { JSONData, JSONDataFlat, State, Meeting, Index } from '../types';
 
@@ -100,6 +101,15 @@ export function loadMeetingData(
 
     // creates formatted_address if necessary
     if (!formatted_address) {
+      // infer country if state is in Canada or USA
+      if (!meeting.country && meeting.state) {
+        if (states.canada.includes(meeting.state)) {
+          meeting.country = 'Canada';
+        } else if (states.usa.includes(meeting.state)) {
+          meeting.country = 'USA';
+        }
+      }
+
       formatted_address = [
         meeting.address,
         meeting.city,
@@ -321,6 +331,19 @@ export function loadMeetingData(
           }
         });
       }
+    } else {
+      const timeIndex = indexes.time.findIndex(
+        ({ key }) => key === 'appointment'
+      );
+      if (timeIndex === -1) {
+        indexes.time.push({
+          key: 'appointment',
+          name: strings.appointment,
+          slugs: [slug],
+        });
+      } else {
+        indexes.time[timeIndex].slugs.push(slug);
+      }
     }
 
     // parse regions
diff --git a/src/helpers/settings.ts b/src/helpers/settings.ts
@@ -91,7 +91,7 @@ export const defaults: TSMLReactConfig = {
     sk,
     sv,
   },
-  times: ['morning', 'midday', 'evening', 'night'],
+  times: ['morning', 'midday', 'evening', 'night', 'appointment'],
   weekdays: [
     'sunday',
     'monday',
diff --git a/src/helpers/states.ts b/src/helpers/states.ts
@@ -0,0 +1,78 @@
+export const states = {
+  canada: [
+    'AB',
+    'BC',
+    'MB',
+    'NB',
+    'NL',
+    'NT',
+    'NS',
+    'NU',
+    'ON',
+    'PE',
+    'QC',
+    'SK',
+    'YT',
+  ],
+  usa: [
+    'AL',
+    'AK',
+    'AS',
+    'AZ',
+    'AR',
+    'CA',
+    'CO',
+    'CT',
+    'DE',
+    'DC',
+    'FM',
+    'FL',
+    'GA',
+    'GU',
+    'HI',
+    'ID',
+    'IL',
+    'IN',
+    'IA',
+    'KS',
+    'KY',
+    'LA',
+    'ME',
+    'MH',
+    'MD',
+    'MA',
+    'MI',
+    'MN',
+    'MS',
+    'MO',
+    'MT',
+    'NE',
+    'NV',
+    'NH',
+    'NJ',
+    'NM',
+    'NY',
+    'NC',
+    'ND',
+    'MP',
+    'OH',
+    'OK',
+    'OR',
+    'PW',
+    'PA',
+    'PR',
+    'RI',
+    'SC',
+    'SD',
+    'TN',
+    'TX',
+    'UT',
+    'VT',
+    'VI',
+    'VA',
+    'WA',
+    'WV',
+    'WI',
+    'WY',
+  ],
+};
diff --git a/test/__tests__/load-meeting-data.spec.ts b/test/__tests__/load-meeting-data.spec.ts
@@ -82,7 +82,13 @@ describe('loadMeetingData', () => {
           slugs: ['test-meeting'],
         },
       ],
-      time: [],
+      time: [
+        {
+          key: 'appointment',
+          name: 'Appointment',
+          slugs: ['test-meeting', 'inactive-meeting'],
+        },
+      ],
       type: [
         {
           key: 'active',

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@ interface TSMLReactConfig {`
`47`	`47`	`strings: {`
`48`	`48`	`[lang in Lang]: Translation;`
`49`	`49`	`};`
`50`		`- times: Array<'morning' \| 'midday' \| 'evening' \| 'night'>;`
	`50`	`+ times: Array<'morning' \| 'midday' \| 'evening' \| 'night' \| 'appointment'>;`
`51`	`51`	`weekdays: string[];`
`52`	`52`	`}`
`53`	`53`