add generic to specify return type

Author: chriskapp

projects/fusio-sdk/src/lib/abstract/object-selector.ts

@@ -1,7 +1,6 @@
 import {Component, EventEmitter, Input, Output} from '@angular/core';
 import {catchError, debounceTime, distinctUntilChanged, map, merge, Observable, of, OperatorFunction, Subject, switchMap, tap} from "rxjs";
 import {fromPromise} from "rxjs/internal/observable/innerFrom";
-import {ModelId} from "./query";
 import {CommonCollection} from "fusio-sdk/dist/CommonCollection";
 
 /**
@@ -10,12 +9,12 @@ import {CommonCollection} from "fusio-sdk/dist/CommonCollection";
 @Component({
   template: '',
 })
-export abstract class ObjectSelector<T extends ModelId> {
+export abstract class ObjectSelector<T, R> {
 
   @Input() name!: string;
   @Input() disabled: boolean = false;
-  @Input() data?: number = undefined;
-  @Output() dataChange = new EventEmitter<number>();
+  @Input() data?: R = undefined;
+  @Output() dataChange = new EventEmitter<R>();
 
   focus$ = new Subject<string>();
 
@@ -25,8 +24,14 @@ export abstract class ObjectSelector<T extends ModelId> {
   selected?: T
 
   objectFormatter = (object: T): string => {
-    if (typeof object === 'object' && object.hasOwnProperty(this.getNameKey())) {
-      return (object as any)[this.getNameKey()];
+    const name = this.getNameProperty(object);
+    if (name) {
+      return name;
+    }
+
+    const id = this.getIdProperty(object);
+    if (id) {
+      return '' + id;
     }
 
     return '-';
@@ -61,16 +66,21 @@ export abstract class ObjectSelector<T extends ModelId> {
   }
 
   changeValue() {
-    if (this.disabled) {
+    if (this.disabled || !this.selected) {
       return;
     }
 
-    const id = this.selected?.id;
+    const id = this.getIdProperty(this.selected);
     if (!id) {
       return;
     }
 
-    this.dataChange.emit(parseInt('' + id));
+    this.dataChange.emit(id);
+  }
+
+  protected getIdKey(): string
+  {
+    return 'id';
   }
 
   protected getNameKey(): string
@@ -82,4 +92,22 @@ export abstract class ObjectSelector<T extends ModelId> {
 
   protected abstract get(id: string): Promise<T>;
 
+  private getIdProperty(object: T): R|undefined
+  {
+    if (typeof object === 'object' && object && object.hasOwnProperty(this.getIdKey())) {
+      return (object as any)[this.getIdKey()];
+    }
+
+    return undefined;
+  }
+
+  private getNameProperty(object: T): string|undefined
+  {
+    if (typeof object === 'object' && object && object.hasOwnProperty(this.getNameKey())) {
+      return (object as any)[this.getNameKey()];
+    }
+
+    return undefined;
+  }
+
 }