Skip to content

Commit 34d13a7

Browse files
ijreillyWeiko
andauthored
Deprecate address standard field (#6087)
Closes #5916 --------- Co-authored-by: Weiko <[email protected]>
1 parent b14918c commit 34d13a7

File tree

27 files changed

+310
-77
lines changed

27 files changed

+310
-77
lines changed

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

+20-2
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,16 @@ export const mocks = [
145145
currencyCode
146146
}
147147
createdAt
148-
address
148+
address {
149+
addressStreet1
150+
addressStreet2
151+
addressCity
152+
addressState
153+
addressCountry
154+
addressPostcode
155+
addressLat
156+
addressLng
157+
}
149158
updatedAt
150159
name
151160
accountOwnerId
@@ -262,7 +271,16 @@ export const mocks = [
262271
currencyCode
263272
}
264273
createdAt
265-
address
274+
address {
275+
addressStreet1
276+
addressStreet2
277+
addressCity
278+
addressState
279+
addressCountry
280+
addressPostcode
281+
addressLat
282+
addressLng
283+
}
266284
updatedAt
267285
name
268286
accountOwnerId

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

+21-1
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,16 @@ annualRecurringRevenue
6666
}
6767
createdAt
6868
address
69+
{
70+
addressStreet1
71+
addressStreet2
72+
addressCity
73+
addressState
74+
addressCountry
75+
addressPostcode
76+
addressLat
77+
addressLng
78+
}
6979
updatedAt
7080
name
7181
accountOwnerId
@@ -86,7 +96,7 @@ idealCustomerProfile
8696
domainName: true,
8797
annualRecurringRevenue: true,
8898
createdAt: true,
89-
address: true,
99+
address: { addressStreet1: true },
90100
updatedAt: true,
91101
name: true,
92102
accountOwnerId: true,
@@ -129,6 +139,16 @@ annualRecurringRevenue
129139
}
130140
createdAt
131141
address
142+
{
143+
addressStreet1
144+
addressStreet2
145+
addressCity
146+
addressState
147+
addressCountry
148+
addressPostcode
149+
addressLat
150+
addressLng
151+
}
132152
updatedAt
133153
people
134154
{

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

+10
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,16 @@ annualRecurringRevenue
6565
}
6666
createdAt
6767
address
68+
{
69+
addressStreet1
70+
addressStreet2
71+
addressCity
72+
addressState
73+
addressCountry
74+
addressPostcode
75+
addressLat
76+
addressLng
77+
}
6878
updatedAt
6979
name
7080
accountOwnerId

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -3039,7 +3039,7 @@ export const getObjectMetadataItemsMock = () => {
30393039
{
30403040
__typename: 'field',
30413041
id: '20202020-ad10-4117-a039-3f04b7a5f939',
3042-
type: 'TEXT',
3042+
type: 'ADDRESS',
30433043
name: 'address',
30443044
label: 'Address',
30453045
description: 'The company address',

packages/twenty-front/src/modules/object-record/hooks/__mocks__/useFindManyRecords.ts

+10-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,16 @@ export const query = gql`
8282
currencyCode
8383
}
8484
createdAt
85-
address
85+
address {
86+
addressStreet1
87+
addressStreet2
88+
addressCity
89+
addressState
90+
addressCountry
91+
addressPostcode
92+
addressLat
93+
addressLng
94+
}
8695
updatedAt
8796
name
8897
accountOwnerId

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

+10-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,16 @@ const mocks: MockedResponse[] = [
4040
currencyCode
4141
}
4242
createdAt
43-
address
43+
address {
44+
addressStreet1
45+
addressStreet2
46+
addressCity
47+
addressState
48+
addressCountry
49+
addressPostcode
50+
addressLat
51+
addressLng
52+
}
4453
updatedAt
4554
name
4655
accountOwnerId

packages/twenty-front/src/modules/object-record/record-table/components/__stories__/perf/mock.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -800,7 +800,9 @@ export const mockPerformance = {
800800
},
801801
employees: null,
802802
accountOwnerId: null,
803-
address: '',
803+
address: {
804+
addressCity: 'San Francisco',
805+
},
804806
idealCustomerProfile: false,
805807
createdAt: '2024-05-01T13:16:29.046Z',
806808
id: '20202020-c21e-4ec2-873b-de4264d89025',
@@ -844,7 +846,7 @@ export const mockPerformance = {
844846
},
845847
employees: null,
846848
accountOwnerId: null,
847-
address: '',
849+
address: { addressCity: 'San Francisco' },
848850
idealCustomerProfile: false,
849851
createdAt: '2024-05-01T13:16:29.046Z',
850852
id: '20202020-ed89-413a-b31a-962986e67bb4',

packages/twenty-front/src/modules/object-record/spreadsheet-import/__tests__/useSpreadsheetRecordImport.test.tsx

+10-1
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,16 @@ const companyMocks = [
4040
currencyCode
4141
}
4242
createdAt
43-
address
43+
address {
44+
addressStreet1
45+
addressStreet2
46+
addressCity
47+
addressState
48+
addressCountry
49+
addressPostcode
50+
addressLat
51+
addressLng
52+
}
4453
updatedAt
4554
name
4655
accountOwnerId

packages/twenty-front/src/modules/search/hooks/__mocks__/useFilteredSearchEntityQuery.ts

+3-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,9 @@ export const query = gql`
7878
currencyCode
7979
}
8080
createdAt
81-
address
81+
address {
82+
adressCity
83+
}
8284
updatedAt
8385
name
8486
accountOwnerId

packages/twenty-front/src/modules/sign-in-background-mock/constants/SignInBackgroundMockColumnDefinitions.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ export const SIGN_IN_BACKGROUND_MOCK_COLUMN_DEFINITIONS = (
7878
fieldMetadataId: '20202020-ad10-4117-a039-3f04b7a5f939',
7979
label: 'Address',
8080
size: 100,
81-
type: FieldMetadataType.Text,
81+
type: FieldMetadataType.Address,
8282
metadata: {
8383
fieldName: 'address',
8484
placeHolder: 'Address',

packages/twenty-front/src/modules/sign-in-background-mock/constants/SignInBackgroundMockCompanies.ts

+78-13
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,12 @@ export const SIGN_IN_BACKGROUND_MOCK_COMPANIES = [
1010
__typename: 'FavoriteConnection',
1111
edges: [],
1212
},
13-
address: 'OLINDA SAS. 18 rue de Navarin, 75009 Paris',
13+
address: {
14+
addressStreet1: 'OLINDA SAS',
15+
addressStreet2: '18 rue de Navarin',
16+
addressCity: 'Paris',
17+
addressPostcode: '75009',
18+
},
1419
accountOwner: null,
1520
people: {
1621
__typename: 'PersonConnection',
@@ -115,7 +120,12 @@ export const SIGN_IN_BACKGROUND_MOCK_COMPANIES = [
115120
__typename: 'FavoriteConnection',
116121
edges: [],
117122
},
118-
address: '1600 Amphitheatre Pkwy, Mountain View, CA 94043',
123+
address: {
124+
addressStreet1: '1600 Amphitheatre Pkwy',
125+
addressStreet2: 'Mountain View',
126+
addressState: 'CA',
127+
addressPostcode: '94043',
128+
},
119129
accountOwner: null,
120130
people: {
121131
__typename: 'PersonConnection',
@@ -314,7 +324,12 @@ export const SIGN_IN_BACKGROUND_MOCK_COMPANIES = [
314324
__typename: 'FavoriteConnection',
315325
edges: [],
316326
},
317-
address: '1 Hacker Way, Menlo Park, CA 94025',
327+
address: {
328+
addressStreet1: '1 Hacker Way',
329+
addressStreet2: 'Menlo Park',
330+
addressState: 'CA',
331+
addressPostcode: '94025',
332+
},
318333
accountOwner: null,
319334
people: {
320335
__typename: 'PersonConnection',
@@ -444,7 +459,12 @@ export const SIGN_IN_BACKGROUND_MOCK_COMPANIES = [
444459
__typename: 'FavoriteConnection',
445460
edges: [],
446461
},
447-
address: '121 Albright Way, Los Gatos, CA 95032',
462+
address: {
463+
addressStreet1: '121 Albright Way',
464+
addressStreet2: 'Los Gatos',
465+
addressState: 'CA',
466+
addressPostcode: '95032',
467+
},
448468
accountOwner: null,
449469
people: {
450470
__typename: 'PersonConnection',
@@ -492,7 +512,12 @@ export const SIGN_IN_BACKGROUND_MOCK_COMPANIES = [
492512
__typename: 'FavoriteConnection',
493513
edges: [],
494514
},
495-
address: '1 Microsoft Way, Redmond, WA 98052',
515+
address: {
516+
addressStreet1: '1 Microsoft Way',
517+
addressStreet2: 'Redmond',
518+
addressState: 'WA',
519+
addressPostcode: '98052',
520+
},
496521
accountOwner: null,
497522
people: {
498523
__typename: 'PersonConnection',
@@ -672,7 +697,11 @@ export const SIGN_IN_BACKGROUND_MOCK_COMPANIES = [
672697
__typename: 'FavoriteConnection',
673698
edges: [],
674699
},
675-
address: '42 Rue de Paradis, 75010 Paris',
700+
address: {
701+
addressStreet1: '42 rue de paradis',
702+
addressCity: 'Paris',
703+
addressPostcode: '75010',
704+
},
676705
accountOwner: null,
677706
people: {
678707
__typename: 'PersonConnection',
@@ -720,7 +749,12 @@ export const SIGN_IN_BACKGROUND_MOCK_COMPANIES = [
720749
__typename: 'FavoriteConnection',
721750
edges: [],
722751
},
723-
address: '888 Brannan Street San Francisco, CA 94103',
752+
address: {
753+
addressStreet1: '888 Brannan Street',
754+
addressCity: 'San Francisco',
755+
addressState: 'CA',
756+
addressPostcode: '75010',
757+
},
724758
accountOwner: null,
725759
people: {
726760
__typename: 'PersonConnection',
@@ -768,7 +802,13 @@ export const SIGN_IN_BACKGROUND_MOCK_COMPANIES = [
768802
__typename: 'FavoriteConnection',
769803
edges: [],
770804
},
771-
address: '901 Fifth Avenue; Suite 1200; Seattle, WA 98164',
805+
address: {
806+
addressStreet1: '901 Fifth Avenue',
807+
addressStreet2: 'Suite 1200',
808+
addressCity: 'Seattle',
809+
addressState: 'WA',
810+
addressPostcode: '98164',
811+
},
772812
accountOwner: null,
773813
people: {
774814
__typename: 'PersonConnection',
@@ -816,7 +856,13 @@ export const SIGN_IN_BACKGROUND_MOCK_COMPANIES = [
816856
__typename: 'FavoriteConnection',
817857
edges: [],
818858
},
819-
address: '3790 El Camino Real, Unit 518, Palo Alto, CA 94306',
859+
address: {
860+
addressStreet1: '3790 El Camino Real',
861+
addressStreet2: 'Unit 518',
862+
addressCity: 'Palo Alto',
863+
addressState: 'CA',
864+
addressPostcode: '94306',
865+
},
820866
accountOwner: null,
821867
people: {
822868
__typename: 'PersonConnection',
@@ -895,7 +941,11 @@ export const SIGN_IN_BACKGROUND_MOCK_COMPANIES = [
895941
__typename: 'FavoriteConnection',
896942
edges: [],
897943
},
898-
address: '129, Samsung-ro, Yeongtong-gu, Suwon-si, Gyeonggi-do',
944+
address: {
945+
addressStreet1: '129, Samsung-ro',
946+
addressStreet2: 'Yeongtong-gu, Suwon-si',
947+
addressCity: 'Gyeonggi-do',
948+
},
899949
accountOwner: null,
900950
people: {
901951
__typename: 'PersonConnection',
@@ -974,7 +1024,13 @@ export const SIGN_IN_BACKGROUND_MOCK_COMPANIES = [
9741024
__typename: 'FavoriteConnection',
9751025
edges: [],
9761026
},
977-
address: '576 Folsom St., Floor 3, San Francisco, CA 94105',
1027+
address: {
1028+
addressStreet1: '576 Folsom St.',
1029+
addressStreet2: 'Floor 3',
1030+
addressCity: 'San Francisco',
1031+
addressState: 'CA',
1032+
addressPostcode: '94105',
1033+
},
9781034
accountOwner: null,
9791035
people: {
9801036
__typename: 'PersonConnection',
@@ -1022,7 +1078,10 @@ export const SIGN_IN_BACKGROUND_MOCK_COMPANIES = [
10221078
__typename: 'FavoriteConnection',
10231079
edges: [],
10241080
},
1025-
address: '575 Lexington Ave 16th Floor, New York',
1081+
address: {
1082+
addressStreet1: '575 Lexington Ave 16th Floor',
1083+
addressCity: 'New York',
1084+
},
10261085
accountOwner: null,
10271086
people: {
10281087
__typename: 'PersonConnection',
@@ -1070,7 +1129,13 @@ export const SIGN_IN_BACKGROUND_MOCK_COMPANIES = [
10701129
__typename: 'FavoriteConnection',
10711130
edges: [],
10721131
},
1073-
address: '315 Montgomery St, 13th Fl. San Francisco, CA 94104',
1132+
address: {
1133+
addressStreet1: '315 Montgomery St',
1134+
addressStreet2: '13th Fl.',
1135+
addressCity: 'San Francisco',
1136+
addressState: 'CA',
1137+
addressPostcode: '94104',
1138+
},
10741139
accountOwner: null,
10751140
people: {
10761141
__typename: 'PersonConnection',

packages/twenty-front/src/modules/sign-in-background-mock/constants/SignInBackgroundMockFilterDefinitions.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export const SIGN_IN_BACKGROUND_MOCK_FILTER_DEFINITIONS = [
2323
fieldMetadataId: '20202020-ad10-4117-a039-3f04b7a5f939',
2424
label: 'Address',
2525
iconName: 'IconMap',
26-
type: 'TEXT',
26+
type: 'ADDRESS',
2727
},
2828
{
2929
fieldMetadataId: '20202020-0739-495d-8e70-c0807f6b2268',

0 commit comments

Comments
 (0)