From e312f40a84c07ca53f004bb5d7dd45752c3e9c1a Mon Sep 17 00:00:00 2001
From: Edi Cziszter <eduard@devplant.ro>
Date: Wed, 15 Dec 2021 12:37:02 +0200
Subject: [PATCH] reload returns promise

---
 apps/red-ui/src/app/services/user-preference.service.ts | 4 ++--
 apps/red-ui/src/app/utils/configuration.initializer.ts  | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/apps/red-ui/src/app/services/user-preference.service.ts b/apps/red-ui/src/app/services/user-preference.service.ts
index e2ac56f9e..ac318c13d 100644
--- a/apps/red-ui/src/app/services/user-preference.service.ts
+++ b/apps/red-ui/src/app/services/user-preference.service.ts
@@ -68,8 +68,8 @@ export class UserPreferenceService extends GenericService<UserAttributes> {
         window.location.reload();
     }
 
-    reload(): void {
-        this.getAll<UserAttributes>()
+    reload(): Promise<void> {
+        return this.getAll<UserAttributes>()
             .toPromise()
             .then(attributes => {
                 this._userAttributes = attributes ?? {};
diff --git a/apps/red-ui/src/app/utils/configuration.initializer.ts b/apps/red-ui/src/app/utils/configuration.initializer.ts
index 7350337e9..2f31bef07 100644
--- a/apps/red-ui/src/app/utils/configuration.initializer.ts
+++ b/apps/red-ui/src/app/utils/configuration.initializer.ts
@@ -23,8 +23,7 @@ export function configurationInitializer(
                 switchMap(loggedIn => (!loggedIn ? throwError('Not Logged In') : of({}))),
                 mergeMapTo(generalSettingsService.getGeneralConfigurations()),
                 tap(configuration => configService.updateDisplayName(configuration.displayName)),
-                tap(() => userPreferenceService.reload()),
-                tap(() => languageService.chooseAndSetInitialLanguage()),
+                tap(() => userPreferenceService.reload().then(() => languageService.chooseAndSetInitialLanguage())),
                 catchError(() => {
                     title.setTitle('RedactManager');
                     return of({});