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

5
server/src/core/auth/auth.resolver.spec.ts
View File

@ -1,6 +1,7 @@
import { Test, TestingModule } from '@nestjs/testing';
import { getRepositoryToken } from '@nestjs/typeorm';
import { WorkspaceService } from 'src/core/workspace/services/workspace.service';
import { Workspace } from 'src/core/workspace/workspace.entity';
import { AuthResolver } from './auth.resolver';
@ -15,7 +16,7 @@ describe('AuthResolver', () => {
providers: [
AuthResolver,
{
provide: WorkspaceService,
provide: getRepositoryToken(Workspace),
useValue: {},
},
{

22
server/src/core/auth/services/auth.service.spec.ts
View File

@ -1,7 +1,11 @@
import { Test, TestingModule } from '@nestjs/testing';
import { getRepositoryToken } from '@nestjs/typeorm';
import { UserService } from 'src/core/user/user.service';
import { WorkspaceService } from 'src/core/workspace/services/workspace.service';
import { UserService } from 'src/core/user/services/user.service';
import { WorkspaceManagerService } from 'src/workspace/workspace-manager/workspace-manager.service';
import { FileUploadService } from 'src/core/file/services/file-upload.service';
import { Workspace } from 'src/core/workspace/workspace.entity';
import { User } from 'src/core/user/user.entity';
import { AuthService } from './auth.service';
import { TokenService } from './token.service';
@ -22,7 +26,19 @@ describe('AuthService', () => {
useValue: {},
},
{
provide: WorkspaceService,
provide: WorkspaceManagerService,
useValue: {},
},
{
provide: FileUploadService,
useValue: {},
},
{
provide: getRepositoryToken(Workspace),
useValue: {},
},
{
provide: getRepositoryToken(User),
useValue: {},
},
],

11
server/src/core/auth/services/token.service.spec.ts
View File

@ -1,7 +1,10 @@
import { Test, TestingModule } from '@nestjs/testing';
import { JwtService } from '@nestjs/jwt';
import { getRepositoryToken } from '@nestjs/typeorm';
import { EnvironmentService } from 'src/integrations/environment/environment.service';
import { RefreshToken } from 'src/core/refresh-token/refresh-token.entity';
import { User } from 'src/core/user/user.entity';
import { TokenService } from './token.service';
@ -20,6 +23,14 @@ describe('TokenService', () => {
provide: EnvironmentService,
useValue: {},
},
{
provide: getRepositoryToken(User),
useValue: {},
},
{
provide: getRepositoryToken(RefreshToken),
useValue: {},
},
],
}).compile();

10
server/src/core/user/services/user.service.spec.ts
View File

@ -2,6 +2,8 @@ import { Test, TestingModule } from '@nestjs/testing';
import { getRepositoryToken } from '@nestjs/typeorm';
import { User } from 'src/core/user/user.entity';
import { DataSourceService } from 'src/metadata/data-source/data-source.service';
import { TypeORMService } from 'src/database/typeorm/typeorm.service';
import { UserService } from './user.service';
@ -16,6 +18,14 @@ describe('UserService', () => {
provide: getRepositoryToken(User),
useValue: {},
},
{
provide: DataSourceService,
useValue: {},
},
{
provide: TypeORMService,
useValue: {},
},
],
}).compile();

5
server/src/core/workspace/services/workspace.service.spec.ts
View File

@ -2,6 +2,7 @@ import { Test, TestingModule } from '@nestjs/testing';
import { getRepositoryToken } from '@nestjs/typeorm';
import { Workspace } from 'src/core/workspace/workspace.entity';
import { WorkspaceManagerService } from 'src/workspace/workspace-manager/workspace-manager.service';
import { WorkspaceService } from './workspace.service';
@ -16,6 +17,10 @@ describe('WorkspaceService', () => {
provide: getRepositoryToken(Workspace),
useValue: {},
},
{
provide: WorkspaceManagerService,
useValue: {},
},
],
}).compile();

4
server/src/database/typeorm-seeds/metadata/field-metadata/activity-target.ts
View File

@ -69,7 +69,7 @@ export const seedActivityTargetFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'createdAt',
label: 'Creation date',
targetColumnMap: {
@ -87,7 +87,7 @@ export const seedActivityTargetFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'updatedAt',
label: 'Update date',
targetColumnMap: {

10
server/src/database/typeorm-seeds/metadata/field-metadata/activity.ts
View File

@ -77,7 +77,7 @@ export const seedActivityFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'createdAt',
label: 'Creation date',
targetColumnMap: {
@ -95,7 +95,7 @@ export const seedActivityFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'updatedAt',
label: 'Update date',
targetColumnMap: {
@ -170,7 +170,7 @@ export const seedActivityFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'reminderAt',
label: 'Reminder Date',
targetColumnMap: {
@ -188,7 +188,7 @@ export const seedActivityFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'dueAt',
label: 'Due Date',
targetColumnMap: {
@ -206,7 +206,7 @@ export const seedActivityFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'completedAt',
label: 'Completion Date',
targetColumnMap: {

8
server/src/database/typeorm-seeds/metadata/field-metadata/api-key.ts
View File

@ -66,7 +66,7 @@ export const seedApiKeyFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'createdAt',
label: 'Creation date',
targetColumnMap: {
@ -84,7 +84,7 @@ export const seedApiKeyFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'updatedAt',
label: 'Update date',
targetColumnMap: {
@ -121,7 +121,7 @@ export const seedApiKeyFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'expiresAt',
label: 'Expiration date',
targetColumnMap: {
@ -139,7 +139,7 @@ export const seedApiKeyFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'revokedAt',
label: 'Revocation date',
targetColumnMap: {

4
server/src/database/typeorm-seeds/metadata/field-metadata/attachment.ts
View File

@ -75,7 +75,7 @@ export const seedAttachmentFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'createdAt',
label: 'Creation date',
targetColumnMap: {
@ -93,7 +93,7 @@ export const seedAttachmentFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'updatedAt',
label: 'Update date',
targetColumnMap: {

4
server/src/database/typeorm-seeds/metadata/field-metadata/comment.ts
View File

@ -68,7 +68,7 @@ export const seedCommentFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'createdAt',
label: 'Creation date',
targetColumnMap: {
@ -86,7 +86,7 @@ export const seedCommentFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'updatedAt',
label: 'Update date',
targetColumnMap: {

4
server/src/database/typeorm-seeds/metadata/field-metadata/company.ts
View File

@ -80,7 +80,7 @@ export const seedCompanyFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'createdAt',
label: 'Creation date',
targetColumnMap: {
@ -98,7 +98,7 @@ export const seedCompanyFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'updatedAt',
label: 'Update date',
targetColumnMap: {

4
server/src/database/typeorm-seeds/metadata/field-metadata/favorite.ts
View File

@ -71,7 +71,7 @@ export const seedFavoriteFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'createdAt',
label: 'Creation date',
targetColumnMap: {
@ -89,7 +89,7 @@ export const seedFavoriteFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'updatedAt',
label: 'Update date',
targetColumnMap: {

6
server/src/database/typeorm-seeds/metadata/field-metadata/opportunity.ts
View File

@ -75,7 +75,7 @@ export const seedOpportunityFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'createdAt',
label: 'Creation date',
targetColumnMap: {
@ -93,7 +93,7 @@ export const seedOpportunityFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'updatedAt',
label: 'Update date',
targetColumnMap: {
@ -131,7 +131,7 @@ export const seedOpportunityFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'closeDate',
label: 'Close date',
targetColumnMap: {

4
server/src/database/typeorm-seeds/metadata/field-metadata/person.ts
View File

@ -80,7 +80,7 @@ export const seedPersonFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'createdAt',
label: 'Creation date',
targetColumnMap: {
@ -98,7 +98,7 @@ export const seedPersonFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'updatedAt',
label: 'Update date',
targetColumnMap: {

4
server/src/database/typeorm-seeds/metadata/field-metadata/pipeline-step.ts
View File

@ -67,7 +67,7 @@ export const seedPipelineStepFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'createdAt',
label: 'Creation date',
targetColumnMap: {
@ -85,7 +85,7 @@ export const seedPipelineStepFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'updatedAt',
label: 'Update date',
targetColumnMap: {

4
server/src/database/typeorm-seeds/metadata/field-metadata/view-field.ts
View File

@ -69,7 +69,7 @@ export const seedViewFieldFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'createdAt',
label: 'Creation date',
targetColumnMap: {
@ -87,7 +87,7 @@ export const seedViewFieldFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'updatedAt',
label: 'Update date',
targetColumnMap: {

4
server/src/database/typeorm-seeds/metadata/field-metadata/view-filter.ts
View File

@ -69,7 +69,7 @@ export const seedViewFilterFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'createdAt',
label: 'Creation date',
targetColumnMap: {
@ -87,7 +87,7 @@ export const seedViewFilterFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'updatedAt',
label: 'Update date',
targetColumnMap: {

4
server/src/database/typeorm-seeds/metadata/field-metadata/view-sort.ts
View File

@ -67,7 +67,7 @@ export const seedViewSortFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'createdAt',
label: 'Creation date',
targetColumnMap: {
@ -85,7 +85,7 @@ export const seedViewSortFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'updatedAt',
label: 'Update date',
targetColumnMap: {

4
server/src/database/typeorm-seeds/metadata/field-metadata/view.ts
View File

@ -69,7 +69,7 @@ export const seedViewFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'createdAt',
label: 'Creation date',
targetColumnMap: {
@ -87,7 +87,7 @@ export const seedViewFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'updatedAt',
label: 'Update date',
targetColumnMap: {

4
server/src/database/typeorm-seeds/metadata/field-metadata/webhook.ts
View File

@ -65,7 +65,7 @@ export const seedWebhookFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'createdAt',
label: 'Creation date',
targetColumnMap: {
@ -83,7 +83,7 @@ export const seedWebhookFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'updatedAt',
label: 'Update date',
targetColumnMap: {

4
server/src/database/typeorm-seeds/metadata/field-metadata/workspace-member.ts
View File

@ -76,7 +76,7 @@ export const seedWorkspaceMemberFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'createdAt',
label: 'Creation date',
targetColumnMap: {
@ -94,7 +94,7 @@ export const seedWorkspaceMemberFieldMetadata = async (
isCustom: false,
workspaceId: SeedWorkspaceId,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'updatedAt',
label: 'Update date',
targetColumnMap: {

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: {

6
server/src/workspace/workspace-manager/standard-objects/activity.ts
View File

@ -54,7 +54,7 @@ const activityMetadata = {
{
isCustom: false,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'reminderAt',
label: 'Reminder Date',
targetColumnMap: {
@ -67,7 +67,7 @@ const activityMetadata = {
{
isCustom: false,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'dueAt',
label: 'Due Date',
targetColumnMap: {
@ -80,7 +80,7 @@ const activityMetadata = {
{
isCustom: false,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'completedAt',
label: 'Completion Date',
targetColumnMap: {

4
server/src/workspace/workspace-manager/standard-objects/api-key.ts
View File

@ -27,7 +27,7 @@ const apiKeyMetadata = {
{
isCustom: false,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'expiresAt',
label: 'Expiration date',
targetColumnMap: {
@ -40,7 +40,7 @@ const apiKeyMetadata = {
{
isCustom: false,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'revokedAt',
label: 'Revocation date',
targetColumnMap: {

2
server/src/workspace/workspace-manager/standard-objects/opportunity.ts
View File

@ -28,7 +28,7 @@ const opportunityMetadata = {
{
isCustom: false,
isActive: true,
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
name: 'closeDate',
label: 'Close date',
targetColumnMap: {

4
server/src/workspace/workspace-manager/standard-objects/standard-object-metadata.ts
View File

@ -55,7 +55,7 @@ export const basicFieldsMetadata: Partial<FieldMetadataEntity>[] = [
{
name: 'createdAt',
label: 'Creation date',
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
targetColumnMap: {
value: 'createdAt',
},
@ -68,7 +68,7 @@ export const basicFieldsMetadata: Partial<FieldMetadataEntity>[] = [
{
name: 'updatedAt',
label: 'Update date',
type: FieldMetadataType.DATE,
type: FieldMetadataType.DATE_TIME,
targetColumnMap: {
value: 'updatedAt',
},

6
server/src/workspace/workspace-schema-builder/services/type-mapper.service.ts
View File

@ -58,7 +58,7 @@ export class TypeMapperService {
[FieldMetadataType.TEXT, GraphQLString],
[FieldMetadataType.PHONE, GraphQLString],
[FieldMetadataType.EMAIL, GraphQLString],
[FieldMetadataType.DATE, dateScalar],
[FieldMetadataType.DATE_TIME, dateScalar],
[FieldMetadataType.BOOLEAN, GraphQLBoolean],
[FieldMetadataType.NUMBER, numberScalar],
[FieldMetadataType.PROBABILITY, GraphQLFloat],
@ -87,7 +87,7 @@ export class TypeMapperService {
[FieldMetadataType.TEXT, StringFilterType],
[FieldMetadataType.PHONE, StringFilterType],
[FieldMetadataType.EMAIL, StringFilterType],
[FieldMetadataType.DATE, dateFilter],
[FieldMetadataType.DATE_TIME, dateFilter],
[FieldMetadataType.BOOLEAN, BooleanFilterType],
[FieldMetadataType.NUMBER, numberScalar],
[FieldMetadataType.PROBABILITY, FloatFilterType],
@ -106,7 +106,7 @@ export class TypeMapperService {
[FieldMetadataType.TEXT, OrderByDirectionType],
[FieldMetadataType.PHONE, OrderByDirectionType],
[FieldMetadataType.EMAIL, OrderByDirectionType],
[FieldMetadataType.DATE, OrderByDirectionType],
[FieldMetadataType.DATE_TIME, OrderByDirectionType],
[FieldMetadataType.BOOLEAN, OrderByDirectionType],
[FieldMetadataType.NUMBER, OrderByDirectionType],
[FieldMetadataType.PROBABILITY, OrderByDirectionType],

2
server/src/workspace/workspace-schema-builder/utils/__tests__/get-field-metadata-type.spec.ts
View File

@ -4,7 +4,7 @@ import { getFieldMetadataType } from 'src/workspace/workspace-schema-builder/uti
describe('getFieldMetadataType', () => {
it.each([
['uuid', FieldMetadataType.UUID],
['timestamp', FieldMetadataType.DATE],
['timestamp', FieldMetadataType.DATE_TIME],
])(
'should return correct FieldMetadataType for type %s',
(type, expectedMetadataType) => {

2
server/src/workspace/workspace-schema-builder/utils/get-field-metadata-type.util.ts
View File

@ -2,7 +2,7 @@ import { FieldMetadataType } from 'src/metadata/field-metadata/field-metadata.en
const typeOrmTypeMapping = new Map<string, FieldMetadataType>([
['uuid', FieldMetadataType.UUID],
['timestamp', FieldMetadataType.DATE],
['timestamp', FieldMetadataType.DATE_TIME],
// Add more types here if we need to support more than id, and createdAt/updatedAt/deletedAt
]);