Admin Generator (Future): Rename combination column type string to …

…`text` (#2556) This is to be more consistent with column types outside of combination columns.
vivid-planet · Sep 24, 2024 · b433d53 · b433d53
1 parent 566d5be
commit b433d53
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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<GQLProduct> = {
             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
@@ -8,8 +8,8 @@ type AbstractField<FieldName extends string> = {
     emptyValue?: string;
 };
 
-type StringField<FieldName extends string> = AbstractField<FieldName> & {
-    type: "string";
+type TextField<FieldName extends string> = AbstractField<FieldName> & {
+    type: "text";
 };
 
 type StaticText = {
@@ -47,7 +47,7 @@ type NumberField<FieldName extends string> = AbstractField<FieldName> &
 
 // type TextConfig<FieldName extends string> = Field<FieldName> | FieldGroup<FieldName>;
 
-type Field<FieldName extends string> = StaticText | FieldName | StringField<FieldName> | NumberField<FieldName>;
+type Field<FieldName extends string> = StaticText | FieldName | TextField<FieldName> | NumberField<FieldName>;
 
 type TextConfig<FieldName extends string> = Field<FieldName>;