diff --git a/demo/admin/src/products/future/CombinationFieldsTestProductsGrid.cometGen.ts b/demo/admin/src/products/future/CombinationFieldsTestProductsGrid.cometGen.ts index 170785ea70..c3164f2bcd 100644 --- a/demo/admin/src/products/future/CombinationFieldsTestProductsGrid.cometGen.ts +++ b/demo/admin/src/products/future/CombinationFieldsTestProductsGrid.cometGen.ts @@ -14,7 +14,7 @@ export const CombinationFieldsTestProductsGrid: GridConfig = { headerName: "Title and Category", primaryText: "title", secondaryText: { - type: "string", + type: "text", field: "category.title", emptyValue: "No category set", }, diff --git a/packages/admin/cms-admin/src/generator/future/generateGrid/combinationColumn.ts b/packages/admin/cms-admin/src/generator/future/generateGrid/combinationColumn.ts index 557d0e580e..b834513d90 100644 --- a/packages/admin/cms-admin/src/generator/future/generateGrid/combinationColumn.ts +++ b/packages/admin/cms-admin/src/generator/future/generateGrid/combinationColumn.ts @@ -8,8 +8,8 @@ type AbstractField = { emptyValue?: string; }; -type StringField = AbstractField & { - type: "string"; +type TextField = AbstractField & { + type: "text"; }; type StaticText = { @@ -47,7 +47,7 @@ type NumberField = AbstractField & // type TextConfig = Field | FieldGroup; -type Field = StaticText | FieldName | StringField | NumberField; +type Field = StaticText | FieldName | TextField | NumberField; type TextConfig = Field;