Minor fixes.

src/Squidex/app/features/administration/pages/users/user-page.component.html

@@ -3,7 +3,6 @@
 <form [formGroup]="userForm" (ngSubmit)="save()">
     <sqx-panel panelWidth="26rem">
         <div class="panel-header">
-            
             <div class="panel-title-row">
                 <div class="float-right">
                     <button type="submit" class="btn btn-primary" title="CTRL + S">
@@ -45,20 +44,13 @@
                     <input type="text" class="form-control" id="displayName" maxlength="100" formControlName="displayName" />
                 </div>
 
-                <div class="form-group form-group-password">
+                <div class="form-group form-group-password" *ngIf="!isCurrentUser">
                     <label for="password">Password</label>
 
                     <sqx-control-errors for="password" [submitted]="userFormSubmitted"></sqx-control-errors>
 
                     <input type="password" class="form-control" id="password" maxlength="100" formControlName="password" />
                 </div>
-                <div class="form-group">
-                    <label for="passwordConfirm">Confirm Password</label>
-
-                    <sqx-control-errors for="passwordConfirm" [submitted]="userFormSubmitted"></sqx-control-errors>
-                    
-                    <input type="password" class="form-control" id="passwordConfirm" maxlength="100" formControlName="passwordConfirm" />
-                </div>
             </div>
         </div>
     </sqx-panel>

src/Squidex/app/features/administration/pages/users/user-page.component.ts

@@ -6,10 +6,11 @@
  */
 
 import { Component, OnInit } from '@angular/core';
-import { FormGroup, FormBuilder, Validators } from '@angular/forms';
+import { FormControl, FormGroup, FormBuilder, Validators } from '@angular/forms';
 import { ActivatedRoute, Router } from '@angular/router';
 
 import {
+    AuthService,
     ComponentBase,
     MessageBus,
     NotificationService,
@@ -25,14 +26,17 @@ import { UserCreated, UserUpdated } from './messages';
     templateUrl: './user-page.component.html'
 })
 export class UserPageComponent extends ComponentBase implements OnInit {
+    public currentUserId: string;
     public userFormSubmitted = false;
     public userForm: FormGroup;
     public userId: string;
     public userFormError: string;
 
+    public isCurrentUser = false;
     public isNewMode = false;
 
     constructor(notifications: NotificationService,
+        private readonly authService: AuthService,
         private readonly formBuilder: FormBuilder,
         private readonly messageBus: MessageBus,
         private readonly route: ActivatedRoute,
@@ -47,6 +51,8 @@ export class UserPageComponent extends ComponentBase implements OnInit {
             .subscribe((user: UserDto) => {
                 this.populateForm(user);
             });
+
+        this.currentUserId = this.authService.user!.id;
     }
 
     public save(publish: boolean) {
@@ -107,51 +113,34 @@ export class UserPageComponent extends ComponentBase implements OnInit {
     }
 
     private populateForm(user: UserDto) {
+        const input = user || {};
+
+        this.isNewMode = !user;
+        this.userId = input['id'];
         this.userFormError = '';
         this.userFormSubmitted = false;
+        this.userForm =
+            this.formBuilder.group({
+                email: [input['email'],
+                    [
+                        Validators.email,
+                        Validators.required,
+                        Validators.maxLength(100)
+                    ]],
+                displayName: [input['displayName'],
+                    [
+                        Validators.required,
+                        Validators.maxLength(100)
+                    ]]
+            });
 
         if (user) {
-            this.isNewMode = false;
+            this.userForm.addControl('password', new FormControl(''));
-            this.userId = user.id;
-            this.userForm =
-                this.formBuilder.group({
-                    email: [user.email,
-                        [
-                            Validators.email,
-                            Validators.required,
-                            Validators.maxLength(100)
-                        ]],
-                    displayName: [user.displayName,
-                        [
-                            Validators.required,
-                            Validators.maxLength(100)
-                        ]],
-                    password: ['', []],
-                    passwordConfirm: ['', []]
-                });
         } else {
-            this.isNewMode = true;
+            this.userForm.addControl('password', new FormControl(Validators.required));
-            this.userForm =
-                this.formBuilder.group({
-                    displayName: ['',
-                        [
-                            Validators.required,
-                            Validators.maxLength(100)
-                        ]],
-                    email: ['',
-                        [
-                            Validators.email,
-                            Validators.required,
-                            Validators.maxLength(100)
-                        ]],
-                    password: ['', [
-                            Validators.required
-                        ]],
-                    passwordConfirm: ['', [
-                            Validators.required
-                        ]]
-                });
         }
+
+        this.isCurrentUser = this.userId === this.currentUserId;
     }
 }
 

src/Squidex/app/features/administration/pages/users/users-page.component.html

@@ -14,7 +14,7 @@
                     <input class="form-control" [formControl]="usersFilter" placeholder="Search for user" />
                 </form>
 
-                <button class="btn btn-success" [routerLink]="['new']">
+                <button class="btn btn-success" routerLink="new">
                     <i class="icon-plus"></i> New
                 </button>
             </div>
@@ -56,7 +56,7 @@
 
                 <tbody>
                     <ng-template ngFor let-user [ngForOf]="usersItems">
-                        <tr [routerLink]="[user.id]" routerLinkActive="active">
+                        <tr [routerLink]="user.id" routerLinkActive="active">
                             <td>
                                 <img class="user-picture" [attr.title]="user.name" [attr.src]="user.pictureUrl" />
                             </td>

src/Squidex/app/features/content/pages/contents/contents-page.component.html

@@ -18,7 +18,7 @@
                     <sqx-language-selector class="languages-buttons" (selectedLanguageChanged)="selectLanguage($event)" [languages]="languages"></sqx-language-selector>
                 </span>
 
-                <button class="btn btn-success" [routerLink]="['new']">
+                <button class="btn btn-success" routerLink="new">
                     <i class="icon-plus"></i> New
                 </button>
             </div>

src/Squidex/app/features/content/pages/schemas/schemas-page.component.html

@@ -23,10 +23,7 @@
         <div class="panel-content">
             <ul class="nav nav-pills flex-column nav-dark nav-dark-bordered">
                 <li class="nav-item" *ngFor="let schema of schemasFiltered | async">
-                    <a class="nav-link" [routerLink]="[schema.name]" routerLinkActive="active">
+                    <a class="nav-link" [routerLink]="schema.name" routerLinkActive="active">{{schema | displayName}} <i class="icon-angle-right"></i></a>
-                        {{schema | displayName}}
-                        <i class="icon-angle-right"></i>
-                    </a>
                 </li>
             </ul>
         </div>

src/Squidex/app/shell/pages/internal/apps-menu.component.html

@@ -3,7 +3,7 @@
         <span class="nav-link dropdown-toggle" id="app-name" (click)="modalMenu.toggle()">{{appName}}</span>
 
         <div class="dropdown-menu" *sqxModalView="modalMenu" closeAlways="true" [@fade]>
-            <a class="dropdown-item all-apps" [routerLink]="['/app']">
+            <a class="dropdown-item all-apps" routerLink="/app">
                 <span class="all-apps-text">All Apps</span> 
                 <span class="all-apps-pill tag tag-pill tag-default">{{apps.length || 0}}</span>
             </a>

src/Squidex/app/shell/pages/internal/internal-area.component.html

@@ -1,5 +1,5 @@
 <nav class="navbar navbar-fixed-top navbar-inverse bg-primary bg-faded">
-    <span class="navbar-brand" [routerLink]="['/app']">
+    <span class="navbar-brand" routerLink="/app">
         <i class="icon-logo"></i>
     </span>
 

src/Squidex/app/shell/pages/internal/profile-menu.component.html

@@ -7,7 +7,7 @@
         </span>
 
         <div class="dropdown-menu" *sqxModalView="modalMenu" closeAlways="true" [@fade]>
-            <a class="dropdown-item" [routerLink]="['/app/administration']" *ngIf="isAdmin">
+            <a class="dropdown-item" routerLink="/app/administration" *ngIf="isAdmin">
                 Administration
             </a>