Merge branch 'feat/byok-frontend-ui'

Author: yash-pouranik

apps/dashboard-api/src/controllers/project.controller.js

@@ -522,11 +522,7 @@ module.exports.getSingleProject = async (req, res) => {
       await setProjectById(req.params.projectId, projectObj);
     }
 
-    res.json({
-      success: true,
-      data: sanitizeProjectResponse(projectObj),
-      message: ""
-    });
+    res.json(sanitizeProjectResponse(projectObj));
   } catch (err) {
     if (err instanceof AppError) {
       return res.status(err.statusCode).json({

apps/web-dashboard/src/components/Layout/Header.jsx

@@ -26,7 +26,8 @@ function Header({ onToggleSidebar, showToggle = true, isSidebarCollapsed = false
         }
         api.get(`/api/projects/${projectId}`)
             .then(res => {
-                if (isMounted) setProjectName(res.data.name);
+                const projectData = res.data?.data || res.data;
+                if (isMounted && projectData) setProjectName(projectData.name || '');
             })
             .catch(err => console.error("Failed to fetch project name for header:", err));
         return () => { isMounted = false; };

apps/web-dashboard/src/pages/Database.jsx

@@ -63,7 +63,8 @@ export default function Database() {
       const fetchProject = async () => {
         try {
           const res = await api.get(`/api/projects/${projectId}`);
-          const withRlsDefaults = (res.data.collections || []).map(c => ({
+          const projectData = res.data?.data || res.data;
+          const withRlsDefaults = (projectData?.collections || []).map(c => ({
               ...c,
               rls: {
                 enabled: typeof c.rls?.enabled === 'boolean' ? c.rls.enabled : false,
@@ -73,7 +74,7 @@ export default function Database() {
               }
           }));
           if (isMounted) {
-            setProject(res.data);
+            setProject(projectData);
             setCollections(withRlsDefaults);
             const queryCol = searchParams.get("collection");
             if (queryCol) {

apps/web-dashboard/src/pages/MailPlatform.jsx

@@ -62,7 +62,7 @@ export default function MailPlatform() {
                 api.get(`/api/projects/${projectId}`),
                 api.get(`/api/projects/${projectId}/mail/logs`)
             ]);
-            setProject(projRes.data);
+            setProject(projRes.data?.data || projRes.data);
             if (logsRes.data?.success) {
                 setLogs(logsRes.data.data.logs || []);
             }

apps/web-dashboard/src/pages/ProjectDetails.jsx

@@ -44,7 +44,7 @@ function ProjectDetails() {
                     api.get(`/api/projects/${projectId}/analytics`)
                 ]);
                 if (isMounted) {
-                    setProject(projectRes.data);
+                    setProject(projectRes.data?.data || projectRes.data);
                     setAnalytics(analyticsRes.data.success ? analyticsRes.data.data : analyticsRes.data);
                 }
             } catch (err){

apps/web-dashboard/src/pages/ProjectSettings.jsx

@@ -54,7 +54,7 @@ export default function ProjectSettings() {
         const fetchProject = async () => {
             try {
                 const res = await api.get(`/api/projects/${projectId}`);
-                const projectData = res.data;
+                const projectData = res.data?.data || res.data;
                 const myMember = projectData?.members?.find(m => {
                     const memberId = typeof m.user === 'object' ? m.user?._id : m.user;
                     return memberId?.toString() === user?._id?.toString() || m.email === user?.email;

apps/web-dashboard/src/pages/Storage.jsx

@@ -24,7 +24,7 @@ export default function Storage() {
                 api.get(`/api/projects/${projectId}`),
                 api.get(`/api/projects/${projectId}/storage/files`)
             ]);
-            setProject(projRes.data);
+            setProject(projRes.data?.data || projRes.data);
             setFiles(filesRes.data);
         } catch {
             toast.error("Failed to load files");

apps/web-dashboard/src/pages/Webhooks.jsx

@@ -65,7 +65,7 @@ export default function Webhooks() {
         api.get(`/api/projects/${projectId}`),
         api.get(`/api/projects/${projectId}/webhooks`)
       ]);
-      setProject(projRes.data);
+      setProject(projRes.data?.data || projRes.data);
       setWebhooks(webhooksRes.data.data || []);
     } catch (err) {
       console.error(err);