From c73feb513a079aa289a0fa468ebac2ff0decf843 Mon Sep 17 00:00:00 2001 From: Gabriel Utzig Date: Fri, 4 Oct 2024 20:23:02 -0300 Subject: [PATCH] fix: Center Functions Empty state (#7378) ## Description - This PR fix #7012 - It changes the logic behind the rendering of `SettingsPageContainer` component. Now, the component is only rendered when the page content is not blank. ## Changes | Before | After | |--------|--------| | ![image](https://github.com/user-attachments/assets/98b64370-f145-41a2-a829-f86ae9687f73) | ![image](https://github.com/user-attachments/assets/4cb0cc32-a669-4151-9444-4bc734bd2909) |
Details

This change aligns the behavior of the settings page with the existing logic found on the `/rockets` page

Co-authored-by: Charles Bochet --- .../SettingsServerlessFunctionsTable.tsx | 43 ++++++++++--------- .../SettingsServerlessFunctions.tsx | 9 ++-- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/packages/twenty-front/src/modules/settings/serverless-functions/components/SettingsServerlessFunctionsTable.tsx b/packages/twenty-front/src/modules/settings/serverless-functions/components/SettingsServerlessFunctionsTable.tsx index 93785116a..286a90faa 100644 --- a/packages/twenty-front/src/modules/settings/serverless-functions/components/SettingsServerlessFunctionsTable.tsx +++ b/packages/twenty-front/src/modules/settings/serverless-functions/components/SettingsServerlessFunctionsTable.tsx @@ -1,3 +1,4 @@ +import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer'; import { SettingsServerlessFunctionsFieldItemTableRow } from '@/settings/serverless-functions/components/SettingsServerlessFunctionsFieldItemTableRow'; import { SettingsServerlessFunctionsTableEmpty } from '@/settings/serverless-functions/components/SettingsServerlessFunctionsTableEmpty'; import { useGetManyServerlessFunctions } from '@/settings/serverless-functions/hooks/useGetManyServerlessFunctions'; @@ -24,26 +25,28 @@ export const SettingsServerlessFunctionsTable = () => { return ( <> {serverlessFunctions.length ? ( - - - Name - Runtime - - - - {serverlessFunctions.map( - (serverlessFunction: ServerlessFunction) => ( - - ), - )} - -
+ + + + Name + Runtime + + + + {serverlessFunctions.map( + (serverlessFunction: ServerlessFunction) => ( + + ), + )} + +
+
) : ( )} diff --git a/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctions.tsx b/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctions.tsx index 00dcabb77..5f9e58ce7 100644 --- a/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctions.tsx +++ b/packages/twenty-front/src/pages/settings/serverless-functions/SettingsServerlessFunctions.tsx @@ -1,4 +1,3 @@ -import { SettingsPageContainer } from '@/settings/components/SettingsPageContainer'; import { SettingsServerlessFunctionsTable } from '@/settings/serverless-functions/components/SettingsServerlessFunctionsTable'; import { getSettingsPagePath } from '@/settings/utils/getSettingsPagePath'; import { SettingsPath } from '@/types/SettingsPath'; @@ -35,11 +34,9 @@ export const SettingsServerlessFunctions = () => { }, ]} > - -
- -
-
+
+ +
); };