From cfc2a8d2869dd9899d483f758d4edbf44cb59d85 Mon Sep 17 00:00:00 2001 From: John Gozde Date: Mon, 5 Jun 2023 23:18:05 -0600 Subject: [PATCH] Switch to @blueprint/datetime2 (#14371) * Bump blueprint packages * Switch to datetime2 components * Update licenses * Update snapshots --- licenses.yaml | 62 ++++- licenses/bin/date-fns-tz.MIT | 21 ++ licenses/bin/date-fns.MIT | 21 ++ licenses/bin/lodash.MIT | 47 ++++ web-console/package-lock.json | 251 +++++++++++++----- web-console/package.json | 8 +- .../__snapshots__/auto-form.spec.tsx.snap | 1 + .../date-range-selector.tsx | 17 +- .../interval-input/interval-input.tsx | 18 +- .../__snapshots__/menu-tristate.spec.tsx.snap | 12 +- .../numeric-input-with-default.spec.tsx.snap | 1 + .../segment-timeline.spec.tsx.snap | 74 +++--- .../suggestion-menu.spec.tsx.snap | 6 +- web-console/src/entry.scss | 1 + web-console/src/utils/date.ts | 2 +- .../number-menu-items.spec.tsx.snap | 36 ++- .../string-menu-items.spec.tsx.snap | 36 ++- .../time-menu-items.spec.tsx.snap | 36 ++- 18 files changed, 478 insertions(+), 172 deletions(-) create mode 100644 licenses/bin/date-fns-tz.MIT create mode 100644 licenses/bin/date-fns.MIT create mode 100644 licenses/bin/lodash.MIT diff --git a/licenses.yaml b/licenses.yaml index 68ddacb5adf..d6aa715320c 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -5221,7 +5221,7 @@ license_category: binary module: web-console license_name: Apache License version 2.0 copyright: Palantir Technologies -version: 4.1.19 +version: 4.2.1 --- @@ -5230,7 +5230,16 @@ license_category: binary module: web-console license_name: Apache License version 2.0 copyright: Palantir Technologies -version: 4.17.6 +version: 4.20.1 + +--- + +name: "@blueprintjs/datetime2" +license_category: binary +module: web-console +license_name: Apache License version 2.0 +copyright: Palantir Technologies +version: 0.9.35 --- @@ -5239,7 +5248,7 @@ license_category: binary module: web-console license_name: Apache License version 2.0 copyright: Palantir Technologies -version: 4.4.25 +version: 4.4.36 --- @@ -5248,7 +5257,7 @@ license_category: binary module: web-console license_name: Apache License version 2.0 copyright: Palantir Technologies -version: 4.14.3 +version: 4.16.0 --- @@ -5257,7 +5266,16 @@ license_category: binary module: web-console license_name: Apache License version 2.0 copyright: Palantir Technologies -version: 1.13.10 +version: 1.14.9 + +--- + +name: "@blueprintjs/select" +license_category: binary +module: web-console +license_name: Apache License version 2.0 +copyright: Palantir Technologies +version: 4.9.22 --- @@ -5375,7 +5393,7 @@ license_category: binary module: web-console license_name: MIT License copyright: Federico Zivolo -version: 2.11.6 +version: 2.11.8 license_file_path: licenses/bin/@popperjs-core.MIT --- @@ -5740,6 +5758,26 @@ license_file_path: licenses/bin/d3-time.BSD3 --- +name: "date-fns-tz" +license_category: binary +module: web-console +license_name: MIT License +copyright: Marnus Weststrate +version: 1.3.8 +license_file_path: licenses/bin/date-fns-tz.MIT + +--- + +name: "date-fns" +license_category: binary +module: web-console +license_name: MIT License +copyright: Sasha Koss and Lesha Koss https://kossnocorp.mit-license.org +version: 2.30.0 +license_file_path: licenses/bin/date-fns.MIT + +--- + name: "deep-equal" license_category: binary module: web-console @@ -6188,6 +6226,16 @@ license_file_path: licenses/bin/lodash.isequal.MIT --- +name: "lodash" +license_category: binary +module: web-console +license_name: MIT License +copyright: John-David Dalton +version: 4.17.21 +license_file_path: licenses/bin/lodash.MIT + +--- + name: "loose-envify" license_category: binary module: web-console @@ -6692,7 +6740,7 @@ license_category: binary module: web-console license_name: Zero-Clause BSD copyright: Microsoft Corp. -version: 2.3.1 +version: 2.5.3 license_file_path: licenses/bin/tslib.0BSD --- diff --git a/licenses/bin/date-fns-tz.MIT b/licenses/bin/date-fns-tz.MIT new file mode 100644 index 00000000000..640ef802c35 --- /dev/null +++ b/licenses/bin/date-fns-tz.MIT @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright © 2018 Marnus Weststrate + +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/date-fns.MIT b/licenses/bin/date-fns.MIT new file mode 100644 index 00000000000..29c6e85fd32 --- /dev/null +++ b/licenses/bin/date-fns.MIT @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2021 Sasha Koss and Lesha Koss https://kossnocorp.mit-license.org + +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/lodash.MIT b/licenses/bin/lodash.MIT new file mode 100644 index 00000000000..77c42f1408a --- /dev/null +++ b/licenses/bin/lodash.MIT @@ -0,0 +1,47 @@ +Copyright OpenJS Foundation and other contributors + +Based on Underscore.js, copyright Jeremy Ashkenas, +DocumentCloud and Investigative Reporters & Editors + +This software consists of voluntary contributions made by many +individuals. For exact contribution history, see the revision history +available at https://github.com/lodash/lodash + +The following license applies to all parts of this software except as +documented below: + +==== + +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. + +==== + +Copyright and related rights for sample code are waived via CC0. Sample +code is defined as all source code displayed within the prose of the +documentation. + +CC0: http://creativecommons.org/publicdomain/zero/1.0/ + +==== + +Files located in the node_modules and vendor directories are externally +maintained libraries used by this software which have their own +licenses; we recommend you read them, as their terms may differ from the +terms above. diff --git a/web-console/package-lock.json b/web-console/package-lock.json index 10ba50cf2f5..7aac4aa3ad2 100644 --- a/web-console/package-lock.json +++ b/web-console/package-lock.json @@ -9,10 +9,10 @@ "version": "27.0.0", "license": "Apache-2.0", "dependencies": { - "@blueprintjs/core": "^4.17.6", - "@blueprintjs/datetime": "^4.4.25", - "@blueprintjs/icons": "^4.14.3", - "@blueprintjs/popover2": "^1.13.10", + "@blueprintjs/core": "^4.20.1", + "@blueprintjs/datetime2": "^0.9.35", + "@blueprintjs/icons": "^4.16.0", + "@blueprintjs/popover2": "^1.14.9", "ace-builds": "^1.4.13", "axios": "^0.26.1", "classnames": "^2.2.6", @@ -2389,17 +2389,20 @@ "dev": true }, "node_modules/@blueprintjs/colors": { - "version": "4.1.19", - "resolved": "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.1.19.tgz", - "integrity": "sha512-x5mDo4Ue9rAdbMHvOm0dNru9MSZqgs9Dd/l/2rgjzottthjsq1XjkiVae6evX4EGNM0I/bZKjTT8ccvqCqn4yw==" + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.2.1.tgz", + "integrity": "sha512-Cx7J2YnUuxn+fi+y5XtXnBB7+cFHN4xBrRkaAetp78i3VTCXjUk+d1omrOr8TqbRucUXTdrhbZOUHpzRLFcJpQ==", + "dependencies": { + "tslib": "~2.5.0" + } }, "node_modules/@blueprintjs/core": { - "version": "4.17.6", - "resolved": "https://registry.npmjs.org/@blueprintjs/core/-/core-4.17.6.tgz", - "integrity": "sha512-hZBIYfOUsgeeKeFeYCW6qcCTOxwA6EJTXJyjTv+QK34245Lms/rW4sKn+t8Z3z/b0AK5cTH0/S3a1umjshDhLA==", + "version": "4.20.1", + "resolved": "https://registry.npmjs.org/@blueprintjs/core/-/core-4.20.1.tgz", + "integrity": "sha512-nKFXfWj8PQrkweLrCr6VazYd4JJHCwiAxcgT9zzoxbEs0mSJF4yI7Qjoh5QkomtWugXrVLCDSzs4uJdaO1reAA==", "dependencies": { - "@blueprintjs/colors": "^4.1.19", - "@blueprintjs/icons": "^4.14.3", + "@blueprintjs/colors": "^4.2.1", + "@blueprintjs/icons": "^4.16.0", "@juggle/resize-observer": "^3.4.0", "@types/dom4": "^2.0.2", "classnames": "^2.3.1", @@ -2408,7 +2411,7 @@ "popper.js": "^1.16.1", "react-popper": "^1.3.11", "react-transition-group": "^4.4.5", - "tslib": "~2.3.1" + "tslib": "~2.5.0" }, "bin": { "upgrade-blueprint-2.0.0-rename": "scripts/upgrade-blueprint-2.0.0-rename.sh", @@ -2426,14 +2429,40 @@ } }, "node_modules/@blueprintjs/datetime": { - "version": "4.4.25", - "resolved": "https://registry.npmjs.org/@blueprintjs/datetime/-/datetime-4.4.25.tgz", - "integrity": "sha512-2Q818yMKqfUbU53fxh1XmkDLP9DMGDxe7t4LrrdKZBPM/m3qs2pyI5ficwDak1Rr9cHbe7Bq8ICwieCrudBeYw==", + "version": "4.4.36", + "resolved": "https://registry.npmjs.org/@blueprintjs/datetime/-/datetime-4.4.36.tgz", + "integrity": "sha512-+0zMGorGNjR/5lEB2t7sjVX0jWPVgmFkHTIezhAIQgJAj0upcxF3SuvnrpVjJKA3Ug6/0wZ+76eLPbpNz9CVzA==", "dependencies": { - "@blueprintjs/core": "^4.17.6", + "@blueprintjs/core": "^4.20.1", "classnames": "^2.3.1", "react-day-picker": "7.4.9", - "tslib": "~2.3.1" + "tslib": "~2.5.0" + }, + "peerDependencies": { + "@types/react": "^16.14.32 || 17", + "react": "^16.8 || 17", + "react-dom": "^16.8 || 17" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, + "node_modules/@blueprintjs/datetime2": { + "version": "0.9.35", + "resolved": "https://registry.npmjs.org/@blueprintjs/datetime2/-/datetime2-0.9.35.tgz", + "integrity": "sha512-9vuhKtVj8GwtB3fx4xnzQWc1g4kH6NB3QqotDI1azJrzTOVVEqzYs+RVGwLw60/WAR2PD+L/WJkthRIS6/wKAw==", + "dependencies": { + "@blueprintjs/core": "^4.20.1", + "@blueprintjs/datetime": "^4.4.36", + "@blueprintjs/popover2": "^1.14.9", + "@blueprintjs/select": "^4.9.22", + "classnames": "^2.3.1", + "date-fns": "^2.28.0", + "date-fns-tz": "^1.3.7", + "lodash": "^4.17.21", + "tslib": "~2.5.0" }, "peerDependencies": { "@types/react": "^16.14.32 || 17", @@ -2447,27 +2476,27 @@ } }, "node_modules/@blueprintjs/icons": { - "version": "4.14.3", - "resolved": "https://registry.npmjs.org/@blueprintjs/icons/-/icons-4.14.3.tgz", - "integrity": "sha512-2X5VXYCfybcax+tPVFl6WDngdxEk6AS7gflRjI9iuiJvkgjnkYeHBXZGRMhCzZb/B6+cBuMyvvAxmD2WVtlQsg==", + "version": "4.16.0", + "resolved": "https://registry.npmjs.org/@blueprintjs/icons/-/icons-4.16.0.tgz", + "integrity": "sha512-cyfgjUZcZCtQrXWUV8FwqYTFEzduV4a0N7yhOU38jY+cBRCLu/sDrD0Osvfk4DGRvNe4YjY7pohVLFSxpg68Uw==", "dependencies": { "change-case": "^4.1.2", "classnames": "^2.3.1", - "tslib": "~2.3.1" + "tslib": "~2.5.0" } }, "node_modules/@blueprintjs/popover2": { - "version": "1.13.10", - "resolved": "https://registry.npmjs.org/@blueprintjs/popover2/-/popover2-1.13.10.tgz", - "integrity": "sha512-ohdO3F9MUZXDaBNYFi+xrlhDWl6GWg9/zl8VQTzhk5ny5kuGJsU7cPAeTGNyrXkR8PMRbTWKfFFc/R/H4qUo/g==", + "version": "1.14.9", + "resolved": "https://registry.npmjs.org/@blueprintjs/popover2/-/popover2-1.14.9.tgz", + "integrity": "sha512-46gesoxeEbp1owKDGz7JwurXmVqSLq9ALes5etHqtjwdCpenBQc7GM+sFuJoLlEU7twcIlzwE6xaSU2+vnYVCQ==", "dependencies": { - "@blueprintjs/core": "^4.17.6", + "@blueprintjs/core": "^4.20.1", "@juggle/resize-observer": "^3.4.0", - "@popperjs/core": "^2.11.6", + "@popperjs/core": "^2.11.7", "classnames": "^2.3.1", "dom4": "^2.1.5", "react-popper": "^2.3.0", - "tslib": "~2.3.1" + "tslib": "~2.5.0" }, "peerDependencies": { "@types/react": "^16.14.32 || 17 || 18", @@ -2494,6 +2523,27 @@ "react-dom": "^16.8.0 || ^17 || ^18" } }, + "node_modules/@blueprintjs/select": { + "version": "4.9.22", + "resolved": "https://registry.npmjs.org/@blueprintjs/select/-/select-4.9.22.tgz", + "integrity": "sha512-T5ofz571kPfycbxAuXlTrE7ndXIiHPCDMjADYJpb5HVOk0SYwwzDvnWjsYbyAj1SONbxOAKh4/wmFTDjZv7G2g==", + "dependencies": { + "@blueprintjs/core": "^4.20.1", + "@blueprintjs/popover2": "^1.14.9", + "classnames": "^2.3.1", + "tslib": "~2.5.0" + }, + "peerDependencies": { + "@types/react": "^16.14.32 || 17 || 18", + "react": "^16.8 || 17 || 18", + "react-dom": "^16.8 || 17 || 18" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/@bufbuild/protobuf": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-1.1.1.tgz", @@ -4263,9 +4313,9 @@ "dev": true }, "node_modules/@popperjs/core": { - "version": "2.11.6", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz", - "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==", + "version": "2.11.8", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==", "funding": { "type": "opencollective", "url": "https://opencollective.com/popperjs" @@ -7814,6 +7864,29 @@ "node": ">=10" } }, + "node_modules/date-fns": { + "version": "2.30.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz", + "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==", + "dependencies": { + "@babel/runtime": "^7.21.0" + }, + "engines": { + "node": ">=0.11" + }, + "funding": { + "type": "opencollective", + "url": "https://opencollective.com/date-fns" + } + }, + "node_modules/date-fns-tz": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.8.tgz", + "integrity": "sha512-qwNXUFtMHTTU6CFSFjoJ80W8Fzzp24LntbjFFBgL/faqds4e5mo9mftoRLgr3Vi1trISsg4awSpYVsOQCRnapQ==", + "peerDependencies": { + "date-fns": ">=2.0.0" + } + }, "node_modules/debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", @@ -16484,8 +16557,7 @@ "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "node_modules/lodash._reinterpolate": { "version": "3.0.0", @@ -24230,9 +24302,9 @@ } }, "node_modules/tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" }, "node_modules/tsutils": { "version": "3.21.0", @@ -27984,17 +28056,20 @@ "dev": true }, "@blueprintjs/colors": { - "version": "4.1.19", - "resolved": "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.1.19.tgz", - "integrity": "sha512-x5mDo4Ue9rAdbMHvOm0dNru9MSZqgs9Dd/l/2rgjzottthjsq1XjkiVae6evX4EGNM0I/bZKjTT8ccvqCqn4yw==" + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.2.1.tgz", + "integrity": "sha512-Cx7J2YnUuxn+fi+y5XtXnBB7+cFHN4xBrRkaAetp78i3VTCXjUk+d1omrOr8TqbRucUXTdrhbZOUHpzRLFcJpQ==", + "requires": { + "tslib": "~2.5.0" + } }, "@blueprintjs/core": { - "version": "4.17.6", - "resolved": "https://registry.npmjs.org/@blueprintjs/core/-/core-4.17.6.tgz", - "integrity": "sha512-hZBIYfOUsgeeKeFeYCW6qcCTOxwA6EJTXJyjTv+QK34245Lms/rW4sKn+t8Z3z/b0AK5cTH0/S3a1umjshDhLA==", + "version": "4.20.1", + "resolved": "https://registry.npmjs.org/@blueprintjs/core/-/core-4.20.1.tgz", + "integrity": "sha512-nKFXfWj8PQrkweLrCr6VazYd4JJHCwiAxcgT9zzoxbEs0mSJF4yI7Qjoh5QkomtWugXrVLCDSzs4uJdaO1reAA==", "requires": { - "@blueprintjs/colors": "^4.1.19", - "@blueprintjs/icons": "^4.14.3", + "@blueprintjs/colors": "^4.2.1", + "@blueprintjs/icons": "^4.16.0", "@juggle/resize-observer": "^3.4.0", "@types/dom4": "^2.0.2", "classnames": "^2.3.1", @@ -28003,42 +28078,58 @@ "popper.js": "^1.16.1", "react-popper": "^1.3.11", "react-transition-group": "^4.4.5", - "tslib": "~2.3.1" + "tslib": "~2.5.0" } }, "@blueprintjs/datetime": { - "version": "4.4.25", - "resolved": "https://registry.npmjs.org/@blueprintjs/datetime/-/datetime-4.4.25.tgz", - "integrity": "sha512-2Q818yMKqfUbU53fxh1XmkDLP9DMGDxe7t4LrrdKZBPM/m3qs2pyI5ficwDak1Rr9cHbe7Bq8ICwieCrudBeYw==", + "version": "4.4.36", + "resolved": "https://registry.npmjs.org/@blueprintjs/datetime/-/datetime-4.4.36.tgz", + "integrity": "sha512-+0zMGorGNjR/5lEB2t7sjVX0jWPVgmFkHTIezhAIQgJAj0upcxF3SuvnrpVjJKA3Ug6/0wZ+76eLPbpNz9CVzA==", "requires": { - "@blueprintjs/core": "^4.17.6", + "@blueprintjs/core": "^4.20.1", "classnames": "^2.3.1", "react-day-picker": "7.4.9", - "tslib": "~2.3.1" + "tslib": "~2.5.0" + } + }, + "@blueprintjs/datetime2": { + "version": "0.9.35", + "resolved": "https://registry.npmjs.org/@blueprintjs/datetime2/-/datetime2-0.9.35.tgz", + "integrity": "sha512-9vuhKtVj8GwtB3fx4xnzQWc1g4kH6NB3QqotDI1azJrzTOVVEqzYs+RVGwLw60/WAR2PD+L/WJkthRIS6/wKAw==", + "requires": { + "@blueprintjs/core": "^4.20.1", + "@blueprintjs/datetime": "^4.4.36", + "@blueprintjs/popover2": "^1.14.9", + "@blueprintjs/select": "^4.9.22", + "classnames": "^2.3.1", + "date-fns": "^2.28.0", + "date-fns-tz": "^1.3.7", + "lodash": "^4.17.21", + "tslib": "~2.5.0" } }, "@blueprintjs/icons": { - "version": "4.14.3", - "resolved": "https://registry.npmjs.org/@blueprintjs/icons/-/icons-4.14.3.tgz", - "integrity": "sha512-2X5VXYCfybcax+tPVFl6WDngdxEk6AS7gflRjI9iuiJvkgjnkYeHBXZGRMhCzZb/B6+cBuMyvvAxmD2WVtlQsg==", + "version": "4.16.0", + "resolved": "https://registry.npmjs.org/@blueprintjs/icons/-/icons-4.16.0.tgz", + "integrity": "sha512-cyfgjUZcZCtQrXWUV8FwqYTFEzduV4a0N7yhOU38jY+cBRCLu/sDrD0Osvfk4DGRvNe4YjY7pohVLFSxpg68Uw==", "requires": { "change-case": "^4.1.2", "classnames": "^2.3.1", - "tslib": "~2.3.1" + "tslib": "~2.5.0" } }, "@blueprintjs/popover2": { - "version": "1.13.10", - "resolved": "https://registry.npmjs.org/@blueprintjs/popover2/-/popover2-1.13.10.tgz", - "integrity": "sha512-ohdO3F9MUZXDaBNYFi+xrlhDWl6GWg9/zl8VQTzhk5ny5kuGJsU7cPAeTGNyrXkR8PMRbTWKfFFc/R/H4qUo/g==", + "version": "1.14.9", + "resolved": "https://registry.npmjs.org/@blueprintjs/popover2/-/popover2-1.14.9.tgz", + "integrity": "sha512-46gesoxeEbp1owKDGz7JwurXmVqSLq9ALes5etHqtjwdCpenBQc7GM+sFuJoLlEU7twcIlzwE6xaSU2+vnYVCQ==", "requires": { - "@blueprintjs/core": "^4.17.6", + "@blueprintjs/core": "^4.20.1", "@juggle/resize-observer": "^3.4.0", - "@popperjs/core": "^2.11.6", + "@popperjs/core": "^2.11.7", "classnames": "^2.3.1", "dom4": "^2.1.5", "react-popper": "^2.3.0", - "tslib": "~2.3.1" + "tslib": "~2.5.0" }, "dependencies": { "react-popper": { @@ -28052,6 +28143,17 @@ } } }, + "@blueprintjs/select": { + "version": "4.9.22", + "resolved": "https://registry.npmjs.org/@blueprintjs/select/-/select-4.9.22.tgz", + "integrity": "sha512-T5ofz571kPfycbxAuXlTrE7ndXIiHPCDMjADYJpb5HVOk0SYwwzDvnWjsYbyAj1SONbxOAKh4/wmFTDjZv7G2g==", + "requires": { + "@blueprintjs/core": "^4.20.1", + "@blueprintjs/popover2": "^1.14.9", + "classnames": "^2.3.1", + "tslib": "~2.5.0" + } + }, "@bufbuild/protobuf": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@bufbuild/protobuf/-/protobuf-1.1.1.tgz", @@ -29434,9 +29536,9 @@ "dev": true }, "@popperjs/core": { - "version": "2.11.6", - "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.6.tgz", - "integrity": "sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw==" + "version": "2.11.8", + "resolved": "https://registry.npmjs.org/@popperjs/core/-/core-2.11.8.tgz", + "integrity": "sha512-P1st0aksCrn9sGZhp8GMYwBnQsbvAWsZAX44oXNNvLHGqAOcoVxmjZiohstwQ7SqKnbR47akdNi+uleWD8+g6A==" }, "@sheerun/mutationobserver-shim": { "version": "0.3.2", @@ -32293,6 +32395,20 @@ "whatwg-url": "^8.0.0" } }, + "date-fns": { + "version": "2.30.0", + "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz", + "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==", + "requires": { + "@babel/runtime": "^7.21.0" + } + }, + "date-fns-tz": { + "version": "1.3.8", + "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-1.3.8.tgz", + "integrity": "sha512-qwNXUFtMHTTU6CFSFjoJ80W8Fzzp24LntbjFFBgL/faqds4e5mo9mftoRLgr3Vi1trISsg4awSpYVsOQCRnapQ==", + "requires": {} + }, "debug": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz", @@ -38981,8 +39097,7 @@ "lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", - "dev": true + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" }, "lodash._reinterpolate": { "version": "3.0.0", @@ -44836,9 +44951,9 @@ } }, "tslib": { - "version": "2.3.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", - "integrity": "sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==" + "version": "2.5.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", + "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" }, "tsutils": { "version": "3.21.0", diff --git a/web-console/package.json b/web-console/package.json index 9dba6ca8190..1d02753cd2b 100644 --- a/web-console/package.json +++ b/web-console/package.json @@ -63,10 +63,10 @@ "not ie 11" ], "dependencies": { - "@blueprintjs/core": "^4.17.6", - "@blueprintjs/datetime": "^4.4.25", - "@blueprintjs/icons": "^4.14.3", - "@blueprintjs/popover2": "^1.13.10", + "@blueprintjs/core": "^4.20.1", + "@blueprintjs/datetime2": "^0.9.35", + "@blueprintjs/icons": "^4.16.0", + "@blueprintjs/popover2": "^1.14.9", "ace-builds": "^1.4.13", "axios": "^0.26.1", "classnames": "^2.2.6", diff --git a/web-console/src/components/auto-form/__snapshots__/auto-form.spec.tsx.snap b/web-console/src/components/auto-form/__snapshots__/auto-form.spec.tsx.snap index f55beba4ba8..64c6e41420c 100644 --- a/web-console/src/components/auto-form/__snapshots__/auto-form.spec.tsx.snap +++ b/web-console/src/components/auto-form/__snapshots__/auto-form.spec.tsx.snap @@ -34,6 +34,7 @@ exports[`AutoForm matches snapshot 1`] = ` onValueChange={[Function]} selectAllOnFocus={false} selectAllOnIncrement={false} + small={false} stepSize={1000} /> diff --git a/web-console/src/components/date-range-selector/date-range-selector.tsx b/web-console/src/components/date-range-selector/date-range-selector.tsx index 26da957114f..08ea9fcdca3 100644 --- a/web-console/src/components/date-range-selector/date-range-selector.tsx +++ b/web-console/src/components/date-range-selector/date-range-selector.tsx @@ -16,16 +16,19 @@ * limitations under the License. */ -import { Button, InputGroup, Popover, Position } from '@blueprintjs/core'; -import type { DateRange } from '@blueprintjs/datetime'; -import { DateRangePicker } from '@blueprintjs/datetime'; +import { Button, InputGroup, Position } from '@blueprintjs/core'; +import type { DateRange } from '@blueprintjs/datetime2'; +import { DateRangeInput2 } from '@blueprintjs/datetime2'; import { IconNames } from '@blueprintjs/icons'; +import { Popover2 } from '@blueprintjs/popover2'; import React, { useState } from 'react'; import { dateToIsoDateString, localToUtcDate, utcToLocalDate } from '../../utils'; import './date-range-selector.scss'; +const BASIC_DATE_PARSER = (str: string) => new Date(str); + interface DateRangeSelectorProps { startDate: Date; endDate: Date; @@ -39,10 +42,12 @@ export const DateRangeSelector = React.memo(function DateRangeSelector( const [intermediateDateRange, setIntermediateDateRange] = useState(); return ( - } /> - + ); }); diff --git a/web-console/src/components/interval-input/interval-input.tsx b/web-console/src/components/interval-input/interval-input.tsx index 7cc44133564..b50d8af6a85 100644 --- a/web-console/src/components/interval-input/interval-input.tsx +++ b/web-console/src/components/interval-input/interval-input.tsx @@ -18,13 +18,19 @@ import type { Intent } from '@blueprintjs/core'; import { Button, InputGroup, Position } from '@blueprintjs/core'; -import type { DateRange } from '@blueprintjs/datetime'; -import { DateRangePicker, TimePrecision } from '@blueprintjs/datetime'; +import type { DateRange } from '@blueprintjs/datetime2'; +import { DateRangeInput2 } from '@blueprintjs/datetime2'; import { IconNames } from '@blueprintjs/icons'; import { Popover2 } from '@blueprintjs/popover2'; import React from 'react'; -import { intervalToLocalDateRange, localDateRangeToInterval } from '../../utils'; +import { + dateToIsoDateString, + intervalToLocalDateRange, + localDateRangeToInterval, +} from '../../utils'; + +const BASIC_DATE_PARSER = (str: string) => new Date(str); export interface IntervalInputProps { interval: string; @@ -45,14 +51,16 @@ export const IntervalInput = React.memo(function IntervalInput(props: IntervalIn { onValueChange(localDateRangeToInterval(selectedRange)); }} + formatDate={dateToIsoDateString} + parseDate={BASIC_DATE_PARSER} /> } position={Position.BOTTOM_RIGHT} diff --git a/web-console/src/components/menu-tristate/__snapshots__/menu-tristate.spec.tsx.snap b/web-console/src/components/menu-tristate/__snapshots__/menu-tristate.spec.tsx.snap index efa4ebb6126..3b3fc951863 100644 --- a/web-console/src/components/menu-tristate/__snapshots__/menu-tristate.spec.tsx.snap +++ b/web-console/src/components/menu-tristate/__snapshots__/menu-tristate.spec.tsx.snap @@ -11,12 +11,14 @@ exports[`MenuTristate matches snapshot false 1`] = ` diff --git a/web-console/src/components/suggestion-menu/__snapshots__/suggestion-menu.spec.tsx.snap b/web-console/src/components/suggestion-menu/__snapshots__/suggestion-menu.spec.tsx.snap index 273ab1aac8c..f8841865101 100644 --- a/web-console/src/components/suggestion-menu/__snapshots__/suggestion-menu.spec.tsx.snap +++ b/web-console/src/components/suggestion-menu/__snapshots__/suggestion-menu.spec.tsx.snap @@ -63,11 +63,13 @@ exports[`SuggestionMenu matches snapshot 1`] = `