remove

demo-shell/src/app/components/app-layout/app-layout.component.ts

@@ -16,7 +16,7 @@
  */
 
 import { Component, ViewEncapsulation } from '@angular/core';
-import { AlfrescoApiService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 
 @Component({
     templateUrl: './app-layout.component.html',

demo-shell/src/app/components/form/fake-tak-form.service.ts

@@ -21,7 +21,8 @@ import { Injectable } from '@angular/core';
 import {
     TaskFormService
 } from '@alfresco/adf-process-services';
-import { AlfrescoApiService, LogService } from '@alfresco/adf-core';
+import { LogService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 
 @Injectable()
 export class FakeTaskFormService extends TaskFormService {

demo-shell/src/app/components/process-service/process-attachments.component.ts

@@ -22,8 +22,8 @@ import {
     ProcessService,
     ProcessUploadService
 } from '@alfresco/adf-process-services';
-import { AlfrescoApiService, AppConfigService } from '@alfresco/adf-core';
-import { DiscoveryApiService, UploadService } from '@alfresco/adf-content-services';
+import { AppConfigService } from '@alfresco/adf-core';
+import { AlfrescoApiService, DiscoveryApiService, UploadService } from '@alfresco/adf-content-services';
 import { PreviewService } from '../../services/preview.service';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';

demo-shell/src/app/components/process-service/process-service.component.ts

@@ -36,8 +36,9 @@ import {
 } from '@alfresco/js-api';
 import {
     FORM_FIELD_VALIDATORS, FormRenderingService, FormService, AppConfigService, PaginationComponent, UserPreferenceValues,
-    AlfrescoApiService, UserPreferencesService, LogService, DataCellEvent, NotificationService
+    UserPreferencesService, LogService, DataCellEvent, NotificationService
 } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import {
     ProcessFiltersComponent,
     ProcessInstance,

demo-shell/src/app/components/process-service/task-attachments.component.ts

@@ -22,8 +22,8 @@ import {
     TaskListService,
     TaskUploadService
 } from '@alfresco/adf-process-services';
-import { AlfrescoApiService, AppConfigService } from '@alfresco/adf-core';
-import { DiscoveryApiService, UploadService } from '@alfresco/adf-content-services';
+import { AppConfigService } from '@alfresco/adf-core';
+import { AlfrescoApiService, DiscoveryApiService, UploadService } from '@alfresco/adf-content-services';
 import { PreviewService } from '../../services/preview.service';
 import { Subject } from 'rxjs';
 import { takeUntil } from 'rxjs/operators';

demo-shell/src/app/components/settings/host-settings.component.ts

@@ -17,7 +17,8 @@
 
 import { Component, EventEmitter, Output, ViewEncapsulation, OnInit, Input } from '@angular/core';
 import { Validators, UntypedFormGroup, UntypedFormBuilder, UntypedFormControl } from '@angular/forms';
-import { AppConfigService, AppConfigValues, StorageService, AlfrescoApiService, AuthenticationService } from '@alfresco/adf-core';
+import { AppConfigService, AppConfigValues, StorageService, AuthenticationService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { ENTER } from '@angular/cdk/keycodes';
 import { MAT_FORM_FIELD_DEFAULT_OPTIONS } from '@angular/material/form-field';
 

demo-shell/src/app/services/app-notifications.service.ts

@@ -20,9 +20,9 @@ import {
     AppConfigService,
     NotificationService,
     NotificationModel,
-    AlfrescoApiService,
     IdentityUserService
 } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '@alfresco/adf-content-services';
 import { NotificationCloudService } from '@alfresco/adf-process-services-cloud';
 import { Injectable } from '@angular/core';
 import { TranslateService } from '@ngx-translate/core';

lib/content-services/src/lib/aspect-list/services/aspect-list.service.ts

@@ -16,7 +16,8 @@
  */
 
 import { Injectable } from '@angular/core';
-import { AlfrescoApiService, AppConfigService, LogService } from '@alfresco/adf-core';
+import { AppConfigService, LogService } from '@alfresco/adf-core';
+import { AlfrescoApiService } from '../../services/alfresco-api.service';
 import { from, Observable, of, zip } from 'rxjs';
 import { catchError, map } from 'rxjs/operators';
 import { AspectEntry, AspectPaging, AspectsApi } from '@alfresco/js-api';

lib/content-services/src/public-api.ts

@@ -47,5 +47,6 @@ export * from './lib/category/index';
 export * from './lib/viewer/index';
 export * from './lib/security/index';
 export * from './lib/api-factories/index';
+export * from './lib/services/alfresco-api.service';
 
 export * from './lib/content.module';

lib/core/src/lib/app-config/app-config.loader.ts

@@ -19,7 +19,9 @@ import { AppConfigService, AppConfigValues } from './app-config.service';
 import { StorageService } from '../common/services/storage.service';
 import { AdfHttpClient } from '@alfresco/adf-core/api';
 
-export function loadAppConfig(appConfigService: AppConfigService, storageService: StorageService, adfHttpClient: AdfHttpClient) {
+export function loadAppConfig(appConfigService: AppConfigService,
+                              storageService: StorageService,
+                              adfHttpClient: AdfHttpClient) {
 
     const init = () => {
         adfHttpClient.disableCsrf = appConfigService.get<boolean>(AppConfigValues.DISABLECSRF, true);

lib/core/src/lib/common/services/user-preferences.service.spec.ts

@@ -160,14 +160,17 @@ describe('UserPreferencesService', () => {
         });
     });
 
-    describe('with language config', () => {
-        it('should store default textOrientation based on language', () => {
+    fdescribe('with language config', () => {
+        fit('should store default textOrientation based on language', () => {
             appConfig.config.languages = [
                 {
                     key: 'fake-locale-config'
                 }
             ];
+
             appConfig.config.locale = 'fake-locale-config';
+            appConfig.load();
+
             const textOrientation = preferences.getPropertyKey('textOrientation');
             expect(storage.getItem(textOrientation)).toBe('ltr');
         });
@@ -180,6 +183,8 @@ describe('UserPreferencesService', () => {
                 }
             ];
             appConfig.config.locale = 'fake-locale-config';
+            appConfig.load();
+
             const textOrientation = preferences.getPropertyKey('textOrientation');
             expect(storage.getItem(textOrientation)).toBe('rtl');
         });

lib/core/src/lib/common/services/user-preferences.service.ts

@@ -50,8 +50,8 @@ export class UserPreferencesService {
     constructor(public translate: TranslateService,
                 private appConfig: AppConfigService,
                 private storage: StorageService) {
-        this.appConfig.onLoad
-            .subscribe(() => {
+        this.appConfig.onLoad.subscribe(() => {
+                console.log('init');
                 this.initUserPreferenceStatus();
             });
         this.onChangeSubject = new BehaviorSubject(this.userPreferenceStatus);
@@ -65,12 +65,20 @@ export class UserPreferencesService {
     }
 
     private initUserLanguage() {
+        console.log('locale', this.locale);
+        console.log('loc',  this.appConfig.config);
+        console.log('locale 2',  this.appConfig.get<string>(UserPreferenceValues.Locale));
+
         if (this.locale || this.appConfig.get<string>(UserPreferenceValues.Locale)) {
+            console.log('b');
+
             const locale = this.locale || this.getDefaultLocale();
 
             this.set(UserPreferenceValues.Locale, locale);
             this.set('textOrientation', this.getLanguageByKey(locale).direction || 'ltr');
         } else {
+            console.log('a');
+
             const locale = this.locale || this.getDefaultLocale();
 
             this.setWithoutStore(UserPreferenceValues.Locale, locale);