From 9fef05b69f9a502a46463be3c3bbae5865512326 Mon Sep 17 00:00:00 2001 From: Cilibiu Bogdan Date: Fri, 31 May 2019 13:30:11 +0300 Subject: [PATCH] 3.3.0 alpha update (#1118) * alpha * locale --- package-lock.json | 59 +++++++------------ package.json | 6 +- src/app.config.json | 1 + .../app-layout/app-layout.component.html | 1 - .../app-layout/app-layout.component.spec.ts | 39 ------------ .../layout/app-layout/app-layout.component.ts | 24 +------- 6 files changed, 25 insertions(+), 105 deletions(-) diff --git a/package-lock.json b/package-lock.json index 8ac16f9ed..ad1b180cb 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,25 +5,25 @@ "requires": true, "dependencies": { "@alfresco/adf-content-services": { - "version": "3.3.0-4a363c731be09d8213e25cd149bee302ebcbeb82", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.3.0-4a363c731be09d8213e25cd149bee302ebcbeb82.tgz", - "integrity": "sha512-G4zvUwzVDm5YAK4/eo/U8tMA7osIU5axBhc1JGxRyWR3jcd1E6tVeHDQP+i4X9cQWdYF6fvSOYNS4qqapk8JAg==", + "version": "3.3.0-9aafb804830cba52f2a92e0a14549f6b41fcaa92", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.3.0-9aafb804830cba52f2a92e0a14549f6b41fcaa92.tgz", + "integrity": "sha512-tc7uNSbzWimRqRb6dbUMZ+tIWsD4yRs/FHNYUzR5JBs+PNX6zcLytl3cj68C4qbo95hAb1svYJt8vJ1h1Tv8IA==", "requires": { "tslib": "^1.9.0" } }, "@alfresco/adf-core": { - "version": "3.3.0-4a363c731be09d8213e25cd149bee302ebcbeb82", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.3.0-4a363c731be09d8213e25cd149bee302ebcbeb82.tgz", - "integrity": "sha512-7SEJLDr23/JgZDZaw4aD6FDgvnOIfQ5SIh/qJUdhxyD1eC852qpm/OlNRg4zqJ+6so8pvvOqEEqrDgFJvr1OWg==", + "version": "3.3.0-9aafb804830cba52f2a92e0a14549f6b41fcaa92", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.3.0-9aafb804830cba52f2a92e0a14549f6b41fcaa92.tgz", + "integrity": "sha512-uVCzyoRwX0Oha8qifVpjxExNuY1mBEAkgpgDh/rRZshtsJQ3r2iSkx6o9JV9ZACRP1i5ct0KHJkcOxB0o+f36A==", "requires": { "tslib": "^1.9.0" } }, "@alfresco/adf-extensions": { - "version": "3.3.0-4a363c731be09d8213e25cd149bee302ebcbeb82", - "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.3.0-4a363c731be09d8213e25cd149bee302ebcbeb82.tgz", - "integrity": "sha512-l8VIc3Zg0Nr1mJUGbeC+9oPUdBAtqg5f4NUNedb8vSMumYAyK/p8DvZdEERHPXxRCfrxxGuYvDwxu1IlcZkCZg==", + "version": "3.3.0-9aafb804830cba52f2a92e0a14549f6b41fcaa92", + "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.3.0-9aafb804830cba52f2a92e0a14549f6b41fcaa92.tgz", + "integrity": "sha512-8dAUsEfENFQsDRlFveuvw6XsfxTCX8aYPlvE1Mo24HjFvc6wRU98+m1hso4aJWZo194W4otjtj7IEvRWnTovwA==", "requires": { "tslib": "^1.9.0" } @@ -5107,8 +5107,7 @@ "ansi-regex": { "version": "2.1.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "aproba": { "version": "1.2.0", @@ -5129,14 +5128,12 @@ "balanced-match": { "version": "1.0.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "brace-expansion": { "version": "1.1.11", "bundled": true, "dev": true, - "optional": true, "requires": { "balanced-match": "^1.0.0", "concat-map": "0.0.1" @@ -5151,20 +5148,17 @@ "code-point-at": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "concat-map": { "version": "0.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "console-control-strings": { "version": "1.1.0", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "core-util-is": { "version": "1.0.2", @@ -5281,8 +5275,7 @@ "inherits": { "version": "2.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "ini": { "version": "1.3.5", @@ -5294,7 +5287,6 @@ "version": "1.0.0", "bundled": true, "dev": true, - "optional": true, "requires": { "number-is-nan": "^1.0.0" } @@ -5309,7 +5301,6 @@ "version": "3.0.4", "bundled": true, "dev": true, - "optional": true, "requires": { "brace-expansion": "^1.1.7" } @@ -5317,14 +5308,12 @@ "minimist": { "version": "0.0.8", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "minipass": { "version": "2.3.5", "bundled": true, "dev": true, - "optional": true, "requires": { "safe-buffer": "^5.1.2", "yallist": "^3.0.0" @@ -5343,7 +5332,6 @@ "version": "0.5.1", "bundled": true, "dev": true, - "optional": true, "requires": { "minimist": "0.0.8" } @@ -5424,8 +5412,7 @@ "number-is-nan": { "version": "1.0.1", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "object-assign": { "version": "4.1.1", @@ -5437,7 +5424,6 @@ "version": "1.4.0", "bundled": true, "dev": true, - "optional": true, "requires": { "wrappy": "1" } @@ -5523,8 +5509,7 @@ "safe-buffer": { "version": "5.1.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "safer-buffer": { "version": "2.1.2", @@ -5560,7 +5545,6 @@ "version": "1.0.2", "bundled": true, "dev": true, - "optional": true, "requires": { "code-point-at": "^1.0.0", "is-fullwidth-code-point": "^1.0.0", @@ -5580,7 +5564,6 @@ "version": "3.0.1", "bundled": true, "dev": true, - "optional": true, "requires": { "ansi-regex": "^2.0.0" } @@ -5624,14 +5607,12 @@ "wrappy": { "version": "1.0.2", "bundled": true, - "dev": true, - "optional": true + "dev": true }, "yallist": { "version": "3.0.3", "bundled": true, - "dev": true, - "optional": true + "dev": true } } }, diff --git a/package.json b/package.json index e3827bcbf..acb9225cf 100644 --- a/package.json +++ b/package.json @@ -37,9 +37,9 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "3.3.0-4a363c731be09d8213e25cd149bee302ebcbeb82", - "@alfresco/adf-core": "3.3.0-4a363c731be09d8213e25cd149bee302ebcbeb82", - "@alfresco/adf-extensions": "3.3.0-4a363c731be09d8213e25cd149bee302ebcbeb82", + "@alfresco/adf-content-services": "3.3.0-9aafb804830cba52f2a92e0a14549f6b41fcaa92", + "@alfresco/adf-core": "3.3.0-9aafb804830cba52f2a92e0a14549f6b41fcaa92", + "@alfresco/adf-extensions": "3.3.0-9aafb804830cba52f2a92e0a14549f6b41fcaa92", "@alfresco/js-api": "3.2.1", "@angular/animations": "7.2.15", "@angular/cdk": "^7.3.7", diff --git a/src/app.config.json b/src/app.config.json index 59c704c40..b83f7b721 100644 --- a/src/app.config.json +++ b/src/app.config.json @@ -15,6 +15,7 @@ "redirectUri": "/", "redirectUriLogout": "/logout" }, + "locale": "en", "application": { "name": "Alfresco Content Application", "logo": "assets/images/alfresco-logo-flower.svg", diff --git a/src/app/components/layout/app-layout/app-layout.component.html b/src/app/components/layout/app-layout/app-layout.component.html index 953955e94..b114dc453 100644 --- a/src/app/components/layout/app-layout/app-layout.component.html +++ b/src/app/components/layout/app-layout/app-layout.component.html @@ -7,7 +7,6 @@ [hideSidenav]="hideSidenav" [expandedSidenav]="expandedSidenav" (expanded)="onExpanded($event)" - [direction]="direction" > diff --git a/src/app/components/layout/app-layout/app-layout.component.spec.ts b/src/app/components/layout/app-layout/app-layout.component.spec.ts index d4bb05759..95398bf0a 100644 --- a/src/app/components/layout/app-layout/app-layout.component.spec.ts +++ b/src/app/components/layout/app-layout/app-layout.component.spec.ts @@ -195,43 +195,4 @@ describe('AppLayoutComponent', () => { expect(component.layout.container.toggleMenu).toHaveBeenCalled(); }); - - it('should set direction `ltr` if no direction declared', () => { - appConfig.config.languages = [ - { - key: 'en' - } - ]; - - spyOn(userPreference, 'get').and.callFake(key => { - if (key === 'locale') { - return 'en'; - } - }); - - const spy = spyOn(userPreference, 'set'); - fixture.detectChanges(); - - expect(spy.calls.mostRecent().args).toEqual(['textOrientation', 'ltr']); - }); - - it('should set direction `rtl` based on locale language direction', () => { - appConfig.config.languages = [ - { - key: 'en', - direction: 'rtl' - } - ]; - - spyOn(userPreference, 'get').and.callFake(key => { - if (key === 'locale') { - return 'en'; - } - }); - - const spy = spyOn(userPreference, 'set'); - fixture.detectChanges(); - - expect(spy.calls.mostRecent().args).toEqual(['textOrientation', 'rtl']); - }); }); diff --git a/src/app/components/layout/app-layout/app-layout.component.ts b/src/app/components/layout/app-layout/app-layout.component.ts index 7e1127a42..103defa4a 100644 --- a/src/app/components/layout/app-layout/app-layout.component.ts +++ b/src/app/components/layout/app-layout/app-layout.component.ts @@ -26,9 +26,7 @@ import { AppConfigService, SidenavLayoutComponent, - UserPreferencesService, - LanguageItem, - AppConfigValues + UserPreferencesService } from '@alfresco/adf-core'; import { Component, @@ -151,18 +149,6 @@ export class AppLayoutComponent implements OnInit, OnDestroy { takeUntil(this.onDestroy$) ) .subscribe(() => this.store.dispatch(new SetSelectedNodesAction([]))); - - this.userPreferenceService - .select('textOrientation') - .subscribe((textOrientation: Directionality) => { - this.direction = textOrientation; - }); - - this.userPreferenceService.set( - 'textOrientation', - this.getCurrentLanguage(this.userPreferenceService.get('locale')) - .direction || 'ltr' - ); } ngOnDestroy() { @@ -221,12 +207,4 @@ export class AppLayoutComponent implements OnInit, OnDestroy { return expand; } - - private getCurrentLanguage(key: string): LanguageItem { - return ( - this.appConfigService - .get>(AppConfigValues.APP_CONFIG_LANGUAGES_KEY) - .find(language => language.key === key) || {} - ); - } }