Skip to content

Commit

Permalink
release: 2024-07-29 (#1350)
Browse files Browse the repository at this point in the history
  • Loading branch information
kodiakhq[bot] authored Jul 29, 2024
2 parents e9ee27b + fb41e18 commit a475dcd
Show file tree
Hide file tree
Showing 46 changed files with 1,812 additions and 1,458 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/chromatic.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ jobs:

# 👇 Runs Chromatic CLI in ./packages/ui
- name: Publish to Chromatic
uses: chromaui/action@fbf458b6cd4dfd06cf25c06e937bea66b93a0587 # v11
uses: chromaui/action@13180b77f984a874c7a7eca8b35027d6e613e8c2 # v11
with:
workingDir: packages/ui
projectToken: ${{ secrets.CHROMATIC_PROJECT_TOKEN }}
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3
uses: github/codeql-action/init@5cf07d8b700b67e235fbb65cbc84f69c0cf10464 # v3
- name: 🚀 Perform CodeQL Analysis
uses: github/codeql-action/analyze@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3
uses: github/codeql-action/analyze@5cf07d8b700b67e235fbb65cbc84f69c0cf10464 # v3
2 changes: 1 addition & 1 deletion .github/workflows/njsscan.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ jobs:
with:
args: '. --sarif --output results.sarif || true'
- name: Upload njsscan report
uses: github/codeql-action/upload-sarif@4fa2a7953630fd2f3fb380f21be14ede0169dd4f # v3
uses: github/codeql-action/upload-sarif@5cf07d8b700b67e235fbb65cbc84f69c0cf10464 # v3
with:
sarif_file: results.sarif
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.15.1
20.16.0
26 changes: 13 additions & 13 deletions apps/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"with-env": "dotenv -e ../../.env --"
},
"dependencies": {
"@emotion/react": "11.12.0",
"@emotion/react": "11.13.0",
"@emotion/server": "11.11.0",
"@hookform/resolvers": "3.9.0",
"@mantine/carousel": "6.0.22",
Expand All @@ -47,11 +47,11 @@
"@opentelemetry/sdk-trace-node": "1.25.1",
"@opentelemetry/semantic-conventions": "1.25.1",
"@prisma/instrumentation": "5.17.0",
"@sentry/browser": "8.19.0",
"@sentry/nextjs": "8.19.0",
"@sentry/node": "8.19.0",
"@sentry/opentelemetry": "8.19.0",
"@sentry/profiling-node": "8.19.0",
"@sentry/browser": "8.20.0",
"@sentry/nextjs": "8.20.0",
"@sentry/node": "8.20.0",
"@sentry/opentelemetry": "8.20.0",
"@sentry/profiling-node": "8.20.0",
"@tanstack/react-query": "4.36.1",
"@tanstack/react-table": "8.19.3",
"@trpc/client": "10.45.2",
Expand Down Expand Up @@ -105,20 +105,20 @@
},
"devDependencies": {
"@hookform/devtools": "4.3.1",
"@playwright/test": "1.45.2",
"@playwright/test": "1.45.3",
"@prisma/nextjs-monorepo-workaround-plugin": "5.17.0",
"@relative-ci/agent": "4.2.9",
"@tanstack/react-query-devtools": "4.36.1",
"@tanstack/react-table-devtools": "8.19.3",
"@total-typescript/ts-reset": "0.5.1",
"@types/eslint": "8.56.10",
"@types/eslint": "8.56.11",
"@types/gtag.js": "0.0.20",
"@types/luxon": "3.4.2",
"@types/node": "20.14.11",
"@types/node": "20.14.12",
"@types/react": "18.3.3",
"@types/react-dom": "18.3.0",
"@typescript-eslint/eslint-plugin": "7.16.1",
"@typescript-eslint/parser": "7.16.1",
"@typescript-eslint/eslint-plugin": "7.17.0",
"@typescript-eslint/parser": "7.17.0",
"@weareinreach/config": "workspace:*",
"@weareinreach/eslint-config": "workspace:*",
"@welldone-software/why-did-you-render": "8.0.3",
Expand All @@ -132,8 +132,8 @@
"prettier": "3.3.3",
"trpc-panel": "1.3.4",
"trpc-playground": "1.0.4",
"type-fest": "4.22.1",
"typescript": "5.5.3",
"type-fest": "4.23.0",
"typescript": "5.5.4",
"webpack-bundle-analyzer": "4.10.2"
},
"ct3aMetadata": {
Expand Down
2 changes: 2 additions & 0 deletions apps/app/public/locales/en/services.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
},
"community-support": {
"CATEGORYNAME": "Community Support",
"advocacy-and-community-organizing": "Advocacy and Community Organizing",
"community-social-groups": "Community and social groups",
"cultural-centers": "Cultural centers",
"lgbtq-centers": "LGBTQ centers",
Expand Down Expand Up @@ -93,6 +94,7 @@
"name-and-gender-change": "Name and gender marker change",
"refugee-claim": "Refugee claim",
"residency": "Residency",
"self-advocacy-information": "Self-Advocacy Information",
"special-immigrant-juvenile-status-sijs": "Special Immigrant Juvenile Status (SIJS)",
"t-visa": "T visa",
"u-visa": "U visa"
Expand Down
18 changes: 9 additions & 9 deletions apps/app/public/locales/ht/attribute.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,22 +68,22 @@
},
"cost": {
"CATEGORYNAME": "Pri",
"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-accepts-insurance": "Sevis sa a aksepte asirans",
"cost-accepts-insurance_default": "Sevis sa a aksepte asirans. Kontakte òganizasyon an dirèkteman pou plis enfòmasyon sou pri, opsyon asistans finansye ak detay sou kouvèti asirans.",
"cost-accepts-insurance_withUrl": "Sevis sa a aksepte asirans. <Link href=\"{{url}}\">Klike la pou vizite paj òganizasyon an</Link> pou plis enfòmasyon sou pri, opsyon asistans finansye ak detay sou kouvèti asirans.",
"cost-fees": "Bay yon pri",
"cost-free": "Gratis nan pri",
"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>"
"cost-sliding-scale": "Pri yo detèmine sou yon echèl glisman",
"cost-sliding-scale_default": "Sevis sa a gen frè selon yon echèl glisman. Kantite lajan ou peye pou sèvis yo ajiste selon nivo revni ou. Kontakte òganizasyon an dirèkteman pou plis enfòmasyon.",
"cost-sliding-scale_withUrl": "Sevis sa a gen frè selon yon echèl glisman. Kantite lajan ou peye pou sèvis yo ajiste selon nivo revni ou. <Link href=\"{{url}}\">Klike la pou vizite paj òganizasyon an pou plis enfòmasyon.</Link>"
},
"crisis-support-community": {
"elders": "Granmoun yo",
"general-lgbtq": "LGBTQ+ Jeneral"
},
"eligibility": {
"CATEGORYNAME": "Kondisyon pou Kalifikasyon",
"elig-age": "Age eligibility",
"elig-age": "Kondisyon laj",
"elig-age_max": "Anba {{max}}",
"elig-age_min": "{{min}} ak plis",
"elig-age_range": "{{min}} - {{max}}",
Expand All @@ -107,7 +107,7 @@
"bipoc-led": "Dirije pa BIPOC",
"black-led": "Nwa-dirije",
"immigrant-led": "Imigran dirije",
"lgbtq-led": "LGBTQ+ Led",
"lgbtq-led": "Dirije pa LGBTQ+",
"trans-led": "Dirije pa transèksyèl",
"women-led": "Dirije pa Fanm"
},
Expand Down Expand Up @@ -148,7 +148,7 @@
"incompatible-info": "Enfòmasyon enkonpatib"
},
"tpop": {
"other": "Target Population - Other"
"other": "Popilasyon Sib - Lòt"
},
"userlawpractice": {
"CATEGORYNAME": "Opsyon Pratike Lalwa",
Expand Down
8 changes: 4 additions & 4 deletions apps/web/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
},
"dependencies": {
"@crowdin/ota-client": "1.0.0",
"@emotion/react": "11.12.0",
"@emotion/react": "11.13.0",
"@emotion/server": "11.11.0",
"@mantine/carousel": "6.0.22",
"@mantine/core": "6.0.22",
Expand All @@ -35,13 +35,13 @@
},
"devDependencies": {
"@next/bundle-analyzer": "14.2.5",
"@types/eslint": "8.56.10",
"@types/node": "20.14.11",
"@types/eslint": "8.56.11",
"@types/node": "20.14.12",
"@types/react": "18.3.3",
"@types/react-dom": "18.3.0",
"@weareinreach/config": "workspace:*",
"@weareinreach/eslint-config": "workspace:*",
"eslint": "8.57.0",
"typescript": "5.5.3"
"typescript": "5.5.4"
}
}
8 changes: 4 additions & 4 deletions lambdas/cognito-messaging/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@
"@aws-lambda-powertools/logger": "1.18.1"
},
"devDependencies": {
"@types/aws-lambda": "8.10.141",
"@types/eslint": "8.56.10",
"@types/node": "20.14.11",
"@types/aws-lambda": "8.10.142",
"@types/eslint": "8.56.11",
"@types/node": "20.14.12",
"@vercel/ncc": "0.38.1",
"@weareinreach/config": "workspace:*",
"@weareinreach/eslint-config": "workspace:*",
"aws-lambda": "1.0.7",
"eslint": "8.57.0",
"prettier": "3.3.3",
"typescript": "5.5.3"
"typescript": "5.5.4"
}
}
8 changes: 4 additions & 4 deletions lambdas/cognito-user-migrate/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,16 @@
"@weareinreach/db": "workspace:*"
},
"devDependencies": {
"@types/aws-lambda": "8.10.141",
"@types/eslint": "8.56.10",
"@types/node": "20.14.11",
"@types/aws-lambda": "8.10.142",
"@types/eslint": "8.56.11",
"@types/node": "20.14.12",
"@vercel/ncc": "0.38.1",
"@weareinreach/config": "workspace:*",
"@weareinreach/eslint-config": "workspace:*",
"aws-lambda": "1.0.7",
"eslint": "8.57.0",
"prettier": "3.3.3",
"prisma": "5.17.0",
"typescript": "5.5.3"
"typescript": "5.5.4"
}
}
16 changes: 8 additions & 8 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -39,31 +39,31 @@
},
"devDependencies": {
"@changesets/cli": "2.27.7",
"@turbo/gen": "2.0.7",
"@turbo/gen": "2.0.9",
"@types/lint-staged": "13.3.0",
"@types/node": "20.14.11",
"@types/node": "20.14.12",
"@types/yargs": "17.0.32",
"@weareinreach/config": "workspace:*",
"@weareinreach/eslint-config": "workspace:*",
"boxen": "8.0.0",
"docker-compose": "0.24.8",
"dotenv": "16.4.5",
"dotenv-expand": "11.0.6",
"husky": "9.1.1",
"knip": "5.26.0",
"husky": "9.1.2",
"knip": "5.27.0",
"lint-staged": "15.2.7",
"prettier": "3.3.3",
"prettier-plugin-jsdoc": "1.3.0",
"prettier-plugin-packagejson": "2.5.1",
"prettier-plugin-prisma": "5.0.0",
"sherif": "0.10.0",
"tsx": "4.16.2",
"turbo": "2.0.7",
"typescript": "5.5.3",
"typesync": "0.12.2",
"turbo": "2.0.9",
"typescript": "5.5.4",
"typesync": "0.13.0",
"yargs": "17.7.2"
},
"packageManager": "pnpm@9.5.0",
"packageManager": "pnpm@9.6.0",
"engines": {
"node": "^20.12.2",
"pnpm": "^9.0.0"
Expand Down
8 changes: 4 additions & 4 deletions packages/analytics/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,16 @@
"just-compact": "3.2.0"
},
"devDependencies": {
"@types/eslint": "8.56.10",
"@types/eslint": "8.56.11",
"@types/gtag.js": "0.0.20",
"@types/node": "20.14.11",
"@types/node": "20.14.12",
"@weareinreach/config": "workspace:*",
"@weareinreach/eslint-config": "workspace:*",
"eslint": "8.57.0",
"next": "14.2.5",
"nextjs-google-analytics": "2.3.3",
"type-fest": "4.22.1",
"typescript": "5.5.3"
"type-fest": "4.23.0",
"typescript": "5.5.4"
},
"peerDependencies": {
"next": "14.2.5",
Expand Down
14 changes: 7 additions & 7 deletions packages/api/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"dependencies": {
"@googlemaps/google-maps-services-js": "3.4.0",
"@opentelemetry/api": "1.9.0",
"@sentry/nextjs": "8.19.0",
"@sentry/nextjs": "8.20.0",
"@tanstack/react-query": "4.36.1",
"@terraformer/wkt": "2.2.1",
"@trpc/client": "10.45.2",
Expand Down Expand Up @@ -53,11 +53,11 @@
"zod": "3.23.8"
},
"devDependencies": {
"@turbo/gen": "2.0.7",
"@types/eslint": "8.56.10",
"@types/google.maps": "3.55.11",
"@turbo/gen": "2.0.9",
"@types/eslint": "8.56.11",
"@types/google.maps": "3.55.12",
"@types/luxon": "3.4.2",
"@types/node": "20.14.11",
"@types/node": "20.14.12",
"@types/terraformer__wkt": "2.0.3",
"@weareinreach/config": "workspace:*",
"@weareinreach/eslint-config": "workspace:*",
Expand All @@ -69,8 +69,8 @@
"next": "14.2.5",
"prettier": "3.3.3",
"trpc-panel": "1.3.4",
"type-fest": "4.22.1",
"typescript": "5.5.3"
"type-fest": "4.23.0",
"typescript": "5.5.4"
},
"peerDependencies": {
"i18next": "23.12.2",
Expand Down
7 changes: 5 additions & 2 deletions packages/api/router/component/query.ServiceSelect.handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,22 +6,25 @@ const ServiceSelect = async ({ ctx: _ctx }: TRPCHandlerParams) => {
try {
const result = await prisma.serviceCategory.findMany({
where: {
active: true,
// active: true,
OR: [{ crisisSupportOnly: null }, { crisisSupportOnly: false }],
},
select: {
// id: true,
tsKey: true,
// tsNs: true,
active: true,
services: {
where: {
active: true,
// active: true,
},
select: {
active: true,
serviceTag: {
select: {
id: true,
tsKey: true,
active: true,
// tsNs: true,
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,14 @@ const validateJsonSchema = (schema: unknown): schema is JSONSchemaType<unknown>
}

const attributesByCategory = async ({ input }: TRPCHandlerParams<TAttributesByCategorySchema>) => {
console.log(input)
const { attributeActive, categoryActive } = input ?? { attributeActive: true, categoryActive: true }

const result = await prisma.attributesByCategory.findMany({
where: {
categoryName: Array.isArray(input?.categoryName) ? { in: input.categoryName } : input?.categoryName,
canAttachTo: input?.canAttachTo?.length ? { hasSome: input.canAttachTo } : undefined,
attributeActive: attributeActive ? attributeActive : undefined,
categoryActive: categoryActive ? categoryActive : undefined,
},
orderBy: [{ categoryName: 'asc' }, { attributeName: 'asc' }],
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ export const ZAttributesByCategorySchema = z
.object({
categoryName: z.string().or(z.string().array()).optional().describe('categoryName'),
canAttachTo: z.enum(['LOCATION', 'ORGANIZATION', 'SERVICE', 'USER']).array().optional(),
attributeActive: z.boolean().default(true),
categoryActive: z.boolean().default(true),
})
.optional()
export type TAttributesByCategorySchema = z.infer<typeof ZAttributesByCategorySchema>
Expand Down
2 changes: 1 addition & 1 deletion packages/api/router/orgEmail/mutation.update.handler.ts
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ const update = async ({ ctx, input }: TRPCHandlerParams<TUpdateSchema, 'protecte
id,
email,
...record,
description: updateDescriptionText?.upsert,
description: updateDescriptionText ? { create: updateDescriptionText.upsert.create } : undefined,
...(linkLocationId && {
locations: { createMany: { data: [{ orgLocationId: linkLocationId }], skipDuplicates: true } },
}),
Expand Down
Loading

1 comment on commit a475dcd

@vercel
Copy link

@vercel vercel bot commented on a475dcd Jul 29, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please sign in to comment.