From 3af3f42dd690a2ffc54fbf17bc667f92f26adbe5 Mon Sep 17 00:00:00 2001 From: John Gozde Date: Fri, 1 Apr 2022 10:44:45 -0600 Subject: [PATCH 1/5] Update blueprint dependencies & LICENSES --- licenses.yaml | 206 ++++++++++++++++++--- licenses/bin/@types-dom4.MIT | 2 +- licenses/bin/camel-case.MIT | 21 +++ licenses/bin/capital-case.MIT | 21 +++ licenses/bin/change-case.MIT | 21 +++ licenses/bin/constant-case.MIT | 21 +++ licenses/bin/dot-case.MIT | 21 +++ licenses/bin/header-case.MIT | 21 +++ licenses/bin/lower-case.MIT | 21 +++ licenses/bin/no-case.MIT | 21 +++ licenses/bin/param-case.MIT | 21 +++ licenses/bin/pascal-case.MIT | 21 +++ licenses/bin/path-case.MIT | 21 +++ licenses/bin/sentence-case.MIT | 21 +++ licenses/bin/snake-case.MIT | 21 +++ licenses/bin/upper-case-first.MIT | 21 +++ licenses/bin/upper-case.MIT | 21 +++ web-console/package-lock.json | 285 ++++++++++++++++++++++-------- web-console/package.json | 8 +- web-console/script/licenses | 1 + 20 files changed, 705 insertions(+), 112 deletions(-) mode change 100644 => 100755 licenses/bin/@types-dom4.MIT create mode 100644 licenses/bin/camel-case.MIT create mode 100644 licenses/bin/capital-case.MIT create mode 100644 licenses/bin/change-case.MIT create mode 100644 licenses/bin/constant-case.MIT create mode 100644 licenses/bin/dot-case.MIT create mode 100644 licenses/bin/header-case.MIT create mode 100644 licenses/bin/lower-case.MIT create mode 100644 licenses/bin/no-case.MIT create mode 100644 licenses/bin/param-case.MIT create mode 100644 licenses/bin/pascal-case.MIT create mode 100644 licenses/bin/path-case.MIT create mode 100644 licenses/bin/sentence-case.MIT create mode 100644 licenses/bin/snake-case.MIT create mode 100644 licenses/bin/upper-case-first.MIT create mode 100644 licenses/bin/upper-case.MIT diff --git a/licenses.yaml b/licenses.yaml index 89e04b927359..ea5c210bb74f 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -5088,12 +5088,21 @@ license_file_path: licenses/bin/@babel-types.MIT --- +name: "@blueprintjs/colors" +license_category: binary +module: web-console +license_name: Apache License version 2.0 +copyright: Palantir Technologies +version: 4.0.1 + +--- + name: "@blueprintjs/core" license_category: binary module: web-console license_name: Apache License version 2.0 copyright: Palantir Technologies -version: 3.45.0 +version: 4.0.3 --- @@ -5102,7 +5111,7 @@ license_category: binary module: web-console license_name: Apache License version 2.0 copyright: Palantir Technologies -version: 3.23.4 +version: 4.0.3 --- @@ -5111,7 +5120,7 @@ license_category: binary module: web-console license_name: Apache License version 2.0 copyright: Palantir Technologies -version: 3.31.0 +version: 4.1.1 --- @@ -5120,7 +5129,7 @@ license_category: binary module: web-console license_name: Apache License version 2.0 copyright: Palantir Technologies -version: 0.10.1 +version: 1.0.3 --- @@ -5224,12 +5233,21 @@ license_file_path: licenses/bin/@hypnosphi-create-react-context.MIT --- +name: "@juggle/resize-observer" +license_category: binary +module: web-console +license_name: Apache License version 2.0 +copyright: Juggle +version: 3.3.1 + +--- + name: "@popperjs/core" license_category: binary module: web-console license_name: MIT License copyright: Federico Zivolo -version: 2.9.2 +version: 2.11.4 license_file_path: licenses/bin/@popperjs-core.MIT --- @@ -5239,7 +5257,7 @@ license_category: binary module: web-console license_name: MIT License copyright: Microsoft Corporation. -version: 2.0.1 +version: 2.0.2 license_file_path: licenses/bin/@types-dom4.MIT --- @@ -5324,6 +5342,26 @@ license_file_path: licenses/bin/callsites.MIT --- +name: "camel-case" +license_category: binary +module: web-console +license_name: MIT License +copyright: Blake Embrey +version: 4.1.2 +license_file_path: licenses/bin/camel-case.MIT + +--- + +name: "capital-case" +license_category: binary +module: web-console +license_name: MIT License +copyright: Blake Embrey +version: 1.0.4 +license_file_path: licenses/bin/capital-case.MIT + +--- + name: "chalk" license_category: binary module: web-console @@ -5334,6 +5372,16 @@ license_file_path: licenses/bin/chalk.MIT --- +name: "change-case" +license_category: binary +module: web-console +license_name: MIT License +copyright: Blake Embrey +version: 4.1.2 +license_file_path: licenses/bin/change-case.MIT + +--- + name: "classnames" license_category: binary module: web-console @@ -5364,6 +5412,16 @@ license_file_path: licenses/bin/color-name.MIT --- +name: "constant-case" +license_category: binary +module: web-console +license_name: MIT License +copyright: Blake Embrey +version: 3.0.4 +license_file_path: licenses/bin/constant-case.MIT + +--- + name: "convert-source-map" license_category: binary module: web-console @@ -5558,7 +5616,7 @@ license_category: binary module: web-console license_name: MIT License copyright: Jason Quense -version: 3.4.0 +version: 5.2.1 license_file_path: licenses/bin/dom-helpers.MIT --- @@ -5573,6 +5631,16 @@ license_file_path: licenses/bin/dom4.MIT --- +name: "dot-case" +license_category: binary +module: web-console +license_name: MIT License +copyright: Blake Embrey +version: 3.0.4 +license_file_path: licenses/bin/dot-case.MIT + +--- + name: "druid-query-toolkit" license_category: binary module: web-console @@ -5712,6 +5780,16 @@ license_file_path: licenses/bin/has.MIT --- +name: "header-case" +license_category: binary +module: web-console +license_name: MIT License +copyright: Blake Embrey +version: 2.0.4 +license_file_path: licenses/bin/header-case.MIT + +--- + name: "history" license_category: binary module: web-console @@ -5892,6 +5970,16 @@ license_file_path: licenses/bin/loose-envify.MIT --- +name: "lower-case" +license_category: binary +module: web-console +license_name: MIT License +copyright: Blake Embrey +version: 2.0.2 +license_file_path: licenses/bin/lower-case.MIT + +--- + name: "memoize-one" license_category: binary module: web-console @@ -5912,6 +6000,16 @@ license_file_path: licenses/bin/mini-create-react-context.MIT --- +name: "no-case" +license_category: binary +module: web-console +license_name: MIT License +copyright: Blake Embrey +version: 3.0.4 +license_file_path: licenses/bin/no-case.MIT + +--- + name: "normalize.css" license_category: binary module: web-console @@ -5971,6 +6069,16 @@ version: 1.101.0 --- +name: "param-case" +license_category: binary +module: web-console +license_name: MIT License +copyright: Blake Embrey +version: 3.0.4 +license_file_path: licenses/bin/param-case.MIT + +--- + name: "parent-module" license_category: binary module: web-console @@ -5991,6 +6099,26 @@ license_file_path: licenses/bin/parse-json.MIT --- +name: "pascal-case" +license_category: binary +module: web-console +license_name: MIT License +copyright: Blake Embrey +version: 3.1.2 +license_file_path: licenses/bin/pascal-case.MIT + +--- + +name: "path-case" +license_category: binary +module: web-console +license_name: MIT License +copyright: Blake Embrey +version: 3.0.4 +license_file_path: licenses/bin/path-case.MIT + +--- + name: "path-parse" license_category: binary module: web-console @@ -6101,16 +6229,6 @@ license_file_path: licenses/bin/react-is.MIT --- -name: "react-lifecycles-compat" -license_category: binary -module: web-console -license_name: MIT License -copyright: Facebook, Inc. -version: 3.0.4 -license_file_path: licenses/bin/react-lifecycles-compat.MIT - ---- - name: "react-popper" license_category: binary module: web-console @@ -6166,7 +6284,7 @@ license_category: binary module: web-console license_name: BSD-3-Clause License copyright: React Community -version: 2.9.0 +version: 4.4.2 license_file_path: licenses/bin/react-transition-group.BSD3 --- @@ -6201,16 +6319,6 @@ license_file_path: licenses/bin/regexp.prototype.flags.MIT --- -name: "resize-observer-polyfill" -license_category: binary -module: web-console -license_name: MIT License -copyright: Denis Rul -version: 1.5.1 -license_file_path: licenses/bin/resize-observer-polyfill.MIT - ---- - name: "resolve-from" license_category: binary module: web-console @@ -6261,6 +6369,26 @@ license_file_path: licenses/bin/scheduler.MIT --- +name: "sentence-case" +license_category: binary +module: web-console +license_name: MIT License +copyright: Blake Embrey +version: 3.0.4 +license_file_path: licenses/bin/sentence-case.MIT + +--- + +name: "snake-case" +license_category: binary +module: web-console +license_name: MIT License +copyright: Blake Embrey +version: 3.0.4 +license_file_path: licenses/bin/snake-case.MIT + +--- + name: "source-map" license_category: binary module: web-console @@ -6326,7 +6454,7 @@ license_category: binary module: web-console license_name: Zero-Clause BSD copyright: Microsoft Corp. -version: 1.13.0 +version: 2.3.1 license_file_path: licenses/bin/tslib.0BSD --- @@ -6341,6 +6469,26 @@ license_file_path: licenses/bin/typed-styles.MIT --- +name: "upper-case-first" +license_category: binary +module: web-console +license_name: MIT License +copyright: Blake Embrey +version: 2.0.2 +license_file_path: licenses/bin/upper-case-first.MIT + +--- + +name: "upper-case" +license_category: binary +module: web-console +license_name: MIT License +copyright: Blake Embrey +version: 2.0.2 +license_file_path: licenses/bin/upper-case.MIT + +--- + name: "value-equal" license_category: binary module: web-console diff --git a/licenses/bin/@types-dom4.MIT b/licenses/bin/@types-dom4.MIT old mode 100644 new mode 100755 index 21071075c245..9e841e7a26e4 --- a/licenses/bin/@types-dom4.MIT +++ b/licenses/bin/@types-dom4.MIT @@ -1,6 +1,6 @@ MIT License - Copyright (c) Microsoft Corporation. All rights reserved. + Copyright (c) Microsoft Corporation. Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/licenses/bin/camel-case.MIT b/licenses/bin/camel-case.MIT new file mode 100644 index 000000000000..983fbe8aec3f --- /dev/null +++ b/licenses/bin/camel-case.MIT @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/licenses/bin/capital-case.MIT b/licenses/bin/capital-case.MIT new file mode 100644 index 000000000000..983fbe8aec3f --- /dev/null +++ b/licenses/bin/capital-case.MIT @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/licenses/bin/change-case.MIT b/licenses/bin/change-case.MIT new file mode 100644 index 000000000000..983fbe8aec3f --- /dev/null +++ b/licenses/bin/change-case.MIT @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/licenses/bin/constant-case.MIT b/licenses/bin/constant-case.MIT new file mode 100644 index 000000000000..983fbe8aec3f --- /dev/null +++ b/licenses/bin/constant-case.MIT @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/licenses/bin/dot-case.MIT b/licenses/bin/dot-case.MIT new file mode 100644 index 000000000000..983fbe8aec3f --- /dev/null +++ b/licenses/bin/dot-case.MIT @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/licenses/bin/header-case.MIT b/licenses/bin/header-case.MIT new file mode 100644 index 000000000000..983fbe8aec3f --- /dev/null +++ b/licenses/bin/header-case.MIT @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/licenses/bin/lower-case.MIT b/licenses/bin/lower-case.MIT new file mode 100644 index 000000000000..983fbe8aec3f --- /dev/null +++ b/licenses/bin/lower-case.MIT @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/licenses/bin/no-case.MIT b/licenses/bin/no-case.MIT new file mode 100644 index 000000000000..983fbe8aec3f --- /dev/null +++ b/licenses/bin/no-case.MIT @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/licenses/bin/param-case.MIT b/licenses/bin/param-case.MIT new file mode 100644 index 000000000000..983fbe8aec3f --- /dev/null +++ b/licenses/bin/param-case.MIT @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/licenses/bin/pascal-case.MIT b/licenses/bin/pascal-case.MIT new file mode 100644 index 000000000000..983fbe8aec3f --- /dev/null +++ b/licenses/bin/pascal-case.MIT @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/licenses/bin/path-case.MIT b/licenses/bin/path-case.MIT new file mode 100644 index 000000000000..983fbe8aec3f --- /dev/null +++ b/licenses/bin/path-case.MIT @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/licenses/bin/sentence-case.MIT b/licenses/bin/sentence-case.MIT new file mode 100644 index 000000000000..983fbe8aec3f --- /dev/null +++ b/licenses/bin/sentence-case.MIT @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/licenses/bin/snake-case.MIT b/licenses/bin/snake-case.MIT new file mode 100644 index 000000000000..983fbe8aec3f --- /dev/null +++ b/licenses/bin/snake-case.MIT @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/licenses/bin/upper-case-first.MIT b/licenses/bin/upper-case-first.MIT new file mode 100644 index 000000000000..983fbe8aec3f --- /dev/null +++ b/licenses/bin/upper-case-first.MIT @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. diff --git a/licenses/bin/upper-case.MIT b/licenses/bin/upper-case.MIT new file mode 100644 index 000000000000..dcd4d7369042 --- /dev/null +++ b/licenses/bin/upper-case.MIT @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2014 Blake Embrey (hello@blakeembrey.com) + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in +all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +THE SOFTWARE. \ No newline at end of file diff --git a/web-console/package-lock.json b/web-console/package-lock.json index 46ec940322d1..4f747b7c042d 100644 --- a/web-console/package-lock.json +++ b/web-console/package-lock.json @@ -3210,78 +3210,62 @@ "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", "dev": true }, + "@blueprintjs/colors": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.0.1.tgz", + "integrity": "sha512-w2kMtUzQjHdrmjXpUnCfTq7/pc41S4UnXzOp6+AZtzCR4cVG1r2yBWR4XxaAAecDb94/yIBXooqtMD0B8T1Y2w==" + }, "@blueprintjs/core": { - "version": "3.45.0", - "resolved": "https://registry.npmjs.org/@blueprintjs/core/-/core-3.45.0.tgz", - "integrity": "sha512-oLknlh+jdvdat+3JrljKGAmtP7KJRKnUqWJOvcGHmAlE2nUZkwzI1jICd2HMncQrukIqQN5ORZK1tswus6BM+Q==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/@blueprintjs/core/-/core-4.0.3.tgz", + "integrity": "sha512-3yLiBAuBTnBneqSc2eqiMGhhcxwUcCLpUu8PLDfpsBLi4AjO9zHyfcmAupxpV49KlKpDJrntGq6jltDvQDXLtQ==", "requires": { - "@blueprintjs/icons": "^3.26.1", + "@blueprintjs/colors": "^4.0.1", + "@blueprintjs/icons": "^4.1.1", + "@juggle/resize-observer": "^3.3.1", "@types/dom4": "^2.0.1", "classnames": "^2.2", "dom4": "^2.1.5", "normalize.css": "^8.0.1", "popper.js": "^1.16.1", - "react-lifecycles-compat": "^3.0.4", "react-popper": "^1.3.7", - "react-transition-group": "^2.9.0", - "resize-observer-polyfill": "^1.5.1", - "tslib": "~1.13.0" - }, - "dependencies": { - "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" - } + "react-transition-group": "^4.4.1", + "tslib": "~2.3.1" } }, "@blueprintjs/datetime": { - "version": "3.23.4", - "resolved": "https://registry.npmjs.org/@blueprintjs/datetime/-/datetime-3.23.4.tgz", - "integrity": "sha512-tC0DH6jKMLdZjXlAH7UoP3gzTjCm8iYKGY9jMyqPqTj869AJHnqW5NlCZKp+xMiy6FJ53oJjjKdhw6l5p46BZA==", + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/@blueprintjs/datetime/-/datetime-4.0.3.tgz", + "integrity": "sha512-kmxzUoiYYMyscn4y3YM7kwUI3cQZ4eNS3mYH69lc2QNsuxT0g2H6WbFlYBP4hF8XDRgqBlv1Mi2/HDsRRBQHBQ==", "requires": { - "@blueprintjs/core": "^3.45.0", + "@blueprintjs/core": "^4.0.3", "classnames": "^2.2", "react-day-picker": "7.4.9", - "react-lifecycles-compat": "^3.0.4", - "tslib": "~1.13.0" - }, - "dependencies": { - "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" - } + "tslib": "~2.3.1" } }, "@blueprintjs/icons": { - "version": "3.31.0", - "resolved": "https://registry.npmjs.org/@blueprintjs/icons/-/icons-3.31.0.tgz", - "integrity": "sha512-6pXhHC8zEvoDKN5KNsIHNuCRKsemmRbXNv1jweB95VaFzR1M+Mik+Qi+13Wd+VtZrzes2ZcWttIeyuK91NoLCw==", + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/@blueprintjs/icons/-/icons-4.1.1.tgz", + "integrity": "sha512-UwxNpkMsyIM5hUoili9YJyk4f9/YPB6ErwokJF4aBhcmuPxEXDtvizJhSVOL5omc0GjhedZ9HXEoPZhbYLGwLw==", "requires": { + "change-case": "^4.1.2", "classnames": "^2.2", - "tslib": "~1.13.0" - }, - "dependencies": { - "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" - } + "tslib": "~2.3.1" } }, "@blueprintjs/popover2": { - "version": "0.10.1", - "resolved": "https://registry.npmjs.org/@blueprintjs/popover2/-/popover2-0.10.1.tgz", - "integrity": "sha512-5zo4TsoGO79yA/CCsENE7cVuSk3BEMzS99iWDdesyh9I9AU0rkSYcaKbAmpIrWfO9Oe4s8lRPms0OrXF2fs94Q==", + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@blueprintjs/popover2/-/popover2-1.0.3.tgz", + "integrity": "sha512-PoQwNWa2fCbgzNvvW36DWfX+HK1/0vJWvX9qluZJ06n3/CgA5x+INpbmaXiTQVofEVhHP8H1VcpfDfVMG0LFWw==", "requires": { - "@blueprintjs/core": "^3.45.0", + "@blueprintjs/core": "^4.0.3", + "@juggle/resize-observer": "^3.3.1", "@popperjs/core": "^2.5.4", "classnames": "^2.2", "dom4": "^2.1.5", "react-popper": "^2.2.4", - "resize-observer-polyfill": "^1.5.1", - "tslib": "~1.13.0" + "tslib": "~2.3.1" }, "dependencies": { "react-popper": { @@ -3292,11 +3276,6 @@ "react-fast-compare": "^3.0.1", "warning": "^4.0.2" } - }, - "tslib": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.13.0.tgz", - "integrity": "sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==" } } }, @@ -4598,6 +4577,11 @@ "@types/yargs": "^13.0.0" } }, + "@juggle/resize-observer": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.3.1.tgz", + "integrity": "sha512-zMM9Ds+SawiUkakS7y94Ymqx+S0ORzpG3frZirN3l+UlXUmSUR7hF4wxCVqW+ei94JzV5kt0uXBcoOEAuiydrw==" + }, "@nodelib/fs.scandir": { "version": "2.1.4", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.4.tgz", @@ -4631,9 +4615,9 @@ "dev": true }, "@popperjs/core": { - "version": "2.9.2", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.9.2.tgz", - "integrity": "sha512-VZMYa7+fXHdwIq1TDhSXoVmSPEGM/aa+6Aiq3nVVJ9bXr24zScr+NlKFKC3iPljA7ho/GAZr+d2jOf5GIRC30Q==" + "version": "2.11.4", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.4.tgz", + "integrity": "sha512-q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg==" }, "@sheerun/mutationobserver-shim": { "version": "0.3.2", @@ -4930,9 +4914,9 @@ "dev": true }, "@types/dom4": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@types/dom4/-/dom4-2.0.1.tgz", - "integrity": "sha512-kSkVAvWmMZiCYtvqjqQEwOmvKwcH+V4uiv3qPQ8pAh1Xl39xggGEo8gHUqV4waYGHezdFw0rKBR8Jt0CrQSDZA==" + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/@types/dom4/-/dom4-2.0.2.tgz", + "integrity": "sha512-Rt4IC1T7xkCWa0OG1oSsPa0iqnxlDeQqKXZAHrQGLb7wFGncWm85MaxKUjAGejOrUynOgWlFi4c6S6IyJwoK4g==" }, "@types/enzyme": { "version": "3.10.3", @@ -7081,6 +7065,15 @@ "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" }, + "camel-case": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz", + "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==", + "requires": { + "pascal-case": "^3.1.2", + "tslib": "^2.0.3" + } + }, "camelcase": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", @@ -7111,6 +7104,16 @@ "integrity": "sha512-OE5UE4+nBOro8Dyvv0lfx+SRtfVIOM9uhKqFmJeUbGriqhhStgp1A0OyBpgy3OUF8AhYCT+PVwPC1gMl2ZcQMA==", "dev": true }, + "capital-case": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/capital-case/-/capital-case-1.0.4.tgz", + "integrity": "sha512-ds37W8CytHgwnhGGTi88pcPyR15qoNkOpYwmMMfnWqqWgESapLqvDx6huFjQ5vqWSn2Z06173XNA7LtMOeUh1A==", + "requires": { + "no-case": "^3.0.4", + "tslib": "^2.0.3", + "upper-case-first": "^2.0.2" + } + }, "caseless": { "version": "0.12.0", "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", @@ -7127,6 +7130,25 @@ "supports-color": "^5.3.0" } }, + "change-case": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/change-case/-/change-case-4.1.2.tgz", + "integrity": "sha512-bSxY2ws9OtviILG1EiY5K7NNxkqg/JnRnFxLtKQ96JaviiIxi7djMrSd0ECT9AC+lttClmYwKw53BWpOMblo7A==", + "requires": { + "camel-case": "^4.1.2", + "capital-case": "^1.0.4", + "constant-case": "^3.0.4", + "dot-case": "^3.0.4", + "header-case": "^2.0.4", + "no-case": "^3.0.4", + "param-case": "^3.0.4", + "pascal-case": "^3.1.2", + "path-case": "^3.0.4", + "sentence-case": "^3.0.4", + "snake-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, "char-regex": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", @@ -7615,6 +7637,16 @@ "integrity": "sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=", "dev": true }, + "constant-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/constant-case/-/constant-case-3.0.4.tgz", + "integrity": "sha512-I2hSBi7Vvs7BEuJDr5dDHfzb/Ruj3FyvFyh7KLilAjNQw3Be+xgqUBA2W6scVEcL0hL1dwPRtIqEPVUCKkSsyQ==", + "requires": { + "no-case": "^3.0.4", + "tslib": "^2.0.3", + "upper-case": "^2.0.2" + } + }, "content-disposition": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", @@ -8032,8 +8064,7 @@ "csstype": { "version": "3.0.7", "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.0.7.tgz", - "integrity": "sha512-KxnUB0ZMlnUWCsx2Z8MUsr6qV6ja1w9ArPErJaJaF8a5SOWoHLIszeCTKGRGRgtLgYrs1E8CHkNSP1VZTTPc9g==", - "dev": true + "integrity": "sha512-KxnUB0ZMlnUWCsx2Z8MUsr6qV6ja1w9ArPErJaJaF8a5SOWoHLIszeCTKGRGRgtLgYrs1E8CHkNSP1VZTTPc9g==" }, "currently-unhandled": { "version": "0.4.1", @@ -8382,11 +8413,22 @@ } }, "dom-helpers": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-3.4.0.tgz", - "integrity": "sha512-LnuPJ+dwqKDIyotW1VzmOZ5TONUN7CwkCR5hrgawTUbkBGYdeoNLZo6nNfGkCrjtE1nXXaj7iMMpDa8/d9WoIA==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/dom-helpers/-/dom-helpers-5.2.1.tgz", + "integrity": "sha512-nRCa7CK3VTrM2NmGkIy4cbK7IZlgBE/PYMn55rrXefr5xXDP0LdtfPnblFDoVdcAfslJ7or6iqAUnx0CCGIWQA==", "requires": { - "@babel/runtime": "^7.1.2" + "@babel/runtime": "^7.8.7", + "csstype": "^3.0.2" + }, + "dependencies": { + "@babel/runtime": { + "version": "7.17.8", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.8.tgz", + "integrity": "sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA==", + "requires": { + "regenerator-runtime": "^0.13.4" + } + } } }, "dom-serializer": { @@ -8446,6 +8488,15 @@ "domelementtype": "1" } }, + "dot-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz", + "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==", + "requires": { + "no-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, "druid-query-toolkit": { "version": "0.14.6", "resolved": "https://registry.npmjs.org/druid-query-toolkit/-/druid-query-toolkit-0.14.6.tgz", @@ -10996,6 +11047,15 @@ } } }, + "header-case": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/header-case/-/header-case-2.0.4.tgz", + "integrity": "sha512-H/vuk5TEEVZwrR0lp2zed9OCo1uAILMlx0JEMgC26rzyJJ3N1v6XkwHHXJQdR2doSjcGPM6OKPYoJgf0plJ11Q==", + "requires": { + "capital-case": "^1.0.4", + "tslib": "^2.0.3" + } + }, "history": { "version": "4.10.1", "resolved": "https://registry.npmjs.org/history/-/history-4.10.1.tgz", @@ -15524,6 +15584,14 @@ "signal-exit": "^3.0.0" } }, + "lower-case": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz", + "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==", + "requires": { + "tslib": "^2.0.3" + } + }, "make-dir": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", @@ -16083,6 +16151,15 @@ "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", "dev": true }, + "no-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", + "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==", + "requires": { + "lower-case": "^2.0.2", + "tslib": "^2.0.3" + } + }, "node-fetch": { "version": "2.6.7", "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.6.7.tgz", @@ -16819,6 +16896,15 @@ "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" }, + "param-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz", + "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==", + "requires": { + "dot-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, "parent-module": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", @@ -16875,12 +16961,30 @@ "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", "dev": true }, + "pascal-case": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz", + "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==", + "requires": { + "no-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, "pascalcase": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=", "dev": true }, + "path-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/path-case/-/path-case-3.0.4.tgz", + "integrity": "sha512-qO4qCFjXqVTrcbPt/hQfhTQ+VhFsqNKOPtytgNKkKxSoEp3XPUQ8ObFuePylOIok5gjn69ry8XiULxCwot3Wfg==", + "requires": { + "dot-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, "path-dirname": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz", @@ -18981,11 +19085,6 @@ "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz", "integrity": "sha512-aUk3bHfZ2bRSVFFbbeVS4i+lNPZr3/WM5jT2J5omUVV1zzcs1nAaf3l51ctA5FFvCRbhrH0bdAsRRQddFJZPtA==" }, - "react-lifecycles-compat": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz", - "integrity": "sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA==" - }, "react-popper": { "version": "1.3.11", "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.11.tgz", @@ -19057,14 +19156,14 @@ } }, "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==", + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/react-transition-group/-/react-transition-group-4.4.2.tgz", + "integrity": "sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg==", "requires": { - "dom-helpers": "^3.4.0", + "@babel/runtime": "^7.5.5", + "dom-helpers": "^5.0.1", "loose-envify": "^1.4.0", - "prop-types": "^15.6.2", - "react-lifecycles-compat": "^3.0.4" + "prop-types": "^15.6.2" } }, "read-installed": { @@ -19500,11 +19599,6 @@ "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=", "dev": true }, - "resize-observer-polyfill": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/resize-observer-polyfill/-/resize-observer-polyfill-1.5.1.tgz", - "integrity": "sha512-LwZrotdHOo12nQuZlHEmtuXdqGoOD0OhaxopaNFxWzInpEgaLWoVuAMbTzixuosCx2nEG58ngzW3vxdWoxIgdg==" - }, "resolve": { "version": "1.12.0", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.12.0.tgz", @@ -19790,6 +19884,16 @@ } } }, + "sentence-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/sentence-case/-/sentence-case-3.0.4.tgz", + "integrity": "sha512-8LS0JInaQMCRoQ7YUytAo/xUu5W2XnQxV2HI/6uM6U7CITS1RqPElr30V6uIqyMKM9lJGRVFy5/4CuzcixNYSg==", + "requires": { + "no-case": "^3.0.4", + "tslib": "^2.0.3", + "upper-case-first": "^2.0.2" + } + }, "serialize-javascript": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-5.0.1.tgz", @@ -20023,6 +20127,15 @@ "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", "dev": true }, + "snake-case": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/snake-case/-/snake-case-3.0.4.tgz", + "integrity": "sha512-LAOh4z89bGQvl9pFfNF8V146i7o7/CqFPbqzYgP+yYzDIDeS9HaNFtXABamRW+AQzEVODcvE79ljJ+8a9YSdMg==", + "requires": { + "dot-case": "^3.0.4", + "tslib": "^2.0.3" + } + }, "snapdragon": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", @@ -22434,6 +22547,22 @@ "integrity": "sha512-aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg==", "dev": true }, + "upper-case": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/upper-case/-/upper-case-2.0.2.tgz", + "integrity": "sha512-KgdgDGJt2TpuwBUIjgG6lzw2GWFRCW9Qkfkiv0DxqHHLYJHmtmdUIKcZd8rHgFSjopVTlw6ggzCm1b8MFQwikg==", + "requires": { + "tslib": "^2.0.3" + } + }, + "upper-case-first": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/upper-case-first/-/upper-case-first-2.0.2.tgz", + "integrity": "sha512-514ppYHBaKwfJRK/pNC6c/OxfGa0obSnAl106u97Ed0I625Nin96KAjttZF6ZL3e1XLtphxnqrOi9iWgm+u+bg==", + "requires": { + "tslib": "^2.0.3" + } + }, "uri-js": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.2.2.tgz", diff --git a/web-console/package.json b/web-console/package.json index 6ecb3fb37c48..457f3d7863cc 100644 --- a/web-console/package.json +++ b/web-console/package.json @@ -66,10 +66,10 @@ "not ie 11" ], "dependencies": { - "@blueprintjs/core": "^3.45.0", - "@blueprintjs/datetime": "^3.23.4", - "@blueprintjs/icons": "^3.31.0", - "@blueprintjs/popover2": "^0.10.1", + "@blueprintjs/core": "^4.0.3", + "@blueprintjs/datetime": "^4.0.3", + "@blueprintjs/icons": "^4.1.1", + "@blueprintjs/popover2": "^1.0.3", "ace-builds": "^1.4.13", "axios": "^0.21.4", "classnames": "^2.2.6", diff --git a/web-console/script/licenses b/web-console/script/licenses index fdbf2190a95e..46df1fdb4897 100755 --- a/web-console/script/licenses +++ b/web-console/script/licenses @@ -163,6 +163,7 @@ checker.init( hasLicense = true; } catch (e) { console.log(`Could not find license for '${p}': ${JSON.stringify(meta)}`); + console.log(`Find and copy the package's license file to '../${licenseDest}'`); } } } From 76bd64a6ceb46733389903643bc595426f31e1cb Mon Sep 17 00:00:00 2001 From: John Gozde Date: Fri, 1 Apr 2022 10:47:21 -0600 Subject: [PATCH 2/5] Switch to bp4 namespace; use bp-ns variable in overrides --- .../src/blueprint-overrides/common/_variables.scss | 2 +- web-console/src/bootstrap/ace.scss | 4 ++-- .../bootstrap/react-table-custom-pagination.scss | 11 +++++------ .../src/components/auto-form/auto-form.scss | 6 ++++-- .../date-range-selector/date-range-selector.scss | 4 +++- .../form-group-with-info/form-group-with-info.scss | 6 ++++-- .../formatted-input/formatted-input.scss | 4 +++- .../src/components/header-bar/header-bar.scss | 14 +++++++------- .../src/components/show-history/show-history.scss | 6 ++++-- .../table-column-selector.scss | 4 +++- .../view-control-bar/view-control-bar.scss | 4 ++-- .../compaction-dialog/compaction-dialog.scss | 4 +++- .../coordinator-dynamic-config-dialog.scss | 6 ++++-- .../src/dialogs/diff-dialog/diff-dialog.scss | 4 ++-- .../src/dialogs/doctor-dialog/doctor-dialog.scss | 6 ++++-- .../edit-context-dialog/edit-context-dialog.scss | 8 +++++--- .../src/dialogs/history-dialog/history-dialog.scss | 8 +++++--- .../lookup-edit-dialog/lookup-edit-dialog.scss | 4 +++- .../overlord-dynamic-config-dialog.scss | 6 ++++-- .../query-history-dialog/query-history-dialog.scss | 4 +++- .../dialogs/retention-dialog/retention-dialog.scss | 6 ++++-- .../show-value-dialog/show-value-dialog.scss | 12 +++++++----- .../src/dialogs/snitch-dialog/snitch-dialog.scss | 4 +++- .../src/dialogs/spec-dialog/spec-dialog.scss | 4 +++- .../src/dialogs/status-dialog/status-dialog.scss | 9 ++++++--- .../table-action-dialog/table-action-dialog.scss | 12 +++++++----- web-console/src/entry.scss | 2 +- web-console/src/variables.scss | 3 ++- .../home-view/home-view-card/home-view-card.scss | 6 +++--- .../load-data-view/form-editor/form-editor.scss | 3 +-- .../src/views/load-data-view/load-data-view.scss | 7 +++---- .../views/query-view/column-tree/column-tree.scss | 6 +++--- .../query-view/explain-dialog/explain-dialog.scss | 12 +++++++----- .../live-query-mode-selector.scss | 4 ++-- .../views/query-view/query-error/query-error.scss | 3 ++- .../query-view/query-output/query-output.scss | 4 ++-- web-console/src/views/query-view/query-view.scss | 2 +- web-console/unified-console.html | 2 +- 38 files changed, 129 insertions(+), 87 deletions(-) diff --git a/web-console/src/blueprint-overrides/common/_variables.scss b/web-console/src/blueprint-overrides/common/_variables.scss index 1527fbe4ab03..b8798c76b82b 100644 --- a/web-console/src/blueprint-overrides/common/_variables.scss +++ b/web-console/src/blueprint-overrides/common/_variables.scss @@ -18,7 +18,7 @@ // Namespace appended to the beginning of each CSS class: `.#{$ns}-button`. // Do not quote this value, for Less consumers. -$ns: bp3; +$ns: bp4; // easily the most important variable, so it comes up top // (so other variables can use it to define themselves) diff --git a/web-console/src/bootstrap/ace.scss b/web-console/src/bootstrap/ace.scss index f06fe0c3614e..ebe74d4c4121 100644 --- a/web-console/src/bootstrap/ace.scss +++ b/web-console/src/bootstrap/ace.scss @@ -41,7 +41,7 @@ background: $gray5; color: $gray1; - .bp3-dark & { + .#{$bp-ns}-dark & { background: $dark-gray4; color: $gray5; } @@ -79,7 +79,7 @@ border-radius: 2px; box-shadow: 0 5px 15px rgba(15, 19, 32, 0.45); - .bp3-dark & { + .#{$bp-ns}-dark & { background: $dark-gray4; } diff --git a/web-console/src/bootstrap/react-table-custom-pagination.scss b/web-console/src/bootstrap/react-table-custom-pagination.scss index 1acacfe6633c..4bfacb31e80f 100644 --- a/web-console/src/bootstrap/react-table-custom-pagination.scss +++ b/web-console/src/bootstrap/react-table-custom-pagination.scss @@ -16,30 +16,29 @@ * limitations under the License. */ -@import '../blueprint-overrides/common/colors'; -@import '../blueprint-overrides/common/variables'; +@import '../variables'; .ReactTable { .-pageJump { - .bp3-input { + .#{$bp-ns}-input { position: relative; top: -2px; border: none; - .bp3-dark & { + .#{$bp-ns}-dark & { background-color: $dark-gray4; } } } .-pageSizeOptions { - .bp3-html-select select { + .#{$bp-ns}-html-select select { width: 90px; position: relative; top: -2px; border: none; - .bp3-dark & { + .#{$bp-ns}-dark & { background-color: $dark-gray4; } } diff --git a/web-console/src/components/auto-form/auto-form.scss b/web-console/src/components/auto-form/auto-form.scss index 94ce1f32fef6..5523f0f8173f 100644 --- a/web-console/src/components/auto-form/auto-form.scss +++ b/web-console/src/components/auto-form/auto-form.scss @@ -16,12 +16,14 @@ * limitations under the License. */ +@import '../../variables'; + .auto-form { // Popover in info label - label.bp3-label { + label.#{$bp-ns}-label { position: relative; - .bp3-text-muted { + .#{$bp-ns}-text-muted { position: absolute; right: 0; } diff --git a/web-console/src/components/date-range-selector/date-range-selector.scss b/web-console/src/components/date-range-selector/date-range-selector.scss index a30d62287619..39df4d75f2ab 100644 --- a/web-console/src/components/date-range-selector/date-range-selector.scss +++ b/web-console/src/components/date-range-selector/date-range-selector.scss @@ -16,8 +16,10 @@ * limitations under the License. */ +@import '../../variables'; + .date-range-selector { - .bp3-popover-target { + .#{$bp-ns}-popover-target { display: block; } diff --git a/web-console/src/components/form-group-with-info/form-group-with-info.scss b/web-console/src/components/form-group-with-info/form-group-with-info.scss index 40ac3cc1c30b..c9587cb088fa 100644 --- a/web-console/src/components/form-group-with-info/form-group-with-info.scss +++ b/web-console/src/components/form-group-with-info/form-group-with-info.scss @@ -16,12 +16,14 @@ * limitations under the License. */ +@import '../../variables'; + .form-group-with-info { - .bp3-text-muted .bp3-popover2-target { + .#{$bp-ns}-text-muted .#{$bp-ns}-popover2-target { margin-top: 0; } - .bp3-form-content { + .#{$bp-ns}-form-content { position: relative; & > .info-popover { diff --git a/web-console/src/components/formatted-input/formatted-input.scss b/web-console/src/components/formatted-input/formatted-input.scss index 553ce0da3cec..46098e694e2c 100644 --- a/web-console/src/components/formatted-input/formatted-input.scss +++ b/web-console/src/components/formatted-input/formatted-input.scss @@ -16,10 +16,12 @@ * limitations under the License. */ +@import '../../variables'; + .formatted-input { position: relative; - & > .bp3-popover2-target { + & > .#{$bp-ns}-popover2-target { position: absolute; width: 0; right: 0; diff --git a/web-console/src/components/header-bar/header-bar.scss b/web-console/src/components/header-bar/header-bar.scss index 30365db3be04..783b472cb848 100644 --- a/web-console/src/components/header-bar/header-bar.scss +++ b/web-console/src/components/header-bar/header-bar.scss @@ -43,7 +43,7 @@ fill: $druid-brand2; } - .bp3-dark & { + .#{$bp-ns}-dark & { .letter { fill: $white; } @@ -59,29 +59,29 @@ white-space: nowrap; } - .bp3-navbar-divider { + .#{$bp-ns}-navbar-divider { margin: 0 11px; } - .bp3-button.bp3-minimal { + .#{$bp-ns}-button.#{$bp-ns}-minimal { border-radius: 20px; margin: 0 1px; - .bp3-icon { + .#{$bp-ns}-icon { svg { fill: $blue3; - .bp3-dark & { + .#{$bp-ns}-dark & { fill: $druid-brand; } } } - .bp3-dark & { + .#{$bp-ns}-dark & { &:hover { background: rgba($dark-gray5, 0.5); } - &.bp3-active { + &.#{$bp-ns}-active { background: rgba($dark-gray5, 0.9); } } diff --git a/web-console/src/components/show-history/show-history.scss b/web-console/src/components/show-history/show-history.scss index 9975fd7f8073..e06264246443 100644 --- a/web-console/src/components/show-history/show-history.scss +++ b/web-console/src/components/show-history/show-history.scss @@ -16,11 +16,13 @@ * limitations under the License. */ +@import '../../variables'; + .show-history { position: relative; height: 100%; - .bp3-tabs { + .#{$bp-ns}-tabs { position: relative; height: 100%; } @@ -30,7 +32,7 @@ width: 100%; } - .bp3-tab-list { + .#{$bp-ns}-tab-list { overflow-y: auto; } } diff --git a/web-console/src/components/table-column-selector/table-column-selector.scss b/web-console/src/components/table-column-selector/table-column-selector.scss index 4cefabf90005..f0c47723ab9f 100644 --- a/web-console/src/components/table-column-selector/table-column-selector.scss +++ b/web-console/src/components/table-column-selector/table-column-selector.scss @@ -16,6 +16,8 @@ * limitations under the License. */ +@import '../../variables'; + .table-column-selector { position: absolute; right: 0; @@ -28,7 +30,7 @@ // This will be mounted in a portal .table-column-selector-menu { - .bp3-form-group { + .#{$bp-ns}-form-group { margin-bottom: 0; } } diff --git a/web-console/src/components/view-control-bar/view-control-bar.scss b/web-console/src/components/view-control-bar/view-control-bar.scss index 8b4b71a22443..54529e334daa 100644 --- a/web-console/src/components/view-control-bar/view-control-bar.scss +++ b/web-console/src/components/view-control-bar/view-control-bar.scss @@ -36,8 +36,8 @@ margin-right: 20px; } - label.bp3-control, - label.bp3-label { + label.#{$bp-ns}-control, + label.#{$bp-ns}-label { display: inline-block; margin-bottom: 0; line-height: 30px; diff --git a/web-console/src/dialogs/compaction-dialog/compaction-dialog.scss b/web-console/src/dialogs/compaction-dialog/compaction-dialog.scss index 00cea76f381c..e3ca37b14ea0 100644 --- a/web-console/src/dialogs/compaction-dialog/compaction-dialog.scss +++ b/web-console/src/dialogs/compaction-dialog/compaction-dialog.scss @@ -16,8 +16,10 @@ * limitations under the License. */ +@import '../../variables'; + .compaction-dialog { - &.bp3-dialog { + &.#{$bp-ns}-dialog { height: 80vh; } diff --git a/web-console/src/dialogs/coordinator-dynamic-config-dialog/coordinator-dynamic-config-dialog.scss b/web-console/src/dialogs/coordinator-dynamic-config-dialog/coordinator-dynamic-config-dialog.scss index 0213e2c930ea..6ca750560088 100644 --- a/web-console/src/dialogs/coordinator-dynamic-config-dialog/coordinator-dynamic-config-dialog.scss +++ b/web-console/src/dialogs/coordinator-dynamic-config-dialog/coordinator-dynamic-config-dialog.scss @@ -16,13 +16,15 @@ * limitations under the License. */ +@import '../../variables'; + .coordinator-dynamic-config-dialog { - &.bp3-dialog { + &.#{$bp-ns}-dialog { margin-top: 5vh; top: 5%; } - .bp3-dialog-body { + .#{$bp-ns}-dialog-body { max-height: 70vh; .auto-form { diff --git a/web-console/src/dialogs/diff-dialog/diff-dialog.scss b/web-console/src/dialogs/diff-dialog/diff-dialog.scss index 39da1903ab33..2bcad85f2841 100644 --- a/web-console/src/dialogs/diff-dialog/diff-dialog.scss +++ b/web-console/src/dialogs/diff-dialog/diff-dialog.scss @@ -20,12 +20,12 @@ @import '../../blueprint-overrides/common/colors'; .diff-dialog { - &.bp3-dialog { + &.#{$bp-ns}-dialog { height: 90vh; width: 90vw; } - .bp3-dialog-body { + .#{$bp-ns}-dialog-body { position: relative; .version-selector-bar { diff --git a/web-console/src/dialogs/doctor-dialog/doctor-dialog.scss b/web-console/src/dialogs/doctor-dialog/doctor-dialog.scss index 7efca3a5d149..1cf48ede3260 100644 --- a/web-console/src/dialogs/doctor-dialog/doctor-dialog.scss +++ b/web-console/src/dialogs/doctor-dialog/doctor-dialog.scss @@ -16,13 +16,15 @@ * limitations under the License. */ +@import '../../variables'; + .doctor-dialog { - &.bp3-dialog { + &.#{$bp-ns}-dialog { margin-top: 5vh; top: 5%; } - .bp3-dialog-body { + .#{$bp-ns}-dialog-body { height: 70vh; overflow: scroll; } diff --git a/web-console/src/dialogs/edit-context-dialog/edit-context-dialog.scss b/web-console/src/dialogs/edit-context-dialog/edit-context-dialog.scss index cff40594d931..4cc5ab33b7f5 100644 --- a/web-console/src/dialogs/edit-context-dialog/edit-context-dialog.scss +++ b/web-console/src/dialogs/edit-context-dialog/edit-context-dialog.scss @@ -16,17 +16,19 @@ * limitations under the License. */ +@import '../../variables'; + .edit-context-dialog { - &.bp3-dialog { + &.#{$bp-ns}-dialog { padding-bottom: 10px; } - .bp3-input { + .#{$bp-ns}-input { margin: 10px; height: 400px; } - .bp3-dialog-footer-actions { + .#{$bp-ns}-dialog-footer-actions { padding: 0px 10px 0px 10px; display: grid; grid-template-columns: 340px 1fr; diff --git a/web-console/src/dialogs/history-dialog/history-dialog.scss b/web-console/src/dialogs/history-dialog/history-dialog.scss index bc812eefbbe1..01c411f78374 100644 --- a/web-console/src/dialogs/history-dialog/history-dialog.scss +++ b/web-console/src/dialogs/history-dialog/history-dialog.scss @@ -16,19 +16,21 @@ * limitations under the License. */ +@import '../../variables'; + .history-dialog { - &.bp3-dialog { + &.#{$bp-ns}-dialog { width: 75%; top: 5%; height: 75vh; } - .bp3-tabs { + .#{$bp-ns}-tabs { position: relative; height: 100%; width: 100%; - .bp3-tab-panel { + .#{$bp-ns}-tab-panel { flex: 1; } } diff --git a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.scss b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.scss index 1e28158f074f..b983f0a0c766 100644 --- a/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.scss +++ b/web-console/src/dialogs/lookup-edit-dialog/lookup-edit-dialog.scss @@ -16,8 +16,10 @@ * limitations under the License. */ +@import '../../variables'; + .lookup-edit-dialog { - &.bp3-dialog { + &.#{$bp-ns}-dialog { height: 80vh; width: 600px; } diff --git a/web-console/src/dialogs/overlord-dynamic-config-dialog/overlord-dynamic-config-dialog.scss b/web-console/src/dialogs/overlord-dynamic-config-dialog/overlord-dynamic-config-dialog.scss index f655cc92e463..8829e93b501b 100644 --- a/web-console/src/dialogs/overlord-dynamic-config-dialog/overlord-dynamic-config-dialog.scss +++ b/web-console/src/dialogs/overlord-dynamic-config-dialog/overlord-dynamic-config-dialog.scss @@ -16,14 +16,16 @@ * limitations under the License. */ +@import '../../variables'; + .overlord-dynamic-config-dialog { - &.bp3-dialog { + &.#{$bp-ns}-dialog { margin-top: 5vh; top: 5%; width: 600px; } - .bp3-dialog-body { + .#{$bp-ns}-dialog-body { max-height: 70vh; .auto-form { diff --git a/web-console/src/dialogs/query-history-dialog/query-history-dialog.scss b/web-console/src/dialogs/query-history-dialog/query-history-dialog.scss index 8a3eaa7b271a..cdf2ce1ec638 100644 --- a/web-console/src/dialogs/query-history-dialog/query-history-dialog.scss +++ b/web-console/src/dialogs/query-history-dialog/query-history-dialog.scss @@ -16,8 +16,10 @@ * limitations under the License. */ +@import '../../variables'; + .query-history-dialog { - &.bp3-dialog { + &.#{$bp-ns}-dialog { width: 900px; } diff --git a/web-console/src/dialogs/retention-dialog/retention-dialog.scss b/web-console/src/dialogs/retention-dialog/retention-dialog.scss index c4d33ec3559a..7fa00021ada6 100644 --- a/web-console/src/dialogs/retention-dialog/retention-dialog.scss +++ b/web-console/src/dialogs/retention-dialog/retention-dialog.scss @@ -16,13 +16,15 @@ * limitations under the License. */ +@import '../../variables'; + .retention-dialog { - &.bp3-dialog { + &.#{$bp-ns}-dialog { top: 5%; width: 750px; } - .bp3-dialog-body { + .#{$bp-ns}-dialog-body { .rule-editor { margin-bottom: 15px; } diff --git a/web-console/src/dialogs/show-value-dialog/show-value-dialog.scss b/web-console/src/dialogs/show-value-dialog/show-value-dialog.scss index 5cce81bc92cc..a1da01e5931e 100644 --- a/web-console/src/dialogs/show-value-dialog/show-value-dialog.scss +++ b/web-console/src/dialogs/show-value-dialog/show-value-dialog.scss @@ -16,26 +16,28 @@ * limitations under the License. */ +@import '../../variables'; + .show-value-dialog { - &.bp3-dialog { + &.#{$bp-ns}-dialog { padding-bottom: 10px; } - &.normal.bp3-dialog { + &.normal.#{$bp-ns}-dialog { height: 600px; } - &.large.bp3-dialog { + &.large.#{$bp-ns}-dialog { width: 90vw; height: 90vh; } - .bp3-input { + .#{$bp-ns}-input { margin: 10px; flex: 1; } - .bp3-dialog-footer-actions { + .#{$bp-ns}-dialog-footer-actions { padding-right: 10px; } } diff --git a/web-console/src/dialogs/snitch-dialog/snitch-dialog.scss b/web-console/src/dialogs/snitch-dialog/snitch-dialog.scss index 9d80b58e1353..c77b3f53d693 100644 --- a/web-console/src/dialogs/snitch-dialog/snitch-dialog.scss +++ b/web-console/src/dialogs/snitch-dialog/snitch-dialog.scss @@ -16,8 +16,10 @@ * limitations under the License. */ +@import '../../variables'; + .snitch-dialog { - .bp3-dialog-footer-actions { + .#{$bp-ns}-dialog-footer-actions { position: relative; .left-align-button { diff --git a/web-console/src/dialogs/spec-dialog/spec-dialog.scss b/web-console/src/dialogs/spec-dialog/spec-dialog.scss index d9af9ae85035..7bf38699419e 100644 --- a/web-console/src/dialogs/spec-dialog/spec-dialog.scss +++ b/web-console/src/dialogs/spec-dialog/spec-dialog.scss @@ -16,8 +16,10 @@ * limitations under the License. */ +@import '../../variables'; + .spec-dialog { - &.bp3-dialog { + &.#{$bp-ns}-dialog { top: 5%; width: 90%; } diff --git a/web-console/src/dialogs/status-dialog/status-dialog.scss b/web-console/src/dialogs/status-dialog/status-dialog.scss index fbda2691d351..e259747ccfde 100644 --- a/web-console/src/dialogs/status-dialog/status-dialog.scss +++ b/web-console/src/dialogs/status-dialog/status-dialog.scss @@ -15,6 +15,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + +@import '../../variables'; + $side-bar-width: 120px; .status-dialog { @@ -23,13 +26,13 @@ $side-bar-width: 120px; height: 500px; } - &.bp3-dialog { + &.#{$bp-ns}-dialog { margin-top: 5vh; top: 5%; width: 60vw; height: 90vh; - .bp3-dialog-body { + .#{$bp-ns}-dialog-body { position: relative; .main-container { @@ -50,7 +53,7 @@ $side-bar-width: 120px; } } - .bp3-dialog-footer { + .#{$bp-ns}-dialog-footer { position: relative; display: inline; overflow: auto; diff --git a/web-console/src/dialogs/table-action-dialog/table-action-dialog.scss b/web-console/src/dialogs/table-action-dialog/table-action-dialog.scss index 4af0a8848eca..3f7320768590 100644 --- a/web-console/src/dialogs/table-action-dialog/table-action-dialog.scss +++ b/web-console/src/dialogs/table-action-dialog/table-action-dialog.scss @@ -16,10 +16,12 @@ * limitations under the License. */ +@import '../../variables'; + $side-bar-width: 120px; .table-action-dialog { - &.bp3-dialog { + &.#{$bp-ns}-dialog { position: relative; width: 90vw; height: 85vh; @@ -36,7 +38,7 @@ $side-bar-width: 120px; } } - .bp3-dialog-body { + .#{$bp-ns}-dialog-body { position: relative; margin: 0; @@ -59,11 +61,11 @@ $side-bar-width: 120px; background-color: #2c74a8; } - .bp3-icon { + .#{$bp-ns}-icon { margin-right: 0; } - .bp3-button-text { + .#{$bp-ns}-button-text { margin-top: 5px; } } @@ -79,7 +81,7 @@ $side-bar-width: 120px; } } - .bp3-dialog-footer { + .#{$bp-ns}-dialog-footer { position: relative; .footer-actions-left { diff --git a/web-console/src/entry.scss b/web-console/src/entry.scss index 021d728bdf03..44ce87b05928 100644 --- a/web-console/src/entry.scss +++ b/web-console/src/entry.scss @@ -38,7 +38,7 @@ body { body { background: $light-gray4; - &.bp3-dark { + &.#{$bp-ns}-dark { background: $dark-gray2; } diff --git a/web-console/src/variables.scss b/web-console/src/variables.scss index 41c3cedf7369..e4105e3a11b0 100644 --- a/web-console/src/variables.scss +++ b/web-console/src/variables.scss @@ -18,6 +18,7 @@ @import './blueprint-overrides/common/colors'; @import './blueprint-overrides/common/variables'; +@import '~@blueprintjs/core/src/common/variables'; $header-bar-height: 50px; $view-control-bar-height: 30px; @@ -35,7 +36,7 @@ $druid-brand-background: #1c1c26; border-radius: $pt-border-radius; box-shadow: $pt-elevation-shadow-1; - .bp3-dark & { + .#{$bp-ns}-dark & { background: $dark-gray3; box-shadow: $pt-dark-elevation-shadow-1; } diff --git a/web-console/src/views/home-view/home-view-card/home-view-card.scss b/web-console/src/views/home-view/home-view-card/home-view-card.scss index ef5eb2bb0663..171f99b1cf9d 100644 --- a/web-console/src/views/home-view/home-view-card/home-view-card.scss +++ b/web-console/src/views/home-view/home-view-card/home-view-card.scss @@ -20,7 +20,7 @@ @import '../../../blueprint-overrides/common/colors'; .home-view-card { - .bp3-card { + .#{$bp-ns}-card { height: 170px; } @@ -42,7 +42,7 @@ height: 20px; fill: $blue3; - .bp3-dark & { + .#{$bp-ns}-dark & { fill: $druid-brand; } } @@ -51,7 +51,7 @@ a.home-view-card, a.home-view-card:hover { - .bp3-dark & { + .#{$bp-ns}-dark & { color: $gray4; } color: $gray2; diff --git a/web-console/src/views/load-data-view/form-editor/form-editor.scss b/web-console/src/views/load-data-view/form-editor/form-editor.scss index 99cc7e17b6a5..80556d62ec78 100644 --- a/web-console/src/views/load-data-view/form-editor/form-editor.scss +++ b/web-console/src/views/load-data-view/form-editor/form-editor.scss @@ -16,7 +16,6 @@ * limitations under the License. */ -@import '~@blueprintjs/core/src/common/colors'; @import '../../../variables'; .form-editor { @@ -29,7 +28,7 @@ position: relative; text-align: right; - .bp3-button { + .#{$bp-ns}-button { margin-left: 15px; } diff --git a/web-console/src/views/load-data-view/load-data-view.scss b/web-console/src/views/load-data-view/load-data-view.scss index e3b01fe38487..53bc7f050077 100644 --- a/web-console/src/views/load-data-view/load-data-view.scss +++ b/web-console/src/views/load-data-view/load-data-view.scss @@ -16,7 +16,6 @@ * limitations under the License. */ -@import '~@blueprintjs/core/src/common/colors'; @import '../../variables'; $control-bar-width: 300px; @@ -108,7 +107,7 @@ $actual-icon-height: 400px; } } - .bp3-card { + .#{$bp-ns}-card { position: relative; display: inline-block; vertical-align: top; @@ -129,7 +128,7 @@ $actual-icon-height: 400px; border: 2px solid $blue3; border-radius: $pt-border-radius; - .bp3-dark & { + .#{$bp-ns}-dark & { border: 2px solid $blue4; } } @@ -306,7 +305,7 @@ $actual-icon-height: 400px; .control-buttons { text-align: right; - .bp3-button { + .#{$bp-ns}-button { margin-left: 15px; } } diff --git a/web-console/src/views/query-view/column-tree/column-tree.scss b/web-console/src/views/query-view/column-tree/column-tree.scss index 65390d38a271..20e6dc9d239f 100644 --- a/web-console/src/views/query-view/column-tree/column-tree.scss +++ b/web-console/src/views/query-view/column-tree/column-tree.scss @@ -29,7 +29,7 @@ } .column-tree { - .bp3-dark & { + .#{$bp-ns}-dark & { background: $dark-gray3; } @@ -50,7 +50,7 @@ width: 100%; overflow: auto; - .bp3-tree-node-content-1 { + .#{$bp-ns}-tree-node-content-1 { padding-left: 0; } @@ -59,7 +59,7 @@ } } - .bp3-popover2-target { + .#{$bp-ns}-popover2-target { width: 188px; display: inline-block; cursor: pointer; diff --git a/web-console/src/views/query-view/explain-dialog/explain-dialog.scss b/web-console/src/views/query-view/explain-dialog/explain-dialog.scss index e447fdf6d856..56fd2c9a89bc 100644 --- a/web-console/src/views/query-view/explain-dialog/explain-dialog.scss +++ b/web-console/src/views/query-view/explain-dialog/explain-dialog.scss @@ -16,19 +16,21 @@ * limitations under the License. */ +@import '../../../variables'; + .explain-dialog { - &.bp3-dialog { + &.#{$bp-ns}-dialog { width: 800px; height: 90vh; } - .bp3-dialog-body { - .bp3-tabs { + .#{$bp-ns}-dialog-body { + .#{$bp-ns}-tabs { width: 100%; height: 100%; } - .bp3-tab-panel { + .#{$bp-ns}-tab-panel { flex: 1; } @@ -47,7 +49,7 @@ .query-group { flex: 1; - .bp3-form-content { + .#{$bp-ns}-form-content { flex: 1; } } diff --git a/web-console/src/views/query-view/live-query-mode-selector/live-query-mode-selector.scss b/web-console/src/views/query-view/live-query-mode-selector/live-query-mode-selector.scss index 2f86be2442af..f4193c2baeaf 100644 --- a/web-console/src/views/query-view/live-query-mode-selector/live-query-mode-selector.scss +++ b/web-console/src/views/query-view/live-query-mode-selector/live-query-mode-selector.scss @@ -30,11 +30,11 @@ } .live-query-mode-selector-portal { - .auto.auto-on .bp3-text-overflow-ellipsis { + .auto.auto-on .#{$bp-ns}-text-overflow-ellipsis { color: $druid-brand; } - .on .bp3-text-overflow-ellipsis { + .on .#{$bp-ns}-text-overflow-ellipsis { color: $druid-brand; } } diff --git a/web-console/src/views/query-view/query-error/query-error.scss b/web-console/src/views/query-view/query-error/query-error.scss index 821084fba200..c5c7a188f4d5 100644 --- a/web-console/src/views/query-view/query-error/query-error.scss +++ b/web-console/src/views/query-view/query-error/query-error.scss @@ -17,11 +17,12 @@ */ @import '../../../blueprint-overrides/common/colors'; +@import '../../../variables'; .query-error { padding: 20px 22px; - .bp3-dark & { + .#{$bp-ns}-dark & { background: $dark-gray3; } diff --git a/web-console/src/views/query-view/query-output/query-output.scss b/web-console/src/views/query-view/query-output/query-output.scss index 0e2eeaa0b95d..0d2a67581923 100644 --- a/web-console/src/views/query-view/query-output/query-output.scss +++ b/web-console/src/views/query-view/query-output/query-output.scss @@ -53,7 +53,7 @@ box-shadow: inset 0 -3px 0 0 rgba(255, 255, 255, 0.6); } - .bp3-icon { + .#{$bp-ns}-icon { margin-left: 3px; } } @@ -69,7 +69,7 @@ width: 100%; } - .bp3-popover2-target { + .#{$bp-ns}-popover2-target { width: 100%; } diff --git a/web-console/src/views/query-view/query-view.scss b/web-console/src/views/query-view/query-view.scss index a7b6b8b91a8e..169d05067d3f 100644 --- a/web-console/src/views/query-view/query-view.scss +++ b/web-console/src/views/query-view/query-view.scss @@ -73,7 +73,7 @@ $vertical-gap: 6px; margin-bottom: 6px; font-size: $pt-font-size; - .bp3-control-indicator { + .#{$bp-ns}-control-indicator { margin-top: -1px; } } diff --git a/web-console/unified-console.html b/web-console/unified-console.html index 7b1ad56fba05..533b53eba1e8 100644 --- a/web-console/unified-console.html +++ b/web-console/unified-console.html @@ -52,7 +52,7 @@ } - +
`; diff --git a/web-console/src/components/clearable-input/__snapshots__/clearable-input.spec.tsx.snap b/web-console/src/components/clearable-input/__snapshots__/clearable-input.spec.tsx.snap index 57554f5bc7ba..a5ac890d6ae2 100644 --- a/web-console/src/components/clearable-input/__snapshots__/clearable-input.spec.tsx.snap +++ b/web-console/src/components/clearable-input/__snapshots__/clearable-input.spec.tsx.snap @@ -2,25 +2,27 @@ exports[`ClearableInput matches snapshot 1`] = `
- - - + `; diff --git a/web-console/src/components/menu-checkbox/__snapshots__/menu-checkbox.spec.tsx.snap b/web-console/src/components/menu-checkbox/__snapshots__/menu-checkbox.spec.tsx.snap index 96312ffad7ea..855f81282e22 100644 --- a/web-console/src/components/menu-checkbox/__snapshots__/menu-checkbox.spec.tsx.snap +++ b/web-console/src/components/menu-checkbox/__snapshots__/menu-checkbox.spec.tsx.snap @@ -5,29 +5,33 @@ exports[`MenuCheckbox matches snapshot checked 1`] = ` class="" > - + + + +
hello
@@ -40,29 +44,33 @@ exports[`MenuCheckbox matches snapshot unchecked 1`] = ` class="" > - + + + +
hello
diff --git a/web-console/src/components/more-button/__snapshots__/more-button.spec.tsx.snap b/web-console/src/components/more-button/__snapshots__/more-button.spec.tsx.snap index 1619365f6dc9..119b10c70dd5 100644 --- a/web-console/src/components/more-button/__snapshots__/more-button.spec.tsx.snap +++ b/web-console/src/components/more-button/__snapshots__/more-button.spec.tsx.snap @@ -2,17 +2,20 @@ exports[`MoreButton matches snapshot (empty) 1`] = `
- double-caret-vertical + Open dropdown
- double-caret-vertical + Open dropdown
- double-caret-vertical + Open dropdown
- double-caret-vertical + Open dropdown
- double-caret-vertical + Open dropdown
- double-caret-vertical + Open dropdown
+
`; diff --git a/web-console/src/dialogs/history-dialog/__snapshots__/history-dialog.spec.tsx.snap b/web-console/src/dialogs/history-dialog/__snapshots__/history-dialog.spec.tsx.snap index 0ad76aacab98..6ee82f354b04 100644 --- a/web-console/src/dialogs/history-dialog/__snapshots__/history-dialog.spec.tsx.snap +++ b/web-console/src/dialogs/history-dialog/__snapshots__/history-dialog.spec.tsx.snap @@ -2,37 +2,44 @@ exports[`HistoryDialog matches snapshot 1`] = `
+