From 79e8bc136fcde37d1784c39a43e922477504d376 Mon Sep 17 00:00:00 2001 From: Oleksii Kurinnyi Date: Tue, 24 Sep 2019 15:56:30 +0300 Subject: [PATCH 1/2] activate first tab on workspace detals page if no query params were passed Signed-off-by: Oleksii Kurinnyi --- .../workspace-details/workspace-details.controller.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/dashboard/src/app/workspaces/workspace-details/workspace-details.controller.ts b/dashboard/src/app/workspaces/workspace-details/workspace-details.controller.ts index a2dd709ee6c..aebc296eb16 100644 --- a/dashboard/src/app/workspaces/workspace-details/workspace-details.controller.ts +++ b/dashboard/src/app/workspaces/workspace-details/workspace-details.controller.ts @@ -221,10 +221,8 @@ export class WorkspaceDetailsController { * @param {string} tab */ updateSelectedTab(tab: string): void { - const value = this.tab[tab]; - if (angular.isDefined(value)) { - this.selectedTabIndex = parseInt(value, 10); - } + const tabIndex = parseInt(this.tab[tab], 10); + this.selectedTabIndex = isNaN(tabIndex) ? 0 : tabIndex; } /** From 9fd2c41878c684d919fb061fa430045b4a31aeea Mon Sep 17 00:00:00 2001 From: Oleksii Kurinnyi Date: Tue, 24 Sep 2019 16:09:57 +0300 Subject: [PATCH 2/2] update axios version to fix high security vulnerability Signed-off-by: Oleksii Kurinnyi --- e2e/package-lock.json | 40 +++++++++++++--------------------------- e2e/package.json | 2 +- 2 files changed, 14 insertions(+), 28 deletions(-) diff --git a/e2e/package-lock.json b/e2e/package-lock.json index d107c685a25..8c0eb2031fc 100644 --- a/e2e/package-lock.json +++ b/e2e/package-lock.json @@ -164,21 +164,13 @@ "dev": true }, "axios": { - "version": "0.17.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.17.1.tgz", - "integrity": "sha1-LY4+XQvb1zJ/kbyBT1xXZg+Bgk0=", + "version": "0.18.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.1.tgz", + "integrity": "sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==", "dev": true, "requires": { - "follow-redirects": "^1.2.5", - "is-buffer": "^1.1.5" - }, - "dependencies": { - "is-buffer": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", - "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true - } + "follow-redirects": "1.5.10", + "is-buffer": "^2.0.2" } }, "babel-code-frame": { @@ -661,28 +653,22 @@ } }, "follow-redirects": { - "version": "1.8.1", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.8.1.tgz", - "integrity": "sha512-micCIbldHioIegeKs41DoH0KS3AXfFzgS30qVkM6z/XOE/GJgvmsoc839NUqa1B9udYe9dQxgv7KFwng6+p/dw==", + "version": "1.5.10", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz", + "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==", "dev": true, "requires": { - "debug": "^3.0.0" + "debug": "=3.1.0" }, "dependencies": { "debug": { - "version": "3.2.6", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", - "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", + "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==", "dev": true, "requires": { - "ms": "^2.1.1" + "ms": "2.0.0" } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true } } }, diff --git a/e2e/package.json b/e2e/package.json index 19b96f386d7..e82b9973ca6 100644 --- a/e2e/package.json +++ b/e2e/package.json @@ -23,7 +23,7 @@ "@types/node": "^11.13.4", "@types/rimraf": "^2.0.2", "@types/selenium-webdriver": "^3.0.16", - "axios": "0.17.1", + "axios": "0.18.1", "chai": "^4.2.0", "chromedriver": "^76.0.0", "mocha": "^6.1.4",