V.0.3.1.6 🌶️ Hotfixes (#35)

* Fixed filtering only returning 1 row * Hotfix: Revalidate cache after 10s Added cache revalidation after 10s to fix data being cached permanently
digitalbuiltenvironment · May 20, 2024 · f8ff91f · f8ff91f
1 parent b6915e6
commit f8ff91f
Show file tree

Hide file tree

Showing 13 changed files with 13 additions and 19 deletions.
diff --git a/frontend/app/api/admin/collections-requests/route.ts b/frontend/app/api/admin/collections-requests/route.ts
@@ -1,4 +1,4 @@
-export const dynamic = 'force-dynamic';
+export const revalidate = 10;
 
 import { createClient } from '@supabase/supabase-js';
 import { NextRequest, NextResponse } from "next/server";
@@ -34,14 +34,15 @@ export async function GET(request: NextRequest) {
                 )
             )
         `)
-        .eq('is_pending', true);
+        .eq('is_pending', true)
+        .limit(1000);
 
     if (collErr) {
         console.error('Error fetching collection request data from database:', collErr.message);
         return NextResponse.json({ error: collErr.message }, { status: 500 });
     }
 
-    // console.log('Collections Request:', collectionsReq);
+    // console.log('New Collections Request:', collectionsReq);
 
     return NextResponse.json({ collectionsReq: collectionsReq });
 }
diff --git a/frontend/app/api/admin/collections/route.ts b/frontend/app/api/admin/collections/route.ts
@@ -1,4 +1,4 @@
-export const dynamic = 'force-dynamic';
+export const revalidate = 10;
 
 import { createClient } from '@supabase/supabase-js';
 import { NextRequest, NextResponse } from "next/server";

diff --git a/frontend/app/api/admin/users/route.ts b/frontend/app/api/admin/users/route.ts
@@ -1,4 +1,4 @@
-export const dynamic = 'force-dynamic';
+export const revalidate = 10;
 
 import { createClient } from '@supabase/supabase-js';
 import { NextRequest, NextResponse } from "next/server";

diff --git a/frontend/app/api/public/collections/route.ts b/frontend/app/api/public/collections/route.ts
@@ -1,4 +1,4 @@
-export const dynamic = 'force-dynamic';
+export const revalidate = 10;
 
 import { createClient } from '@supabase/supabase-js';
 import { NextRequest, NextResponse } from "next/server";

diff --git a/frontend/app/api/user/collections-requests/route.ts b/frontend/app/api/user/collections-requests/route.ts
@@ -1,4 +1,4 @@
-export const dynamic = 'force-dynamic';
+export const revalidate = 10;
 
 import { createClient } from '@supabase/supabase-js';
 import { NextRequest, NextResponse } from "next/server";

diff --git a/frontend/app/api/user/collections/route.ts b/frontend/app/api/user/collections/route.ts
@@ -1,4 +1,4 @@
-export const dynamic = 'force-dynamic';
+export const revalidate = 10;
 
 import { createClient } from '@supabase/supabase-js';
 import { NextRequest, NextResponse } from "next/server";

diff --git a/frontend/app/components/ui/admin/admin-manage-collections.tsx b/frontend/app/components/ui/admin/admin-manage-collections.tsx
@@ -20,7 +20,6 @@ export default function AdminManageCollections() {
                     method: 'GET',
                     headers: {
                         'Content-Type': 'application/json',
-                        'Cache-Control': 'no-cache', // Disable cache to get the latest data
                     },
                 }
             );

diff --git a/frontend/app/components/ui/admin/admin-manage-requests.tsx b/frontend/app/components/ui/admin/admin-manage-requests.tsx
@@ -1,12 +1,14 @@
 "use client";
 
+import { unstable_noStore as noStore } from 'next/cache';
 import { useEffect, useState } from 'react';
 import { Eye, EyeOff, X, Check, RefreshCw } from 'lucide-react';
 import { IconSpinner } from '@/app/components/ui/icons';
 import { toast } from 'react-toastify';
 import Swal from 'sweetalert2';
 
 export default function AdminManageRequests() {
+    noStore();
     const [userRequests, setUserRequests] = useState<any[]>([]);
     const [loading, setLoading] = useState<boolean>(true);
     const [isRefreshed, setIsRefreshed] = useState<boolean>(true); // Track whether the data has been refreshed
@@ -20,7 +22,6 @@ export default function AdminManageRequests() {
                     method: 'GET',
                     headers: {
                         'Content-Type': 'application/json',
-                        'Cache-Control': 'no-cache', // Disable cache to get the latest data
                     },
                 }
             );

diff --git a/frontend/app/components/ui/admin/admin-manage-users.tsx b/frontend/app/components/ui/admin/admin-manage-users.tsx
@@ -1,12 +1,14 @@
 "use client";
 
+import { unstable_noStore as noStore } from 'next/cache';
 import { useEffect, useState } from "react";
 import { toast } from "react-toastify";
 import { RefreshCw, UserCheck, UserX } from "lucide-react";
 import { IconSpinner } from "@/app/components/ui/icons";
 import Swal from "sweetalert2";
 
 export default function AdminManageUsers() {
+    noStore();
     const [users, setUsers] = useState<any[]>([]);
     const [loading, setLoading] = useState<boolean>(true);
     const [isRefreshed, setIsRefreshed] = useState<boolean>(true); // Track whether the data has been refreshed
@@ -20,7 +22,6 @@ export default function AdminManageUsers() {
                     method: 'GET',
                     headers: {
                         'Content-Type': 'application/json',
-                        'Cache-Control': 'no-cache', // Disable cache to get the latest data
                     },
                 }
             );

diff --git a/frontend/app/components/ui/chat/chat-selection.tsx b/frontend/app/components/ui/chat/chat-selection.tsx
@@ -23,7 +23,6 @@ export default function ChatSelection(
             method: 'GET',
             headers: {
                 'Content-Type': 'application/json',
-                'Cache-Control': 'no-cache', // Disable caching
             },
         });
 

diff --git a/frontend/app/components/ui/query/query-manage.tsx b/frontend/app/components/ui/query/query-manage.tsx
@@ -24,7 +24,6 @@ export default function QueryCollectionManage() {
                 method: 'GET',
                 headers: {
                     'Content-Type': 'application/json',
-                    'Cache-Control': 'no-cache', // Disable caching
                 },
             }
         )
@@ -125,7 +124,6 @@ export default function QueryCollectionManage() {
                                     method: 'PUT',
                                     headers: {
                                         'Content-Type': 'application/json',
-                                        'Cache-Control': 'no-cache', // Disable caching
                                     },
                                     body: JSON.stringify({ collection_id: collectionId, is_make_public: isPublic }),
                                 }
@@ -177,7 +175,6 @@ export default function QueryCollectionManage() {
                             method: 'POST',
                             headers: {
                                 'Content-Type': 'application/json',
-                                'Cache-Control': 'no-cache', // Disable caching
                             },
                             body: JSON.stringify({ collection_id: collectionId, is_make_public: isPublic }),
                         }
@@ -246,7 +243,6 @@ export default function QueryCollectionManage() {
                         method: 'DELETE',
                         headers: {
                             'Content-Type': 'application/json',
-                            'Cache-Control': 'no-cache', // Disable caching
                         },
                         body: JSON.stringify({ collection_id: collectionId }),
                     }
@@ -314,7 +310,6 @@ export default function QueryCollectionManage() {
                         method: 'DELETE',
                         headers: {
                             'Content-Type': 'application/json',
-                            'Cache-Control': 'no-cache', // Disable caching
                             'Authorization': `Bearer ${supabaseAccessToken}`, // Add the access token to the request headers
                         },
                         body: JSON.stringify({ collection_id: collectionId }),

diff --git a/frontend/app/components/ui/query/query-selection.tsx b/frontend/app/components/ui/query/query-selection.tsx
@@ -22,7 +22,6 @@ export default function QuerySelection(
             method: 'GET',
             headers: {
                 'Content-Type': 'application/json',
-                'Cache-Control': 'no-cache', // Disable caching
             },
         });
 

diff --git a/frontend/app/components/ui/search/search-selection.tsx b/frontend/app/components/ui/search/search-selection.tsx
@@ -23,7 +23,6 @@ export default function SearchSelection(
             method: 'GET',
             headers: {
                 'Content-Type': 'application/json',
-                'Cache-Control': 'no-cache', // Disable caching
             },
         });