Skip to content
Snippets Groups Projects
Commit 40b8d745 authored by Florent Poittevin's avatar Florent Poittevin
Browse files

fix: avoid to force submit of oauth token when edit user

parent 4b970281
No related branches found
No related tags found
No related merge requests found
...@@ -49,7 +49,9 @@ ...@@ -49,7 +49,9 @@
[readonly]="true" [readonly]="true"
> >
</mat-form-field> </mat-form-field>
</div>
<div class="right-part">
<mat-form-field> <mat-form-field>
<mat-label>{{'admin.user.form.email' | translate }}</mat-label> <mat-label>{{'admin.user.form.email' | translate }}</mat-label>
<input matInput <input matInput
...@@ -59,8 +61,7 @@ ...@@ -59,8 +61,7 @@
<mat-error *ngIf="getFormControl(formDefinition.email).invalid">{{'required' | translate}}</mat-error> <mat-error *ngIf="getFormControl(formDefinition.email).invalid">{{'required' | translate}}</mat-error>
<mat-error *ngFor="let error of getFormControl(formDefinition.email).errors?.errorsFromBackend">{{error}}</mat-error> <mat-error *ngFor="let error of getFormControl(formDefinition.email).errors?.errorsFromBackend">{{error}}</mat-error>
</mat-form-field> </mat-form-field>
</div>
<div class="right-part">
<mat-form-field> <mat-form-field>
<mat-label>{{'admin.user.form.person' | translate }}</mat-label> <mat-label>{{'admin.user.form.person' | translate }}</mat-label>
<mat-select [formControlName]="formDefinition.person"> <mat-select [formControlName]="formDefinition.person">
...@@ -73,25 +74,25 @@ ...@@ -73,25 +74,25 @@
</mat-select> </mat-select>
</mat-form-field> </mat-form-field>
<mat-form-field> <!-- <mat-form-field>-->
<mat-label>{{'admin.user.form.accessToken' | translate }}</mat-label> <!-- <mat-label>{{'admin.user.form.accessToken' | translate }}</mat-label>-->
<input matInput <!-- <input matInput-->
[formControlName]="formDefinition.accessToken" <!-- [formControlName]="formDefinition.accessToken"-->
[required]="isRequired(formDefinition.accessToken)" <!-- [required]="isRequired(formDefinition.accessToken)"-->
> <!-- >-->
<mat-error *ngIf="getFormControl(formDefinition.accessToken).invalid">{{'required' | translate}}</mat-error> <!-- <mat-error *ngIf="getFormControl(formDefinition.accessToken).invalid">{{'required' | translate}}</mat-error>-->
<mat-error *ngFor="let error of getFormControl(formDefinition.accessToken).errors?.errorsFromBackend">{{error}}</mat-error> <!-- <mat-error *ngFor="let error of getFormControl(formDefinition.accessToken).errors?.errorsFromBackend">{{error}}</mat-error>-->
</mat-form-field> <!-- </mat-form-field>-->
<mat-form-field> <!-- <mat-form-field>-->
<mat-label>{{'admin.user.form.refreshToken' | translate }}</mat-label> <!-- <mat-label>{{'admin.user.form.refreshToken' | translate }}</mat-label>-->
<input matInput <!-- <input matInput-->
[formControlName]="formDefinition.refreshToken" <!-- [formControlName]="formDefinition.refreshToken"-->
[required]="isRequired(formDefinition.refreshToken)" <!-- [required]="isRequired(formDefinition.refreshToken)"-->
> <!-- >-->
<mat-error *ngIf="getFormControl(formDefinition.refreshToken).invalid">{{'required' | translate}}</mat-error> <!-- <mat-error *ngIf="getFormControl(formDefinition.refreshToken).invalid">{{'required' | translate}}</mat-error>-->
<mat-error *ngFor="let error of getFormControl(formDefinition.refreshToken).errors?.errorsFromBackend">{{error}}</mat-error> <!-- <mat-error *ngFor="let error of getFormControl(formDefinition.refreshToken).errors?.errorsFromBackend">{{error}}</mat-error>-->
</mat-form-field> <!-- </mat-form-field>-->
<div> <div>
<mat-label [class.disabled]="readonly">{{'admin.user.form.roles' | translate }}</mat-label> <mat-label [class.disabled]="readonly">{{'admin.user.form.roles' | translate }}</mat-label>
......
...@@ -55,8 +55,8 @@ export class AdminUserFormPresentational extends SharedAbstractFormPresentationa ...@@ -55,8 +55,8 @@ export class AdminUserFormPresentational extends SharedAbstractFormPresentationa
[this.formDefinition.homeOrganization]: [user.homeOrganization, [Validators.required, SolidifyValidator]], [this.formDefinition.homeOrganization]: [user.homeOrganization, [Validators.required, SolidifyValidator]],
[this.formDefinition.email]: [user.email, [Validators.required, SolidifyValidator]], [this.formDefinition.email]: [user.email, [Validators.required, SolidifyValidator]],
[this.formDefinition.person]: isNullOrUndefined(user.person) ? [] : [user.person.resId], [this.formDefinition.person]: isNullOrUndefined(user.person) ? [] : [user.person.resId],
[this.formDefinition.accessToken]: [user.accessToken, [Validators.required, SolidifyValidator]], // [this.formDefinition.accessToken]: [user.accessToken, [Validators.required, SolidifyValidator]],
[this.formDefinition.refreshToken]: [user.refreshToken, [Validators.required, SolidifyValidator]], // [this.formDefinition.refreshToken]: [user.refreshToken, [Validators.required, SolidifyValidator]],
[this.formDefinition.applicationRoles]: [this.fillApplicationRolesSelection(this.applicationRolesNames, user.applicationRoles)], [this.formDefinition.applicationRoles]: [this.fillApplicationRolesSelection(this.applicationRolesNames, user.applicationRoles)],
}); });
} }
...@@ -70,8 +70,8 @@ export class AdminUserFormPresentational extends SharedAbstractFormPresentationa ...@@ -70,8 +70,8 @@ export class AdminUserFormPresentational extends SharedAbstractFormPresentationa
[this.formDefinition.homeOrganization]: ["", [Validators.required, SolidifyValidator]], [this.formDefinition.homeOrganization]: ["", [Validators.required, SolidifyValidator]],
[this.formDefinition.email]: ["", [Validators.required, SolidifyValidator]], [this.formDefinition.email]: ["", [Validators.required, SolidifyValidator]],
[this.formDefinition.person]: [""], [this.formDefinition.person]: [""],
[this.formDefinition.accessToken]: ["", [Validators.required, SolidifyValidator]], // [this.formDefinition.accessToken]: ["", [Validators.required, SolidifyValidator]],
[this.formDefinition.refreshToken]: ["", [Validators.required, SolidifyValidator]], // [this.formDefinition.refreshToken]: ["", [Validators.required, SolidifyValidator]],
[this.formDefinition.applicationRoles]: [this.mapToCheckboxArrayGroup(this.applicationRolesNames)], [this.formDefinition.applicationRoles]: [this.mapToCheckboxArrayGroup(this.applicationRolesNames)],
}); });
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment