@@ -30,7 +30,7 @@
-
diff --git a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts
index a796242f2..8c3d896bf 100644
--- a/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts
+++ b/apps/red-ui/src/app/modules/account/screens/user-profile/user-profile-screen/user-profile-screen.component.ts
@@ -17,7 +17,7 @@ import { LanguageService } from '../../../../../i18n/language.service';
changeDetection: ChangeDetectionStrategy.OnPush,
})
export class UserProfileScreenComponent implements OnInit {
- readonly formGroup: FormGroup = this._getForm();
+ readonly form: FormGroup = this._getForm();
changePasswordUrl: SafeResourceUrl;
translations = languagesTranslations;
@@ -50,15 +50,15 @@ export class UserProfileScreenComponent implements OnInit {
}
get languageChanged(): boolean {
- return this._profileModel['language'] !== this.formGroup.get('language').value;
+ return this._profileModel['language'] !== this.form.get('language').value;
}
get profileChanged(): boolean {
- const keys = Object.keys(this.formGroup.getRawValue());
+ const keys = Object.keys(this.form.getRawValue());
keys.splice(keys.indexOf('language'), 1);
for (const key of keys) {
- if (this._profileModel[key] !== this.formGroup.get(key).value) {
+ if (this._profileModel[key] !== this.form.get(key).value) {
return true;
}
}
@@ -78,11 +78,11 @@ export class UserProfileScreenComponent implements OnInit {
this._loadingService.start();
if (this.languageChanged) {
- await this._languageService.changeLanguage(this.formGroup.get('language').value);
+ await this._languageService.changeLanguage(this.form.get('language').value);
}
if (this.profileChanged) {
- const value = this.formGroup.value as IProfile;
+ const value = this.form.value as IProfile;
delete value.language;
await this._userService
@@ -108,9 +108,9 @@ export class UserProfileScreenComponent implements OnInit {
};
if (this._userService.currentUser.email) {
// disable email if it's already set
- this.formGroup.get('email').disable();
+ this.form.get('email').disable();
}
- this.formGroup.patchValue(this._profileModel, { emitEvent: false });
+ this.form.patchValue(this._profileModel, { emitEvent: false });
} catch (e) {
} finally {
this._loadingService.stop();
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 9ce0e6dc5..e2ac56f9e 100644
--- a/apps/red-ui/src/app/services/user-preference.service.ts
+++ b/apps/red-ui/src/app/services/user-preference.service.ts
@@ -3,13 +3,18 @@ import { GenericService, List, RequiredParam, Validate } from '@iqser/common-ui'
type UserAttributes = Record
;
+const KEYS = {
+ language: 'Language',
+ dossierRecent: 'Dossier-Recent',
+ filePreviewTooltips: 'File-Preview-Tooltips',
+} as const;
+
@Injectable({
providedIn: 'root',
})
export class UserPreferenceService extends GenericService {
constructor(protected readonly _injector: Injector) {
super(_injector, 'attributes');
- this.reload();
}
private _userAttributes: UserAttributes = {};
@@ -24,23 +29,34 @@ export class UserPreferenceService extends GenericService {
}
getLastOpenedFileForDossier(dossierId: string): string {
- const key = `Dossier-Recent-${dossierId}`;
+ const key = `${KEYS.dossierRecent}-${dossierId}`;
return this._getAttribute(key);
}
async saveLastOpenedFileForDossier(dossierId: string, fileId: string): Promise {
- const key = `Dossier-Recent-${dossierId}`;
+ const key = `${KEYS.dossierRecent}-${dossierId}`;
this.userAttributes[key] = [fileId];
await this.savePreferences([fileId], key).toPromise();
}
+ getLanguage(): string {
+ const key = KEYS.language;
+ return this._getAttribute(key);
+ }
+
+ async saveLanguage(language: string): Promise {
+ const key = KEYS.language;
+ this.userAttributes[key] = [language];
+ await this.savePreferences([language], key).toPromise();
+ }
+
getFilePreviewTooltipsPreference(): boolean {
- const key = 'File-Preview-Tooltips';
+ const key = KEYS.filePreviewTooltips;
return this._getAttribute(key, 'false') === 'true';
}
async toggleFilePreviewTooltipsPreference(): Promise {
- const key = 'File-Preview-Tooltips';
+ const key = KEYS.filePreviewTooltips;
const currentValue = this.getFilePreviewTooltipsPreference();
const nextValue = [(!currentValue).toString()];
this.userAttributes[key] = nextValue;
diff --git a/apps/red-ui/src/app/utils/configuration.initializer.ts b/apps/red-ui/src/app/utils/configuration.initializer.ts
index d111c02af..228994ec0 100644
--- a/apps/red-ui/src/app/utils/configuration.initializer.ts
+++ b/apps/red-ui/src/app/utils/configuration.initializer.ts
@@ -4,12 +4,16 @@ import { Title } from '@angular/platform-browser';
import { of } from 'rxjs';
import { KeycloakEventType, KeycloakService } from 'keycloak-angular';
import { GeneralSettingsService } from '@services/general-settings.service';
+import { LanguageService } from '@i18n/language.service';
+import { UserPreferenceService } from '@services/user-preference.service';
export function configurationInitializer(
keycloakService: KeycloakService,
title: Title,
configService: ConfigService,
generalSettingsService: GeneralSettingsService,
+ languageService: LanguageService,
+ userPreferenceService: UserPreferenceService,
) {
return () =>
keycloakService.keycloakEvents$
@@ -21,6 +25,8 @@ export function configurationInitializer(
title.setTitle('RedactManager');
return of({});
}),
+ tap(() => userPreferenceService.reload()),
+ tap(() => languageService.chooseAndSetInitialLanguage()),
take(1),
)
.toPromise();