Merge pull request dubinc#2380 from dubinc/folders-ga

Folders GA

Author: steven-tey

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/links-title.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>
   );