apps/web/ui/modals/set-default-folder-modal.tsx (1)

87-90: Disable action if workspaceId isn’t ready

Button can be clicked when workspaceId is not loaded (early-return inside handler silently no-ops). Disable it until ready for clearer UX.

-          loading={isPending}
+          loading={isPending}
+          disabled={!workspaceId}

apps/web/ui/modals/import-rebrandly-modal.tsx (1)

152-154: Optional: build the redirect URL via query helpers to preserve existing params

Using string templates drops any other existing query params. Consider useRouterStuff().queryParams({ set: { folderId } }) and then router.push or call it directly to maintain state.

apps/web/lib/swr/use-current-folder-id.ts (1)

4-14: Add explicit return type for clarity and downstream typing

Helps call sites reason about nullability and avoids implicit any regressions if this grows.

-export default function useCurrentFolderId() {
+export default function useCurrentFolderId(): { folderId: string | null } {

apps/web/ui/modals/import-short-modal.tsx (1)

141-142: Optional: preserve existing query params when redirecting after import

Consider using useRouterStuff().queryParams to set folderId rather than manually constructing ?folderId=..., which drops other stateful params.

apps/web/ui/modals/import-csv-modal/index.tsx (1)

220-222: URL-encode folderId when composing the redirect.

If folderId ever contains non-URL-safe characters, the query string can break. Safer to encode the value.

Apply this diff:

-                    router.push(
-                      `/${slug}/links${folderId ? `?folderId=${folderId}` : ""}`,
-                    );
+                    router.push(
+                      `/${slug}/links${
+                        folderId ? `?folderId=${encodeURIComponent(folderId)}` : ""
+                      }`,
+                    );

apps/web/ui/links/links-container.tsx (2)

91-99: Empty-state “filtered” logic may ignore default-folder scoping.

isFiltered only checks URL params. With the new hook, users can be scoped to a default folder even without a folderId param, which would still show the “No links yet” state (with CTA) instead of “No links found” (no CTA). If the intent is to treat default-folder scoping as a filter, thread that signal into LinksList.

Apply these diffs:

@@
   return (
     <PageWidthWrapper className="grid gap-y-2">
       <LinksList
         CreateLinkButton={CreateLinkButton}
         links={links}
         count={count}
         loading={isValidating}
         compact={viewMode === "rows"}
+        folderScoped={!!folderId}
       />
     </PageWidthWrapper>
   );

@@
-function LinksList({
+function LinksList({
   CreateLinkButton,
   links,
   count,
   loading,
   compact,
+  folderScoped,
 }: {
   CreateLinkButton: () => JSX.Element;
   links?: ResponseLink[];
   count?: number;
   loading?: boolean;
   compact: boolean;
+  folderScoped: boolean;
 }) {

@@
-  const isFiltered = [
-    "folderId",
-    "tagIds",
-    "domain",
-    "userId",
-    "search",
-    "showArchived",
-  ].some((param) => searchParams.has(param));
+  const isFiltered =
+    folderScoped ||
+    ["tagIds", "domain", "userId", "search", "showArchived"].some((param) =>
+      searchParams.has(param),
+    );

Also applies to: 54-61, 73-85

---

42-43: Replace empty‐string sentinel with undefined for folderId in useLinks calls

To ensure downstream query/serialization treats “unspecified” correctly, update both calls in apps/web/ui/links/links-container.tsx:

• At lines 42–43:

-    folderId: folderId ?? "",
+    folderId: folderId ?? undefined,

• At lines 48–49 (useLinksCount):

-    folderId: folderId ?? "",
+    folderId: folderId ?? undefined,

This preserves the existing typing (opts is a partial Zod‐inferred schema) while omitting folderId entirely when falsy, avoiding accidental ?folderId= emissions.

apps/web/ui/modals/import-bitly-modal.tsx (1)

13-13: Sanity-check env configuration at build time.

If NEXT_PUBLIC_BITLY_CLIENT_ID is missing, the generated OAuth URL will be invalid (client_id=undefined). Consider a build-time guard to surface misconfig early.

I can provide a tiny compile-time assertion or runtime console.warn gated to dev if useful.

apps/web/ui/links/link-controls.tsx (1)

103-105: Prefer nullish coalescing for folder selection.

Use ?? rather than || to avoid treating empty strings as falsy. While folderId shouldn’t be "", using the nullish operator communicates intent and avoids accidental fallthrough.

Apply this diff:

-  const { folderId: currentFolderId } = useCurrentFolderId();
-  const folderId = link.folderId || currentFolderId;
+  const { folderId: currentFolderId } = useCurrentFolderId();
+  const folderId = link.folderId ?? currentFolderId;

apps/web/lib/swr/use-is-mega-folder.ts (1)

11-12: Minor boolean simplification.

The ternary can be simplified for readability.

Apply this diff:

-    isMegaFolder: folderId && folder?.type === "mega" ? true : false,
+    isMegaFolder: !!folderId && folder?.type === "mega",

apps/web/ui/links/use-link-filters.tsx (2)

86-101: Remove the ts-expect-error by tightening return types from useUserFilterOptions.

The // @ts-expect-error masks type drift between the two branches of useUserFilterOptions. Normalize the return type so this map is type-safe.

Apply these changes:

-  // @ts-expect-error
-  users?.map(({ id, name, email, image, count }) => ({
+  users?.map(({ id, name, email, image, count }) => ({
     value: id,
     label: name || email,
     icon: (
       <Avatar
         user={{
           id,
           name,
           image,
         }}
         className="h-4 w-4"
       />
     ),
     right: nFormatter(count, { full: true }),
   })) ?? null,

And update the helper’s signature and shape to be consistent (lower in the file):

-function useUserFilterOptions({ folderId }: { folderId: string }) {
+type UserFilterOption = {
+  id: string;
+  name?: string;
+  email?: string;
+  image?: string;
+  count: number;
+};
+
+function useUserFilterOptions({ folderId }: { folderId: string }): UserFilterOption[] | null {

---

120-136: Guard against duplicate tagIds when selecting.

Repeatedly selecting the same tag can introduce duplicates in tagIds. Deduplicate when composing the param.

-      queryParams({
-        set: {
-          tagIds: selectedTagIds.concat(value).join(","),
-        },
-        del: "page",
-      });
+      queryParams({
+        set: {
+          tagIds: Array.from(new Set(selectedTagIds.concat(value))).join(","),
+        },
+        del: "page",
+      });

apps/web/ui/links/link-card.tsx (1)

80-83: Add editUrl to the prefetch effect deps.

router.prefetch(editUrl) depends on editUrl. Add it to avoid linter noise and ensure correctness if props change.

-useEffect(() => {
-  if (isInView) router.prefetch(editUrl);
-}, [isInView]);
+useEffect(() => {
+  if (isInView) router.prefetch(editUrl);
+}, [isInView, editUrl]);

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

💡 Knowledge Base configuration:

• MCP integration is disabled by default for public repositories
• Jira integration is disabled by default for public repositories
• Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

apps/web/ui/modals/set-default-folder-modal.tsx (2)

26-26: Good move to use slug alongside workspaceId

Destructuring slug from useWorkspace() aligns this modal with the slug-based SWR key used by useWorkspace.

---

33-35: Folder SWR key usage is consistent

All folder-related SWR mutations and fetches in the codebase use the workspaceId query parameter (e.g. mutate('/api/folders?workspaceId=…')), and there are no instances of slug-based folder keys (such as ?workspaceSlug= or ?slug=). The set-default-folder-modal.tsx call to mutate('/api/folders?workspaceId=${workspaceId}') matches the existing convention, so you can disregard the fragmentation concern raised earlier.

Likely an incorrect or invalid review comment.

apps/web/ui/modals/import-rebrandly-modal.tsx (1)

1-1: Nice adoption of useCurrentFolderId

Centralizing folderId sourcing through the new hook removes URL-coupling and keeps behavior consistent with defaults.

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

3-3: Good change: useCurrentFolderId import

Using the hook removes direct coupling to URL parsing across the page.

---

89-97: useCheckFolderPermission already handles null/“unsorted” folderId

The implementation in apps/web/lib/swr/use-folder-permissions.ts returns true if folderId is falsy (e.g. null) or equals "unsorted", so unsorted folders are granted access by design. No changes needed.

apps/web/lib/swr/use-current-folder-id.ts (1)

4-14: Solid, minimal hook to source folderId

Reading from search params with fallback to defaultFolderId and normalizing “unsorted” to null is clean and predictable.

apps/web/ui/modals/import-short-modal.tsx (1)

1-1: Good use of useCurrentFolderId

Consistent with the rest of the PR, removing direct URL parsing here improves cohesion.

apps/web/ui/modals/import-csv-modal/index.tsx (1)

4-4: Good migration to the centralized folderId source.

Adopting useCurrentFolderId keeps folder scoping consistent across the app and avoids URL/searchParam drift. Appending folderId to FormData only when present is also correct.

Also applies to: 103-103, 208-208

apps/web/ui/links/links-container.tsx (1)

3-3: Hook adoption looks solid.

Replacing ad-hoc searchParam/default logic with useCurrentFolderId reduces edge cases and aligns with the rest of the PR.

Also applies to: 37-37

apps/web/ui/modals/import-bitly-modal.tsx (1)

1-1: Folder scoping wired correctly.

Using the new hook for folderId and threading it through state and POST payload keeps Bitly imports aligned with the current folder context.

Also applies to: 36-36, 138-139

apps/web/ui/links/link-controls.tsx (1)

146-149: I’ve requested the full implementation of useCheckFolderPermission for inspection. Once we see how it treats folderId === null, we can confirm whether an explicit workspace-level fallback is needed.

apps/web/ui/links/use-link-filters.tsx (1)

199-205: Confirm folderId sentinel semantics for “unsorted”.

You pass folderId as string, with null normalized to "". Ensure useLinksCount interprets "" as “unsorted/null folder” consistently across endpoints. If not, consider sending undefined instead and handling defaulting inside the hook.

apps/web/ui/links/link-card.tsx (1)

55-66: Consistent “show folder” condition with new hook — LGTM.

Switching to useCurrentFolderId() and keeping the “not default nor selected” check preserves existing UX. Nice.

apps/web/ui/links/link-title-column.tsx (1)

108-116: Navigation consistency

Good call switching to a slug-based folder link here. Once the identity check above is fixed, this stays consistent with the “Open folder” banner in LinkCard.

apps/web/ui/folders/folder-dropdown.tsx (2)

96-101: Confirm redirect intent after folder creation.

Current logic only redirects to the new folder if you were already in a folder view. If the user creates a folder from “All/Unsorted”, it won’t navigate into the new folder. Is that intended?

If not, consider always navigating to the new folder when auto-redirect is enabled:

-        router.push(
-          `/${slug}/links${folderId && folderId !== "unsorted" ? `?folderId=${folder.id}` : ""}`,
-        );
+        router.push(`/${slug}/links?folderId=${folder.id}`);

---

195-205: URL handling for “unsorted” with default folder

Good handling: delete folderId only when selecting “unsorted” and there is no defaultFolderId; otherwise set folderId=unsorted. This keeps URL state explicit when needed.

apps/web/ui/links/link-title-column.tsx (1)

78-94: Show folder icon only when link’s folder differs from both the current and the default folder (match LinkCard).

Current check only excludes the current folder. Links in the default folder will still show a folder icon when viewed outside that folder, which diverges from LinkCard and leads to inconsistent UI. Include the defaultFolderId in the exclusion and update deps.

Apply:

-  const { slug } = useWorkspace();
+  const { slug, defaultFolderId } = useWorkspace();
@@
-  const showFolderIcon = useMemo(() => {
-    return Boolean(
-      !loading && link.folderId && currentFolderId !== link.folderId,
-    );
-  }, [loading, link.folderId, currentFolderId]);
+  const showFolderIcon = useMemo(() => {
+    return Boolean(
+      !loading &&
+        link.folderId &&
+        ![defaultFolderId ?? null, currentFolderId ?? null].includes(
+          link.folderId,
+        ),
+    );
+  }, [loading, link.folderId, defaultFolderId, currentFolderId]);

Please confirm LinkCard uses the same identity-based exclusion for both current and default folders so the behavior stays consistent across views.

apps/web/ui/links/link-title-column.tsx (1)

105-113: Verify slug availability for the folder link href.

This builds /${slug}/links?folderId=.... If this component can render in contexts without a workspace slug (e.g., admin mode), the href becomes malformed. If that can’t happen, we’re good; otherwise guard or compute a safe fallback.

Configuration used: CodeRabbit UI

Review profile: CHILL

Plan: Pro

💡 Knowledge Base configuration:

• MCP integration is disabled by default for public repositories
• Jira integration is disabled by default for public repositories
• Linear integration is disabled by default for public repositories

You can enable these sources in your CodeRabbit configuration.

apps/web/ui/links/link-title-column.tsx (2)

3-3: LGTM: Switched to useCurrentFolderId.

Good move away from ad-hoc URL parsing; centralizing folder resolution reduces edge cases (e.g., “unsorted” → null mapping).

---

45-45: LGTM: Added useParams import for UserAvatar.

Required for the admin-mode conditional; import aligns with usage below.