feat: add/link dropdowns (#1076)

* email to location linking dropdown menu * rollback & block t3-oss/[email protected] - bug * allow unpublished for elevated users * skip loading org specific i18n * phone to location linking dropdown * set published default to "true" on new item * audit log routes * api route handlers * generated data * consolidate api queries * Website add or link * SocialMedia add or link * update mock data * update/replace deps * set "moduleResolution" to 'Bundler' for 3rd party packages added export defs for @weareinreach/auth --------- Co-authored-by: kodiakhq[bot] <49736102+kodiakhq[bot]@users.noreply.github.com>
weareinreach · Feb 12, 2024 · 708456b · 708456b
1 parent 3d745f8
commit 708456b
Show file tree

Hide file tree

Showing 72 changed files with 1,723 additions and 275 deletions.
diff --git a/.github/renovate.json b/.github/renovate.json
@@ -8,6 +8,12 @@
 			"groupName": "patched packages",
 			"matchPackageNames": ["@crowdin/ota-client", "trpc-panel", "msw-storybook-addon"],
 			"matchUpdateTypes": ["major", "minor", "patch"]
+		},
+		{
+			"enabled": false,
+			"groupName": "Ignored Versions",
+			"matchCurrentVersion": "0.9.2",
+			"matchPackageNames": ["@t3-oss/env-nextjs"]
 		}
 	],
 	"semanticCommitScope": "{{parentDir}}"

diff --git a/apps/app/src/pages/org/[slug]/[orgLocationId]/edit/[orgServiceId].tsx b/apps/app/src/pages/org/[slug]/[orgLocationId]/edit/[orgServiceId].tsx
@@ -281,12 +281,13 @@ export const getServerSideProps: GetServerSideProps = async ({ locale, params, r
 	const ssg = await trpcServerClient({ session })
 	const { id: orgId } = await ssg.organization.getIdFromSlug.fetch({ slug })
 	const [i18n] = await Promise.all([
-		getServerSideTranslations(locale, ['common', 'services', 'attribute', orgId]),
+		getServerSideTranslations(locale, ['common', 'services', 'attribute']),
 		ssg.page.serviceEdit.prefetch({ id: orgServiceId }),
 		ssg.component.ServiceSelect.prefetch(),
 		ssg.service.getOptions.prefetch(),
 	])
 	const props = {
+		organizationId: orgId,
 		session,
 		trpcState: ssg.dehydrate(),
 		...i18n,

diff --git a/apps/app/src/pages/org/[slug]/[orgLocationId]/edit/index.tsx b/apps/app/src/pages/org/[slug]/[orgLocationId]/edit/index.tsx
@@ -51,12 +51,9 @@ const OrgLocationPage: NextPage<InferGetServerSidePropsType<typeof getServerSide
 	const { slug, orgLocationId } = query
 	const [activeTab, setActiveTab] = useState<string | null>('services')
 	const [loading, setLoading] = useState(true)
-	const { data: orgData, status: orgDataStatus } = api.organization.getBySlug.useQuery(query, {
-		enabled: router.isReady,
-	})
 	const { data, status } = api.location.forLocationPageEdits.useQuery({ id: orgLocationId })
-	const { data: isSaved } = api.savedList.isSaved.useQuery(orgData?.id as string, {
-		enabled: orgDataStatus === 'success' && Boolean(orgData?.id),
+	const { data: isSaved } = api.savedList.isSaved.useQuery(data?.organization?.id ?? '', {
+		enabled: status === 'success' && Boolean(data?.organization?.id),
 	})
 	const { data: alertData } = api.location.getAlerts.useQuery(
 		{ id: orgLocationId },
@@ -105,9 +102,9 @@ const OrgLocationPage: NextPage<InferGetServerSidePropsType<typeof getServerSide
 		}
 	}, [formMethods.formState, unsaved])
 	useEffect(() => {
-		if (data && status === 'success' && orgData && orgDataStatus === 'success') setLoading(false)
-	}, [data, status, orgData, orgDataStatus])
-	if (loading || !data || !orgData) return <OrgLocationPageLoading />
+		if (data && status === 'success') setLoading(false)
+	}, [data, status])
+	if (loading || !data) return <OrgLocationPageLoading />
 
 	const {
 		// emails,
@@ -123,22 +120,24 @@ const OrgLocationPage: NextPage<InferGetServerSidePropsType<typeof getServerSide
 	return (
 		<>
 			<Head>
-				<title>{t('page-title.edit-mode', { ns: 'common', title: `${orgData.name} - ${data.name}` })}</title>
+				<title>
+					{t('page-title.edit-mode', { ns: 'common', title: `${data.organization.name} - ${data.name}` })}
+				</title>
 			</Head>
 			<FormProvider {...formMethods}>
 				<Grid.Col xs={12} sm={8} order={1}>
 					<Toolbar
 						breadcrumbProps={{
 							option: 'back',
 							backTo: 'dynamicText',
-							backToText: orgData.name,
+							backToText: data.organization.name,
 							onClick: () =>
 								router.push({
 									pathname: '/org/[slug]/edit',
-									query: { slug: orgData.slug },
+									query: { slug: data.organization.slug },
 								}),
 						}}
-						organizationId={orgData.id}
+						organizationId={data.organization.id}
 						saved={Boolean(isSaved)}
 					/>
 					<Stack pt={24} align='flex-start' spacing={40}>
@@ -147,21 +146,21 @@ const OrgLocationPage: NextPage<InferGetServerSidePropsType<typeof getServerSide
 								<AlertMessage
 									key={alert.key}
 									iconKey={alert.icon}
-									ns={orgData.id}
+									ns={data.organization.id}
 									textKey={alert.key}
 									defaultText={alert.text}
 								/>
 							))}
 						<ListingBasicInfo
 							data={{
-								name: data.name || orgData.name,
+								name: data.name || data.organization.name,
 								id: data.id,
 								slug,
 								locations: [data],
 								description,
-								lastVerified: orgData.lastVerified,
+								lastVerified: data.organization.lastVerified,
 								attributes,
-								isClaimed: orgData.isClaimed,
+								isClaimed: data.organization.isClaimed,
 							}}
 							edit
 							location
@@ -263,9 +262,7 @@ export const getServerSideProps = async ({
 			'phone-type',
 			'country',
 			'gov-dist',
-			orgId,
 		]),
-		ssg.organization.getBySlug.prefetch({ slug }),
 		ssg.location.forLocationPageEdits.prefetch({ id }),
 		ssg.location.getAlerts.prefetch({ id }),
 	])

diff --git a/apps/app/src/pages/org/[slug]/edit.tsx b/apps/app/src/pages/org/[slug]/edit.tsx
@@ -159,14 +159,15 @@ export const getServerSideProps = async ({
 	}
 
 	const ssg = await trpcServerClient({ session })
-	const orgId = await ssg.organization.getIdFromSlug.fetch({ slug })
+	const { id: organizationId } = await ssg.organization.getIdFromSlug.fetch({ slug })
 
 	const [i18n] = await Promise.all([
-		getServerSideTranslations(locale, compact(['common', 'services', 'attribute', 'phone-type', orgId?.id])),
+		getServerSideTranslations(locale, compact(['common', 'services', 'attribute', 'phone-type'])),
 		ssg.organization.forOrgPageEdits.prefetch({ slug }),
 		ssg.fieldOpt.countries.prefetch({ activeForOrgs: true }),
 	])
 	const props = {
+		organizationId,
 		session,
 		trpcState: ssg.dehydrate(),
 		...i18n,

diff --git a/apps/app/src/pages/org/[slug]/index.tsx b/apps/app/src/pages/org/[slug]/index.tsx
@@ -264,7 +264,6 @@ export const getStaticProps = async ({
 			getServerSideTranslations(locale, formatNS(orgId)),
 			ssg.organization.forOrgPage.prefetch({ slug }),
 		])
-		// await ssg.organization.getBySlug.prefetch({ slug })
 
 		const props = {
 			trpcState: ssg.dehydrate(),

diff --git a/packages/api/lib/middleware/permissions.ts b/packages/api/lib/middleware/permissions.ts
@@ -24,7 +24,7 @@ export const checkPermissions = (meta: Meta | undefined, ctx: Context) => {
 
 		/** Check multiple permissions */
 		if (Array.isArray(meta.hasPerm)) {
-			if (meta.hasPerm.every((perm) => ctx.session?.user.permissions.includes(perm))) {
+			if (meta.hasPerm.every((perm) => ctx.session?.user?.permissions?.includes(perm))) {
 				return true
 			}
 			return false
@@ -51,7 +51,9 @@ export const checkRole = (allowedRoles: string[], userRoles: string[]) => {
 
 export const isAdmin = t.middleware(({ ctx, meta, next }) => {
 	if (!ctx.session || !ctx.session.user) return reject()
-	if (!(checkRole(['dataAdmin', 'sysadmin', 'root'], ctx.session?.user.roles) && checkPermissions(meta, ctx)))
+	if (
+		!(checkRole(['dataAdmin', 'sysadmin', 'root'], ctx.session?.user?.roles) && checkPermissions(meta, ctx))
+	)
 		return reject()
 
 	return next({
@@ -66,7 +68,7 @@ export const isStaff = t.middleware(({ ctx, meta, next }) => {
 	if (!ctx.session || !ctx.session.user) return reject()
 	if (
 		!(
-			checkRole(['dataManager', 'dataAdmin', 'sysadmin', 'system', 'root'], ctx.session?.user.roles) &&
+			checkRole(['dataManager', 'dataAdmin', 'sysadmin', 'system', 'root'], ctx.session?.user?.roles) &&
 			checkPermissions(meta, ctx)
 		)
 	)

diff --git a/packages/api/package.json b/packages/api/package.json
@@ -42,10 +42,12 @@
 		"just-map-values": "3.2.0",
 		"just-omit": "2.2.0",
 		"just-pick": "4.2.0",
+		"libphonenumber-js": "1.10.55",
 		"luxon": "3.4.4",
 		"nanoid": "5.0.5",
 		"slugify": "1.6.6",
 		"tiny-invariant": "1.3.1",
+		"useful-typescript-functions": "4.0.7",
 		"zod": "3.22.4"
 	},
 	"devDependencies": {

diff --git a/packages/api/router/location/query.forLocationPageEdits.handler.ts b/packages/api/router/location/query.forLocationPageEdits.handler.ts
@@ -151,9 +151,28 @@ export const forLocationPageEdits = async ({ input }: TRPCHandlerParams<TForLoca
 					select: { id: true },
 				},
 				services: { select: { serviceId: true } },
+				organization: {
+					select: {
+						id: true,
+						name: true,
+						slug: true,
+						lastVerified: true,
+						allowedEditors: { where: { authorized: true }, select: { userId: true } },
+					},
+				},
 			},
 		})
-		return location
+		const { organization, ...record } = location
+		const { allowedEditors, ...org } = organization
+		const formatted = {
+			...record,
+			organization: {
+				...org,
+				isClaimed: allowedEditors.length !== 0,
+			},
+		}
+
+		return formatted
 	} catch (error) {
 		handleError(error)
 	}

diff --git a/packages/api/router/misc/query.hasContactInfo.handler.ts b/packages/api/router/misc/query.hasContactInfo.handler.ts
@@ -74,8 +74,8 @@ const whereId = (
 					locations: { some: { location: { id: input, ...isPublic } } },
 					...isPublic,
 				},
-				socialMedia: { locations: { every: { location: { id: input, ...isPublic }, ...isPublic } } },
-				website: { locations: { every: { location: { id: input, ...isPublic }, ...isPublic } } },
+				socialMedia: { locations: { every: { location: { id: input, ...isPublic } } }, ...isPublic },
+				website: { locations: { every: { location: { id: input, ...isPublic } } }, ...isPublic },
 			}
 		}
 		case isIdFor('orgService', input): {

diff --git a/packages/api/router/orgEmail/index.ts b/packages/api/router/orgEmail/index.ts
@@ -59,4 +59,22 @@ export const orgEmailRouter = defineRouter({
 			)
 			return handler(opts)
 		}),
+	getLinkOptions: permissionedProcedure('updateEmail')
+		.input(schema.ZGetLinkOptionsSchema)
+		.query(async (opts) => {
+			const handler = await importHandler(
+				namespaced('getLinkOptions'),
+				() => import('./query.getLinkOptions.handler')
+			)
+			return handler(opts)
+		}),
+	locationLink: permissionedProcedure('updateEmail')
+		.input(schema.ZLocationLinkSchema)
+		.mutation(async (opts) => {
+			const handler = await importHandler(
+				namespaced('locationLink'),
+				() => import('./mutation.locationLink.handler')
+			)
+			return handler(opts)
+		}),
 })
diff --git a/packages/api/router/orgEmail/mutation.locationLink.handler.ts b/packages/api/router/orgEmail/mutation.locationLink.handler.ts
@@ -0,0 +1,39 @@
+import { getAuditedClient } from '@weareinreach/db'
+import { handleError } from '~api/lib/errorHandler'
+import { type TRPCHandlerParams } from '~api/types/handler'
+
+import { type TLocationLinkSchema } from './mutation.locationLink.schema'
+
+export const locationLink = async ({ ctx, input }: TRPCHandlerParams<TLocationLinkSchema, 'protected'>) => {
+	try {
+		const prisma = getAuditedClient(ctx.actorId)
+		const { action, orgEmailId, orgLocationId } = input
+
+		switch (action) {
+			case 'link': {
+				const result = await prisma.orgLocationEmail.create({
+					data: {
+						orgEmailId,
+						orgLocationId,
+						active: true,
+					},
+				})
+				return result
+			}
+			case 'unlink': {
+				const result = await prisma.orgLocationEmail.delete({
+					where: {
+						orgEmailId_orgLocationId: {
+							orgEmailId,
+							orgLocationId,
+						},
+					},
+				})
+				return result
+			}
+		}
+	} catch (error) {
+		handleError(error)
+	}
+}
+export default locationLink
diff --git a/packages/api/router/orgEmail/mutation.locationLink.schema.ts b/packages/api/router/orgEmail/mutation.locationLink.schema.ts
@@ -0,0 +1,10 @@
+import { z } from 'zod'
+
+import { prefixedId } from '~api/schemas/idPrefix'
+
+export const ZLocationLinkSchema = z.object({
+	orgEmailId: prefixedId('orgEmail'),
+	orgLocationId: prefixedId('orgLocation'),
+	action: z.enum(['link', 'unlink']),
+})
+export type TLocationLinkSchema = z.infer<typeof ZLocationLinkSchema>
diff --git a/packages/api/router/orgEmail/query.getLinkOptions.handler.ts b/packages/api/router/orgEmail/query.getLinkOptions.handler.ts
@@ -0,0 +1,34 @@
+import { prisma } from '@weareinreach/db'
+import { handleError } from '~api/lib/errorHandler'
+import { type TRPCHandlerParams } from '~api/types/handler'
+
+import { type TGetLinkOptionsSchema } from './query.getLinkOptions.schema'
+
+export const getLinkOptions = async ({ input }: TRPCHandlerParams<TGetLinkOptionsSchema>) => {
+	try {
+		const { slug, locationId } = input
+		const result = await prisma.orgEmail.findMany({
+			where: {
+				organization: { some: { organization: { slug } } },
+				locations: { every: { orgLocationId: { not: locationId } } },
+			},
+			select: {
+				id: true,
+				firstName: true,
+				lastName: true,
+				email: true,
+				published: true,
+				deleted: true,
+				description: { select: { tsKey: { select: { text: true } } } },
+			},
+		})
+		const transformed = result.map(({ description, ...record }) => ({
+			...record,
+			description: description ? description.tsKey.text : null,
+		}))
+		return transformed
+	} catch (error) {
+		handleError(error)
+	}
+}
+export default getLinkOptions
diff --git a/packages/api/router/orgEmail/query.getLinkOptions.schema.ts b/packages/api/router/orgEmail/query.getLinkOptions.schema.ts
@@ -0,0 +1,6 @@
+import { z } from 'zod'
+
+import { prefixedId } from '~api/schemas/idPrefix'
+
+export const ZGetLinkOptionsSchema = z.object({ slug: z.string(), locationId: prefixedId('orgLocation') })
+export type TGetLinkOptionsSchema = z.infer<typeof ZGetLinkOptionsSchema>
diff --git a/packages/api/router/orgEmail/schemas.ts b/packages/api/router/orgEmail/schemas.ts
@@ -1,9 +1,11 @@
 // codegen:start {preset: barrel, include: ./*.schema.ts}
 export * from './mutation.create.schema'
+export * from './mutation.locationLink.schema'
 export * from './mutation.update.schema'
 export * from './mutation.upsertMany.schema'
 export * from './query.forContactInfo.schema'
 export * from './query.forContactInfoEdit.schema'
 export * from './query.forEditDrawer.schema'
 export * from './query.get.schema'
+export * from './query.getLinkOptions.schema'
 // codegen:end
diff --git a/packages/api/router/orgPhone/index.ts b/packages/api/router/orgPhone/index.ts
@@ -58,4 +58,22 @@ export const orgPhoneRouter = defineRouter({
 			)
 			return handler(opts)
 		}),
+	getLinkOptions: permissionedProcedure('updatePhone')
+		.input(schema.ZGetLinkOptionsSchema)
+		.query(async (opts) => {
+			const handler = await importHandler(
+				namespaced('getLinkOptions'),
+				() => import('./query.getLinkOptions.handler')
+			)
+			return handler(opts)
+		}),
+	locationLink: permissionedProcedure('updatePhone')
+		.input(schema.ZLocationLinkSchema)
+		.mutation(async (opts) => {
+			const handler = await importHandler(
+				namespaced('locationLink'),
+				() => import('./mutation.locationLink.handler')
+			)
+			return handler(opts)
+		}),
 })