inteligr8/alfresco-content-app
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-content-app.git synced 2025-10-01 14:41:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

3.3.0 alpha update (#1118)

Browse Source 
* alpha

* locale
This commit is contained in:
Cilibiu Bogdan
2019-05-31 13:30:11 +03:00
committed by Suzana Dirla
parent 14adbad1a9
commit 9fef05b69f
6 changed files with 25 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
package-lock.json generated
View File

@@ -5,25 +5,25 @@
"requires": true, "requires": true,
"dependencies": { "dependencies": {
"@alfresco/adf-content-services": { "@alfresco/adf-content-services": {
"version": "3.3.0-4a363c731be09d8213e25cd149bee302ebcbeb82", "version": "3.3.0-9aafb804830cba52f2a92e0a14549f6b41fcaa92",
"resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.3.0-4a363c731be09d8213e25cd149bee302ebcbeb82.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-3.3.0-9aafb804830cba52f2a92e0a14549f6b41fcaa92.tgz",
"integrity": "sha512-G4zvUwzVDm5YAK4/eo/U8tMA7osIU5axBhc1JGxRyWR3jcd1E6tVeHDQP+i4X9cQWdYF6fvSOYNS4qqapk8JAg==", "integrity": "sha512-tc7uNSbzWimRqRb6dbUMZ+tIWsD4yRs/FHNYUzR5JBs+PNX6zcLytl3cj68C4qbo95hAb1svYJt8vJ1h1Tv8IA==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }
}, },
"@alfresco/adf-core": { "@alfresco/adf-core": {
"version": "3.3.0-4a363c731be09d8213e25cd149bee302ebcbeb82", "version": "3.3.0-9aafb804830cba52f2a92e0a14549f6b41fcaa92",
"resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.3.0-4a363c731be09d8213e25cd149bee302ebcbeb82.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-3.3.0-9aafb804830cba52f2a92e0a14549f6b41fcaa92.tgz",
"integrity": "sha512-7SEJLDr23/JgZDZaw4aD6FDgvnOIfQ5SIh/qJUdhxyD1eC852qpm/OlNRg4zqJ+6so8pvvOqEEqrDgFJvr1OWg==", "integrity": "sha512-uVCzyoRwX0Oha8qifVpjxExNuY1mBEAkgpgDh/rRZshtsJQ3r2iSkx6o9JV9ZACRP1i5ct0KHJkcOxB0o+f36A==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }
}, },
"@alfresco/adf-extensions": { "@alfresco/adf-extensions": {
"version": "3.3.0-4a363c731be09d8213e25cd149bee302ebcbeb82", "version": "3.3.0-9aafb804830cba52f2a92e0a14549f6b41fcaa92",
"resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.3.0-4a363c731be09d8213e25cd149bee302ebcbeb82.tgz", "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-3.3.0-9aafb804830cba52f2a92e0a14549f6b41fcaa92.tgz",
"integrity": "sha512-l8VIc3Zg0Nr1mJUGbeC+9oPUdBAtqg5f4NUNedb8vSMumYAyK/p8DvZdEERHPXxRCfrxxGuYvDwxu1IlcZkCZg==", "integrity": "sha512-8dAUsEfENFQsDRlFveuvw6XsfxTCX8aYPlvE1Mo24HjFvc6wRU98+m1hso4aJWZo194W4otjtj7IEvRWnTovwA==",
"requires": { "requires": {
"tslib": "^1.9.0" "tslib": "^1.9.0"
} }
@@ -5107,8 +5107,7 @@
"ansi-regex": { "ansi-regex": {
"version": "2.1.1", "version": "2.1.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"aproba": { "aproba": {
"version": "1.2.0", "version": "1.2.0",
@@ -5129,14 +5128,12 @@
"balanced-match": { "balanced-match": {
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"brace-expansion": { "brace-expansion": {
"version": "1.1.11", "version": "1.1.11",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"balanced-match": "^1.0.0", "balanced-match": "^1.0.0",
"concat-map": "0.0.1" "concat-map": "0.0.1"
@@ -5151,20 +5148,17 @@
"code-point-at": { "code-point-at": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"concat-map": { "concat-map": {
"version": "0.0.1", "version": "0.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"console-control-strings": { "console-control-strings": {
"version": "1.1.0", "version": "1.1.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"core-util-is": { "core-util-is": {
"version": "1.0.2", "version": "1.0.2",
@@ -5281,8 +5275,7 @@
"inherits": { "inherits": {
"version": "2.0.3", "version": "2.0.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"ini": { "ini": {
"version": "1.3.5", "version": "1.3.5",
@@ -5294,7 +5287,6 @@
"version": "1.0.0", "version": "1.0.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"number-is-nan": "^1.0.0" "number-is-nan": "^1.0.0"
} }
@@ -5309,7 +5301,6 @@
"version": "3.0.4", "version": "3.0.4",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"brace-expansion": "^1.1.7" "brace-expansion": "^1.1.7"
} }
@@ -5317,14 +5308,12 @@
"minimist": { "minimist": {
"version": "0.0.8", "version": "0.0.8",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"minipass": { "minipass": {
"version": "2.3.5", "version": "2.3.5",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"safe-buffer": "^5.1.2", "safe-buffer": "^5.1.2",
"yallist": "^3.0.0" "yallist": "^3.0.0"
@@ -5343,7 +5332,6 @@
"version": "0.5.1", "version": "0.5.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"minimist": "0.0.8" "minimist": "0.0.8"
} }
@@ -5424,8 +5412,7 @@
"number-is-nan": { "number-is-nan": {
"version": "1.0.1", "version": "1.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"object-assign": { "object-assign": {
"version": "4.1.1", "version": "4.1.1",
@@ -5437,7 +5424,6 @@
"version": "1.4.0", "version": "1.4.0",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"wrappy": "1" "wrappy": "1"
} }
@@ -5523,8 +5509,7 @@
"safe-buffer": { "safe-buffer": {
"version": "5.1.2", "version": "5.1.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"safer-buffer": { "safer-buffer": {
"version": "2.1.2", "version": "2.1.2",
@@ -5560,7 +5545,6 @@
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"code-point-at": "^1.0.0", "code-point-at": "^1.0.0",
"is-fullwidth-code-point": "^1.0.0", "is-fullwidth-code-point": "^1.0.0",
@@ -5580,7 +5564,6 @@
"version": "3.0.1", "version": "3.0.1",
"bundled": true, "bundled": true,
"dev": true, "dev": true,
"optional": true,
"requires": { "requires": {
"ansi-regex": "^2.0.0" "ansi-regex": "^2.0.0"
} }
@@ -5624,14 +5607,12 @@
"wrappy": { "wrappy": {
"version": "1.0.2", "version": "1.0.2",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
}, },
"yallist": { "yallist": {
"version": "3.0.3", "version": "3.0.3",
"bundled": true, "bundled": true,
"dev": true, "dev": true
"optional": true
} }
} }
}, },

6
package.json
View File

@@ -37,9 +37,9 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@alfresco/adf-content-services": "3.3.0-4a363c731be09d8213e25cd149bee302ebcbeb82", "@alfresco/adf-content-services": "3.3.0-9aafb804830cba52f2a92e0a14549f6b41fcaa92",
"@alfresco/adf-core": "3.3.0-4a363c731be09d8213e25cd149bee302ebcbeb82", "@alfresco/adf-core": "3.3.0-9aafb804830cba52f2a92e0a14549f6b41fcaa92",
"@alfresco/adf-extensions": "3.3.0-4a363c731be09d8213e25cd149bee302ebcbeb82", "@alfresco/adf-extensions": "3.3.0-9aafb804830cba52f2a92e0a14549f6b41fcaa92",
"@alfresco/js-api": "3.2.1", "@alfresco/js-api": "3.2.1",
"@angular/animations": "7.2.15", "@angular/animations": "7.2.15",
"@angular/cdk": "^7.3.7", "@angular/cdk": "^7.3.7",

1
src/app.config.json
View File

@@ -15,6 +15,7 @@
"redirectUri": "/", "redirectUri": "/",
"redirectUriLogout": "/logout" "redirectUriLogout": "/logout"
}, },
"locale": "en",
"application": { "application": {
"name": "Alfresco Content Application", "name": "Alfresco Content Application",
"logo": "assets/images/alfresco-logo-flower.svg", "logo": "assets/images/alfresco-logo-flower.svg",

1
src/app/components/layout/app-layout/app-layout.component.html
View File

@@ -7,7 +7,6 @@
[hideSidenav]="hideSidenav" [hideSidenav]="hideSidenav"
[expandedSidenav]="expandedSidenav" [expandedSidenav]="expandedSidenav"
(expanded)="onExpanded($event)" (expanded)="onExpanded($event)"
[direction]="direction"
> >
<adf-sidenav-layout-header> <adf-sidenav-layout-header>
<ng-template> <ng-template>

39
src/app/components/layout/app-layout/app-layout.component.spec.ts
View File

@@ -195,43 +195,4 @@ describe('AppLayoutComponent', () => {
expect(component.layout.container.toggleMenu).toHaveBeenCalled(); 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']);
});
}); });

24
src/app/components/layout/app-layout/app-layout.component.ts
View File

@@ -26,9 +26,7 @@
import { import {
AppConfigService, AppConfigService,
SidenavLayoutComponent, SidenavLayoutComponent,
UserPreferencesService, UserPreferencesService
LanguageItem,
AppConfigValues
} from '@alfresco/adf-core'; } from '@alfresco/adf-core';
import { import {
Component, Component,
@@ -151,18 +149,6 @@ export class AppLayoutComponent implements OnInit, OnDestroy {
takeUntil(this.onDestroy$) takeUntil(this.onDestroy$)
) )
.subscribe(() => this.store.dispatch(new SetSelectedNodesAction([]))); .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() { ngOnDestroy() {
@@ -221,12 +207,4 @@ export class AppLayoutComponent implements OnInit, OnDestroy {
return expand; return expand;
} }
private getCurrentLanguage(key: string): LanguageItem {
return (
this.appConfigService
.get<Array<LanguageItem>>(AppConfigValues.APP_CONFIG_LANGUAGES_KEY)
.find(language => language.key === key) || <LanguageItem>{}
);
}
} }