From bb4da7d574f3b54216b22a2f89d60147a8cb7152 Mon Sep 17 00:00:00 2001
From: Suhail Kakar <suhail.zahed@gmail.com>
Date: Mon, 4 Mar 2024 19:12:26 +0530
Subject: [PATCH] new updates

---
 .../www/hooks/use-api/endpoints/webhook.ts    |  1 -
 .../dashboard/developers/webhooks/[id].tsx    | 23 ++++++++++++++-----
 2 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/packages/www/hooks/use-api/endpoints/webhook.ts b/packages/www/hooks/use-api/endpoints/webhook.ts
index 54b42e9331..08dacb93f5 100644
--- a/packages/www/hooks/use-api/endpoints/webhook.ts
+++ b/packages/www/hooks/use-api/endpoints/webhook.ts
@@ -115,7 +115,6 @@ export const getWebhookLogs = async (
   ];
 
   const fetchLogs = async (fromStatus, additionalFilters = [], limit = 20) => {
-    console.log("fromStatus", additionalFilters);
     const query = qs.stringify({
       limit,
       cursor: fromStatus ? null : cursor,
diff --git a/packages/www/pages/dashboard/developers/webhooks/[id].tsx b/packages/www/pages/dashboard/developers/webhooks/[id].tsx
index 69df9fa3c4..ad10a46e12 100644
--- a/packages/www/pages/dashboard/developers/webhooks/[id].tsx
+++ b/packages/www/pages/dashboard/developers/webhooks/[id].tsx
@@ -18,7 +18,6 @@ const WebhookDetail = () => {
     successCount: 0,
   });
   const [loadingMore, setLoadingMore] = useState(false);
-
   const { getWebhook, getWebhookLogs } = useApi();
   const router = useRouter();
   const { id } = router.query;
@@ -31,17 +30,25 @@ const WebhookDetail = () => {
     }
   );
 
+  const containsSuccessFilter = (logFilters) => {
+    return logFilters.some((filter) => filter.id === "success");
+  };
+
   const { refetch: refetchLogs, isLoading: isLogsLoading } = useQuery(
     ["webhookLogs", id, logFilters],
-    () => getWebhookLogs(id, logFilters, logs ? logs.cursor : null, true),
+    () =>
+      getWebhookLogs(
+        id,
+        logFilters,
+        logFilters.length > 0 ? null : logs.cursor,
+        true
+      ),
     {
       enabled: !!id,
       onSuccess: (data) => {
-        const containsSuccessFilter = logFilters.some(
-          (filter) => filter.id === "success"
-        );
+        const isSuccess = containsSuccessFilter(logFilters);
 
-        if (containsSuccessFilter) {
+        if (isSuccess) {
           setLogs({
             ...data,
             data: loadingMore ? [...logs.data, ...data.data] : data.data,
@@ -64,6 +71,10 @@ const WebhookDetail = () => {
   const handleLogFilters = async (filters) => {
     if (filters.length === 0) {
       setLogFilters([]);
+      setLogs({
+        ...logs,
+        cursor: null,
+      });
       refetchLogs();
       return;
     }