final changes

Author: steven-tey

apps/web/app/app.dub.co/(dashboard)/[slug]/links/[...link]/page-client.tsx

@@ -50,10 +50,16 @@ export function LinkPageClient() {
     },
     {
       keepPreviousData: true,
-      onError: (error) => {
+      // doing onErrorRetry to avoid race condiition for when a link's domain / key is updated
+      onErrorRetry: (error, _key, _config, revalidate, { retryCount }) => {
         if (error.status === 401 || error.status === 404) {
-          router.push(`/${workspace.slug}/links`);
+          if (retryCount >= 3) {
+            router.push(`/${workspace.slug}/links`);
+            return;
+          }
         }
+        // Default retry behavior for other errors
+        setTimeout(() => revalidate({ retryCount }), 5000);
       },
     },
   );

apps/web/lib/swr/use-folder.ts

@@ -5,29 +5,27 @@ import useWorkspace from "./use-workspace";
 
 export default function useFolder({
   folderId,
-  enabled: enabledOverride,
+  enabled,
 }: {
   folderId?: string | null;
   enabled?: boolean;
 }) {
   const { id: workspaceId, plan, flags } = useWorkspace();
 
-  const defaultEnabled =
+  const swrEnabled =
+    enabled &&
     folderId &&
     folderId !== "unsorted" &&
     workspaceId &&
     flags?.linkFolders &&
     plan !== "free";
 
-  const enabled =
-    enabledOverride !== undefined ? enabledOverride : defaultEnabled;
-
   const {
     data: folder,
     isValidating,
     isLoading,
   } = useSWR<Folder>(
-    enabled ? `/api/folders/${folderId}?workspaceId=${workspaceId}` : null,
+    swrEnabled ? `/api/folders/${folderId}?workspaceId=${workspaceId}` : null,
     fetcher,
     {
       dedupingInterval: 60000,

apps/web/ui/links/link-builder/use-link-builder-submit.tsx

@@ -1,6 +1,7 @@
 import { mutatePrefix } from "@/lib/swr/mutate";
 import { UpgradeRequiredToast } from "@/ui/shared/upgrade-required-toast";
-import { useCopyToClipboard, useRouterStuff } from "@dub/ui";
+import { useCopyToClipboard } from "@dub/ui";
+import { useRouter } from "next/navigation";
 import posthog from "posthog-js";
 import { useCallback } from "react";
 import { useFormContext } from "react-hook-form";
@@ -13,7 +14,7 @@ export function useLinkBuilderSubmit({
 }: {
   onSuccess?: (data: LinkFormData) => void;
 } = {}) {
-  const { queryParams } = useRouterStuff();
+  const router = useRouter();
   const { workspace, props } = useLinkBuilderContext();
   const { getValues, setError } = useFormContext<LinkFormData>();
 
@@ -61,6 +62,15 @@ export function useLinkBuilderSubmit({
           const data = await res.json();
           onSuccess?.(data);
 
+          // for editing links, if domain / key is changed, push to new url
+          console.log({ props, data });
+          if (
+            props &&
+            (props.domain !== data.domain || props.key !== data.key)
+          ) {
+            router.push(`/${workspace.slug}/links/${data.domain}/${data.key}`);
+          }
+
           await mutatePrefix([
             "/api/links",
             // if updating root domain link, mutate domains as well