From 6478947de5a9518b4d48fe4eb9811a0dbe6d3809 Mon Sep 17 00:00:00 2001 From: v Date: Wed, 31 Mar 2021 11:59:25 +0300 Subject: [PATCH] ui: fix aggregation on txn details in old version admin-ui-components we have known issue on txn datails page with duplications of stmns displayed on multinode clusters. as admin-ui-components is deprecated switched this dependency on relative version of cluster-ui. as 20.2 console db pointed to pretty old commit in yarn-vendored master-20.2 was created and contains corresponding changes for current pr. Release note (ui): fix duplicates of statements on transactions details page for multi-node clusters --- pkg/ui/package.json | 2 +- pkg/ui/src/app.spec.tsx | 2 +- .../cluster/containers/nodeOverview/index.tsx | 2 +- .../containers/tableDetails/index.tsx | 2 +- pkg/ui/src/views/jobs/jobDetails.tsx | 2 +- pkg/ui/src/views/jobs/jobTable.tsx | 2 +- pkg/ui/src/views/sessions/sessionDetails.tsx | 2 +- pkg/ui/src/views/sessions/sessionsPage.tsx | 2 +- .../shared/components/sortabletable/index.tsx | 2 +- .../src/views/statements/statementDetails.tsx | 2 +- .../statements/statementsPage.fixture.ts | 2 +- .../src/views/statements/statementsPage.tsx | 2 +- .../views/transactions/transactionsPage.tsx | 2 +- pkg/ui/yarn-vendor | 2 +- pkg/ui/yarn.lock | 167 ++++++++++++------ 15 files changed, 130 insertions(+), 65 deletions(-) diff --git a/pkg/ui/package.json b/pkg/ui/package.json index 13f247aeb7f5..17cba5838f0d 100644 --- a/pkg/ui/package.json +++ b/pkg/ui/package.json @@ -13,7 +13,7 @@ "cypress:update-snapshots": "yarn cypress run --env updateSnapshots=true --spec 'cypress/integration/**/*.visual.spec.ts'" }, "dependencies": { - "@cockroachlabs/admin-ui-components": "^0.1.28", + "@cockroachlabs/cluster-ui": "^0.1.63", "analytics-node": "^3.4.0-beta.1", "antd": "^3.25.2", "babel-polyfill": "^6.26.0", diff --git a/pkg/ui/src/app.spec.tsx b/pkg/ui/src/app.spec.tsx index 95be919625dc..32e8247cd357 100644 --- a/pkg/ui/src/app.spec.tsx +++ b/pkg/ui/src/app.spec.tsx @@ -32,7 +32,7 @@ import { } from "src/views/databases/containers/databases"; import { TableMain } from "src/views/databases/containers/tableDetails"; import { DataDistributionPage } from "src/views/cluster/containers/dataDistribution"; -import { StatementsPage } from "@cockroachlabs/admin-ui-components"; +import { StatementsPage } from "@cockroachlabs/cluster-ui"; import { StatementDetails } from "src/views/statements/statementDetails"; import Debug from "src/views/reports/containers/debug"; import { ReduxDebug } from "src/views/reports/containers/redux"; diff --git a/pkg/ui/src/views/cluster/containers/nodeOverview/index.tsx b/pkg/ui/src/views/cluster/containers/nodeOverview/index.tsx index de12682a4240..8f532311b236 100644 --- a/pkg/ui/src/views/cluster/containers/nodeOverview/index.tsx +++ b/pkg/ui/src/views/cluster/containers/nodeOverview/index.tsx @@ -23,7 +23,7 @@ import { Bytes, DATE_FORMAT, Percentage } from "src/util/format"; import { INodeStatus, MetricConstants, StatusMetrics } from "src/util/proto"; import { getMatchParamByName } from "src/util/query"; import { SummaryBar, SummaryLabel, SummaryValue } from "src/views/shared/components/summaryBar"; -import { Button } from "@cockroachlabs/admin-ui-components"; +import { Button } from "@cockroachlabs/cluster-ui"; import { ArrowLeft } from "@cockroachlabs/icons"; import "./nodeOverview.styl"; import { LiveBytesTooltip, KeyBytesTooltip, ValueBytesTooltip, IntentBytesTooltip, SystemBytesTooltip, NodeUsedCapacityTooltip, NodeAvailableCapacityTooltip, NodeMaximumCapacityTooltip } from "./tooltips"; diff --git a/pkg/ui/src/views/databases/containers/tableDetails/index.tsx b/pkg/ui/src/views/databases/containers/tableDetails/index.tsx index 2d816579c15f..bc221ce69e0c 100644 --- a/pkg/ui/src/views/databases/containers/tableDetails/index.tsx +++ b/pkg/ui/src/views/databases/containers/tableDetails/index.tsx @@ -26,7 +26,7 @@ import { SortedTable } from "src/views/shared/components/sortedtable"; const { TabPane } = Tabs; import { getMatchParamByName } from "src/util/query"; import { databaseDetails } from "../databaseSummary"; -import { Button } from "@cockroachlabs/admin-ui-components"; +import { Button } from "@cockroachlabs/cluster-ui"; import { ArrowLeft } from "@cockroachlabs/icons"; import SqlBox from "src/views/shared/components/sql/box"; diff --git a/pkg/ui/src/views/jobs/jobDetails.tsx b/pkg/ui/src/views/jobs/jobDetails.tsx index 1ab4a236bed4..e63f287243f9 100644 --- a/pkg/ui/src/views/jobs/jobDetails.tsx +++ b/pkg/ui/src/views/jobs/jobDetails.tsx @@ -27,7 +27,7 @@ import { SummaryCard } from "../shared/components/summaryCard"; import Job = cockroach.server.serverpb.JobsResponse.IJob; import JobsRequest = cockroach.server.serverpb.JobsRequest; import JobsResponse = cockroach.server.serverpb.JobsResponse; -import { Button } from "@cockroachlabs/admin-ui-components"; +import { Button } from "@cockroachlabs/cluster-ui"; import { ArrowLeft } from "@cockroachlabs/icons"; import { DATE_FORMAT } from "src/util/format"; import { JobStatusCell } from "./jobStatusCell"; diff --git a/pkg/ui/src/views/jobs/jobTable.tsx b/pkg/ui/src/views/jobs/jobTable.tsx index 00b2042b0c1d..b63c66a4a15d 100644 --- a/pkg/ui/src/views/jobs/jobTable.tsx +++ b/pkg/ui/src/views/jobs/jobTable.tsx @@ -20,7 +20,7 @@ import { isEmpty, isEqual, map } from "lodash"; import {JobDescriptionCell} from "src/views/jobs/jobDescriptionCell"; import Job = cockroach.server.serverpb.JobsResponse.IJob; import JobsResponse = cockroach.server.serverpb.JobsResponse; -import { Pagination, ResultsPerPageLabel } from "@cockroachlabs/admin-ui-components"; +import { Pagination, ResultsPerPageLabel } from "@cockroachlabs/cluster-ui"; import { jobTable } from "src/util/docs"; import { trackDocsLink } from "src/util/analytics"; diff --git a/pkg/ui/src/views/sessions/sessionDetails.tsx b/pkg/ui/src/views/sessions/sessionDetails.tsx index 157803939a68..6d59ee65802c 100644 --- a/pkg/ui/src/views/sessions/sessionDetails.tsx +++ b/pkg/ui/src/views/sessions/sessionDetails.tsx @@ -33,7 +33,7 @@ import {nodeDisplayNameByIDSelector} from "src/redux/nodes"; import {NodeLink, StatementLinkTarget} from "src/views/statements/statementsTableContent"; import TerminateSessionModal, {TerminateSessionModalRef} from "src/views/sessions/terminateSessionModal"; import TerminateQueryModal, {TerminateQueryModalRef} from "src/views/sessions/terminateQueryModal"; -import { Button } from "@cockroachlabs/admin-ui-components"; +import { Button } from "@cockroachlabs/cluster-ui"; import { ArrowLeft } from "@cockroachlabs/icons"; import { Text, TextTypes } from "src/components"; diff --git a/pkg/ui/src/views/sessions/sessionsPage.tsx b/pkg/ui/src/views/sessions/sessionsPage.tsx index 6ac41cc24673..66c189c13d7b 100644 --- a/pkg/ui/src/views/sessions/sessionsPage.tsx +++ b/pkg/ui/src/views/sessions/sessionsPage.tsx @@ -31,7 +31,7 @@ import {SessionsResponseMessage} from "src/util/api"; import TerminateSessionModal, {TerminateSessionModalRef} from "src/views/sessions/terminateSessionModal"; import TerminateQueryModal, {TerminateQueryModalRef} from "src/views/sessions/terminateQueryModal"; import {showSessions} from "src/util/docs"; -import { Pagination, ResultsPerPageLabel } from "@cockroachlabs/admin-ui-components"; +import { Pagination, ResultsPerPageLabel } from "@cockroachlabs/cluster-ui"; const sortableTableCx = classNames.bind(sortableTableStyles); const cx = classNames.bind(styles); diff --git a/pkg/ui/src/views/shared/components/sortabletable/index.tsx b/pkg/ui/src/views/shared/components/sortabletable/index.tsx index 1096cd35796b..56cb43312b87 100644 --- a/pkg/ui/src/views/shared/components/sortabletable/index.tsx +++ b/pkg/ui/src/views/shared/components/sortabletable/index.tsx @@ -278,7 +278,7 @@ export class SortableTable extends React.Component { classes.push(cx("sort-table__cell--sortable")); onClick = () => { // TODO (koorosh): `title` field has ReactNode type isn't correct field to - // track column name. `SortableColumn` has to be imported from `@cockroachlabs/admin-ui-components` + // track column name. `SortableColumn` has to be imported from `@cockroachlabs/cluster-ui` // package which has extended field to track column name. trackTableSort(className, c.title.toString(), sortSetting.ascending); this.clickSort(c.sortKey); diff --git a/pkg/ui/src/views/statements/statementDetails.tsx b/pkg/ui/src/views/statements/statementDetails.tsx index 0437fcd8a32e..fc4f03d085ed 100644 --- a/pkg/ui/src/views/statements/statementDetails.tsx +++ b/pkg/ui/src/views/statements/statementDetails.tsx @@ -47,7 +47,7 @@ import classNames from "classnames/bind"; import { selectDiagnosticsReportsCountByStatementFingerprint, } from "src/redux/statements/statementsSelectors"; -import { Button } from "@cockroachlabs/admin-ui-components"; +import { Button } from "@cockroachlabs/cluster-ui"; import { ArrowLeft } from "@cockroachlabs/icons"; import { trackSubnavSelection } from "src/util/analytics"; import styles from "./statementDetails.module.styl"; diff --git a/pkg/ui/src/views/statements/statementsPage.fixture.ts b/pkg/ui/src/views/statements/statementsPage.fixture.ts index a3ae50af8355..28762eb728ed 100644 --- a/pkg/ui/src/views/statements/statementsPage.fixture.ts +++ b/pkg/ui/src/views/statements/statementsPage.fixture.ts @@ -8,7 +8,7 @@ // by the Apache License, Version 2.0, included in the file // licenses/APL.txt. -import { StatementsPageProps } from "@cockroachlabs/admin-ui-components"; +import { StatementsPageProps } from "@cockroachlabs/cluster-ui"; import { createMemoryHistory } from "history"; import Long from "long"; import * as protos from "src/js/protos"; diff --git a/pkg/ui/src/views/statements/statementsPage.tsx b/pkg/ui/src/views/statements/statementsPage.tsx index 2820cd6ca52f..c5f9a47718f7 100644 --- a/pkg/ui/src/views/statements/statementsPage.tsx +++ b/pkg/ui/src/views/statements/statementsPage.tsx @@ -35,7 +35,7 @@ import { import { createStatementDiagnosticsAlertLocalSetting } from "src/redux/alerts"; import { getMatchParamByName } from "src/util/query"; -import { StatementsPage, AggregateStatistics } from "@cockroachlabs/admin-ui-components"; +import { StatementsPage, AggregateStatistics } from "@cockroachlabs/cluster-ui"; import { createOpenDiagnosticsModalAction, createStatementDiagnosticsReportAction } from "src/redux/statements"; import { trackStatementsPaginationAction, diff --git a/pkg/ui/src/views/transactions/transactionsPage.tsx b/pkg/ui/src/views/transactions/transactionsPage.tsx index 5f75ba089570..5ccf290c190f 100644 --- a/pkg/ui/src/views/transactions/transactionsPage.tsx +++ b/pkg/ui/src/views/transactions/transactionsPage.tsx @@ -21,7 +21,7 @@ import { StatementsResponseMessage } from "src/util/api"; import { TimestampToMoment } from "src/util/convert"; import { PrintTime } from "src/views/reports/containers/range/print"; -import { TransactionsPage } from "@cockroachlabs/admin-ui-components"; +import { TransactionsPage } from "@cockroachlabs/cluster-ui"; // selectStatements returns the array of AggregateStatistics to show on the // TransactionsPage, based on if the appAttr route parameter is set. diff --git a/pkg/ui/yarn-vendor b/pkg/ui/yarn-vendor index 9d7d31f82f27..4535696c2161 160000 --- a/pkg/ui/yarn-vendor +++ b/pkg/ui/yarn-vendor @@ -1 +1 @@ -Subproject commit 9d7d31f82f27b4f22da5d4e1bd7bc20f8d94e66d +Subproject commit 4535696c2161b4c28a7e24988bc6aca52d5aefc8 diff --git a/pkg/ui/yarn.lock b/pkg/ui/yarn.lock index d5404ff433e9..86d227cfd7d8 100644 --- a/pkg/ui/yarn.lock +++ b/pkg/ui/yarn.lock @@ -1717,6 +1717,13 @@ dependencies: regenerator-runtime "^0.13.2" +"@babel/runtime@^7.12.13": + version "7.13.10" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.10.tgz#47d42a57b6095f4468da440388fdbad8bebf0d7d" + integrity sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw== + dependencies: + regenerator-runtime "^0.13.4" + "@babel/runtime@^7.4.0": version "7.8.3" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.8.3.tgz#0811944f73a6c926bb2ad35e918dcc1bfab279f1" @@ -1806,14 +1813,15 @@ lodash "^4.17.13" to-fast-properties "^2.0.0" -"@cockroachlabs/admin-ui-components@^0.1.28": - version "0.1.28" - resolved "https://registry.yarnpkg.com/@cockroachlabs/admin-ui-components/-/admin-ui-components-0.1.28.tgz#6dc00be6d4ea41dd9853e2f754c85936f701950c" - integrity sha512-i12d+wtCgxBM25ZpkcLtyuIRlhl/jZreFmJV1SpQYLVLV7OxLTb5WHlUCMMQFC85+UFVPs7evr2l575Ne5AzvA== +"@cockroachlabs/cluster-ui@^0.1.63": + version "0.1.63" + resolved "https://registry.yarnpkg.com/@cockroachlabs/cluster-ui/-/cluster-ui-0.1.63.tgz#3ecb2bdeb25d1f9057d1e402467d7df61127f6b3" + integrity sha512-w8jZ/uNHBg5xk2L886Ae6b3Vw+t6ECNB0Lfsx6qDR8bpJJz3ZqJX4GtBe/lzxH+ekJxT461ciDfWWhhiLYYs8w== dependencies: - "@cockroachlabs/crdb-protobuf-client" "^0.0.3" - "@cockroachlabs/icons" "^0.2.2" - "@cockroachlabs/ui-components" "^0.2.11" + "@babel/runtime" "^7.12.13" + "@cockroachlabs/crdb-protobuf-client" "0.0.4" + "@cockroachlabs/icons" "0.3.0" + "@cockroachlabs/ui-components" "0.2.14-alpha.0" "@popperjs/core" "^2.4.0" "@reduxjs/toolkit" "^1.5.0" babel-polyfill "^6.26.0" @@ -1822,30 +1830,26 @@ d3-scale "^3.2.3" highlight.js "^10.2.0" long "^4.0.0" + npm-run-all "^4.1.5" react-helmet "^5.2.0" react-popper "^2.2.3" react-select "^1.2.1" reselect "^4.0.0" -"@cockroachlabs/crdb-protobuf-client@^0.0.3": - version "0.0.3" - resolved "https://registry.yarnpkg.com/@cockroachlabs/crdb-protobuf-client/-/crdb-protobuf-client-0.0.3.tgz#3ce8dd4953a1209f1895c713cf90595a15c54ab1" - integrity sha512-AXHWWW7hI05hj5fTdXgIIjfZrqfacQ/zsT83LoUsrnFUOeWZCa6qSF3qVonaR2h8FloRfEeFhC+27TDsi8RI0A== - -"@cockroachlabs/icons@^0.2.2": - version "0.2.9" - resolved "https://registry.yarnpkg.com/@cockroachlabs/icons/-/icons-0.2.9.tgz#b626fe409ea49be66b19a9a0358a082d50ade2d0" - integrity sha512-s1kH8sU/DeIGrGUwUMVMAjxGTOn6SHAK8q0tmJY6zcIUaoYb/5UfnQjzdG+ybflgBdyMTB41/bWTXnpsYxxSpw== +"@cockroachlabs/crdb-protobuf-client@0.0.4": + version "0.0.4" + resolved "https://registry.yarnpkg.com/@cockroachlabs/crdb-protobuf-client/-/crdb-protobuf-client-0.0.4.tgz#9b53ef7cbb187cd7d73b4269c95b0f573caafd45" + integrity sha512-n/SEmLzU7i9h5m8cAw9NPRAcQSgzHNdm5+F0dN3myfQSCuEMTgTlbWsfm6EnjTRL1FnZlieqY2gZzgyx4Ke0Ug== -"@cockroachlabs/icons@^0.3.0": +"@cockroachlabs/icons@0.3.0", "@cockroachlabs/icons@^0.3.0": version "0.3.0" resolved "https://registry.yarnpkg.com/@cockroachlabs/icons/-/icons-0.3.0.tgz#160573074396f266e92fcbe5e520c5ba1d8750f9" integrity sha512-GJxhlXy8Z3/PYFb9C3iM1dvU9wajGoaA/+VCj0an2ipfbkI2fhToq+h0b33vu7JuZ3dS4QMRjfVE4uhlyIUH2Q== -"@cockroachlabs/ui-components@^0.2.11": - version "0.2.12" - resolved "https://registry.yarnpkg.com/@cockroachlabs/ui-components/-/ui-components-0.2.12.tgz#617f97351606026a0a8e5f17730f313b6cc6000c" - integrity sha512-RHRvKAsaUDJpCefA3VqmQSbu1jc1/TM2cEKkhN9G4gg2KgePcaqHupUc4wTD+rw6OqZHwbOHQe9ESXBMhiMVLw== +"@cockroachlabs/ui-components@0.2.14-alpha.0": + version "0.2.14-alpha.0" + resolved "https://registry.yarnpkg.com/@cockroachlabs/ui-components/-/ui-components-0.2.14-alpha.0.tgz#d90a7ce6fbede9d8b177d9a940f24218c262d267" + integrity sha512-8zOZswstmBbJQxXmQ7yfEXEOEUJ4JT5xlzGQ5FD7z8sjy67UDXFoe6FMqFXrkpiFwlCrkK2Vd36LKhLvGY2xkA== dependencies: "@cockroachlabs/icons" "^0.3.0" "@popperjs/core" "^2.4.3" @@ -1966,15 +1970,10 @@ resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-1.1.3.tgz#2b5a3ab3f918cca48a8c754c08168e3f03eba61b" integrity sha512-shAmDyaQC4H92APFoIaVDHCx5bStIocgvbwQyxPRrbUY20V1EYTbSDchWbuwlMG3V17cprZhA6+78JfB+3DTPw== -"@popperjs/core@^2.4.0": - version "2.4.4" - resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.4.4.tgz#11d5db19bd178936ec89cd84519c4de439574398" - integrity sha512-1oO6+dN5kdIA3sKPZhRGJTfGVP4SWV6KqlMOwry4J3HfyD68sl/3KmG7DeYUzvN+RbhXDnv/D8vNNB8168tAMg== - -"@popperjs/core@^2.4.3": - version "2.5.2" - resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.5.2.tgz#d3217d5f630766c0c92fbd55cf285ba64de0578b" - integrity sha512-tVkIU9JQw5fYPxLQgok/a7I6J1eEZ79svwQGpe2mb3jlVsPADOleefOnQBiS/takK7jQuNeswCUicMH1VWVziA== +"@popperjs/core@^2.4.0", "@popperjs/core@^2.4.3": + version "2.9.1" + resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.9.1.tgz#7f554e7368c9ab679a11f4a042ca17149d70cf12" + integrity sha512-DvJbbn3dUgMxDnJLH+RZQPnXak1h4ZVYQ7CWiFWjQwBFkVajT4rfw2PdpHLTSTwxrYfnoEXkuBiwkDm6tPMQeA== "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2": version "1.1.2" @@ -2074,11 +2073,11 @@ integrity sha512-afmTuJrylUU/0OtqzaRkbyYFFNgCF73Bvel/sw90pvGrWIZ+vyoIJqA6eMSoA6+nb443kTmulmBtC9NerXboNg== "@reduxjs/toolkit@^1.5.0": - version "1.5.0" - resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-1.5.0.tgz#1025c1ccb224d1fc06d8d98a61f6717d57e6d477" - integrity sha512-E/FUraRx+8guw9Hlg/Ja8jI/hwCrmIKed8Annt9YsZw3BQp+F24t5I5b2OWR6pkEHY4hn1BgP08FrTZFRKsdaQ== + version "1.5.1" + resolved "https://registry.yarnpkg.com/@reduxjs/toolkit/-/toolkit-1.5.1.tgz#05daa2f6eebc70dc18cd98a90421fab7fa565dc5" + integrity sha512-PngZKuwVZsd+mimnmhiOQzoD0FiMjqVks6ituO1//Ft5UEX5Ca9of13NEjo//pU22Jk7z/mdXVsmDfgsig1osA== dependencies: - immer "^8.0.0" + immer "^8.0.1" redux "^4.0.0" redux-thunk "^2.3.0" reselect "^4.0.0" @@ -4877,7 +4876,7 @@ create-react-context@0.3.0, create-react-context@^0.3.0: gud "^1.0.0" warning "^4.0.3" -cross-spawn@6.0.5, cross-spawn@^6.0.0: +cross-spawn@6.0.5, cross-spawn@^6.0.0, cross-spawn@^6.0.5: version "6.0.5" resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4" integrity sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ== @@ -5057,9 +5056,11 @@ d3-array@1: resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-1.2.4.tgz#635ce4d5eea759f6f605863dbcfc30edc737f71f" d3-array@^2.3.0, d3-array@^2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-2.8.0.tgz#f76e10ad47f1f4f75f33db5fc322eb9ffde5ef23" - integrity sha512-6V272gsOeg7+9pTW1jSYOR1QE37g95I3my1hBmY+vOUNHRrk9yt4OTz/gK7PMkVAVDrYYq4mq3grTiZ8iJdNIw== + version "2.12.1" + resolved "https://registry.yarnpkg.com/d3-array/-/d3-array-2.12.1.tgz#e20b41aafcdffdf5d50928004ececf815a465e81" + integrity sha512-B0ErZK/66mHtEsR1TkPEEkwdy+WDesimkM5gpZr5Dsg54BiTA5RXtYW5qTLIAcekaS9xfZrzBLF/OAkB3Qn1YQ== + dependencies: + internmap "^1.0.0" "d3-color@1 - 2": version "2.0.0" @@ -5093,9 +5094,9 @@ d3-geo@^1.10.0: d3-color "1 - 2" d3-scale@^3.2.3: - version "3.2.3" - resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-3.2.3.tgz#be380f57f1f61d4ff2e6cbb65a40593a51649cfd" - integrity sha512-8E37oWEmEzj57bHcnjPVOBS3n4jqakOeuv1EDdQSiSrYnMCBdMd3nc4HtKk7uia8DUHcY/CGuJ42xxgtEYrX0g== + version "3.2.4" + resolved "https://registry.yarnpkg.com/d3-scale/-/d3-scale-3.2.4.tgz#13d758d7cf4e4f1fc40196a63597d01f3ed81765" + integrity sha512-PG6gtpbPCFqKbvdBEswQcJcTzHC8VEd/XzezF5e68KlkT4/ggELw/nR1tv863jY6ufKTvDlzCMZvhe06codbbA== dependencies: d3-array "^2.3.0" d3-format "1 - 2" @@ -6947,9 +6948,9 @@ he@1.2.0, he@^1.2.0: integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== highlight.js@^10.2.0: - version "10.2.0" - resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.2.0.tgz#367151bcf813adebc54822f1cb51d2e1e599619f" - integrity sha512-OryzPiqqNCfO/wtFo619W+nPYALM6u7iCQkum4bqRmmlcTikOkmlL06i009QelynBPAlNByTQU6cBB2cOBQtCw== + version "10.7.1" + resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.7.1.tgz#a8ec4152db24ea630c90927d6cae2a45f8ecb955" + integrity sha512-S6G97tHGqJ/U8DsXcEdnACbirtbx58Bx9CzIVeYli8OuswCfYI/LsXH2EiGcoGio1KAC3x4mmUwulOllJ2ZyRA== highlight.js@^9.10.0: version "9.10.0" @@ -7192,10 +7193,10 @@ immer@^1.12.0: resolved "https://registry.yarnpkg.com/immer/-/immer-1.12.1.tgz#40c6e5b292c00560836c2993bda3a24379d466f5" integrity sha512-3fmKM6ovaqDt0CdC9daXpNi5x/YCYS3i4cwLdTVkhJdk5jrDXoPs7lCm3IqM3yhfSnz4tjjxbRG2CziQ7m8ztg== -immer@^8.0.0: - version "8.0.0" - resolved "https://registry.yarnpkg.com/immer/-/immer-8.0.0.tgz#08763549ba9dd7d5e2eb4bec504a8315bd9440c2" - integrity sha512-jm87NNBAIG4fHwouilCHIecFXp5rMGkiFrAuhVO685UnMAlOneEAnOyzPt8OnP47TC11q/E7vpzZe0WvwepFTg== +immer@^8.0.1: + version "8.0.4" + resolved "https://registry.yarnpkg.com/immer/-/immer-8.0.4.tgz#3a21605a4e2dded852fb2afd208ad50969737b7a" + integrity sha512-jMfL18P+/6P6epANRvRk6q8t+3gGhqsJ9EuJ25AXE+9bNTYtssvzeYbEd0mXRYWCmmXSIbnlpz6vd6iJlmGGGQ== immutable@^3.7.4, immutable@^3.8.1: version "3.8.2" @@ -7348,6 +7349,11 @@ internal-slot@^1.0.2: has "^1.0.3" side-channel "^1.0.2" +internmap@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/internmap/-/internmap-1.0.1.tgz#0017cc8a3b99605f0302f2b198d272e015e5df95" + integrity sha512-lDB5YccMydFBtasVtxnZ3MRBHuaoE8GKsppq+EchKL2U4nK/DmEpPHNH8MZe5HkMtpSiTSOZwfN0tzYjO/lJEw== + interpret@1.2.0, interpret@^1.0.0, interpret@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.2.0.tgz#d5061a6224be58e8083985f5014d844359576296" @@ -8074,6 +8080,16 @@ load-json-file@^1.0.0, load-json-file@^1.1.0: pinkie-promise "^2.0.0" strip-bom "^2.0.0" +load-json-file@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b" + integrity sha1-L19Fq5HjMhYjT9U62rZo607AmTs= + dependencies: + graceful-fs "^4.1.2" + parse-json "^4.0.0" + pify "^3.0.0" + strip-bom "^3.0.0" + loader-runner@^2.3.1, loader-runner@^2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-2.4.0.tgz#ed47066bfe534d7e84c4c7b9998c2a75607d9357" @@ -8404,6 +8420,11 @@ memory-fs@^0.5.0: errno "^0.1.3" readable-stream "^2.0.1" +memorystream@^0.3.1: + version "0.3.1" + resolved "https://registry.yarnpkg.com/memorystream/-/memorystream-0.3.1.tgz#86d7090b30ce455d63fbae12dda51a47ddcaf9b2" + integrity sha1-htcJCzDORV1j+64S3aUaR93K+bI= + merge-deep@^3.0.2: version "3.0.2" resolved "https://registry.yarnpkg.com/merge-deep/-/merge-deep-3.0.2.tgz#f39fa100a4f1bd34ff29f7d2bf4508fbb8d83ad2" @@ -8935,6 +8956,21 @@ npm-packlist@^1.1.6: ignore-walk "^3.0.1" npm-bundled "^1.0.1" +npm-run-all@^4.1.5: + version "4.1.5" + resolved "https://registry.yarnpkg.com/npm-run-all/-/npm-run-all-4.1.5.tgz#04476202a15ee0e2e214080861bff12a51d98fba" + integrity sha512-Oo82gJDAVcaMdi3nuoKFavkIHBRVqQ1qvMb+9LHk/cF4P6B2m8aP04hGf7oL6wZ9BuGwX1onlLhpuoofSyoQDQ== + dependencies: + ansi-styles "^3.2.1" + chalk "^2.4.1" + cross-spawn "^6.0.5" + memorystream "^0.3.1" + minimatch "^3.0.4" + pidtree "^0.3.0" + read-pkg "^3.0.0" + shell-quote "^1.6.1" + string.prototype.padend "^3.0.0" + npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -9531,6 +9567,11 @@ picomatch@^2.0.5: resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.1.1.tgz#ecdfbea7704adb5fe6fb47f9866c4c0e15e905c5" integrity sha512-OYMyqkKzK7blWO/+XZYP6w8hH0LDvkBvdvKukti+7kqYFCiEAk+gI3DWnryapc0Dau05ugGTy0foQ6mqn4AHYA== +pidtree@^0.3.0: + version "0.3.1" + resolved "https://registry.yarnpkg.com/pidtree/-/pidtree-0.3.1.tgz#ef09ac2cc0533df1f3250ccf2c4d366b0d12114a" + integrity sha512-qQbW94hLHEqCg7nhby4yRC7G2+jYHY4Rguc2bjw7Uug4GIJuu1tvf2uHaZv5Q8zdt+WKJ6qK1FOI6amaWUo5FA== + pify@^2.0.0: version "2.3.0" resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c" @@ -10752,9 +10793,9 @@ react-popper@^1.3.6: warning "^4.0.2" react-popper@^2.2.3: - version "2.2.3" - resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-2.2.3.tgz#33d425fa6975d4bd54d9acd64897a89d904b9d97" - integrity sha512-mOEiMNT1249js0jJvkrOjyHsGvqcJd3aGW/agkiMoZk3bZ1fXN1wQszIQSjHIai48fE67+zwF8Cs+C4fWqlfjw== + version "2.2.5" + resolved "https://registry.yarnpkg.com/react-popper/-/react-popper-2.2.5.tgz#1214ef3cec86330a171671a4fbcbeeb65ee58e96" + integrity sha512-kxGkS80eQGtLl18+uig1UIf9MKixFSyPxglsgLBxlYnyDf65BiY9B3nZSc6C9XUNDgStROB0fMQlTEz1KxGddw== dependencies: react-fast-compare "^3.0.1" warning "^4.0.2" @@ -10903,6 +10944,15 @@ read-pkg@^1.0.0: normalize-package-data "^2.3.2" path-type "^1.0.0" +read-pkg@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389" + integrity sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k= + dependencies: + load-json-file "^4.0.0" + normalize-package-data "^2.3.2" + path-type "^3.0.0" + "readable-stream@1 || 2", readable-stream@^2.0.0, readable-stream@^2.0.1, readable-stream@^2.0.4, readable-stream@^2.1.5, readable-stream@^2.2.2, readable-stream@^2.3.3, readable-stream@^2.3.6: version "2.3.6" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.6.tgz#b11c27d88b8ff1fbe070643cf94b0c79ae1b0aaf" @@ -11094,6 +11144,11 @@ regenerator-runtime@^0.13.2: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.3.tgz#7cf6a77d8f5c6f60eb73c5fc1955b2ceb01e6bf5" integrity sha512-naKIZz2GQ8JWh///G7L3X6LaQUAMp2lvb1rvwwsURe/VXwD6VMfr+/1NuNw3ag8v2kY1aQ/go5SNn79O9JU7yw== +regenerator-runtime@^0.13.4: + version "0.13.7" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55" + integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew== + regenerator-transform@^0.14.0: version "0.14.1" resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.1.tgz#3b2fce4e1ab7732c08f665dfdb314749c7ddd2fb" @@ -11616,6 +11671,11 @@ shell-quote@1.6.1: array-reduce "~0.0.0" jsonify "~0.0.0" +shell-quote@^1.6.1: + version "1.7.2" + resolved "https://registry.yarnpkg.com/shell-quote/-/shell-quote-1.7.2.tgz#67a7d02c76c9da24f99d20808fcaded0e0e04be2" + integrity sha512-mRz/m/JVscCrkMyPqHc/bczi3OQHkLTqXHEFu0zDhK/qfv3UcOA4SVmRCLmos4bhjr9ekVQubj/R7waKapmiQg== + shelljs@^0.8.2: version "0.8.3" resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.3.tgz#a7f3319520ebf09ee81275b2368adb286659b097" @@ -12145,6 +12205,11 @@ strip-bom@^2.0.0: dependencies: is-utf8 "^0.2.0" +strip-bom@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-3.0.0.tgz#2334c18e9c759f7bdd56fdef7e9ae3d588e68ed3" + integrity sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM= + strip-eof@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"