feat(UiSchema): Shortahnd column definition

proophboard · Jul 14, 2023 · 05805aa · 05805aa
1 parent ddf078c
commit 05805aa
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -6,7 +6,9 @@
     {
       "files": ["*.ts", "*.tsx"],
       "extends": ["plugin:@nx/typescript"],
-      "rules": {}
+      "rules": {
+        "no-case-declarations": "off"
+      }
     },
     {
       "files": ["*.js", "*.jsx"],

diff --git a/packages/cody/src/lib/hooks/utils/ui/upsert-list-view-component.ts b/packages/cody/src/lib/hooks/utils/ui/upsert-list-view-component.ts
@@ -7,7 +7,7 @@ import {names} from "@event-engine/messaging/helpers";
 import {
   getVoMetadata,
   PageLinkTableColumn,
-  RefTableColumn,
+  RefTableColumn, StringOrTableColumnUiSchema,
   TableColumnUiSchema,
   ValueObjectMetadata
 } from "../value-object/get-vo-metadata";
@@ -86,17 +86,23 @@ export const upsertListViewComponent = async (vo: Node, voMeta: ValueObjectMetad
 const compileTableColumns = (vo: Node, voMeta: ValueObjectMetadata, itemVO: Node, itemVOMeta: ValueObjectMetadata, ctx: Context): [string[], string[], string[]] | CodyResponse => {
   const columns = getColumns(vo, voMeta, itemVO, itemVOMeta, ctx);
   let imports: string[] = [];
-  let hooks: string[] = [];
+  const hooks: string[] = [];
 
   if(isCodyError(columns)) {
     return columns;
   }
 
   const strColumns: string[] = [];
 
-  for (const column of columns) {
+  for (let column of columns) {
     // @TODO: Validate column
 
+    if(typeof column === "string") {
+      column = {
+        field: column
+      }
+    }
+
     if(!column['headerName']) {
       column['headerName'] = camelCaseToTitle(column['field']);
     }
@@ -184,7 +190,7 @@ const compileTableColumns = (vo: Node, voMeta: ValueObjectMetadata, itemVO: Node
   return [strColumns, imports, hooks];
 }
 
-const getColumns = (vo: Node, voMeta: ValueObjectMetadata, itemVO: Node, itemVOMeta: ValueObjectMetadata, ctx: Context): TableColumnUiSchema[] | CodyResponse => {
+const getColumns = (vo: Node, voMeta: ValueObjectMetadata, itemVO: Node, itemVOMeta: ValueObjectMetadata, ctx: Context): StringOrTableColumnUiSchema[] | CodyResponse => {
   return voMeta.uiSchema?.table?.columns || deriveColumnsFromSchema(vo, voMeta, itemVO, itemVOMeta, ctx);
 }
 

diff --git a/packages/cody/src/lib/hooks/utils/value-object/get-vo-metadata.ts b/packages/cody/src/lib/hooks/utils/value-object/get-vo-metadata.ts
@@ -51,9 +51,12 @@ export interface TableColumnUiSchema {
   link?: string | Rule[];
 }
 
+export type StringOrTableColumnUiSchema = string | TableColumnUiSchema;
+
+
 export interface TableUiSchema {
   table?: {
-    columns?: TableColumnUiSchema[],
+    columns?: StringOrTableColumnUiSchema[],
     pageSize?: number,
     pageSizeOptions?: number[],
     density?: GridDensity,