diff --git a/angular.json b/angular.json index 9564a396458..88e77a79b41 100644 --- a/angular.json +++ b/angular.json @@ -339,12 +339,12 @@ }, "build-schematics": { "executor": "nx:run-commands", - "options": { - "commands": [ - "npx tsc -p lib/core/tsconfig.schematics.json", - "cp lib/core/schematics/migrations/collection.json dist/libs/core/schematics/migrations/collection.json" - ], - "parallel": false + "options": { + "commands": [ + { + "command": "npx tsc -p lib/core/tsconfig.schematics.json && cp lib/core/schematics/migrations/collection.json dist/libs/core/schematics/migrations/collection.json" + } + ] } }, "test": { diff --git a/lib/core/src/lib/common/services/user-preferences.service.ts b/lib/core/src/lib/common/services/user-preferences.service.ts index 04c83200026..da3fb1fe2ad 100644 --- a/lib/core/src/lib/common/services/user-preferences.service.ts +++ b/lib/core/src/lib/common/services/user-preferences.service.ts @@ -52,12 +52,12 @@ export class UserPreferencesService { private appConfig: AppConfigService, private storage: StorageService ) { + this.onChangeSubject = new BehaviorSubject(this.userPreferenceStatus); + this.onChange = this.onChangeSubject.asObservable(); + this.appConfig.onLoad.subscribe(() => { this.initUserPreferenceStatus(); }); - - this.onChangeSubject = new BehaviorSubject(this.userPreferenceStatus); - this.onChange = this.onChangeSubject.asObservable(); } private initUserPreferenceStatus() { diff --git a/lib/core/src/lib/testing/core.testing.module.ts b/lib/core/src/lib/testing/core.testing.module.ts index 15c8884ad87..721f821aa3a 100644 --- a/lib/core/src/lib/testing/core.testing.module.ts +++ b/lib/core/src/lib/testing/core.testing.module.ts @@ -31,6 +31,7 @@ import { HttpClientModule } from '@angular/common/http'; import { directionalityConfigFactory } from '../common/services/directionality-config-factory'; import { DirectionalityConfigService } from '../common/services/directionality-config.service'; import { AuthModule } from '../auth'; +import { UserPreferencesService } from '../common/services/user-preferences.service'; @NgModule({ imports: [ @@ -43,6 +44,7 @@ import { AuthModule } from '../auth'; ], providers: [ DatePipe, + UserPreferencesService, { provide: AppConfigService, useClass: AppConfigServiceMock }, { provide: TranslationService, useClass: TranslationMock }, { provide: CookieService, useClass: CookieServiceMock }, diff --git a/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.ts b/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.ts index 347f7974edb..5614aa89471 100644 --- a/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.ts +++ b/lib/process-services-cloud/src/lib/task/task-list/components/task-list-cloud.component.ts @@ -158,13 +158,14 @@ export class TaskListCloudComponent extends BaseTaskListCloudComponent isLoadingPreferences || isReloading) ); - constructor(@Inject(TASK_LIST_CLOUD_TOKEN) public taskListCloudService: TaskListCloudServiceInterface, - appConfigService: AppConfigService, - taskCloudService: TaskCloudService, - userPreferences: UserPreferencesService, - @Inject(TASK_LIST_PREFERENCES_SERVICE_TOKEN) cloudPreferenceService: PreferenceCloudServiceInterface, - private viewModelCreator: VariableMapperService - ) { + constructor( + @Inject(TASK_LIST_CLOUD_TOKEN) public taskListCloudService: TaskListCloudServiceInterface, + appConfigService: AppConfigService, + taskCloudService: TaskCloudService, + userPreferences: UserPreferencesService, + @Inject(TASK_LIST_PREFERENCES_SERVICE_TOKEN) cloudPreferenceService: PreferenceCloudServiceInterface, + private viewModelCreator: VariableMapperService + ) { super(appConfigService, taskCloudService, userPreferences, PRESET_KEY, cloudPreferenceService); }