diff --git a/front/app/src/common/crud/types/foreignkey.type.ts b/front/app/src/common/crud/types/foreignkey.type.ts index 1cafe5d7..3d2bad17 100644 --- a/front/app/src/common/crud/types/foreignkey.type.ts +++ b/front/app/src/common/crud/types/foreignkey.type.ts @@ -79,7 +79,7 @@ export class ForeignkeyTypeComponent extends FieldType implemen public foreignLabel: string = "" public foreignResource : string = ""; public foreignSchema : string = ""; - public displayedFields = []; + public displayedFields: string[] = []; public errorMsg: string = ""; constructor(private crudService: CrudService, @@ -90,19 +90,15 @@ export class ForeignkeyTypeComponent extends FieldType implemen super(); } - typeaheadLoading: boolean = false; - dataSource: Observable = new Observable(); - formatter = (foreignModel: any) => foreignModel.label; ngOnInit() { // @ts-ignore - this.foreignResource = this.field.foreignKey.reference.resource; - // @ts-ignore - this.foreignSchema = this.field.foreignKey.reference.schema; - // @ts-ignore - this.displayedFields = this.field.foreignKey.reference.displayedFields; + const reference: {resource: string, schema: string, displayedFields: string[] } = this.field.foreignKey.reference; + this.foreignResource = reference.resource; + this.foreignSchema = reference.schema; + this.displayedFields = reference.displayedFields; this.formControl.valueChanges.pipe( @@ -196,14 +192,14 @@ export class ForeignkeyTypeComponent extends FieldType implemen { for (let i in form.fieldGroup) { // @ts-ignore - let f = form["fieldGroup"]![i] - // @ts-ignore + let f = form["fieldGroup"][i] if (this.displayedFields.indexOf(f.key) == -1) { // @ts-ignore - delete form["fieldGroup"]![i] + delete form["fieldGroup"][i] } else { - // @ts-ignore - form["fieldGroup"]![i].props.disabled = true + f.props.disabled = true; + f.props.readonly = true; + f.props.hideRequiredMarker = true; } } delete form.props