NAS-130854: fixed type check

truenas · Sep 12, 2024 · c50c49a · c50c49a
1 parent 8b4c312
commit c50c49a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/src/app/modules/ix-table/directives/ix-body-cell.directive.ts b/src/app/modules/ix-table/directives/ix-body-cell.directive.ts
@@ -7,7 +7,7 @@ import {
   ViewContainerRef,
 } from '@angular/core';
 import { IxCellTextComponent } from 'app/modules/ix-table/components/ix-table-body/cells/ix-cell-text/ix-cell-text.component';
-import { Column, ColumnComponent } from 'app/modules/ix-table/interfaces/column-component.class';
+import { Column, ColumnComponent, ColumnKeys } from 'app/modules/ix-table/interfaces/column-component.class';
 
 @Directive({
   selector: '[ix-body-cell]',
@@ -48,11 +48,7 @@ export class IxTableBodyCellDirective<T> implements AfterViewInit, OnChanges {
 
   private setComponentProps(): void {
     this.componentRef.instance.setRow(this.row);
-    Object.keys(this.column).forEach((key: keyof ColumnComponent<T>) => {
-      if (key === 'value') {
-        return;
-      }
-      // TODO: Replace never.
+    Object.keys(this.column).forEach((key: ColumnKeys<T>) => {
       this.componentRef.instance[key] = this.column[key] as never;
     });
 

diff --git a/src/app/modules/ix-table/directives/ix-header-cell.directive.ts b/src/app/modules/ix-table/directives/ix-header-cell.directive.ts
@@ -5,7 +5,7 @@ import {
   ViewContainerRef,
 } from '@angular/core';
 import { IxHeaderCellTextComponent } from 'app/modules/ix-table/components/ix-table-head/head-cells/ix-header-cell-text/ix-header-cell-text.component';
-import { Column, ColumnComponent } from 'app/modules/ix-table/interfaces/column-component.class';
+import { Column, ColumnComponent, ColumnKeys } from 'app/modules/ix-table/interfaces/column-component.class';
 import { DataProvider } from 'app/modules/ix-table/interfaces/data-provider.interface';
 
 @Directive({
@@ -31,10 +31,7 @@ export class IxTableHeaderCellDirective<T> implements AfterViewInit {
     );
 
     componentRef.instance.dataProvider = this.dataProvider;
-    Object.keys(this.column).forEach((key: keyof ColumnComponent<T>) => {
-      if (key === 'value') {
-        return;
-      }
+    Object.keys(this.column).forEach((key: ColumnKeys<T>) => {
       // TODO: replace never
       componentRef.instance[key] = this.column[key] as never;
     });

diff --git a/src/app/modules/ix-table/interfaces/column-component.class.ts b/src/app/modules/ix-table/interfaces/column-component.class.ts
@@ -1,4 +1,5 @@
 import { signal, WritableSignal } from '@angular/core';
+import { MutableKeys } from 'utility-types';
 import { DataProvider } from 'app/modules/ix-table/interfaces/data-provider.interface';
 
 export abstract class ColumnComponent<T> {
@@ -35,3 +36,5 @@ export type Column<T, C extends ColumnComponent<T>> = {
   type?: new () => C;
   headerType?: new () => C;
 } & Partial<C>;
+
+export type ColumnKeys<T> = MutableKeys<ColumnComponent<T>>;