release: 2024-06-28 (#1311)

.github/workflows/codeql.yml

@@ -25,6 +25,6 @@ jobs:
       - name: ⤵️ Check out code from GitHub
         uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
       - name: 🏗 Initialize CodeQL
-        uses: github/codeql-action/init@530d4feaa9c62aaab2d250371e2061eb7a172363 # v3
+        uses: github/codeql-action/init@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3
       - name: 🚀 Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@530d4feaa9c62aaab2d250371e2061eb7a172363 # v3
+        uses: github/codeql-action/analyze@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3

.github/workflows/crowdin.yml

@@ -122,7 +122,7 @@ jobs:
       - name: Commit files
         id: commit-files
         if: ((github.event_name != 'pull_request' && github.ref_name == 'dev') || github.event_name == 'scheduled') && steps.verify-changed-files.outputs.files_changed
-        uses: peter-evans/create-pull-request@6d6857d36972b65feb161a90e484f2984215f83e # v6
+        uses: peter-evans/create-pull-request@c5a7806660adbe173f04e3e038b0ccdcd758773c # v6
         with:
           token: ${{ secrets.GH_ACT_PAT }}
           commit-message: Updated translations from Crowdin

.github/workflows/njsscan.yml

@@ -37,6 +37,6 @@ jobs:
         with:
           args: '. --sarif --output results.sarif || true'
       - name: Upload njsscan report
-        uses: github/codeql-action/upload-sarif@530d4feaa9c62aaab2d250371e2061eb7a172363 # v3
+        uses: github/codeql-action/upload-sarif@23acc5c183826b7a8a97bce3cecc52db901f8251 # v3
         with:
           sarif_file: results.sarif

.nvmrc

@@ -1 +1 @@
-20.14.0
+20.15.0

InReach.code-workspace

@@ -202,6 +202,7 @@
 			"**/zod-schemas/**": true,
 			"**/.turbo/**": true,
 			"**/generated/**": true,
+			"_queries/**": true,
 		},
 		"search.exclude": {
 			"**/node_modules": true,

apps/app/next.config.mjs

@@ -20,6 +20,7 @@ jiti('../../packages/env')
 
 const isVercelActiveDev = process.env.VERCEL_ENV === 'preview' && process.env.VERCEL_GIT_COMMIT_REF !== 'dev'
 const isVercelProd = process.env.VERCEL_ENV === 'production'
+const isVercelStaging = process.env.VERCEL_ENV === 'preview' && process.env.VERCEL_GIT_COMMIT_REF === 'dev'
 const isLocalDev =
 	process.env.NODE_ENV === 'development' && !['preview', 'production'].includes(process.env.VERCEL_ENV)
 const shouldAnalyze = process.env.ANALYZE === 'true'
@@ -56,10 +57,10 @@ const nextConfig = {
 		serverComponentsExternalPackages: ['@sentry/profiling-node'],
 	},
 	eslint: {
-		ignoreDuringBuilds: !(isVercelProd || isRenovatePR),
+		ignoreDuringBuilds: !(isVercelProd || isRenovatePR || isVercelStaging),
 	},
 	typescript: {
-		ignoreBuildErrors: !(isVercelProd || isRenovatePR),
+		ignoreBuildErrors: !(isVercelProd || isRenovatePR || isVercelStaging),
 	},
 	images: {
 		remotePatterns: [{ protocol: 'https', hostname: '**.4sqi.net' }],

apps/app/package.json

@@ -39,21 +39,21 @@
 		"@next/bundle-analyzer": "14.2.4",
 		"@next/third-parties": "14.2.4",
 		"@opentelemetry/api": "1.9.0",
-		"@opentelemetry/core": "1.25.0",
-		"@opentelemetry/exporter-trace-otlp-http": "0.52.0",
-		"@opentelemetry/resources": "1.25.0",
-		"@opentelemetry/sdk-node": "0.52.0",
-		"@opentelemetry/sdk-trace-base": "1.25.0",
-		"@opentelemetry/sdk-trace-node": "1.25.0",
-		"@opentelemetry/semantic-conventions": "1.25.0",
-		"@prisma/instrumentation": "5.15.0",
-		"@sentry/browser": "7.117.0",
+		"@opentelemetry/core": "1.25.1",
+		"@opentelemetry/exporter-trace-otlp-http": "0.52.1",
+		"@opentelemetry/resources": "1.25.1",
+		"@opentelemetry/sdk-node": "0.52.1",
+		"@opentelemetry/sdk-trace-base": "1.25.1",
+		"@opentelemetry/sdk-trace-node": "1.25.1",
+		"@opentelemetry/semantic-conventions": "1.25.1",
+		"@prisma/instrumentation": "5.16.1",
+		"@sentry/browser": "7.118.0",
 		"@sentry/integrations": "7.114.0",
-		"@sentry/nextjs": "7.117.0",
-		"@sentry/node": "7.117.0",
-		"@sentry/opentelemetry": "7.117.0",
+		"@sentry/nextjs": "7.118.0",
+		"@sentry/node": "7.118.0",
+		"@sentry/opentelemetry": "7.118.0",
 		"@sentry/opentelemetry-node": "7.114.0",
-		"@sentry/profiling-node": "7.117.0",
+		"@sentry/profiling-node": "7.118.0",
 		"@tanstack/react-query": "4.36.1",
 		"@tanstack/react-table": "8.17.3",
 		"@trpc/client": "10.45.2",
@@ -93,49 +93,49 @@
 		"next-i18next": "15.3.0",
 		"next-seo": "6.5.0",
 		"nextjs-google-analytics": "2.3.3",
-		"nextjs-routes": "2.2.0",
+		"nextjs-routes": "2.2.1",
 		"object-sizeof": "2.6.4",
 		"pretty-bytes": "6.1.1",
 		"react": "18.3.1",
 		"react-dom": "18.3.1",
 		"react-error-boundary": "4.0.13",
 		"react-hook-consent": "3.5.3",
-		"react-hook-form": "7.51.5",
+		"react-hook-form": "7.52.0",
 		"react-hook-form-mantine": "2.0.0",
 		"react-i18next": "14.1.2",
 		"zod": "3.23.8"
 	},
 	"devDependencies": {
 		"@hookform/devtools": "4.3.1",
-		"@playwright/test": "1.44.1",
-		"@prisma/nextjs-monorepo-workaround-plugin": "5.15.0",
+		"@playwright/test": "1.45.0",
+		"@prisma/nextjs-monorepo-workaround-plugin": "5.16.1",
 		"@relative-ci/agent": "4.2.8",
 		"@tanstack/react-query-devtools": "4.36.1",
 		"@tanstack/react-table-devtools": "8.17.3",
 		"@total-typescript/ts-reset": "0.5.1",
 		"@types/eslint": "8.56.10",
 		"@types/gtag.js": "0.0.20",
 		"@types/luxon": "3.4.2",
-		"@types/node": "20.14.2",
+		"@types/node": "20.14.9",
 		"@types/react": "18.3.3",
 		"@types/react-dom": "18.3.0",
-		"@typescript-eslint/eslint-plugin": "7.13.0",
-		"@typescript-eslint/parser": "7.13.0",
+		"@typescript-eslint/eslint-plugin": "7.14.1",
+		"@typescript-eslint/parser": "7.14.1",
 		"@weareinreach/config": "workspace:*",
 		"@weareinreach/eslint-config": "workspace:*",
-		"@welldone-software/why-did-you-render": "8.0.1",
+		"@welldone-software/why-did-you-render": "8.0.3",
 		"commander": "12.1.0",
 		"dotenv": "16.4.5",
 		"eslint": "8.57.0",
 		"eslint-plugin-i18next": "6.0.3",
 		"i18next-hmr": "3.1.2",
 		"jiti": "1.21.6",
-		"listr2": "8.2.1",
+		"listr2": "8.2.3",
 		"prettier": "3.3.2",
 		"trpc-panel": "1.3.4",
 		"trpc-playground": "1.0.4",
-		"type-fest": "4.20.0",
-		"typescript": "5.4.5",
+		"type-fest": "4.20.1",
+		"typescript": "5.5.2",
 		"webpack-bundle-analyzer": "4.10.2"
 	},
 	"ct3aMetadata": {

apps/app/public/locales/en/attribute.json

@@ -68,8 +68,14 @@
 	},
 	"cost": {
 		"CATEGORYNAME": "Cost",
+		"cost-accepts-insurance": "This service accepts insurance",
+		"cost-accepts-insurance_default": "This service accepts insurance. Contact the organization directly for more information on cost, financial assistance options and insurance coverage details.",
+		"cost-accepts-insurance_withUrl": "This service accepts insurance. <Link href=\"{{url}}\">Click here to visit the organization's page</Link> for more information on cost, financial assistance options and insurance coverage details.",
 		"cost-fees": "Incurs a cost",
-		"cost-free": "Free of cost"
+		"cost-free": "Free of cost",
+		"cost-sliding-scale": "Costs determined on a sliding scale",
+		"cost-sliding-scale_default": "This service has sliding scale fees. The amount you pay for services is adjusted according to your income level. Contact the organization directly for more information.",
+		"cost-sliding-scale_withUrl": "This service has sliding scale fees. The amount you pay for services is adjusted according to your income level. <Link href=\"{{url}}\">Click here to visit the organization's page for more information.</Link>"
 	},
 	"crisis-support-community": {
 		"elders": "Elders",
@@ -101,6 +107,7 @@
 		"bipoc-led": "BIPOC-led",
 		"black-led": "Black-led",
 		"immigrant-led": "Immigrant-led",
+		"lgbtq-led": "LGBTQ+ Led",
 		"trans-led": "Transgender-led",
 		"women-led": "Women-led"
 	},

apps/app/public/locales/en/common.json

@@ -15,9 +15,6 @@
 	"alert-message-1": "<strong>COVID-19 policy:</strong> With news and best practices for COVID-19 prevention changing rapidly each day, Whitman-Walker Health continues to update their services to reflect prevention recommendations. Please check their website for the most up-to-date information.",
 	"alert-message-instructions": "Enter the alert message",
 	"alert-title-instructions": "Enter a title for the message...",
-	"alerts": {
-		"search-page-legislative-map": "This <ATLink>anti-trans legislative risk map</ATLink> shows the 2-year risk for anti-trans laws in all 50 states and D.C."
-	},
 	"all-service-category": "All {{serviceCategory}}",
 	"anti-hate": {
 		"body": "By using InReach, you agree that you will not use this resource information for harmful, hate-based, homophobic, transphobic, xenophobic, and/or racist agendas or commentary.",

apps/app/public/locales/en/services.json

@@ -32,20 +32,34 @@
 		"educational-support-for-lgbtq-youth": "Educational support for LGBTQ youth",
 		"english-classes": "English classes",
 		"language-classes": "Language classes",
-		"leadership-training-and-professional-development": "Leadership training and professional development",
 		"libraries": "Libraries",
-		"scholarships": "Scholarships"
+		"scholarships": "Scholarships",
+		"training-and-professional-development": "Training and professional development"
+	},
+	"financial-assistance": {
+		"CATEGORYNAME": "Financial Assistance",
+		"bail-funds": "Bail Funds",
+		"healthcare-and-insurance": "Healthcare and insurance",
+		"housing-and-utilities": "Housing and utilities",
+		"legal-fees": "Legal fees",
+		"moving-and-domestic-relocation": "Moving and domestic relocation",
+		"mutual-aid": "Mutual Aid"
 	},
 	"food": {
 		"CATEGORYNAME": "Food",
-		"food": "Food",
-		"food-assistance": "Food assistance"
+		"community-meals": "Community meals",
+		"food-assistance": "Food assistance",
+		"food-delivery": "Food delivery",
+		"food-pantries": "Food pantries",
+		"nutrition-education": "Nutrition education"
 	},
 	"housing": {
 		"CATEGORYNAME": "Housing",
+		"drop-in-centers": "Drop-in centers",
 		"drop-in-centers-for-lgbtq-youth": "Drop-in centers for LGBTQ youth",
 		"emergency-housing": "Emergency housing",
 		"housing-information-and-referrals": "Housing information and referrals",
+		"mail-services": "Mail services",
 		"short-term-housing": "Short-term housing",
 		"trans-housing": "Trans housing"
 	},
@@ -71,7 +85,8 @@
 		"deferred-action-for-childhood-arrivals-daca": "Deferred Action for Childhood Arrivals (DACA)",
 		"deportation-or-removal": "Deportation or removal",
 		"employment-authorization": "Employment authorization",
-		"family-petitions": "Family petitions",
+		"family-based-immigration": "Family-based immigration",
+		"family-law": "Family law",
 		"immigration-detention": "Immigration detention",
 		"legal-advice": "Legal advice",
 		"legal-hotlines": "Legal hotlines",
@@ -83,18 +98,19 @@
 		"u-visa": "U visa"
 	},
 	"mail": {
-		"CATEGORYNAME": "Mail",
-		"mail": "Mail"
+		"CATEGORYNAME": "Mail"
 	},
 	"medical": {
 		"CATEGORYNAME": "Medical",
 		"covid-19-services": "COVID-19 services",
 		"dental-care": "Dental care",
+		"fertility-and-family-planning-services": "Fertility and family planning services",
 		"hiv-and-sexual-health": "HIV and sexual health",
 		"medical-clinics": "Medical clinics",
 		"obgyn-services": "OBGYN services",
 		"physical-evaluations-for-asylum-claim": "Physical evaluations for asylum claim",
 		"physical-evaluations-for-refugee-claim": "Physical evaluations for refugee claim",
+		"substance-use": "Substance use",
 		"trans-health": "Trans health",
 		"trans-health-gender-affirming-surgery": "Trans health - gender affirming surgery",
 		"trans-health-hormone-and-surgery-letters": "Trans health - hormone and surgery letters",
@@ -106,6 +122,7 @@
 	"mental-health": {
 		"CATEGORYNAME": "Mental Health",
 		"bipoc-support-groups": "BIPOC support groups",
+		"family-support-groups": "Family support groups",
 		"hotlines": "Hotlines",
 		"private-therapy-and-counseling": "Private therapy and counseling",
 		"psychological-evaluations-for-asylum-claim": "Psychological evaluations for asylum claim",
@@ -119,6 +136,7 @@
 	"sports-and-entertainment": {
 		"CATEGORYNAME": "Entertainment and Activities",
 		"art-music-literature": "Art, music, and literature",
+		"camps-and-excursions": "Camps and excursions",
 		"sports-and-entertainment": "Sports and entertainment"
 	},
 	"trans-focused-services": {

apps/app/src/pages/search/[...params]/index.tsx

@@ -1,6 +1,5 @@
 /* eslint-disable i18next/no-literal-string */
 import {
-	Box,
 	createStyles,
 	Divider,
 	Grid,
@@ -16,13 +15,14 @@ import compare from 'just-compare'
 import dynamic from 'next/dynamic'
 import Head from 'next/head'
 import { useRouter } from 'next/router'
-import { Trans, useTranslation } from 'next-i18next'
+import { useTranslation } from 'next-i18next'
 import { type GetServerSideProps } from 'nextjs-routes'
-import { type JSX, memo, useCallback, useEffect, useMemo, useState } from 'react'
+import { type JSX, memo, useEffect, useMemo, useState } from 'react'
 import { z } from 'zod'
 
 import { SearchParamsSchema } from '@weareinreach/api/schemas/routes/search'
 import { type ApiOutput, trpcServerClient } from '@weareinreach/api/trpc'
+import { LocationBasedAlertBanner } from '@weareinreach/ui/components/core/LocationBasedAlertBanner'
 import { Pagination } from '@weareinreach/ui/components/core/Pagination'
 import { SearchBox } from '@weareinreach/ui/components/core/SearchBox'
 import { SearchResultCard } from '@weareinreach/ui/components/core/SearchResultCard'
@@ -33,7 +33,6 @@ import { useSearchState } from '@weareinreach/ui/hooks/useSearchState'
 import { api } from '~app/utils/api'
 import { getSearchResultPageCount, SEARCH_RESULT_PAGE_SIZE } from '~app/utils/constants'
 import { getServerSideTranslations } from '~app/utils/i18n'
-import { Link } from '~ui/components/core/Link'
 
 const MoreFilter = dynamic(() => import('@weareinreach/ui/modals/MoreFilter').then((mod) => mod.MoreFilter))
 const ServiceFilter = dynamic(() =>
@@ -213,10 +212,6 @@ const SearchResults = () => {
 		// eslint-disable-next-line react-hooks/exhaustive-deps
 	}, [])
 
-	const handleResetInitialValue = useCallback(() => {
-		searchStateActions.setSearchTerm('')
-	}, [searchStateActions])
-
 	if (error) {
 		return <>Error</>
 	}
@@ -227,26 +222,9 @@ const SearchResults = () => {
 			<Head>
 				<title>{t('page-title.base', { ns: 'common', title: '$t(page-title.search-results)' })}</title>
 			</Head>
-			{showAlertMessage && (
-				<Box className={classes.banner}>
-					<Text variant={variants.Text.utility1white}>
-						<Trans
-							i18nKey='alerts.search-page-legislative-map'
-							ns='common'
-							components={{
-								ATLink: (
-									<Link
-										external
-										variant={variants.Link.inheritStyle}
-										href='https://www.erininthemorning.com/p/anti-trans-legislative-risk-assessment-2a4'
-										target='_blank'
-									></Link>
-								),
-							}}
-						/>
-					</Text>
-				</Box>
-			)}
+
+			<LocationBasedAlertBanner lat={lat} lon={lon} type='primary' />
+
 			<Grid.Col
 				xs={12}
 				sm={12}
@@ -259,11 +237,14 @@ const SearchResults = () => {
 							type='location'
 							loadingManager={{ setLoading: setLoadingPage, isLoading: loadingPage }}
 							initialValue={searchState.searchTerm}
-							resetInitialValue={handleResetInitialValue}
 						/>
 					</Group>
 					<Group noWrap w={{ base: '100%', md: '50%' }}>
-						<ServiceFilter resultCount={resultCount} isFetching={searchIsFetching} />
+						<ServiceFilter
+							resultCount={resultCount}
+							isFetching={searchIsFetching}
+							current={searchState.services}
+						/>
 						{/* @ts-expect-error `component` prop not needed.. */}
 						<MoreFilter resultCount={resultCount} isFetching={searchIsFetching}>
 							{t('more.filters')}
@@ -292,6 +273,7 @@ const SearchResults = () => {
 					<NoResults crisisData={crisisResults} />
 				) : (
 					<>
+						<LocationBasedAlertBanner lat={lat} lon={lon} type='secondary' />
 						{resultDisplay}
 						<Pagination total={getSearchResultPageCount(data?.resultCount)} />
 					</>

apps/app/src/types/nextjs-routes.d.ts

@@ -1,6 +1,6 @@
 // THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
 // This file will be automatically regenerated when your Next.js server is running.
-// nextjs-routes version: 2.2.0
+// nextjs-routes version: 2.2.1
 /* eslint-disable */
 
 // prettier-ignore