fix types

TRIPTYK · Jan 3, 2025 · 21d61e1 · 21d61e1
1 parent b0d3caf
commit 21d61e1
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 18 deletions.
diff --git a/packages/ember-ui/src/components/prefabs/tpk-table-generic-prefab.gts b/packages/ember-ui/src/components/prefabs/tpk-table-generic-prefab.gts
@@ -2,8 +2,8 @@ import Component from '@glimmer/component';
 import type { TableGenericComponentSignature } from "../tpk-table-generic.gts";
 import TableGenericComponent from "../tpk-table-generic.gts";
 import TpkTableGeneric from "../tpk-table-generic.gts";
-import type { WithBoundArgs } from '@glint/template';
-import t from 'ember-intl/helpers/t';
+import type { ContentValue, WithBoundArgs } from '@glint/template';
+import { get } from '@ember/object';
 
 export interface TableGenericPrefabComponentSignature {
   Args: TableGenericComponentSignature["Args"] & {
@@ -38,14 +38,18 @@ export default class TableGenericPrefabComponent extends Component<TableGenericP
   }
 
   get columns() {
-    console.log(this.args.columns);
     if(!this.args.columns){
       throw new Error("entityKeys is required");
-      
+
     }
     return this.args.columns
   }
-
+
+  displayValue = (element: unknown, field: string): ContentValue => {
+    const value = get(element, field);
+    return String(value);
+  }
+
   <template>
     <TpkTableGeneric
       @pageSizes={{this.pageSizes}}
@@ -59,20 +63,20 @@ export default class TableGenericPrefabComponent extends Component<TableGenericP
       <TG.Table as | Table |>
         <Table.Header as |Header|>
           {{#each this.columns as |column|}}
-            {{!-- <Header.Cell @sortable={{column.sortable}} @prop={{column.field}} data-test-table={{column.field}}>
+            <Header.Cell @sortable={{column.sortable}} @prop={{column.field}}>
               {{column.headerName}}
-            </Header.Cell> --}}
+            </Header.Cell>
           {{/each}}
         </Table.Header>
         <Table.Body as |Body element|>
-          {{!-- {{#each this.columns as |column|}}
+          {{#each this.columns as |column|}}
             <Body.Cell >
-              {{element[column.field}]}}
+              {{this.displayValue element column.field}}
             </Body.Cell>
-          {{/each}} --}}
+          {{/each}}
         </Table.Body>
         <Table.Footer />
       </TG.Table>
   </TpkTableGeneric>
 </template>
-} 
+}
diff --git a/packages/ember-ui/src/components/tpk-table-generic/body.gts b/packages/ember-ui/src/components/tpk-table-generic/body.gts
@@ -1,7 +1,7 @@
 import Component from '@glimmer/component';
 import { tracked } from 'tracked-built-ins';
 import { action } from '@ember/object';
-import type { ComponentLike, WithBoundArgs } from '@glint/template';
+import type { WithBoundArgs } from '@glint/template';
 import TableGenericBodyCellComponent from './body/cell.gts';
 import TableGenericBodyActionMenuComponent from './body/action-menu.gts';
 import { fn, hash } from '@ember/helper';
@@ -20,7 +20,7 @@ export interface TableGenericBodyComponentSignature {
   Blocks: {
     default: [
       {
-        Cell: ComponentLike<typeof TableGenericBodyCellComponent>;
+        Cell: WithBoundArgs<typeof TableGenericBodyCellComponent, 'row'>;
         ActionMenu: WithBoundArgs<
           typeof TableGenericBodyActionMenuComponent,
           'registerActionMenu'

diff --git a/packages/ember-ui/src/components/tpk-table-generic/body/cell.gts b/packages/ember-ui/src/components/tpk-table-generic/body/cell.gts
@@ -1,19 +1,23 @@
 import type { TOC } from '@ember/component/template-only';
+import type { ComponentLike } from '@glint/template';
+
 export interface TableGenericBodyCellComponentSignature {
   Args: {
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    row: any;
+    row: ComponentLike;
   };
-  Element: HTMLDivElement;
+  Element: HTMLElement;
   Blocks: {
     default: [];
   };
 }
 
 const TableGenericBodyCellComponent: TOC<TableGenericBodyCellComponentSignature> =
   <template>
+    {{!-- @glint-ignore --}}
     <@row.cell ...attributes>
       {{yield}}
+      {{!-- @glint-ignore --}}
     </@row.cell>
 </template>;
 

diff --git a/packages/ember-ui/src/components/tpk-table-generic/header.gts b/packages/ember-ui/src/components/tpk-table-generic/header.gts
@@ -1,4 +1,4 @@
-import type { ComponentLike } from '@glint/template';
+import type { WithBoundArgs } from '@glint/template';
 import TableGenericHeaderCellComponent from './header/cell.gts';
 import type { TOC } from '@ember/component/template-only';
 import { hash } from '@ember/helper';
@@ -9,11 +9,10 @@ export interface TableGenericHeaderComponentSignature {
     table: any;
     hasActionMenu: boolean;
   };
-  Element: HTMLDivElement;
   Blocks: {
     default: [
       {
-        Cell: ComponentLike<typeof TableGenericHeaderCellComponent>;
+        Cell: WithBoundArgs<typeof TableGenericHeaderCellComponent, 'header'>;
       },
     ];
   };