Merge branch 'main_sync' into feature/leads_refactor

packages/twenty-emails/src/emails/send-invite-link.email.tsx

@@ -9,7 +9,7 @@ import { MainText } from 'src/components/MainText';
 import { Title } from 'src/components/Title';
 import { WhatIsTwenty } from 'src/components/WhatIsTwenty';
 import { capitalize } from 'src/utils/capitalize';
-import { getImageAbsoluteURIOrBase64 } from 'src/utils/getImageAbsoluteURIOrBase64';
+import { getImageAbsoluteURI } from 'src/utils/getImageAbsoluteURI';
 
 type SendInviteLinkEmailProps = {
   link: string;
@@ -27,7 +27,7 @@ export const SendInviteLinkEmail = ({
   sender,
   serverUrl,
 }: SendInviteLinkEmailProps) => {
-  const workspaceLogo = getImageAbsoluteURIOrBase64(workspace.logo, serverUrl);
+  const workspaceLogo = getImageAbsoluteURI(workspace.logo, serverUrl);
   return (
     <BaseEmail width={333}>
       <Title value="Join your team on Twenty" />

packages/twenty-emails/src/utils/getImageAbsoluteURIOrBase64.ts → packages/twenty-emails/src/utils/getImageAbsoluteURI.ts

@@ -1,12 +1,12 @@
-export const getImageAbsoluteURIOrBase64 = (
+export const getImageAbsoluteURI = (
   imageUrl?: string | null,
   serverUrl?: string,
 ) => {
   if (!imageUrl) {
     return null;
   }
 
-  if (imageUrl?.startsWith('data:') || imageUrl?.startsWith('https:')) {
+  if (imageUrl?.startsWith('https:')) {
     return imageUrl;
   }
 

packages/twenty-front/.eslintrc.cjs

@@ -6,6 +6,7 @@ module.exports = {
     'mockServiceWorker.js',
     '**/generated*/*',
     '**/generated/standard-metadata-query-result.ts',
+    '**/getObjectMetadataItemsMock.ts',
     'tsup.config.ts',
     'build',
     'coverage',

packages/twenty-front/codegen-metadata.cjs

@@ -3,6 +3,7 @@ module.exports = {
   documents: [
     './src/modules/databases/graphql/**/*.ts',
     './src/modules/object-metadata/graphql/*.ts',
+    './src/modules/settings/serverless-functions/graphql/**/*.ts',
     './src/modules/object-record/graphql/*.tsx',
     './src/modules/metadata/graphql/*.ts',
   ],

packages/twenty-front/codegen.cjs

@@ -4,6 +4,7 @@ module.exports = {
     '!./src/modules/databases/**',
     '!./src/modules/object-metadata/**',
     '!./src/modules/object-record/**',
+    '!./src/modules/settings/serverless-functions/**',
     './src/modules/**/*.tsx',
     './src/modules/**/*.ts',
     '!./src/**/*.test.tsx',

packages/twenty-front/src/App.tsx

@@ -82,13 +82,15 @@ import { SettingsIntegrationEditDatabaseConnection } from '~/pages/settings/inte
 import { SettingsIntegrationNewDatabaseConnection } from '~/pages/settings/integrations/SettingsIntegrationNewDatabaseConnection';
 import { SettingsIntegrations } from '~/pages/settings/integrations/SettingsIntegrations';
 import { SettingsIntegrationShowDatabaseConnection } from '~/pages/settings/integrations/SettingsIntegrationShowDatabaseConnection';
+import { SettingsAppearance } from '~/pages/settings/profile/appearance/components/SettingsAppearance';
 import { Releases } from '~/pages/settings/Releases';
-import { SettingsAppearance } from '~/pages/settings/SettingsAppearance';
+import { SettingsServerlessFunctionDetailWrapper } from '~/pages/settings/serverless-functions/SettingsServerlessFunctionDetailWrapper';
+import { SettingsServerlessFunctions } from '~/pages/settings/serverless-functions/SettingsServerlessFunctions';
+import { SettingsServerlessFunctionsNew } from '~/pages/settings/serverless-functions/SettingsServerlessFunctionsNew';
 import { SettingsBilling } from '~/pages/settings/SettingsBilling';
 import { SettingsProfile } from '~/pages/settings/SettingsProfile';
 import { SettingsWorkspace } from '~/pages/settings/SettingsWorkspace';
 import { SettingsWorkspaceMembers } from '~/pages/settings/SettingsWorkspaceMembers';
-import { Tasks } from '~/pages/tasks/Tasks';
 import { getPageTitleFromPath } from '~/utils/title-utils';
 
 const ProvidersThatNeedRouterContext = () => {
@@ -137,6 +139,7 @@ const ProvidersThatNeedRouterContext = () => {
 const createRouter = (
   isBillingEnabled?: boolean,
   isCRMMigrationEnabled?: boolean,
+  isServerlessFunctionSettingsEnabled?: boolean,
 ) =>
   createBrowserRouter(
     createRoutesFromElements(
@@ -161,7 +164,6 @@ const createRouter = (
             element={<PaymentSuccess />}
           />
           <Route path={indexAppPath.getIndexAppPath()} element={<></>} />
-          <Route path={AppPath.TasksPage} element={<Tasks />} />
           <Route path={AppPath.Impersonate} element={<ImpersonateEffect />} />
           <Route path={AppPath.RecordIndexPage} element={<RecordIndexPage />} />
           <Route path={AppPath.RecordShowPage} element={<RecordShowPage />} />
@@ -263,6 +265,22 @@ const createRouter = (
                     </Routes>
                   }
                 />
+                {isServerlessFunctionSettingsEnabled && (
+                  <>
+                    <Route
+                      path={SettingsPath.ServerlessFunctions}
+                      element={<SettingsServerlessFunctions />}
+                    />
+                    <Route
+                      path={SettingsPath.NewServerlessFunction}
+                      element={<SettingsServerlessFunctionsNew />}
+                    />
+                    <Route
+                      path={SettingsPath.ServerlessFunctionDetail}
+                      element={<SettingsServerlessFunctionDetailWrapper />}
+                    />
+                  </>
+                )}
                 <Route
                   path={SettingsPath.Integrations}
                   element={<SettingsIntegrations />}
@@ -323,10 +341,17 @@ const createRouter = (
 export const App = () => {
   const billing = useRecoilValue(billingState);
   const isCRMMigrationEnabled = useIsFeatureEnabled('IS_CRM_MIGRATION_ENABLED');
+  const isServerlessFunctionSettingsEnabled = useIsFeatureEnabled(
+    'IS_FUNCTION_SETTINGS_ENABLED',
+  );
 
   return (
     <RouterProvider
-      router={createRouter(billing?.isBillingEnabled, isCRMMigrationEnabled)}
+      router={createRouter(
+        billing?.isBillingEnabled,
+        isCRMMigrationEnabled,
+        isServerlessFunctionSettingsEnabled,
+      )}
     />
   );
 };

packages/twenty-front/src/effect-components/PageChangeEffect.tsx

@@ -9,6 +9,7 @@ import { useRequestFreshCaptchaToken } from '@/captcha/hooks/useRequestFreshCapt
 import { isCaptchaScriptLoadedState } from '@/captcha/states/isCaptchaScriptLoadedState';
 import { useCommandMenu } from '@/command-menu/hooks/useCommandMenu';
 import { CommandType } from '@/command-menu/types/Command';
+import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSingular';
 import { TableHotkeyScope } from '@/object-record/record-table/types/TableHotkeyScope';
 import { AppBasePath } from '@/types/AppBasePath';
 import { AppPath } from '@/types/AppPath';
@@ -43,7 +44,9 @@ export const PageChangeEffect = () => {
 
   const { addToCommandMenu, setToInitialCommandMenu } = useCommandMenu();
 
-  const openCreateActivity = useOpenCreateActivityDrawer();
+  const openCreateActivity = useOpenCreateActivityDrawer({
+    activityObjectNameSingular: CoreObjectNameSingular.Task,
+  });
 
   useEffect(() => {
     if (!previousLocation || previousLocation !== location.pathname) {
@@ -189,8 +192,7 @@ useEffect(() => {
         label: 'Create Task',
         type: CommandType.Create,
         Icon: IconCheckbox,
-        onCommandClick: () =>
-          openCreateActivity({ type: 'Task', targetableObjects: [] }),
+        onCommandClick: () => openCreateActivity({ targetableObjects: [] }),
       },
     ]);
   }, [addToCommandMenu, setToInitialCommandMenu, openCreateActivity]);