This is an automated email from the ASF dual-hosted git repository.
rongr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 5cd0ded908 revert alpha version of MUI Labs and fix Typings (#8964)
5cd0ded908 is described below
commit 5cd0ded9088be55dc2468688bac79fc24b080b03
Author: Oren <oreokid...@gmail.com>
AuthorDate: Thu Jun 23 16:07:40 2022 -0400
revert alpha version of MUI Labs and fix Typings (#8964)
---
.../resources/app/components/CustomMultiSelect.tsx | 4 +-
.../main/resources/app/components/MaterialTree.tsx | 2 +-
.../src/main/resources/package-lock.json | 239 ++-------------------
pinot-controller/src/main/resources/package.json | 2 +-
4 files changed, 25 insertions(+), 222 deletions(-)
diff --git
a/pinot-controller/src/main/resources/app/components/CustomMultiSelect.tsx
b/pinot-controller/src/main/resources/app/components/CustomMultiSelect.tsx
index 2c9cd0a2b3..8c0d079a09 100644
--- a/pinot-controller/src/main/resources/app/components/CustomMultiSelect.tsx
+++ b/pinot-controller/src/main/resources/app/components/CustomMultiSelect.tsx
@@ -19,7 +19,7 @@
import React, { forwardRef, useEffect, useState } from 'react';
import Chip from '@material-ui/core/Chip';
-import Autocomplete, { AutocompleteRenderInputParams } from
'@material-ui/lab/Autocomplete';
+import Autocomplete, { RenderInputParams } from
'@material-ui/lab/Autocomplete';
import TextField from '@material-ui/core/TextField';
import { withStyles } from '@material-ui/core';
import _ from 'lodash';
@@ -27,7 +27,7 @@ import _ from 'lodash';
interface MyInputProps {
onKeyDown: (event: object) => void;
}
-interface MyParams extends AutocompleteRenderInputParams {
+interface MyParams extends RenderInputParams {
inputProps: MyInputProps;
}
diff --git
a/pinot-controller/src/main/resources/app/components/MaterialTree.tsx
b/pinot-controller/src/main/resources/app/components/MaterialTree.tsx
index ac739f688a..f73c16d694 100644
--- a/pinot-controller/src/main/resources/app/components/MaterialTree.tsx
+++ b/pinot-controller/src/main/resources/app/components/MaterialTree.tsx
@@ -88,7 +88,7 @@ const CustomTreeItem = ({ itemObj, showChildEvent }:
CustomTreeProps) => {
nodeId={itemObj.nodeId}
label={itemObj.label}
endIcon={itemObj.isLeafNode ? <DescriptionOutlinedIcon /> :
<AddCircleOutlineOutlinedIcon />}
- onIconClick={(e)=> {
+ onClick={(e)=> {
showChildEvent(itemObj);
}}
>
diff --git a/pinot-controller/src/main/resources/package-lock.json
b/pinot-controller/src/main/resources/package-lock.json
index beff67ffbe..5447100957 100644
--- a/pinot-controller/src/main/resources/package-lock.json
+++ b/pinot-controller/src/main/resources/package-lock.json
@@ -20,14 +20,6 @@
"@babel/types": "^7.16.7"
}
},
- "@babel/helper-module-imports": {
- "version": "7.16.0",
- "resolved":
"https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz";,
- "integrity":
"sha512-kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg==",
- "requires": {
- "@babel/types": "^7.16.0"
- }
- },
"@babel/helper-validator-identifier": {
"version": "7.16.7",
"resolved":
"https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz";,
@@ -205,15 +197,15 @@
}
},
"@material-ui/lab": {
- "version": "4.0.0-alpha.61",
- "resolved":
"https://registry.npmjs.org/@material-ui/lab/-/lab-4.0.0-alpha.61.tgz";,
- "integrity":
"sha512-rSzm+XKiNUjKegj8bzt5+pygZeckNLOr+IjykH8sYdVk7dE9y2ZuUSofiMV2bJk3qU+JHwexmw+q0RyNZB9ugg==",
+ "version": "4.0.0-alpha.51",
+ "resolved":
"https://registry.npmjs.org/@material-ui/lab/-/lab-4.0.0-alpha.51.tgz";,
+ "integrity":
"sha512-X/qv/sZQGhXhKDn83L94gNahGDQj2Rd6r7/9tPpQbSn2A1LAt1+jlTiWD1HUgDXZEPqTsJMajOjWSEmTL7/q7w==",
"requires": {
"@babel/runtime": "^7.4.4",
- "@material-ui/utils": "^4.11.3",
+ "@material-ui/utils": "^4.9.6",
"clsx": "^1.0.4",
"prop-types": "^15.7.2",
- "react-is": "^16.8.0 || ^17.0.0"
+ "react-is": "^16.8.0"
}
},
"@material-ui/styles": {
@@ -334,11 +326,6 @@
"resolved":
"https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz";,
"integrity":
"sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
},
- "@types/parse-json": {
- "version": "4.0.0",
- "resolved":
"https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.0.tgz";,
- "integrity":
"sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA=="
- },
"@types/prop-types": {
"version": "15.7.5",
"resolved":
"https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.5.tgz";,
@@ -389,9 +376,9 @@
}
},
"@types/react-transition-group": {
- "version": "4.4.4",
- "resolved":
"https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.4.tgz";,
- "integrity":
"sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug==",
+ "version": "4.4.5",
+ "resolved":
"https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.5.tgz";,
+ "integrity":
"sha512-juKD/eiSM3/xZYzjuzH6ZwpP+/lejltmiS3QEzV/vmb/Q8+HfDmxu+Baga8UEMGBqV88Nbg4l2hY/K2DkyaLLA==",
"requires": {
"@types/react": "*"
}
@@ -1892,21 +1879,6 @@
"safe-buffer": "~5.1.1"
}
},
- "convert-source-map": {
- "version": "1.8.0",
- "resolved":
"https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.8.0.tgz";,
- "integrity":
"sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==",
- "requires": {
- "safe-buffer": "~5.1.1"
- },
- "dependencies": {
- "safe-buffer": {
- "version": "5.1.2",
- "resolved":
"https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz";,
- "integrity":
"sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
- }
- }
- },
"cookie": {
"version": "0.5.0",
"resolved": "https://registry.npmjs.org/cookie/-/cookie-0.5.0.tgz";,
@@ -1981,130 +1953,16 @@
}
}
},
- "copy-webpack-plugin": {
- "version": "5.1.1",
- "resolved":
"https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-5.1.1.tgz";,
- "integrity":
"sha512-P15M5ZC8dyCjQHWwd4Ia/dm0SgVvZJMYeykVIVYXbGyqO4dWB5oyPHp9i7wjwo5LhtlhKbiBCdS2NvM07Wlybg==",
- "dev": true,
- "requires": {
- "cacache": "^12.0.3",
- "find-cache-dir": "^2.1.0",
- "glob-parent": "^3.1.0",
- "globby": "^7.1.1",
- "is-glob": "^4.0.1",
- "loader-utils": "^1.2.3",
- "minimatch": "^3.0.4",
- "normalize-path": "^3.0.0",
- "p-limit": "^2.2.1",
- "schema-utils": "^1.0.0",
- "serialize-javascript": "^2.1.2",
- "webpack-log": "^2.0.0"
- },
- "dependencies": {
- "find-cache-dir": {
- "version": "2.1.0",
- "resolved":
"https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz";,
- "integrity":
"sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
- "dev": true,
- "requires": {
- "commondir": "^1.0.1",
- "make-dir": "^2.0.0",
- "pkg-dir": "^3.0.0"
- }
- },
- "globby": {
- "version": "7.1.1",
- "resolved": "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz";,
- "integrity": "sha1-+yzP+UAfhgCUXfral0QMypcrhoA=",
- "dev": true,
- "requires": {
- "array-union": "^1.0.1",
- "dir-glob": "^2.0.0",
- "glob": "^7.1.2",
- "ignore": "^3.3.5",
- "pify": "^3.0.0",
- "slash": "^1.0.0"
- },
- "dependencies": {
- "pify": {
- "version": "3.0.0",
- "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz";,
- "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
- "dev": true
- }
- }
- },
- "ignore": {
- "version": "3.3.10",
- "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz";,
- "integrity":
"sha512-Pgs951kaMm5GXP7MOvxERINe3gsaVjUWFm+UZPSq9xYriQAksyhg0csnS0KXSNRD5NmNdapXEpjxG49+AKh/ug==",
- "dev": true
- },
- "json5": {
- "version": "1.0.1",
- "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz";,
- "integrity":
"sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==",
- "dev": true,
- "requires": {
- "minimist": "^1.2.0"
- }
- },
- "loader-utils": {
- "version": "1.4.0",
- "resolved":
"https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.0.tgz";,
- "integrity":
"sha512-qH0WSMBtn/oHuwjy/NucEgbx5dbxxnxup9s4PVXJUDHZBQY+s0NWA9rJf53RBnQZxfch7euUui7hpoAPvALZdA==",
- "dev": true,
- "requires": {
- "big.js": "^5.2.2",
- "emojis-list": "^3.0.0",
- "json5": "^1.0.1"
- }
- },
- "make-dir": {
- "version": "2.1.0",
- "resolved":
"https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz";,
- "integrity":
"sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
- "dev": true,
- "requires": {
- "pify": "^4.0.1",
- "semver": "^5.6.0"
- }
- },
- "pify": {
- "version": "4.0.1",
- "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz";,
- "integrity":
"sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
- "dev": true
- },
- "schema-utils": {
- "version": "1.0.0",
- "resolved":
"https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz";,
- "integrity":
"sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
- "dev": true,
- "requires": {
- "ajv": "^6.1.0",
- "ajv-errors": "^1.0.0",
- "ajv-keywords": "^3.1.0"
- }
- },
- "serialize-javascript": {
- "version": "2.1.2",
- "resolved":
"https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-2.1.2.tgz";,
- "integrity":
"sha512-rs9OggEUF0V4jUSecXazOYsLfu7OGK2qIn3c7IPBiffz32XniEp/TX9Xmc9LQfK2nQ2QKHvZ2oygKUGU0lG4jQ==",
- "dev": true
- }
- }
- },
"core-js": {
- "version": "3.23.1",
- "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.23.1.tgz";,
- "integrity":
"sha512-wfMYHWi1WQjpgZNC9kAlN4ut04TM9fUTdi7CqIoTVM7yaiOUQTklOzfb+oWH3r9edQcT3F887swuVmxrV+CC8w==",
+ "version": "3.23.2",
+ "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.23.2.tgz";,
+ "integrity":
"sha512-ELJOWxNrJfOH/WK4VJ3Qd+fOqZuOuDNDJz0xG6Bt4mGg2eO/UT9CljCrbqDGovjLKUrGajEEBcoTOc0w+yBYeQ==",
"dev": true
},
"core-js-pure": {
- "version": "3.23.1",
- "resolved":
"https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.23.1.tgz";,
- "integrity":
"sha512-3qNgf6TqI3U1uhuSYRzJZGfFd4T+YlbyVPl+jgRiKjdZopvG4keZQwWZDAWpu1UH9nCgTpUzIV3GFawC7cJsqg==",
+ "version": "3.23.2",
+ "resolved":
"https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.23.2.tgz";,
+ "integrity":
"sha512-t6u7H4Ff/yZNk+zqTr74UjCcZ3k8ApBryeLLV4rYQd9aF3gqmjjGjjR44ENfeBMH8VVvSynIjAJ0mUuFhzQtrA==",
"dev": true
},
"core-util-is": {
@@ -2125,36 +1983,6 @@
"yaml": "^1.7.2"
}
},
- "cosmiconfig": {
- "version": "6.0.0",
- "resolved":
"https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-6.0.0.tgz";,
- "integrity":
"sha512-xb3ZL6+L8b9JLLCx3ZdoZy4+2ECphCMo2PwqgP1tlfVq6M6YReyzBJtvWWtbDSpNr9hn96pkCiZqUcFEc+54Qg==",
- "requires": {
- "@types/parse-json": "^4.0.0",
- "import-fresh": "^3.1.0",
- "parse-json": "^5.0.0",
- "path-type": "^4.0.0",
- "yaml": "^1.7.2"
- },
- "dependencies": {
- "parse-json": {
- "version": "5.2.0",
- "resolved":
"https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz";,
- "integrity":
"sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
- "requires": {
- "@babel/code-frame": "^7.0.0",
- "error-ex": "^1.3.1",
- "json-parse-even-better-errors": "^2.3.0",
- "lines-and-columns": "^1.1.6"
- }
- },
- "path-type": {
- "version": "4.0.0",
- "resolved":
"https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz";,
- "integrity":
"sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw=="
- }
- }
- },
"create-ecdh": {
"version": "4.0.4",
"resolved":
"https://registry.npmjs.org/create-ecdh/-/create-ecdh-4.0.4.tgz";,
@@ -2505,11 +2333,6 @@
"resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz";,
"integrity":
"sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="
},
- "diff": {
- "version": "4.0.2",
- "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz";,
- "integrity":
"sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A=="
- },
"diffie-hellman": {
"version": "5.0.3",
"resolved":
"https://registry.npmjs.org/diffie-hellman/-/diffie-hellman-5.0.3.tgz";,
@@ -2762,15 +2585,6 @@
"create-emotion": "^10.0.27"
}
},
- "emotion": {
- "version": "10.0.27",
- "resolved": "https://registry.npmjs.org/emotion/-/emotion-10.0.27.tgz";,
- "integrity":
"sha512-2xdDzdWWzue8R8lu4G76uWX5WhyQuzATon9LmNeCy/2BHVC6dsEpfhN1a0qhELgtDVdjyEA6J8Y/VlI5ZnaH0g==",
- "requires": {
- "babel-plugin-emotion": "^10.0.27",
- "create-emotion": "^10.0.27"
- }
- },
"encodeurl": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz";,
@@ -3794,11 +3608,6 @@
"integrity":
"sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
"dev": true
},
- "fast-memoize": {
- "version": "2.5.2",
- "resolved":
"https://registry.npmjs.org/fast-memoize/-/fast-memoize-2.5.2.tgz";,
- "integrity":
"sha512-Ue0LwpDYErFbmNnZSF0UH6eImUwDmogUO1jyE+JbN2gsQz/jICm1Ve7t9QT0rNSsfJt+Hs4/S3GnsDVjL4HVrw=="
- },
"fastparse": {
"version": "1.1.2",
"resolved": "https://registry.npmjs.org/fastparse/-/fastparse-1.1.2.tgz";,
@@ -4766,9 +4575,9 @@
}
},
"http-parser-js": {
- "version": "0.5.6",
- "resolved":
"https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.6.tgz";,
- "integrity":
"sha512-vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA==",
+ "version": "0.5.7",
+ "resolved":
"https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.7.tgz";,
+ "integrity":
"sha512-8gQM8ZcewlONQLnik2AKzS13euQhaZcu4rK5QBSYOszW0T1upLW9VA2MdWvTvMmRo42HjXp7igFmdROoBCCrfg==",
"dev": true
},
"http-proxy": {
@@ -8273,11 +8082,11 @@
"dev": true
},
"resolve": {
- "version": "1.22.0",
- "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz";,
- "integrity":
"sha512-Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw==",
+ "version": "1.22.1",
+ "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz";,
+ "integrity":
"sha512-nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw==",
"requires": {
- "is-core-module": "^2.8.1",
+ "is-core-module": "^2.9.0",
"path-parse": "^1.0.7",
"supports-preserve-symlinks-flag": "^1.0.0"
}
@@ -8672,12 +8481,6 @@
"integrity":
"sha512-3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg==",
"dev": true
},
- "slash": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz";,
- "integrity": "sha1-xB8vbDn8FtHNF61LXYlhFK5HDVU=",
- "dev": true
- },
"slice-ansi": {
"version": "2.1.0",
"resolved":
"https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz";,
diff --git a/pinot-controller/src/main/resources/package.json
b/pinot-controller/src/main/resources/package.json
index c20f7f86c6..50892337ad 100644
--- a/pinot-controller/src/main/resources/package.json
+++ b/pinot-controller/src/main/resources/package.json
@@ -63,7 +63,7 @@
"@fortawesome/react-fontawesome": "0.1.18",
"@material-ui/core": "4.11.0",
"@material-ui/icons": "4.11.3",
- "@material-ui/lab": "4.0.0-alpha.61",
+ "@material-ui/lab": "4.0.0-alpha.51",
"@types/codemirror": "0.0.104",
"@types/react": "16.14.26",
"@types/react-dom": "16.9.16",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
