[pull] main from dubinc:main

apps/web/app/api/folders/[folderId]/route.ts

@@ -34,7 +34,6 @@ export const GET = withWorkspace(
       "advanced",
       "enterprise",
     ],
-    featureFlag: "linkFolders",
   },
 );
 
@@ -104,7 +103,6 @@ export const PATCH = withWorkspace(
       "advanced",
       "enterprise",
     ],
-    featureFlag: "linkFolders",
   },
 );
 
@@ -175,6 +173,5 @@ export const DELETE = withWorkspace(
       "advanced",
       "enterprise",
     ],
-    featureFlag: "linkFolders",
   },
 );

apps/web/app/api/folders/[folderId]/users/route.ts

@@ -82,6 +82,5 @@ export const GET = withWorkspace(
       "advanced",
       "enterprise",
     ],
-    featureFlag: "linkFolders",
   },
 );

apps/web/app/api/folders/access-requests/route.ts

@@ -28,6 +28,5 @@ export const GET = withWorkspace(
       "advanced",
       "enterprise",
     ],
-    featureFlag: "linkFolders",
   },
 );

apps/web/app/api/folders/count/route.ts

@@ -42,6 +42,5 @@ export const GET = withWorkspace(
   },
   {
     requiredPermissions: ["folders.read"],
-    featureFlag: "linkFolders",
   },
 );

apps/web/app/api/folders/permissions/route.ts

@@ -56,6 +56,5 @@ export const GET = withWorkspace(
       "advanced",
       "enterprise",
     ],
-    featureFlag: "linkFolders",
   },
 );

apps/web/app/api/folders/route.ts

@@ -43,7 +43,6 @@ export const GET = withWorkspace(
       "advanced",
       "enterprise",
     ],
-    featureFlag: "linkFolders",
   },
 );
 
@@ -124,6 +123,5 @@ export const POST = withWorkspace(
       "advanced",
       "enterprise",
     ],
-    featureFlag: "linkFolders",
   },
 );

apps/web/app/api/workspaces/[idOrSlug]/route.ts

@@ -40,11 +40,6 @@ export const GET = withWorkspace(
           ...workspace,
           id: prefixWorkspaceId(workspace.id),
           domains,
-          // TODO: Remove this once Folders goes GA
-          flags: {
-            ...flags,
-            linkFolders: flags.linkFolders || workspace.partnersEnabled,
-          },
         }),
       },
       { headers },

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

@@ -156,8 +156,6 @@ function LinkBuilder({ link }: { link: ExpandedLinkProps }) {
             );
           }}
           className="p-0"
-          foldersEnabled={!!workspace.flags?.linkFolders}
-          linkToFolder={!!workspace.flags?.linkFolders}
         >
           <div
             className={cn(

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

@@ -1,10 +1,10 @@
+import { FolderSwitcher } from "@/ui/folders/folder-switcher";
 import { PageContent } from "@/ui/layout/page-content";
-import { LinksTitle } from "./links-title";
 import WorkspaceLinksClient from "./page-client";
 
 export default function WorkspaceLinks() {
   return (
-    <PageContent title={<LinksTitle />}>
+    <PageContent title={<FolderSwitcher />}>
       <WorkspaceLinksClient />
     </PageContent>
   );

apps/web/app/app.dub.co/(dashboard)/[slug]/settings/billing/plan-usage.tsx

@@ -185,8 +185,7 @@ export default function PlanUsage() {
         <div
           className={cn(
             "grid grid-cols-1 gap-[1px] overflow-hidden rounded-b-lg bg-neutral-200 md:grid-cols-3",
-            flags?.linkFolders &&
-              "md:grid-cols-2 lg:grid-cols-2 xl:grid-cols-4",
+            "md:grid-cols-2 lg:grid-cols-2 xl:grid-cols-4",
             !partnersEnabled && "rounded-b-lg",
           )}
         >
@@ -197,15 +196,13 @@ export default function PlanUsage() {
             usageLimit={domainsLimit}
             href={`/${slug}/settings/domains`}
           />
-          {flags?.linkFolders && (
-            <UsageCategory
-              title="Folders"
-              icon={Folder5}
-              usage={foldersUsage}
-              usageLimit={foldersLimit}
-              href={`/${slug}/settings/library/folders`}
-            />
-          )}
+          <UsageCategory
+            title="Folders"
+            icon={Folder5}
+            usage={foldersUsage}
+            usageLimit={foldersLimit}
+            href={`/${slug}/settings/library/folders`}
+          />
           <UsageCategory
             title="Tags"
             icon={Tag}

apps/web/app/app.dub.co/(dashboard)/[slug]/settings/library/folders/page-client.tsx

@@ -38,10 +38,6 @@ export const FoldersPageClient = () => {
   const showAllLinkFolder =
     !searchParams.get("search") || folders?.length === 0;
 
-  if (flags && !flags.linkFolders) {
-    router.push("/settings");
-  }
-
   const { pagination, setPagination } = usePagination(FOLDERS_MAX_PAGE_SIZE);
 
   return (

apps/web/app/app.dub.co/(dashboard)/[slug]/settings/library/header.tsx

@@ -12,9 +12,7 @@ export default function LibraryHeader() {
   const page = selectedLayoutSegment === null ? "" : selectedLayoutSegment;
 
   if (selectedLayoutSegment === null) {
-    redirect(
-      `/${slug}/settings/library/${flags?.linkFolders ? "folders" : "tags"}`,
-    );
+    redirect(`/${slug}/settings/library/folders`);
   }
 
   return (
@@ -29,15 +27,11 @@ export default function LibraryHeader() {
       <TabSelect
         variant="accent"
         options={[
-          ...(flags?.linkFolders
-            ? [
-                {
-                  id: "folders",
-                  label: "Folders",
-                  href: `/${slug}/settings/library/folders`,
-                },
-              ]
-            : []),
+          {
+            id: "folders",
+            label: "Folders",
+            href: `/${slug}/settings/library/folders`,
+          },
           { id: "tags", label: "Tags", href: `/${slug}/settings/library/tags` },
           {
             id: "utm",

apps/web/lib/auth/workspace.ts

@@ -351,12 +351,6 @@ export const withWorkspace = (
             workspaceId: workspace.id,
           });
 
-          // TODO: Remove this once Folders goes GA
-          flags = {
-            ...flags,
-            linkFolders: flags.linkFolders || workspace.partnersEnabled,
-          };
-
           if (!flags[featureFlag]) {
             throw new DubApiError({
               code: "forbidden",

apps/web/lib/edge-config/get-feature-flags.ts

@@ -17,7 +17,6 @@ export const getFeatureFlags = async ({
 
   const workspaceFeatures: Record<BetaFeatures, boolean> = {
     noDubLink: false,
-    linkFolders: false,
     abTesting: false,
   };
 

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

@@ -4,12 +4,12 @@ import useSWR from "swr";
 import useWorkspace from "./use-workspace";
 
 export function useFolderAccessRequests() {
-  const { id, plan, flags } = useWorkspace();
+  const { id, plan } = useWorkspace();
 
   const { data, error, isLoading, isValidating, mutate } = useSWR<
     FolderAccessRequest[]
   >(
-    id && flags?.linkFolders && plan !== "free" && plan !== "pro"
+    id && plan !== "free" && plan !== "pro"
       ? `/api/folders/access-requests?workspaceId=${id}`
       : null,
     fetcher,

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

@@ -5,10 +5,10 @@ import useSWR from "swr";
 import useWorkspace from "./use-workspace";
 
 export function useFolderPermissions() {
-  const { id, plan, flags } = useWorkspace();
+  const { id, plan } = useWorkspace();
 
   const { data, error, isLoading, mutate } = useSWR<FolderWithPermissions[]>(
-    id && flags?.linkFolders && plan !== "free" && plan !== "pro"
+    id && plan !== "free" && plan !== "pro"
       ? `/api/folders/permissions?workspaceId=${id}`
       : null,
     fetcher,

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

@@ -10,14 +10,13 @@ export default function useFolder({
   folderId?: string | null;
   enabled?: boolean;
 }) {
-  const { id: workspaceId, plan, flags } = useWorkspace();
+  const { id: workspaceId, plan } = useWorkspace();
 
   const swrEnabled =
     enabled &&
     folderId &&
     folderId !== "unsorted" &&
     workspaceId &&
-    flags?.linkFolders &&
     plan !== "free";
 
   const {

apps/web/lib/swr/use-folders-count.ts

@@ -10,7 +10,7 @@ export default function useFoldersCount({
   includeParams?: boolean;
   query?: Record<string, any>;
 } = {}) {
-  const { id: workspaceId, plan, flags } = useWorkspace();
+  const { id: workspaceId, plan } = useWorkspace();
 
   const { getQueryString } = useRouterStuff();
 
@@ -20,9 +20,7 @@ export default function useFoldersCount({
   );
 
   const { data, error } = useSWR<number>(
-    workspaceId && flags?.linkFolders && plan !== "free"
-      ? `/api/folders/count${qs}`
-      : null,
+    workspaceId && plan !== "free" ? `/api/folders/count${qs}` : null,
     fetcher,
     {
       dedupingInterval: 60000,

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

@@ -15,7 +15,7 @@ export default function useFolders({
   query?: Record<string, any>;
   options?: SWRConfiguration;
 } = {}) {
-  const { id: workspaceId, plan, flags } = useWorkspace();
+  const { id: workspaceId, plan } = useWorkspace();
   const { getQueryString } = useRouterStuff();
 
   const qs = getQueryString(
@@ -28,7 +28,7 @@ export default function useFolders({
     isValidating,
     isLoading,
   } = useSWR<Folder[]>(
-    workspaceId && flags?.linkFolders && plan !== "free"
+    workspaceId && plan !== "free"
       ? `/api/folders${qs}${includeLinkCount ? "&includeLinkCount=true" : ""}`
       : null,
     fetcher,

apps/web/lib/types.ts

@@ -138,7 +138,7 @@ export type PlanProps = (typeof plans)[number];
 
 export type RoleProps = (typeof roles)[number];
 
-export type BetaFeatures = "noDubLink" | "linkFolders" | "abTesting";
+export type BetaFeatures = "noDubLink" | "abTesting";
 
 export interface WorkspaceProps extends Project {
   logo: string | null;

apps/web/ui/analytics/toggle.tsx

@@ -452,50 +452,46 @@ export default function Toggle({
           ? [LinkFilterItem, CustomerFilterItem]
           : [
               ...(canManageCustomers ? [CustomerFilterItem] : []),
-              ...(flags?.linkFolders
-                ? [
-                    {
-                      key: "folderId",
-                      icon: Folder,
-                      label: "Folder",
-                      shouldFilter: !foldersAsync,
-                      getOptionIcon: (value, props) => {
-                        const folderName = props.option?.label;
-                        const folder = folders?.find(
-                          ({ name }) => name === folderName,
-                        );
+              {
+                key: "folderId",
+                icon: Folder,
+                label: "Folder",
+                shouldFilter: !foldersAsync,
+                getOptionIcon: (value, props) => {
+                  const folderName = props.option?.label;
+                  const folder = folders?.find(
+                    ({ name }) => name === folderName,
+                  );
 
-                        return folder ? (
-                          <FolderIcon
-                            folder={folder}
-                            shape="square"
-                            iconClassName="size-3"
-                          />
-                        ) : null;
-                      },
-                      options: loadingFolders
-                        ? null
-                        : [
-                            ...(folders || []),
-                            // Add currently filtered folder if not already in the list
-                            ...(selectedFolder &&
-                            !folders?.find((f) => f.id === selectedFolder.id)
-                              ? [selectedFolder]
-                              : []),
-                          ].map((folder) => ({
-                            value: folder.id,
-                            icon: (
-                              <FolderIcon
-                                folder={folder}
-                                shape="square"
-                                iconClassName="size-3"
-                              />
-                            ),
-                            label: folder.name,
-                          })),
-                    },
-                  ]
-                : []),
+                  return folder ? (
+                    <FolderIcon
+                      folder={folder}
+                      shape="square"
+                      iconClassName="size-3"
+                    />
+                  ) : null;
+                },
+                options: loadingFolders
+                  ? null
+                  : [
+                      ...(folders || []),
+                      // Add currently filtered folder if not already in the list
+                      ...(selectedFolder &&
+                      !folders?.find((f) => f.id === selectedFolder.id)
+                        ? [selectedFolder]
+                        : []),
+                    ].map((folder) => ({
+                      value: folder.id,
+                      icon: (
+                        <FolderIcon
+                          folder={folder}
+                          shape="square"
+                          iconClassName="size-3"
+                        />
+                      ),
+                      label: folder.name,
+                    })),
+              },
               {
                 key: "tagIds",
                 icon: Tag,