From 90215350a1a41f845b730c2b3019385941425543 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Fri, 15 Jun 2018 19:13:04 +0100 Subject: [PATCH] update to latest ADF 2.4.0 alpha (#423) * update to latest ADF 2.4.0 alpha * update app config * fix routing --- package-lock.json | 36 +++++++++---------- package.json | 6 ++-- src/app.config.json | 2 ++ src/app/components/search/search.component.ts | 3 +- src/app/store/effects/router.effects.ts | 4 ++- 5 files changed, 28 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index 56bb8c792..4aaf70d36 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,11 +5,11 @@ "requires": true, "dependencies": { "@alfresco/adf-content-services": { - "version": "2.4.0-d152c367aa039ce18bb0e009306f761ead190674", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-2.4.0-d152c367aa039ce18bb0e009306f761ead190674.tgz", - "integrity": "sha512-v4mksZCPOzJu7yg2WhRc3z2u6tGHssgwII1mCuHdLkjNNNRYqwc906xYvw8sAsCr0hysDoUw2PZBmwZbt+O7CA==", + "version": "2.4.0-052668fddc2827b87055e37b43516500a348f9d8", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-2.4.0-052668fddc2827b87055e37b43516500a348f9d8.tgz", + "integrity": "sha512-wAIxDwNWZWAhkJ5lQKUkEISlIUA/8YTVuVx8DlMmGQYp9xTK4xqAVVV/eQ0AV9xsfxK23driAlzk6HageZYhHQ==", "requires": { - "@alfresco/adf-core": "2.4.0-d152c367aa039ce18bb0e009306f761ead190674", + "@alfresco/adf-core": "2.4.0-052668fddc2827b87055e37b43516500a348f9d8", "@angular/animations": "5.1.1", "@angular/cdk": "5.0.1", "@angular/common": "5.1.1", @@ -24,7 +24,7 @@ "@angular/platform-browser-dynamic": "5.1.1", "@angular/router": "5.1.1", "@ngx-translate/core": "9.1.1", - "alfresco-js-api": "2.4.0-cab81f4d5e1ca60fa70ce9199e7ff028d43484d7", + "alfresco-js-api": "2.4.0-d78bd47d095d373088d67a4fe2aa3bb06c66c14f", "chart.js": "2.5.0", "core-js": "2.4.1", "hammerjs": "2.0.8", @@ -41,9 +41,9 @@ }, "dependencies": { "alfresco-js-api": { - "version": "2.4.0-cab81f4d5e1ca60fa70ce9199e7ff028d43484d7", - "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.4.0-cab81f4d5e1ca60fa70ce9199e7ff028d43484d7.tgz", - "integrity": "sha512-AaElRlZmzoNDgi9FWbsOZoBgkMr0M/SkPHERJm6qkoneB5gSsDa+VqwGzAKhD7tokSIXDcuHxbNM+zc2e4UdBA==", + "version": "2.4.0-d78bd47d095d373088d67a4fe2aa3bb06c66c14f", + "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.4.0-d78bd47d095d373088d67a4fe2aa3bb06c66c14f.tgz", + "integrity": "sha512-6H80RmDIOV2DrWz/n7t4jzpdQm79rPpWolsV8tRuyJW3U08Nj4WSB8cQ7VYe19sLEZbKtRG3K/DE8xpYZzU1uA==", "requires": { "event-emitter": "0.3.4", "jsrsasign": "^8.0.12", @@ -71,9 +71,9 @@ } }, "@alfresco/adf-core": { - "version": "2.4.0-d152c367aa039ce18bb0e009306f761ead190674", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-2.4.0-d152c367aa039ce18bb0e009306f761ead190674.tgz", - "integrity": "sha512-ZY0z8ihY08Bnrmd8/7J265t4Df5uJjAuy5gB8P6ndcZRr8u31ZU4JMUA0q0qN4b+aVmBISFxFy0PXJ8SUu8ydg==", + "version": "2.4.0-052668fddc2827b87055e37b43516500a348f9d8", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-2.4.0-052668fddc2827b87055e37b43516500a348f9d8.tgz", + "integrity": "sha512-GJ4+c6NzVa/tfYQFlyP2QG2EjaqY9DyktQt9F9GApMaa0p3aJIvGjcf7+BpyIasWXD63uNCdmmoIOd2pggtubQ==", "requires": { "@angular/animations": "5.1.1", "@angular/cdk": "5.0.1", @@ -89,7 +89,7 @@ "@angular/platform-browser-dynamic": "5.1.1", "@angular/router": "5.1.1", "@ngx-translate/core": "9.1.1", - "alfresco-js-api": "2.4.0-cab81f4d5e1ca60fa70ce9199e7ff028d43484d7", + "alfresco-js-api": "2.4.0-d78bd47d095d373088d67a4fe2aa3bb06c66c14f", "chart.js": "2.5.0", "core-js": "2.4.1", "hammerjs": "2.0.8", @@ -106,9 +106,9 @@ }, "dependencies": { "alfresco-js-api": { - "version": "2.4.0-cab81f4d5e1ca60fa70ce9199e7ff028d43484d7", - "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.4.0-cab81f4d5e1ca60fa70ce9199e7ff028d43484d7.tgz", - "integrity": "sha512-AaElRlZmzoNDgi9FWbsOZoBgkMr0M/SkPHERJm6qkoneB5gSsDa+VqwGzAKhD7tokSIXDcuHxbNM+zc2e4UdBA==", + "version": "2.4.0-d78bd47d095d373088d67a4fe2aa3bb06c66c14f", + "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.4.0-d78bd47d095d373088d67a4fe2aa3bb06c66c14f.tgz", + "integrity": "sha512-6H80RmDIOV2DrWz/n7t4jzpdQm79rPpWolsV8tRuyJW3U08Nj4WSB8cQ7VYe19sLEZbKtRG3K/DE8xpYZzU1uA==", "requires": { "event-emitter": "0.3.4", "jsrsasign": "^8.0.12", @@ -676,9 +676,9 @@ "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=" }, "alfresco-js-api": { - "version": "2.4.0-cab81f4d5e1ca60fa70ce9199e7ff028d43484d7", - "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.4.0-cab81f4d5e1ca60fa70ce9199e7ff028d43484d7.tgz", - "integrity": "sha512-AaElRlZmzoNDgi9FWbsOZoBgkMr0M/SkPHERJm6qkoneB5gSsDa+VqwGzAKhD7tokSIXDcuHxbNM+zc2e4UdBA==", + "version": "2.4.0-d78bd47d095d373088d67a4fe2aa3bb06c66c14f", + "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.4.0-d78bd47d095d373088d67a4fe2aa3bb06c66c14f.tgz", + "integrity": "sha512-6H80RmDIOV2DrWz/n7t4jzpdQm79rPpWolsV8tRuyJW3U08Nj4WSB8cQ7VYe19sLEZbKtRG3K/DE8xpYZzU1uA==", "requires": { "event-emitter": "0.3.4", "jsrsasign": "^8.0.12", diff --git a/package.json b/package.json index 735dbb808..880fa9e42 100644 --- a/package.json +++ b/package.json @@ -25,8 +25,8 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "2.4.0-d152c367aa039ce18bb0e009306f761ead190674", - "@alfresco/adf-core": "2.4.0-d152c367aa039ce18bb0e009306f761ead190674", + "@alfresco/adf-content-services": "2.4.0-052668fddc2827b87055e37b43516500a348f9d8", + "@alfresco/adf-core": "2.4.0-052668fddc2827b87055e37b43516500a348f9d8", "@angular/animations": "5.1.1", "@angular/cdk": "5.0.1", "@angular/common": "5.1.1", @@ -48,7 +48,7 @@ "@ngrx/store-devtools": "^5.2.0", "@ngstack/electron": "0.1.0", "@ngx-translate/core": "9.1.1", - "alfresco-js-api": "2.4.0-cab81f4d5e1ca60fa70ce9199e7ff028d43484d7", + "alfresco-js-api": "2.4.0-d78bd47d095d373088d67a4fe2aa3bb06c66c14f", "core-js": "2.5.3", "cspell": "^2.1.12", "hammerjs": "2.0.8", diff --git a/src/app.config.json b/src/app.config.json index b0828ea99..2d87d408c 100644 --- a/src/app.config.json +++ b/src/app.config.json @@ -1,5 +1,7 @@ { "ecmHost": "http://{hostname}{:port}", + "providers": "ECM", + "authType" : "BASIC", "application": { "name": "Alfresco Example Content Application", "logo": "assets/images/alfresco-logo-white.svg", diff --git a/src/app/components/search/search.component.ts b/src/app/components/search/search.component.ts index ae3308bb3..ce672a6a3 100644 --- a/src/app/components/search/search.component.ts +++ b/src/app/components/search/search.component.ts @@ -31,12 +31,13 @@ import { UserPreferencesService } from '@alfresco/adf-core'; import { PageComponent } from '../page.component'; import { Store } from '@ngrx/store'; import { AppStore } from '../../store/states/app.state'; -import { NavigateToLocationAction } from '../../store/actions'; +import { NavigateToLocationAction } from '../../store/actions'; @Component({ selector: 'app-search', templateUrl: './search.component.html', styleUrls: ['./search.component.scss'], + providers: [SearchQueryBuilderService] }) export class SearchComponent extends PageComponent implements OnInit { diff --git a/src/app/store/effects/router.effects.ts b/src/app/store/effects/router.effects.ts index 08adb84cd..a1d27e5bd 100644 --- a/src/app/store/effects/router.effects.ts +++ b/src/app/store/effects/router.effects.ts @@ -47,7 +47,9 @@ export class RouterEffects { } } - this.router.navigate(link); + setTimeout(() => { + this.router.navigate(link); + }, 10); } private isLibraryContent(path: PathInfoEntity): boolean {