fix: wip

apps/remix/app/routes/_authenticated+/admin+/site-settings.tsx

@@ -3,6 +3,7 @@ import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
 import { useForm } from 'react-hook-form';
+import { useRevalidator } from 'react-router';
 import type { z } from 'zod';
 
 import { getSiteSettings } from '@documenso/lib/server-only/site-settings/get-site-settings';
@@ -47,6 +48,7 @@ export default function AdminBannerPage({ loaderData }: Route.ComponentProps) {
 
   const { toast } = useToast();
   const { _ } = useLingui();
+  const { revalidate } = useRevalidator();
 
   const form = useForm<TBannerFormSchema>({
     resolver: zodResolver(ZBannerFormSchema),
@@ -80,8 +82,7 @@ export default function AdminBannerPage({ loaderData }: Route.ComponentProps) {
         duration: 5000,
       });
 
-      // Todo
-      // router.refresh();
+      await revalidate();
     } catch (err) {
       toast({
         title: _(msg`An unknown error occurred`),

apps/remix/app/routes/_authenticated+/admin+/users.$id.tsx

@@ -3,6 +3,7 @@ import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
 import { useForm } from 'react-hook-form';
+import { useRevalidator } from 'react-router';
 import type { z } from 'zod';
 
 import { trpc } from '@documenso/trpc/react';
@@ -32,6 +33,7 @@ type TUserFormSchema = z.infer<typeof ZUserFormSchema>;
 export default function UserPage({ params }: { params: { id: number } }) {
   const { _ } = useLingui();
   const { toast } = useToast();
+  const { revalidate } = useRevalidator();
 
   const { data: user } = trpc.profile.getUser.useQuery(
     {
@@ -64,8 +66,7 @@ export default function UserPage({ params }: { params: { id: number } }) {
         roles,
       });
 
-      // Todo
-      // router.refresh();
+      await revalidate();
 
       toast({
         title: _(msg`Profile updated`),

apps/remix/app/routes/_authenticated+/documents+/_index.tsx

@@ -3,8 +3,10 @@ import { useEffect, useMemo, useState } from 'react';
 import { Trans } from '@lingui/react/macro';
 import { useSearchParams } from 'react-router';
 import { Link } from 'react-router';
+import { z } from 'zod';
 
 import { formatAvatarUrl } from '@documenso/lib/utils/avatars';
+import { parseToIntegerArray } from '@documenso/lib/utils/params';
 import { formatDocumentsPath } from '@documenso/lib/utils/teams';
 import { ExtendedDocumentStatus } from '@documenso/prisma/types/extended-document-status';
 import { trpc } from '@documenso/trpc/react';
@@ -33,8 +35,9 @@ const ZSearchParamsSchema = ZFindDocumentsInternalRequestSchema.pick({
   period: true,
   page: true,
   perPage: true,
-  senderIds: true,
   query: true,
+}).extend({
+  senderIds: z.string().transform(parseToIntegerArray).optional().catch([]),
 });
 
 export default function DocumentsPage() {
@@ -59,7 +62,7 @@ export default function DocumentsPage() {
     ...findDocumentSearchParams,
   });
 
-  const getTabHref = (value: typeof status) => {
+  const getTabHref = (value: keyof typeof ExtendedDocumentStatus) => {
     const params = new URLSearchParams(searchParams);
 
     params.set('status', value);

apps/remix/app/routes/_authenticated+/settings+/webhooks+/$id.tsx

@@ -4,7 +4,7 @@ import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
 import { Loader } from 'lucide-react';
 import { useForm } from 'react-hook-form';
-import { useParams } from 'react-router';
+import { useParams, useRevalidator } from 'react-router';
 import type { z } from 'zod';
 
 import { trpc } from '@documenso/trpc/react';
@@ -36,6 +36,7 @@ export default function WebhookPage() {
 
   const { _ } = useLingui();
   const { toast } = useToast();
+  const { revalidate } = useRevalidator();
 
   const webhookId = params.id || '';
 
@@ -71,8 +72,7 @@ export default function WebhookPage() {
         duration: 5000,
       });
 
-      // Todo
-      // router.refresh();
+      await revalidate();
     } catch (err) {
       toast({
         title: _(msg`Failed to update webhook`),

apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings+/members.tsx

@@ -3,7 +3,7 @@ import { useEffect, useState } from 'react';
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
-import { Link, useLocation, useNavigate, useSearchParams } from 'react-router';
+import { Link, useLocation, useSearchParams } from 'react-router';
 
 import { useDebouncedValue } from '@documenso/lib/client-only/hooks/use-debounced-value';
 import { Input } from '@documenso/ui/primitives/input';
@@ -13,15 +13,11 @@ import { TeamMemberInviteDialog } from '~/components/dialogs/team-member-invite-
 import { SettingsHeader } from '~/components/general/settings-header';
 import { TeamSettingsMemberInvitesTable } from '~/components/tables/team-settings-member-invites-table';
 import { TeamSettingsMembersDataTable } from '~/components/tables/team-settings-members-table';
-import { useCurrentTeam } from '~/providers/team';
 
 export default function TeamsSettingsMembersPage() {
   const { _ } = useLingui();
 
-  const team = useCurrentTeam();
-
-  const [searchParams] = useSearchParams();
-  const navigate = useNavigate();
+  const [searchParams, setSearchParams] = useSearchParams();
   const { pathname } = useLocation();
 
   const [searchQuery, setSearchQuery] = useState(() => searchParams?.get('query') ?? '');
@@ -34,10 +30,6 @@ export default function TeamsSettingsMembersPage() {
    * Handle debouncing the search query.
    */
   useEffect(() => {
-    if (!pathname) {
-      return;
-    }
-
     const params = new URLSearchParams(searchParams?.toString());
 
     params.set('query', debouncedSearchQuery);
@@ -46,8 +38,13 @@ export default function TeamsSettingsMembersPage() {
       params.delete('query');
     }
 
-    void navigate(`${pathname}?${params.toString()}`);
-  }, [debouncedSearchQuery, pathname, navigate, searchParams]);
+    // If nothing  to change then do nothing.
+    if (params.toString() === searchParams?.toString()) {
+      return;
+    }
+
+    setSearchParams(params);
+  }, [debouncedSearchQuery, pathname, searchParams]);
 
   return (
     <div>
@@ -55,10 +52,7 @@ export default function TeamsSettingsMembersPage() {
         title={_(msg`Members`)}
         subtitle={_(msg`Manage the members or invite new members.`)}
       >
-        <TeamMemberInviteDialog
-          teamId={team.id}
-          currentUserTeamRole={team.currentTeamMember.role}
-        />
+        <TeamMemberInviteDialog />
       </SettingsHeader>
 
       <div>

apps/remix/app/routes/_authenticated+/t.$teamUrl+/settings+/webhooks.$id.tsx

@@ -4,6 +4,7 @@ import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
 import { Loader } from 'lucide-react';
 import { useForm } from 'react-hook-form';
+import { useRevalidator } from 'react-router';
 import type { z } from 'zod';
 
 import { trpc } from '@documenso/trpc/react';
@@ -36,6 +37,7 @@ type TEditWebhookFormSchema = z.infer<typeof ZEditWebhookFormSchema>;
 export default function WebhookPage({ params }: Route.ComponentProps) {
   const { _ } = useLingui();
   const { toast } = useToast();
+  const { revalidate } = useRevalidator();
 
   const team = useCurrentTeam();
 
@@ -73,8 +75,7 @@ export default function WebhookPage({ params }: Route.ComponentProps) {
         duration: 5000,
       });
 
-      // Todo
-      // router.refresh();
+      await revalidate();
     } catch (err) {
       toast({
         title: _(msg`Failed to update webhook`),

apps/remix/app/routes/_recipient+/d.$token+/_index.tsx

@@ -48,7 +48,7 @@ export async function loader({ params }: Route.LoaderArgs) {
 
   // Ensure typesafety when we add more options.
   const isAccessAuthValid = match(derivedRecipientAccessAuth)
-    .with(DocumentAccessAuth.ACCOUNT, () => session?.user !== null)
+    .with(DocumentAccessAuth.ACCOUNT, () => Boolean(session?.user))
     .with(null, () => true)
     .exhaustive();
 

apps/remix/app/routes/_recipient+/sign.$token+/complete.tsx

@@ -1,9 +1,11 @@
+import { useEffect } from 'react';
+
 import { msg } from '@lingui/core/macro';
 import { useLingui } from '@lingui/react';
 import { Trans } from '@lingui/react/macro';
-import { DocumentStatus, FieldType, RecipientRole } from '@prisma/client';
+import { type Document, DocumentStatus, FieldType, RecipientRole } from '@prisma/client';
 import { CheckCircle2, Clock8, FileSearch } from 'lucide-react';
-import { Link } from 'react-router';
+import { Link, useRevalidator } from 'react-router';
 import { getOptionalLoaderSession } from 'server/utils/get-loader-session';
 import { match } from 'ts-pattern';
 
@@ -254,35 +256,32 @@ export default function CompletedSigningPage({ loaderData }: Route.ComponentProp
         </div>
       </div>
 
-      {/* Todo */}
-      {/* Todo */}
-      {/* <PollUntilDocumentCompleted document={document} /> */}
+      <PollUntilDocumentCompleted document={document} />
     </div>
   );
 }
 
-// Todo: Refresh on focus? Was in a layout w it before.
-// Todo:
-// export type PollUntilDocumentCompletedProps = {
-//   document: Pick<Document, 'id' | 'status' | 'deletedAt'>;
-// };
+export type PollUntilDocumentCompletedProps = {
+  document: Pick<Document, 'id' | 'status' | 'deletedAt'>;
+};
 
-// export const PollUntilDocumentCompleted = ({ document }: PollUntilDocumentCompletedProps) => {
-//   const router = useRouter();
+export const PollUntilDocumentCompleted = ({ document }: PollUntilDocumentCompletedProps) => {
+  const { revalidate } = useRevalidator();
 
-//   useEffect(() => {
-//     if (document.status === DocumentStatus.COMPLETED) {
-//       return;
-//     }
+  useEffect(() => {
+    if (document.status === DocumentStatus.COMPLETED) {
+      return;
+    }
 
-//     const interval = setInterval(() => {
-//       if (window.document.hasFocus()) {
-//         router.refresh();
-//       }
-//     }, 5000);
+    const interval = setInterval(() => {
+      if (window.document.hasFocus()) {
+        void revalidate();
+      }
+    }, 5000);
 
-//     return () => clearInterval(interval);
-//   }, [router, document.status]);
+    return () => clearInterval(interval);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [document.status]);
 
-//   return <></>;
-// };
+  return <></>;
+};

apps/remix/app/routes/_unauthenticated+/verify-email.$token.tsx

@@ -8,7 +8,7 @@ import { Link, redirect, useNavigate } from 'react-router';
 import { match } from 'ts-pattern';
 
 import { authClient } from '@documenso/auth/client';
-import { EMAIL_VERIFICATION_STATE } from '@documenso/lib/server-only/user/verify-email';
+import { EMAIL_VERIFICATION_STATE } from '@documenso/lib/constants/email';
 import { Button } from '@documenso/ui/primitives/button';
 import { useToast } from '@documenso/ui/primitives/use-toast';