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

4
server/src/metadata/standard-objects/view-fields/view-fields.metadata.ts
View File

@ -9,10 +9,10 @@ const viewFieldsMetadata = {
fields: [
{
type: 'TEXT',
name: 'fieldId',
name: 'fieldMetadataId',
label: 'Field Id',
targetColumnMap: {
value: 'fieldId',
value: 'fieldMetadataId',
},
description: 'View Field target field',
icon: null,

4
server/src/metadata/standard-objects/view-filters/view-filters.metadata.ts
View File

@ -9,10 +9,10 @@ const viewFiltersMetadata = {
fields: [
{
type: 'TEXT',
name: 'fieldId',
name: 'fieldMetadataId',
label: 'Field Id',
targetColumnMap: {
value: 'fieldId',
value: 'fieldMetadataId',
},
description: 'View Filter target field',
icon: null,

4
server/src/metadata/standard-objects/view-sorts/view-sorts.metadata.ts
View File

@ -9,10 +9,10 @@ const viewSortsMetadata = {
fields: [
{
type: 'TEXT',
name: 'fieldId',
name: 'fieldMetadataId',
label: 'Field Id',
targetColumnMap: {
value: 'fieldId',
value: 'fieldMetadataId',
},
description: 'View Sort target field',
icon: null,

4
server/src/metadata/standard-objects/views/views.metadata.ts
View File

@ -20,10 +20,10 @@ const viewsMetadata = {
},
{
type: 'TEXT',
name: 'objectId',
name: 'objectMetadataId',
label: 'Object Id',
targetColumnMap: {
value: 'objectId',
value: 'objectMetadataId',
},
description: 'View target object',
icon: null,

58
server/src/metadata/tenant-initialisation/standard-objects-prefill-data/standard-objects-prefill-data.ts
View File

@ -58,27 +58,27 @@ export const standardObjectsPrefillData = async (
const createdViews = await entityManager
.createQueryBuilder()
.insert()
.into(`${schemaName}.view`, ['name', 'objectId', 'type'])
.into(`${schemaName}.view`, ['name', 'objectMetadataId', 'type'])
.orIgnore()
.values([
{
name: 'All companies',
objectId: 'company',
objectMetadataId: 'company',
type: 'table',
},
{
name: 'All people',
objectId: 'person',
objectMetadataId: 'person',
type: 'table',
},
{
name: 'All opportunities',
objectId: 'company',
objectMetadataId: 'company',
type: 'kanban',
},
{
name: 'All Companies (V2)',
objectId: companyIdMap['Airbnb'],
objectMetadataId: companyIdMap['Airbnb'],
type: 'table',
},
])
@ -94,7 +94,7 @@ export const standardObjectsPrefillData = async (
.createQueryBuilder()
.insert()
.into(`${schemaName}.viewField`, [
'fieldId',
'fieldMetadataId',
'viewId',
'position',
'isVisible',
@ -103,161 +103,161 @@ export const standardObjectsPrefillData = async (
.orIgnore()
.values([
{
fieldId: 'name',
fieldMetadataId: 'name',
viewId: viewIdMap['All Companies (V2)'],
position: 0,
isVisible: true,
size: 180,
},
{
fieldId: 'name',
fieldMetadataId: 'name',
viewId: viewIdMap['All companies'],
position: 0,
isVisible: true,
size: 180,
},
{
fieldId: 'domainName',
fieldMetadataId: 'domainName',
viewId: viewIdMap['All companies'],
position: 1,
isVisible: true,
size: 100,
},
{
fieldId: 'accountOwner',
fieldMetadataId: 'accountOwner',
viewId: viewIdMap['All companies'],
position: 2,
isVisible: true,
size: 150,
},
{
fieldId: 'createdAt',
fieldMetadataId: 'createdAt',
viewId: viewIdMap['All companies'],
position: 3,
isVisible: true,
size: 150,
},
{
fieldId: 'employees',
fieldMetadataId: 'employees',
viewId: viewIdMap['All companies'],
position: 4,
isVisible: true,
size: 150,
},
{
fieldId: 'linkedin',
fieldMetadataId: 'linkedin',
viewId: viewIdMap['All companies'],
position: 5,
isVisible: true,
size: 170,
},
{
fieldId: 'address',
fieldMetadataId: 'address',
viewId: viewIdMap['All companies'],
position: 6,
isVisible: true,
size: 170,
},
{
fieldId: 'displayName',
fieldMetadataId: 'displayName',
viewId: viewIdMap['All people'],
position: 0,
isVisible: true,
size: 210,
},
{
fieldId: 'email',
fieldMetadataId: 'email',
viewId: viewIdMap['All people'],
position: 1,
isVisible: true,
size: 150,
},
{
fieldId: 'company',
fieldMetadataId: 'company',
viewId: viewIdMap['All people'],
position: 2,
isVisible: true,
size: 150,
},
{
fieldId: 'phone',
fieldMetadataId: 'phone',
viewId: viewIdMap['All people'],
position: 3,
isVisible: true,
size: 150,
},
{
fieldId: 'createdAt',
fieldMetadataId: 'createdAt',
viewId: viewIdMap['All people'],
position: 4,
isVisible: true,
size: 150,
},
{
fieldId: 'city',
fieldMetadataId: 'city',
viewId: viewIdMap['All people'],
position: 5,
isVisible: true,
size: 150,
},
{
fieldId: 'jobTitle',
fieldMetadataId: 'jobTitle',
viewId: viewIdMap['All people'],
position: 6,
isVisible: true,
size: 150,
},
{
fieldId: 'linkedin',
fieldMetadataId: 'linkedin',
viewId: viewIdMap['All people'],
position: 7,
isVisible: true,
size: 150,
},
{
fieldId: 'x',
fieldMetadataId: 'x',
viewId: viewIdMap['All people'],
position: 8,
isVisible: true,
size: 150,
},
{
fieldId: 'amount',
fieldMetadataId: 'amount',
viewId: viewIdMap['All opportunities'],
position: 0,
isVisible: true,
size: 180,
},
{
fieldId: 'probability',
fieldMetadataId: 'probability',
viewId: viewIdMap['All opportunities'],
position: 1,
isVisible: true,
size: 150,
},
{
fieldId: 'closeDate',
fieldMetadataId: 'closeDate',
viewId: viewIdMap['All opportunities'],
position: 2,
isVisible: true,
size: 100,
},
{
fieldId: 'company',
fieldMetadataId: 'company',
viewId: viewIdMap['All opportunities'],
position: 3,
isVisible: true,
size: 150,
},
{
fieldId: 'createdAt',
fieldMetadataId: 'createdAt',
viewId: viewIdMap['All opportunities'],
position: 4,
isVisible: true,
size: 150,
},
{
fieldId: 'pointOfContact',
fieldMetadataId: 'pointOfContact',
viewId: viewIdMap['All opportunities'],
position: 5,
isVisible: true,

2
server/src/metadata/tenant-migration/migrations/1697618011-addViewTable.ts
View File

@ -18,7 +18,7 @@ export const addViewTable: TenantMigrationTableAction[] = [
action: TenantMigrationColumnActionType.CREATE,
},
{
columnName: 'objectId',
columnName: 'objectMetadataId',
columnType: 'varchar',
action: TenantMigrationColumnActionType.CREATE,
},

2
server/src/metadata/tenant-migration/migrations/1697618012-addViewFieldTable.ts
View File

@ -13,7 +13,7 @@ export const addViewFieldTable: TenantMigrationTableAction[] = [
action: 'alter',
columns: [
{
columnName: 'fieldId',
columnName: 'fieldMetadataId',
columnType: 'varchar',
action: TenantMigrationColumnActionType.CREATE,
},

2
server/src/metadata/tenant-migration/migrations/1697618013-addViewFilterTable.ts
View File

@ -13,7 +13,7 @@ export const addViewFilterTable: TenantMigrationTableAction[] = [
action: 'alter',
columns: [
{
columnName: 'fieldId',
columnName: 'fieldMetadataId',
columnType: 'varchar',
action: TenantMigrationColumnActionType.CREATE,
},

2
server/src/metadata/tenant-migration/migrations/1697618014-addViewSortTable.ts
View File

@ -13,7 +13,7 @@ export const addViewSortTable: TenantMigrationTableAction[] = [
action: 'alter',
columns: [
{
columnName: 'fieldId',
columnName: 'fieldMetadataId',
columnType: 'varchar',
action: TenantMigrationColumnActionType.CREATE,
},