Migrate domainName field from text type to links type

packages/twenty-front/src/modules/activities/hooks/__tests__/useActivityTargetObjectRecords.test.tsx

@@ -1,7 +1,7 @@
-import { ReactNode } from 'react';
 import { gql, InMemoryCache } from '@apollo/client';
 import { MockedProvider } from '@apollo/client/testing';
 import { act, renderHook } from '@testing-library/react';
+import { ReactNode } from 'react';
 import { RecoilRoot, useSetRecoilState } from 'recoil';
 
 import { useActivityTargetObjectRecords } from '@/activities/hooks/useActivityTargetObjectRecords';
@@ -45,7 +45,11 @@ const activityNode = {
           company: {
             id: '89bb825c-171e-4bcc-9cf7-43448d6fb280',
             name: 'Airbnb',
-            domainName: 'airbnb.com',
+            domainName: {
+              primaryLinkUrl: 'https://www.airbnb.com',
+              primaryLinkLabel: '',
+              secondaryLinks: null,
+            },
           },
           person: null,
           activityId: '89bb825c-171e-4bcc-9cf7-43448d6fb230',
@@ -90,7 +94,11 @@ cache.writeFragment({
             company {
               id
               name
-              domainName
+              domainName {
+                primaryLinkUrl
+                primaryLinkLabel
+                secondaryLinks
+              }
             }
             person
             activityId

packages/twenty-front/src/modules/command-menu/components/CommandMenu.tsx

@@ -33,6 +33,7 @@ import { commandMenuCommandsState } from '../states/commandMenuCommandsState';
 import { isCommandMenuOpenedState } from '../states/isCommandMenuOpenedState';
 import { Command, CommandType } from '../types/Command';
 
+import { getCompanyDomainName } from '@/object-metadata/utils/getCompanyDomainName';
 import { LightIconButton } from '@/ui/input/button/components/LightIconButton';
 import { CommandGroup } from './CommandGroup';
 import { CommandMenuItem } from './CommandMenuItem';
@@ -429,7 +430,7 @@ export const CommandMenu = () => {
                               placeholderColorSeed={company.id}
                               placeholder={company.name}
                               avatarUrl={getLogoUrlFromDomainName(
-                                company.domainName,
+                                getCompanyDomainName(company),
                               )}
                             />
                           )}

packages/twenty-front/src/modules/companies/types/Company.ts

@@ -5,7 +5,13 @@ export type Company = {
   updatedAt?: string;
   deletedAt?: string | null;
   name: string;
-  domainName: string;
+  domainName:
+    | string
+    | {
+        __typename?: 'Links';
+        primaryLinkUrl: string;
+        primaryLinkLabel: string;
+      };
   address: string;
   accountOwnerId?: string | null;
   position?: number;

packages/twenty-front/src/modules/favorites/hooks/__mocks__/useFavorites.ts

@@ -143,7 +143,11 @@ export const mocks = [
                 primaryLinkLabel
                 secondaryLinks
               }
-              domainName
+              domainName {
+                primaryLinkUrl
+                primaryLinkLabel
+                secondaryLinks
+              }
               annualRecurringRevenue {
                 amountMicros
                 currencyCode
@@ -273,7 +277,11 @@ export const mocks = [
                 primaryLinkLabel
                 secondaryLinks
               }
-              domainName
+              domainName {
+                primaryLinkUrl
+                primaryLinkLabel
+                secondaryLinks
+              }
               annualRecurringRevenue {
                 amountMicros
                 currencyCode

packages/twenty-front/src/modules/favorites/utils/mapFavorites.ts

@@ -1,3 +1,4 @@
+import { getCompanyDomainName } from '@/object-metadata/utils/getCompanyDomainName';
 import { getLogoUrlFromDomainName } from '~/utils';
 import { isDefined } from '~/utils/isDefined';
 
@@ -19,7 +20,9 @@ export const mapFavorites = (favorites: any) => {
           ? {
               id: favorite.company.id,
               labelIdentifier: favorite.company.name,
-              avatarUrl: getLogoUrlFromDomainName(favorite.company.domainName),
+              avatarUrl: getLogoUrlFromDomainName(
+                getCompanyDomainName(favorite.company),
+              ),
               avatarType: 'squared',
               link: `/object/company/${favorite.company.id}`,
             }

packages/twenty-front/src/modules/object-metadata/utils/__tests__/mapFieldMetadataToGraphQLQuery.test.tsx

@@ -61,6 +61,11 @@ linkedinLink
   secondaryLinks
 }
 domainName
+{
+  primaryLinkUrl
+  primaryLinkLabel
+  secondaryLinks
+}
 annualRecurringRevenue
 {
   amountMicros
@@ -95,7 +100,11 @@ idealCustomerProfile
         people: true,
         xLink: true,
         linkedinLink: true,
-        domainName: true,
+        domainName: {
+          primaryLinkUrl: true,
+          primaryLinkLabel: true,
+          secondaryLinks: true,
+        },
         annualRecurringRevenue: true,
         createdAt: true,
         address: { addressStreet1: true },
@@ -136,6 +145,11 @@ linkedinLink
   secondaryLinks
 }
 domainName
+{
+  primaryLinkUrl
+  primaryLinkLabel
+  secondaryLinks
+}
 annualRecurringRevenue
 {
   amountMicros

packages/twenty-front/src/modules/object-metadata/utils/__tests__/mapObjectMetadataToGraphQLQuery.test.tsx

@@ -61,6 +61,11 @@ linkedinLink
   secondaryLinks
 }
 domainName
+{
+  primaryLinkUrl
+  primaryLinkLabel
+  secondaryLinks
+}
 annualRecurringRevenue
 {
   amountMicros

packages/twenty-front/src/modules/object-metadata/utils/getAvatarUrl.ts

@@ -5,6 +5,8 @@ import { getLogoUrlFromDomainName } from '~/utils';
 import { getImageAbsoluteURI } from '~/utils/image/getImageAbsoluteURI';
 import { isDefined } from '~/utils/isDefined';
 
+import { Company } from '@/companies/types/Company';
+import { getCompanyDomainName } from '@/object-metadata/utils/getCompanyDomainName';
 import { getImageIdentifierFieldValue } from './getImageIdentifierFieldValue';
 
 export const getAvatarUrl = (
@@ -17,7 +19,9 @@ export const getAvatarUrl = (
   }
 
   if (objectNameSingular === CoreObjectNameSingular.Company) {
-    return getLogoUrlFromDomainName(record.domainName ?? '');
+    return getLogoUrlFromDomainName(
+      getCompanyDomainName(record as Company) ?? '',
+    );
   }
 
   if (objectNameSingular === CoreObjectNameSingular.Person) {

packages/twenty-front/src/modules/object-metadata/utils/getCompanyDomainName.ts

@@ -0,0 +1,14 @@
+import { Company } from '@/companies/types/Company';
+import { isDefined } from 'twenty-ui';
+
+// temporary, to remove once domainName has been fully migrated to Links type
+export const getCompanyDomainName = (company: Company) => {
+  if (!isDefined(company.domainName)) {
+    return company.domainName;
+  }
+  if (typeof company.domainName === 'string') {
+    return company.domainName;
+  } else {
+    return company.domainName.primaryLinkUrl;
+  }
+};

packages/twenty-front/src/modules/object-metadata/utils/getObjectMetadataItemsMock.ts

@@ -2940,7 +2940,7 @@ export const getObjectMetadataItemsMock = () => {
         {
           __typename: 'field',
           id: '20202020-5e4e-4007-a630-8a2617914889',
-          type: 'TEXT',
+          type: 'LINKS',
           name: 'domainName',
           label: 'Domain Name',
           description:

packages/twenty-front/src/modules/object-record/graphql/types/RecordGqlOperationFilter.ts

@@ -85,6 +85,11 @@ export type AddressFilter = {
   addressPostcode?: StringFilter;
 };
 
+export type LinksFilter = {
+  primaryLinkUrl?: StringFilter;
+  primaryLinkLabel?: StringFilter;
+};
+
 export type LeafFilter =
   | UUIDFilter
   | StringFilter
@@ -95,6 +100,7 @@ export type LeafFilter =
   | FullNameFilter
   | BooleanFilter
   | AddressFilter
+  | LinksFilter
   | undefined;
 
 export type AndObjectRecordFilter = {

packages/twenty-front/src/modules/object-record/record-field/hooks/__tests__/useToggleEditOnlyInput.test.tsx

@@ -36,7 +36,11 @@ const mocks: MockedResponse[] = [
               primaryLinkLabel
               secondaryLinks
             }
-            domainName
+            domainName {
+              primaryLinkUrl
+              primaryLinkLabel
+              secondaryLinks
+            }
             annualRecurringRevenue {
               amountMicros
               currencyCode

packages/twenty-front/src/modules/object-record/record-field/meta-types/display/components/__stories__/perf/relationFromManyFieldDisplayMock.ts

@@ -3,7 +3,7 @@ import { FieldMetadataType } from '~/generated-metadata/graphql';
 export const fieldValue = [
   {
     __typename: 'Company',
-    domainName: 'google.com',
+    domainName: { primaryLinkUrl: 'google.com', primaryLinkLabel: '' },
     xLink: {
       __typename: 'Link',
       primaryLinkLabel: '',
@@ -31,7 +31,7 @@ export const fieldValue = [
   },
   {
     __typename: 'Company',
-    domainName: 'airbnb.com',
+    domainName: { primaryLinkUrl: 'airbnb.com', primaryLinkLabel: '' },
     xLink: {
       __typename: 'Link',
       primaryLinkLabel: '',
@@ -69,7 +69,7 @@ export const otherPersonMock = {
     createdAt: '2024-05-01T13:16:29.046Z',
     company: {
       __typename: 'Company',
-      domainName: 'google.com',
+      domainName: { primaryLinkUrl: 'google.com', primaryLinkLabel: '' },
       xLink: {
         __typename: 'Link',
         primaryLinkLabel: '',
@@ -125,7 +125,7 @@ export const relationFromManyFieldDisplayMock = {
     createdAt: '2024-05-01T13:16:29.046Z',
     company: {
       __typename: 'Company',
-      domainName: 'google.com',
+      domainName: { primaryLinkUrl: 'google.com', primaryLinkLabel: '' },
       xLink: {
         __typename: 'Link',
         primaryLinkLabel: '',
@@ -169,7 +169,10 @@ export const relationFromManyFieldDisplayMock = {
   },
   relationFieldValue: {
     __typename: 'Company',
-    domainName: 'microsoft.com',
+    domainName: {
+      primaryLinkLabel: '',
+      primaryLinkUrl: 'microsoft.com',
+    },
     xLink: {
       __typename: 'Link',
       primaryLinkLabel: '',

packages/twenty-front/src/modules/object-record/record-filter/utils/isRecordMatchingFilter.spec.ts

@@ -2,6 +2,8 @@ import { RecordGqlOperationFilter } from '@/object-record/graphql/types/RecordGq
 import { getCompaniesMock } from '~/testing/mock-data/companies';
 import { generatedMockObjectMetadataItems } from '~/testing/mock-data/objectMetadataItems';
 
+import { Company } from '@/companies/types/Company';
+import { getCompanyDomainName } from '@/object-metadata/utils/getCompanyDomainName';
 import { isRecordMatchingFilter } from './isRecordMatchingFilter';
 
 const companiesMock = getCompaniesMock();
@@ -123,10 +125,19 @@ describe('isRecordMatchingFilter', () => {
 
       const companyMockNotInFilter = {
         ...companiesMock[0],
-        domainName: companyMockInFilter.domainName + 'Different',
+        domainName: {
+          primaryLinkUrl:
+            getCompanyDomainName(companyMockInFilter as Company) + 'Different',
+        },
       };
 
-      const filter = { domainName: { eq: companyMockInFilter.domainName } };
+      const filter = {
+        domainName: {
+          primaryLinkUrl: {
+            eq: getCompanyDomainName(companyMockInFilter as Company),
+          },
+        },
+      };
 
       expect(
         isRecordMatchingFilter({
@@ -228,7 +239,9 @@ describe('isRecordMatchingFilter', () => {
         and: [
           {
             domainName: {
-              eq: companyMockInFilter.domainName,
+              primaryLinkUrl: {
+                eq: getCompanyDomainName(companyMockInFilter as Company),
+              },
             },
           },
           {
@@ -317,14 +330,23 @@ describe('isRecordMatchingFilter', () => {
 
       const companyMockNotInFilter = {
         ...companiesMock[0],
-        domainName: companyMockInFilter.domainName + 'Different',
+        domainName: {
+          primaryLinkUrl:
+            getCompanyDomainName(companyMockInFilter as Company) + 'Different',
+        },
         employees: 5,
         name: companyMockInFilter.name + 'Different',
       };
 
       const filter: RecordGqlOperationFilter = {
         and: [
-          { domainName: { eq: companyMockInFilter.domainName } },
+          {
+            domainName: {
+              primaryLinkUrl: {
+                eq: getCompanyDomainName(companyMockInFilter as Company),
+              },
+            },
+          },
           {
             or: [
               { employees: { eq: companyMockInFilter.employees } },
@@ -478,13 +500,17 @@ describe('isRecordMatchingFilter', () => {
       const companyMockNotInFilter = {
         ...companiesMock[0],
         name: companyMockInFilter.name + 'Different',
-        domainName: companyMockInFilter.name + 'Different',
+        domainName: { primaryLinkUrl: companyMockInFilter.name + 'Different' },
       };
 
       const filter = {
         or: {
           name: { eq: companyMockInFilter.name },
-          domainName: { eq: companyMockInFilter.domainName },
+          domainName: {
+            primaryLinkUrl: {
+              eq: getCompanyDomainName(companyMockInFilter as Company),
+            },
+          },
         },
       };