Rallly is an open-source scheduling and collaboration tool designed to make organizing events and meetings easier.
TypeScript i18nextnext-authnextjspostgresqlprismareact-emailt3-stacktailwindcsstrpcturborepotypescriptzod
✨ Optimistic space switching with loading indicator (#2870)
Luke Vellacd669577064f
diff --git a/apps/web/src/app/[locale]/(space)/(dashboard)/layout.tsx b/apps/web/src/app/[locale]/(space)/(dashboard)/layout.tsxindex b2f2ce4a0..0ec26f9db 100644--- a/apps/web/src/app/[locale]/(space)/(dashboard)/layout.tsx+++ b/apps/web/src/app/[locale]/(space)/(dashboard)/layout.tsx@@ -46,6 +46,7 @@ export default async function Layout({id: space.id,name: space.name,image: space.image,+ tier: space.tier,}))}/></SidebarHeader>diff --git a/apps/web/src/features/space/components/space-dropdown.tsx b/apps/web/src/features/space/components/space-dropdown.tsxindex 8b7b8620e..21b9ea5f5 100644--- a/apps/web/src/features/space/components/space-dropdown.tsx+++ b/apps/web/src/features/space/components/space-dropdown.tsx@@ -21,9 +21,12 @@ import {UserPlusIcon,} from "lucide-react";import Link from "next/link";+import React from "react";+import { RouterLoadingIndicator } from "@/components/router-loading-indicator";import { setActiveSpaceAction } from "@/features/space/actions";import { useSpace } from "@/features/space/client";import { SpaceTierLabel } from "@/features/space/components/space-tier";+import type { SpaceTier } from "@/features/space/schema";import { Trans } from "@/i18n/client";import { useSafeAction } from "@/lib/safe-action/client";import { CreateSpaceDialog } from "./create-space-dialog";@@ -32,14 +35,20 @@ import { SpaceIcon } from "./space-icon";export function SpaceDropdown({spaces,}: {- spaces: { id: string; name: string; image?: string }[];+ spaces: { id: string; name: string; image?: string; tier: SpaceTier }[];}) {const { data: activeSpace } = useSpace();+ const [pendingSpaceId, setPendingSpaceId] = React.useState<string>();- const setActiveSpace = useSafeAction(setActiveSpaceAction);+ const setActiveSpace = useSafeAction(setActiveSpaceAction, {+ onError: () => setPendingSpaceId(undefined),+ });const newSpaceDialog = useDialog();- const selectedSpaceId = activeSpace.id;+ const pendingSpace = spaces.find((space) => space.id === pendingSpaceId);+ const isSwitching = !!pendingSpace && pendingSpace.id !== activeSpace.id;+ const displayedSpace = isSwitching ? pendingSpace : activeSpace;+ const selectedSpaceId = displayedSpace.id;return (<>@@ -48,23 +57,23 @@ export function SpaceDropdown({render={<ButtonclassName={cn("flex h-auto w-full gap-2.5 p-2", {- "pointer-events-none animate-pulse": setActiveSpace.isExecuting,+ "pointer-events-none": isSwitching,})}variant="ghost"/>}><SpaceIcon- src={activeSpace.image}- name={activeSpace.name}+ src={displayedSpace.image}+ name={displayedSpace.name}size="lg"/><div className="min-w-0 flex-1 px-0.5 text-left"><div className="truncate font-medium text-sm">- {activeSpace.name}+ {displayedSpace.name}</div><div className="text-muted-foreground text-xs">- <SpaceTierLabel tier={activeSpace.tier} />+ <SpaceTierLabel tier={displayedSpace.tier} /></div></div><Icon>@@ -82,6 +91,7 @@ export function SpaceDropdown({value={selectedSpaceId}onValueChange={(value) => {if (value === selectedSpaceId) return;+ setPendingSpaceId(value);setActiveSpace.execute({ spaceId: value });}}>@@ -118,6 +128,7 @@ export function SpaceDropdown({</DropdownMenuContent></DropdownMenu><CreateSpaceDialog {...newSpaceDialog.dialogProps} />+ {isSwitching ? <RouterLoadingIndicator /> : null}</>);}diff --git a/apps/web/src/lib/safe-action/client.ts b/apps/web/src/lib/safe-action/client.tsindex 790d8af72..065b695f7 100644--- a/apps/web/src/lib/safe-action/client.ts+++ b/apps/web/src/lib/safe-action/client.ts@@ -14,7 +14,8 @@ export const useSafeAction: typeof useAction = (action, options) => {router.refresh();options?.onSuccess?.(args);},- onError: ({ error }) => {+ onError: (args) => {+ const { error } = args;if (error.serverError) {let translatedDescription = "An unexpected error occurred";@@ -65,6 +66,7 @@ export const useSafeAction: typeof useAction = (action, options) => {toast.error(translatedDescription);}+ options?.onError?.(args);},});};