Merge branch 'main' into fix/context-menu

twentyhq · Jan 2, 2025 · b876240 · b876240
2 parents bd86af7 + 0674388
commit b876240
Show file tree

Hide file tree

Showing 120 changed files with 1,949 additions and 766 deletions.
diff --git a/packages/twenty-front/src/generated-metadata/graphql.ts b/packages/twenty-front/src/generated-metadata/graphql.ts
@@ -32,12 +32,6 @@ export type ActivateWorkspaceInput = {
   displayName?: InputMaybe<Scalars['String']['input']>;
 };
 
-export type ActivateWorkspaceOutput = {
-  __typename?: 'ActivateWorkspaceOutput';
-  loginToken: AuthToken;
-  workspace: Workspace;
-};
-
 export type Analytics = {
   __typename?: 'Analytics';
   /** Boolean that confirms query was dispatched */
@@ -128,6 +122,12 @@ export type Billing = {
   isBillingEnabled: Scalars['Boolean']['output'];
 };
 
+/** The different billing plans available */
+export enum BillingPlanKey {
+  Enterprise = 'ENTERPRISE',
+  Pro = 'PRO'
+}
+
 export type BillingSubscription = {
   __typename?: 'BillingSubscription';
   id: Scalars['UUID']['output'];
@@ -371,7 +371,7 @@ export type ExecuteServerlessFunctionInput = {
 export type FeatureFlag = {
   __typename?: 'FeatureFlag';
   id: Scalars['UUID']['output'];
-  key: Scalars['String']['output'];
+  key: FeatureFlagKey;
   value: Scalars['Boolean']['output'];
   workspaceId: Scalars['String']['output'];
 };
@@ -382,6 +382,28 @@ export type FeatureFlagFilter = {
   or?: InputMaybe<Array<FeatureFlagFilter>>;
 };
 
+export enum FeatureFlagKey {
+  IsAdvancedFiltersEnabled = 'IsAdvancedFiltersEnabled',
+  IsAggregateQueryEnabled = 'IsAggregateQueryEnabled',
+  IsAirtableIntegrationEnabled = 'IsAirtableIntegrationEnabled',
+  IsAnalyticsV2Enabled = 'IsAnalyticsV2Enabled',
+  IsCopilotEnabled = 'IsCopilotEnabled',
+  IsCrmMigrationEnabled = 'IsCrmMigrationEnabled',
+  IsEventObjectEnabled = 'IsEventObjectEnabled',
+  IsFreeAccessEnabled = 'IsFreeAccessEnabled',
+  IsFunctionSettingsEnabled = 'IsFunctionSettingsEnabled',
+  IsGmailSendEmailScopeEnabled = 'IsGmailSendEmailScopeEnabled',
+  IsJsonFilterEnabled = 'IsJsonFilterEnabled',
+  IsMicrosoftSyncEnabled = 'IsMicrosoftSyncEnabled',
+  IsPageHeaderV2Enabled = 'IsPageHeaderV2Enabled',
+  IsPostgreSqlIntegrationEnabled = 'IsPostgreSQLIntegrationEnabled',
+  IsSsoEnabled = 'IsSSOEnabled',
+  IsStripeIntegrationEnabled = 'IsStripeIntegrationEnabled',
+  IsUniqueIndexesEnabled = 'IsUniqueIndexesEnabled',
+  IsViewGroupsEnabled = 'IsViewGroupsEnabled',
+  IsWorkflowEnabled = 'IsWorkflowEnabled'
+}
+
 export type FeatureFlagSort = {
   direction: SortDirection;
   field: FeatureFlagSortFields;
@@ -481,6 +503,12 @@ export enum IdentityProviderType {
   Saml = 'SAML'
 }
 
+export type ImpersonateOutput = {
+  __typename?: 'ImpersonateOutput';
+  loginToken: AuthToken;
+  workspace: WorkspaceSubdomainAndId;
+};
+
 export type IndexConnection = {
   __typename?: 'IndexConnection';
   /** Array of edges. */
@@ -544,7 +572,7 @@ export enum MessageChannelVisibility {
 export type Mutation = {
   __typename?: 'Mutation';
   activateWorkflowVersion: Scalars['Boolean']['output'];
-  activateWorkspace: ActivateWorkspaceOutput;
+  activateWorkspace: Workspace;
   addUserToWorkspace: User;
   addUserToWorkspaceByInviteToken: User;
   authorizeApp: AuthorizeApp;
@@ -579,13 +607,13 @@ export type Mutation = {
   generateApiKeyToken: ApiKeyToken;
   generateTransientToken: TransientToken;
   getAuthorizationUrl: GetAuthorizationUrlOutput;
-  impersonate: AuthTokens;
+  impersonate: ImpersonateOutput;
   publishServerlessFunction: ServerlessFunction;
   renewToken: AuthTokens;
   resendWorkspaceInvitation: SendInvitationsOutput;
   runWorkflowVersion: WorkflowRun;
   sendInvitations: SendInvitationsOutput;
-  signUp: LoginToken;
+  signUp: SignUpOutput;
   skipSyncEmailOnboardingStep: OnboardingStepSuccess;
   switchWorkspace: PublicWorkspaceDataOutput;
   syncRemoteTable: RemoteTable;
@@ -645,7 +673,9 @@ export type MutationChallengeArgs = {
 
 
 export type MutationCheckoutSessionArgs = {
+  plan?: BillingPlanKey;
   recurringInterval: SubscriptionInterval;
+  requirePaymentMethod?: Scalars['Boolean']['input'];
   successUrlPath?: InputMaybe<Scalars['String']['input']>;
 };
 
@@ -1368,6 +1398,12 @@ export type SetupSsoOutput = {
   type: IdentityProviderType;
 };
 
+export type SignUpOutput = {
+  __typename?: 'SignUpOutput';
+  loginToken: AuthToken;
+  workspace: WorkspaceSubdomainAndId;
+};
+
 /** Sort Directions */
 export enum SortDirection {
   Asc = 'ASC',
@@ -1751,6 +1787,7 @@ export type WorkspaceEdge = {
 
 export type WorkspaceInfo = {
   __typename?: 'WorkspaceInfo';
+  allowImpersonation: Scalars['Boolean']['output'];
   featureFlags: Array<FeatureFlag>;
   id: Scalars['String']['output'];
   logo?: Maybe<Scalars['String']['output']>;
@@ -1804,6 +1841,12 @@ export type WorkspaceNameAndId = {
   id: Scalars['String']['output'];
 };
 
+export type WorkspaceSubdomainAndId = {
+  __typename?: 'WorkspaceSubdomainAndId';
+  id: Scalars['String']['output'];
+  subdomain: Scalars['String']['output'];
+};
+
 export type BillingCustomer = {
   __typename?: 'billingCustomer';
   id: Scalars['UUID']['output'];

diff --git a/packages/twenty-front/src/generated/graphql.tsx b/packages/twenty-front/src/generated/graphql.tsx
@@ -117,7 +117,6 @@ export type Billing = {
 
 /** The different billing plans available */
 export enum BillingPlanKey {
-  Base = 'BASE',
   Enterprise = 'ENTERPRISE',
   Pro = 'PRO'
 }
@@ -325,14 +324,12 @@ export enum FeatureFlagKey {
   IsFunctionSettingsEnabled = 'IsFunctionSettingsEnabled',
   IsGmailSendEmailScopeEnabled = 'IsGmailSendEmailScopeEnabled',
   IsJsonFilterEnabled = 'IsJsonFilterEnabled',
-  IsMessageThreadSubscriberEnabled = 'IsMessageThreadSubscriberEnabled',
   IsMicrosoftSyncEnabled = 'IsMicrosoftSyncEnabled',
   IsPageHeaderV2Enabled = 'IsPageHeaderV2Enabled',
   IsPostgreSqlIntegrationEnabled = 'IsPostgreSQLIntegrationEnabled',
   IsSsoEnabled = 'IsSSOEnabled',
   IsStripeIntegrationEnabled = 'IsStripeIntegrationEnabled',
   IsUniqueIndexesEnabled = 'IsUniqueIndexesEnabled',
-  IsViewGroupsEnabled = 'IsViewGroupsEnabled',
   IsWorkflowEnabled = 'IsWorkflowEnabled'
 }
 

diff --git a/...graphql/operation-signatures/factories/fetchAllThreadMessagesOperationSignatureFactory.ts b/...graphql/operation-signatures/factories/fetchAllThreadMessagesOperationSignatureFactory.ts
@@ -2,13 +2,7 @@ import { CoreObjectNameSingular } from '@/object-metadata/types/CoreObjectNameSi
 import { RecordGqlOperationSignatureFactory } from '@/object-record/graphql/types/RecordGqlOperationSignatureFactory';
 
 export const fetchAllThreadMessagesOperationSignatureFactory: RecordGqlOperationSignatureFactory =
-  ({
-    messageThreadId,
-    isSubscribersEnabled,
-  }: {
-    messageThreadId: string;
-    isSubscribersEnabled: boolean;
-  }) => ({
+  ({ messageThreadId }: { messageThreadId: string }) => ({
     objectNameSingular: CoreObjectNameSingular.Message,
     variables: {
       filter: {
@@ -33,15 +27,6 @@ export const fetchAllThreadMessagesOperationSignatureFactory: RecordGqlOperation
       receivedAt: true,
       messageThread: {
         id: true,
-        subscribers: isSubscribersEnabled
-          ? {
-              workspaceMember: {
-                id: true,
-                name: true,
-                avatarUrl: true,
-              },
-            }
-          : undefined,
       },
       messageParticipants: {
         id: true,

diff --git a/...wenty-front/src/modules/activities/emails/right-drawer/hooks/useRightDrawerEmailThread.ts b/...wenty-front/src/modules/activities/emails/right-drawer/hooks/useRightDrawerEmailThread.ts
@@ -14,9 +14,7 @@ import { useFindManyRecords } from '@/object-record/hooks/useFindManyRecords';
 import { useFindOneRecord } from '@/object-record/hooks/useFindOneRecord';
 import { viewableRecordIdState } from '@/object-record/record-right-drawer/states/viewableRecordIdState';
 import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useUpsertRecordsInStore';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
 import { isDefined } from 'twenty-ui';
-import { FeatureFlagKey } from '~/generated/graphql';
 
 export const useRightDrawerEmailThread = () => {
   const viewableRecordId = useRecoilValue(viewableRecordIdState);
@@ -38,14 +36,9 @@ export const useRightDrawerEmailThread = () => {
     },
   });
 
-  const isMessageThreadSubscribersEnabled = useIsFeatureEnabled(
-    FeatureFlagKey.IsMessageThreadSubscriberEnabled,
-  );
-
   const FETCH_ALL_MESSAGES_OPERATION_SIGNATURE =
     fetchAllThreadMessagesOperationSignatureFactory({
       messageThreadId: viewableRecordId,
-      isSubscribersEnabled: isMessageThreadSubscribersEnabled,
     });
 
   const {

diff --git a/...y-front/src/modules/activities/right-drawer/components/MessageThreadSubscribersTopBar.tsx b/...y-front/src/modules/activities/right-drawer/components/MessageThreadSubscribersTopBar.tsx
diff --git a/...front/src/modules/apollo/optimistic-effect/utils/triggerAttachRelationOptimisticEffect.ts b/...front/src/modules/apollo/optimistic-effect/utils/triggerAttachRelationOptimisticEffect.ts
@@ -32,7 +32,7 @@ export const triggerAttachRelationOptimisticEffect = ({
     id: targetRecordCacheId,
     fields: {
       [fieldNameOnTargetRecord]: (targetRecordFieldValue, { toReference }) => {
-        const fieldValueisObjectRecordConnectionWithRefs =
+        const fieldValueIsObjectRecordConnectionWithRefs =
           isObjectRecordConnectionWithRefs(
             sourceObjectNameSingular,
             targetRecordFieldValue,
@@ -47,7 +47,7 @@ export const triggerAttachRelationOptimisticEffect = ({
           return targetRecordFieldValue;
         }
 
-        if (fieldValueisObjectRecordConnectionWithRefs) {
+        if (fieldValueIsObjectRecordConnectionWithRefs) {
           const nextEdges: RecordGqlRefEdge[] = [
             ...targetRecordFieldValue.edges,
             {

diff --git a/.../twenty-front/src/modules/object-record/hooks/__tests__/useAggregateRecordsQuery.test.tsx b/.../twenty-front/src/modules/object-record/hooks/__tests__/useAggregateRecordsQuery.test.tsx
@@ -5,10 +5,14 @@ import { useAggregateRecordsQuery } from '@/object-record/hooks/useAggregateReco
 import { AGGREGATE_OPERATIONS } from '@/object-record/record-table/constants/AggregateOperations';
 import { generateAggregateQuery } from '@/object-record/utils/generateAggregateQuery';
 import { renderHook } from '@testing-library/react';
+import { getColumnNameForAggregateOperation } from 'twenty-shared';
 import { FieldMetadataType } from '~/generated/graphql';
 
 jest.mock('@/object-metadata/hooks/useObjectMetadataItem');
 jest.mock('@/object-record/utils/generateAggregateQuery');
+jest.mock('twenty-shared', () => ({
+  getColumnNameForAggregateOperation: jest.fn(),
+}));
 
 const mockObjectMetadataItem: ObjectMetadataItem = {
   nameSingular: 'company',
@@ -65,6 +69,7 @@ describe('useAggregateRecordsQuery', () => {
   });
 
   it('should handle simple count operation', () => {
+    (getColumnNameForAggregateOperation as jest.Mock).mockReturnValue('name');
     const { result } = renderHook(() =>
       useAggregateRecordsQuery({
         objectNameSingular: 'company',
@@ -86,6 +91,7 @@ describe('useAggregateRecordsQuery', () => {
   });
 
   it('should handle field aggregation', () => {
+    (getColumnNameForAggregateOperation as jest.Mock).mockReturnValue('amount');
     const { result } = renderHook(() =>
       useAggregateRecordsQuery({
         objectNameSingular: 'company',

diff --git a/...nt/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdown.tsx b/...nt/src/modules/object-record/object-options-dropdown/components/ObjectOptionsDropdown.tsx
@@ -34,6 +34,7 @@ export const ObjectOptionsDropdown = ({
       clickableComponent={
         <StyledHeaderDropdownButton>Options</StyledHeaderDropdownButton>
       }
+      onClose={handleResetContent}
       dropdownComponents={
         <ObjectOptionsDropdownContext.Provider
           value={{

diff --git a/...ord/object-options-dropdown/components/ObjectOptionsDropdownHiddenRecordGroupsContent.tsx b/...ord/object-options-dropdown/components/ObjectOptionsDropdownHiddenRecordGroupsContent.tsx
@@ -25,6 +25,7 @@ import { useSetRecoilState } from 'recoil';
 
 export const ObjectOptionsDropdownHiddenRecordGroupsContent = () => {
   const {
+    viewType,
     currentContentId,
     recordIndexId,
     objectMetadataItem,
@@ -47,6 +48,7 @@ export const ObjectOptionsDropdownHiddenRecordGroupsContent = () => {
   const { handleVisibilityChange: handleRecordGroupVisibilityChange } =
     useRecordGroupVisibility({
       viewBarId: recordIndexId,
+      viewType,
     });
 
   const viewGroupSettingsUrl = getSettingsPagePath(

diff --git a/...les/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuContent.tsx b/...les/object-record/object-options-dropdown/components/ObjectOptionsDropdownMenuContent.tsx
@@ -30,8 +30,7 @@ import { useScopedHotkeys } from '@/ui/utilities/hotkey/hooks/useScopedHotkeys';
 import { useRecoilComponentValueV2 } from '@/ui/utilities/state/component-state/hooks/useRecoilComponentValueV2';
 import { useGetCurrentView } from '@/views/hooks/useGetCurrentView';
 import { ViewType } from '@/views/types/ViewType';
-import { useIsFeatureEnabled } from '@/workspace/hooks/useIsFeatureEnabled';
-import { FeatureFlagKey } from '~/generated/graphql';
+import { isDefined } from '~/utils/isDefined';
 
 export const ObjectOptionsDropdownMenuContent = () => {
   const {
@@ -42,10 +41,6 @@ export const ObjectOptionsDropdownMenuContent = () => {
     closeDropdown,
   } = useOptionsDropdown();
 
-  const isViewGroupEnabled = useIsFeatureEnabled(
-    FeatureFlagKey.IsViewGroupsEnabled,
-  );
-
   const { getIcon } = useIcons();
   const { currentViewWithCombinedFiltersAndSorts: currentView } =
     useGetCurrentView();
@@ -120,9 +115,13 @@ export const ObjectOptionsDropdownMenuContent = () => {
           contextualText={`${visibleBoardFields.length} shown`}
           hasSubMenu
         />
-        {(viewType === ViewType.Kanban || isViewGroupEnabled) && (
+        {viewType === ViewType.Kanban && currentView?.key !== 'INDEX' && (
           <MenuItem
-            onClick={() => onContentChange('recordGroups')}
+            onClick={() =>
+              isDefined(recordGroupFieldMetadata)
+                ? onContentChange('recordGroups')
+                : onContentChange('recordGroupFields')
+            }
             LeftIcon={IconLayoutList}
             text="Group by"
             contextualText={recordGroupFieldMetadata?.label}