From fc60d6a4bd9718ba39beb667bc58934f53d84418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Oskar=20Damkj=C3=A6r?= Date: Wed, 3 Apr 2024 08:30:38 +0200 Subject: [PATCH] Fix formatting of large duration values (#1958) * Remove luxon duration formatter * fix duration issue * self review * fix unit test * fix e2e test and add new test * update type spec * fix tests and restore older rendering in ascii view --- LICENSES.txt | 320 +++++++++++------- NOTICE.txt | 207 +++-------- e2e_tests/integration/types.spec.ts | 8 +- package.json | 2 - .../Stream/CypherFrame/helpers.test.ts | 41 ++- .../modules/Stream/CypherFrame/helpers.ts | 8 +- .../modules/Stream/Queries/QueriesFrame.tsx | 60 ++-- .../services/bolt/cypherTypesFormatting.ts | 13 +- yarn.lock | 10 - 9 files changed, 328 insertions(+), 341 deletions(-) diff --git a/LICENSES.txt b/LICENSES.txt index fbf3418a0a9..b066890b2d8 100644 --- a/LICENSES.txt +++ b/LICENSES.txt @@ -32,7 +32,7 @@ SOFTWARE. ----- -The following software may be included in this product: @babel/code-frame, @babel/generator, @babel/helper-annotate-as-pure, @babel/helper-environment-visitor, @babel/helper-function-name, @babel/helper-get-function-arity, @babel/helper-hoist-variables, @babel/helper-module-imports, @babel/helper-plugin-utils, @babel/helper-split-export-declaration, @babel/helper-string-parser, @babel/helper-validator-identifier, @babel/highlight, @babel/plugin-syntax-jsx, @babel/runtime, @babel/runtime-corejs3, @babel/template, @babel/traverse, @babel/types. A copy of the source code may be downloaded from https://github.com/babel/babel.git (@babel/code-frame), https://github.com/babel/babel.git (@babel/generator), https://github.com/babel/babel.git (@babel/helper-annotate-as-pure), https://github.com/babel/babel.git (@babel/helper-environment-visitor), https://github.com/babel/babel.git (@babel/helper-function-name), https://github.com/babel/babel.git (@babel/helper-get-function-arity), https://github.com/babel/babel.git (@babel/helper-hoist-variables), https://github.com/babel/babel.git (@babel/helper-module-imports), https://github.com/babel/babel.git (@babel/helper-plugin-utils), https://github.com/babel/babel.git (@babel/helper-split-export-declaration), https://github.com/babel/babel.git (@babel/helper-string-parser), https://github.com/babel/babel.git (@babel/helper-validator-identifier), https://github.com/babel/babel.git (@babel/highlight), https://github.com/babel/babel.git (@babel/plugin-syntax-jsx), https://github.com/babel/babel.git (@babel/runtime), https://github.com/babel/babel.git (@babel/runtime-corejs3), https://github.com/babel/babel.git (@babel/template), https://github.com/babel/babel.git (@babel/traverse), https://github.com/babel/babel.git (@babel/types). This software contains the following license and notice below: +The following software may be included in this product: @babel/code-frame, @babel/generator, @babel/helper-annotate-as-pure, @babel/helper-function-name, @babel/helper-get-function-arity, @babel/helper-module-imports, @babel/helper-plugin-utils, @babel/helper-split-export-declaration, @babel/helper-validator-identifier, @babel/highlight, @babel/plugin-syntax-jsx, @babel/runtime, @babel/runtime-corejs3, @babel/template, @babel/traverse, @babel/types. A copy of the source code may be downloaded from https://github.com/babel/babel.git (@babel/code-frame), https://github.com/babel/babel.git (@babel/generator), https://github.com/babel/babel.git (@babel/helper-annotate-as-pure), https://github.com/babel/babel.git (@babel/helper-function-name), https://github.com/babel/babel.git (@babel/helper-get-function-arity), https://github.com/babel/babel.git (@babel/helper-module-imports), https://github.com/babel/babel.git (@babel/helper-plugin-utils), https://github.com/babel/babel.git (@babel/helper-split-export-declaration), https://github.com/babel/babel.git (@babel/helper-validator-identifier), https://github.com/babel/babel.git (@babel/highlight), https://github.com/babel/babel.git (@babel/plugin-syntax-jsx), https://github.com/babel/babel.git (@babel/runtime), https://github.com/babel/babel.git (@babel/runtime-corejs3), https://github.com/babel/babel.git (@babel/template), https://github.com/babel/babel.git (@babel/traverse), https://github.com/babel/babel.git (@babel/types). This software contains the following license and notice below: MIT License @@ -109,7 +109,7 @@ SOFTWARE. ----- -The following software may be included in this product: @firebase/auth, gaxios, gcp-metadata, google-auth-library, long, neo4j-client-sso. A copy of the source code may be downloaded from https://github.com/firebase/firebase-js-sdk.git (@firebase/auth), https://github.com/googleapis/gaxios.git (gaxios), https://github.com/googleapis/gcp-metadata.git (gcp-metadata), https://github.com/googleapis/google-auth-library-nodejs.git (google-auth-library), https://github.com/dcodeIO/long.js.git (long), git+https://github.com/neo4j-devtools/neo4j-client-sso.git (neo4j-client-sso). This software contains the following license and notice below: +The following software may be included in this product: @firebase/auth, gaxios, gcp-metadata, google-auth-library, long. A copy of the source code may be downloaded from https://github.com/firebase/firebase-js-sdk.git (@firebase/auth), https://github.com/googleapis/gaxios.git (gaxios), https://github.com/googleapis/gcp-metadata.git (gcp-metadata), https://github.com/googleapis/google-auth-library-nodejs.git (google-auth-library), https://github.com/dcodeIO/long.js.git (long). This software contains the following license and notice below: Apache License Version 2.0, January 2004 @@ -2062,7 +2062,7 @@ SOFTWARE. ----- -The following software may be included in this product: @types/chroma-js, @types/debug, @types/hast, @types/js-cookie, @types/node, @types/react, @types/react-transition-group, @types/zen-observable. A copy of the source code may be downloaded from https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/chroma-js), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/debug), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/hast), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/js-cookie), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/node), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/react), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/react-transition-group), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/zen-observable). This software contains the following license and notice below: +The following software may be included in this product: @types/chroma-js, @types/debug, @types/hast, @types/js-cookie, @types/node, @types/react, @types/react-transition-group, @types/scheduler, @types/zen-observable. A copy of the source code may be downloaded from https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/chroma-js), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/debug), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/hast), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/js-cookie), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/node), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/react), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/react-transition-group), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/scheduler), https://github.com/DefinitelyTyped/DefinitelyTyped.git (@types/zen-observable). This software contains the following license and notice below: MIT License @@ -2192,7 +2192,7 @@ SOFTWARE. ----- -The following software may be included in this product: ansi-regex, ansi-styles, arrify, callsites, camelcase, chalk, find-up, globals, has-flag, import-fresh, is-fullwidth-code-point, is-stream, locate-path, p-limit, p-locate, p-try, parent-module, path-exists, path-type, resolve-from, screenfull, string-width, strip-ansi, supports-color, wrap-ansi. A copy of the source code may be downloaded from https://github.com/chalk/ansi-regex.git (ansi-regex), https://github.com/chalk/ansi-styles.git (ansi-styles), https://github.com/sindresorhus/arrify.git (arrify), https://github.com/sindresorhus/callsites.git (callsites), https://github.com/sindresorhus/camelcase.git (camelcase), https://github.com/chalk/chalk.git (chalk), https://github.com/sindresorhus/find-up.git (find-up), https://github.com/sindresorhus/globals.git (globals), https://github.com/sindresorhus/has-flag.git (has-flag), https://github.com/sindresorhus/import-fresh.git (import-fresh), https://github.com/sindresorhus/is-fullwidth-code-point.git (is-fullwidth-code-point), https://github.com/sindresorhus/is-stream.git (is-stream), https://github.com/sindresorhus/locate-path.git (locate-path), https://github.com/sindresorhus/p-limit.git (p-limit), https://github.com/sindresorhus/p-locate.git (p-locate), https://github.com/sindresorhus/p-try.git (p-try), https://github.com/sindresorhus/parent-module.git (parent-module), https://github.com/sindresorhus/path-exists.git (path-exists), https://github.com/sindresorhus/path-type.git (path-type), https://github.com/sindresorhus/resolve-from.git (resolve-from), https://github.com/sindresorhus/screenfull.js.git (screenfull), https://github.com/sindresorhus/string-width.git (string-width), https://github.com/chalk/strip-ansi.git (strip-ansi), https://github.com/chalk/supports-color.git (supports-color), https://github.com/chalk/wrap-ansi.git (wrap-ansi). This software contains the following license and notice below: +The following software may be included in this product: ansi-regex, ansi-styles, arrify, callsites, camelcase, chalk, find-up, globals, has-flag, is-fullwidth-code-point, is-stream, locate-path, p-limit, p-locate, p-try, parent-module, path-exists, path-type, resolve-from, screenfull, string-width, strip-ansi, supports-color, wrap-ansi. A copy of the source code may be downloaded from https://github.com/chalk/ansi-regex.git (ansi-regex), https://github.com/chalk/ansi-styles.git (ansi-styles), https://github.com/sindresorhus/arrify.git (arrify), https://github.com/sindresorhus/callsites.git (callsites), https://github.com/sindresorhus/camelcase.git (camelcase), https://github.com/chalk/chalk.git (chalk), https://github.com/sindresorhus/find-up.git (find-up), https://github.com/sindresorhus/globals.git (globals), https://github.com/sindresorhus/has-flag.git (has-flag), https://github.com/sindresorhus/is-fullwidth-code-point.git (is-fullwidth-code-point), https://github.com/sindresorhus/is-stream.git (is-stream), https://github.com/sindresorhus/locate-path.git (locate-path), https://github.com/sindresorhus/p-limit.git (p-limit), https://github.com/sindresorhus/p-locate.git (p-locate), https://github.com/sindresorhus/p-try.git (p-try), https://github.com/sindresorhus/parent-module.git (parent-module), https://github.com/sindresorhus/path-exists.git (path-exists), https://github.com/sindresorhus/path-type.git (path-type), https://github.com/sindresorhus/resolve-from.git (resolve-from), https://github.com/sindresorhus/screenfull.js.git (screenfull), https://github.com/sindresorhus/string-width.git (string-width), https://github.com/chalk/strip-ansi.git (strip-ansi), https://github.com/chalk/supports-color.git (supports-color), https://github.com/chalk/wrap-ansi.git (wrap-ansi). This software contains the following license and notice below: MIT License @@ -2565,32 +2565,6 @@ SOFTWARE. ----- -The following software may be included in this product: classnames. A copy of the source code may be downloaded from https://github.com/JedWatson/classnames.git. This software contains the following license and notice below: - -The MIT License (MIT) - -Copyright (c) 2017 Jed Watson - -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. - ------ - The following software may be included in this product: cliui. A copy of the source code may be downloaded from http://github.com/yargs/cliui.git. This software contains the following license and notice below: Copyright (c) 2015, Contributors @@ -2820,7 +2794,7 @@ THE SOFTWARE. The following software may be included in this product: core-js-pure. A copy of the source code may be downloaded from https://github.com/zloirock/core-js.git. This software contains the following license and notice below: -Copyright (c) 2014-2021 Denis Pushkarev +Copyright (c) 2014-2023 Denis Pushkarev Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -3104,30 +3078,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. ----- -The following software may be included in this product: debug. A copy of the source code may be downloaded from git://github.com/debug-js/debug.git. This software contains the following license and notice below: - -(The MIT License) - -Copyright (c) 2014-2017 TJ Holowaychuk -Copyright (c) 2018-2021 Josh Junon - -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. - ------ - The following software may be included in this product: decamelize, escape-string-regexp, object-assign. A copy of the source code may be downloaded from https://github.com/sindresorhus/decamelize.git (decamelize), https://github.com/sindresorhus/escape-string-regexp.git (escape-string-regexp), https://github.com/sindresorhus/object-assign.git (object-assign). This software contains the following license and notice below: The MIT License (MIT) @@ -3825,7 +3775,7 @@ SOFTWARE. ----- -The following software may be included in this product: escape-string-regexp, is-plain-obj, parse-json. A copy of the source code may be downloaded from https://github.com/sindresorhus/escape-string-regexp.git (escape-string-regexp), https://github.com/sindresorhus/is-plain-obj.git (is-plain-obj), https://github.com/sindresorhus/parse-json.git (parse-json). This software contains the following license and notice below: +The following software may be included in this product: escape-string-regexp, import-fresh, is-plain-obj, parse-json. A copy of the source code may be downloaded from https://github.com/sindresorhus/escape-string-regexp.git (escape-string-regexp), https://github.com/sindresorhus/import-fresh.git (import-fresh), https://github.com/sindresorhus/is-plain-obj.git (is-plain-obj), https://github.com/sindresorhus/parse-json.git (parse-json). This software contains the following license and notice below: MIT License @@ -6153,18 +6103,6 @@ IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. ----- -The following software may be included in this product: luxon. A copy of the source code may be downloaded from https://github.com/moment/luxon. This software contains the following license and notice below: - -Copyright 2019 JS Foundation and other contributors - -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. - ------ - The following software may be included in this product: markdown-table. A copy of the source code may be downloaded from https://github.com/wooorm/markdown-table.git. This software contains the following license and notice below: (The MIT License) @@ -6555,11 +6493,11 @@ SOFTWARE. ----- -The following software may be included in this product: ms. A copy of the source code may be downloaded from https://github.com/zeit/ms.git. This software contains the following license and notice below: +The following software may be included in this product: nearley. A copy of the source code may be downloaded from https://github.com/hardmath123/nearley.git. This software contains the following license and notice below: The MIT License (MIT) -Copyright (c) 2016 Zeit, Inc. +Copyright (c) 2014, 2015, 2016, 2017, 2018, 2019 Kartik Chandra, Tim Radvan Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -6581,29 +6519,209 @@ SOFTWARE. ----- -The following software may be included in this product: nearley. A copy of the source code may be downloaded from https://github.com/hardmath123/nearley.git. This software contains the following license and notice below: +The following software may be included in this product: neo4j-client-sso. A copy of the source code may be downloaded from git+https://github.com/neo4j-devtools/neo4j-client-sso.git. This software contains the following license and notice below: -The MIT License (MIT) +Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ -Copyright (c) 2014, 2015, 2016, 2017, 2018, 2019 Kartik Chandra, Tim Radvan + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION -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: + 1. Definitions. -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. -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. + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright 2022 Neo4j Inc, + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. ----- @@ -9642,32 +9760,6 @@ The following software may be included in this product: whatwg-url. A copy of th The MIT License (MIT) -Copyright (c) 2015–2016 Sebastian Mayr - -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. - ------ - -The following software may be included in this product: whatwg-url. A copy of the source code may be downloaded from https://github.com/jsdom/whatwg-url.git. This software contains the following license and notice below: - -The MIT License (MIT) - Copyright (c) Sebastian Mayr Permission is hereby granted, free of charge, to any person obtaining a copy diff --git a/NOTICE.txt b/NOTICE.txt index 735e7fe312a..73888aab074 100644 --- a/NOTICE.txt +++ b/NOTICE.txt @@ -239,25 +239,25 @@ Third-party licenses │ ├─ long@4.0.0 │ │ ├─ URL: https://github.com/dcodeIO/long.js.git │ │ └─ VendorName: Daniel Wirtz -│ ├─ neo4j-client-sso@1.2.2 +│ ├─ neo4j-client-sso@1.2.3 │ │ ├─ URL: git+https://github.com/neo4j-devtools/neo4j-client-sso.git │ │ └─ VendorName: Neo4j Engineering -│ ├─ neo4j-driver-bolt-connection@5.3.0 +│ ├─ neo4j-driver-bolt-connection@5.9.2 │ │ ├─ URL: git://github.com/neo4j/neo4j-javascript-driver.git │ │ ├─ VendorName: Neo4j │ │ └─ VendorUrl: https://github.com/neo4j/neo4j-javascript-driver#readme -│ ├─ neo4j-driver-core@5.3.0 +│ ├─ neo4j-driver-core@5.9.2 │ │ ├─ URL: git://github.com/neo4j/neo4j-javascript-driver.git │ │ ├─ VendorName: Neo4j │ │ └─ VendorUrl: https://github.com/neo4j/neo4j-javascript-driver#readme -│ ├─ neo4j-driver@5.3.0 +│ ├─ neo4j-driver@5.9.2 │ │ ├─ URL: git://github.com/neo4j/neo4j-javascript-driver.git │ │ └─ VendorName: Neo4j │ ├─ rxjs@5.5.12 │ │ ├─ URL: git@github.com:ReactiveX/RxJS.git │ │ ├─ VendorName: Ben Lesh │ │ └─ VendorUrl: https://github.com/ReactiveX/RxJS -│ ├─ rxjs@7.5.6 +│ ├─ rxjs@7.8.1 │ │ ├─ URL: https://github.com/reactivex/rxjs.git │ │ ├─ VendorName: Ben Lesh │ │ └─ VendorUrl: https://rxjs.dev/ @@ -274,10 +274,6 @@ Third-party licenses │ │ ├─ URL: https://github.com/terser/terser │ │ ├─ VendorName: Mihai Bazon │ │ └─ VendorUrl: https://terser.org/ -│ ├─ webidl-conversions@3.0.1 -│ │ ├─ URL: https://github.com/jsdom/webidl-conversions.git -│ │ ├─ VendorName: Domenic Denicola -│ │ └─ VendorUrl: https://domenic.me/ │ └─ webidl-conversions@7.0.0 │ ├─ URL: https://github.com/jsdom/webidl-conversions.git │ ├─ VendorName: Domenic Denicola @@ -550,10 +546,10 @@ Third-party licenses │ │ ├─ URL: git+https://github.com/isaacs/yallist.git │ │ ├─ VendorName: Isaac Z. Schlueter │ │ └─ VendorUrl: http://blog.izs.me/ -│ ├─ yaml@1.10.2 +│ ├─ yaml@1.10.0 │ │ ├─ URL: https://github.com/eemeli/yaml.git │ │ ├─ VendorName: Eemeli Aro -│ │ └─ VendorUrl: https://eemeli.org/yaml/v1/ +│ │ └─ VendorUrl: https://eemeli.org/yaml/ │ └─ yargs-parser@18.1.3 │ ├─ URL: https://github.com/yargs/yargs-parser.git │ └─ VendorName: Ben Coe @@ -562,127 +558,60 @@ Third-party licenses │ │ ├─ URL: git+https://github.com/apollographql/apollo-client.git │ │ ├─ VendorName: opensource@apollographql.com │ │ └─ VendorUrl: https://www.apollographql.com/ -│ ├─ @babel/code-frame@7.16.0 +│ ├─ @babel/code-frame@7.12.11 │ │ ├─ URL: https://github.com/babel/babel.git -│ │ ├─ VendorName: The Babel Team -│ │ └─ VendorUrl: https://babel.dev/docs/en/next/babel-code-frame -│ ├─ @babel/code-frame@7.16.7 -│ │ ├─ URL: https://github.com/babel/babel.git -│ │ ├─ VendorName: The Babel Team -│ │ └─ VendorUrl: https://babel.dev/docs/en/next/babel-code-frame -│ ├─ @babel/generator@7.17.7 +│ │ ├─ VendorName: Sebastian McKenzie +│ │ └─ VendorUrl: https://babeljs.io/ +│ ├─ @babel/generator@7.11.6 │ │ ├─ URL: https://github.com/babel/babel.git -│ │ ├─ VendorName: The Babel Team -│ │ └─ VendorUrl: https://babel.dev/docs/en/next/babel-generator +│ │ ├─ VendorName: Sebastian McKenzie +│ │ └─ VendorUrl: https://babeljs.io/ │ ├─ @babel/helper-annotate-as-pure@7.16.7 │ │ ├─ URL: https://github.com/babel/babel.git │ │ ├─ VendorName: The Babel Team │ │ └─ VendorUrl: https://babel.dev/docs/en/next/babel-helper-annotate-as-pure -│ ├─ @babel/helper-environment-visitor@7.16.7 -│ │ ├─ URL: https://github.com/babel/babel.git -│ │ ├─ VendorName: The Babel Team -│ │ └─ VendorUrl: https://babel.dev/docs/en/next/babel-helper-environment-visitor -│ ├─ @babel/helper-function-name@7.16.7 -│ │ ├─ URL: https://github.com/babel/babel.git -│ │ ├─ VendorName: The Babel Team -│ │ └─ VendorUrl: https://babel.dev/docs/en/next/babel-helper-function-name -│ ├─ @babel/helper-get-function-arity@7.16.7 -│ │ ├─ URL: https://github.com/babel/babel.git -│ │ ├─ VendorName: The Babel Team -│ │ └─ VendorUrl: https://babel.dev/docs/en/next/babel-helper-get-function-arity -│ ├─ @babel/helper-hoist-variables@7.16.7 -│ │ ├─ URL: https://github.com/babel/babel.git -│ │ ├─ VendorName: The Babel Team -│ │ └─ VendorUrl: https://babel.dev/docs/en/next/babel-helper-hoist-variables -│ ├─ @babel/helper-module-imports@7.10.4 -│ │ ├─ URL: https://github.com/babel/babel.git -│ │ ├─ VendorName: Logan Smyth -│ │ └─ VendorUrl: https://babeljs.io/ +│ ├─ @babel/helper-function-name@7.10.4 +│ │ └─ URL: https://github.com/babel/babel.git +│ ├─ @babel/helper-get-function-arity@7.10.4 +│ │ └─ URL: https://github.com/babel/babel.git │ ├─ @babel/helper-module-imports@7.16.7 │ │ ├─ URL: https://github.com/babel/babel.git │ │ ├─ VendorName: The Babel Team │ │ └─ VendorUrl: https://babel.dev/docs/en/next/babel-helper-module-imports -│ ├─ @babel/helper-module-imports@7.18.6 -│ │ ├─ URL: https://github.com/babel/babel.git -│ │ ├─ VendorName: The Babel Team -│ │ └─ VendorUrl: https://babel.dev/docs/en/next/babel-helper-module-imports │ ├─ @babel/helper-plugin-utils@7.19.0 │ │ ├─ URL: https://github.com/babel/babel.git │ │ ├─ VendorName: The Babel Team │ │ └─ VendorUrl: https://babel.dev/docs/en/next/babel-helper-plugin-utils -│ ├─ @babel/helper-split-export-declaration@7.16.7 -│ │ ├─ URL: https://github.com/babel/babel.git -│ │ ├─ VendorName: The Babel Team -│ │ └─ VendorUrl: https://babel.dev/docs/en/next/babel-helper-split-export-declaration -│ ├─ @babel/helper-string-parser@7.19.4 -│ │ ├─ URL: https://github.com/babel/babel.git -│ │ ├─ VendorName: The Babel Team -│ │ └─ VendorUrl: https://babel.dev/docs/en/next/babel-helper-string-parser -│ ├─ @babel/helper-validator-identifier@7.15.7 -│ │ ├─ URL: https://github.com/babel/babel.git -│ │ ├─ VendorName: The Babel Team -│ │ └─ VendorUrl: https://babel.dev/team +│ ├─ @babel/helper-split-export-declaration@7.11.0 +│ │ └─ URL: https://github.com/babel/babel.git │ ├─ @babel/helper-validator-identifier@7.16.7 │ │ ├─ URL: https://github.com/babel/babel.git │ │ ├─ VendorName: The Babel Team │ │ └─ VendorUrl: https://babel.dev/team -│ ├─ @babel/helper-validator-identifier@7.19.1 -│ │ ├─ URL: https://github.com/babel/babel.git -│ │ ├─ VendorName: The Babel Team -│ │ └─ VendorUrl: https://babel.dev/team │ ├─ @babel/highlight@7.16.0 │ │ ├─ URL: https://github.com/babel/babel.git │ │ ├─ VendorName: The Babel Team │ │ └─ VendorUrl: https://babel.dev/docs/en/next/babel-highlight -│ ├─ @babel/highlight@7.16.10 -│ │ ├─ URL: https://github.com/babel/babel.git -│ │ ├─ VendorName: The Babel Team -│ │ └─ VendorUrl: https://babel.dev/docs/en/next/babel-highlight -│ ├─ @babel/parser@7.17.7 -│ │ ├─ URL: https://github.com/babel/babel.git -│ │ ├─ VendorName: The Babel Team -│ │ └─ VendorUrl: https://babel.dev/docs/en/next/babel-parser -│ ├─ @babel/plugin-syntax-jsx@7.18.6 -│ │ ├─ URL: https://github.com/babel/babel.git -│ │ ├─ VendorName: The Babel Team -│ │ └─ VendorUrl: https://babel.dev/docs/en/next/babel-plugin-syntax-jsx -│ ├─ @babel/runtime-corejs3@7.15.3 -│ │ ├─ URL: https://github.com/babel/babel.git -│ │ ├─ VendorName: The Babel Team -│ │ └─ VendorUrl: https://babel.dev/team -│ ├─ @babel/runtime@7.11.2 +│ ├─ @babel/parser@7.11.5 │ │ ├─ URL: https://github.com/babel/babel.git │ │ ├─ VendorName: Sebastian McKenzie │ │ └─ VendorUrl: https://babeljs.io/ -│ ├─ @babel/runtime@7.16.3 -│ │ ├─ URL: https://github.com/babel/babel.git -│ │ ├─ VendorName: The Babel Team -│ │ └─ VendorUrl: https://babel.dev/docs/en/next/babel-runtime -│ ├─ @babel/runtime@7.19.0 -│ │ ├─ URL: https://github.com/babel/babel.git -│ │ ├─ VendorName: The Babel Team -│ │ └─ VendorUrl: https://babel.dev/docs/en/next/babel-runtime -│ ├─ @babel/runtime@7.20.0 +│ ├─ @babel/plugin-syntax-jsx@7.18.6 │ │ ├─ URL: https://github.com/babel/babel.git │ │ ├─ VendorName: The Babel Team -│ │ └─ VendorUrl: https://babel.dev/docs/en/next/babel-runtime -│ ├─ @babel/runtime@7.20.1 +│ │ └─ VendorUrl: https://babel.dev/docs/en/next/babel-plugin-syntax-jsx +│ ├─ @babel/runtime-corejs3@7.11.2 │ │ ├─ URL: https://github.com/babel/babel.git -│ │ ├─ VendorName: The Babel Team -│ │ └─ VendorUrl: https://babel.dev/docs/en/next/babel-runtime +│ │ └─ VendorName: Denis Pushkarev │ ├─ @babel/runtime@7.21.0 │ │ ├─ URL: https://github.com/babel/babel.git │ │ ├─ VendorName: The Babel Team │ │ └─ VendorUrl: https://babel.dev/docs/en/next/babel-runtime -│ ├─ @babel/template@7.16.7 -│ │ ├─ URL: https://github.com/babel/babel.git -│ │ ├─ VendorName: The Babel Team -│ │ └─ VendorUrl: https://babel.dev/docs/en/next/babel-template -│ ├─ @babel/traverse@7.17.3 +│ ├─ @babel/template@7.10.4 │ │ ├─ URL: https://github.com/babel/babel.git -│ │ ├─ VendorName: The Babel Team -│ │ └─ VendorUrl: https://babel.dev/docs/en/next/babel-traverse -│ ├─ @babel/types@7.11.5 +│ │ ├─ VendorName: Sebastian McKenzie +│ │ └─ VendorUrl: https://babeljs.io/ +│ ├─ @babel/traverse@7.11.5 │ │ ├─ URL: https://github.com/babel/babel.git │ │ ├─ VendorName: Sebastian McKenzie │ │ └─ VendorUrl: https://babeljs.io/ @@ -690,10 +619,6 @@ Third-party licenses │ │ ├─ URL: https://github.com/babel/babel.git │ │ ├─ VendorName: The Babel Team │ │ └─ VendorUrl: https://babel.dev/docs/en/next/babel-types -│ ├─ @babel/types@7.20.0 -│ │ ├─ URL: https://github.com/babel/babel.git -│ │ ├─ VendorName: The Babel Team -│ │ └─ VendorUrl: https://babel.dev/docs/en/next/babel-types │ ├─ @emotion/babel-plugin@11.10.5 │ │ ├─ URL: https://github.com/emotion-js/emotion/tree/main/packages/babel-plugin │ │ ├─ VendorName: Kye Hohenberger @@ -807,8 +732,12 @@ Third-party licenses │ ├─ @types/react-transition-group@4.4.5 │ │ ├─ URL: https://github.com/DefinitelyTyped/DefinitelyTyped.git │ │ └─ VendorUrl: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/react-transition-group -│ ├─ @types/react@17.0.2 -│ │ └─ URL: https://github.com/DefinitelyTyped/DefinitelyTyped.git +│ ├─ @types/react@17.0.40 +│ │ ├─ URL: https://github.com/DefinitelyTyped/DefinitelyTyped.git +│ │ └─ VendorUrl: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/react +│ ├─ @types/scheduler@0.16.2 +│ │ ├─ URL: https://github.com/DefinitelyTyped/DefinitelyTyped.git +│ │ └─ VendorUrl: https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/scheduler │ ├─ @types/unist@2.0.3 │ │ └─ URL: https://github.com/DefinitelyTyped/DefinitelyTyped.git │ ├─ @types/zen-observable@0.8.1 @@ -833,7 +762,7 @@ Third-party licenses │ │ ├─ URL: git://github.com/TooTallNate/node-agent-base.git │ │ ├─ VendorName: Nathan Rajlich │ │ └─ VendorUrl: http://n8.io/ -│ ├─ ansi-regex@5.0.0 +│ ├─ ansi-regex@5.0.1 │ │ ├─ URL: https://github.com/chalk/ansi-regex.git │ │ ├─ VendorName: Sindre Sorhus │ │ └─ VendorUrl: sindresorhus.com @@ -878,10 +807,6 @@ Third-party licenses │ │ ├─ URL: git://github.com/beatgammit/base64-js.git │ │ ├─ VendorName: T. Jameson Little │ │ └─ VendorUrl: https://github.com/beatgammit/base64-js -│ ├─ base64-js@1.5.1 -│ │ ├─ URL: git://github.com/beatgammit/base64-js.git -│ │ ├─ VendorName: T. Jameson Little -│ │ └─ VendorUrl: https://github.com/beatgammit/base64-js │ ├─ bignumber.js@9.0.0 │ │ ├─ URL: https://github.com/MikeMcl/bignumber.js.git │ │ └─ VendorName: Michael Mclaughlin @@ -927,9 +852,6 @@ Third-party licenses │ │ ├─ URL: https://github.com/wooorm/character-reference-invalid.git │ │ ├─ VendorName: Titus Wormer │ │ └─ VendorUrl: https://wooorm.com -│ ├─ classnames@2.2.6 -│ │ ├─ URL: https://github.com/JedWatson/classnames.git -│ │ └─ VendorName: Jed Watson │ ├─ classnames@2.3.1 │ │ ├─ URL: https://github.com/JedWatson/classnames.git │ │ └─ VendorName: Jed Watson @@ -962,15 +884,17 @@ Third-party licenses │ ├─ commander@2.20.3 │ │ ├─ URL: https://github.com/tj/commander.js.git │ │ └─ VendorName: TJ Holowaychuk -│ ├─ convert-source-map@1.9.0 +│ ├─ convert-source-map@1.7.0 │ │ ├─ URL: git://github.com/thlorenz/convert-source-map.git │ │ ├─ VendorName: Thorsten Lorenz │ │ └─ VendorUrl: https://github.com/thlorenz/convert-source-map │ ├─ copy-to-clipboard@3.3.2 │ │ ├─ URL: git+https://github.com/sudodoki/copy-to-clipboard │ │ └─ VendorName: sudodoki -│ ├─ core-js-pure@3.16.1 -│ │ └─ URL: https://github.com/zloirock/core-js.git +│ ├─ core-js-pure@3.29.0 +│ │ ├─ URL: https://github.com/zloirock/core-js.git +│ │ ├─ VendorName: Denis Pushkarev +│ │ └─ VendorUrl: http://zloirock.ru │ ├─ core-js@2.6.11 │ │ └─ URL: https://github.com/zloirock/core-js.git │ ├─ core-js@3.6.5 @@ -997,15 +921,9 @@ Third-party licenses │ ├─ csstype@3.0.6 │ │ ├─ URL: https://github.com/frenic/csstype │ │ └─ VendorName: Fredrik Nicol -│ ├─ csstype@3.1.1 -│ │ ├─ URL: https://github.com/frenic/csstype -│ │ └─ VendorName: Fredrik Nicol │ ├─ debug@4.1.1 │ │ ├─ URL: git://github.com/visionmedia/debug.git │ │ └─ VendorName: TJ Holowaychuk -│ ├─ debug@4.3.3 -│ │ ├─ URL: git://github.com/debug-js/debug.git -│ │ └─ VendorName: Josh Junon │ ├─ decamelize@1.2.0 │ │ ├─ URL: https://github.com/sindresorhus/decamelize.git │ │ ├─ VendorName: Sindre Sorhus @@ -1157,10 +1075,10 @@ Third-party licenses │ │ └─ VendorUrl: http://n8.io/ │ ├─ immediate@3.0.6 │ │ └─ URL: git://github.com/calvinmetcalf/immediate.git -│ ├─ import-fresh@3.2.1 +│ ├─ import-fresh@3.3.0 │ │ ├─ URL: https://github.com/sindresorhus/import-fresh.git │ │ ├─ VendorName: Sindre Sorhus -│ │ └─ VendorUrl: sindresorhus.com +│ │ └─ VendorUrl: https://sindresorhus.com │ ├─ inline-style-parser@0.1.1 │ │ └─ URL: https://github.com/remarkablemark/inline-style-parser │ ├─ inline-style-prefixer@6.0.1 @@ -1270,10 +1188,6 @@ Third-party licenses │ │ ├─ URL: https://github.com/sindresorhus/locate-path.git │ │ ├─ VendorName: Sindre Sorhus │ │ └─ VendorUrl: sindresorhus.com -│ ├─ lodash-es@4.17.15 -│ │ ├─ URL: https://github.com/lodash/lodash.git -│ │ ├─ VendorName: John-David Dalton -│ │ └─ VendorUrl: https://lodash.com/custom-builds │ ├─ lodash-es@4.17.21 │ │ ├─ URL: https://github.com/lodash/lodash.git │ │ ├─ VendorName: John-David Dalton @@ -1294,10 +1208,6 @@ Third-party licenses │ │ ├─ URL: https://github.com/lodash/lodash.git │ │ ├─ VendorName: John-David Dalton │ │ └─ VendorUrl: https://lodash.com/ -│ ├─ lodash@4.17.20 -│ │ ├─ URL: https://github.com/lodash/lodash.git -│ │ ├─ VendorName: John-David Dalton -│ │ └─ VendorUrl: https://lodash.com/ │ ├─ lodash@4.17.21 │ │ ├─ URL: https://github.com/lodash/lodash.git │ │ ├─ VendorName: John-David Dalton @@ -1314,9 +1224,6 @@ Third-party licenses │ │ ├─ URL: https://github.com/wooorm/lowlight.git │ │ ├─ VendorName: Titus Wormer │ │ └─ VendorUrl: https://wooorm.com -│ ├─ luxon@2.5.2 -│ │ ├─ URL: https://github.com/moment/luxon -│ │ └─ VendorName: Isaac Cambron │ ├─ markdown-table@3.0.2 │ │ ├─ URL: https://github.com/wooorm/markdown-table.git │ │ ├─ VendorName: Titus Wormer @@ -1500,8 +1407,6 @@ Third-party licenses │ │ ├─ URL: https://github.com/lukeed/mri.git │ │ ├─ VendorName: Luke Edwards │ │ └─ VendorUrl: https://lukeed.com -│ ├─ ms@2.1.2 -│ │ └─ URL: https://github.com/zeit/ms.git │ ├─ ms@2.1.3 │ │ └─ URL: https://github.com/vercel/ms.git │ ├─ nearley@2.18.0 @@ -1511,10 +1416,6 @@ Third-party licenses │ │ ├─ URL: https://github.com/bitinn/node-fetch.git │ │ ├─ VendorName: David Frank │ │ └─ VendorUrl: https://github.com/bitinn/node-fetch -│ ├─ node-fetch@2.6.9 -│ │ ├─ URL: https://github.com/bitinn/node-fetch.git -│ │ ├─ VendorName: David Frank -│ │ └─ VendorUrl: https://github.com/bitinn/node-fetch │ ├─ object-assign@4.1.1 │ │ ├─ URL: https://github.com/sindresorhus/object-assign.git │ │ ├─ VendorName: Sindre Sorhus @@ -1584,9 +1485,6 @@ Third-party licenses │ │ ├─ URL: https://github.com/taylorhakes/promise-polyfill.git │ │ ├─ VendorName: Taylor Hakes │ │ └─ VendorUrl: https://github.com/taylorhakes/promise-polyfill -│ ├─ prop-types@15.7.2 -│ │ ├─ URL: https://github.com/facebook/prop-types.git -│ │ └─ VendorUrl: https://facebook.github.io/react/ │ ├─ prop-types@15.8.1 │ │ ├─ URL: https://github.com/facebook/prop-types.git │ │ └─ VendorUrl: https://facebook.github.io/react/ @@ -1634,9 +1532,6 @@ Third-party licenses │ ├─ react-is@17.0.2 │ │ ├─ URL: https://github.com/facebook/react.git │ │ └─ VendorUrl: https://reactjs.org/ -│ ├─ react-is@18.2.0 -│ │ ├─ URL: https://github.com/facebook/react.git -│ │ └─ VendorUrl: https://reactjs.org/ │ ├─ react-lifecycles-compat@3.0.4 │ │ └─ URL: https://github.com/reactjs/react-lifecycles-compat.git │ ├─ react-markdown@8.0.0 @@ -1692,18 +1587,12 @@ Third-party licenses │ │ ├─ URL: https://github.com/wooorm/refractor.git │ │ ├─ VendorName: Titus Wormer │ │ └─ VendorUrl: https://wooorm.com -│ ├─ regenerator-runtime@0.13.10 -│ │ ├─ URL: https://github.com/facebook/regenerator/tree/master/packages/runtime -│ │ └─ VendorName: Ben Newman │ ├─ regenerator-runtime@0.13.11 │ │ ├─ URL: https://github.com/facebook/regenerator/tree/main/packages/runtime │ │ └─ VendorName: Ben Newman │ ├─ regenerator-runtime@0.13.7 │ │ ├─ URL: https://github.com/facebook/regenerator/tree/master/packages/regenerator-runtime │ │ └─ VendorName: Ben Newman -│ ├─ regenerator-runtime@0.13.9 -│ │ ├─ URL: https://github.com/facebook/regenerator/tree/master/packages/runtime -│ │ └─ VendorName: Ben Newman │ ├─ remark-gfm@3.0.1 │ │ ├─ URL: https://github.com/remarkjs/remark-gfm.git │ │ ├─ VendorName: Titus Wormer @@ -1771,7 +1660,7 @@ Third-party licenses │ │ ├─ URL: https://github.com/dashed/shallowequal.git │ │ ├─ VendorName: Alberto Leal │ │ └─ VendorUrl: github.com/dashed -│ ├─ source-map-support@0.5.19 +│ ├─ source-map-support@0.5.21 │ │ └─ URL: https://github.com/evanw/node-source-map-support │ ├─ sourcemap-codec@1.4.8 │ │ ├─ URL: https://github.com/Rich-Harris/sourcemap-codec @@ -1792,9 +1681,6 @@ Third-party licenses │ │ ├─ URL: https://github.com/flozz/StackBlur.git │ │ ├─ VendorName: Mario Klingemann │ │ └─ VendorUrl: http://www.quasimondo.com/StackBlurForCanvas/StackBlurDemo.html -│ ├─ stackframe@1.2.0 -│ │ ├─ URL: git://github.com/stacktracejs/stackframe.git -│ │ └─ VendorUrl: https://www.stacktracejs.com/ │ ├─ stackframe@1.3.4 │ │ ├─ URL: git://github.com/stacktracejs/stackframe.git │ │ └─ VendorUrl: https://www.stacktracejs.com/ @@ -1869,10 +1755,6 @@ Third-party licenses │ │ ├─ URL: git+https://github.com/sudodoki/toggle-selection │ │ ├─ VendorName: sudodoki │ │ └─ VendorUrl: sudodoki.name -│ ├─ tr46@0.0.3 -│ │ ├─ URL: git+https://github.com/Sebmaster/tr46.js.git -│ │ ├─ VendorName: Sebastian Mayr -│ │ └─ VendorUrl: https://github.com/Sebmaster/tr46.js#readme │ ├─ tr46@3.0.0 │ │ ├─ URL: https://github.com/jsdom/tr46 │ │ └─ VendorName: Sebastian Mayr @@ -1953,9 +1835,6 @@ Third-party licenses │ ├─ whatwg-url@11.0.0 │ │ ├─ URL: https://github.com/jsdom/whatwg-url.git │ │ └─ VendorName: Sebastian Mayr -│ ├─ whatwg-url@5.0.0 -│ │ ├─ URL: https://github.com/jsdom/whatwg-url.git -│ │ └─ VendorName: Sebastian Mayr │ ├─ wrap-ansi@6.2.0 │ │ ├─ URL: https://github.com/chalk/wrap-ansi.git │ │ ├─ VendorName: Sindre Sorhus diff --git a/e2e_tests/integration/types.spec.ts b/e2e_tests/integration/types.spec.ts index 853bae4c4f7..0241340aa48 100644 --- a/e2e_tests/integration/types.spec.ts +++ b/e2e_tests/integration/types.spec.ts @@ -106,10 +106,10 @@ describe('Types in Browser', () => { cy.executeCommand(query) cy.waitForCommandResult() - cy.resultContains('P1Y2M3DT4H5M6S') + cy.resultContains('P14M3DT14706S') // Go to ascii view cy.get('[data-testid="cypherFrameSidebarAscii"]').first().click() - cy.resultContains('│P1Y2M3DT4H5M6S') + cy.resultContains('│"P14M3DT14706S') }) it('presents time type correctly', () => { cy.executeCommand(':clear') @@ -143,7 +143,7 @@ describe('Types in Browser', () => { // cy.waitForCommandResult() cy.get('circle.b-outline', { timeout: 10000 }).click() cy.get('[data-testid="vizInspector"]') - .should('contain', 'P11M2DT2H19') + .should('contain', 'P11M2DT8363.857000000S') .and('contain', 'srid:4326') .and('contain', 'elementId') }) @@ -154,7 +154,7 @@ describe('Types in Browser', () => { // cy.waitForCommandResult() cy.get('circle.b-outline', { timeout: 10000 }).click() cy.get('[data-testid="vizInspector"]') - .should('contain', 'P11M2DT2H19') + .should('contain', 'P11M2DT8363.857000000S') .and('contain', 'srid:4326') .and('contain', 'date') .and('contain', 'location') diff --git a/package.json b/package.json index 007db0f2f93..d04bd1fcfa3 100644 --- a/package.json +++ b/package.json @@ -92,7 +92,6 @@ "@types/jest": "^24.9.0", "@types/jsonic": "^0.3.0", "@types/lodash-es": "^4.17.6", - "@types/luxon": "^2.0.3", "@types/react": "^17.0.40", "@types/react-dom": "^17.0.11", "@types/react-redux": "^7.1.9", @@ -204,7 +203,6 @@ "jsonic": "^0.3.0", "jszip": "3.8.0", "lodash-es": "^4.17.21", - "luxon": "2.5.2", "memoize-one": "^5.2.1", "monaco-editor": "0.23.0", "neo4j-client-sso": "1.2.3", diff --git a/src/browser/modules/Stream/CypherFrame/helpers.test.ts b/src/browser/modules/Stream/CypherFrame/helpers.test.ts index 560192cdb1f..a2c19cef882 100644 --- a/src/browser/modules/Stream/CypherFrame/helpers.test.ts +++ b/src/browser/modules/Stream/CypherFrame/helpers.test.ts @@ -17,21 +17,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -import neo4j, { Record } from 'neo4j-driver' +import neo4j, { Integer, Record } from 'neo4j-driver' +import * as viewTypes from 'shared/modules/frames/frameViewTypes' +import { BrowserRequestResult } from 'shared/modules/requests/requestsDuck' import { - recordToStringArray, getRecordsToDisplayInTable, initialView, recordToJSONMapper, + recordToStringArray, resultHasNodes, resultHasPlan, resultHasRows, resultHasWarnings, resultIsError } from './helpers' -import * as viewTypes from 'shared/modules/frames/frameViewTypes' -import { BrowserRequestResult } from 'shared/modules/requests/requestsDuck' describe('helpers', () => { test('getRecordsToDisplayInTable should report if there are rows or not in the result', () => { @@ -646,7 +646,7 @@ describe('helpers', () => { const res = records.map(record => recordToStringArray(record)) // Then - expect(res).toEqual([['P1M2DT3S']]) + expect(res).toEqual([['"P1M2DT3.000000004S"']]) }) }) @@ -846,7 +846,34 @@ describe('helpers', () => { elementType: 'node', labels: ['foo'], properties: { - bar: 'P2012Y2M2DT14H37M21.545S' + bar: 'P24146M2DT52641.545000000S' + } + } + } + + expect(recordToJSONMapper(record)).toEqual(expected) + }) + + test('handles duration above js safe number', () => { + const node = new (neo4j.types.Node as any)(1, ['foo'], { + bar: new neo4j.types.Duration( + new Integer(0), + new Integer(0), + // RETURN 9223372036854775807 which is maxiumum integer in neo4j + new Integer(-1, 2147483647), + new Integer(0) + ) + }) + const record = new (neo4j.types.Record as any)(['n'], [node]) + const expected = { + n: { + elementId: '1', + identity: 1, + elementType: 'node', + labels: ['foo'], + properties: { + // get same number as above + bar: 'P0M0DT9223372036854775807S' } } } @@ -866,7 +893,7 @@ describe('helpers', () => { elementType: 'node', labels: ['foo'], properties: { - bar: 'PT1M40S' + bar: 'P0M0DT100S' } } } diff --git a/src/browser/modules/Stream/CypherFrame/helpers.ts b/src/browser/modules/Stream/CypherFrame/helpers.ts index 44eb7bc90c4..842a74c4b46 100644 --- a/src/browser/modules/Stream/CypherFrame/helpers.ts +++ b/src/browser/modules/Stream/CypherFrame/helpers.ts @@ -30,14 +30,11 @@ import { some } from 'lodash-es' import { CypherDataType, isCypherPropertyType } from 'neo4j-arc/common' -import neo4j, { Path, Record, Node, Relationship } from 'neo4j-driver' +import neo4j, { Node, Path, Record, Relationship } from 'neo4j-driver' import bolt from 'services/bolt/bolt' import { recursivelyExtractGraphItems } from 'services/bolt/boltMappings' -import { - durationFormat, - stringModifier -} from 'services/bolt/cypherTypesFormatting' +import { stringModifier } from 'services/bolt/cypherTypesFormatting' import { stringifyMod, unescapeDoubleQuotesForDisplay } from 'services/utils' import * as viewTypes from 'shared/modules/frames/frameViewTypes' import { BrowserRequestResult } from 'shared/modules/requests/requestsDuck' @@ -396,7 +393,6 @@ export function mapNeo4jValuesToPlainValues(values: any): any { function neo4jValueToPlainValue(value: any) { switch (get(value, 'constructor')) { case neo4j.types.Duration: - return durationFormat(value) case neo4j.types.Date: case neo4j.types.DateTime: case neo4j.types.LocalDateTime: diff --git a/src/browser/modules/Stream/Queries/QueriesFrame.tsx b/src/browser/modules/Stream/Queries/QueriesFrame.tsx index 98f7d99e999..b3016d850b6 100644 --- a/src/browser/modules/Stream/Queries/QueriesFrame.tsx +++ b/src/browser/modules/Stream/Queries/QueriesFrame.tsx @@ -22,6 +22,23 @@ import { connect } from 'react-redux' import { withBus } from 'react-suber' import { Bus } from 'suber' +import { ConfirmationButton } from 'browser-components/buttons/ConfirmationButton' +import { Duration } from 'neo4j-driver' +import { GlobalState } from 'project-root/src/shared/globalState' +import { gte } from 'semver' +import { NEO4J_BROWSER_USER_ACTION_QUERY } from 'services/bolt/txMetadata' +import { + CONNECTED_STATE, + getConnectionState +} from 'shared/modules/connections/connectionsDuck' +import { CYPHER_REQUEST } from 'shared/modules/cypher/cypherDuck' +import { + getRawVersion, + getSemanticVersion, + hasProcedure, + isOnCluster +} from 'shared/modules/dbMeta/dbMetaDuck' +import { Frame } from 'shared/modules/frames/framesDuck' import FrameBodyTemplate from '../../Frame/FrameBodyTemplate' import FrameError from '../../Frame/FrameError' import { @@ -30,6 +47,9 @@ import { StatusbarWrapper, StyledStatusBar } from '../AutoRefresh/styled' +import LegacyQueriesFrame, { + LegacyQueriesFrameProps +} from './LegacyQueriesFrame' import { Code, StyledHeaderRow, @@ -38,26 +58,6 @@ import { StyledTd, StyledTh } from './styled' -import { ConfirmationButton } from 'browser-components/buttons/ConfirmationButton' -import { GlobalState } from 'project-root/src/shared/globalState' -import { NEO4J_BROWSER_USER_ACTION_QUERY } from 'services/bolt/txMetadata' -import { - CONNECTED_STATE, - getConnectionState -} from 'shared/modules/connections/connectionsDuck' -import { CYPHER_REQUEST } from 'shared/modules/cypher/cypherDuck' -import { durationFormat } from 'services/bolt/cypherTypesFormatting' -import { Frame } from 'shared/modules/frames/framesDuck' -import LegacyQueriesFrame, { - LegacyQueriesFrameProps -} from './LegacyQueriesFrame' -import { - getRawVersion, - getSemanticVersion, - hasProcedure, - isOnCluster -} from 'shared/modules/dbMeta/dbMetaDuck' -import { gte } from 'semver' type QueriesFrameState = { queries: any[] @@ -84,6 +84,22 @@ function constructOverviewMessage(queries: any, errors: string[]) { : successMessage } +function prettyPrintDuration(duration: Duration) { + const { months, days, seconds, nanoseconds } = duration + + let resultsString = '' + if (months.toNumber() > 0) { + resultsString += `${months} months, ` + } + if (days.toNumber() > 0) { + resultsString += `${days} days, ` + } + const millis = seconds.toNumber() * 1000 + nanoseconds.toNumber() / 1000000 + resultsString += `${millis} ms` + + return resultsString +} + export class QueriesFrame extends Component< QueriesFrameProps, QueriesFrameState @@ -153,7 +169,7 @@ export class QueriesFrame extends Component< ...data, host: `neo4j://${nonNullHost}`, query: data.currentQuery, - elapsedTimeMillis: durationFormat(data.elapsedTime), + elapsedTimeMillis: prettyPrintDuration(data.elapsedTime), queryId: data.transactionId } } @@ -267,7 +283,7 @@ export class QueriesFrame extends Component< {JSON.stringify(query.metaData, null, 2)} - {query.elapsedTimeMillis} ms + {query.elapsedTimeMillis} { @@ -31,21 +30,11 @@ export const stringModifier = (anything: any) => { return spacialFormat(anything) } if (isTemporalType(anything)) { - if (isDuration(anything)) { - return durationFormat(anything) - } else { - return `"${anything.toString()}"` - } + return `"${anything.toString()}"` } return undefined } -export const durationFormat = (duration: typeof neo4j.types.Duration): string => - Duration.fromISO(duration.toString()) - .shiftTo('years', 'days', 'months', 'hours', 'minutes', 'seconds') - .normalize() - .toISO() - const numberFormat = (anything: any) => { // Exclude false positives and return early if ([Infinity, -Infinity, NaN].includes(anything)) { diff --git a/yarn.lock b/yarn.lock index 890568a1c3f..d437503c85e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2366,11 +2366,6 @@ resolved "https://registry.npmjs.org/@types/long/-/long-4.0.1.tgz" integrity "sha1-RZxl+hhn2v5qjzIsTFFpVmPMVek= sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==" -"@types/luxon@^2.0.3": - version "2.4.0" - resolved "https://registry.npmjs.org/@types/luxon/-/luxon-2.4.0.tgz" - integrity sha512-oCavjEjRXuR6URJEtQm0eBdfsBiEcGBZbq21of8iGkeKxU1+1xgKuFPClaBZl2KB8ZZBSWlgk61tH6Mf+nvZVw== - "@types/mdast@^3.0.0": version "3.0.3" resolved "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.3.tgz" @@ -9096,11 +9091,6 @@ lru-cache@^6.0.0: dependencies: yallist "^4.0.0" -luxon@2.5.2: - version "2.5.2" - resolved "https://registry.npmjs.org/luxon/-/luxon-2.5.2.tgz" - integrity sha512-Yg7/RDp4nedqmLgyH0LwgGRvMEKVzKbUdkBYyCosbHgJ+kaOUx0qzSiSatVc3DFygnirTPYnMM2P5dg2uH1WvA== - lz-string@^1.4.4: version "1.4.4" resolved "https://registry.npmjs.org/lz-string/-/lz-string-1.4.4.tgz"