Merge branch 'main' into tt-make-record-name-editable-in-breadcumb

twentyhq · Dec 24, 2024 · b2c2e2e · b2c2e2e
2 parents 9a5a87e + e971760
commit b2c2e2e
Show file tree

Hide file tree

Showing 227 changed files with 7,684 additions and 1,855 deletions.
diff --git a/.vscode/twenty.code-workspace b/.vscode/twenty.code-workspace
@@ -24,6 +24,10 @@
       "name": "packages/twenty-emails",
       "path": "../packages/twenty-emails"
     },
+    {
+      "name": "packages/twenty-shared",
+      "path": "../packages/twenty-shared"
+    },
     {
       "name": "packages/twenty-server",
       "path": "../packages/twenty-server"

diff --git a/packages/twenty-front/codegen-metadata.cjs b/packages/twenty-front/codegen-metadata.cjs
@@ -1,5 +1,7 @@
 module.exports = {
-  schema: (process.env.REACT_APP_SERVER_BASE_URL ?? 'http://localhost:3000') + '/metadata',
+  schema:
+    (process.env.REACT_APP_SERVER_BASE_URL ?? 'http://localhost:3000') +
+    '/metadata',
   documents: [
     './src/modules/databases/graphql/**/*.ts',
     './src/modules/object-metadata/graphql/*.ts',

diff --git a/packages/twenty-front/codegen.cjs b/packages/twenty-front/codegen.cjs
@@ -1,5 +1,7 @@
 module.exports = {
-  schema: (process.env.REACT_APP_SERVER_BASE_URL ?? 'http://localhost:3000') + '/graphql',
+  schema:
+    (process.env.REACT_APP_SERVER_BASE_URL ?? 'http://localhost:3000') +
+    '/graphql',
   documents: [
     '!./src/modules/databases/**',
     '!./src/modules/object-metadata/**',

diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts
@@ -176,6 +176,7 @@ export type ClientConfig = {
   __typename?: 'ClientConfig';
   analyticsEnabled: Scalars['Boolean']['output'];
   api: ApiConfig;
+  authProviders: AuthProviders;
   billing: Billing;
   captcha: Captcha;
   chromeExtensionId?: Maybe<Scalars['String']['output']>;
@@ -358,13 +359,6 @@ export type EmailPasswordResetLink = {
   success: Scalars['Boolean']['output'];
 };
 
-export type ExchangeAuthCode = {
-  __typename?: 'ExchangeAuthCode';
-  accessToken: AuthToken;
-  loginToken: AuthToken;
-  refreshToken: AuthToken;
-};
-
 export type ExecuteServerlessFunctionInput = {
   /** Id of the serverless function to execute */
   id: Scalars['UUID']['input'];
@@ -581,12 +575,11 @@ export type Mutation = {
   editSSOIdentityProvider: EditSsoOutput;
   emailPasswordResetLink: EmailPasswordResetLink;
   enablePostgresProxy: PostgresCredentials;
-  exchangeAuthorizationCode: ExchangeAuthCode;
   executeOneServerlessFunction: ServerlessFunctionExecutionResult;
   generateApiKeyToken: ApiKeyToken;
   generateTransientToken: TransientToken;
   getAuthorizationUrl: GetAuthorizationUrlOutput;
-  impersonate: Verify;
+  impersonate: AuthTokens;
   publishServerlessFunction: ServerlessFunction;
   renewToken: AuthTokens;
   resendWorkspaceInvitation: SendInvitationsOutput;
@@ -613,7 +606,7 @@ export type Mutation = {
   uploadProfilePicture: Scalars['String']['output'];
   uploadWorkspaceLogo: Scalars['String']['output'];
   userLookupAdminPanel: UserLookup;
-  verify: Verify;
+  verify: AuthTokens;
 };
 
 
@@ -762,13 +755,6 @@ export type MutationEmailPasswordResetLinkArgs = {
 };
 
 
-export type MutationExchangeAuthorizationCodeArgs = {
-  authorizationCode: Scalars['String']['input'];
-  clientSecret?: InputMaybe<Scalars['String']['input']>;
-  codeVerifier?: InputMaybe<Scalars['String']['input']>;
-};
-
-
 export type MutationExecuteOneServerlessFunctionArgs = {
   input: ExecuteServerlessFunctionInput;
 };
@@ -787,6 +773,7 @@ export type MutationGetAuthorizationUrlArgs = {
 
 export type MutationImpersonateArgs = {
   userId: Scalars['String']['input'];
+  workspaceId: Scalars['String']['input'];
 };
 
 
@@ -1593,9 +1580,8 @@ export type User = {
   analyticsTinybirdJwts?: Maybe<AnalyticsTinybirdJwtMap>;
   canImpersonate: Scalars['Boolean']['output'];
   createdAt: Scalars['DateTime']['output'];
+  currentWorkspace?: Maybe<Workspace>;
   defaultAvatarUrl?: Maybe<Scalars['String']['output']>;
-  defaultWorkspace: Workspace;
-  defaultWorkspaceId: Scalars['String']['output'];
   deletedAt?: Maybe<Scalars['DateTime']['output']>;
   disabled?: Maybe<Scalars['Boolean']['output']>;
   email: Scalars['String']['output'];
@@ -1681,12 +1667,6 @@ export type ValidatePasswordResetToken = {
   id: Scalars['String']['output'];
 };
 
-export type Verify = {
-  __typename?: 'Verify';
-  tokens: AuthTokenPair;
-  user: User;
-};
-
 export type WorkflowAction = {
   __typename?: 'WorkflowAction';
   id: Scalars['UUID']['output'];

diff --git a/packages/twenty-front/src/generated/graphql.tsx b/packages/twenty-front/src/generated/graphql.tsx
diff --git a/...ion-menu/actions/record-actions/multiple-records/hooks/useDeleteMultipleRecordsAction.tsx b/...ion-menu/actions/record-actions/multiple-records/hooks/useDeleteMultipleRecordsAction.tsx
@@ -15,6 +15,7 @@ import { DELETE_MAX_COUNT } from '@/object-record/constants/DeleteMaxCount';
 import { useDeleteManyRecords } from '@/object-record/hooks/useDeleteManyRecords';
 import { useLazyFetchAllRecords } from '@/object-record/hooks/useLazyFetchAllRecords';
 import { FilterOperand } from '@/object-record/object-filter-dropdown/types/FilterOperand';
+import { useFilterValueDependencies } from '@/object-record/record-filter/hooks/useFilterValueDependencies';
 import { useRecordTable } from '@/object-record/record-table/hooks/useRecordTable';
 import { ConfirmationModal } from '@/ui/layout/modal/components/ConfirmationModal';
 import { useRightDrawer } from '@/ui/layout/right-drawer/hooks/useRightDrawer';
@@ -52,10 +53,13 @@ export const useDeleteMultipleRecordsAction = ({
     contextStoreFiltersComponentState,
   );
 
+  const { filterValueDependencies } = useFilterValueDependencies();
+
   const graphqlFilter = computeContextStoreFilters(
     contextStoreTargetedRecordsRule,
     contextStoreFilters,
     objectMetadataItem,
+    filterValueDependencies,
   );
 
   const deletedAtFieldMetadata = objectMetadataItem.fields.find(

diff --git a/packages/twenty-front/src/modules/action-menu/components/RecordShowActionMenuButtons.tsx b/packages/twenty-front/src/modules/action-menu/components/RecordShowActionMenuButtons.tsx
@@ -15,10 +15,10 @@ export const RecordShowActionMenuButtons = () => {
   return (
     <>
       {!isMobile &&
-        pinnedEntries.map((entry, index) =>
+        pinnedEntries.map((entry) =>
           entry.shortLabel ? (
             <Button
-              key={index}
+              key={entry.key}
               Icon={entry.Icon}
               size="small"
               variant="secondary"
@@ -29,6 +29,7 @@ export const RecordShowActionMenuButtons = () => {
             />
           ) : (
             <IconButton
+              key={entry.key}
               Icon={entry.Icon}
               size="small"
               variant="secondary"

diff --git a/packages/twenty-front/src/modules/analytics/hooks/useEventTracker.ts b/packages/twenty-front/src/modules/analytics/hooks/useEventTracker.ts
@@ -1,4 +1,5 @@
 import { useCallback } from 'react';
+import { v4 } from 'uuid';
 import { useTrackMutation } from '~/generated/graphql';
 export interface EventData {
   pathname: string;
@@ -19,7 +20,7 @@ export const getSessionId = (): string => {
 };
 
 export const setSessionId = (domain?: string): void => {
-  const sessionId = getSessionId() || crypto.randomUUID();
+  const sessionId = getSessionId() || v4();
   const baseCookie = `${ANALYTICS_COOKIE_NAME}=${sessionId}; Max-Age=1800; path=/; secure`;
   const cookie = domain ? baseCookie + `; domain=${domain}` : baseCookie;
 

diff --git a/.../src/modules/apollo/optimistic-effect/utils/triggerUpdateRecordOptimisticEffectByBatch.ts b/.../src/modules/apollo/optimistic-effect/utils/triggerUpdateRecordOptimisticEffectByBatch.ts
@@ -75,14 +75,12 @@ export const triggerUpdateRecordOptimisticEffectByBatch = ({
               objectMetadataItem,
             });
 
-          const updatedRecordIndexInRootQueryEdges =
-            rootQueryCurrentEdges.findIndex(
+          const updatedRecordFoundInRootQueryEdges = isDefined(
+            rootQueryCurrentEdges.find(
               (cachedEdge) =>
                 readField('id', cachedEdge.node) === updatedRecord.id,
-            );
-
-          const updatedRecordFoundInRootQueryEdges =
-            updatedRecordIndexInRootQueryEdges > -1;
+            ),
+          );
 
           const updatedRecordShouldBeAddedToRootQueryEdges =
             updatedRecordMatchesThisRootQueryFilter &&
@@ -105,7 +103,10 @@ export const triggerUpdateRecordOptimisticEffectByBatch = ({
           }
 
           if (updatedRecordShouldBeRemovedFromRootQueryEdges) {
-            rootQueryNextEdges.splice(updatedRecordIndexInRootQueryEdges, 1);
+            rootQueryNextEdges = rootQueryNextEdges.filter(
+              (cachedEdge) =>
+                readField('id', cachedEdge.node) !== updatedRecord.id,
+            );
           }
         }
 

diff --git a/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx b/packages/twenty-front/src/modules/app/components/SettingsRoutes.tsx
@@ -254,10 +254,10 @@ const SettingsAdmin = lazy(() =>
   })),
 );
 
-const SettingsAdminFeatureFlags = lazy(() =>
-  import('~/pages/settings/admin-panel/SettingsAdminFeatureFlags').then(
+const SettingsAdminContent = lazy(() =>
+  import('@/settings/admin-panel/components/SettingsAdminContent').then(
     (module) => ({
-      default: module.SettingsAdminFeatureFlags,
+      default: module.SettingsAdminContent,
     }),
   ),
 );
@@ -402,7 +402,7 @@ export const SettingsRoutes = ({
           <Route path={SettingsPath.AdminPanel} element={<SettingsAdmin />} />
           <Route
             path={SettingsPath.FeatureFlags}
-            element={<SettingsAdminFeatureFlags />}
+            element={<SettingsAdminContent />}
           />
         </>
       )}

diff --git a/packages/twenty-front/src/modules/auth/graphql/mutations/impersonate.ts b/packages/twenty-front/src/modules/auth/graphql/mutations/impersonate.ts
@@ -2,13 +2,14 @@ import { gql } from '@apollo/client';
 
 // TODO: Fragments should be used instead of duplicating the user fields !
 export const IMPERSONATE = gql`
-  mutation Impersonate($userId: String!) {
-    impersonate(userId: $userId) {
-      user {
-        ...UserQueryFragment
+  mutation Impersonate($userId: String!, $workspaceId: String!) {
+    impersonate(userId: $userId, workspaceId: $workspaceId) {
+      workspace {
+        subdomain
+        id
       }
-      tokens {
-        ...AuthTokensFragment
+      loginToken {
+        ...AuthTokenFragment
       }
     }
   }

diff --git a/packages/twenty-front/src/modules/auth/graphql/mutations/signUp.ts b/packages/twenty-front/src/modules/auth/graphql/mutations/signUp.ts
@@ -18,6 +18,10 @@ export const SIGN_UP = gql`
       loginToken {
         ...AuthTokenFragment
       }
+      workspace {
+        id
+        subdomain
+      }
     }
   }
 `;
diff --git a/packages/twenty-front/src/modules/auth/graphql/mutations/verify.ts b/packages/twenty-front/src/modules/auth/graphql/mutations/verify.ts
@@ -3,9 +3,6 @@ import { gql } from '@apollo/client';
 export const VERIFY = gql`
   mutation Verify($loginToken: String!) {
     verify(loginToken: $loginToken) {
-      user {
-        ...UserQueryFragment
-      }
       tokens {
         ...AuthTokensFragment
       }

diff --git a/packages/twenty-front/src/modules/auth/graphql/queries/checkUserExists.ts b/packages/twenty-front/src/modules/auth/graphql/queries/checkUserExists.ts
@@ -6,7 +6,6 @@ export const CHECK_USER_EXISTS = gql`
       __typename
       ... on UserExists {
         exists
-        defaultWorkspaceId
         availableWorkspaces {
           id
           displayName

diff --git a/packages/twenty-front/src/modules/auth/hooks/__mocks__/useAuth.ts b/packages/twenty-front/src/modules/auth/hooks/__mocks__/useAuth.ts
@@ -1,5 +1,6 @@
 import {
   ChallengeDocument,
+  GetCurrentUserDocument,
   SignUpDocument,
   VerifyDocument,
 } from '~/generated/graphql';
@@ -8,6 +9,7 @@ export const queries = {
   challenge: ChallengeDocument,
   verify: VerifyDocument,
   signup: SignUpDocument,
+  getCurrentUser: GetCurrentUserDocument,
 };
 
 export const email = '[email protected]';
@@ -22,6 +24,7 @@ export const variables = {
   },
   verify: { loginToken: token },
   signup: {},
+  getCurrentUser: {},
 };
 
 export const results = {
@@ -32,7 +35,14 @@ export const results = {
     },
   },
   verify: {
-    user: {
+    tokens: {
+      accessToken: { token, expiresAt: 'expiresAt' },
+      refreshToken: { token, expiresAt: 'expiresAt' },
+    },
+  },
+  signUp: { loginToken: { token, expiresAt: 'expiresAt' } },
+  getCurrentUser: {
+    currentUser: {
       id: 'id',
       firstName: 'firstName',
       lastName: 'lastName',
@@ -49,7 +59,7 @@ export const results = {
         avatarUrl: 'avatarUrl',
         locale: 'locale',
       },
-      defaultWorkspace: {
+      currentWorkspace: {
         id: 'id',
         displayName: 'displayName',
         logo: 'logo',
@@ -65,13 +75,7 @@ export const results = {
         },
       },
     },
-    tokens: {
-      accessToken: { token, expiresAt: 'expiresAt' },
-      refreshToken: { token, expiresAt: 'expiresAt' },
-    },
-    signup: {},
   },
-  signUp: { loginToken: { token, expiresAt: 'expiresAt' } },
 };
 
 export const mocks = [
@@ -108,4 +112,13 @@ export const mocks = [
       },
     })),
   },
+  {
+    request: {
+      query: queries.getCurrentUser,
+      variables: variables.getCurrentUser,
+    },
+    result: jest.fn(() => ({
+      data: results.getCurrentUser,
+    })),
+  },
 ];
diff --git a/packages/twenty-front/src/modules/auth/hooks/__tests__/useAuth.test.tsx b/packages/twenty-front/src/modules/auth/hooks/__tests__/useAuth.test.tsx
@@ -1,8 +1,7 @@
 import { useApolloClient } from '@apollo/client';
 import { MockedProvider } from '@apollo/client/testing';
 import { expect } from '@storybook/test';
-import { act, renderHook } from '@testing-library/react';
-import { ReactNode } from 'react';
+import { ReactNode, act } from 'react';
 import { RecoilRoot, useRecoilValue } from 'recoil';
 import { iconsState } from 'twenty-ui';
 
@@ -15,6 +14,7 @@ import { workspaceAuthProvidersState } from '@/workspace/states/workspaceAuthPro
 
 import { isMultiWorkspaceEnabledState } from '@/client-config/states/isMultiWorkspaceEnabledState';
 import { email, mocks, password, results, token } from '../__mocks__/useAuth';
+import { renderHook } from '@testing-library/react';
 
 const Wrapper = ({ children }: { children: ReactNode }) => (
   <MockedProvider mocks={mocks} addTypename={false}>
@@ -59,6 +59,7 @@ describe('useAuth', () => {
     });
 
     expect(mocks[1].result).toHaveBeenCalled();
+    expect(mocks[3].result).toHaveBeenCalled();
   });
 
   it('should handle credential sign-in', async () => {