From ac99f5397d37a4ecef8669d5ce30db401f344cc4 Mon Sep 17 00:00:00 2001 From: Denys Vuika Date: Fri, 5 Oct 2018 09:52:07 +0100 Subject: [PATCH] fix redirection for multiple 401 in a row (#690) * fix redirection for multiple 401 in a row * update to ADF 2.6.0 * update e2e test --- e2e/components/dialog/share-dialog.ts | 4 ++-- package-lock.json | 24 ++++++++++++------------ package.json | 9 +++++---- src/app/app.component.ts | 9 +++------ 4 files changed, 22 insertions(+), 24 deletions(-) diff --git a/e2e/components/dialog/share-dialog.ts b/e2e/components/dialog/share-dialog.ts index 2ca53f426..eeac12c83 100755 --- a/e2e/components/dialog/share-dialog.ts +++ b/e2e/components/dialog/share-dialog.ts @@ -33,12 +33,12 @@ export class ShareDialog extends Component { title: '.mat-dialog-title', content: '.mat-dialog-content', - button: '.mat-button' + button: `[data-automation-id='adf-share-dialog-close']` }; title: ElementFinder = this.component.element(by.css(ShareDialog.selectors.title)); content: ElementFinder = this.component.element(by.css(ShareDialog.selectors.content)); - closeButton: ElementFinder = this.component.element(by.cssContainingText(ShareDialog.selectors.button, 'CLOSE')); + closeButton: ElementFinder = this.component.element(by.css(ShareDialog.selectors.button)); constructor(ancestor?: ElementFinder) { super(ShareDialog.selectors.root, ancestor); diff --git a/package-lock.json b/package-lock.json index 91b305821..bba98184a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,25 +5,25 @@ "requires": true, "dependencies": { "@alfresco/adf-content-services": { - "version": "2.6.0-4ca80e13f16f727101471145d30e9120f7746822", - "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-2.6.0-4ca80e13f16f727101471145d30e9120f7746822.tgz", - "integrity": "sha512-q6AtOodFlIrzUz9ep70KKNBu1AZuIsm740lH/XJP8YygWLWqeH9eZWGgEB6UnoNaM7x+NUEmgKbstI3oQJ04gQ==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@alfresco/adf-content-services/-/adf-content-services-2.6.0.tgz", + "integrity": "sha512-yho1Z67xRSdbjRxGmU5HZ9NjZCti7tNP1eqFS5w5qhgQUFIQx8UjeUy4AqxAySNuwb37IicXahu0heK1rE2K3g==", "requires": { "tslib": "^1.9.0" } }, "@alfresco/adf-core": { - "version": "2.6.0-4ca80e13f16f727101471145d30e9120f7746822", - "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-2.6.0-4ca80e13f16f727101471145d30e9120f7746822.tgz", - "integrity": "sha512-Y8gcKxXJWXSdgMo+j3f7fiLNFasSb7iKyErUwtV7+Qps75+gcvdErJVlBmiXZ7kpmeRvb1h3kURhZC5kdtBGng==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@alfresco/adf-core/-/adf-core-2.6.0.tgz", + "integrity": "sha512-9cTV27M7nAtVOTWqQi9+LXIzUxzzfnGb8BegkC8ptrvSxQZy+Ep3bNyash3g38XyFHDzZYkvM4c2cassSg/Xdw==", "requires": { "tslib": "^1.9.0" } }, "@alfresco/adf-extensions": { - "version": "2.6.0-4ca80e13f16f727101471145d30e9120f7746822", - "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-2.6.0-4ca80e13f16f727101471145d30e9120f7746822.tgz", - "integrity": "sha512-jJ2nVc1LSRolfpZ2a56UYpgm3pXP+gcNFwSSrBoEe9Wk5pWoEGBrTabKcazFcXZzX1R9PvEndbVfPEXiV2gjcQ==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/@alfresco/adf-extensions/-/adf-extensions-2.6.0.tgz", + "integrity": "sha512-9/NinDRC0pqNJYkX0U6rkWXMQmXpB5Efyx5y75mYdm7k3kQb7cxt/uGYThDVVl64QW4AT/mnd2oykHtjsgDCGw==", "requires": { "tslib": "^1.9.0" } @@ -2876,9 +2876,9 @@ "integrity": "sha1-6GuBnGAs+IIa1jdBNpjx3sAhhHo=" }, "alfresco-js-api": { - "version": "2.6.0-a777a19bc169173a712c9c69c3669a98066a482c", - "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.6.0-a777a19bc169173a712c9c69c3669a98066a482c.tgz", - "integrity": "sha512-bP5V4N1AoBy0IpKxS3N9WDXFCXHsHhIBlHPvd+ZV7TEbklt3BbuTZKWc2Z1diJFU4SocN11fVs8CPW6IqbtW6A==", + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/alfresco-js-api/-/alfresco-js-api-2.6.0.tgz", + "integrity": "sha512-ua+RBHViTeWiFoL3ncPO68GVHsUUQth8LxutuxvGA0Sbino1oJi/CcSiHjIungSI8G23Im9X7e0x6FP9XcuTdA==", "requires": { "event-emitter": "0.3.4", "superagent": "3.8.2" diff --git a/package.json b/package.json index 42b613d8f..0e6aa7cae 100644 --- a/package.json +++ b/package.json @@ -14,6 +14,7 @@ "server-versions": "rimraf ./src/versions.json && npm list --depth=0 --json=true --prod=true > ./src/versions.json || exit 0", "wd:update": "webdriver-manager update --gecko=false", "e2e": "npm run wd:update && protractor --baseUrl=http://localhost:4000", + "e2e.local": "npm run wd:update && protractor --baseUrl=http://localhost:4200", "start:docker": "docker-compose up -d --build && wait-on http://localhost:8080 && wait-on http://localhost:4000", "stop:docker": "docker-compose stop", "e2e:docker": "npm run start:docker && npm run e2e && npm run stop:docker", @@ -28,9 +29,9 @@ }, "private": true, "dependencies": { - "@alfresco/adf-content-services": "2.6.0-4ca80e13f16f727101471145d30e9120f7746822", - "@alfresco/adf-core": "2.6.0-4ca80e13f16f727101471145d30e9120f7746822", - "@alfresco/adf-extensions": "2.6.0-4ca80e13f16f727101471145d30e9120f7746822", + "@alfresco/adf-content-services": "2.6.0", + "@alfresco/adf-core": "2.6.0", + "@alfresco/adf-extensions": "2.6.0", "@angular/animations": "6.1.8", "@angular/cdk": "^6.4.7", "@angular/common": "6.1.8", @@ -53,7 +54,7 @@ "@ngrx/store-devtools": "^6.1.0", "@ngstack/code-editor": "^0.4.3", "@ngx-translate/core": "^10.0.2", - "alfresco-js-api": "2.6.0-a777a19bc169173a712c9c69c3669a98066a482c", + "alfresco-js-api": "2.6.0", "chrome-remote-interface": "^0.26.1", "core-js": "^2.5.7", "hammerjs": "2.0.8", diff --git a/src/app/app.component.ts b/src/app/app.component.ts index 01d7e186c..44d073ec7 100644 --- a/src/app/app.component.ts +++ b/src/app/app.component.ts @@ -80,13 +80,10 @@ export class AppComponent implements OnInit, OnDestroy { this.alfrescoApiService.getInstance().on('error', error => { if (error.status === 401) { if (!this.authenticationService.isLoggedIn()) { - this.authenticationService.setRedirect({ - provider: 'ECM', - url: this.router.url - }); - this.store.dispatch(new CloseModalDialogsAction()); - this.router.navigate(['/login']); + this.router.navigate(['/login'], { + queryParams: { returnUrl: 'personal-files' } + }); } } });