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

Rename DATE to DATETIME (#2576)

Browse Source 
* Rename DATE to DATETIME

* rename DATE to DATE_TIME

* fix server tests

* rename date to datetime

* rename date to datetime
This commit is contained in:
Weiko
2023-11-21 00:16:42 +01:00
committed by GitHub
parent b3c1723638
commit a33d4c8b8d
64 changed files with 197 additions and 147 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/metadata/field-metadata/field-metadata.entity.ts
View File

@ -22,7 +22,7 @@ export enum FieldMetadataType {
TEXT = 'TEXT',
PHONE = 'PHONE',
EMAIL = 'EMAIL',
DATE = 'DATE',
DATE_TIME = 'DATE_TIME',
BOOLEAN = 'BOOLEAN',
NUMBER = 'NUMBER',
PROBABILITY = 'PROBABILITY',

6
server/src/metadata/field-metadata/interfaces/field-metadata-default-value.interface.ts
View File

@ -9,7 +9,7 @@ export interface FieldMetadataDefaultValueNumber {
export interface FieldMetadataDefaultValueBoolean {
value: boolean;
}
export interface FieldMetadataDefaultValueDate {
export interface FieldMetadataDefaultValueDateTime {
value: Date;
}
@ -17,7 +17,7 @@ type FieldMetadataScalarDefaultValue =
| FieldMetadataDefaultValueString
| FieldMetadataDefaultValueNumber
| FieldMetadataDefaultValueBoolean
| FieldMetadataDefaultValueDate;
| FieldMetadataDefaultValueDateTime;
export type FieldMetadataDynamicDefaultValue =
| { type: 'uuid' }
@ -50,7 +50,7 @@ type FieldMetadataDefaultValueMapping = {
[FieldMetadataType.TEXT]: FieldMetadataDefaultValueString;
[FieldMetadataType.PHONE]: FieldMetadataDefaultValueString;
[FieldMetadataType.EMAIL]: FieldMetadataDefaultValueString;
[FieldMetadataType.DATE]: FieldMetadataDefaultValueDate;
[FieldMetadataType.DATE_TIME]: FieldMetadataDefaultValueDateTime;
[FieldMetadataType.BOOLEAN]: FieldMetadataDefaultValueBoolean;
[FieldMetadataType.NUMBER]: FieldMetadataDefaultValueNumber;
[FieldMetadataType.PROBABILITY]: FieldMetadataDefaultValueNumber;

7
server/src/metadata/field-metadata/utils/__tests__/validate-default-value-based-on-type.spec.ts
View File

@ -15,9 +15,12 @@ describe('validateDefaultValueBasedOnType', () => {
).toBe(true);
});
it('should validate now dynamic default value for DATE type', () => {
it('should validate now dynamic default value for DATE_TIME type', () => {
expect(
validateDefaultValueBasedOnType({ type: 'now' }, FieldMetadataType.DATE),
validateDefaultValueBasedOnType(
{ type: 'now' },
FieldMetadataType.DATE_TIME,
),
).toBe(true);
});

4
server/src/metadata/field-metadata/utils/convert-field-metadata-to-column-action.util.ts
View File

@ -72,9 +72,9 @@ export function convertFieldMetadataToColumnActions(
},
];
}
case FieldMetadataType.DATE: {
case FieldMetadataType.DATE_TIME: {
const defaultValue =
fieldMetadata.defaultValue as FieldMetadataDefaultValue<FieldMetadataType.DATE>;
fieldMetadata.defaultValue as FieldMetadataDefaultValue<FieldMetadataType.DATE_TIME>;
return [
{

2
server/src/metadata/field-metadata/utils/generate-target-column-map.util.ts
View File

@ -25,7 +25,7 @@ export function generateTargetColumnMap(
case FieldMetadataType.NUMBER:
case FieldMetadataType.PROBABILITY:
case FieldMetadataType.BOOLEAN:
case FieldMetadataType.DATE:
case FieldMetadataType.DATE_TIME:
return {
value: columnName,
};

4
server/src/metadata/field-metadata/utils/validate-default-value-based-on-type.util.ts
View File

@ -13,7 +13,7 @@ export const validateDefaultValueBasedOnType = (
if (type === FieldMetadataType.UUID && defaultValue.type === 'uuid') {
return true;
}
if (type === FieldMetadataType.DATE && defaultValue.type === 'now') {
if (type === FieldMetadataType.DATE_TIME && defaultValue.type === 'now') {
return true;
}
@ -47,7 +47,7 @@ export const validateDefaultValueBasedOnType = (
typeof defaultValue.value === 'boolean'
);
case FieldMetadataType.DATE:
case FieldMetadataType.DATE_TIME:
return (
typeof defaultValue === 'object' &&
'value' in defaultValue &&

4
server/src/metadata/object-metadata/object-metadata.service.ts
View File

@ -88,7 +88,7 @@ export class ObjectMetadataService extends TypeOrmQueryService<ObjectMetadataEnt
defaultValue: { type: 'uuid' },
},
{
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'createdAt',
label: 'Creation date',
targetColumnMap: {
@ -103,7 +103,7 @@ export class ObjectMetadataService extends TypeOrmQueryService<ObjectMetadataEnt
defaultValue: { type: 'now' },
},
{
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'updatedAt',
label: 'Update date',
targetColumnMap: {