[ADF-2316] upgrade ngx-translate (#2956)

* upgrade ngx-translate

* add missing export

* add missing export

* Update test-e2e-bc.sh

* rxjs fixes

* increase timeout test

* lettable operator translate

demo-shell/package.json

@@ -81,7 +81,7 @@
     "@angular/router": "5.1.1",
     "@mat-datetimepicker/core": "^1.0.1",
     "@mat-datetimepicker/moment": "^1.0.1",
-    "@ngx-translate/core": "8.0.0",
+    "@ngx-translate/core": "9.1.1",
     "alfresco-js-api": "2.1.0",
     "chart.js": "2.5.0",
     "classlist.js": "1.1.20150312",

integration/base_ver_2_app/protractor.conf.js

@@ -4,7 +4,8 @@
 const { SpecReporter } = require('jasmine-spec-reporter');
 
 exports.config = {
-  allScriptsTimeout: 11000,
+  allScriptsTimeout: 40000,
+  getPageTimeout: 40000,
   specs: [
     './e2e/**/*.e2e-spec.ts'
   ],

lib/content-services/content-node-selector/content-node-selector.module.ts

@@ -48,7 +48,9 @@ import { NameLocationCellComponent } from './name-location-cell/name-location-ce
         PaginationModule
     ],
     exports: [
-        ContentNodeSelectorPanelComponent, ContentNodeSelectorComponent
+        ContentNodeSelectorPanelComponent,
+        NameLocationCellComponent,
+        ContentNodeSelectorComponent
     ],
     entryComponents: [
         ContentNodeSelectorPanelComponent, ContentNodeSelectorComponent

lib/content-services/content-node-selector/public-api.ts

@@ -15,6 +15,7 @@
  * limitations under the License.
  */
 
+export * from './name-location-cell/name-location-cell.component';
 export * from './content-node-selector.component-data.interface';
 export * from './content-node-selector-panel.component';
 export * from './content-node-selector.component';

lib/content-services/package.json

@@ -25,7 +25,7 @@
     "@angular/platform-browser": "5.1.1",
     "@angular/platform-browser-dynamic": "5.1.1",
     "@angular/router": "5.1.1",
-    "@ngx-translate/core": "8.0.0",
+    "@ngx-translate/core": "9.1.1",
     "alfresco-js-api": "2.1.0",
     "@alfresco/adf-core": "2.1.0",
     "chart.js": "2.5.0",

lib/core/core.module.ts

@@ -20,7 +20,6 @@ import { HttpClient, HttpClientModule } from '@angular/common/http';
 import { NgModule, ModuleWithProviders } from '@angular/core';
 import { FormsModule, ReactiveFormsModule } from '@angular/forms';
 import { TranslateModule, TranslateLoader } from '@ngx-translate/core';
-import { TranslateStore } from '@ngx-translate/core/src/translate.store';
 
 import { MaterialModule } from './material.module';
 import { AppConfigModule } from './app-config/app-config.module';
@@ -206,7 +205,6 @@ export class CoreModule {
                         source: 'assets/adf-core'
                     }
                 },
-                TranslateStore,
                 ...providers()
             ]
         };

lib/core/package.json

@@ -25,7 +25,7 @@
     "@angular/platform-browser": "5.1.1",
     "@angular/platform-browser-dynamic": "5.1.1",
     "@angular/router": "5.1.1",
-    "@ngx-translate/core": "8.0.0",
+    "@ngx-translate/core": "9.1.1",
     "alfresco-js-api": "2.1.0",
     "chart.js": "2.5.0",
     "core-js": "2.4.1",

lib/core/services/translate-loader.service.ts

@@ -23,6 +23,7 @@ import { Observable } from 'rxjs/Observable';
 import { ComponentTranslationModel } from '../models/component.model';
 import { ObjectUtils } from '../utils/object-utils';
 import { LogService } from './log.service';
+import { map } from 'rxjs/operators'
 import 'rxjs/observable/forkJoin';
 import 'rxjs/add/observable/forkJoin';
 
@@ -63,10 +64,9 @@ export class TranslateLoaderService implements TranslateLoader {
                 const loader = Observable.create(observer => {
                     const translationUrl = `${component.path}/${this.prefix}/${lang}${this.suffix}?v=${Date.now()}`;
 
-                    this.http.get(translationUrl)
+                    this.http.get(translationUrl).pipe(map((res: Response) => {
-                        .map((res: Response) => {
                         component.json[lang] = res;
-                        }).subscribe((result) => {
+                    })).subscribe((result) => {
                         observer.next(result);
                         observer.complete();
                     }, () => {

lib/insights/package.json

@@ -25,7 +25,7 @@
     "@angular/platform-browser": "5.1.1",
     "@angular/platform-browser-dynamic": "5.1.1",
     "@angular/router": "5.1.1",
-    "@ngx-translate/core": "8.0.0",
+    "@ngx-translate/core": "9.1.1",
     "alfresco-js-api": "2.1.0",
     "@alfresco/adf-core": "2.1.0",
     "chart.js": "2.5.0",

lib/package.json

@@ -70,7 +70,7 @@
     "@angular/router": "5.1.1",
     "@mat-datetimepicker/core": "^1.0.1",
     "@mat-datetimepicker/moment": "^1.0.1",
-    "@ngx-translate/core": "8.0.0",
+    "@ngx-translate/core": "9.1.1",
     "alfresco-js-api": "2.1.0",
     "chart.js": "2.5.0",
     "core-js": "2.4.1",

lib/process-services/package.json

@@ -25,7 +25,7 @@
     "@angular/platform-browser": "5.1.1",
     "@angular/platform-browser-dynamic": "5.1.1",
     "@angular/router": "5.1.1",
-    "@ngx-translate/core": "8.0.0",
+    "@ngx-translate/core": "9.1.1",
     "alfresco-js-api": "2.1.0",
     "@alfresco/adf-core": "2.1.0",
     "@alfresco/adf-process-services": "2.1.0",

scripts/test-e2e-bc.sh

@@ -7,6 +7,7 @@ cd "$DIR/../integration/base_ver_2_app"
 ADF_VERSION=$(npm view @alfresco/adf-core version)
 ANGULAR_VERSION="5.1.1"
 MATERIAL_VERSION="5.0.1"
+NGX_TRANSLATE_VERSION="9.1.1"
 
 npm install
 
@@ -19,5 +20,6 @@ npm install --save-exact --save-dev @angular-devkit/core@0.0.28 @angular/compile
 npm install --save  @mat-datetimepicker/core @mat-datetimepicker/moment
 npm install --save-exact --save  @angular/animations@${ANGULAR_VERSION} @angular/common@${ANGULAR_VERSION}  @angular/compiler@${ANGULAR_VERSION} @angular/core@${ANGULAR_VERSION}  @angular/platform-browser@${ANGULAR_VERSION} @angular/router@${ANGULAR_VERSION} @angular/flex-layout@2.0.0-beta.12  @angular/forms@${ANGULAR_VERSION} @angular/forms@${ANGULAR_VERSION} @angular/http@${ANGULAR_VERSION}  @angular/platform-browser-dynamic@${ANGULAR_VERSION}
 npm install --save-exact --save @angular/cdk@${MATERIAL_VERSION} @angular/material@${MATERIAL_VERSION}
+npm install --save-exact --save @ngx-translate/core@${NGX_TRANSLATE_VERSION}
 
 npm run e2e