twentyhq/twenty
1
1
Fork 0
mirror of https://github.com/twentyhq/twenty.git synced 2024-10-04 21:07:21 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix: composite type migrations not well formatted (#3088)

Browse Source
This commit is contained in:
Jérémy M 2023-12-21 19:00:33 +01:00 committed by GitHub
parent 1b7580476d
commit 3234134a30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 42 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
packages/twenty-server/src/metadata/field-metadata/composite-types/currency.composite-type.ts
View File

@ -2,10 +2,22 @@ import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/
import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
import { generateTargetColumnMap } from 'src/metadata/field-metadata/utils/generate-target-column-map.util';
export const currencyFields = (
fieldMetadata?: FieldMetadataInterface,
): FieldMetadataInterface[] => {
const targetColumnMap = fieldMetadata
? generateTargetColumnMap(
fieldMetadata.type,
fieldMetadata.isCustom ?? false,
fieldMetadata.name,
)
: {
amountMicros: 'amountMicros',
currencyCode: 'currencyCode',
};
return [
{
id: 'amountMicros',
@ -14,9 +26,7 @@ export const currencyFields = (
name: 'amountMicros',
label: 'AmountMicros',
targetColumnMap: {
value: fieldMetadata
? `${fieldMetadata.name}AmountMicros`
: 'amountMicros',
value: targetColumnMap.amountMicros,
},
isNullable: true,
} satisfies FieldMetadataInterface,
@ -27,9 +37,7 @@ export const currencyFields = (
name: 'currencyCode',
label: 'Currency Code',
targetColumnMap: {
value: fieldMetadata
? `${fieldMetadata.name}CurrencyCode`
: 'currencyCode',
value: targetColumnMap.currencyCode,
},
isNullable: true,
} satisfies FieldMetadataInterface,

16
packages/twenty-server/src/metadata/field-metadata/composite-types/full-name.composite-type.ts
View File

@ -2,10 +2,22 @@ import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/
import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
import { generateTargetColumnMap } from 'src/metadata/field-metadata/utils/generate-target-column-map.util';
export const fullNameFields = (
fieldMetadata?: FieldMetadataInterface,
): FieldMetadataInterface[] => {
const targetColumnMap = fieldMetadata
? generateTargetColumnMap(
fieldMetadata.type,
fieldMetadata.isCustom ?? false,
fieldMetadata.name,
)
: {
firstName: 'firstName',
lastName: 'lastName',
};
return [
{
id: 'firstName',
@ -14,7 +26,7 @@ export const fullNameFields = (
name: 'firstName',
label: 'First Name',
targetColumnMap: {
value: fieldMetadata ? `${fieldMetadata.name}FirstName` : 'firstName',
value: targetColumnMap.firstName,
},
isNullable: true,
} satisfies FieldMetadataInterface,
@ -25,7 +37,7 @@ export const fullNameFields = (
name: 'lastName',
label: 'Last Name',
targetColumnMap: {
value: fieldMetadata ? `${fieldMetadata.name}LastName` : 'lastName',
value: targetColumnMap.lastName,
},
isNullable: true,
} satisfies FieldMetadataInterface,

16
packages/twenty-server/src/metadata/field-metadata/composite-types/link.composite-type.ts
View File

@ -2,10 +2,22 @@ import { ObjectMetadataInterface } from 'src/metadata/field-metadata/interfaces/
import { FieldMetadataInterface } from 'src/metadata/field-metadata/interfaces/field-metadata.interface';
import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.entity';
import { generateTargetColumnMap } from 'src/metadata/field-metadata/utils/generate-target-column-map.util';
export const linkFields = (
fieldMetadata?: FieldMetadataInterface,
): FieldMetadataInterface[] => {
const targetColumnMap = fieldMetadata
? generateTargetColumnMap(
fieldMetadata.type,
fieldMetadata.isCustom ?? false,
fieldMetadata.name,
)
: {
label: 'label',
url: 'url',
};
return [
{
id: 'label',
@ -14,7 +26,7 @@ export const linkFields = (
name: 'label',
label: 'Label',
targetColumnMap: {
value: fieldMetadata ? `${fieldMetadata.name}Label` : 'label',
value: targetColumnMap.label,
},
isNullable: true,
} satisfies FieldMetadataInterface,
@ -25,7 +37,7 @@ export const linkFields = (
name: 'url',
label: 'Url',
targetColumnMap: {
value: fieldMetadata ? `${fieldMetadata.name}Url` : 'url',
value: targetColumnMap.url,
},
isNullable: true,
} satisfies FieldMetadataInterface,