Merge branch 'twentyhq:main' into 6138_DataImporter-incorret-unmactedFields

Author: Faisal-imtiyaz123

nx.json

@@ -162,7 +162,7 @@
       "options": {
         "cwd": "{projectRoot}",
         "commands": [
-          "test-storybook --url http://localhost:{args.port} --maxWorkers=3"
+          "test-storybook --url http://localhost:{args.port} --maxWorkers=2"
         ],
         "port": 6006
       }

package.json

@@ -3,6 +3,7 @@
     "@air/react-drag-to-select": "^5.0.8",
     "@apollo/client": "^3.7.17",
     "@apollo/server": "^4.7.3",
+    "@aws-sdk/client-lambda": "^3.614.0",
     "@aws-sdk/client-s3": "^3.363.0",
     "@aws-sdk/credential-providers": "^3.363.0",
     "@blocknote/core": "^0.12.1",
@@ -70,6 +71,8 @@
     "afterframe": "^1.0.2",
     "apollo-server-express": "^3.12.0",
     "apollo-upload-client": "^17.0.0",
+    "archiver": "^7.0.1",
+    "aws-sdk": "^2.1658.0",
     "axios": "^1.6.2",
     "bcrypt": "^5.1.1",
     "better-sqlite3": "^9.2.2",
@@ -93,6 +96,7 @@
     "facepaint": "^1.2.1",
     "file-type": "16.5.4",
     "framer-motion": "^10.12.17",
+    "fs-extra": "^11.2.0",
     "googleapis": "105",
     "graphiql": "^3.1.1",
     "graphql": "16.8.0",

packages/twenty-chrome-extension/src/generated/graphql.tsx

@@ -1,5 +1,5 @@
-import { gql } from '@apollo/client';
 import * as Apollo from '@apollo/client';
+import { gql } from '@apollo/client';
 export type Maybe<T> = T | null;
 export type InputMaybe<T> = Maybe<T>;
 export type Exact<T extends { [key: string]: unknown }> = { [K in keyof T]: T[K] };
@@ -2528,7 +2528,6 @@ export enum FieldMetadataType {
   Numeric = 'NUMERIC',
   Phone = 'PHONE',
   Position = 'POSITION',
-  Probability = 'PROBABILITY',
   Rating = 'RATING',
   RawJson = 'RAW_JSON',
   Relation = 'RELATION',

packages/twenty-emails/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twenty-emails",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "description": "",
   "author": "",
   "private": true,

packages/twenty-front/jest.config.ts

@@ -24,8 +24,8 @@ const jestConfig: JestConfigWithTsJest = {
   extensionsToTreatAsEsm: ['.ts', '.tsx'],
   coverageThreshold: {
     global: {
-      statements: 65,
-      lines: 64,
+      statements: 64,
+      lines: 63,
       functions: 55,
     },
   },

packages/twenty-front/package.json

@@ -1,6 +1,6 @@
 {
   "name": "twenty-front",
-  "version": "0.21.0",
+  "version": "0.22.0",
   "private": true,
   "type": "module",
   "scripts": {

packages/twenty-front/src/generated-metadata/graphql.ts

@@ -26,6 +26,13 @@ export type Scalars = {
   Upload: { input: any; output: any; }
 };
 
+export type AisqlQueryResult = {
+  __typename?: 'AISQLQueryResult';
+  queryFailedErrorMessage?: Maybe<Scalars['String']['output']>;
+  sqlQuery: Scalars['String']['output'];
+  sqlQueryResult?: Maybe<Scalars['String']['output']>;
+};
+
 export type ActivateWorkspaceInput = {
   displayName?: InputMaybe<Scalars['String']['input']>;
 };
@@ -333,7 +340,6 @@ export enum FieldMetadataType {
   Numeric = 'NUMERIC',
   Phone = 'PHONE',
   Position = 'POSITION',
-  Probability = 'PROBABILITY',
   Rating = 'RATING',
   RawJson = 'RAW_JSON',
   Relation = 'RELATION',
@@ -346,6 +352,7 @@ export enum FileFolder {
   Attachment = 'Attachment',
   PersonPicture = 'PersonPicture',
   ProfilePicture = 'ProfilePicture',
+  ServerlessFunction = 'ServerlessFunction',
   WorkspaceLogo = 'WorkspaceLogo'
 }
 
@@ -398,6 +405,7 @@ export type Mutation = {
   createOneObject: Object;
   createOneRelation: Relation;
   createOneRemoteServer: RemoteServer;
+  createOneServerlessFunction: ServerlessFunction;
   deleteCurrentWorkspace: Workspace;
   deleteOneField: Field;
   deleteOneObject: Object;
@@ -408,6 +416,7 @@ export type Mutation = {
   emailPasswordResetLink: EmailPasswordResetLink;
   enablePostgresProxy: PostgresCredentials;
   exchangeAuthorizationCode: ExchangeAuthCode;
+  executeOneServerlessFunction: ServerlessFunctionExecutionResult;
   generateApiKeyToken: ApiKeyToken;
   generateJWT: AuthTokens;
   generateTransientToken: TransientToken;
@@ -489,6 +498,12 @@ export type MutationCreateOneRemoteServerArgs = {
 };
 
 
+export type MutationCreateOneServerlessFunctionArgs = {
+  file: Scalars['Upload']['input'];
+  name: Scalars['String']['input'];
+};
+
+
 export type MutationDeleteOneFieldArgs = {
   input: DeleteOneFieldInput;
 };
@@ -521,6 +536,12 @@ export type MutationExchangeAuthorizationCodeArgs = {
 };
 
 
+export type MutationExecuteOneServerlessFunctionArgs = {
+  name: Scalars['String']['input'];
+  payload?: InputMaybe<Scalars['JSON']['input']>;
+};
+
+
 export type MutationGenerateApiKeyTokenArgs = {
   apiKeyId: Scalars['String']['input'];
   expiresAt: Scalars['String']['input'];
@@ -708,6 +729,7 @@ export type Query = {
   findManyRemoteServersByType: Array<RemoteServer>;
   findOneRemoteServerById: RemoteServer;
   findWorkspaceFromInviteHash: Workspace;
+  getAISQLQuery: AisqlQueryResult;
   getPostgresCredentials?: Maybe<PostgresCredentials>;
   getProductPrices: ProductPricesEntity;
   getTimelineCalendarEventsFromCompanyId: TimelineCalendarEventsWithTotal;
@@ -718,6 +740,8 @@ export type Query = {
   objects: ObjectConnection;
   relation: Relation;
   relations: RelationConnection;
+  serverlessFunction: ServerlessFunction;
+  serverlessFunctions: ServerlessFunctionConnection;
   validatePasswordResetToken: ValidatePasswordResetToken;
 };
 
@@ -769,6 +793,11 @@ export type QueryFindWorkspaceFromInviteHashArgs = {
 };
 
 
+export type QueryGetAisqlQueryArgs = {
+  text: Scalars['String']['input'];
+};
+
+
 export type QueryGetProductPricesArgs = {
   product: Scalars['String']['input'];
 };
@@ -823,6 +852,18 @@ export type QueryRelationsArgs = {
 };
 
 
+export type QueryServerlessFunctionArgs = {
+  id: Scalars['UUID']['input'];
+};
+
+
+export type QueryServerlessFunctionsArgs = {
+  filter?: ServerlessFunctionFilter;
+  paging?: CursorPaging;
+  sorting?: Array<ServerlessFunctionSort>;
+};
+
+
 export type QueryValidatePasswordResetTokenArgs = {
   passwordResetToken: Scalars['String']['input'];
 };
@@ -916,6 +957,26 @@ export type Sentry = {
   release?: Maybe<Scalars['String']['output']>;
 };
 
+export type ServerlessFunctionConnection = {
+  __typename?: 'ServerlessFunctionConnection';
+  /** Array of edges. */
+  edges: Array<ServerlessFunctionEdge>;
+  /** Paging information */
+  pageInfo: PageInfo;
+};
+
+export type ServerlessFunctionExecutionResult = {
+  __typename?: 'ServerlessFunctionExecutionResult';
+  /** Execution result in JSON format */
+  result: Scalars['JSON']['output'];
+};
+
+/** SyncStatus of the serverlessFunction */
+export enum ServerlessFunctionSyncStatus {
+  NotReady = 'NOT_READY',
+  Ready = 'READY'
+}
+
 export type SessionEntity = {
   __typename?: 'SessionEntity';
   url?: Maybe<Scalars['String']['output']>;
@@ -1346,6 +1407,39 @@ export type RelationEdge = {
   node: Relation;
 };
 
+export type ServerlessFunction = {
+  __typename?: 'serverlessFunction';
+  createdAt: Scalars['DateTime']['output'];
+  id: Scalars['UUID']['output'];
+  name: Scalars['String']['output'];
+  syncStatus: ServerlessFunctionSyncStatus;
+  updatedAt: Scalars['DateTime']['output'];
+};
+
+export type ServerlessFunctionEdge = {
+  __typename?: 'serverlessFunctionEdge';
+  /** Cursor for this node. */
+  cursor: Scalars['ConnectionCursor']['output'];
+  /** The node containing the serverlessFunction */
+  node: ServerlessFunction;
+};
+
+export type ServerlessFunctionFilter = {
+  and?: InputMaybe<Array<ServerlessFunctionFilter>>;
+  id?: InputMaybe<UuidFilterComparison>;
+  or?: InputMaybe<Array<ServerlessFunctionFilter>>;
+};
+
+export type ServerlessFunctionSort = {
+  direction: SortDirection;
+  field: ServerlessFunctionSortFields;
+  nulls?: InputMaybe<SortNulls>;
+};
+
+export enum ServerlessFunctionSortFields {
+  Id = 'id'
+}
+
 export type RemoteServerFieldsFragment = { __typename?: 'RemoteServer', id: string, createdAt: any, foreignDataWrapperId: string, foreignDataWrapperOptions?: any | null, foreignDataWrapperType: string, updatedAt: any, schema?: string | null, label: string, userMappingOptions?: { __typename?: 'UserMappingOptionsUser', user?: string | null } | null };
 
 export type RemoteTableFieldsFragment = { __typename?: 'RemoteTable', id?: any | null, name: string, schema?: string | null, status: RemoteTableStatus, schemaPendingUpdates?: Array<DistantTableUpdate> | null };

packages/twenty-front/src/generated/graphql.tsx

@@ -246,7 +246,6 @@ export enum FieldMetadataType {
   Numeric = 'NUMERIC',
   Phone = 'PHONE',
   Position = 'POSITION',
-  Probability = 'PROBABILITY',
   Rating = 'RATING',
   RawJson = 'RAW_JSON',
   Relation = 'RELATION',
@@ -259,6 +258,7 @@ export enum FileFolder {
   Attachment = 'Attachment',
   PersonPicture = 'PersonPicture',
   ProfilePicture = 'ProfilePicture',
+  ServerlessFunction = 'ServerlessFunction',
   WorkspaceLogo = 'WorkspaceLogo'
 }
 
@@ -684,6 +684,26 @@ export type Sentry = {
   release?: Maybe<Scalars['String']>;
 };
 
+export type ServerlessFunctionConnection = {
+  __typename?: 'ServerlessFunctionConnection';
+  /** Array of edges. */
+  edges: Array<ServerlessFunctionEdge>;
+  /** Paging information */
+  pageInfo: PageInfo;
+};
+
+export type ServerlessFunctionExecutionResult = {
+  __typename?: 'ServerlessFunctionExecutionResult';
+  /** Execution result in JSON format */
+  result: Scalars['JSON'];
+};
+
+/** SyncStatus of the serverlessFunction */
+export enum ServerlessFunctionSyncStatus {
+  NotReady = 'NOT_READY',
+  Ready = 'READY'
+}
+
 export type SessionEntity = {
   __typename?: 'SessionEntity';
   url?: Maybe<Scalars['String']>;
@@ -1065,6 +1085,23 @@ export type RelationEdge = {
   node: Relation;
 };
 
+export type ServerlessFunction = {
+  __typename?: 'serverlessFunction';
+  createdAt: Scalars['DateTime'];
+  id: Scalars['UUID'];
+  name: Scalars['String'];
+  syncStatus: ServerlessFunctionSyncStatus;
+  updatedAt: Scalars['DateTime'];
+};
+
+export type ServerlessFunctionEdge = {
+  __typename?: 'serverlessFunctionEdge';
+  /** Cursor for this node. */
+  cursor: Scalars['ConnectionCursor'];
+  /** The node containing the serverlessFunction */
+  node: ServerlessFunction;
+};
+
 export type TimelineCalendarEventFragmentFragment = { __typename?: 'TimelineCalendarEvent', id: any, title: string, description: string, location: string, startsAt: string, endsAt: string, isFullDay: boolean, visibility: CalendarChannelVisibility, participants: Array<{ __typename?: 'TimelineCalendarEventParticipant', personId?: any | null, workspaceMemberId?: any | null, firstName: string, lastName: string, displayName: string, avatarUrl: string, handle: string }> };
 
 export type TimelineCalendarEventParticipantFragmentFragment = { __typename?: 'TimelineCalendarEventParticipant', personId?: any | null, workspaceMemberId?: any | null, firstName: string, lastName: string, displayName: string, avatarUrl: string, handle: string };

packages/twenty-front/src/hooks/useScrollToPosition.ts

@@ -0,0 +1,20 @@
+import { overlayScrollbarsState } from '@/ui/utilities/scroll/states/overlayScrollbarsState';
+import { useRecoilCallback } from 'recoil';
+
+export const useScrollToPosition = () => {
+  const scrollToPosition = useRecoilCallback(
+    ({ snapshot }) =>
+      (scrollPositionInPx: number) => {
+        const overlayScrollbars = snapshot
+          .getLoadable(overlayScrollbarsState)
+          .getValue();
+
+        const scrollWrapper = overlayScrollbars?.elements().viewport;
+
+        scrollWrapper?.scrollTo({ top: scrollPositionInPx });
+      },
+    [],
+  );
+
+  return { scrollToPosition };
+};

packages/twenty-front/src/modules/activities/calendar/components/CalendarEventDetailsEffect.tsx

@@ -0,0 +1,23 @@
+import { CalendarEvent } from '@/activities/calendar/types/CalendarEvent';
+import { useUpsertRecordsInStore } from '@/object-record/record-store/hooks/useUpsertRecordsInStore';
+import { useEffect } from 'react';
+
+type CalendarEventDetailsEffectProps = {
+  record: CalendarEvent;
+};
+
+export const CalendarEventDetailsEffect = ({
+  record,
+}: CalendarEventDetailsEffectProps) => {
+  const { upsertRecords } = useUpsertRecordsInStore();
+
+  useEffect(() => {
+    if (!record) {
+      return;
+    }
+
+    upsertRecords([record]);
+  }, [record, upsertRecords]);
+
+  return <></>;
+};