Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
fix(user): bring back password field and resolve loading issue (DEV-967…
…) (#753)
- Loading branch information
1 parent
84975d7
commit 694cb06
Showing
2 changed files
with
85 additions
and
84 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,90 +1,93 @@ | ||
<!-- content --> | ||
<form [formGroup]="userForm" class="form-content user-data" (ngSubmit)="submitData()"> | ||
<app-progress-indicator *ngIf="loadingData"></app-progress-indicator> | ||
<div *ngIf="!loadingData"> | ||
<form [formGroup]="userForm" class="form-content user-data" (ngSubmit)="submitData()"> | ||
|
||
<!-- username --> | ||
<mat-form-field [class.large-field]="!username" [class.small-field]="username"> | ||
<input matInput type="text" formControlName="username" | ||
placeholder="{{ 'appLabels.form.user.general.username' | translate }}" autocomplete="username"> | ||
<mat-hint *ngIf="formErrors.username"> | ||
{{ formErrors.username }} | ||
</mat-hint> | ||
</mat-form-field> | ||
<!-- username --> | ||
<mat-form-field [class.large-field]="!username" [class.small-field]="username"> | ||
<input matInput type="text" formControlName="username" | ||
placeholder="{{ 'appLabels.form.user.general.username' | translate }}" autocomplete="username"> | ||
<mat-hint *ngIf="formErrors.username"> | ||
{{ formErrors.username }} | ||
</mat-hint> | ||
</mat-form-field> | ||
|
||
<!-- email --> | ||
<mat-form-field [class.large-field]="!username" [class.medium-field]="username"> | ||
<input matInput type="email" formControlName="email" | ||
placeholder="{{ 'appLabels.form.user.general.email' | translate }}" autocomplete="email"> | ||
<mat-hint *ngIf="formErrors.email"> | ||
{{ formErrors.email }} | ||
</mat-hint> | ||
</mat-form-field> | ||
<!-- email --> | ||
<mat-form-field [class.large-field]="!username" [class.medium-field]="username"> | ||
<input matInput type="email" formControlName="email" | ||
placeholder="{{ 'appLabels.form.user.general.email' | translate }}" autocomplete="email"> | ||
<mat-hint *ngIf="formErrors.email"> | ||
{{ formErrors.email }} | ||
</mat-hint> | ||
</mat-form-field> | ||
|
||
<!-- given name --> | ||
<mat-form-field class="small-field"> | ||
<input matInput formControlName="givenName" | ||
placeholder="{{ 'appLabels.form.user.general.givenName' | translate }}" autocomplete="givenname"> | ||
<mat-hint *ngIf="formErrors.givenName"> | ||
{{ formErrors.givenName }} | ||
</mat-hint> | ||
</mat-form-field> | ||
<!-- given name --> | ||
<mat-form-field class="small-field"> | ||
<input matInput formControlName="givenName" | ||
placeholder="{{ 'appLabels.form.user.general.givenName' | translate }}" autocomplete="givenname"> | ||
<mat-hint *ngIf="formErrors.givenName"> | ||
{{ formErrors.givenName }} | ||
</mat-hint> | ||
</mat-form-field> | ||
|
||
<!-- family name --> | ||
<mat-form-field class="medium-field"> | ||
<input matInput formControlName="familyName" | ||
placeholder="{{ 'appLabels.form.user.general.familyName' | translate }}" autocomplete="name"> | ||
<mat-hint *ngIf="formErrors.familyName"> | ||
{{ formErrors.familyName }} | ||
</mat-hint> | ||
</mat-form-field> | ||
<!-- family name --> | ||
<mat-form-field class="medium-field"> | ||
<input matInput formControlName="familyName" | ||
placeholder="{{ 'appLabels.form.user.general.familyName' | translate }}" autocomplete="name"> | ||
<mat-hint *ngIf="formErrors.familyName"> | ||
{{ formErrors.familyName }} | ||
</mat-hint> | ||
</mat-form-field> | ||
|
||
<!-- password // hidden in edit mode --> | ||
<!-- <app-password-form *ngIf="!username" (sendToParent)="getPassword($event)"></app-password-form> --> | ||
<!-- password // hidden in edit mode --> | ||
<app-password-form *ngIf="!username" (sendToParent)="getPassword($event)"></app-password-form> | ||
|
||
<mat-form-field class="large-field"> | ||
<mat-form-field class="large-field"> | ||
|
||
<mat-select formControlName="lang" | ||
[placeholder]="'appLabels.form.user.general.language' | translate"> | ||
<mat-option *ngFor="let lang of languagesList" [value]="lang.language"> | ||
{{ lang.value }} | ||
</mat-option> | ||
</mat-select> | ||
<mat-select formControlName="lang" | ||
[placeholder]="'appLabels.form.user.general.language' | translate"> | ||
<mat-option *ngFor="let lang of languagesList" [value]="lang.language"> | ||
{{ lang.value }} | ||
</mat-option> | ||
</mat-select> | ||
|
||
</mat-form-field> | ||
</mat-form-field> | ||
|
||
<div class="large-field"> | ||
<mat-slide-toggle formControlName="systemAdmin" | ||
*ngIf="sysAdmin"> | ||
{{ 'appLabels.form.user.general.sysAdmin' | translate }} | ||
</mat-slide-toggle> | ||
</div> | ||
<div class="large-field"> | ||
<mat-slide-toggle formControlName="systemAdmin" | ||
*ngIf="sysAdmin"> | ||
{{ 'appLabels.form.user.general.sysAdmin' | translate }} | ||
</mat-slide-toggle> | ||
</div> | ||
|
||
<div class="form-panel form-action"> | ||
<span> | ||
<button mat-button type="reset" (click)="closeDialog.emit()"> | ||
{{ 'appLabels.form.action.cancel' | translate }} | ||
</button> | ||
</span> | ||
<span class="fill-remaining-space"></span> | ||
<span> | ||
<!-- Update --> | ||
<button mat-raised-button type="submit" color="primary" *ngIf="username" [disabled]="!userForm.valid"> | ||
<app-progress-indicator [color]="'white'" [status]="0" *ngIf="loading" class="submit-progress"> | ||
</app-progress-indicator> | ||
<mat-icon *ngIf="error && !loading">close</mat-icon> | ||
{{ !loading && error ? ('appLabels.form.action.retry' | translate) : ('appLabels.form.action.update' | | ||
translate) }} | ||
</button> | ||
<!-- Create new --> | ||
<button mat-raised-button type="submit" color="primary" *ngIf="!username" | ||
[disabled]="!userForm.valid || (userForm.controls['password'].value.length < 8)"> | ||
<app-progress-indicator [color]="'white'" [status]="0" *ngIf="loading" class="submit-progress"> | ||
</app-progress-indicator> | ||
<mat-icon *ngIf="error && !loading">close</mat-icon> | ||
{{ !loading && error ? ('appLabels.form.action.retry' | translate) : ('appLabels.form.action.submit' | | ||
translate) }} | ||
</button> | ||
<div class="form-panel form-action"> | ||
<span> | ||
<button mat-button type="reset" (click)="closeDialog.emit()"> | ||
{{ 'appLabels.form.action.cancel' | translate }} | ||
</button> | ||
</span> | ||
<span class="fill-remaining-space"></span> | ||
<span> | ||
<!-- Update --> | ||
<button mat-raised-button type="submit" color="primary" *ngIf="username" [disabled]="!userForm.valid"> | ||
<app-progress-indicator [color]="'white'" [status]="0" *ngIf="loading" class="submit-progress"> | ||
</app-progress-indicator> | ||
<mat-icon *ngIf="error && !loading">close</mat-icon> | ||
{{ !loading && error ? ('appLabels.form.action.retry' | translate) : ('appLabels.form.action.update' | | ||
translate) }} | ||
</button> | ||
<!-- Create new --> | ||
<button mat-raised-button type="submit" color="primary" *ngIf="!username" | ||
[disabled]="!userForm.valid || (userForm.controls['password'].value.length < 8)"> | ||
<app-progress-indicator [color]="'white'" [status]="0" *ngIf="loading" class="submit-progress"> | ||
</app-progress-indicator> | ||
<mat-icon *ngIf="error && !loading">close</mat-icon> | ||
{{ !loading && error ? ('appLabels.form.action.retry' | translate) : ('appLabels.form.action.submit' | | ||
translate) }} | ||
</button> | ||
|
||
</span> | ||
</div> | ||
</span> | ||
</div> | ||
|
||
</form> | ||
</form> | ||
</div> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters