You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@druid.apache.org by vo...@apache.org on 2021/07/28 16:25:41 UTC
[druid] branch master updated: Update awesome-code-style (#11503)
This is an automated email from the ASF dual-hosted git repository.
vogievetsky pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/druid.git
The following commit(s) were added to refs/heads/master by this push:
new 280c080 Update awesome-code-style (#11503)
280c080 is described below
commit 280c08045fb4384db0389b12bf50ec82168ae996
Author: John Gozde <jo...@gozde.ca>
AuthorDate: Wed Jul 28 10:25:18 2021 -0600
Update awesome-code-style (#11503)
---
web-console/.eslintrc.js | 2 +-
web-console/package-lock.json | 126 ++++++++++++++++++---
web-console/package.json | 3 +-
.../src/components/timed-button/timed-button.tsx | 2 +-
.../views/query-view/query-output/query-output.tsx | 6 +-
5 files changed, 120 insertions(+), 19 deletions(-)
diff --git a/web-console/.eslintrc.js b/web-console/.eslintrc.js
index c27f429..519496c 100644
--- a/web-console/.eslintrc.js
+++ b/web-console/.eslintrc.js
@@ -20,7 +20,7 @@ module.exports = {
env: {
browser: true,
},
- extends: ['@awesome-code-style'],
+ extends: ['@awesome-code-style', '@awesome-code-style/eslint-config/react'],
parserOptions: {
project: 'tsconfig.json',
},
diff --git a/web-console/package-lock.json b/web-console/package-lock.json
index 5089227..9f24067 100644
--- a/web-console/package-lock.json
+++ b/web-console/package-lock.json
@@ -5,9 +5,9 @@
"requires": true,
"dependencies": {
"@awesome-code-style/eslint-config": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/@awesome-code-style/eslint-config/-/eslint-config-3.0.0.tgz",
- "integrity": "sha512-w/aZ51cxejAgs/zGXdpyuGhW4ikocBFZH2ipk9kDgiuR7sYV7BJVwPC6t5YNS6ZoYILCd7w0t7LvSfN0ochmNQ==",
+ "version": "3.2.0",
+ "resolved": "https://registry.npmjs.org/@awesome-code-style/eslint-config/-/eslint-config-3.2.0.tgz",
+ "integrity": "sha512-IKozmD4O0nmw6kQQCk/FvM8KQZIU0HECfL4oiEdORC5tGh4OeSloKMuyvmuRSbnrYYDtnRVSb+zg+HUMTL1hOw==",
"dev": true,
"requires": {
"@typescript-eslint/parser": "^4.22.0"
@@ -5124,31 +5124,116 @@
}
},
"@typescript-eslint/parser": {
- "version": "4.22.0",
- "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.22.0.tgz",
- "integrity": "sha512-z/bGdBJJZJN76nvAY9DkJANYgK3nlRstRRi74WHm3jjgf2I8AglrSY+6l7ogxOmn55YJ6oKZCLLy+6PW70z15Q==",
+ "version": "4.28.5",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.28.5.tgz",
+ "integrity": "sha512-NPCOGhTnkXGMqTznqgVbA5LqVsnw+i3+XA1UKLnAb+MG1Y1rP4ZSK9GX0kJBmAZTMIktf+dTwXToT6kFwyimbw==",
"dev": true,
"requires": {
- "@typescript-eslint/scope-manager": "4.22.0",
- "@typescript-eslint/types": "4.22.0",
- "@typescript-eslint/typescript-estree": "4.22.0",
- "debug": "^4.1.1"
+ "@typescript-eslint/scope-manager": "4.28.5",
+ "@typescript-eslint/types": "4.28.5",
+ "@typescript-eslint/typescript-estree": "4.28.5",
+ "debug": "^4.3.1"
},
"dependencies": {
+ "@typescript-eslint/scope-manager": {
+ "version": "4.28.5",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.28.5.tgz",
+ "integrity": "sha512-PHLq6n9nTMrLYcVcIZ7v0VY1X7dK309NM8ya9oL/yG8syFINIMHxyr2GzGoBYUdv3NUfCOqtuqps0ZmcgnZTfQ==",
+ "dev": true,
+ "requires": {
+ "@typescript-eslint/types": "4.28.5",
+ "@typescript-eslint/visitor-keys": "4.28.5"
+ }
+ },
+ "@typescript-eslint/types": {
+ "version": "4.28.5",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.28.5.tgz",
+ "integrity": "sha512-MruOu4ZaDOLOhw4f/6iudyks/obuvvZUAHBDSW80Trnc5+ovmViLT2ZMDXhUV66ozcl6z0LJfKs1Usldgi/WCA==",
+ "dev": true
+ },
+ "@typescript-eslint/typescript-estree": {
+ "version": "4.28.5",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.5.tgz",
+ "integrity": "sha512-FzJUKsBX8poCCdve7iV7ShirP8V+ys2t1fvamVeD1rWpiAnIm550a+BX/fmTHrjEpQJ7ZAn+Z7ZZwJjytk9rZw==",
+ "dev": true,
+ "requires": {
+ "@typescript-eslint/types": "4.28.5",
+ "@typescript-eslint/visitor-keys": "4.28.5",
+ "debug": "^4.3.1",
+ "globby": "^11.0.3",
+ "is-glob": "^4.0.1",
+ "semver": "^7.3.5",
+ "tsutils": "^3.21.0"
+ }
+ },
+ "@typescript-eslint/visitor-keys": {
+ "version": "4.28.5",
+ "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.5.tgz",
+ "integrity": "sha512-dva/7Rr+EkxNWdJWau26xU/0slnFlkh88v3TsyTgRS/IIYFi5iIfpCFM4ikw0vQTFUR9FYSSyqgK4w64gsgxhg==",
+ "dev": true,
+ "requires": {
+ "@typescript-eslint/types": "4.28.5",
+ "eslint-visitor-keys": "^2.0.0"
+ }
+ },
+ "array-union": {
+ "version": "2.1.0",
+ "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz",
+ "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==",
+ "dev": true
+ },
"debug": {
- "version": "4.3.1",
- "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
- "integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
+ "version": "4.3.2",
+ "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz",
+ "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==",
"dev": true,
"requires": {
"ms": "2.1.2"
}
},
+ "globby": {
+ "version": "11.0.4",
+ "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz",
+ "integrity": "sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==",
+ "dev": true,
+ "requires": {
+ "array-union": "^2.1.0",
+ "dir-glob": "^3.0.1",
+ "fast-glob": "^3.1.1",
+ "ignore": "^5.1.4",
+ "merge2": "^1.3.0",
+ "slash": "^3.0.0"
+ }
+ },
+ "lru-cache": {
+ "version": "6.0.0",
+ "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+ "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+ "dev": true,
+ "requires": {
+ "yallist": "^4.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
+ },
+ "semver": {
+ "version": "7.3.5",
+ "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
+ "integrity": "sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==",
+ "dev": true,
+ "requires": {
+ "lru-cache": "^6.0.0"
+ }
+ },
+ "yallist": {
+ "version": "4.0.0",
+ "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+ "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
+ "dev": true
}
}
},
@@ -9080,6 +9165,21 @@
}
}
},
+ "eslint-plugin-unused-imports": {
+ "version": "1.1.2",
+ "resolved": "https://registry.npmjs.org/eslint-plugin-unused-imports/-/eslint-plugin-unused-imports-1.1.2.tgz",
+ "integrity": "sha512-dfiCZiv/lSkOp6/JIjP+ASIs1vxLgiN1NISM+oxcO799+FEZQXy0Se1CaAHQt4BCInBOJ9LK0ILCe1lMMI+YGA==",
+ "dev": true,
+ "requires": {
+ "eslint-rule-composer": "^0.3.0"
+ }
+ },
+ "eslint-rule-composer": {
+ "version": "0.3.0",
+ "resolved": "https://registry.npmjs.org/eslint-rule-composer/-/eslint-rule-composer-0.3.0.tgz",
+ "integrity": "sha512-bt+Sh8CtDmn2OajxvNO+BX7Wn4CIWMpTRm3MaiKPCQcnnlm0CS2mhui6QaoeQugs+3Kj2ESKEEGJUdVafwhiCg==",
+ "dev": true
+ },
"eslint-scope": {
"version": "5.1.1",
"resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
diff --git a/web-console/package.json b/web-console/package.json
index 147e7eb..3eaf1bb 100644
--- a/web-console/package.json
+++ b/web-console/package.json
@@ -100,7 +100,7 @@
"tslib": "^2.2.0"
},
"devDependencies": {
- "@awesome-code-style/eslint-config": "^3.0.0",
+ "@awesome-code-style/eslint-config": "^3.2.0",
"@awesome-code-style/prettier-config": "^3.0.0",
"@awesome-code-style/stylelint-config": "^3.0.0",
"@babel/core": "^7.14.3",
@@ -144,6 +144,7 @@
"eslint-plugin-react-hooks": "^4.2.0",
"eslint-plugin-simple-import-sort": "^7.0.0",
"eslint-plugin-unicorn": "^30.0.0",
+ "eslint-plugin-unused-imports": "^1.1.2",
"file-loader": "^6.2.0",
"fs-extra": "^8.1.0",
"identity-obj-proxy": "^3.0.0",
diff --git a/web-console/src/components/timed-button/timed-button.tsx b/web-console/src/components/timed-button/timed-button.tsx
index ffda0a9..01e759e 100644
--- a/web-console/src/components/timed-button/timed-button.tsx
+++ b/web-console/src/components/timed-button/timed-button.tsx
@@ -42,7 +42,7 @@ export const TimedButton = React.memo(function TimedButton(props: TimedButtonPro
label,
delays,
onRefresh,
- type,
+ type: _type,
text,
icon,
defaultDelay,
diff --git a/web-console/src/views/query-view/query-output/query-output.tsx b/web-console/src/views/query-view/query-output/query-output.tsx
index 78df215..542c588 100644
--- a/web-console/src/views/query-view/query-output/query-output.tsx
+++ b/web-console/src/views/query-view/query-output/query-output.tsx
@@ -99,9 +99,9 @@ export const QueryOutput = React.memo(function QueryOutput(props: QueryOutputPro
// Reset page to 0 if number of results changes
useEffect(() => {
- if (pagination.page) {
- setPagination(changePage(pagination, 0));
- }
+ setPagination(pagination => {
+ return pagination.page ? changePage(pagination, 0) : pagination;
+ });
}, [queryResult.rows.length]);
function hasFilterOnHeader(header: string, headerIndex: number): boolean {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@druid.apache.org
For additional commands, e-mail: commits-help@druid.apache.org