Upgrading to Angular 20:

Replaced checked in package-lock.json by regenerated one. Ran ng update @angular/core@20 @angular/cli@20 Ran npm install @angular-builders/jest@^20.0.0 @fortawesome/angular-fontawesome@^3.0.0 @swimlane/ngx-graph@^11 Ran npm install ngx-mat-select-search@^8.0.2. Ran ng update @angular/material@20. Updated all eslint and typescript to the latest versions. Removed @angular-devkit/schematics. Updated fontawesome. Updated rxjs and tslib. Moved required node version from 16 to 20. Updated jest-preset-angular. Set preserveWhitespaces to false. Corrected two type declarations in two typescript files to make ng serve run without errors. Removed unused angular-devkit/schematics from view-user.component.ts . Updated list of supported browsers. Upgraded prettier. Ran prettier . --write the first time. Ran prettier . --write the second time. Ran ng generate @angular/core:inject with defaults, excepted a handful of files. Fixed remaining eslint problems. Added dist directory to ignores in eslint.config.js. Let prettier fix formatting, almost everything is just line breaks. Made htmlhint ignore @if and @for Angular constructs. Updated node version in Github workflow to 22.12.0 (build.yml). Updated .env.ts. Updated Angular datetime format strings from YYYY-MM-DD to yyyy-MM-dd. Merged changes from dev into angular20 branch.
2025-12-08 11:01:01 +01:00
parent f1b4ec2cf2
commit 7fd1486c08
1516 changed files with 39367 additions and 36037 deletions
@@ -7,24 +7,30 @@
          <mat-form-field class="flex-48">
            <mat-label>{{ 'labels.inputs.Username' | translate }}</mat-label>
            <input matInput required formControlName="username" />
-            <mat-error *ngIf="userForm.controls.username.hasError('required')">
-              {{ 'labels.inputs.Username' | translate }} {{ 'labels.commons.is' | translate }}
-              <strong>{{ 'labels.commons.required' | translate }}</strong>
-            </mat-error>
+            @if (userForm.controls.username.hasError('required')) {
+              <mat-error>
+                {{ 'labels.inputs.Username' | translate }} {{ 'labels.commons.is' | translate }}
+                <strong>{{ 'labels.commons.required' | translate }}</strong>
+              </mat-error>
+            }
          </mat-form-field>

          <!-- Email -->
          <mat-form-field class="flex-48">
            <mat-label>{{ 'labels.inputs.Email' | translate }}</mat-label>
            <input matInput required formControlName="email" />
-            <mat-error *ngIf="userForm.controls.email.hasError('email')">
-              {{ 'labels.inputs.Email' | translate }} {{ 'labels.commons.is' | translate }}
-              <strong>{{ 'labels.commons.invalid' | translate }}</strong>
-            </mat-error>
-            <mat-error *ngIf="userForm.controls.email.hasError('required')">
-              {{ 'labels.inputs.Email' | translate }} {{ 'labels.commons.is' | translate }}
-              <strong>{{ 'labels.commons.required' | translate }}</strong>
-            </mat-error>
+            @if (userForm.controls.email.hasError('email')) {
+              <mat-error>
+                {{ 'labels.inputs.Email' | translate }} {{ 'labels.commons.is' | translate }}
+                <strong>{{ 'labels.commons.invalid' | translate }}</strong>
+              </mat-error>
+            }
+            @if (userForm.controls.email.hasError('required')) {
+              <mat-error>
+                {{ 'labels.inputs.Email' | translate }} {{ 'labels.commons.is' | translate }}
+                <strong>{{ 'labels.commons.required' | translate }}</strong>
+              </mat-error>
+            }
          </mat-form-field>

          <!-- First Name -->
@@ -43,9 +49,11 @@
          <mat-form-field class="flex-48">
            <mat-label>{{ 'labels.inputs.Language' | translate }}</mat-label>
            <mat-select formControlName="preferredLanguage" required>
-              <mat-option *ngFor="let lang of languageCodes" [value]="lang.code">
-                {{ 'languages.' + lang.key | translate }}
-              </mat-option>
+              @for (lang of languageCodes; track lang) {
+                <mat-option [value]="lang.code">
+                  {{ 'languages.' + lang.key | translate }}
+                </mat-option>
+              }
            </mat-select>
          </mat-form-field>
          <!-- Gender -->
@@ -63,9 +71,11 @@
            <mat-form-field class="flex-48">
              <mat-label>{{ 'labels.inputs.Code' | translate }}</mat-label>
              <mat-select formControlName="countryCode" required>
-                <mat-option *ngFor="let country of countryCodes" [value]="country.code">
-                  {{ 'countries.' + country.key | translate }} ({{ country.code }})
-                </mat-option>
+                @for (country of countryCodes; track country) {
+                  <mat-option [value]="country.code">
+                    {{ 'countries.' + country.key | translate }} ({{ country.code }})
+                  </mat-option>
+                }
              </mat-select>
            </mat-form-field>

@@ -78,22 +88,28 @@
          <mat-form-field class="flex-20">
            <mat-label>{{ 'labels.inputs.Office' | translate }}</mat-label>
            <mat-select required formControlName="officeId">
-              <mat-option *ngFor="let office of officesData" [value]="office.id">
-                {{ office.name }}
-              </mat-option>
+              @for (office of officesData; track office) {
+                <mat-option [value]="office.id">
+                  {{ office.name }}
+                </mat-option>
+              }
            </mat-select>
-            <mat-error *ngIf="userForm.controls.officeId.hasError('required')">
-              {{ 'labels.inputs.Office' | translate }} {{ 'labels.commons.is' | translate }}
-              <strong>{{ 'labels.commons.required' | translate }}</strong>
-            </mat-error>
+            @if (userForm.controls.officeId.hasError('required')) {
+              <mat-error>
+                {{ 'labels.inputs.Office' | translate }} {{ 'labels.commons.is' | translate }}
+                <strong>{{ 'labels.commons.required' | translate }}</strong>
+              </mat-error>
+            }
          </mat-form-field>

          <mat-form-field class="flex-20">
            <mat-label>{{ 'labels.inputs.Staff' | translate }}</mat-label>
            <mat-select formControlName="staffId">
-              <mat-option *ngFor="let staff of staffData" [value]="staff.id">
-                {{ staff.displayName }}
-              </mat-option>
+              @for (staff of staffData; track staff) {
+                <mat-option [value]="staff.id">
+                  {{ staff.displayName }}
+                </mat-option>
+              }
            </mat-select>
          </mat-form-field>

@@ -101,69 +117,80 @@
          <mat-form-field class="flex-48">
            <mat-label>{{ 'labels.inputs.Password' | translate }}</mat-label>
            <input matInput type="password" formControlName="password" required />
-            <mat-error *ngIf="userForm.get('password')?.hasError('required')">
-              {{ 'labels.inputs.Password' | translate }} {{ 'labels.commons.is' | translate }}
-              <strong>{{ 'labels.commons.required' | translate }}</strong>
-            </mat-error>
-            <mat-error *ngIf="userForm.get('password')?.hasError('minlength')">
-              {{ 'labels.commons.Password should be at least' | translate }}
-              <strong>{{ 'labels.commons.12 characters long' | translate }}</strong>
-            </mat-error>
-            <mat-error *ngIf="userForm.get('password')?.hasError('maxlength')">
-              {{ 'labels.commons.Password should not be more than' | translate }}
-              <strong>{{ 'labels.commons.50 characters long' | translate }}</strong>
-            </mat-error>
-            <mat-error
-              *ngIf="
-                userForm.get('password')?.hasError('pattern') &&
-                !userForm.get('password')?.hasError('minlength') &&
-                !userForm.get('password')?.hasError('maxlength')
-              "
-            >
-              {{ 'labels.commons.Password should include a' | translate }}
-              <strong>{{ 'labels.commons.numeral' | translate }}</strong>
-              {{ 'labels.commons.and at' | translate }}
-              <strong>{{ 'labels.commons.least one uppercase' | translate }}</strong
-              >,
-              <strong>{{ 'labels.commons.lowercase and special character' | translate }}</strong>
-            </mat-error>
+            @if (userForm.get('password')?.hasError('required')) {
+              <mat-error>
+                {{ 'labels.inputs.Password' | translate }} {{ 'labels.commons.is' | translate }}
+                <strong>{{ 'labels.commons.required' | translate }}</strong>
+              </mat-error>
+            }
+            @if (userForm.get('password')?.hasError('minlength')) {
+              <mat-error>
+                {{ 'labels.commons.Password should be at least' | translate }}
+                <strong>{{ 'labels.commons.12 characters long' | translate }}</strong>
+              </mat-error>
+            }
+            @if (userForm.get('password')?.hasError('maxlength')) {
+              <mat-error>
+                {{ 'labels.commons.Password should not be more than' | translate }}
+                <strong>{{ 'labels.commons.50 characters long' | translate }}</strong>
+              </mat-error>
+            }
+            @if (
+              userForm.get('password')?.hasError('pattern') &&
+              !userForm.get('password')?.hasError('minlength') &&
+              !userForm.get('password')?.hasError('maxlength')
+            ) {
+              <mat-error>
+                {{ 'labels.commons.Password should include a' | translate }}
+                <strong>{{ 'labels.commons.numeral' | translate }}</strong>
+                {{ 'labels.commons.and at' | translate }}
+                <strong>{{ 'labels.commons.least one uppercase' | translate }}</strong
+                >,
+                <strong>{{ 'labels.commons.lowercase and special character' | translate }}</strong>
+              </mat-error>
+            }
          </mat-form-field>

          <!-- Repeat password -->
          <mat-form-field class="flex-48">
            <mat-label>{{ 'labels.inputs.Repeat Password' | translate }}</mat-label>
            <input matInput type="password" formControlName="repeatPassword" required />
-            <mat-error *ngIf="userForm.get('repeatPassword')?.hasError('required')">
-              {{ 'labels.inputs.Password' | translate }} {{ 'labels.commons.is' | translate }}
-              <strong>{{ 'labels.commons.required' | translate }}</strong>
-            </mat-error>
+            @if (userForm.get('repeatPassword')?.hasError('required')) {
+              <mat-error>
+                {{ 'labels.inputs.Password' | translate }} {{ 'labels.commons.is' | translate }}
+                <strong>{{ 'labels.commons.required' | translate }}</strong>
+              </mat-error>
+            }
          </mat-form-field>

          <!-- Passwords do not match -->
-          <p
-            class="flex-98 reset-password-error"
-            *ngIf="
-              userForm.errors?.passwordsDoNotMatch &&
-              !userForm.get('password')?.hasError('required') &&
-              !userForm.get('repeatPassword')?.hasError('required')
-            "
-          >
-            {{ 'labels.inputs.Passwords' | translate }}
-            <strong>{{ 'labels.commons.do not match' | translate }}</strong>
-          </p>
+          @if (
+            userForm.errors?.passwordsDoNotMatch &&
+            !userForm.get('password')?.hasError('required') &&
+            !userForm.get('repeatPassword')?.hasError('required')
+          ) {
+            <p class="flex-98 reset-password-error">
+              {{ 'labels.inputs.Passwords' | translate }}
+              <strong>{{ 'labels.commons.do not match' | translate }}</strong>
+            </p>
+          }

          <!-- Roles -->
          <mat-form-field class="flex-20">
            <mat-label>{{ 'labels.inputs.Roles' | translate }}</mat-label>
            <mat-select formControlName="roles" required multiple>
-              <mat-option *ngFor="let role of rolesData" [value]="role.id">
-                {{ role.name }}
-              </mat-option>
+              @for (role of rolesData; track role) {
+                <mat-option [value]="role.id">
+                  {{ role.name }}
+                </mat-option>
+              }
            </mat-select>
-            <mat-error *ngIf="userForm.controls.roles.hasError('required')">
-              {{ 'labels.commons.At least one role' | translate }}
-              <strong>{{ 'labels.commons.must be selected' | translate }}</strong>
-            </mat-error>
+            @if (userForm.controls.roles.hasError('required')) {
+              <mat-error>
+                {{ 'labels.commons.At least one role' | translate }}
+                <strong>{{ 'labels.commons.must be selected' | translate }}</strong>
+              </mat-error>
+            }
          </mat-form-field>
        </div>
      </mat-card-content>
@@ -1,5 +1,5 @@
 /** Angular Imports */
-import { Component, OnInit, TemplateRef, ElementRef, ViewChild, AfterViewInit } from '@angular/core';
+import { Component, OnInit, TemplateRef, ElementRef, ViewChild, AfterViewInit, inject } from '@angular/core';
 import {
  UntypedFormGroup,
  UntypedFormBuilder,
@@ -38,6 +38,16 @@ import { ZITADEL_LANGUAGES } from 'app/zitadel/constants/languages';
  ]
 })
 export class CreateUserComponent implements OnInit, AfterViewInit {
+  private formBuilder = inject(UntypedFormBuilder);
+  private usersService = inject(UsersServiceZitadel);
+  private usersService2 = inject(UsersService);
+  private route = inject(ActivatedRoute);
+  private router = inject(Router);
+  private popoverService = inject(PopoverService);
+  private configurationWizardService = inject(ConfigurationWizardService);
+  private dialog = inject(MatDialog);
+  private passwordsUtility = inject(PasswordsUtility);
+
  /** User form. */
  userForm: UntypedFormGroup;
  /** Offices data. */
@@ -65,17 +75,7 @@ export class CreateUserComponent implements OnInit, AfterViewInit {
   * @param {ConfigurationWizardService} configurationWizardService ConfigurationWizard Service.
   * @param {PopoverService} popoverService PopoverService.
   */
-  constructor(
-    private formBuilder: UntypedFormBuilder,
-    private usersService: UsersServiceZitadel,
-    private usersService2: UsersService,
-    private route: ActivatedRoute,
-    private router: Router,
-    private popoverService: PopoverService,
-    private configurationWizardService: ConfigurationWizardService,
-    private dialog: MatDialog,
-    private passwordsUtility: PasswordsUtility
-  ) {
+  constructor() {
    this.route.data.subscribe((data: { usersTemplate: any }) => {
      this.officesData = data.usersTemplate.allowedOffices;
      this.rolesData = data.usersTemplate.availableRoles;
@@ -132,7 +132,8 @@ export class CreateUserComponent implements OnInit, AfterViewInit {
          '',
          [
            Validators.required,
-            Validators.pattern(/^[0-9]{7,15}$/)]
+            Validators.pattern(/^[0-9]{7,15}$/)
+          ]
        ],
        password: [
          '',
@@ -140,7 +141,8 @@ export class CreateUserComponent implements OnInit, AfterViewInit {
            Validators.required,
            Validators.minLength(12),
            Validators.maxLength(50),
-            Validators.pattern(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[\W_]).+$/)]
+            Validators.pattern(/^(?=.*[a-z])(?=.*[A-Z])(?=.*\d)(?=.*[\W_]).+$/)
+          ]
        ],
        repeatPassword: [
          '',
@@ -1,125 +1,140 @@
 <div class="container">
  <mat-card>
-    <form *ngIf="editUserForm" [formGroup]="editUserForm" (ngSubmit)="submit()">
-      <mat-card-content>
-        <div class="layout-row-wrap gap-2px responsive-column">
-          <mat-form-field class="flex-48">
-            <mat-label>{{ 'labels.inputs.Username' | translate }}</mat-label>
-            <input matInput required formControlName="username" readonline />
-            <mat-error *ngIf="editUserForm.controls.username.hasError('required')">
-              {{ 'labels.inputs.Username' | translate }} {{ 'labels.commons.is' | translate }}
-              <strong>{{ 'labels.commons.required' | translate }}</strong>
-            </mat-error>
-          </mat-form-field>
-
-          <mat-form-field class="flex-48">
-            <mat-label>{{ 'labels.inputs.Email' | translate }}</mat-label>
-            <input matInput required formControlName="email" />
-            <mat-error *ngIf="editUserForm.controls.email.hasError('email')">
-              {{ 'labels.inputs.Email' | translate }} {{ 'labels.commons.is' | translate }}
-              <strong>{{ 'labels.commons.invalid' | translate }}</strong>
-            </mat-error>
-            <mat-error *ngIf="editUserForm.controls.email.hasError('required')">
-              {{ 'labels.inputs.Email' | translate }} {{ 'labels.commons.is' | translate }}
-              <strong>{{ 'labels.commons.required' | translate }}</strong>
-            </mat-error>
-          </mat-form-field>
-
-          <mat-form-field class="flex-48">
-            <mat-label>{{ 'labels.inputs.First Name' | translate }}</mat-label>
-            <input matInput required formControlName="firstname" />
-            <mat-error *ngIf="editUserForm.controls.firstname.hasError('pattern')">
-              {{ 'labels.inputs.First Name' | translate }}
-              <strong>{{ 'labels.commons.cannot begin with a special character or number' | translate }}</strong>
-            </mat-error>
-            <mat-error *ngIf="editUserForm.controls.firstname.hasError('required')">
-              {{ 'labels.inputs.First Name' | translate }} {{ 'labels.commons.is' | translate }}
-              <strong>{{ 'labels.commons.required' | translate }}</strong>
-            </mat-error>
-          </mat-form-field>
-
-          <mat-form-field class="flex-48">
-            <mat-label>{{ 'labels.inputs.Last Name' | translate }}</mat-label>
-            <input matInput required formControlName="lastname" />
-            <mat-error *ngIf="editUserForm.controls.lastname.hasError('pattern')">
-              {{ 'labels.inputs.Last Name' | translate }}
-              <strong>{{ 'labels.commons.cannot begin with a special character or number' | translate }}</strong>
-            </mat-error>
-            <mat-error *ngIf="editUserForm.controls.lastname.hasError('required')">
-              {{ 'labels.inputs.Last Name' | translate }} {{ 'labels.commons.is' | translate }}
-              <strong>{{ 'labels.commons.required' | translate }}</strong>
-            </mat-error>
-          </mat-form-field>
-
-          <mat-form-field class="flex-20">
-            <mat-label>{{ 'labels.inputs.Code' | translate }}</mat-label>
-            <mat-select formControlName="countryCode" required>
-              <mat-option *ngFor="let country of countryCodes" [value]="country.code">
-                {{ 'countries.' + country.key | translate }} ({{ country.code }})
-              </mat-option>
-            </mat-select>
-          </mat-form-field>
-
-          <mat-form-field class="flex-75">
-            <mat-label>{{ 'labels.inputs.Phone Number' | translate }}</mat-label>
-            <input matInput formControlName="phoneNumber" required maxlength="12" minlength="4" />
-          </mat-form-field>
-
-          <mat-form-field class="flex-48">
-            <mat-label>{{ 'labels.inputs.Gender' | translate }}</mat-label>
-            <mat-select formControlName="gender" required>
-              <mat-option value="GENDER_MALE">{{ 'labels.catalogs.male' | translate }}</mat-option>
-              <mat-option value="GENDER_FEMALE">{{ 'labels.catalogs.female' | translate }}</mat-option>
-              <mat-option value="GENDER_OTHER">{{ 'labels.catalogs.other' | translate }}</mat-option>
-            </mat-select>
-          </mat-form-field>
-
-          <mat-form-field class="flex-48">
-            <mat-label>{{ 'labels.inputs.Language' | translate }}</mat-label>
-            <mat-select formControlName="preferredLanguage" required>
-              <mat-option *ngFor="let lang of languageCodes" [value]="lang.code">
-                {{ 'languages.' + lang.key | translate }}
-              </mat-option>
-            </mat-select>
-          </mat-form-field>
-
-          <mat-form-field class="flex-48">
-            <mat-label>{{ 'labels.inputs.Office' | translate }}</mat-label>
-            <mat-select required formControlName="officeId" (selectionChange)="officeChanged($event.value)">
-              <mat-option *ngFor="let office of officesData" [value]="office.id">
-                {{ office.name }}
-              </mat-option>
-            </mat-select>
-          </mat-form-field>
-
-          <mat-form-field class="flex-48">
-            <mat-label>{{ 'labels.inputs.Staff' | translate }}</mat-label>
-            <mat-select formControlName="staffId">
-              <mat-option *ngFor="let staff of staffData" [value]="staff.id">
-                {{ staff.displayName }}
-              </mat-option>
-            </mat-select>
-          </mat-form-field>
-
-          <mat-form-field class="flex-48">
-            <mat-label>{{ 'labels.inputs.Roles' | translate }}</mat-label>
-            <mat-select formControlName="roles" multiple>
-              <mat-option *ngFor="let rol of rolesData" [value]="rol.id">
-                {{ rol.name }}
-              </mat-option>
-            </mat-select>
-          </mat-form-field>
-
-          <mat-card-actions class="layout-row align-center gap-5px responsive-column">
-            <button type="button" mat-raised-button [routerLink]="['../']">
-              {{ 'labels.buttons.Cancel' | translate }}
-            </button>
-            <button mat-raised-button color="primary">
-              {{ 'labels.buttons.Submit' | translate }}
-            </button>
-          </mat-card-actions>
-        </div>
-      </mat-card-content>
-    </form>
+    @if (editUserForm) {
+      <form [formGroup]="editUserForm" (ngSubmit)="submit()">
+        <mat-card-content>
+          <div class="layout-row-wrap gap-2px responsive-column">
+            <mat-form-field class="flex-48">
+              <mat-label>{{ 'labels.inputs.Username' | translate }}</mat-label>
+              <input matInput required formControlName="username" readonline />
+              @if (editUserForm.controls.username.hasError('required')) {
+                <mat-error>
+                  {{ 'labels.inputs.Username' | translate }} {{ 'labels.commons.is' | translate }}
+                  <strong>{{ 'labels.commons.required' | translate }}</strong>
+                </mat-error>
+              }
+            </mat-form-field>
+            <mat-form-field class="flex-48">
+              <mat-label>{{ 'labels.inputs.Email' | translate }}</mat-label>
+              <input matInput required formControlName="email" />
+              @if (editUserForm.controls.email.hasError('email')) {
+                <mat-error>
+                  {{ 'labels.inputs.Email' | translate }} {{ 'labels.commons.is' | translate }}
+                  <strong>{{ 'labels.commons.invalid' | translate }}</strong>
+                </mat-error>
+              }
+              @if (editUserForm.controls.email.hasError('required')) {
+                <mat-error>
+                  {{ 'labels.inputs.Email' | translate }} {{ 'labels.commons.is' | translate }}
+                  <strong>{{ 'labels.commons.required' | translate }}</strong>
+                </mat-error>
+              }
+            </mat-form-field>
+            <mat-form-field class="flex-48">
+              <mat-label>{{ 'labels.inputs.First Name' | translate }}</mat-label>
+              <input matInput required formControlName="firstname" />
+              @if (editUserForm.controls.firstname.hasError('pattern')) {
+                <mat-error>
+                  {{ 'labels.inputs.First Name' | translate }}
+                  <strong>{{ 'labels.commons.cannot begin with a special character or number' | translate }}</strong>
+                </mat-error>
+              }
+              @if (editUserForm.controls.firstname.hasError('required')) {
+                <mat-error>
+                  {{ 'labels.inputs.First Name' | translate }} {{ 'labels.commons.is' | translate }}
+                  <strong>{{ 'labels.commons.required' | translate }}</strong>
+                </mat-error>
+              }
+            </mat-form-field>
+            <mat-form-field class="flex-48">
+              <mat-label>{{ 'labels.inputs.Last Name' | translate }}</mat-label>
+              <input matInput required formControlName="lastname" />
+              @if (editUserForm.controls.lastname.hasError('pattern')) {
+                <mat-error>
+                  {{ 'labels.inputs.Last Name' | translate }}
+                  <strong>{{ 'labels.commons.cannot begin with a special character or number' | translate }}</strong>
+                </mat-error>
+              }
+              @if (editUserForm.controls.lastname.hasError('required')) {
+                <mat-error>
+                  {{ 'labels.inputs.Last Name' | translate }} {{ 'labels.commons.is' | translate }}
+                  <strong>{{ 'labels.commons.required' | translate }}</strong>
+                </mat-error>
+              }
+            </mat-form-field>
+            <mat-form-field class="flex-20">
+              <mat-label>{{ 'labels.inputs.Code' | translate }}</mat-label>
+              <mat-select formControlName="countryCode" required>
+                @for (country of countryCodes; track country) {
+                  <mat-option [value]="country.code">
+                    {{ 'countries.' + country.key | translate }} ({{ country.code }})
+                  </mat-option>
+                }
+              </mat-select>
+            </mat-form-field>
+            <mat-form-field class="flex-75">
+              <mat-label>{{ 'labels.inputs.Phone Number' | translate }}</mat-label>
+              <input matInput formControlName="phoneNumber" required maxlength="12" minlength="4" />
+            </mat-form-field>
+            <mat-form-field class="flex-48">
+              <mat-label>{{ 'labels.inputs.Gender' | translate }}</mat-label>
+              <mat-select formControlName="gender" required>
+                <mat-option value="GENDER_MALE">{{ 'labels.catalogs.male' | translate }}</mat-option>
+                <mat-option value="GENDER_FEMALE">{{ 'labels.catalogs.female' | translate }}</mat-option>
+                <mat-option value="GENDER_OTHER">{{ 'labels.catalogs.other' | translate }}</mat-option>
+              </mat-select>
+            </mat-form-field>
+            <mat-form-field class="flex-48">
+              <mat-label>{{ 'labels.inputs.Language' | translate }}</mat-label>
+              <mat-select formControlName="preferredLanguage" required>
+                @for (lang of languageCodes; track lang) {
+                  <mat-option [value]="lang.code">
+                    {{ 'languages.' + lang.key | translate }}
+                  </mat-option>
+                }
+              </mat-select>
+            </mat-form-field>
+            <mat-form-field class="flex-48">
+              <mat-label>{{ 'labels.inputs.Office' | translate }}</mat-label>
+              <mat-select required formControlName="officeId" (selectionChange)="officeChanged($event.value)">
+                @for (office of officesData; track office) {
+                  <mat-option [value]="office.id">
+                    {{ office.name }}
+                  </mat-option>
+                }
+              </mat-select>
+            </mat-form-field>
+            <mat-form-field class="flex-48">
+              <mat-label>{{ 'labels.inputs.Staff' | translate }}</mat-label>
+              <mat-select formControlName="staffId">
+                @for (staff of staffData; track staff) {
+                  <mat-option [value]="staff.id">
+                    {{ staff.displayName }}
+                  </mat-option>
+                }
+              </mat-select>
+            </mat-form-field>
+            <mat-form-field class="flex-48">
+              <mat-label>{{ 'labels.inputs.Roles' | translate }}</mat-label>
+              <mat-select formControlName="roles" multiple>
+                @for (rol of rolesData; track rol) {
+                  <mat-option [value]="rol.id">
+                    {{ rol.name }}
+                  </mat-option>
+                }
+              </mat-select>
+            </mat-form-field>
+            <mat-card-actions class="layout-row align-center gap-5px responsive-column">
+              <button type="button" mat-raised-button [routerLink]="['../']">
+                {{ 'labels.buttons.Cancel' | translate }}
+              </button>
+              <button mat-raised-button color="primary">
+                {{ 'labels.buttons.Submit' | translate }}
+              </button>
+            </mat-card-actions>
+          </div>
+        </mat-card-content>
+      </form>
+    }
  </mat-card>
 </div>
@@ -1,5 +1,5 @@
 /** Angular Imports */
-import { Component, OnInit } from '@angular/core';
+import { Component, OnInit, inject } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { UntypedFormGroup, UntypedFormBuilder, Validators } from '@angular/forms';
 /** Custom Services */
@@ -20,6 +20,12 @@ import { ZITADEL_LANGUAGES } from 'app/zitadel/constants/languages';
  ]
 })
 export class EditUserComponent implements OnInit {
+  private formBuilder = inject(UntypedFormBuilder);
+  private UsersServiceZitadel = inject(UsersServiceZitadel);
+  private UsersService = inject(UsersService);
+  private route = inject(ActivatedRoute);
+  private router = inject(Router);
+
  /** User Data */
  userData: any;
  /** Offices Data */
@@ -44,13 +50,7 @@ export class EditUserComponent implements OnInit {
   * @param {ConfigurationWizardService} configurationWizardService ConfigurationWizard Service.
   * @param {Router} router Router for navigation.
   */
-  constructor(
-    private formBuilder: UntypedFormBuilder,
-    private UsersServiceZitadel: UsersServiceZitadel,
-    private UsersService: UsersService,
-    private route: ActivatedRoute,
-    private router: Router
-  ) {
+  constructor() {
    this.route.data.subscribe((data: { user: any; usersTemplate: any }) => {
      const fullUserData = data.user;
      this.userData = fullUserData.object?.result?.[0] || {};
@@ -115,13 +115,15 @@ export class EditUserComponent implements OnInit {
        profile.firstName || '',
        [
          Validators.required,
-          Validators.pattern('(^[A-z]).*')]
+          Validators.pattern('(^[A-z]).*')
+        ]
      ],
      lastname: [
        profile.lastName || '',
        [
          Validators.required,
-          Validators.pattern('(^[A-z]).*')]
+          Validators.pattern('(^[A-z]).*')
+        ]
      ],
      countryCode: [
        countryCode,
@@ -1,5 +1,5 @@
 /** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { ActivatedRouteSnapshot } from '@angular/router';

 /** rxjs Imports */
@@ -13,10 +13,7 @@ import { UsersServiceZitadel } from './usersZitadel.service';
 */
@Injectable()
 export class UserZitadelResolver {
-  /**
-   * @param {UsersServiceZitadel} usersServiceZitadel Users service.
-   */
-  constructor(private usersServiceZitadel: UsersServiceZitadel) {}
+  private usersServiceZitadel = inject(UsersServiceZitadel);

  /**
   * Returns the user data.
@@ -1,6 +1,6 @@
 import { MatPaginatorModule } from '@angular/material/paginator';
 /** Angular Imports */
-import { Component, OnInit, TemplateRef, ElementRef, ViewChild, AfterViewInit } from '@angular/core';
+import { Component, OnInit, TemplateRef, ElementRef, ViewChild, AfterViewInit, inject } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { MatPaginator } from '@angular/material/paginator';
 import { MatSort, MatSortModule } from '@angular/material/sort';
@@ -28,6 +28,11 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
  ]
 })
 export class UsersComponent implements OnInit, AfterViewInit {
+  private route = inject(ActivatedRoute);
+  private router = inject(Router);
+  configurationWizardService = inject(ConfigurationWizardService);
+  private popoverService = inject(PopoverService);
+
  /** User data */
  usersData: any[] = [];
  usersZitadelData: any[] = [];
@@ -57,13 +62,6 @@ export class UsersComponent implements OnInit, AfterViewInit {
  @ViewChild('usersTable') usersTable!: ElementRef<any>;
  @ViewChild('templateUsersTable') templateUsersTable!: TemplateRef<any>;

-  constructor(
-    private route: ActivatedRoute,
-    private router: Router,
-    public configurationWizardService: ConfigurationWizardService,
-    private popoverService: PopoverService
-  ) {}
-
  ngOnInit() {
    // Get data from resolver
    this.route.data.subscribe((data: { users: any; usersZitadel: any }) => {
@@ -1,5 +1,5 @@
 /** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';

 /** rxjs Imports */
 import { Observable } from 'rxjs';
@@ -11,10 +11,7 @@ import { UsersServiceZitadel } from './usersZitadel.service';
 */
@Injectable()
 export class UsersZitadelTemplateResolver {
-  /**
-   * @param { UsersServiceZitadel } usersServiceZitadel Users service.
-   */
-  constructor(private usersServiceZitadel: UsersServiceZitadel) {}
+  private usersServiceZitadel = inject(UsersServiceZitadel);

  /**
   * Returns the users template data.
@@ -1,5 +1,5 @@
 /** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';

 /** rxjs Imports */
 import { Observable } from 'rxjs';
@@ -13,10 +13,7 @@ import { UsersServiceZitadel } from './usersZitadel.service';

@Injectable()
 export class UsersZitadelResolver {
-  /**
-   * @param {UsersServiceZitadel} usersServiceZitadel Users service.
-   */
-  constructor(private usersServiceZitadel: UsersServiceZitadel) {}
+  private usersServiceZitadel = inject(UsersServiceZitadel);

  /**
   * Returns the users data.
@@ -1,5 +1,5 @@
 /** Angular Imports */
-import { Injectable } from '@angular/core';
+import { Injectable, inject } from '@angular/core';
 import { HttpClient, HttpParams } from '@angular/common/http';

 /** rxjs Imports */
@@ -15,15 +15,10 @@ import { environment } from '../../../environments/environment';
  providedIn: 'root'
 })
 export class UsersServiceZitadel {
-  private api = environment.OIDC.oidcApiUrl;
+  private http = inject(HttpClient);
+  private autservice = inject(AuthService);

-  /**
-   * @param {HttpClient} http Http Client to send requests.
-   */
-  constructor(
-    private http: HttpClient,
-    private autservice: AuthService
-  ) {}
+  private api = environment.OIDC.oidcApiUrl;

  /**
   * @param {any} user User to be created.
@@ -7,27 +7,35 @@
    <fa-icon icon="trash" class="m-r-10"></fa-icon>
    {{ 'labels.buttons.Delete' | translate }}
  </button>
-  <div
-    *ngIf="userData.isSelfServiceUser === 'USER_STATE_ACTIVE' || userData.isSelfServiceUser === 'USER_STATE_INACTIVE'"
-  >
-    <button mat-raised-button color="primary" (click)="changeUserPassword(userData.id)">
-      <fa-icon icon="cog" class="m-r-10"></fa-icon>
-      {{ 'labels.buttons.Change Password' | translate }}
-    </button>
-  </div>
-  <div [ngSwitch]="userData.isSelfServiceUser">
-    <button *ngSwitchCase="'USER_STATE_ACTIVE'" mat-raised-button color="warn" (click)="desactiveUser(userData.id)">
-      <fa-icon icon="ban" class="m-r-10"></fa-icon>
-      {{ 'labels.buttons.Disable' | translate }}
-    </button>
-    <button *ngSwitchCase="'USER_STATE_INACTIVE'" mat-raised-button color="primary" (click)="activeUser(userData.id)">
-      <fa-icon icon="check" class="m-r-10"></fa-icon>
-      {{ 'labels.buttons.Reactivate' | translate }}
-    </button>
-    <button *ngSwitchDefault mat-raised-button color="primary" disabled>
-      <fa-icon icon="ban" class="m-r-10"></fa-icon>
-      {{ 'labels.buttons.Validate' | translate }}
-    </button>
+  @if (userData.isSelfServiceUser === 'USER_STATE_ACTIVE' || userData.isSelfServiceUser === 'USER_STATE_INACTIVE') {
+    <div>
+      <button mat-raised-button color="primary" (click)="changeUserPassword(userData.id)">
+        <fa-icon icon="cog" class="m-r-10"></fa-icon>
+        {{ 'labels.buttons.Change Password' | translate }}
+      </button>
+    </div>
+  }
+  <div>
+    @switch (userData.isSelfServiceUser) {
+      @case ('USER_STATE_ACTIVE') {
+        <button mat-raised-button color="warn" (click)="desactiveUser(userData.id)">
+          <fa-icon icon="ban" class="m-r-10"></fa-icon>
+          {{ 'labels.buttons.Disable' | translate }}
+        </button>
+      }
+      @case ('USER_STATE_INACTIVE') {
+        <button mat-raised-button color="primary" (click)="activeUser(userData.id)">
+          <fa-icon icon="check" class="m-r-10"></fa-icon>
+          {{ 'labels.buttons.Reactivate' | translate }}
+        </button>
+      }
+      @default {
+        <button mat-raised-button color="primary" disabled>
+          <fa-icon icon="ban" class="m-r-10"></fa-icon>
+          {{ 'labels.buttons.Validate' | translate }}
+        </button>
+      }
+    }
  </div>
 </div>

@@ -59,13 +67,17 @@
          {{ userData.lastname }}
        </div>

-        <div class="flex-50 mat-body-strong" *ngIf="userData.email">
-          {{ 'labels.inputs.Email' | translate }}
-        </div>
+        @if (userData.email) {
+          <div class="flex-50 mat-body-strong">
+            {{ 'labels.inputs.Email' | translate }}
+          </div>
+        }

-        <div class="flex-50" *ngIf="userData.email">
-          {{ userData.email }}
-        </div>
+        @if (userData.email) {
+          <div class="flex-50">
+            {{ userData.email }}
+          </div>
+        }

        <div class="flex-50 mat-body-strong">
          {{ 'labels.inputs.Office' | translate }}
@@ -80,9 +92,11 @@
        </div>

        <div class="flex-50">
-          <span *ngFor="let role of userData.selectedRoles">
-            {{ role.name }}
-          </span>
+          @for (role of userData.selectedRoles; track role) {
+            <span>
+              {{ role.name }}
+            </span>
+          }
        </div>
      </div>

@@ -1,5 +1,5 @@
 /** Angular Imports */
-import { Component } from '@angular/core';
+import { Component, inject } from '@angular/core';
 import { ActivatedRoute, Router } from '@angular/router';
 import { MatDialog } from '@angular/material/dialog';

@@ -13,7 +13,6 @@ import { AuthService } from 'app/zitadel/auth.service';
 /** Custom Components */
 import { DeleteDialogComponent } from 'app/shared/delete-dialog/delete-dialog.component';
 import { ChangePasswordDialogComponent } from 'app/zitadel/shared/change-password-dialog/change-password-dialog.component';
-import { strings } from '@angular-devkit/schematics';
 import { STANDALONE_SHARED_IMPORTS } from 'app/standalone-shared.module';
 import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';

@@ -30,6 +29,12 @@ import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
  ]
 })
 export class ViewUserComponent {
+  private usersService = inject(UsersServiceZitadel);
+  private route = inject(ActivatedRoute);
+  private router = inject(Router);
+  private dialog = inject(MatDialog);
+  private authService = inject(AuthService);
+
  /** User Data. */
  userData: any;

@@ -40,13 +45,7 @@ export class ViewUserComponent {
   * @param {Router} router Router for navigation.
   * @param {MatDialog} dialog Dialog reference.
   */
-  constructor(
-    private usersService: UsersServiceZitadel,
-    private route: ActivatedRoute,
-    private router: Router,
-    private dialog: MatDialog,
-    private authService: AuthService
-  ) {
+  constructor() {
    this.route.data.subscribe((data: { user: any }) => {
      const u = data.user.object?.result?.[0];