From 83ffdce8294c07c3174dfba8f7772aa3a5bbc740 Mon Sep 17 00:00:00 2001 From: Aaron Harper Date: Wed, 17 Apr 2024 13:49:15 -0400 Subject: [PATCH 1/2] Fix function archived toggle --- .../(dashboard)/env/[environmentSlug]/functions/useRows.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ui/apps/dashboard/src/app/(organization-active)/(dashboard)/env/[environmentSlug]/functions/useRows.ts b/ui/apps/dashboard/src/app/(organization-active)/(dashboard)/env/[environmentSlug]/functions/useRows.ts index 858c138af..30b3f027b 100644 --- a/ui/apps/dashboard/src/app/(organization-active)/(dashboard)/env/[environmentSlug]/functions/useRows.ts +++ b/ui/apps/dashboard/src/app/(organization-active)/(dashboard)/env/[environmentSlug]/functions/useRows.ts @@ -44,7 +44,12 @@ export function useRows({ archived }: { archived: boolean }): Output { // Append new function data. useEffect(() => { - if (functionsRes.data && functionsRes.data.page.page > functionsData.lastPage) { + if (!functionsRes.data || functionsRes.isLoading) { + return; + } + + if (functionsRes.data.page.page > functionsData.lastPage) { + console.log('a2', functionsRes.data.functions.length); setFunctionsData((prev) => { return { lastPage: functionsRes.data.page.page, From 0240e7ebfb9c465662988646f918a9a803ade0ad Mon Sep 17 00:00:00 2001 From: Aaron Harper Date: Wed, 17 Apr 2024 15:19:45 -0400 Subject: [PATCH 2/2] Update ui/apps/dashboard/src/app/(organization-active)/(dashboard)/env/[environmentSlug]/functions/useRows.ts Co-authored-by: Tony Holdstock-Brown --- .../(dashboard)/env/[environmentSlug]/functions/useRows.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/ui/apps/dashboard/src/app/(organization-active)/(dashboard)/env/[environmentSlug]/functions/useRows.ts b/ui/apps/dashboard/src/app/(organization-active)/(dashboard)/env/[environmentSlug]/functions/useRows.ts index 30b3f027b..6c7f9ed3b 100644 --- a/ui/apps/dashboard/src/app/(organization-active)/(dashboard)/env/[environmentSlug]/functions/useRows.ts +++ b/ui/apps/dashboard/src/app/(organization-active)/(dashboard)/env/[environmentSlug]/functions/useRows.ts @@ -49,7 +49,6 @@ export function useRows({ archived }: { archived: boolean }): Output { } if (functionsRes.data.page.page > functionsData.lastPage) { - console.log('a2', functionsRes.data.functions.length); setFunctionsData((prev) => { return { lastPage: functionsRes.data.page.page,