Cleanup reset user password by admin

And add some tests

1 files changed, 6 insertions, 10 deletions

diff --git a/client/src/app/+admin/users/user-edit/user-password.component.html b/client/src/app/+admin/users/user-edit/user-password.component.html
index 822e4688e..a1e1f6216 100644
--- a/client/src/app/+admin/users/user-edit/user-password.component.html
+++ b/client/src/app/+admin/users/user-edit/user-password.component.html
@@ -1,19 +1,15 @@
 <form role="form" (ngSubmit)="formValidated()" [formGroup]="form">
   <div class="form-group">
 
-    <div class="input-group mb-3">
-      <div class="input-group-prepend">
-        <div class="input-group-text">
-          <input type="checkbox" aria-label="Show password" (change)="togglePasswordVisibility()">
-        </div>
-      </div>
-      <input id="passwordField" #passwordField
-        [attr.type]="showPassword ? 'text' : 'password'" id="password"
+    <div class="input-group">
+      <input id="password" [attr.type]="showPassword ? 'text' : 'password'"
         formControlName="password" [ngClass]="{ 'input-error': formErrors['password'] }"
       >
       <div class="input-group-append">
-        <button class="btn btn-sm btn-outline-secondary" (click)="generatePassword()  "
-                type="button">Generate</button>
+        <button class="btn btn-sm btn-outline-secondary" (click)="togglePasswordVisibility()" type="button">
+          <ng-container *ngIf="!showPassword" i18n>Show</ng-container>
+          <ng-container *ngIf="!!showPassword" i18n>Hide</ng-container>
+        </button>
       </div>
     </div>
     <div *ngIf="formErrors.password" class="form-error">