admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Rename fieldId and objectId into fieldMetadataId and objectMetadataId (#2421)

Browse Source 
* Rename fieldId and objectId into fieldMetadataId and objectMetadataId

* Fix tests
This commit is contained in:
Charles Bochet
2023-11-10 14:35:18 +01:00
committed by GitHub
parent 57cfd4db45
commit 618513afcd
136 changed files with 544 additions and 402 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
front/src/pages/people/constants/personShowFieldDefinitions.tsx
View File

@ -23,7 +23,7 @@ import { getLogoUrlFromDomainName } from '~/utils';
export const personShowFieldDefinition: FieldDefinition<FieldMetadata>[] = [
{
fieldId: 'email',
fieldMetadataId: 'email',
label: 'Email',
Icon: IconMail,
type: 'TEXT',
@ -33,7 +33,7 @@ export const personShowFieldDefinition: FieldDefinition<FieldMetadata>[] = [
},
} satisfies FieldDefinition<FieldTextMetadata>,
{
fieldId: 'company',
fieldMetadataId: 'company',
label: 'Company',
Icon: IconBuildingSkyscraper,
type: 'RELATION',
@ -50,7 +50,7 @@ export const personShowFieldDefinition: FieldDefinition<FieldMetadata>[] = [
},
} satisfies FieldDefinition<FieldRelationMetadata>,
{
fieldId: 'phone',
fieldMetadataId: 'phone',
label: 'Phone',
Icon: IconPhone,
type: 'PHONE',
@ -60,7 +60,7 @@ export const personShowFieldDefinition: FieldDefinition<FieldMetadata>[] = [
},
} satisfies FieldDefinition<FieldPhoneMetadata>,
{
fieldId: 'jobTitle',
fieldMetadataId: 'jobTitle',
label: 'Job Title',
Icon: IconBriefcase,
type: 'TEXT',
@ -70,7 +70,7 @@ export const personShowFieldDefinition: FieldDefinition<FieldMetadata>[] = [
},
} satisfies FieldDefinition<FieldTextMetadata>,
{
fieldId: 'city',
fieldMetadataId: 'city',
label: 'City',
Icon: IconMap,
type: 'TEXT',
@ -80,7 +80,7 @@ export const personShowFieldDefinition: FieldDefinition<FieldMetadata>[] = [
},
} satisfies FieldDefinition<FieldTextMetadata>,
{
fieldId: 'linkedinUrl',
fieldMetadataId: 'linkedinUrl',
label: 'Linkedin URL',
Icon: IconBrandLinkedin,
type: 'URL',
@ -90,7 +90,7 @@ export const personShowFieldDefinition: FieldDefinition<FieldMetadata>[] = [
},
} satisfies FieldDefinition<FieldURLMetadata>,
{
fieldId: 'xUrl',
fieldMetadataId: 'xUrl',
label: 'X URL',
Icon: IconBrandX,
type: 'URL',
@ -100,7 +100,7 @@ export const personShowFieldDefinition: FieldDefinition<FieldMetadata>[] = [
},
} satisfies FieldDefinition<FieldURLMetadata>,
{
fieldId: 'createdAt',
fieldMetadataId: 'createdAt',
label: 'Created at',
Icon: IconCalendar,
type: 'DATE',

14
front/src/pages/people/constants/personTableFilterDefinitions.tsx
View File

@ -13,25 +13,25 @@ import { Person } from '~/generated/graphql';
export const personTableFilterDefinitions: FilterDefinitionByEntity<Person>[] =
[
{
fieldId: 'firstName',
fieldMetadataId: 'firstName',
label: 'First name',
Icon: IconUser,
type: 'TEXT',
},
{
fieldId: 'lastName',
fieldMetadataId: 'lastName',
label: 'Last name',
Icon: IconUser,
type: 'TEXT',
},
{
fieldId: 'email',
fieldMetadataId: 'email',
label: 'Email',
Icon: IconMail,
type: 'TEXT',
},
{
fieldId: 'companyId',
fieldMetadataId: 'companyId',
label: 'Company',
Icon: IconBuildingSkyscraper,
type: 'ENTITY',
@ -39,19 +39,19 @@ export const personTableFilterDefinitions: FilterDefinitionByEntity<Person>[] =
entitySelectComponent: <FilterDropdownCompanySearchSelect />,
},
{
fieldId: 'phone',
fieldMetadataId: 'phone',
label: 'Phone',
Icon: IconPhone,
type: 'TEXT',
},
{
fieldId: 'createdAt',
fieldMetadataId: 'createdAt',
label: 'Created at',
Icon: IconCalendarEvent,
type: 'DATE',
},
{
fieldId: 'city',
fieldMetadataId: 'city',
label: 'City',
Icon: IconMap,
type: 'TEXT',

12
front/src/pages/people/constants/personTableSortDefinitions.tsx
View File

@ -11,7 +11,7 @@ import { SortDirection } from '@/ui/object/object-sort-dropdown/types/SortDirect
export const personTableSortDefinitions: SortDefinition[] = [
{
fieldId: 'fullname',
fieldMetadataId: 'fullname',
label: 'People',
Icon: IconUser,
@ -21,7 +21,7 @@ export const personTableSortDefinitions: SortDefinition[] = [
],
},
{
fieldId: 'company_name',
fieldMetadataId: 'company_name',
label: 'Company',
Icon: IconBuildingSkyscraper,
getOrderByTemplate: (direction: SortDirection) => [
@ -29,22 +29,22 @@ export const personTableSortDefinitions: SortDefinition[] = [
],
},
{
fieldId: 'email',
fieldMetadataId: 'email',
label: 'Email',
Icon: IconMail,
},
{
fieldId: 'phone',
fieldMetadataId: 'phone',
label: 'Phone',
Icon: IconPhone,
},
{
fieldId: 'createdAt',
fieldMetadataId: 'createdAt',
label: 'Created at',
Icon: IconCalendarEvent,
},
{
fieldId: 'city',
fieldMetadataId: 'city',
label: 'City',
Icon: IconMap,
},