Merge branch 'geturbackend:main' into feature/db-export-pipeline

renganathc · web-flow · commit bd3cfb85f188 · 2026-05-29T19:26:22.000+05:30
diff --git a/apps/dashboard-api/src/__tests__/project.controller.softDelete.test.js b/apps/dashboard-api/src/__tests__/project.controller.softDelete.test.js
@@ -7,15 +7,15 @@ const mockModel = {
     findOneAndUpdate: mockFindOneAndUpdate,
 };
 
-const mockDispatchWebhooks = jest.fn();
+const mockWebhookQueueAdd = jest.fn();
 
 jest.mock('@urbackend/common', () => ({
     Project: {
         findOne: mockFindOne,
     },
     getConnection: jest.fn().mockResolvedValue({}),
     getCompiledModel: jest.fn(() => mockModel),
-    dispatchWebhooks: mockDispatchWebhooks,
+    webhookQueue: { add: mockWebhookQueueAdd },
     enqueueCollectionCleanup: jest.fn().mockResolvedValue(true),
     syncCollectionCleanup: jest.fn().mockResolvedValue(true),
     AppError: class AppError extends Error {
@@ -161,11 +161,16 @@ describe('Soft Delete in dashboard project.controller', () => {
             message: "Document recovered from trash" 
         });
 
-        expect(mockDispatchWebhooks).toHaveBeenCalledWith(expect.objectContaining({
-            action: 'recover',
-            document: restoredDoc,
-            projectId: 'proj_1'
-        }));
+        expect(mockWebhookQueueAdd).toHaveBeenCalledWith(
+            'trigger-webhook',
+            expect.objectContaining({
+                event: 'document.recovered',
+                payload: restoredDoc,
+                projectId: 'proj_1',
+                collection: 'posts'
+            }),
+            { removeOnComplete: true }
+        );
         const { syncCollectionCleanup } = require('@urbackend/common');
         expect(syncCollectionCleanup).toHaveBeenCalledWith('proj_1', 'posts');
     });
diff --git a/apps/dashboard-api/src/controllers/project.controller.js b/apps/dashboard-api/src/controllers/project.controller.js
@@ -22,7 +22,7 @@ const { getConnection } = require("@urbackend/common");
 const { getCompiledModel } = require("@urbackend/common");
 const { QueryEngine } = require("@urbackend/common");
 const { storageRegistry } = require("@urbackend/common");
-const { AppError, dispatchWebhooks, enqueueCollectionCleanup, syncCollectionCleanup } = require("@urbackend/common");
+const { AppError, webhookQueue, enqueueCollectionCleanup, syncCollectionCleanup } = require("@urbackend/common");
 const { resolveEffectivePlan } = require("@urbackend/common");
 const {
   deleteProjectByApiKeyCache,
@@ -1055,14 +1055,12 @@ module.exports.recoverRow = async (req, res, next) => {
       return next(new AppError(404, "Document not found or recovery window expired (30 days)."));
     }
 
-    dispatchWebhooks({
+    await webhookQueue.add('trigger-webhook', {
       projectId: project._id,
+      event: 'document.recovered',
       collection: collectionName,
-      action: "recover",
-      document: result,
-      documentId: id,
-      options: { bypassLimit: true }
-    });
+      payload: result
+    }, { removeOnComplete: true });
 
     try {
       await syncCollectionCleanup(projectId, collectionName);
diff --git a/apps/public-api/src/__tests__/softDelete.test.js b/apps/public-api/src/__tests__/softDelete.test.js
@@ -18,7 +18,7 @@ jest.mock('@urbackend/common', () => {
         Project: {},
         getConnection: jest.fn().mockResolvedValue({}),
         getCompiledModel: jest.fn(() => mockModel),
-        dispatchWebhooks: jest.fn(),
+        webhookQueue: { add: jest.fn() },
         QueryEngine: jest.fn(),
         validateData: jest.fn(),
         validateUpdateData: jest.fn(),
@@ -138,12 +138,17 @@ describe('Soft Delete in data.controller', () => {
             message: "Document recovered from trash" 
         });
 
-        const { dispatchWebhooks, syncCollectionCleanup } = require('@urbackend/common');
-        expect(dispatchWebhooks).toHaveBeenCalledWith(expect.objectContaining({
-            action: 'recover',
-            document: restoredDoc,
-            projectId: 'proj_1'
-        }));
+        const { webhookQueue, syncCollectionCleanup } = require('@urbackend/common');
+        expect(webhookQueue.add).toHaveBeenCalledWith(
+            'trigger-webhook',
+            expect.objectContaining({
+                event: 'document.recovered',
+                payload: restoredDoc,
+                projectId: 'proj_1',
+                collection: 'posts'
+            }),
+            { removeOnComplete: true }
+        );
         expect(syncCollectionCleanup).toHaveBeenCalledWith('proj_1', 'posts');
     });
 
diff --git a/apps/public-api/src/controllers/data.controller.js b/apps/public-api/src/controllers/data.controller.js
@@ -4,7 +4,7 @@ const { Project } = require("@urbackend/common");
 const { getConnection } = require("@urbackend/common");
 const { getCompiledModel } = require("@urbackend/common");
 const { QueryEngine } = require("@urbackend/common");
-const { validateData, validateUpdateData, aggregateSchema, dispatchWebhooks } = require("@urbackend/common");
+const { validateData, validateUpdateData, aggregateSchema, webhookQueue } = require("@urbackend/common");
 const { performance } = require('perf_hooks');
 const { z } = require("zod");
 const { 
@@ -83,13 +83,12 @@ module.exports.insertData = async (req, res) => {
       );
     }
 
-    dispatchWebhooks({
+    await webhookQueue.add('trigger-webhook', {
       projectId: project._id,
+      event: 'document.inserted',
       collection: collectionName,
-      action: 'insert',
-      document: result.toObject ? result.toObject() : result,
-      documentId: result._id,
-    });
+      payload: result.toObject ? result.toObject() : result
+    }, { removeOnComplete: true });
 
     if (isDebug) console.log(`[DEBUG] insert data took ${(performance.now() - start).toFixed(2)}ms`);
     res.status(201).json(result);
@@ -536,13 +535,12 @@ module.exports.updateSingleData = async (req, res) => {
 
     if (!result) return res.status(404).json({ error: "Document not found." });
 
-    dispatchWebhooks({
+    await webhookQueue.add('trigger-webhook', {
       projectId: project._id,
+      event: 'document.updated',
       collection: collectionName,
-      action: 'update',
-      document: result,
-      documentId: result._id,
-    });
+      payload: result
+    }, { removeOnComplete: true });
 
     res.json({ message: "Updated", data: result });
   } catch (err) {
@@ -610,13 +608,12 @@ module.exports.deleteSingleDoc = async (req, res) => {
       console.error("Failed to enqueue trash cleanup job", { projectId: String(project._id), collectionName,  err });
     }
 
-    dispatchWebhooks({
+    await webhookQueue.add('trigger-webhook', {
       projectId: project._id,
+      event: 'document.deleted',
       collection: collectionName,
-      action: 'delete',
-      document: result,
-      documentId: id,
-    });
+      payload: result
+    }, { removeOnComplete: true });
 
     res.json({ success: true, data: { id }, message: "Document moved to trash" });
   } catch (err) {
@@ -679,14 +676,12 @@ module.exports.recoverSingleDoc = async (req, res, next) => {
       return next(new AppError(404, "Document not found or recovery window expired (30 days)."));
     }
 
-    dispatchWebhooks({
+    await webhookQueue.add('trigger-webhook', {
       projectId: project._id,
+      event: 'document.recovered',
       collection: collectionName,
-      action: 'recover',
-      document: result,
-      documentId: id,
-      options: {}
-    });
+      payload: result
+    }, { removeOnComplete: true });
 
     try {
       await syncCollectionCleanup(project._id, collectionName);
diff --git a/apps/web-dashboard/src/components/Layout/BackToTop.jsx b/apps/web-dashboard/src/components/Layout/BackToTop.jsx
@@ -0,0 +1,72 @@
+import { useState, useEffect } from 'react';
+import { ArrowUp } from 'lucide-react';
+
+function BackToTop() {
+    const [isVisible, setIsVisible] = useState(false);
+    const [isHovered, setIsHovered] = useState(false);
+
+    useEffect(() => {
+        let ticking = false;
+
+        const handleScroll = () => {
+            if (!ticking) {
+                window.requestAnimationFrame(() => {
+                    setIsVisible(window.scrollY > 300);
+                    ticking = false;
+                });
+                ticking = true;
+            }
+        };
+
+        window.addEventListener('scroll', handleScroll);
+        handleScroll();
+
+        return () => {
+            window.removeEventListener('scroll', handleScroll);
+        };
+    }, []);
+
+    const handleClick = () => {
+        window.scrollTo({
+            top: 0,
+            behavior: 'smooth'
+        });
+    };
+
+    if (!isVisible) {
+        return null;
+    }
+
+    return (
+        <button
+            onClick={handleClick}
+            title="Back to Top"
+            aria-label="Back to Top"
+            onMouseEnter={() => setIsHovered(true)}
+            onMouseLeave={() => setIsHovered(false)}
+            style={{
+                position: 'fixed',
+                bottom: '2rem',
+                right: '2rem',
+                zIndex: 1000,
+                backgroundColor: '#00f5d4',
+                color: '#000',
+                border: 'none',
+                borderRadius: '50%',
+                width: '45px',
+                height: '45px',
+                cursor: 'pointer',
+                boxShadow: '0 0 15px rgba(0, 245, 212, 0.4)',
+                display: 'flex',
+                alignItems: 'center',
+                justifyContent: 'center',
+                transform: isHovered ? 'scale(1.1)' : 'scale(1)',
+                transition: 'transform 0.2s ease',
+            }}
+        >
+            <ArrowUp size={20} strokeWidth={2.5} />
+        </button>
+    );
+}
+
+export default BackToTop;
diff --git a/apps/web-dashboard/src/components/Layout/MainLayout.jsx b/apps/web-dashboard/src/components/Layout/MainLayout.jsx
@@ -4,7 +4,7 @@ import Sidebar from './Sidebar';
 import Header from './Header';
 import ProjectNavbar from './ProjectNavbar';
 import { useLayout } from '../../context/LayoutContext';
-
+import BackToTop from './BackToTop';
 // Use the new official logo from public directory
 const logoImage = "https://cdn.jsdelivr.net/gh/yash-pouranik/urBackend@main/frontend/public/logo.png";
 
@@ -68,6 +68,7 @@ function MainLayout({ children }) {
                     {children}
                 </div>
             </div>
+            <BackToTop />
         </div>
     );
 }
diff --git a/apps/web-dashboard/src/pages/LandingPage/index.jsx b/apps/web-dashboard/src/pages/LandingPage/index.jsx
@@ -1,7 +1,7 @@
 import { useState, useEffect, useRef, useCallback } from 'react';
 import { Link, useNavigate } from 'react-router-dom';
 import { useAuth } from '../../context/AuthContext';
-
+import BackToTop from '../../components/Layout/BackToTop';
 import {
     Database,
     Shield,
@@ -907,6 +907,7 @@ function LandingPage() {
             </div>
 
             <Footer />
+            <BackToTop />
         </div>
     );
 }
diff --git a/packages/common/src/queues/webhookQueue.js b/packages/common/src/queues/webhookQueue.js
@@ -82,6 +82,30 @@ function initWebhookWorker() {
   const worker = new Worker(
     "webhook-delivery-queue",
     async (job) => {
+      if (job.name === "trigger-webhook") {
+        const { projectId, event, collection, payload } = job.data;
+        const { dispatchWebhooks } = require("../utils/webhookDispatcher");
+
+        let action = "update";
+        if (event.includes("inserted")) action = "insert";
+        if (event.includes("deleted")) action = "delete";
+        if (event.includes("recovered")) action = "recover";
+
+        try {
+          await dispatchWebhooks({
+            projectId,
+            collection,
+            action,
+            document: payload,
+            documentId: payload?._id,
+          });
+        } catch (error) {
+          console.error(`[Webhook] trigger-webhook failed for projectId: ${projectId}, collection: ${collection}, action: ${action}, documentId: ${payload?._id}`, error);
+          throw error;
+        }
+        return;
+      }
+
       const { deliveryId, webhookId, attemptNumber } = job.data;
 
       try {
