Merge branch 'main' into TWNTY-6046

packages/twenty-front/src/modules/object-record/record-field/meta-types/input/components/MultiSelectFieldInput.tsx

@@ -1,4 +1,5 @@
 import styled from '@emotion/styled';
+import { useRef, useState } from 'react';
 import { useRecoilValue } from 'recoil';
 import { Key } from 'ts-key-enum';
 

packages/twenty-front/src/modules/settings/data-model/fields/preview/components/SettingsDataModelSetFieldValueEffect.tsx

@@ -32,9 +32,28 @@ export const SettingsDataModelSetFieldValueEffect = ({
   const setRecordFieldValue = useSetRecordFieldValue();
 
   useEffect(() => {
-    setFieldValue(value);
-    setRecordFieldValue(recordId, fieldName, value);
-  }, [value, setFieldValue, setRecordFieldValue, recordId, fieldName]);
+    if (
+      isDefined(upsertedPreviewRecord) &&
+      !!upsertedPreviewRecord[fieldName]
+    ) {
+      setFieldValue(upsertedPreviewRecord[fieldName]);
+      setRecordFieldValue(
+        recordId,
+        fieldName,
+        upsertedPreviewRecord[fieldName],
+      );
+    } else {
+      setFieldValue(value);
+      setRecordFieldValue(recordId, fieldName, value);
+    }
+  }, [
+    value,
+    setFieldValue,
+    setRecordFieldValue,
+    recordId,
+    fieldName,
+    upsertedPreviewRecord,
+  ]);
 
   return null;
 };

packages/twenty-server/src/modules/contact-creation-manager/services/create-company.service.ts

@@ -1,17 +1,17 @@
 import { Injectable } from '@nestjs/common';
 
 import axios, { AxiosInstance } from 'axios';
-import { EntityManager, ILike } from 'typeorm';
 import uniqBy from 'lodash.uniqby';
+import { EntityManager, ILike } from 'typeorm';
 
+import { FieldActorSource } from 'src/engine/metadata-modules/field-metadata/composite-types/actor.composite-type';
+import { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';
+import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 import { CompanyWorkspaceEntity } from 'src/modules/company/standard-objects/company.workspace-entity';
 import { extractDomainFromLink } from 'src/modules/contact-creation-manager/utils/extract-domain-from-link.util';
 import { getCompanyNameFromDomainName } from 'src/modules/contact-creation-manager/utils/get-company-name-from-domain-name.util';
-import { FieldActorSource } from 'src/engine/metadata-modules/field-metadata/composite-types/actor.composite-type';
 import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
-import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 import { computeDisplayName } from 'src/utils/compute-display-name';
-import { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';
 
 type CompanyToCreate = {
   domainName: string;

packages/twenty-server/src/modules/contact-creation-manager/services/create-contact.service.ts

@@ -3,13 +3,13 @@ import { Injectable } from '@nestjs/common';
 import { EntityManager } from 'typeorm';
 import { v4 } from 'uuid';
 
+import { FieldActorSource } from 'src/engine/metadata-modules/field-metadata/composite-types/actor.composite-type';
+import { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';
+import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
 import { getFirstNameAndLastNameFromHandleAndDisplayName } from 'src/modules/contact-creation-manager/utils/get-first-name-and-last-name-from-handle-and-display-name.util';
 import { PersonWorkspaceEntity } from 'src/modules/person/standard-objects/person.workspace-entity';
-import { TwentyORMGlobalManager } from 'src/engine/twenty-orm/twenty-orm-global.manager';
-import { FieldActorSource } from 'src/engine/metadata-modules/field-metadata/composite-types/actor.composite-type';
 import { WorkspaceMemberWorkspaceEntity } from 'src/modules/workspace-member/standard-objects/workspace-member.workspace-entity';
 import { computeDisplayName } from 'src/utils/compute-display-name';
-import { WorkspaceRepository } from 'src/engine/twenty-orm/repository/workspace.repository';
 
 type ContactToCreate = {
   handle: string;

packages/twenty-ui/src/display/icon/components/TablerIcons.ts

@@ -172,7 +172,6 @@ export {
   IconVideo,
   IconWand,
   IconWorld,
-  IconX
+  IconX,
 } from '@tabler/icons-react';
 export type { TablerIconsProps } from '@tabler/icons-react';
-