Skip to content

Date, timezone and currency support added to field decorators #1805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Jun 6, 2025
Merged

Date, timezone and currency support added to field decorators #1805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
18e9195
added date and currency support to field decorators
twestos Jun 4, 2025
f8843aa
Merge branch 'main' into feature/cell-format-field-option
twestos Jun 4, 2025
52b48dc
Merge branch 'main' into feature/cell-format-field-option
thekevinbrown Jun 4, 2025
ebe648d
Update src/packages/admin-ui-components/src/entity-list/columns.tsx
twestos Jun 6, 2025
2a9b1a0
Updated sqlite tests to handle additional metadata type
twestos Jun 6, 2025
29ac7ab
Merge branch 'main' into feature/cell-format-field-option
twestos Jun 6, 2025
c8e2c19
Fixed default entities in auth package
twestos Jun 6, 2025
c5e3b44
Improvements to table columns renderer
twestos Jun 6, 2025
4029f46
Build error fixes
twestos Jun 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/examples/auth-zero/src/frontend/types.generated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,21 @@ export type AdminUiFieldExtensionsMetadata = {
key?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldFormatMetadata = {
__typename?: 'AdminUiFieldFormatMetadata';
format?: Maybe<Scalars['String']['output']>;
timezone?: Maybe<Scalars['String']['output']>;
type: Scalars['String']['output'];
variant?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldMetadata = {
__typename?: 'AdminUiFieldMetadata';
attributes?: Maybe<AdminUiFieldAttributeMetadata>;
detailPanelInputComponent?: Maybe<DetailPanelInputComponent>;
extensions?: Maybe<AdminUiFieldExtensionsMetadata>;
filter?: Maybe<AdminUiFilterMetadata>;
format?: Maybe<AdminUiFieldFormatMetadata>;
hideInDetailForm?: Maybe<Scalars['Boolean']['output']>;
hideInFilterBar?: Maybe<Scalars['Boolean']['output']>;
hideInTable?: Maybe<Scalars['Boolean']['output']>;
Expand Down
9 changes: 9 additions & 0 deletions src/examples/auth-zero/src/types.generated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,21 @@ export type AdminUiFieldExtensionsMetadata = {
key?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldFormatMetadata = {
__typename?: 'AdminUiFieldFormatMetadata';
format?: Maybe<Scalars['String']['output']>;
timezone?: Maybe<Scalars['String']['output']>;
type: Scalars['String']['output'];
variant?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldMetadata = {
__typename?: 'AdminUiFieldMetadata';
attributes?: Maybe<AdminUiFieldAttributeMetadata>;
detailPanelInputComponent?: Maybe<DetailPanelInputComponent>;
extensions?: Maybe<AdminUiFieldExtensionsMetadata>;
filter?: Maybe<AdminUiFilterMetadata>;
format?: Maybe<AdminUiFieldFormatMetadata>;
hideInDetailForm?: Maybe<Scalars['Boolean']['output']>;
hideInFilterBar?: Maybe<Scalars['Boolean']['output']>;
hideInTable?: Maybe<Scalars['Boolean']['output']>;
Expand Down
9 changes: 9 additions & 0 deletions src/examples/aws-cognito/src/frontend/types.generated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,21 @@ export type AdminUiFieldExtensionsMetadata = {
key?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldFormatMetadata = {
__typename?: 'AdminUiFieldFormatMetadata';
format?: Maybe<Scalars['String']['output']>;
timezone?: Maybe<Scalars['String']['output']>;
type: Scalars['String']['output'];
variant?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldMetadata = {
__typename?: 'AdminUiFieldMetadata';
attributes?: Maybe<AdminUiFieldAttributeMetadata>;
detailPanelInputComponent?: Maybe<DetailPanelInputComponent>;
extensions?: Maybe<AdminUiFieldExtensionsMetadata>;
filter?: Maybe<AdminUiFilterMetadata>;
format?: Maybe<AdminUiFieldFormatMetadata>;
hideInDetailForm?: Maybe<Scalars['Boolean']['output']>;
hideInFilterBar?: Maybe<Scalars['Boolean']['output']>;
hideInTable?: Maybe<Scalars['Boolean']['output']>;
Expand Down
9 changes: 9 additions & 0 deletions src/examples/aws-cognito/src/types.generated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,21 @@ export type AdminUiFieldExtensionsMetadata = {
key?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldFormatMetadata = {
__typename?: 'AdminUiFieldFormatMetadata';
format?: Maybe<Scalars['String']['output']>;
timezone?: Maybe<Scalars['String']['output']>;
type: Scalars['String']['output'];
variant?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldMetadata = {
__typename?: 'AdminUiFieldMetadata';
attributes?: Maybe<AdminUiFieldAttributeMetadata>;
detailPanelInputComponent?: Maybe<DetailPanelInputComponent>;
extensions?: Maybe<AdminUiFieldExtensionsMetadata>;
filter?: Maybe<AdminUiFilterMetadata>;
format?: Maybe<AdminUiFieldFormatMetadata>;
hideInDetailForm?: Maybe<Scalars['Boolean']['output']>;
hideInFilterBar?: Maybe<Scalars['Boolean']['output']>;
hideInTable?: Maybe<Scalars['Boolean']['output']>;
Expand Down
9 changes: 9 additions & 0 deletions src/examples/federation/src/frontend/types.generated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,21 @@ export type AdminUiFieldExtensionsMetadata = {
key?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldFormatMetadata = {
__typename?: 'AdminUiFieldFormatMetadata';
format?: Maybe<Scalars['String']['output']>;
timezone?: Maybe<Scalars['String']['output']>;
type: Scalars['String']['output'];
variant?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldMetadata = {
__typename?: 'AdminUiFieldMetadata';
attributes?: Maybe<AdminUiFieldAttributeMetadata>;
detailPanelInputComponent?: Maybe<DetailPanelInputComponent>;
extensions?: Maybe<AdminUiFieldExtensionsMetadata>;
filter?: Maybe<AdminUiFilterMetadata>;
format?: Maybe<AdminUiFieldFormatMetadata>;
hideInDetailForm?: Maybe<Scalars['Boolean']['output']>;
hideInFilterBar?: Maybe<Scalars['Boolean']['output']>;
hideInTable?: Maybe<Scalars['Boolean']['output']>;
Expand Down
9 changes: 9 additions & 0 deletions src/examples/federation/src/types.generated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,12 +72,21 @@ export type AdminUiFieldExtensionsMetadata = {
key?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldFormatMetadata = {
__typename?: 'AdminUiFieldFormatMetadata';
format?: Maybe<Scalars['String']['output']>;
timezone?: Maybe<Scalars['String']['output']>;
type: Scalars['String']['output'];
variant?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldMetadata = {
__typename?: 'AdminUiFieldMetadata';
attributes?: Maybe<AdminUiFieldAttributeMetadata>;
detailPanelInputComponent?: Maybe<DetailPanelInputComponent>;
extensions?: Maybe<AdminUiFieldExtensionsMetadata>;
filter?: Maybe<AdminUiFilterMetadata>;
format?: Maybe<AdminUiFieldFormatMetadata>;
hideInDetailForm?: Maybe<Scalars['Boolean']['output']>;
hideInFilterBar?: Maybe<Scalars['Boolean']['output']>;
hideInTable?: Maybe<Scalars['Boolean']['output']>;
Expand Down
9 changes: 9 additions & 0 deletions src/examples/microsoft-entra/src/frontend/types.generated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,21 @@ export type AdminUiFieldExtensionsMetadata = {
key?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldFormatMetadata = {
__typename?: 'AdminUiFieldFormatMetadata';
format?: Maybe<Scalars['String']['output']>;
timezone?: Maybe<Scalars['String']['output']>;
type: Scalars['String']['output'];
variant?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldMetadata = {
__typename?: 'AdminUiFieldMetadata';
attributes?: Maybe<AdminUiFieldAttributeMetadata>;
detailPanelInputComponent?: Maybe<DetailPanelInputComponent>;
extensions?: Maybe<AdminUiFieldExtensionsMetadata>;
filter?: Maybe<AdminUiFilterMetadata>;
format?: Maybe<AdminUiFieldFormatMetadata>;
hideInDetailForm?: Maybe<Scalars['Boolean']['output']>;
hideInFilterBar?: Maybe<Scalars['Boolean']['output']>;
hideInTable?: Maybe<Scalars['Boolean']['output']>;
Expand Down
9 changes: 9 additions & 0 deletions src/examples/microsoft-entra/src/types.generated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,21 @@ export type AdminUiFieldExtensionsMetadata = {
key?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldFormatMetadata = {
__typename?: 'AdminUiFieldFormatMetadata';
format?: Maybe<Scalars['String']['output']>;
timezone?: Maybe<Scalars['String']['output']>;
type: Scalars['String']['output'];
variant?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldMetadata = {
__typename?: 'AdminUiFieldMetadata';
attributes?: Maybe<AdminUiFieldAttributeMetadata>;
detailPanelInputComponent?: Maybe<DetailPanelInputComponent>;
extensions?: Maybe<AdminUiFieldExtensionsMetadata>;
filter?: Maybe<AdminUiFilterMetadata>;
format?: Maybe<AdminUiFieldFormatMetadata>;
hideInDetailForm?: Maybe<Scalars['Boolean']['output']>;
hideInFilterBar?: Maybe<Scalars['Boolean']['output']>;
hideInTable?: Maybe<Scalars['Boolean']['output']>;
Expand Down
9 changes: 9 additions & 0 deletions src/examples/okta/src/frontend/types.generated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,21 @@ export type AdminUiFieldExtensionsMetadata = {
key?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldFormatMetadata = {
__typename?: 'AdminUiFieldFormatMetadata';
format?: Maybe<Scalars['String']['output']>;
timezone?: Maybe<Scalars['String']['output']>;
type: Scalars['String']['output'];
variant?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldMetadata = {
__typename?: 'AdminUiFieldMetadata';
attributes?: Maybe<AdminUiFieldAttributeMetadata>;
detailPanelInputComponent?: Maybe<DetailPanelInputComponent>;
extensions?: Maybe<AdminUiFieldExtensionsMetadata>;
filter?: Maybe<AdminUiFilterMetadata>;
format?: Maybe<AdminUiFieldFormatMetadata>;
hideInDetailForm?: Maybe<Scalars['Boolean']['output']>;
hideInFilterBar?: Maybe<Scalars['Boolean']['output']>;
hideInTable?: Maybe<Scalars['Boolean']['output']>;
Expand Down
9 changes: 9 additions & 0 deletions src/examples/okta/src/types.generated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,12 +71,21 @@ export type AdminUiFieldExtensionsMetadata = {
key?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldFormatMetadata = {
__typename?: 'AdminUiFieldFormatMetadata';
format?: Maybe<Scalars['String']['output']>;
timezone?: Maybe<Scalars['String']['output']>;
type: Scalars['String']['output'];
variant?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldMetadata = {
__typename?: 'AdminUiFieldMetadata';
attributes?: Maybe<AdminUiFieldAttributeMetadata>;
detailPanelInputComponent?: Maybe<DetailPanelInputComponent>;
extensions?: Maybe<AdminUiFieldExtensionsMetadata>;
filter?: Maybe<AdminUiFilterMetadata>;
format?: Maybe<AdminUiFieldFormatMetadata>;
hideInDetailForm?: Maybe<Scalars['Boolean']['output']>;
hideInFilterBar?: Maybe<Scalars['Boolean']['output']>;
hideInTable?: Maybe<Scalars['Boolean']['output']>;
Expand Down
9 changes: 9 additions & 0 deletions src/examples/rest-with-auth/src/frontend/types.generated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,21 @@ export type AdminUiFieldExtensionsMetadata = {
key?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldFormatMetadata = {
__typename?: 'AdminUiFieldFormatMetadata';
format?: Maybe<Scalars['String']['output']>;
timezone?: Maybe<Scalars['String']['output']>;
type: Scalars['String']['output'];
variant?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldMetadata = {
__typename?: 'AdminUiFieldMetadata';
attributes?: Maybe<AdminUiFieldAttributeMetadata>;
detailPanelInputComponent?: Maybe<DetailPanelInputComponent>;
extensions?: Maybe<AdminUiFieldExtensionsMetadata>;
filter?: Maybe<AdminUiFilterMetadata>;
format?: Maybe<AdminUiFieldFormatMetadata>;
hideInDetailForm?: Maybe<Scalars['Boolean']['output']>;
hideInFilterBar?: Maybe<Scalars['Boolean']['output']>;
hideInTable?: Maybe<Scalars['Boolean']['output']>;
Expand Down
9 changes: 9 additions & 0 deletions src/examples/rest-with-auth/src/types.generated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,21 @@ export type AdminUiFieldExtensionsMetadata = {
key?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldFormatMetadata = {
__typename?: 'AdminUiFieldFormatMetadata';
format?: Maybe<Scalars['String']['output']>;
timezone?: Maybe<Scalars['String']['output']>;
type: Scalars['String']['output'];
variant?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldMetadata = {
__typename?: 'AdminUiFieldMetadata';
attributes?: Maybe<AdminUiFieldAttributeMetadata>;
detailPanelInputComponent?: Maybe<DetailPanelInputComponent>;
extensions?: Maybe<AdminUiFieldExtensionsMetadata>;
filter?: Maybe<AdminUiFilterMetadata>;
format?: Maybe<AdminUiFieldFormatMetadata>;
hideInDetailForm?: Maybe<Scalars['Boolean']['output']>;
hideInFilterBar?: Maybe<Scalars['Boolean']['output']>;
hideInTable?: Maybe<Scalars['Boolean']['output']>;
Expand Down
9 changes: 9 additions & 0 deletions src/examples/rest-with-auth/types.generated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,12 +73,21 @@ export type AdminUiFieldExtensionsMetadata = {
key?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldFormatMetadata = {
__typename?: 'AdminUiFieldFormatMetadata';
format?: Maybe<Scalars['String']['output']>;
timezone?: Maybe<Scalars['String']['output']>;
type: Scalars['String']['output'];
variant?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldMetadata = {
__typename?: 'AdminUiFieldMetadata';
attributes?: Maybe<AdminUiFieldAttributeMetadata>;
detailPanelInputComponent?: Maybe<DetailPanelInputComponent>;
extensions?: Maybe<AdminUiFieldExtensionsMetadata>;
filter?: Maybe<AdminUiFilterMetadata>;
format?: Maybe<AdminUiFieldFormatMetadata>;
hideInDetailForm?: Maybe<Scalars['Boolean']['output']>;
hideInFilterBar?: Maybe<Scalars['Boolean']['output']>;
hideInTable?: Maybe<Scalars['Boolean']['output']>;
Expand Down
9 changes: 9 additions & 0 deletions src/examples/rest/src/frontend/types.generated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,21 @@ export type AdminUiFieldExtensionsMetadata = {
key?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldFormatMetadata = {
__typename?: 'AdminUiFieldFormatMetadata';
format?: Maybe<Scalars['String']['output']>;
timezone?: Maybe<Scalars['String']['output']>;
type: Scalars['String']['output'];
variant?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldMetadata = {
__typename?: 'AdminUiFieldMetadata';
attributes?: Maybe<AdminUiFieldAttributeMetadata>;
detailPanelInputComponent?: Maybe<DetailPanelInputComponent>;
extensions?: Maybe<AdminUiFieldExtensionsMetadata>;
filter?: Maybe<AdminUiFilterMetadata>;
format?: Maybe<AdminUiFieldFormatMetadata>;
hideInDetailForm?: Maybe<Scalars['Boolean']['output']>;
hideInFilterBar?: Maybe<Scalars['Boolean']['output']>;
hideInTable?: Maybe<Scalars['Boolean']['output']>;
Expand Down
9 changes: 9 additions & 0 deletions src/examples/rest/src/types.generated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,21 @@ export type AdminUiFieldExtensionsMetadata = {
key?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldFormatMetadata = {
__typename?: 'AdminUiFieldFormatMetadata';
format?: Maybe<Scalars['String']['output']>;
timezone?: Maybe<Scalars['String']['output']>;
type: Scalars['String']['output'];
variant?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldMetadata = {
__typename?: 'AdminUiFieldMetadata';
attributes?: Maybe<AdminUiFieldAttributeMetadata>;
detailPanelInputComponent?: Maybe<DetailPanelInputComponent>;
extensions?: Maybe<AdminUiFieldExtensionsMetadata>;
filter?: Maybe<AdminUiFilterMetadata>;
format?: Maybe<AdminUiFieldFormatMetadata>;
hideInDetailForm?: Maybe<Scalars['Boolean']['output']>;
hideInFilterBar?: Maybe<Scalars['Boolean']['output']>;
hideInTable?: Maybe<Scalars['Boolean']['output']>;
Expand Down
Binary file modified src/examples/sqlite/databases/trace.sqlite
View file
Open in desktop
Binary file not shown.
14 changes: 12 additions & 2 deletions src/examples/sqlite/src/backend/schema/employee.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,20 @@ export class Employee {
})
employee?: Employee;

@Field(() => ISODateStringScalar, { nullable: true })
@Field(() => ISODateStringScalar, {
nullable: true,
adminUIOptions: {
format: { type: 'date', timezone: 'Australia/Sydney', format: 'DATE_MED' },
},
})
birthDate?: Date;

@Field(() => ISODateStringScalar, { nullable: true })
@Field(() => ISODateStringScalar, {
nullable: true,
adminUIOptions: {
format: { type: 'date', timezone: 'Australia/Sydney', format: 'DATE_MED_WITH_WEEKDAY' },
},
})
hireDate?: Date;

@Field(() => String, { nullable: true })
Expand Down
6 changes: 5 additions & 1 deletion src/examples/sqlite/src/backend/schema/invoice-line.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ export class InvoiceLine {
@RelationshipField<InvoiceLine>(() => Track, { id: (entity) => entity.track?.trackId })
track!: Track;

@Field(() => String)
@Field(() => String, {
adminUIOptions: {
format: { type: 'currency', variant: 'AUD' },
},
})
unitPrice!: string;

@Field(() => Number)
Expand Down
9 changes: 9 additions & 0 deletions src/examples/sqlite/src/frontend/types.generated.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,21 @@ export type AdminUiFieldExtensionsMetadata = {
key?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldFormatMetadata = {
__typename?: 'AdminUiFieldFormatMetadata';
format?: Maybe<Scalars['String']['output']>;
timezone?: Maybe<Scalars['String']['output']>;
type: Scalars['String']['output'];
variant?: Maybe<Scalars['String']['output']>;
};

export type AdminUiFieldMetadata = {
__typename?: 'AdminUiFieldMetadata';
attributes?: Maybe<AdminUiFieldAttributeMetadata>;
detailPanelInputComponent?: Maybe<DetailPanelInputComponent>;
extensions?: Maybe<AdminUiFieldExtensionsMetadata>;
filter?: Maybe<AdminUiFilterMetadata>;
format?: Maybe<AdminUiFieldFormatMetadata>;
hideInDetailForm?: Maybe<Scalars['Boolean']['output']>;
hideInFilterBar?: Maybe<Scalars['Boolean']['output']>;
hideInTable?: Maybe<Scalars['Boolean']['output']>;
Expand Down
Loading
Loading