Apache
/
druid
mirror of https://github.com/apache/druid.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix spaces and make linting more strict (#7812)

This commit is contained in:
Vadim Ogievetsky 2019-06-01 10:14:13 -07:00 committed by Fangjin Yang
parent 21d3d0cde8
commit 4ad058c429
6 changed files with 178 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

182
web-console/package-lock.json generated
View File

@ -509,9 +509,9 @@
} }
}, },
"@types/classnames": { "@types/classnames": {
"version": "2.2.7", "version": "2.2.8",
"resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.2.7.tgz", "resolved": "https://registry.npmjs.org/@types/classnames/-/classnames-2.2.8.tgz",
"integrity": "sha512-rzOhiQ55WzAiFgXRtitP/ZUT8iVNyllEpylJ5zHzR4vArUvMB39GTk+Zon/uAM0JxEFAWnwsxC2gH8s+tZ3Myg==", "integrity": "sha512-3UrLzPnz8u+MMXuJTF++389IfLSQUbl5F3ry9WCxva0BKG5H/oo5NuPRXk+HrpPU1+5pVHSWhnVWRzIaFQ7QuQ==",
"dev": true "dev": true
}, },
"@types/d3-array": { "@types/d3-array": {
@ -641,9 +641,9 @@
"dev": true "dev": true
}, },
"@types/node": { "@types/node": {
"version": "12.0.3", "version": "12.0.4",
"resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.3.tgz", "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.4.tgz",
"integrity": "sha512-zkOxCS/fA+3SsdA+9Yun0iANxzhQRiNwTvJSr6N95JhuJ/x27z9G2URx1Jpt3zYFfCGUXZGL5UDxt5eyLE7wgw==", "integrity": "sha512-j8YL2C0fXq7IONwl/Ud5Kt0PeXw22zGERt+HSSnwbKOJVsAGkEz3sFCYwaF9IOuoG1HOtE0vKCj6sXF7Q0+Vaw==",
"dev": true "dev": true
}, },
"@types/numeral": { "@types/numeral": {
@ -717,9 +717,9 @@
} }
}, },
"@types/react-table": { "@types/react-table": {
"version": "6.8.1", "version": "6.8.3",
"resolved": "https://registry.npmjs.org/@types/react-table/-/react-table-6.8.1.tgz", "resolved": "https://registry.npmjs.org/@types/react-table/-/react-table-6.8.3.tgz",
"integrity": "sha512-56wi1s7+H4eGbtXsppNz/OeBeUiPQZnJYLxia0ZpwcD47VfYFE1EkbVadEoJshJIjR4nbSQSF/AgJHvC/ZwHaQ==", "integrity": "sha512-N1gU4+u9qUTHy3V+uJ0BRIE+c++B4RCZDTCW8HIDRSLR9ieEN8M0uc05yhOKN8hgA8JgxAFuNYbqztxjTKbpaA==",
"dev": true, "dev": true,
"requires": { "requires": {
"@types/react": "*" "@types/react": "*"
@ -1395,14 +1395,15 @@
} }
}, },
"awesome-code-style": { "awesome-code-style": {
"version": "1.2.2", "version": "1.3.2",
"resolved": "https://registry.npmjs.org/awesome-code-style/-/awesome-code-style-1.2.2.tgz", "resolved": "https://registry.npmjs.org/awesome-code-style/-/awesome-code-style-1.3.2.tgz",
"integrity": "sha512-hWkz6pLemW7z4AAaiia2096O+Fus68FOKlaZJMJWXjVNERUST67VCyRb4FGAr/c2m5GrMpbXLmidCF3GdGO4pA==", "integrity": "sha512-4AHAhzX9jCnqsCcgdSSDGY8ggBoB+x4vcvDElAN5J81nNajGfFHUPrJ6RY7vB1eTzwXBAWLqaEo+FLCgKemfoA==",
"dev": true, "dev": true,
"requires": { "requires": {
"stylelint-config-recommended": "^2.1.0", "stylelint-config-recommended": "^2.2.0",
"stylelint-scss": "^3.5.4", "stylelint-scss": "^3.8.0",
"tslint-react": "^3.6.0" "tslint-eslint-rules": "^5.4.0",
"tslint-react": "^4.0.0"
} }
}, },
"aws-sign2": { "aws-sign2": {
@ -1418,12 +1419,19 @@
"dev": true "dev": true
}, },
"axios": { "axios": {
"version": "0.18.0", "version": "0.19.0",
"resolved": "https://registry.npmjs.org/axios/-/axios-0.18.0.tgz", "resolved": "https://registry.npmjs.org/axios/-/axios-0.19.0.tgz",
"integrity": "sha1-MtU+SFHv3AoRmTts0AB4nXDAUQI=", "integrity": "sha512-1uvKqKQta3KBxIz14F2v06AEHZ/dIoeKfbTRkK1E5oqjDnuEerLmYTgJB5AiQZHJcljpg1TuRzdjDR06qNk0DQ==",
"requires": { "requires": {
"follow-redirects": "^1.3.0", "follow-redirects": "1.5.10",
"is-buffer": "^1.1.5" "is-buffer": "^2.0.2"
},
"dependencies": {
"is-buffer": {
"version": "2.0.3",
"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.3.tgz",
"integrity": "sha512-U15Q7MXTuZlrbymiz95PJpZxu8IlipAp4dtS3wOdgPXx3mqBnslrWU14kxfHB+Py/+2PVKSr37dMAgM2A4uArw=="
}
} }
}, },
"babel-jest": { "babel-jest": {
@ -2786,6 +2794,7 @@
"version": "3.2.6", "version": "3.2.6",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz", "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.6.tgz",
"integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==", "integrity": "sha512-mel+jf7nrtEl5Pn1Qx46zARXKDpBbvzezse7p7LqINmdoIk8PYP5SySaxEmYv6TZ0JyEKA1hsCId6DIhgITtWQ==",
"dev": true,
"requires": { "requires": {
"ms": "^2.1.1" "ms": "^2.1.1"
} }
@ -3069,6 +3078,24 @@
"buffer-indexof": "^1.0.0" "buffer-indexof": "^1.0.0"
} }
}, },
"doctrine": {
"version": "0.7.2",
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-0.7.2.tgz",
"integrity": "sha1-fLhgNZujvpDgQLJrcpzkv6ZUxSM=",
"dev": true,
"requires": {
"esutils": "^1.1.6",
"isarray": "0.0.1"
},
"dependencies": {
"esutils": {
"version": "1.1.6",
"resolved": "https://registry.npmjs.org/esutils/-/esutils-1.1.6.tgz",
"integrity": "sha1-wBzKqa5LiXxtDD4hCuUvPHqEQ3U=",
"dev": true
}
}
},
"dom-helpers": { "dom-helpers": {
"version": "3.4.0", "version": "3.4.0",
"resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz", "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz",
@ -4060,11 +4087,26 @@
} }
}, },
"follow-redirects": { "follow-redirects": {
"version": "1.7.0", "version": "1.5.10",
"resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.7.0.tgz", "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
"integrity": "sha512-m/pZQy4Gj287eNy94nivy5wchN3Kp+Q5WgUPNy5lJSZ3sgkVKSYV/ZChMAQVIgx1SqfZ2zBZtPA2YlXIWxxJOQ==", "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
"requires": { "requires": {
"debug": "^3.2.6" "debug": "=3.1.0"
},
"dependencies": {
"debug": {
"version": "3.1.0",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
"integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
"requires": {
"ms": "2.0.0"
}
},
"ms": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
"integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
}
} }
}, },
"for-in": { "for-in": {
@ -5672,7 +5714,8 @@
"is-buffer": { "is-buffer": {
"version": "1.1.6", "version": "1.1.6",
"resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
"integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
"dev": true
}, },
"is-callable": { "is-callable": {
"version": "1.1.4", "version": "1.1.4",
@ -6789,9 +6832,9 @@
} }
}, },
"loglevel": { "loglevel": {
"version": "1.6.1", "version": "1.6.2",
"resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.1.tgz", "resolved": "https://registry.npmjs.org/loglevel/-/loglevel-1.6.2.tgz",
"integrity": "sha1-4PyVEztu8nbNyIh82vJKpvFW+Po=", "integrity": "sha512-Jt2MHrCNdtIe1W6co3tF5KXGRkzF+TYffiQstfXa04mrss9IKXzAAXYWak8LbZseAQY03sH2GzMCMU0ZOUc9bg==",
"dev": true "dev": true
}, },
"longest-streak": { "longest-streak": {
@ -7353,7 +7396,8 @@
"ms": { "ms": {
"version": "2.1.1", "version": "2.1.1",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz",
"integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==" "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==",
"dev": true
}, },
"multicast-dns": { "multicast-dns": {
"version": "6.2.3", "version": "6.2.3",
@ -11544,9 +11588,9 @@
} }
}, },
"stylelint-scss": { "stylelint-scss": {
"version": "3.6.1", "version": "3.8.0",
"resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.6.1.tgz", "resolved": "https://registry.npmjs.org/stylelint-scss/-/stylelint-scss-3.8.0.tgz",
"integrity": "sha512-6bB2EHUZsE/bDVKUdzBXqOcfgXmg3zq9Lglgbu16EqMa4PM8Y48XKcB8coOj8CKr07GtlqtOdCNA2E5njoI9Kw==", "integrity": "sha512-J55tNmxXEh/ymhz5BiscIiUcHgPmJ2Nv+0+zgnqTqdQBe1URQbrdjlAyK3xq+7i2nVpWr2wlRj25SjoonZFcHg==",
"dev": true, "dev": true,
"requires": { "requires": {
"lodash": "^4.17.11", "lodash": "^4.17.11",
@ -11978,9 +12022,9 @@
} }
}, },
"ts-loader": { "ts-loader": {
"version": "6.0.1", "version": "6.0.2",
"resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-6.0.1.tgz", "resolved": "https://registry.npmjs.org/ts-loader/-/ts-loader-6.0.2.tgz",
"integrity": "sha512-9H5ErTIw5t73sdSoFE0hX0RO45B7cdDA4pW1VIQ2wNFAhxSpZcAlv2fwMcfv6SAYLoI7uGwHuzC5dECzmzqtzA==", "integrity": "sha512-kkF3sGf3oBUehlvXI9fkbItbFTnNgGkYAz91vtWnsKAU4m+LAmQjuby7uTZNo3As+/zHLuyB052SkQDY6vLXtg==",
"dev": true, "dev": true,
"requires": { "requires": {
"chalk": "^2.3.0", "chalk": "^2.3.0",
@ -12060,9 +12104,9 @@
"integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ==" "integrity": "sha512-4krF8scpejhaOgqzBEcGM7yDIEfi0/8+8zDRZhNZZ2kjmHJ4hv3zCbQWxoJGz1iw5U0Jl0nma13xzHXcncMavQ=="
}, },
"tslint": { "tslint": {
"version": "5.16.0", "version": "5.17.0",
"resolved": "https://registry.npmjs.org/tslint/-/tslint-5.16.0.tgz", "resolved": "https://registry.npmjs.org/tslint/-/tslint-5.17.0.tgz",
"integrity": "sha512-UxG2yNxJ5pgGwmMzPMYh/CCnCnh0HfPgtlVRDs1ykZklufFBL1ZoTlWFRz2NQjcoEiDoRp+JyT0lhBbbH/obyA==", "integrity": "sha512-pflx87WfVoYepTet3xLfDOLDm9Jqi61UXIKePOuca0qoAZyrGWonDG9VTbji58Fy+8gciUn8Bt7y69+KEVjc/w==",
"dev": true, "dev": true,
"requires": { "requires": {
"@babel/code-frame": "^7.0.0", "@babel/code-frame": "^7.0.0",
@ -12071,7 +12115,7 @@
"commander": "^2.12.1", "commander": "^2.12.1",
"diff": "^3.2.0", "diff": "^3.2.0",
"glob": "^7.1.1", "glob": "^7.1.1",
"js-yaml": "^3.13.0", "js-yaml": "^3.13.1",
"minimatch": "^3.0.4", "minimatch": "^3.0.4",
"mkdirp": "^0.5.1", "mkdirp": "^0.5.1",
"resolve": "^1.3.2", "resolve": "^1.3.2",
@ -12085,6 +12129,34 @@
"resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz",
"integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==",
"dev": true "dev": true
},
"tsutils": {
"version": "2.29.0",
"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz",
"integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==",
"dev": true,
"requires": {
"tslib": "^1.8.1"
}
}
}
},
"tslint-eslint-rules": {
"version": "5.4.0",
"resolved": "https://registry.npmjs.org/tslint-eslint-rules/-/tslint-eslint-rules-5.4.0.tgz",
"integrity": "sha512-WlSXE+J2vY/VPgIcqQuijMQiel+UtmXS+4nvK4ZzlDiqBfXse8FAvkNnTcYhnQyOTW5KFM+uRRGXxYhFpuBc6w==",
"dev": true,
"requires": {
"doctrine": "0.7.2",
"tslib": "1.9.0",
"tsutils": "^3.0.0"
},
"dependencies": {
"tslib": {
"version": "1.9.0",
"resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.0.tgz",
"integrity": "sha512-f/qGG2tUkrISBlQZEjEqoZ3B2+npJjIf04H1wuAv9iA8i04Icp+61KRXxFdha22670NJopsZCIjhC3SnjPRKrQ==",
"dev": true
} }
} }
}, },
@ -12102,18 +12174,18 @@
} }
}, },
"tslint-react": { "tslint-react": {
"version": "3.6.0", "version": "4.0.0",
"resolved": "https://registry.npmjs.org/tslint-react/-/tslint-react-3.6.0.tgz", "resolved": "https://registry.npmjs.org/tslint-react/-/tslint-react-4.0.0.tgz",
"integrity": "sha512-AIv1QcsSnj7e9pFir6cJ6vIncTqxfqeFF3Lzh8SuuBljueYzEAtByuB6zMaD27BL0xhMEqsZ9s5eHuCONydjBw==", "integrity": "sha512-9fNE0fm9zNDx1+b6hgy8rgDN2WsQLRiIrn3+fbqm0tazBVF6jiaCFAITxmU+WSFWYE03Xhp1joCircXOe1WVAQ==",
"dev": true, "dev": true,
"requires": { "requires": {
"tsutils": "^2.13.1" "tsutils": "^3.9.1"
} }
}, },
"tsutils": { "tsutils": {
"version": "2.29.0", "version": "3.12.0",
"resolved": "https://registry.npmjs.org/tsutils/-/tsutils-2.29.0.tgz", "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.12.0.tgz",
"integrity": "sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA==", "integrity": "sha512-64KxDOb3+5ZVbz6NDZlCtOHstLk9+W96Y7d5Z/s5ge92gLaunxDeXYahvB7Rhl1dbaa3ifyq/W53o4mshIV1Tw==",
"dev": true, "dev": true,
"requires": { "requires": {
"tslib": "^1.8.1" "tslib": "^1.8.1"
@ -12171,9 +12243,9 @@
"dev": true "dev": true
}, },
"typescript": { "typescript": {
"version": "3.4.5", "version": "3.5.1",
"resolved": "https://registry.npmjs.org/typescript/-/typescript-3.4.5.tgz", "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.1.tgz",
"integrity": "sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==", "integrity": "sha512-64HkdiRv1yYZsSe4xC1WVgamNigVYjlssIoaH2HcZF0+ijsk5YK2g0G34w9wJkze8+5ow4STd22AynfO6ZYYLw==",
"dev": true "dev": true
}, },
"ua-parser-js": { "ua-parser-js": {
@ -12774,9 +12846,9 @@
} }
}, },
"webpack-dev-server": { "webpack-dev-server": {
"version": "3.4.1", "version": "3.5.0",
"resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.4.1.tgz", "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-3.5.0.tgz",
"integrity": "sha512-CRqZQX2ryMtrg0r3TXQPpNh76eM1HD3Wmu6zDBxIKi/d2y+4aa28Ia8weNT0bfgWpY6Vs3Oq/K8+DjfbR+tWYw==", "integrity": "sha512-Gr4tBz+BRliDy1Jh9YJBOuwf13CipVxf4PCH7alB/rV/heszJ/U8M7KYekzlQn8XvoGgyozw7Uef2GDFd0ZLvg==",
"dev": true, "dev": true,
"requires": { "requires": {
"ansi-html": "0.0.7", "ansi-html": "0.0.7",
@ -12786,19 +12858,19 @@
"connect-history-api-fallback": "^1.6.0", "connect-history-api-fallback": "^1.6.0",
"debug": "^4.1.1", "debug": "^4.1.1",
"del": "^4.1.1", "del": "^4.1.1",
"express": "^4.17.0", "express": "^4.17.1",
"html-entities": "^1.2.1", "html-entities": "^1.2.1",
"http-proxy-middleware": "^0.19.1", "http-proxy-middleware": "^0.19.1",
"import-local": "^2.0.0", "import-local": "^2.0.0",
"internal-ip": "^4.3.0", "internal-ip": "^4.3.0",
"ip": "^1.1.5", "ip": "^1.1.5",
"killable": "^1.0.1", "killable": "^1.0.1",
"loglevel": "^1.6.1", "loglevel": "^1.6.2",
"opn": "^5.5.0", "opn": "^5.5.0",
"portfinder": "^1.0.20", "portfinder": "^1.0.20",
"schema-utils": "^1.0.0", "schema-utils": "^1.0.0",
"selfsigned": "^1.10.4", "selfsigned": "^1.10.4",
"semver": "^6.0.0", "semver": "^6.1.1",
"serve-index": "^1.9.1", "serve-index": "^1.9.1",
"sockjs": "0.3.19", "sockjs": "0.3.19",
"sockjs-client": "1.3.0", "sockjs-client": "1.3.0",

20
web-console/package.json
View File

@ -43,7 +43,7 @@
}, },
"dependencies": { "dependencies": {
"@blueprintjs/core": "^3.15.1", "@blueprintjs/core": "^3.15.1",
"axios": "^0.18.0", "axios": "^0.19.0",
"brace": "^0.11.1", "brace": "^0.11.1",
"classnames": "^2.2.6", "classnames": "^2.2.6",
"d3-array": "^2.2.0", "d3-array": "^2.2.0",
@ -65,7 +65,7 @@
"tslib": "^1.9.3" "tslib": "^1.9.3"
}, },
"devDependencies": { "devDependencies": {
"@types/classnames": "^2.2.7", "@types/classnames": "^2.2.8",
"@types/d3-array": "^2.0.0", "@types/d3-array": "^2.0.0",
"@types/enzyme": "^3.9.3", "@types/enzyme": "^3.9.3",
"@types/enzyme-adapter-react-16": "^1.0.5", "@types/enzyme-adapter-react-16": "^1.0.5",
@ -73,16 +73,16 @@
"@types/hjson": "^2.4.1", "@types/hjson": "^2.4.1",
"@types/jest": "^24.0.13", "@types/jest": "^24.0.13",
"@types/lodash.debounce": "^4.0.6", "@types/lodash.debounce": "^4.0.6",
"@types/node": "^12.0.3", "@types/node": "^12.0.4",
"@types/numeral": "^0.0.25", "@types/numeral": "^0.0.25",
"@types/react": "^16.8.19", "@types/react": "^16.8.19",
"@types/react-copy-to-clipboard": "^4.2.6", "@types/react-copy-to-clipboard": "^4.2.6",
"@types/react-dom": "^16.8.4", "@types/react-dom": "^16.8.4",
"@types/react-router-dom": "^4.3.3", "@types/react-router-dom": "^4.3.3",
"@types/react-splitter-layout": "^3.0.0", "@types/react-splitter-layout": "^3.0.0",
"@types/react-table": "6.8.1", "@types/react-table": "6.8.3",
"autoprefixer": "^9.5.1", "autoprefixer": "^9.5.1",
"awesome-code-style": "^1.2.2", "awesome-code-style": "^1.3.2",
"css-loader": "^2.1.1", "css-loader": "^2.1.1",
"enzyme": "^3.9.0", "enzyme": "^3.9.0",
"enzyme-adapter-react-16": "^1.13.2", "enzyme-adapter-react-16": "^1.13.2",
@ -102,17 +102,17 @@
"style-loader": "^0.23.1", "style-loader": "^0.23.1",
"stylelint": "^10.0.1", "stylelint": "^10.0.1",
"stylelint-config-recommended-scss": "^3.3.0", "stylelint-config-recommended-scss": "^3.3.0",
"stylelint-scss": "^3.6.1", "stylelint-scss": "^3.8.0",
"stylus": "^0.54.5", "stylus": "^0.54.5",
"ts-jest": "^24.0.2", "ts-jest": "^24.0.2",
"ts-loader": "^6.0.1", "ts-loader": "^6.0.2",
"ts-node": "^8.2.0", "ts-node": "^8.2.0",
"tslint": "^5.16.0", "tslint": "^5.17.0",
"tslint-loader": "^3.5.4", "tslint-loader": "^3.5.4",
"typescript": "^3.4.5", "typescript": "^3.5.1",
"webpack": "^4.32.2", "webpack": "^4.32.2",
"webpack-bundle-analyzer": "^3.3.2", "webpack-bundle-analyzer": "^3.3.2",
"webpack-cli": "^3.3.2", "webpack-cli": "^3.3.2",
"webpack-dev-server": "^3.4.1" "webpack-dev-server": "^3.5.0"
} }
} }

6
web-console/script/create-sql-function-doc.js
View File

@ -45,9 +45,9 @@ const comment = `// This file is auto generated and should not be modified`;
const disableTSlint = '/* tslint:disable */'; const disableTSlint = '/* tslint:disable */';
const interfaceStr = `export interface FunctionDescription { const interfaceStr = `export interface FunctionDescription {
syntax: string; syntax: string;
description: string; description: string;
}`; }`;
const heading = `${license}\n\n${comment}\n\n${interfaceStr}\n\n${disableTSlint}\n\n`; const heading = `${license}\n\n${comment}\n\n${interfaceStr}\n\n${disableTSlint}\n\n`;

18
web-console/src/components/show-log/show-log.tsx
View File

@ -75,16 +75,16 @@ export class ShowLog extends React.Component<ShowLogProps, ShowLogState> {
} }
async tail() { async tail() {
await this.getLogInfo(); await this.getLogInfo();
if (this.state.tail) { if (this.state.tail) {
if (this.log.current) { if (this.log.current) {
this.log.current.scrollTo(0, this.log.current.scrollHeight); this.log.current.scrollTo(0, this.log.current.scrollHeight);
} }
setTimeout(() => { setTimeout(() => {
this.tail(); this.tail();
}, 2000); }, 2000);
}
} }
}
private handleCheckboxChange = () => { private handleCheckboxChange = () => {
this.setState({ this.setState({

52
web-console/src/dialogs/history-dialog/history-dialog.tsx
View File

@ -45,33 +45,33 @@ export class HistoryDialog extends React.Component<HistoryDialogProps, HistoryDi
if (historyRecords.length === 0) { if (historyRecords.length === 0) {
content = <div className="no-record">No history records available</div>; content = <div className="no-record">No history records available</div>;
} else { } else {
content = <> content = <>
<span className="history-dialog-title">History</span> <span className="history-dialog-title">History</span>
<div className="history-record-entries"> <div className="history-record-entries">
{ {
historyRecords.map((record: any) => { historyRecords.map((record: any) => {
const auditInfo = record.auditInfo; const auditInfo = record.auditInfo;
const auditTime = record.auditTime; const auditTime = record.auditTime;
const formattedTime = auditTime.replace('T', ' ').substring(0, auditTime.length - 5); const formattedTime = auditTime.replace('T', ' ').substring(0, auditTime.length - 5);
return <div key={record.auditTime} className="history-record-entry"> return <div key={record.auditTime} className="history-record-entry">
<Card> <Card>
<div className="history-record-title"> <div className="history-record-title">
<span className="history-record-title-change">Change</span> <span className="history-record-title-change">Change</span>
<span>{formattedTime}</span> <span>{formattedTime}</span>
</div> </div>
<Divider/> <Divider/>
<p>{auditInfo.comment === '' ? '(No comment)' : auditInfo.comment}</p> <p>{auditInfo.comment === '' ? '(No comment)' : auditInfo.comment}</p>
<JSONCollapse <JSONCollapse
stringValue={record.payload} stringValue={record.payload}
buttonText="Payload" buttonText="Payload"
/> />
</Card> </Card>
</div>; </div>;
}) })
} }
</div> </div>
</>; </>;
} }
return <div className="history-record-container"> return <div className="history-record-container">
{content} {content}

6
web-console/src/views/task-view/tasks-view.tsx
View File

@ -296,7 +296,8 @@ ORDER BY "rank" DESC, "created_time" DESC`);
onAction: () => this.props.goToLoadDataView(id) onAction: () => this.props.goToLoadDataView(id)
}); });
} }
actions.push({ actions.push(
{
icon: IconNames.STEP_BACKWARD, icon: IconNames.STEP_BACKWARD,
title: 'Reset', title: 'Reset',
onAction: () => this.setState({ resetSupervisorId: id }) onAction: () => this.setState({ resetSupervisorId: id })
@ -312,8 +313,7 @@ ORDER BY "rank" DESC, "created_time" DESC`);
intent: Intent.DANGER, intent: Intent.DANGER,
onAction: () => this.setState({ terminateSupervisorId: id }) onAction: () => this.setState({ terminateSupervisorId: id })
} }
); );
// @ts-ignore
return actions; return actions;
} }