better conditional rendering checks

weareinreach · Jul 18, 2024 · ad1046b · ad1046b
1 parent ee20a26
commit ad1046b
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 5 deletions.
diff --git a/packages/api/router/location/query.forVisitCard.handler.ts b/packages/api/router/location/query.forVisitCard.handler.ts
@@ -29,17 +29,19 @@ const forVisitCard = async ({ input }: TRPCHandlerParams<TForVisitCardSchema>) =
 				latitude: true,
 				longitude: true,
 				addressVisibility: true,
+				hours: { where: { active: true }, select: { id: true } },
 			},
 		})
 		if (!result) {
 			return null
 		}
-		const { attributes, ...rest } = result
+		const { attributes, hours, ...rest } = result
 		const transformed = {
 			...rest,
 			...formatAddressVisiblity(rest),
 			remote: attributes.find(({ attribute }) => attribute.tsKey === 'additional.offers-remote-services')
 				?.attribute,
+			hasHours: hours.length > 0,
 		}
 		return transformed
 	} catch (err) {

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: { some: { location: { id: input, ...isPublic } } }, ...isPublic },
+				website: { locations: { some: { location: { id: input, ...isPublic } } }, ...isPublic },
 			}
 		}
 		case isIdFor('orgService', input): {
@@ -120,7 +120,10 @@ const hasContactInfo = async ({ input }: TRPCHandlerParams<THasContactInfoSchema
 				? prisma.orgWebsite.count({ where: whereId(input, isSingleLoc).website })
 				: 0,
 		])
-		return email + phone + socialMedia + website !== 0 // ? 'true' : 'false'
+
+		const totalCount = email + phone + socialMedia + website
+
+		return totalCount !== 0
 	} catch (error) {
 		return handleError(error)
 	}

diff --git a/packages/ui/components/sections/ContactSection/index.tsx b/packages/ui/components/sections/ContactSection/index.tsx
@@ -10,7 +10,9 @@ export const ContactSection = ({ parentId, edit }: ContactSectionProps) => {
 	const { isMobile, isTablet } = useScreenSize()
 	const { data: hasContactInfo } = api.misc.hasContactInfo.useQuery(parentId)
 
-	if (!hasContactInfo && !edit) return null
+	if (!hasContactInfo && !edit) {
+		return null
+	}
 
 	const body = (
 		<Stack spacing={isMobile ? 32 : 40}>

diff --git a/packages/ui/components/sections/VisitCard.tsx b/packages/ui/components/sections/VisitCard.tsx
@@ -109,6 +109,9 @@ const VisitCardDisplay = ({ locationId }: VisitCardProps) => {
 			</Stack> */}
 		</Stack>
 	)
+	if (!formattedAddress && !data.hasHours) {
+		return null
+	}
 
 	return isTablet ? body : <Card>{body}</Card>
 }