fix: basic info card address display (#1143)

* enforce "notVisitable" on BasicListingCard * do not throw error on not found
weareinreach · Mar 7, 2024 · 61d4265 · 61d4265
1 parent 5dd4ff4
commit 61d4265
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/packages/api/router/location/query.forLocationPage.handler.ts b/packages/api/router/location/query.forLocationPage.handler.ts
@@ -25,6 +25,7 @@ export const forLocationPage = async ({ input }: TRPCHandlerParams<TForLocationP
 			latitude: true,
 			description: globalSelect.freeText(),
 			attributes,
+			notVisitable: true,
 			reviews: {
 				where: { visible: true, deleted: false },
 				select: { id: true },

diff --git a/packages/api/router/location/query.forVisitCard.handler.ts b/packages/api/router/location/query.forVisitCard.handler.ts
@@ -7,7 +7,7 @@ import { type TForVisitCardSchema } from './query.forVisitCard.schema'
 
 export const forVisitCard = async ({ input }: TRPCHandlerParams<TForVisitCardSchema>) => {
 	try {
-		const result = await prisma.orgLocation.findUniqueOrThrow({
+		const result = await prisma.orgLocation.findUnique({
 			where: {
 				...globalWhere.isPublic(),
 				id: input,
@@ -30,6 +30,7 @@ export const forVisitCard = async ({ input }: TRPCHandlerParams<TForVisitCardSch
 				longitude: true,
 			},
 		})
+		if (!result) return null
 		const { attributes, ...rest } = result
 		const transformed = {
 			...rest,

diff --git a/packages/api/router/organization/query.forOrgPage.handler.ts b/packages/api/router/organization/query.forOrgPage.handler.ts
@@ -40,6 +40,7 @@ export const forOrgPage = async ({ ctx, input }: TRPCHandlerParams<TForOrgPageSc
 					postCode: true,
 					country: { select: { cca2: true } },
 					govDist: { select: { abbrev: true, tsKey: true, tsNs: true } },
+					notVisitable: true,
 				},
 			},
 		},

diff --git a/packages/ui/components/sections/ListingBasicInfo.tsx b/packages/ui/components/sections/ListingBasicInfo.tsx
@@ -20,7 +20,11 @@ export const ListingBasicDisplay = memo(({ data }: ListingBasicInfoProps) => {
 	const isSingleLoc = locations?.length === 1
 	const location = isSingleLoc ? locations[0] : undefined
 
-	const addressLine = <Text variant={variants.Text.utility2darkGray}>{useFormattedAddress(location)}</Text>
+	const formattedAddress = useFormattedAddress(location)
+
+	const addressLine = location?.notVisitable ? null : (
+		<Text variant={variants.Text.utility2darkGray}>{formattedAddress}</Text>
+	)
 
 	const leaderAttributes = attributes.filter(({ attribute }) =>
 		attribute.categories.some(({ category }) => category.tag === 'organization-leadership')