diff --git a/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.component.ts b/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.component.ts index ce754bffb..a099504a4 100644 --- a/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.component.ts +++ b/apps/client/src/app/components/user-account-access/create-or-update-access-dialog/create-or-update-access-dialog.component.ts @@ -316,7 +316,7 @@ export class GfCreateOrUpdateAccessDialogComponent .postAccess(access) .pipe( catchError((error: { status?: number }) => { - if (error?.status === StatusCodes.BAD_REQUEST) { + if (error.status === (StatusCodes.BAD_REQUEST as number)) { this.notificationService.alert({ title: $localize`Oops! Could not grant access.` }); @@ -359,7 +359,7 @@ export class GfCreateOrUpdateAccessDialogComponent .putAccess(access) .pipe( catchError((error: { status?: number }) => { - if (error?.status === StatusCodes.BAD_REQUEST) { + if (error.status === (StatusCodes.BAD_REQUEST as number)) { this.notificationService.alert({ title: $localize`Oops! Could not update access.` }); diff --git a/apps/client/src/app/components/user-account-access/user-account-access.component.ts b/apps/client/src/app/components/user-account-access/user-account-access.component.ts index bcd719640..126e9895f 100644 --- a/apps/client/src/app/components/user-account-access/user-account-access.component.ts +++ b/apps/client/src/app/components/user-account-access/user-account-access.component.ts @@ -17,7 +17,12 @@ import { OnDestroy, OnInit } from '@angular/core'; -import { FormBuilder, ReactiveFormsModule, Validators } from '@angular/forms'; +import { + AbstractControl, + FormBuilder, + ReactiveFormsModule, + Validators +} from '@angular/forms'; import { MatButtonModule } from '@angular/material/button'; import { MatDialog, MatDialogModule } from '@angular/material/dialog'; import { MatFormFieldModule } from '@angular/material/form-field'; @@ -60,7 +65,10 @@ export class GfUserAccountAccessComponent implements OnDestroy, OnInit { public hasPermissionToUpdateOwnAccessToken: boolean; public isAccessTokenHidden = true; public updateOwnAccessTokenForm = this.formBuilder.group({ - accessToken: ['', Validators.required] + accessToken: [ + '', + [(control: AbstractControl) => Validators.required(control)] + ] }); public user: User; @@ -116,7 +124,7 @@ export class GfUserAccountAccessComponent implements OnDestroy, OnInit { if (params['createDialog']) { this.openCreateAccessDialog(); } else if (params['editDialog'] && params['accessId']) { - this.openUpdateAccessDialog(params['accessId']); + this.openUpdateAccessDialog(params['accessId'] as string); } });