Merge branch 'dev' into l10n_dev

apps/app/src/pages/org/[slug]/[orgLocationId]/edit.tsx

@@ -57,6 +57,7 @@ const OrgLocationPage: NextPage<InferGetServerSidePropsType<typeof getServerSide
 	const [loading, setLoading] = useState(true)
 	const notifySave = useNewNotification({ displayText: 'Saved', icon: 'success' })
 	const { data, status } = api.location.forLocationPageEdits.useQuery({ id: orgLocationId })
+	const { mutate: revalidatePage } = api.misc.revalidatePage.useMutation()
 
 	const { data: alertData } = api.location.getAlerts.useQuery(
 		{ id: orgLocationId },
@@ -92,6 +93,7 @@ const OrgLocationPage: NextPage<InferGetServerSidePropsType<typeof getServerSide
 		onSuccess: () => {
 			apiUtils.location.invalidate()
 			apiUtils.service.invalidate()
+			revalidatePage({ path: router.asPath.replace('/edit', '') })
 			notifySave()
 		},
 	})

apps/app/src/pages/org/[slug]/[orgLocationId]/index.tsx

@@ -40,14 +40,18 @@ const OrgLocationPage: NextPage = () => {
 	const theme = useMantineTheme()
 	const isTablet = useMediaQuery(`(max-width: ${theme.breakpoints.sm})`)
 
-	const { data: orgData, status: orgDataStatus } = api.organization.forLocationPage.useQuery(
-		{ slug },
-		{ enabled: router.isReady }
-	)
-	const { data, status } = api.location.forLocationPage.useQuery(
-		{ id: orgLocationId },
-		{ enabled: router.isReady }
-	)
+	const {
+		data: orgData,
+		status: orgDataStatus,
+		isError: orgDataIsError,
+		error: orgDataError,
+	} = api.organization.forLocationPage.useQuery({ slug }, { enabled: router.isReady })
+	const {
+		data,
+		status,
+		isError: pageFetchIsError,
+		error: pageFetchError,
+	} = api.location.forLocationPage.useQuery({ id: orgLocationId }, { enabled: router.isReady })
 
 	const { data: alertData } = api.location.getAlerts.useQuery(
 		{ id: orgLocationId },
@@ -84,6 +88,13 @@ const OrgLocationPage: NextPage = () => {
 		}
 	}, [])
 
+	if (
+		(orgDataIsError || pageFetchIsError) &&
+		(orgDataError?.data?.code === 'NOT_FOUND' || pageFetchError?.data?.code === 'NOT_FOUND')
+	) {
+		router.replace('/404')
+	}
+
 	if (loading || !data || !orgData || router.isFallback) {
 		return <OrgLocationPageLoading />
 	}
@@ -202,7 +213,7 @@ export const getStaticProps: GetStaticProps<
 
 		const orgId = await ssg.organization.getIdFromSlug.fetch({ slug })
 		if (!orgId?.id) {
-			return { notFound: true }
+			return { notFound: true, revalidate: 1 }
 		}
 
 		const [i18n] = await Promise.allSettled([
@@ -223,7 +234,7 @@ export const getStaticProps: GetStaticProps<
 	} catch (error) {
 		const TRPCError = (await import('@trpc/server')).TRPCError
 		if (error instanceof TRPCError && error.code === 'NOT_FOUND') {
-			return { notFound: true }
+			return { notFound: true, revalidate: 1 }
 		}
 		return { redirect: { destination: '/500', permanent: false } }
 	}

apps/app/src/pages/org/[slug]/edit.tsx

@@ -40,12 +40,14 @@ const OrganizationPage: NextPageWithOptions<InferGetServerSidePropsType<typeof g
 		{ slug: pageSlug },
 		{ enabled: router.isReady }
 	)
+	const { mutate: revalidatePage } = api.misc.revalidatePage.useMutation()
 	const updateBasic = api.organization.updateBasic.useMutation({
 		onSuccess: (newData) => {
 			if (data && newData && data.slug !== newData.slug) {
 				router.replace({ pathname: router.pathname, query: { ...router.query, slug: newData.slug } })
 			}
 			apiUtils.organization.forOrgPageEdits.invalidate()
+			revalidatePage({ path: router.asPath.replace('/edit', '') })
 		},
 	})
 

apps/app/src/pages/org/[slug]/index.tsx

@@ -44,7 +44,12 @@ const OrganizationPage = ({
 }: InferGetStaticPropsType<typeof getStaticProps>) => {
 	const router = useRouter<'/org/[slug]'>()
 	const slug = passedSlug ?? router.query.slug
-	const { data, status } = api.organization.forOrgPage.useQuery({ slug })
+	const {
+		data,
+		status,
+		isError: pageFetchIsError,
+		error: pageFetchError,
+	} = api.organization.forOrgPage.useQuery({ slug })
 	// const { query } = router
 	const { t } = useTranslation(formatNS(orgId))
 	const [activeTab, setActiveTab] = useState<string | null>('services')
@@ -131,6 +136,10 @@ const OrganizationPage = ({
 		[isTablet, ref, width]
 	)
 
+	if (pageFetchIsError && pageFetchError.data?.code === 'NOT_FOUND') {
+		router.replace('/404')
+	}
+
 	if (loading || !data || router.isFallback) {
 		return <OrgPageLoading />
 	}
@@ -289,7 +298,7 @@ export const getStaticProps: GetStaticProps<
 	} catch (error) {
 		const TRPCError = (await import('@trpc/server')).TRPCError
 		if (error instanceof TRPCError && error.code === 'NOT_FOUND') {
-			return { notFound: true }
+			return { notFound: true, revalidate: 1 }
 		} else {
 			return { redirect: { destination: '/500', permanent: false } }
 		}

packages/api/router/misc/index.ts

@@ -29,4 +29,13 @@ export const miscRouter = defineRouter({
 			)
 			return handler(opts)
 		}),
+	revalidatePage: permissionedProcedure('createNewOrgQuick')
+		.input(schema.ZRevalidatePageSchema)
+		.mutation(async (opts) => {
+			const handler = await importHandler(
+				namespaced('revalidatePage'),
+				() => import('./mutation.revalidatePage.handler')
+			)
+			return handler(opts)
+		}),
 })

packages/api/router/misc/mutation.revalidatePage.handler.ts

@@ -0,0 +1,24 @@
+import { type TRPCHandlerParams } from '~api/types/handler'
+
+import { type TRevalidatePageSchema } from './mutation.revalidatePage.schema'
+
+const revalidatePage = async ({ ctx, input }: TRPCHandlerParams<TRevalidatePageSchema, 'protected'>) => {
+	try {
+		if (!ctx.res) {
+			return {
+				revalidated: false,
+				error: 'Response object is not available',
+			}
+		}
+		await ctx.res.revalidate(input.path)
+		return {
+			revalidated: true,
+		}
+	} catch (error) {
+		return {
+			revalidated: false,
+			error,
+		}
+	}
+}
+export default revalidatePage

packages/api/router/misc/mutation.revalidatePage.schema.ts

@@ -0,0 +1,4 @@
+import { z } from 'zod'
+
+export const ZRevalidatePageSchema = z.object({ path: z.string() })
+export type TRevalidatePageSchema = z.infer<typeof ZRevalidatePageSchema>

packages/api/router/misc/schemas.ts

@@ -1,4 +1,5 @@
 // codegen:start {preset: barrel, include: ./*.schema.ts}
+export * from './mutation.revalidatePage.schema'
 export * from './query.forEditNavbar.schema'
 export * from './query.getCountryTranslation.schema'
 export * from './query.hasContactInfo.schema'

packages/ui/components/sections/Navbar.tsx

@@ -65,7 +65,7 @@ const EditModeBar = () => {
 	const { t } = useTranslation('common')
 	const router = useRouter<'/org/[slug]/edit' | '/org/[slug]/[orgLocationId]/edit'>()
 	const { orgLocationId, slug, orgServiceId } = router.query
-
+	const { mutate: revalidatePage } = api.misc.revalidatePage.useMutation()
 	const apiQuery = (() => {
 		switch (true) {
 			case typeof orgServiceId === 'string': {
@@ -91,6 +91,7 @@ const EditModeBar = () => {
 		onSuccess: () => {
 			apiUtils.organization.invalidate()
 			apiUtils.component.EditModeBar.invalidate()
+			revalidatePage({ path: router.asPath.replace('/edit', '') })
 			reverifyNotification()
 		},
 	})
@@ -103,6 +104,7 @@ const EditModeBar = () => {
 			apiUtils.location.invalidate()
 			apiUtils.organization.invalidate()
 			apiUtils.component.EditModeBar.invalidate()
+			revalidatePage({ path: router.asPath.replace('/edit', '') })
 			publishedNotification()
 		},
 	})
@@ -114,6 +116,7 @@ const EditModeBar = () => {
 		onSuccess: () => {
 			apiUtils.organization.invalidate()
 			apiUtils.component.EditModeBar.invalidate()
+			revalidatePage({ path: router.asPath.replace('/edit', '') })
 			deletedNotification()
 		},
 	})