You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by fj...@apache.org on 2019/04/12 15:51:11 UTC
[incubator-druid] branch master updated: Ensuring that all the
controls are aligned correctly (#7457)
This is an automated email from the ASF dual-hosted git repository.
fjy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-druid.git
The following commit(s) were added to refs/heads/master by this push:
new 3aae4aa Ensuring that all the controls are aligned correctly (#7457)
3aae4aa is described below
commit 3aae4aaf8b1120f2222d0495d20106a255d8167a
Author: Vadim Ogievetsky <va...@gmail.com>
AuthorDate: Fri Apr 12 08:51:03 2019 -0700
Ensuring that all the controls are aligned correctly (#7457)
* making sure all the controls are inline
* update deps
---
web-console/package-lock.json | 469 ++++++++++++---------
web-console/package.json | 22 +-
.../view-control-bar.scss} | 29 +-
.../view-control-bar.tsx} | 24 +-
web-console/src/console-application.scss | 16 -
web-console/src/views/datasource-view.tsx | 6 +-
web-console/src/views/lookups-view.tsx | 9 +-
web-console/src/views/segments-view.tsx | 6 +-
web-console/src/views/servers-view.scss | 2 +-
web-console/src/views/servers-view.tsx | 11 +-
web-console/src/views/tasks-view.scss | 2 +-
web-console/src/views/tasks-view.tsx | 11 +-
12 files changed, 334 insertions(+), 273 deletions(-)
diff --git a/web-console/package-lock.json b/web-console/package-lock.json
index f87a0d3..d3abb42 100644
--- a/web-console/package-lock.json
+++ b/web-console/package-lock.json
@@ -219,11 +219,11 @@
}
},
"@blueprintjs/core": {
- "version": "3.15.0",
- "resolved": "https://registry.npmjs.org/@blueprintjs/core/-/core-3.15.0.tgz",
- "integrity": "sha512-znXO0UaWBJO7Nm2qEvZzURCDuogsJ9DJlIw3N2XnIi+k/c8mQ1xlvtg0TT2pS88lMG9HUEKky3b0UQaSXBw4LA==",
+ "version": "3.15.1",
+ "resolved": "https://registry.npmjs.org/@blueprintjs/core/-/core-3.15.1.tgz",
+ "integrity": "sha512-M8ltbqqlMZuZ6SEuqo/3Fr59ZcUfd8Er7ocbm7EACVfRW7dRhOCd/TKkf2kfICNtCDwznwXk0iAePLXZhUGtQg==",
"requires": {
- "@blueprintjs/icons": "^3.7.0",
+ "@blueprintjs/icons": "^3.8.0",
"@types/dom4": "^2.0.1",
"classnames": "^2.2",
"dom4": "^2.0.1",
@@ -233,25 +233,12 @@
"react-transition-group": "^2.2.1",
"resize-observer-polyfill": "^1.5.0",
"tslib": "^1.9.0"
- },
- "dependencies": {
- "react-transition-group": {
- "version": "2.7.1",
- "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.7.1.tgz",
- "integrity": "sha512-b0VJTzNRnXxRpCuxng6QJbAzmmrhBn1BZJfPPnHbH2PIo8msdkajqwtfdyGm/OypPXZNfAHKEqeN15wjMXrRJQ==",
- "requires": {
- "dom-helpers": "^3.3.1",
- "loose-envify": "^1.4.0",
- "prop-types": "^15.6.2",
- "react-lifecycles-compat": "^3.0.4"
- }
- }
}
},
"@blueprintjs/icons": {
- "version": "3.7.0",
- "resolved": "https://registry.npmjs.org/@blueprintjs/icons/-/icons-3.7.0.tgz",
- "integrity": "sha512-608lQx1okOo85LNp7LyvsXWlgJjoQAiu29wULcktGuAuMmVXgueaGbMEDpuEMbu+uRlg9yqDhmk1eWm7W7R5ag==",
+ "version": "3.8.0",
+ "resolved": "https://registry.npmjs.org/@blueprintjs/icons/-/icons-3.8.0.tgz",
+ "integrity": "sha512-yHaRQ3vfV9Gf3foZ4ONtxddz+u5ufkHqHj8Ia5VhPbFgG4el+cPdmsGGIIM72rgKS1KQa5Ay+ggjpByUlXvrKg==",
"requires": {
"classnames": "^2.2",
"tslib": "^1.9.0"
@@ -566,9 +553,9 @@
"dev": true
},
"@types/node": {
- "version": "11.13.0",
- "resolved": "https://registry.npmjs.org/@types/node/-/node-11.13.0.tgz",
- "integrity": "sha512-rx29MMkRdVmzunmiA4lzBYJNnXsW/PhG4kMBy2ATsYaDjGGR75dCFEVVROKpNwlVdcUX3xxlghKQOeDPBJobng==",
+ "version": "11.13.4",
+ "resolved": "https://registry.npmjs.org/@types/node/-/node-11.13.4.tgz",
+ "integrity": "sha512-+rabAZZ3Yn7tF/XPGHupKIL5EcAbrLxnTr/hgQICxbeuAfWtT0UZSfULE+ndusckBItcv4o6ZeOJplQikVcLvQ==",
"dev": true
},
"@types/numeral": {
@@ -578,15 +565,15 @@
"dev": true
},
"@types/prop-types": {
- "version": "15.5.9",
- "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.5.9.tgz",
- "integrity": "sha512-Nha5b+jmBI271jdTMwrHiNXM+DvThjHOfyZtMX9kj/c/LUj2xiLHsG/1L3tJ8DjAoQN48cHwUwtqBotjyXaSdQ==",
+ "version": "15.7.0",
+ "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.0.tgz",
+ "integrity": "sha512-eItQyV43bj4rR3JPV0Skpl1SncRCdziTEK9/v8VwXmV6d/qOUO8/EuWeHBbCZcsfSHfzI5UyMJLCSXtxxznyZg==",
"dev": true
},
"@types/react": {
- "version": "16.8.5",
- "resolved": "https://registry.npmjs.org/@types/react/-/react-16.8.5.tgz",
- "integrity": "sha512-8LRySaaSJVLNZb2dbOGvGmzn88cbAfrgDpuWy+6lLgQ0OJFgHHvyuaCX4/7ikqJlpmCPf4uazJAZcfTQRdJqdQ==",
+ "version": "16.8.13",
+ "resolved": "https://registry.npmjs.org/@types/react/-/react-16.8.13.tgz",
+ "integrity": "sha512-otJ4ntMuHGrvm67CdDJMAls4WqotmAmW0g3HmWi9LCjSWXrxoXY/nHXrtmMfvPEEmGFNm6NdgMsJmnfH820Qaw==",
"dev": true,
"requires": {
"@types/prop-types": "*",
@@ -594,18 +581,18 @@
}
},
"@types/react-dom": {
- "version": "16.8.3",
- "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.8.3.tgz",
- "integrity": "sha512-HF5hD5YR3z9Mn6kXcW1VKe4AQ04ZlZj1EdLBae61hzQ3eEWWxMgNLUbIxeZp40BnSxqY1eAYLsH9QopQcxzScA==",
+ "version": "16.8.4",
+ "resolved": "https://registry.npmjs.org/@types/react-dom/-/react-dom-16.8.4.tgz",
+ "integrity": "sha512-eIRpEW73DCzPIMaNBDP5pPIpK1KXyZwNgfxiVagb5iGiz6da+9A5hslSX6GAQKdO7SayVCS/Fr2kjqprgAvkfA==",
"dev": true,
"requires": {
"@types/react": "*"
}
},
"@types/react-router": {
- "version": "4.4.4",
- "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-4.4.4.tgz",
- "integrity": "sha512-TZVfpT6nvUv/lbho/nRtckEtgkhspOQr3qxrnpXixwgQRKKyg5PvDfNKc8Uend/p/Pi70614VCmC0NPAKWF+0g==",
+ "version": "4.4.5",
+ "resolved": "https://registry.npmjs.org/@types/react-router/-/react-router-4.4.5.tgz",
+ "integrity": "sha512-12+VOu1+xiC8RPc9yrgHCyLI79VswjtuqeS2gPrMcywH6tkc8rGIUhs4LaL3AJPqo5d+RPnfRpNKiJ7MK2Qhcg==",
"dev": true,
"requires": {
"@types/history": "*",
@@ -613,9 +600,9 @@
}
},
"@types/react-router-dom": {
- "version": "4.3.1",
- "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-4.3.1.tgz",
- "integrity": "sha512-GbztJAScOmQ/7RsQfO4cd55RuH1W4g6V1gDW3j4riLlt+8yxYLqqsiMzmyuXBLzdFmDtX/uU2Bpcm0cmudv44A==",
+ "version": "4.3.2",
+ "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-4.3.2.tgz",
+ "integrity": "sha512-biesHodFxPgDxku2m08XwPeAfUYBcxAnrQG7pwFikuA3L2e3u2OKAb+Sb16bJuU3L5CTHd+Ivap+ke4mmGsHqQ==",
"dev": true,
"requires": {
"@types/history": "*",
@@ -624,9 +611,9 @@
}
},
"@types/react-table": {
- "version": "6.8.0",
- "resolved": "https://registry.npmjs.org/@types/react-table/-/react-table-6.8.0.tgz",
- "integrity": "sha512-2oIZ8kXGK5Pka2MrdNcPCED0NUVEc3tcOI2/Q4vHjeSghHr470AEEidxG19/KMZfCGl5/ISEcKtCHCiFNAFhyg==",
+ "version": "6.8.1",
+ "resolved": "https://registry.npmjs.org/@types/react-table/-/react-table-6.8.1.tgz",
+ "integrity": "sha512-56wi1s7+H4eGbtXsppNz/OeBeUiPQZnJYLxia0ZpwcD47VfYFE1EkbVadEoJshJIjR4nbSQSF/AgJHvC/ZwHaQ==",
"dev": true,
"requires": {
"@types/react": "*"
@@ -1211,13 +1198,13 @@
"dev": true
},
"autoprefixer": {
- "version": "9.5.0",
- "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.5.0.tgz",
- "integrity": "sha512-hMKcyHsZn5+qL6AUeP3c8OyuteZ4VaUlg+fWbyl8z7PqsKHF/Bf8/px3K6AT8aMzDkBo8Bc11245MM+itDBOxQ==",
+ "version": "9.5.1",
+ "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-9.5.1.tgz",
+ "integrity": "sha512-KJSzkStUl3wP0D5sdMlP82Q52JLy5+atf2MHAre48+ckWkXgixmfHyWmA77wFDy6jTHU6mIgXv6hAQ2mf1PjJQ==",
"dev": true,
"requires": {
- "browserslist": "^4.4.2",
- "caniuse-lite": "^1.0.30000947",
+ "browserslist": "^4.5.4",
+ "caniuse-lite": "^1.0.30000957",
"normalize-range": "^0.1.2",
"num2fraction": "^1.2.2",
"postcss": "^7.0.14",
@@ -1225,25 +1212,14 @@
}
},
"awesome-code-style": {
- "version": "1.1.4",
- "resolved": "https://registry.npmjs.org/awesome-code-style/-/awesome-code-style-1.1.4.tgz",
- "integrity": "sha512-352ZbSyYO2P80XqbWOMdFHnAWrDj4CB7y93n8hjk12gAYY1ZWckZMGURjiRH9fz6BaLLutOUh/euNl7TmmQ4Nw==",
+ "version": "1.2.2",
+ "resolved": "https://registry.npmjs.org/awesome-code-style/-/awesome-code-style-1.2.2.tgz",
+ "integrity": "sha512-hWkz6pLemW7z4AAaiia2096O+Fus68FOKlaZJMJWXjVNERUST67VCyRb4FGAr/c2m5GrMpbXLmidCF3GdGO4pA==",
"dev": true,
"requires": {
"stylelint-config-recommended": "^2.1.0",
"stylelint-scss": "^3.5.4",
"tslint-react": "^3.6.0"
- },
- "dependencies": {
- "tslint-react": {
- "version": "3.6.0",
- "resolved": "https://registry.npmjs.org/tslint-react/-/tslint-react-3.6.0.tgz",
- "integrity": "sha512-AIv1QcsSnj7e9pFir6cJ6vIncTqxfqeFF3Lzh8SuuBljueYzEAtByuB6zMaD27BL0xhMEqsZ9s5eHuCONydjBw==",
- "dev": true,
- "requires": {
- "tsutils": "^2.13.1"
- }
- }
}
},
"aws-sign2": {
@@ -2198,16 +2174,16 @@
}
},
"compression": {
- "version": "1.7.3",
- "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.3.tgz",
- "integrity": "sha512-HSjyBG5N1Nnz7tF2+O7A9XUhyjru71/fwgNb7oIsEVHR0WShfs2tIS/EySLgiTe98aOK18YDlMXpzjCXY/n9mg==",
+ "version": "1.7.4",
+ "resolved": "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz",
+ "integrity": "sha512-jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ==",
"dev": true,
"requires": {
"accepts": "~1.3.5",
"bytes": "3.0.0",
- "compressible": "~2.0.14",
+ "compressible": "~2.0.16",
"debug": "2.6.9",
- "on-headers": "~1.0.1",
+ "on-headers": "~1.0.2",
"safe-buffer": "5.1.2",
"vary": "~1.1.2"
},
@@ -2523,9 +2499,9 @@
}
},
"csstype": {
- "version": "2.6.2",
- "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.2.tgz",
- "integrity": "sha512-Rl7PvTae0pflc1YtxtKbiSqq20Ts6vpIYOD5WBafl4y123DyHUeLrRdQP66sQW8/6gmX8jrYJLXwNeMqYVJcow==",
+ "version": "2.6.3",
+ "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.3.tgz",
+ "integrity": "sha512-rINUZXOkcBmoHWEyu7JdHu5JMzkGRoMX4ov9830WNgxf5UYxcBUO0QTKAqeJ5EZfSdlrcJYkC8WwfVW7JYi4yg==",
"dev": true
},
"currently-unhandled": {
@@ -2636,9 +2612,9 @@
"dev": true
},
"default-gateway": {
- "version": "4.1.2",
- "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.1.2.tgz",
- "integrity": "sha512-xhJUAp3u02JsBGovj0V6B6uYhKCUOmiNc8xGmReUwGu77NmvcpxPVB0pCielxMFumO7CmXBG02XjM8HB97k8Hw==",
+ "version": "4.2.0",
+ "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
+ "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
"dev": true,
"requires": {
"execa": "^1.0.0",
@@ -2704,17 +2680,17 @@
}
},
"del": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
- "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+ "version": "4.1.0",
+ "resolved": "https://registry.npmjs.org/del/-/del-4.1.0.tgz",
+ "integrity": "sha512-C4kvKNlYrwXhKxz97BuohF8YoGgQ23Xm9lvoHmgT7JaPGprSEjk3+XFled74Yt/x0ZABUHg2D67covzAPUKx5Q==",
"dev": true,
"requires": {
"globby": "^6.1.0",
- "is-path-cwd": "^1.0.0",
- "is-path-in-cwd": "^1.0.0",
- "p-map": "^1.1.1",
- "pify": "^3.0.0",
- "rimraf": "^2.2.8"
+ "is-path-cwd": "^2.0.0",
+ "is-path-in-cwd": "^2.0.0",
+ "p-map": "^2.0.0",
+ "pify": "^4.0.1",
+ "rimraf": "^2.6.3"
},
"dependencies": {
"globby": {
@@ -2737,6 +2713,12 @@
"dev": true
}
}
+ },
+ "pify": {
+ "version": "4.0.1",
+ "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+ "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+ "dev": true
}
}
},
@@ -5113,12 +5095,12 @@
"dev": true
},
"internal-ip": {
- "version": "4.2.0",
- "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.2.0.tgz",
- "integrity": "sha512-ZY8Rk+hlvFeuMmG5uH1MXhhdeMntmIaxaInvAmzMq/SHV8rv4Kh+6GiQNNDQd0wZFrcO+FiTBo8lui/osKOyJw==",
+ "version": "4.3.0",
+ "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
+ "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
"dev": true,
"requires": {
- "default-gateway": "^4.0.1",
+ "default-gateway": "^4.2.0",
"ipaddr.js": "^1.9.0"
},
"dependencies": {
@@ -5376,15 +5358,15 @@
"dev": true
},
"is-path-cwd": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
- "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.0.0.tgz",
+ "integrity": "sha512-m5dHHzpOXEiv18JEORttBO64UgTEypx99vCxQLjbBvGhOJxnTNglYoFXxwo6AbsQb79sqqycQEHv2hWkHZAijA==",
"dev": true
},
"is-path-in-cwd": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
- "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.0.0.tgz",
+ "integrity": "sha512-6Vz5Gc9s/sDA3JBVu0FzWufm8xaBsqy1zn8Q6gmvGP6nSDMw78aS4poBNeatWjaRpTpxxLn1WOndAiOlk+qY8A==",
"dev": true,
"requires": {
"is-path-inside": "^1.0.0"
@@ -6815,9 +6797,9 @@
}
},
"mocha": {
- "version": "6.0.2",
- "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.0.2.tgz",
- "integrity": "sha512-RtTJsmmToGyeTznSOMoM6TPEk1A84FQaHIciKrRqARZx+B5ccJ5tXlmJzEKGBxZdqk9UjpRsesZTUkZmR5YnuQ==",
+ "version": "6.1.3",
+ "resolved": "https://registry.npmjs.org/mocha/-/mocha-6.1.3.tgz",
+ "integrity": "sha512-QdE/w//EPHrqgT5PNRUjRVHy6IJAzAf1R8n2O8W8K2RZ+NbPfOD5cBDp+PGa2Gptep37C/TdBiaNwakppEzEbg==",
"dev": true,
"requires": {
"ansi-colors": "3.2.3",
@@ -6825,36 +6807,59 @@
"debug": "3.2.6",
"diff": "3.5.0",
"escape-string-regexp": "1.0.5",
- "findup-sync": "2.0.0",
+ "find-up": "3.0.0",
"glob": "7.1.3",
"growl": "1.10.5",
"he": "1.2.0",
- "js-yaml": "3.12.0",
+ "js-yaml": "3.13.0",
"log-symbols": "2.2.0",
"minimatch": "3.0.4",
"mkdirp": "0.5.1",
"ms": "2.1.1",
- "node-environment-flags": "1.0.4",
+ "node-environment-flags": "1.0.5",
"object.assign": "4.1.0",
"strip-json-comments": "2.0.1",
"supports-color": "6.0.0",
"which": "1.3.1",
"wide-align": "1.1.3",
- "yargs": "12.0.5",
- "yargs-parser": "11.1.1",
+ "yargs": "13.2.2",
+ "yargs-parser": "13.0.0",
"yargs-unparser": "1.5.0"
},
"dependencies": {
+ "get-caller-file": {
+ "version": "2.0.5",
+ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+ "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+ "dev": true
+ },
"js-yaml": {
- "version": "3.12.0",
- "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz",
- "integrity": "sha512-PIt2cnwmPfL4hKNwqeiuz4bKfnzHTBv6HyVgjahA6mPLwPDzjDWrplJBMjHUFxku/N3FlmrbyPclad+I+4mJ3A==",
+ "version": "3.13.0",
+ "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.13.0.tgz",
+ "integrity": "sha512-pZZoSxcCYco+DIKBTimr67J6Hy+EYGZDY/HCWC+iAEA9h1ByhMXAIVUXMcMFpOCxQ/xjXmPI2MkDL5HRm5eFrQ==",
"dev": true,
"requires": {
"argparse": "^1.0.7",
"esprima": "^4.0.0"
}
},
+ "require-main-filename": {
+ "version": "2.0.0",
+ "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz",
+ "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==",
+ "dev": true
+ },
+ "string-width": {
+ "version": "3.1.0",
+ "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
+ "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+ "dev": true,
+ "requires": {
+ "emoji-regex": "^7.0.1",
+ "is-fullwidth-code-point": "^2.0.0",
+ "strip-ansi": "^5.1.0"
+ }
+ },
"supports-color": {
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.0.0.tgz",
@@ -6863,6 +6868,35 @@
"requires": {
"has-flag": "^3.0.0"
}
+ },
+ "yargs": {
+ "version": "13.2.2",
+ "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.2.2.tgz",
+ "integrity": "sha512-WyEoxgyTD3w5XRpAQNYUB9ycVH/PQrToaTXdYXRdOXvEy1l19br+VJsc0vcO8PTGg5ro/l/GY7F/JMEBmI0BxA==",
+ "dev": true,
+ "requires": {
+ "cliui": "^4.0.0",
+ "find-up": "^3.0.0",
+ "get-caller-file": "^2.0.1",
+ "os-locale": "^3.1.0",
+ "require-directory": "^2.1.1",
+ "require-main-filename": "^2.0.0",
+ "set-blocking": "^2.0.0",
+ "string-width": "^3.0.0",
+ "which-module": "^2.0.0",
+ "y18n": "^4.0.0",
+ "yargs-parser": "^13.0.0"
+ }
+ },
+ "yargs-parser": {
+ "version": "13.0.0",
+ "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.0.0.tgz",
+ "integrity": "sha512-w2LXjoL8oRdRQN+hOyppuXs+V/fVAYtpcrRxZuF7Kt/Oc+Jr2uAcVntaUTNT6w5ihoWfFDpNY8CPx1QskxZ/pw==",
+ "dev": true,
+ "requires": {
+ "camelcase": "^5.0.0",
+ "decamelize": "^1.2.0"
+ }
}
}
},
@@ -6951,12 +6985,21 @@
"dev": true
},
"node-environment-flags": {
- "version": "1.0.4",
- "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.4.tgz",
- "integrity": "sha512-M9rwCnWVLW7PX+NUWe3ejEdiLYinRpsEre9hMkU/6NS4h+EEulYaDH1gCEZ2gyXsmw+RXYDaV2JkkTNcsPDJ0Q==",
+ "version": "1.0.5",
+ "resolved": "https://registry.npmjs.org/node-environment-flags/-/node-environment-flags-1.0.5.tgz",
+ "integrity": "sha512-VNYPRfGfmZLx0Ye20jWzHUjyTW/c+6Wq+iLhDzUI4XmhrDd9l/FozXV3F2xOaXjvp0co0+v1YSR3CMP6g+VvLQ==",
"dev": true,
"requires": {
- "object.getownpropertydescriptors": "^2.0.3"
+ "object.getownpropertydescriptors": "^2.0.3",
+ "semver": "^5.7.0"
+ },
+ "dependencies": {
+ "semver": {
+ "version": "5.7.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.0.tgz",
+ "integrity": "sha512-Ya52jSX2u7QKghxeoFGpLwCtGlt7j0oY9DYb5apt9nPlJ42ID+ulTXESnt/qAQcoSERyZ5sl3LDIOw0nAn/5DA==",
+ "dev": true
+ }
}
},
"node-fetch": {
@@ -7400,9 +7443,9 @@
}
},
"opn": {
- "version": "5.4.0",
- "resolved": "https://registry.npmjs.org/opn/-/opn-5.4.0.tgz",
- "integrity": "sha512-YF9MNdVy/0qvJvDtunAOzFw9iasOQHpVthTCvGzxt61Il64AYSGdK+rYwld7NAfk9qJ7dt+hymBNSc9LNYS+Sw==",
+ "version": "5.5.0",
+ "resolved": "https://registry.npmjs.org/opn/-/opn-5.5.0.tgz",
+ "integrity": "sha512-PqHpggC9bLV0VeWcdKhkpxY+3JTzetLSqTCWL/z/tFIbI6G8JCjondXklT1JinczLz2Xib62sSp0T/gKT4KksA==",
"dev": true,
"requires": {
"is-wsl": "^1.1.0"
@@ -7542,9 +7585,9 @@
}
},
"p-map": {
- "version": "1.2.0",
- "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
- "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+ "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
"dev": true
},
"p-reduce": {
@@ -7762,9 +7805,9 @@
"dev": true
},
"popper.js": {
- "version": "1.14.7",
- "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.14.7.tgz",
- "integrity": "sha512-4q1hNvoUre/8srWsH7hnoSJ5xVmIL4qgz+s4qf2TnJIMyZFUFMGH+9vE7mXynAlHSZ/NdTmmow86muD0myUkVQ=="
+ "version": "1.15.0",
+ "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.15.0.tgz",
+ "integrity": "sha512-w010cY1oCUmI+9KwwlWki+r5jxKfTFDVoadl7MSrIujHU5MJ5OR6HTDj6Xo8aoR/QsA56x8jKjA59qGH4ELtrA=="
},
"portfinder": {
"version": "1.0.20",
@@ -8569,9 +8612,9 @@
"dev": true
},
"querystringify": {
- "version": "2.1.0",
- "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.0.tgz",
- "integrity": "sha512-sluvZZ1YiTLD5jsqZcDmFyV2EwToyXZBfpoVOmktMmW+VEnhgakFHnasVph65fOjGPTWN0Nw3+XQaSeMayr0kg==",
+ "version": "2.1.1",
+ "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.1.1.tgz",
+ "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
"dev": true
},
"quick-lru": {
@@ -8683,16 +8726,6 @@
"prop-types": "^15.6.1",
"typed-styles": "^0.0.7",
"warning": "^4.0.2"
- },
- "dependencies": {
- "warning": {
- "version": "4.0.3",
- "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
- "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
- "requires": {
- "loose-envify": "^1.0.0"
- }
- }
}
},
"react-router": {
@@ -8734,6 +8767,17 @@
"classnames": "^2.2.5"
}
},
+ "react-transition-group": {
+ "version": "2.9.0",
+ "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-2.9.0.tgz",
+ "integrity": "sha512-+HzNTCHpeQyl4MJ/bdE0u6XRMe9+XG/+aL4mCxVN4DnPBQ0/5bfHWPDuOZUzYdMj94daZaZdCCc1Dzt9R/xSSg==",
+ "requires": {
+ "dom-helpers": "^3.4.0",
+ "loose-envify": "^1.4.0",
+ "prop-types": "^15.6.2",
+ "react-lifecycles-compat": "^3.0.4"
+ }
+ },
"read-cache": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz",
@@ -10021,9 +10065,9 @@
}
},
"readable-stream": {
- "version": "3.1.1",
- "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.1.1.tgz",
- "integrity": "sha512-DkN66hPyqDhnIQ6Jcsvx9bFjhw214O4poMBcIMgPVpQvNy9a0e0Uhg5SqySyDKAmUlwt8LonTBz1ezOnM8pUdA==",
+ "version": "3.3.0",
+ "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.3.0.tgz",
+ "integrity": "sha512-EsI+s3k3XsW+fU8fQACLN59ky34AZ14LoeVZpYwmZvldCFo0r0gnelwF2TcMjLor/BTL5aDJVBMkss0dthToPw==",
"dev": true,
"requires": {
"inherits": "^2.0.3",
@@ -11012,9 +11056,9 @@
}
},
"ts-jest": {
- "version": "24.0.1",
- "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-24.0.1.tgz",
- "integrity": "sha512-mgNZmYPuGBNgYpUzchI7vdSr6zATQI0TrSyzREnXHuPCvlW8T1DQ/fdscgx4ivS5vAMUGUaoxGdWIVHC5I8imw==",
+ "version": "24.0.2",
+ "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-24.0.2.tgz",
+ "integrity": "sha512-h6ZCZiA1EQgjczxq+uGLXQlNgeg02WWJBbeT8j6nyIBRQdglqbvzDoHahTEIiS6Eor6x8mK6PfZ7brQ9Q6tzHw==",
"dev": true,
"requires": {
"bs-logger": "0.x",
@@ -11131,6 +11175,15 @@
"semver": "^5.3.0"
}
},
+ "tslint-react": {
+ "version": "3.6.0",
+ "resolved": "https://registry.npmjs.org/tslint-react/-/tslint-react-3.6.0.tgz",
+ "integrity": "sha512-AIv1QcsSnj7e9pFir6cJ6vIncTqxfqeFF3Lzh8SuuBljueYzEAtByuB6zMaD27BL0xhMEqsZ9s5eHuCONydjBw==",
+ "dev": true,
+ "requires": {
+ "tsutils": "^2.13.1"
+ }
+ },
"tsutils": {
"version": "2.29.0",
"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
@@ -11192,9 +11245,9 @@
"dev": true
},
"typescript": {
- "version": "3.4.1",
- "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.4.1.tgz",
- "integrity": "sha512-3NSMb2VzDQm8oBTLH6Nj55VVtUEpe/rgkIzMir0qVoLyjDZlnMBva0U6vDiV3IH+sl/Yu6oP5QwsAQtHPmDd2Q==",
+ "version": "3.4.3",
+ "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.4.3.tgz",
+ "integrity": "sha512-FFgHdPt4T/duxx6Ndf7hwgMZZjZpB+U0nMNGVCYPq0rEzWKjEDobm4J6yb3CS7naZ0yURFqdw9Gwc7UOh/P9oQ==",
"dev": true
},
"ua-parser-js": {
@@ -11444,9 +11497,9 @@
}
},
"url-parse": {
- "version": "1.4.4",
- "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.4.tgz",
- "integrity": "sha512-/92DTTorg4JjktLNLe6GPS2/RvAd/RGr6LuktmWSMLEOa6rjnlrFXNgSbSmkNvCoL2T028A0a1JaJLzRMlFoHg==",
+ "version": "1.4.5",
+ "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.4.5.tgz",
+ "integrity": "sha512-4XDvC5vZRjEpjP0L4znrWeoH8P8F0XGBlfLdABi/6oV4o8xUVbTpyrxWHxkK2bT0pSIpcjdIzSoWUhlUfawCAQ==",
"dev": true,
"requires": {
"querystringify": "^2.0.0",
@@ -11602,6 +11655,14 @@
"makeerror": "1.0.x"
}
},
+ "warning": {
+ "version": "4.0.3",
+ "resolved": "https://registry.npmjs.org/warning/-/warning-4.0.3.tgz",
+ "integrity": "sha512-rpJyN222KWIvHJ/F53XSZv0Zl/accqHR8et1kpaMTD/fLCRxtV8iX8czMzY7sVZupTI3zcUTg8eycS2kNF9l6w==",
+ "requires": {
+ "loose-envify": "^1.0.0"
+ }
+ },
"watchpack": {
"version": "1.6.0",
"resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
@@ -11699,9 +11760,9 @@
}
},
"webpack-dev-middleware": {
- "version": "3.6.0",
- "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.6.0.tgz",
- "integrity": "sha512-oeXA3m+5gbYbDBGo4SvKpAHJJEGMoekUbHgo1RK7CP1sz7/WOSeu/dWJtSTk+rzDCLkPwQhGocgIq6lQqOyOwg==",
+ "version": "3.6.2",
+ "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-3.6.2.tgz",
+ "integrity": "sha512-A47I5SX60IkHrMmZUlB0ZKSWi29TZTcPz7cha1Z75yYOsgWh/1AcPmQEbC8ZIbU3A1ytSv1PMU0PyPz2Lmz2jg==",
"dev": true,
"requires": {
"memory-fs": "^0.4.1",
@@ -11711,49 +11772,49 @@
},
"dependencies": {
"mime": {
- "version": "2.4.0",
- "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.0.tgz",
- "integrity": "sha512-ikBcWwyqXQSHKtciCcctu9YfPbFYZ4+gbHEmE0Q8jzcTYQg5dHCr3g2wwAZjPoJfQVXZq6KXAjpXOTf5/cjT7w==",
+ "version": "2.4.2",
+ "resolved": "https://registry.npmjs.org/mime/-/mime-2.4.2.tgz",
+ "integrity": "sha512-zJBfZDkwRu+j3Pdd2aHsR5GfH2jIWhmL1ZzBoc+X+3JEti2hbArWcyJ+1laC1D2/U/W1a/+Cegj0/OnEU2ybjg==",
"dev": true
}
}
},
"webpack-dev-server": {
- "version": "3.2.1",
- "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.2.1.tgz",
- "integrity": "sha512-sjuE4mnmx6JOh9kvSbPYw3u/6uxCLHNWfhWaIPwcXWsvWOPN+nc5baq4i9jui3oOBRXGonK9+OI0jVkaz6/rCw==",
+ "version": "3.3.1",
+ "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.3.1.tgz",
+ "integrity": "sha512-jY09LikOyGZrxVTXK0mgIq9y2IhCoJ05848dKZqX1gAGLU1YDqgpOT71+W53JH/wI4v6ky4hm+KvSyW14JEs5A==",
"dev": true,
"requires": {
"ansi-html": "0.0.7",
"bonjour": "^3.5.0",
- "chokidar": "^2.0.0",
- "compression": "^1.5.2",
- "connect-history-api-fallback": "^1.3.0",
+ "chokidar": "^2.1.5",
+ "compression": "^1.7.4",
+ "connect-history-api-fallback": "^1.6.0",
"debug": "^4.1.1",
- "del": "^3.0.0",
- "express": "^4.16.2",
- "html-entities": "^1.2.0",
+ "del": "^4.1.0",
+ "express": "^4.16.4",
+ "html-entities": "^1.2.1",
"http-proxy-middleware": "^0.19.1",
"import-local": "^2.0.0",
"internal-ip": "^4.2.0",
"ip": "^1.1.5",
- "killable": "^1.0.0",
- "loglevel": "^1.4.1",
- "opn": "^5.1.0",
- "portfinder": "^1.0.9",
+ "killable": "^1.0.1",
+ "loglevel": "^1.6.1",
+ "opn": "^5.5.0",
+ "portfinder": "^1.0.20",
"schema-utils": "^1.0.0",
- "selfsigned": "^1.9.1",
- "semver": "^5.6.0",
- "serve-index": "^1.7.2",
+ "selfsigned": "^1.10.4",
+ "semver": "^6.0.0",
+ "serve-index": "^1.9.1",
"sockjs": "0.3.19",
"sockjs-client": "1.3.0",
"spdy": "^4.0.0",
- "strip-ansi": "^3.0.0",
+ "strip-ansi": "^3.0.1",
"supports-color": "^6.1.0",
"url": "^0.11.0",
- "webpack-dev-middleware": "^3.5.1",
+ "webpack-dev-middleware": "^3.6.2",
"webpack-log": "^2.0.0",
- "yargs": "12.0.2"
+ "yargs": "12.0.5"
},
"dependencies": {
"ansi-regex": {
@@ -11762,11 +11823,25 @@
"integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
"dev": true
},
- "camelcase": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-4.1.0.tgz",
- "integrity": "sha1-1UVjW+HjPFQmScaRc+Xeas+uNN0=",
- "dev": true
+ "chokidar": {
+ "version": "2.1.5",
+ "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-2.1.5.tgz",
+ "integrity": "sha512-i0TprVWp+Kj4WRPtInjexJ8Q+BqTE909VpH8xVhXrJkoc5QC8VO9TryGOqTr+2hljzc1sC62t22h5tZePodM/A==",
+ "dev": true,
+ "requires": {
+ "anymatch": "^2.0.0",
+ "async-each": "^1.0.1",
+ "braces": "^2.3.2",
+ "fsevents": "^1.2.7",
+ "glob-parent": "^3.1.0",
+ "inherits": "^2.0.3",
+ "is-binary-path": "^1.0.0",
+ "is-glob": "^4.0.0",
+ "normalize-path": "^3.0.0",
+ "path-is-absolute": "^1.0.0",
+ "readdirp": "^2.2.1",
+ "upath": "^1.1.1"
+ }
},
"debug": {
"version": "4.1.1",
@@ -11777,14 +11852,17 @@
"ms": "^2.1.1"
}
},
- "decamelize": {
- "version": "2.0.0",
- "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-2.0.0.tgz",
- "integrity": "sha512-Ikpp5scV3MSYxY39ymh45ZLEecsTdv/Xj2CaQfI8RLMuwi7XvjX9H/fhraiSuU+C5w5NTDu4ZU72xNiZnurBPg==",
- "dev": true,
- "requires": {
- "xregexp": "4.0.0"
- }
+ "normalize-path": {
+ "version": "3.0.0",
+ "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+ "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+ "dev": true
+ },
+ "semver": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-6.0.0.tgz",
+ "integrity": "sha512-0UewU+9rFapKFnlbirLi3byoOuhrSsli/z/ihNnvM24vgF+8sNBiI1LZPBSH9wJKUwaUbw+s3hToDLCXkrghrQ==",
+ "dev": true
},
"strip-ansi": {
"version": "3.0.1",
@@ -11795,34 +11873,11 @@
"ansi-regex": "^2.0.0"
}
},
- "yargs": {
- "version": "12.0.2",
- "resolved": "https://registry.npmjs.org/yargs/-/yargs-12.0.2.tgz",
- "integrity": "sha512-e7SkEx6N6SIZ5c5H22RTZae61qtn3PYUE8JYbBFlK9sYmh3DMQ6E5ygtaG/2BW0JZi4WGgTR2IV5ChqlqrDGVQ==",
- "dev": true,
- "requires": {
- "cliui": "^4.0.0",
- "decamelize": "^2.0.0",
- "find-up": "^3.0.0",
- "get-caller-file": "^1.0.1",
- "os-locale": "^3.0.0",
- "require-directory": "^2.1.1",
- "require-main-filename": "^1.0.1",
- "set-blocking": "^2.0.0",
- "string-width": "^2.0.0",
- "which-module": "^2.0.0",
- "y18n": "^3.2.1 || ^4.0.0",
- "yargs-parser": "^10.1.0"
- }
- },
- "yargs-parser": {
- "version": "10.1.0",
- "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-10.1.0.tgz",
- "integrity": "sha512-VCIyR1wJoEBZUqk5PA+oOBF6ypbwh5aNB3I50guxAL/quggdfs4TtNHQrSazFA3fYZ+tEqfs0zIGlv0c/rgjbQ==",
- "dev": true,
- "requires": {
- "camelcase": "^4.1.0"
- }
+ "upath": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/upath/-/upath-1.1.2.tgz",
+ "integrity": "sha512-kXpym8nmDmlCBr7nKdIx8P2jNBa+pBpIUFRnKJ4dr8htyYGJFokkr2ZvERRtUN+9SY+JqXouNgUPtv6JQva/2Q==",
+ "dev": true
}
}
},
@@ -12026,12 +12081,6 @@
"integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==",
"dev": true
},
- "xregexp": {
- "version": "4.0.0",
- "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-4.0.0.tgz",
- "integrity": "sha512-PHyM+sQouu7xspQQwELlGwwd05mXUFqwFYfqPO0cC7x4fxyHnnuetmQr6CjJiafIDoH4MogHb9dOoJzR/Y4rFg==",
- "dev": true
- },
"xtend": {
"version": "4.0.1",
"resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
diff --git a/web-console/package.json b/web-console/package.json
index 6cd2232..dcd07d4 100644
--- a/web-console/package.json
+++ b/web-console/package.json
@@ -24,7 +24,7 @@
"stylelint": "stylelint 'src/**/*.scss'"
},
"dependencies": {
- "@blueprintjs/core": "^3.15.0",
+ "@blueprintjs/core": "^3.15.1",
"axios": "^0.18.0",
"brace": "^0.11.1",
"classnames": "^2.2.6",
@@ -50,19 +50,19 @@
"@types/jest": "^24.0.11",
"@types/lodash.debounce": "^4.0.6",
"@types/mocha": "^5.2.6",
- "@types/node": "^11.13.0",
+ "@types/node": "^11.13.4",
"@types/numeral": "^0.0.25",
- "@types/react-dom": "^16.8.3",
- "@types/react-router-dom": "^4.3.1",
- "@types/react-table": "^6.8.0",
- "autoprefixer": "^9.5.0",
- "awesome-code-style": "^1.1.4",
+ "@types/react-dom": "^16.8.4",
+ "@types/react-router-dom": "^4.3.2",
+ "@types/react-table": "^6.8.1",
+ "autoprefixer": "^9.5.1",
+ "awesome-code-style": "^1.2.2",
"css-loader": "^2.1.1",
"identity-obj-proxy": "^3.0.0",
"ignore-styles": "^5.0.1",
"jest": "^24.7.1",
"license-checker": "^25.0.1",
- "mocha": "^6.0.2",
+ "mocha": "^6.1.3",
"node-sass": "^4.11.0",
"node-sass-chokidar": "^1.3.4",
"postcss-cli": "^6.1.2",
@@ -74,14 +74,14 @@
"stylelint-config-recommended-scss": "^3.2.0",
"stylelint-scss": "^3.5.4",
"stylus": "^0.54.5",
- "ts-jest": "^24.0.1",
+ "ts-jest": "^24.0.2",
"ts-loader": "^5.3.3",
"ts-node": "^8.0.3",
"tslint": "^5.15.0",
"tslint-loader": "^3.5.4",
- "typescript": "^3.4.1",
+ "typescript": "^3.4.3",
"webpack": "^4.29.6",
"webpack-cli": "^3.3.0",
- "webpack-dev-server": "^3.2.1"
+ "webpack-dev-server": "^3.3.1"
}
}
diff --git a/web-console/src/views/tasks-view.scss b/web-console/src/components/view-control-bar.scss
similarity index 66%
copy from web-console/src/views/tasks-view.scss
copy to web-console/src/components/view-control-bar.scss
index 07726e9..40cb7f2 100644
--- a/web-console/src/views/tasks-view.scss
+++ b/web-console/src/components/view-control-bar.scss
@@ -16,13 +16,30 @@
* limitations under the License.
*/
-@import "../variables";
+.view-control-bar {
+ height: 30px;
+ white-space: nowrap;
-.tasks-view {
- padding-bottom: 50px;
+ & > * {
+ display: inline-block;
+ margin-right: 15px;
+ vertical-align: bottom;
+ }
+
+ .control-label {
+ font-size: 30px;
+ line-height: 30px;
+ cursor: default;
+ margin-right: 20px;
+ }
+
+ label.bp3-control,
+ label.bp3-label {
+ display: inline-block;
+ margin-bottom: 8px;
+ }
- .control-bar,
- .ReactTable {
- margin-bottom: $standard-padding;
+ .table-column-selection {
+ margin-right: 0;
}
}
diff --git a/web-console/src/views/tasks-view.scss b/web-console/src/components/view-control-bar.tsx
similarity index 64%
copy from web-console/src/views/tasks-view.scss
copy to web-console/src/components/view-control-bar.tsx
index 07726e9..679c671 100644
--- a/web-console/src/views/tasks-view.scss
+++ b/web-console/src/components/view-control-bar.tsx
@@ -16,13 +16,25 @@
* limitations under the License.
*/
-@import "../variables";
+import * as React from 'react';
-.tasks-view {
- padding-bottom: 50px;
+import './view-control-bar.scss';
- .control-bar,
- .ReactTable {
- margin-bottom: $standard-padding;
+export interface ViewControlBarProps {
+ label: string;
+}
+
+export class ViewControlBar extends React.Component<ViewControlBarProps, {}> {
+ constructor(props: ViewControlBarProps) {
+ super(props);
+ }
+
+ render() {
+ const { label, children } = this.props;
+
+ return <div className="view-control-bar">
+ <div className="control-label">{label}</div>
+ {children}
+ </div>;
}
}
diff --git a/web-console/src/console-application.scss b/web-console/src/console-application.scss
index c4de745..a10c3c3 100644
--- a/web-console/src/console-application.scss
+++ b/web-console/src/console-application.scss
@@ -45,20 +45,4 @@
height: 22px;
border-top: 2px solid #6d8ea9;
}
-
- .control-bar {
- height: 35px;
- white-space: nowrap;
-
- & > * {
- display: inline-block;
- margin-right: 15px;
- vertical-align: bottom;
- }
-
- .control-label {
- font-size: 35px;
- line-height: 35px;
- }
- }
}
diff --git a/web-console/src/views/datasource-view.tsx b/web-console/src/views/datasource-view.tsx
index 463e194..2b13b96 100644
--- a/web-console/src/views/datasource-view.tsx
+++ b/web-console/src/views/datasource-view.tsx
@@ -24,6 +24,7 @@ import ReactTable, { Filter } from 'react-table';
import { RuleEditor } from '../components/rule-editor';
import { TableColumnSelection } from '../components/table-column-selection';
+import { ViewControlBar } from '../components/view-control-bar';
import { AsyncActionDialog } from '../dialogs/async-action-dialog';
import { CompactionDialog } from '../dialogs/compaction-dialog';
import { RetentionDialog } from '../dialogs/retention-dialog';
@@ -523,8 +524,7 @@ GROUP BY 1`);
const { tableColumnSelectionHandler } = this;
return <div className="data-sources-view app-view">
- <div className="control-bar">
- <div className="control-label">Datasources</div>
+ <ViewControlBar label="Datasources">
<Button
icon={IconNames.REFRESH}
text="Refresh"
@@ -545,7 +545,7 @@ GROUP BY 1`);
onChange={(column) => tableColumnSelectionHandler.changeTableColumnSelection(column)}
tableColumnsHidden={tableColumnSelectionHandler.hiddenColumns}
/>
- </div>
+ </ViewControlBar>
{this.renderDatasourceTable()}
</div>;
}
diff --git a/web-console/src/views/lookups-view.tsx b/web-console/src/views/lookups-view.tsx
index 037898a..df525ae 100644
--- a/web-console/src/views/lookups-view.tsx
+++ b/web-console/src/views/lookups-view.tsx
@@ -24,6 +24,7 @@ import * as React from 'react';
import ReactTable from 'react-table';
import { TableColumnSelection } from '../components/table-column-selection';
+import { ViewControlBar } from '../components/view-control-bar';
import { AsyncActionDialog } from '../dialogs/async-action-dialog';
import { LookupEditDialog } from '../dialogs/lookup-edit-dialog';
import { AppToaster } from '../singletons/toaster';
@@ -329,14 +330,14 @@ export class LookupsView extends React.Component<LookupsViewProps, LookupsViewSt
const { tableColumnSelectionHandler } = this;
return <div className="lookups-view app-view">
- <div className="control-bar">
- <div className="control-label">Lookups</div>
+ <ViewControlBar label="Lookups">
<Button
icon={IconNames.REFRESH}
text="Refresh"
onClick={() => this.lookupsGetQueryManager.rerunLastQuery()}
/>
- { !lookupsError &&
+ {
+ !lookupsError &&
<Button
icon={IconNames.PLUS}
text="Add"
@@ -348,7 +349,7 @@ export class LookupsView extends React.Component<LookupsViewProps, LookupsViewSt
onChange={(column) => tableColumnSelectionHandler.changeTableColumnSelection(column)}
tableColumnsHidden={tableColumnSelectionHandler.hiddenColumns}
/>
- </div>
+ </ViewControlBar>
{this.renderLookupsTable()}
{this.renderLookupEditDialog()}
{this.renderDeleteLookupAction()}
diff --git a/web-console/src/views/segments-view.tsx b/web-console/src/views/segments-view.tsx
index 95ae001..43bcb01 100644
--- a/web-console/src/views/segments-view.tsx
+++ b/web-console/src/views/segments-view.tsx
@@ -26,6 +26,7 @@ import ReactTable from 'react-table';
import { Filter } from 'react-table';
import { TableColumnSelection } from '../components/table-column-selection';
+import { ViewControlBar } from '../components/view-control-bar';
import { AppToaster } from '../singletons/toaster';
import {
addFilter,
@@ -285,8 +286,7 @@ export class SegmentsView extends React.Component<SegmentsViewProps, SegmentsVie
const { tableColumnSelectionHandler } = this;
return <div className="segments-view app-view">
- <div className="control-bar">
- <div className="control-label">Segments</div>
+ <ViewControlBar label="Segments">
<Button
icon={IconNames.REFRESH}
text="Refresh"
@@ -302,7 +302,7 @@ export class SegmentsView extends React.Component<SegmentsViewProps, SegmentsVie
onChange={(column) => tableColumnSelectionHandler.changeTableColumnSelection(column)}
tableColumnsHidden={tableColumnSelectionHandler.hiddenColumns}
/>
- </div>
+ </ViewControlBar>
{this.renderSegmentsTable()}
</div>;
}
diff --git a/web-console/src/views/servers-view.scss b/web-console/src/views/servers-view.scss
index 45bbf2a..419e58e 100644
--- a/web-console/src/views/servers-view.scss
+++ b/web-console/src/views/servers-view.scss
@@ -21,7 +21,7 @@
.servers-view {
padding-bottom: 50px;
- .control-bar,
+ .view-control-bar,
.ReactTable {
margin-bottom: $standard-padding;
}
diff --git a/web-console/src/views/servers-view.tsx b/web-console/src/views/servers-view.tsx
index 651a645..f04ed44 100644
--- a/web-console/src/views/servers-view.tsx
+++ b/web-console/src/views/servers-view.tsx
@@ -26,6 +26,7 @@ import ReactTable from 'react-table';
import { Filter } from 'react-table';
import { TableColumnSelection } from '../components/table-column-selection';
+import { ViewControlBar } from '../components/view-control-bar';
import {
addFilter,
formatBytes,
@@ -370,8 +371,7 @@ WHERE "server_type" = 'historical'`);
const { serverTableColumnSelectionHandler, middleManagerTableColumnSelectionHandler } = this;
return <div className="servers-view app-view">
- <div className="control-bar">
- <div className="control-label">Historicals</div>
+ <ViewControlBar label="Historicals">
<Button
icon={IconNames.REFRESH}
text="Refresh"
@@ -392,13 +392,12 @@ WHERE "server_type" = 'historical'`);
onChange={(column) => serverTableColumnSelectionHandler.changeTableColumnSelection(column)}
tableColumnsHidden={serverTableColumnSelectionHandler.hiddenColumns}
/>
- </div>
+ </ViewControlBar>
{this.renderServersTable()}
<div className="control-separator"/>
- <div className="control-bar">
- <div className="control-label">MiddleManagers</div>
+ <ViewControlBar label="MiddleManagers">
<Button
icon={IconNames.REFRESH}
text="Refresh"
@@ -409,7 +408,7 @@ WHERE "server_type" = 'historical'`);
onChange={(column) => middleManagerTableColumnSelectionHandler.changeTableColumnSelection(column)}
tableColumnsHidden={middleManagerTableColumnSelectionHandler.hiddenColumns}
/>
- </div>
+ </ViewControlBar>
{this.renderMiddleManagerTable()}
</div>;
}
diff --git a/web-console/src/views/tasks-view.scss b/web-console/src/views/tasks-view.scss
index 07726e9..fd47a01 100644
--- a/web-console/src/views/tasks-view.scss
+++ b/web-console/src/views/tasks-view.scss
@@ -21,7 +21,7 @@
.tasks-view {
padding-bottom: 50px;
- .control-bar,
+ .view-control-bar,
.ReactTable {
margin-bottom: $standard-padding;
}
diff --git a/web-console/src/views/tasks-view.tsx b/web-console/src/views/tasks-view.tsx
index 5f0756c..5cd4dc4 100644
--- a/web-console/src/views/tasks-view.tsx
+++ b/web-console/src/views/tasks-view.tsx
@@ -25,6 +25,7 @@ import ReactTable from 'react-table';
import { Filter } from 'react-table';
import { TableColumnSelection } from '../components/table-column-selection';
+import { ViewControlBar } from '../components/view-control-bar';
import { AsyncActionDialog } from '../dialogs/async-action-dialog';
import { SpecDialog } from '../dialogs/spec-dialog';
import { AppToaster } from '../singletons/toaster';
@@ -570,8 +571,7 @@ ORDER BY "rank" DESC, "created_time" DESC`);
const { supervisorTableColumnSelectionHandler, taskTableColumnSelectionHandler } = this;
return <div className="tasks-view app-view">
- <div className="control-bar">
- <div className="control-label">Supervisors</div>
+ <ViewControlBar label="Supervisors">
<Button
icon={IconNames.REFRESH}
text="Refresh"
@@ -587,13 +587,12 @@ ORDER BY "rank" DESC, "created_time" DESC`);
onChange={(column) => supervisorTableColumnSelectionHandler.changeTableColumnSelection(column)}
tableColumnsHidden={supervisorTableColumnSelectionHandler.hiddenColumns}
/>
- </div>
+ </ViewControlBar>
{this.renderSupervisorTable()}
<div className="control-separator"/>
- <div className="control-bar">
- <div className="control-label">Tasks</div>
+ <ViewControlBar label="Tasks">
<Label>Group by</Label>
<ButtonGroup>
<Button active={groupTasksBy === null} onClick={() => this.setState({ groupTasksBy: null })}>None</Button>
@@ -621,7 +620,7 @@ ORDER BY "rank" DESC, "created_time" DESC`);
onChange={(column) => taskTableColumnSelectionHandler.changeTableColumnSelection(column)}
tableColumnsHidden={taskTableColumnSelectionHandler.hiddenColumns}
/>
- </div>
+ </ViewControlBar>
{this.renderTaskTable()}
{ supervisorSpecDialogOpen ? <SpecDialog
onClose={() => this.setState({ supervisorSpecDialogOpen: false })}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org