From 0eaa810e89b7595a4c760a14f2db92f02339944f Mon Sep 17 00:00:00 2001 From: Alberic Liu Date: Wed, 17 Jul 2024 23:56:15 -0700 Subject: [PATCH 01/57] Fix the maven warning during build (#16746) --- pom.xml | 2 +- processing/pom.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pom.xml b/pom.xml index 3490fbd0ee7..ea9c3dcfa17 100644 --- a/pom.xml +++ b/pom.xml @@ -608,7 +608,7 @@ pom - org.hibernate + org.hibernate.validator hibernate-validator ${hibernate-validator.version} diff --git a/processing/pom.xml b/processing/pom.xml index df0ca6fd464..bfb39cf2f77 100644 --- a/processing/pom.xml +++ b/processing/pom.xml @@ -203,7 +203,7 @@ airline - org.hibernate + org.hibernate.validator hibernate-validator runtime From 721a65046f643eda1fd17f0503252752d7546cc8 Mon Sep 17 00:00:00 2001 From: Edgar Melendrez Date: Thu, 18 Jul 2024 17:06:22 -0700 Subject: [PATCH 02/57] docs: add examples for SQL functions (#16745) * updating first batch of numeric functions * First batch of functions * addressing first few comments * alphabetize list * draft with suggestions applied * minor discrepency expr -> * changed raises to calculates * Update docs/querying/sql-functions.md * switch to underscore * changed to exp(1) to match slack message * adding html text for trademark symbol to .spelling * fixed discrepancy between description and example --------- Co-authored-by: Benedict Jin --- docs/querying/sql-functions.md | 144 ++++++++++++++++++++++++++++----- website/.spelling | 1 + 2 files changed, 123 insertions(+), 22 deletions(-) diff --git a/docs/querying/sql-functions.md b/docs/querying/sql-functions.md index 7151c23b918..f5219f6a4b2 100644 --- a/docs/querying/sql-functions.md +++ b/docs/querying/sql-functions.md @@ -27,19 +27,47 @@ sidebar_label: "All functions" Apache Druid supports two query languages: Druid SQL and [native queries](querying.md). This document describes the SQL language. ::: + +This page provides a reference of Apache Druid® SQL functions in alphabetical order. For more details on a function, refer to the following: +* [Aggregation functions](sql-aggregations.md) +* [Array functions](sql-array-functions.md) +* [JSON functions](sql-json-functions.md) +* [Multi-value string functions](sql-multivalue-string-functions.md) +* [Scalar functions](sql-scalar.md) +* [Window functions](sql-window-functions.md) - -This page provides a reference of all Druid SQL functions in alphabetical order. -Click the linked function type for documentation on a particular function. +The examples on this page use the following example datasources: +* `flight-carriers` using `FlightCarrierOnTime (1 month)` +* `taxi-trips` using `NYC Taxi cabs (3 files)` ## ABS -`ABS()` - -**Function type:** [Scalar, numeric](sql-scalar.md#numeric-functions) - Calculates the absolute value of a numeric expression. +* **Syntax:** `ABS()` +* **Function type:** Scalar, numeric + +
Example + +The following example applies the ABS function to the `ArrDelay` column from the `flight-carriers` datasource. + +```sql +SELECT + "ArrDelay" AS "arrival_delay", + ABS("ArrDelay") AS "absolute_arrival_delay" +FROM "flight-carriers" +WHERE "ArrDelay" < 0 +LIMIT 1 +``` +Returns the following: + +| `arrival_delay` | `absolute_arrival_delay` | +| -- | -- | +| `-27` | `27` | +
+ +[Learn more](sql-scalar.md#numeric-functions) + ## ACOS `ACOS()` @@ -64,6 +92,7 @@ Returns any value of the specified expression. Counts distinct values of a regular column or a prebuilt sketch column. +## APPROX_COUNT_DISTINCT_BUILTIN `APPROX_COUNT_DISTINCT_BUILTIN(expr)` **Function type:** [Aggregation](sql-aggregations.md) @@ -419,11 +448,29 @@ Rounds up a timestamp by a given time unit. ## CEIL (numeric) -`CEIL()` - -**Function type:** [Scalar, numeric](sql-scalar.md#numeric-functions) - Calculates the smallest integer value greater than or equal to the numeric expression. +* **Syntax:** `CEIL()` +* **Function type:** Scalar, numeric + +
Example + +The following example applies the CEIL function to the `fare_amount` column from the `taxi-trips` datasource. + +```sql +SELECT + "fare_amount" AS "fare_amount", + CEIL("fare_amount") AS "ceiling_fare_amount" +FROM "taxi-trips" +LIMIT 1 +``` +Returns the following: + +| `fare_amount` | `ceiling_fare_amount` | +| -- | -- | +| `21.25` | `22` | +
+ +[Learn more](sql-scalar.md#numeric-functions) ## CHAR_LENGTH @@ -697,12 +744,27 @@ Returns the value of a numeric or string expression corresponding to the earlies ## EXP -`EXP()` - -**Function type:** [Scalar, numeric](sql-scalar.md#numeric-functions) - Calculates _e_ raised to the power of the numeric expression. +* **Syntax:** `EXP()` +* **Function type:** Scalar, numeric + +
Example + +The following example calculates _e_ to the power of 1. + +```sql +SELECT EXP(1) AS "exponential" +``` +Returns the following: + +| `exponential` | +| -- | +| `2.7182818284590455` | +
+ +[Learn more](sql-scalar.md#numeric-functions) + ## EXTRACT `EXTRACT( FROM )` @@ -729,11 +791,30 @@ Rounds down a timestamp by a given time unit. ## FLOOR (numeric) -`FLOOR()` +Calculates the largest integer less than or equal to the numeric expression. -**Function type:** [Scalar, numeric](sql-scalar.md#numeric-functions) +* **Syntax:** `FLOOR()` +* **Function type:** Scalar, numeric -Calculates the largest integer value less than or equal to the numeric expression. +
Example + +The following example applies the FLOOR function to the `fare_amount` column from the `taxi-trips` datasource. + +```sql +SELECT + "fare_amount" AS "fare_amount", + FLOOR("fare_amount") AS "floor_fare_amount" +FROM "taxi-trips" +LIMIT 1 +``` +Returns the following: + +| `fare_amount` | `floor_fare_amount` | +| -- | -- | +| `21.25` | `21` | +
+ +[Learn more](sql-scalar.md#numeric-functions) ## GREATEST @@ -961,12 +1042,31 @@ Returns the length of the expression in UTF-16 encoding. ## LN -`LN(expr)` - -**Function type:** [Scalar, numeric](sql-scalar.md#numeric-functions) - Calculates the natural logarithm of the numeric expression. +* **Syntax:** `LN()` +* **Function type:** Scalar, numeric + +
Example + +The following example applies the LN function to the `max_temperature` column from the `taxi-trips` datasource. + +```sql +SELECT + "max_temperature" AS "max_temperature", + LN("max_temperature") AS "natural_log_max_temp" +FROM "taxi-trips" +LIMIT 1 +``` +Returns the following: + +| `max_temperature` | `natural_log_max_temp` | +| -- | -- | +| `76` | `4.330733340286331` | +
+ +[Learn more](sql-scalar.md#numeric-functions) + ## LOG10 `LOG10(expr)` diff --git a/website/.spelling b/website/.spelling index 5825f8ddb2f..40b1b906a12 100644 --- a/website/.spelling +++ b/website/.spelling @@ -55,6 +55,7 @@ CPUs CSVs CentralizedDatasourceSchema Ceph +circledR CloudWatch ColumnDescriptor Corretto From 0a274d56a12116196593c809a6867451bbcb0c5a Mon Sep 17 00:00:00 2001 From: Vadim Ogievetsky Date: Thu, 18 Jul 2024 20:47:44 -0700 Subject: [PATCH 03/57] Web console: upgrade to Blueprint5 (#16756) * pre upgrade * did the upgrade * update snapshots * fix BP5 issues * update licenses * fix more depication warnings * use segmented control * updat snapshots * convert to fake local time * preload icons before tests * update e2e tests * Update web-console/src/components/segment-timeline/segment-timeline.tsx Co-authored-by: John Gozde * Update web-console/src/components/segment-timeline/segment-timeline.tsx Co-authored-by: John Gozde * update e2e test selector * direct import date-fns --------- Co-authored-by: John Gozde --- licenses.yaml | 255 +------- licenses/bin/react-innertext.MIT | 21 + licenses/bin/react-uid.MIT | 21 + .../component/datasources/overview.ts | 4 +- .../component/load-data/data-loader.ts | 4 +- web-console/package-lock.json | 483 +++++++-------- web-console/package.json | 12 +- .../src/blueprint-overrides/_index.scss | 1 + .../_segmented-control.scss} | 13 +- .../_special-switch-modes.scss | 10 +- .../blueprint-overrides/common/_colors.scss | 1 + .../common/_variables.scss | 2 +- .../__snapshots__/action-cell.spec.tsx.snap | 3 +- .../components/action-cell/action-cell.tsx | 7 +- .../__snapshots__/action-icon.spec.tsx.snap | 3 +- .../__snapshots__/array-input.spec.tsx.snap | 12 +- .../components/array-input/array-input.tsx | 7 +- .../array-mode-swtich.spec.tsx.snap | 16 +- .../__snapshots__/auto-form.spec.tsx.snap | 80 +-- .../src/components/auto-form/auto-form.tsx | 39 +- .../center-message.spec.tsx.snap | 2 +- .../center-message/center-message.tsx | 4 +- .../clearable-input.spec.tsx.snap | 11 +- .../date-range-selector.tsx | 74 --- .../fancy-numeric-input.spec.tsx.snap | 18 +- .../form-group-with-info.spec.tsx.snap | 16 +- .../form-group-with-info.tsx | 7 +- .../form-json-selector.spec.tsx.snap | 24 +- .../formatted-input.spec.tsx.snap | 10 +- .../formatted-input/formatted-input.tsx | 7 +- .../__snapshots__/header-bar.spec.tsx.snap | 135 ++--- .../src/components/header-bar/header-bar.tsx | 22 +- .../restricted-mode.spec.tsx.snap | 20 +- .../restricted-mode/restricted-mode.tsx | 7 +- .../interval-input.spec.tsx.snap | 16 +- .../interval-input/interval-input.tsx | 26 +- .../__snapshots__/json-collapse.spec.tsx.snap | 12 +- .../__snapshots__/menu-checkbox.spec.tsx.snap | 18 +- .../__snapshots__/menu-tristate.spec.tsx.snap | 164 ++--- .../__snapshots__/more-button.spec.tsx.snap | 20 +- .../more-button/more-button.spec.tsx | 4 +- .../components/more-button/more-button.tsx | 7 +- .../record-table-pane/record-table-pane.tsx | 7 +- .../__snapshots__/rule-editor.spec.tsx.snap | 561 +++++++++--------- .../segment-timeline.spec.tsx.snap | 184 +++--- .../segment-timeline/segment-timeline.scss | 3 +- .../segment-timeline.spec.tsx | 4 +- .../segment-timeline/segment-timeline.tsx | 251 ++++---- .../segment-timeline/stacked-bar-chart.tsx | 7 +- .../__snapshots__/show-json.spec.tsx.snap | 14 +- .../__snapshots__/show-log.spec.tsx.snap | 19 +- .../src/components/show-log/show-log.tsx | 4 +- .../__snapshots__/show-value.spec.tsx.snap | 8 +- .../suggestible-input.spec.tsx.snap | 32 +- .../suggestible-input/suggestible-input.tsx | 7 +- .../suggestion-menu.spec.tsx.snap | 84 +-- .../__snapshots__/table-cell.spec.tsx.snap | 6 +- .../table-column-selector.spec.tsx.snap | 12 +- .../table-column-selector.tsx | 7 +- .../table-filterable-cell.scss | 2 +- .../table-filterable-cell.tsx | 7 +- .../__snapshots__/timed-button.spec.tsx.snap | 21 +- .../components/timed-button/timed-button.tsx | 7 +- .../warning-checklist.spec.tsx.snap | 12 +- .../__snapshots__/about-dialog.spec.tsx.snap | 49 +- .../__snapshots__/alert-dialog.spec.tsx.snap | 30 +- .../async-action-dialog.spec.tsx.snap | 30 +- .../compaction-config-dialog.spec.tsx.snap | 444 +++++++------- .../compaction-config-dialog.tsx | 7 +- ...tasource-table-action-dialog.spec.tsx.snap | 70 +-- .../__snapshots__/doctor-dialog.spec.tsx.snap | 50 +- .../edit-context-dialog.spec.tsx.snap | 43 +- .../history-dialog.spec.tsx.snap | 80 +-- .../index-spec-dialog.spec.tsx.snap | 40 +- .../lookup-edit-dialog.spec.tsx.snap | 70 +-- .../lookup-table-action-dialog.spec.tsx.snap | 63 +- .../retention-dialog.spec.tsx.snap | 311 +++++----- .../segment-table-action-dialog.spec.tsx.snap | 84 +-- .../show-value-dialog.spec.tsx.snap | 50 +- .../__snapshots__/snitch-dialog.spec.tsx.snap | 92 +-- .../__snapshots__/spec-dialog.spec.tsx.snap | 86 +-- .../__snapshots__/status-dialog.spec.tsx.snap | 43 +- ...pervisor-table-action-dialog.spec.tsx.snap | 98 ++- .../supervisor-statistics-table.spec.tsx.snap | 30 +- .../table-action-dialog.spec.tsx.snap | 48 +- .../table-action-dialog.tsx | 7 +- .../task-table-action-dialog.spec.tsx.snap | 98 ++- web-console/src/entry.scss | 2 +- web-console/src/{entry.ts => entry.tsx} | 15 +- .../src/react-table/react-table-inputs.tsx | 7 +- .../react-table-pagination.tsx | 7 +- web-console/src/setup-tests.ts | 6 + web-console/src/utils/date.ts | 14 +- web-console/src/utils/general.tsx | 4 +- .../datasources-view.spec.tsx.snap | 13 +- .../control-pane/aggregates-input.tsx | 7 +- .../control-pane/columns-input.scss | 4 +- .../control-pane/columns-input.tsx | 7 +- .../control-pane/control-pane.scss | 4 +- .../control-pane/control-pane.tsx | 14 +- .../control-pane/options-input.tsx | 7 +- .../filter-pane/filter-menu/filter-menu.scss | 4 +- .../values-filter-control.tsx | 6 +- .../explore-view/filter-pane/filter-pane.tsx | 11 +- .../generic-output-table.tsx | 13 +- .../modules/time-chart-echarts-module.ts | 7 +- .../resource-pane/resource-pane.tsx | 16 +- .../explore-view/source-pane/source-pane.scss | 4 +- .../explore-view/source-pane/source-pane.tsx | 7 +- .../explore-view/tile-picker/tile-picker.scss | 6 +- .../explore-view/tile-picker/tile-picker.tsx | 11 +- .../datasources-card.spec.tsx.snap | 7 +- .../home-view-card.spec.tsx.snap | 7 +- .../__snapshots__/lookups-card.spec.tsx.snap | 7 +- .../__snapshots__/segments-card.spec.tsx.snap | 7 +- .../__snapshots__/services-card.spec.tsx.snap | 7 +- .../__snapshots__/status-card.spec.tsx.snap | 7 +- .../home-view/status-card/status-card.tsx | 6 +- .../supervisors-card.spec.tsx.snap | 7 +- .../__snapshots__/tasks-card.spec.tsx.snap | 7 +- .../load-data-view.spec.tsx.snap | 152 ++--- .../example-picker.spec.tsx.snap | 22 +- .../__snapshots__/form-editor.spec.tsx.snap | 34 +- .../views/load-data-view/load-data-view.tsx | 18 +- .../__snapshots__/lookups-view.spec.tsx.snap | 2 +- .../__snapshots__/segments-view.spec.tsx.snap | 21 +- .../__snapshots__/services-view.spec.tsx.snap | 23 +- .../column-actions/column-actions.tsx | 11 +- .../column-editor/column-editor.tsx | 6 +- .../destination-form/destination-form.tsx | 6 +- .../schema-step/column-list/column-list.tsx | 11 +- .../preview-table/preview-table.tsx | 7 +- .../schema-step/schema-step.tsx | 18 +- .../supervisors-view.spec.tsx.snap | 36 +- .../supervisors-view/supervisors-view.tsx | 7 +- .../__snapshots__/tasks-view.spec.tsx.snap | 34 +- .../__snapshots__/column-tree.spec.tsx.snap | 67 ++- .../complex-menu-items.spec.tsx.snap | 89 ++- .../number-menu-items.spec.tsx.snap | 543 +++++++++-------- .../string-menu-items.spec.tsx.snap | 543 +++++++++-------- .../time-menu-items.spec.tsx.snap | 543 +++++++++-------- .../column-tree/column-tree.tsx | 46 +- .../destination-pages-pane.tsx | 7 +- .../execution-error-pane.spec.tsx.snap | 4 +- .../execution-progress-bar-pane.spec.tsx.snap | 10 +- .../execution-stages-pane.tsx | 11 +- .../execution-submit-dialog.spec.tsx.snap | 24 +- .../execution-summary-panel.tsx | 7 +- .../execution-timer-panel.spec.tsx.snap | 28 +- .../explain-dialog.spec.tsx.snap | 106 ++-- .../flexible-query-input.tsx | 7 +- .../max-tasks-button.spec.tsx.snap | 43 +- .../max-tasks-button/max-tasks-button.tsx | 7 +- .../query-parameters-dialog.spec.tsx.snap | 164 +++-- .../query-parameters-dialog.tsx | 6 +- .../recent-query-task-panel.tsx | 7 +- .../result-table-pane/result-table-pane.tsx | 11 +- .../workbench-view/run-panel/run-panel.tsx | 14 +- .../workbench-history-dialog.tsx | 7 +- .../views/workbench-view/workbench-view.tsx | 15 +- web-console/unified-console.html | 2 +- web-console/webpack.config.js | 2 +- 162 files changed, 3707 insertions(+), 4072 deletions(-) create mode 100644 licenses/bin/react-innertext.MIT create mode 100644 licenses/bin/react-uid.MIT rename web-console/src/{components/date-range-selector/date-range-selector.scss => blueprint-overrides/_segmented-control.scss} (84%) delete mode 100644 web-console/src/components/date-range-selector/date-range-selector.tsx rename web-console/src/{entry.ts => entry.tsx} (93%) diff --git a/licenses.yaml b/licenses.yaml index abfc8924898..03565a14660 100644 --- a/licenses.yaml +++ b/licenses.yaml @@ -5031,7 +5031,7 @@ license_category: binary module: web-console license_name: Apache License version 2.0 copyright: Palantir Technologies -version: 4.2.1 +version: 5.1.1 --- @@ -5040,7 +5040,7 @@ license_category: binary module: web-console license_name: Apache License version 2.0 copyright: Palantir Technologies -version: 4.20.2 +version: 5.10.5 --- @@ -5049,7 +5049,7 @@ license_category: binary module: web-console license_name: Apache License version 2.0 copyright: Palantir Technologies -version: 0.9.35 +version: 2.3.7 --- @@ -5058,7 +5058,7 @@ license_category: binary module: web-console license_name: Apache License version 2.0 copyright: Palantir Technologies -version: 4.4.36 +version: 5.3.7 --- @@ -5067,16 +5067,7 @@ license_category: binary module: web-console license_name: Apache License version 2.0 copyright: Palantir Technologies -version: 4.16.0 - ---- - -name: "@blueprintjs/popover2" -license_category: binary -module: web-console -license_name: Apache License version 2.0 -copyright: Palantir Technologies -version: 1.14.11 +version: 5.10.0 --- @@ -5085,7 +5076,7 @@ license_category: binary module: web-console license_name: Apache License version 2.0 copyright: Palantir Technologies -version: 4.9.24 +version: 5.2.1 --- @@ -5206,16 +5197,6 @@ license_file_path: licenses/bin/@emotion-weak-memoize.MIT --- -name: "@hypnosphi/create-react-context" -license_category: binary -module: web-console -license_name: MIT License -copyright: James Kyle -version: 0.3.1 -license_file_path: licenses/bin/@hypnosphi-create-react-context.MIT - ---- - name: "@juggle/resize-observer" license_category: binary module: web-console @@ -5235,16 +5216,6 @@ license_file_path: licenses/bin/@popperjs-core.MIT --- -name: "@types/dom4" -license_category: binary -module: web-console -license_name: MIT License -copyright: Microsoft Corporation. -version: 2.0.2 -license_file_path: licenses/bin/@types-dom4.MIT - ---- - name: "@types/parse-json" license_category: binary module: web-console @@ -5355,16 +5326,6 @@ license_file_path: licenses/bin/babel-plugin-syntax-jsx.MIT --- -name: "call-bind" -license_category: binary -module: web-console -license_name: MIT License -copyright: Jordan Harband -version: 1.0.2 -license_file_path: licenses/bin/call-bind.MIT - ---- - name: "callsites" license_category: binary module: web-console @@ -5649,7 +5610,7 @@ license_category: binary module: web-console license_name: MIT License copyright: Marnus Weststrate -version: 1.3.8 +version: 2.0.1 license_file_path: licenses/bin/date-fns-tz.MIT --- @@ -5664,26 +5625,6 @@ license_file_path: licenses/bin/date-fns.MIT --- -name: "deep-equal" -license_category: binary -module: web-console -license_name: MIT License -copyright: James Halliday -version: 1.1.1 -license_file_path: licenses/bin/deep-equal.MIT - ---- - -name: "define-properties" -license_category: binary -module: web-console -license_name: MIT License -copyright: Jordan Harband -version: 1.2.0 -license_file_path: licenses/bin/define-properties.MIT - ---- - name: "delayed-stream" license_category: binary module: web-console @@ -5723,16 +5664,6 @@ license_file_path: licenses/bin/dom-helpers.MIT --- -name: "dom4" -license_category: binary -module: web-console -license_name: MIT License -copyright: Andrea Giammarchi -version: 2.1.6 -license_file_path: licenses/bin/dom4.MIT - ---- - name: "dot-case" license_category: binary module: web-console @@ -5842,36 +5773,6 @@ license_file_path: licenses/bin/function-bind.MIT --- -name: "functions-have-names" -license_category: binary -module: web-console -license_name: MIT License -copyright: Jordan Harband -version: 1.2.3 -license_file_path: licenses/bin/functions-have-names.MIT - ---- - -name: "get-intrinsic" -license_category: binary -module: web-console -license_name: MIT License -copyright: Jordan Harband -version: 1.2.0 -license_file_path: licenses/bin/get-intrinsic.MIT - ---- - -name: "gud" -license_category: binary -module: web-console -license_name: MIT License -copyright: Jamie Kyle -version: 1.0.0 -license_file_path: licenses/bin/gud.MIT - ---- - name: "has-flag" license_category: binary module: web-console @@ -5892,36 +5793,6 @@ license_file_path: licenses/bin/has-own-prop.MIT --- -name: "has-property-descriptors" -license_category: binary -module: web-console -license_name: MIT License -copyright: Jordan Harband -version: 1.0.0 -license_file_path: licenses/bin/has-property-descriptors.MIT - ---- - -name: "has-symbols" -license_category: binary -module: web-console -license_name: MIT License -copyright: Jordan Harband -version: 1.0.3 -license_file_path: licenses/bin/has-symbols.MIT - ---- - -name: "has-tostringtag" -license_category: binary -module: web-console -license_name: MIT License -copyright: Jordan Harband -version: 1.0.0 -license_file_path: licenses/bin/has-tostringtag.MIT - ---- - name: "has" license_category: binary module: web-console @@ -6011,16 +5882,6 @@ license_file_path: licenses/bin/internmap.ISC --- -name: "is-arguments" -license_category: binary -module: web-console -license_name: MIT License -copyright: Jordan Harband -version: 1.1.1 -license_file_path: licenses/bin/is-arguments.MIT - ---- - name: "is-arrayish" license_category: binary module: web-console @@ -6041,26 +5902,6 @@ license_file_path: licenses/bin/is-core-module.MIT --- -name: "is-date-object" -license_category: binary -module: web-console -license_name: MIT License -copyright: Jordan Harband -version: 1.0.5 -license_file_path: licenses/bin/is-date-object.MIT - ---- - -name: "is-regex" -license_category: binary -module: web-console -license_name: MIT License -copyright: Jordan Harband -version: 1.1.4 -license_file_path: licenses/bin/is-regex.MIT - ---- - name: "isarray" license_category: binary module: web-console @@ -6151,16 +5992,6 @@ 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 @@ -6271,26 +6102,6 @@ license_file_path: licenses/bin/object-assign.MIT --- -name: "object-is" -license_category: binary -module: web-console -license_name: MIT License -copyright: Jordan Harband -version: 1.1.5 -license_file_path: licenses/bin/object-is.MIT - ---- - -name: "object-keys" -license_category: binary -module: web-console -license_name: MIT License -copyright: Jordan Harband -version: 1.1.1 -license_file_path: licenses/bin/object-keys.MIT - ---- - name: "opensans" license_category: binary module: web-console @@ -6380,16 +6191,6 @@ license_file_path: licenses/bin/path-type.MIT --- -name: "popper.js" -license_category: binary -module: web-console -license_name: MIT License -copyright: Federico Zivolo -version: 1.16.1 -license_file_path: licenses/bin/popper.js.MIT - ---- - name: "prop-types" license_category: binary module: web-console @@ -6460,6 +6261,16 @@ license_file_path: licenses/bin/react-fast-compare.MIT --- +name: "react-innertext" +license_category: binary +module: web-console +license_name: MIT License +copyright: Charles Stover +version: 1.1.5 +license_file_path: licenses/bin/react-innertext.MIT + +--- + name: "react-is" license_category: binary module: web-console @@ -6475,7 +6286,7 @@ license_category: binary module: web-console license_name: MIT License copyright: Travis Arnold -version: 1.3.11 +version: 2.3.0 license_file_path: licenses/bin/react-popper.MIT --- @@ -6530,6 +6341,16 @@ license_file_path: licenses/bin/react-transition-group.BSD3 --- +name: "react-uid" +license_category: binary +module: web-console +license_name: MIT License +copyright: Marina Korzunova +version: 2.3.3 +license_file_path: licenses/bin/react-uid.MIT + +--- + name: "react" license_category: binary module: web-console @@ -6550,16 +6371,6 @@ license_file_path: licenses/bin/regenerator-runtime.MIT --- -name: "regexp.prototype.flags" -license_category: binary -module: web-console -license_name: MIT License -copyright: Jordan Harband -version: 1.5.0 -license_file_path: licenses/bin/regexp.prototype.flags.MIT - ---- - name: "resolve-from" license_category: binary module: web-console @@ -6730,16 +6541,6 @@ license_file_path: licenses/bin/tslib.0BSD --- -name: "typed-styles" -license_category: binary -module: web-console -license_name: MIT License -copyright: lttb -version: 0.0.7 -license_file_path: licenses/bin/typed-styles.MIT - ---- - name: "upper-case-first" license_category: binary module: web-console diff --git a/licenses/bin/react-innertext.MIT b/licenses/bin/react-innertext.MIT new file mode 100644 index 00000000000..8109ef9ff8a --- /dev/null +++ b/licenses/bin/react-innertext.MIT @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2017 Charles Stover + +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/react-uid.MIT b/licenses/bin/react-uid.MIT new file mode 100644 index 00000000000..6c48e928b3c --- /dev/null +++ b/licenses/bin/react-uid.MIT @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2016 Anton + +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/web-console/e2e-tests/component/datasources/overview.ts b/web-console/e2e-tests/component/datasources/overview.ts index 50a5762c15f..f3f7c1a434d 100644 --- a/web-console/e2e-tests/component/datasources/overview.ts +++ b/web-console/e2e-tests/component/datasources/overview.ts @@ -125,13 +125,13 @@ export class DatasourcesOverview { throw new Error(`Could not find datasource: ${datasourceName}`); } - const editActions = await this.page.$$('.action-cell span[icon=more]'); + const editActions = await this.page.$$('.action-cell span.bp5-icon-more'); await editActions[index].click(); await this.waitForPopupMenu(); } private async waitForPopupMenu(): Promise { - await this.page.waitForSelector('ul.bp4-menu'); + await this.page.waitForSelector('ul.bp5-menu'); } async triggerCompaction(): Promise { diff --git a/web-console/e2e-tests/component/load-data/data-loader.ts b/web-console/e2e-tests/component/load-data/data-loader.ts index 4462641cb9a..102ef2d75bf 100644 --- a/web-console/e2e-tests/component/load-data/data-loader.ts +++ b/web-console/e2e-tests/component/load-data/data-loader.ts @@ -66,7 +66,7 @@ export class DataLoader { } private async start() { - const cardSelector = `//*[contains(@class,"bp4-card")][p[contains(text(),"${this.connector.name}")]]`; + const cardSelector = `//*[contains(@class,"bp5-card")][p[contains(text(),"${this.connector.name}")]]`; await this.page.click(cardSelector); await clickButton(this.page, 'Connect data'); } @@ -126,7 +126,7 @@ export class DataLoader { const rollupChecked = await rollupInput!.evaluate(el => (el as HTMLInputElement).checked); if (rollupChecked !== configureSchemaConfig.rollup) { await this.page.click(rollupSelector); - const confirmationDialogSelector = '//*[contains(@class,"bp4-alert-body")]'; + const confirmationDialogSelector = '//*[contains(@class,"bp5-alert-body")]'; await this.page.waitForSelector(confirmationDialogSelector); await clickButton(this.page, 'Yes'); const statusMessageSelector = '.recipe-toaster'; diff --git a/web-console/package-lock.json b/web-console/package-lock.json index 2945955d9d6..c7c7d271ce7 100644 --- a/web-console/package-lock.json +++ b/web-console/package-lock.json @@ -9,12 +9,11 @@ "version": "31.0.0", "license": "Apache-2.0", "dependencies": { - "@blueprintjs/core": "^4.20.1", - "@blueprintjs/datetime": "^4.4.36", - "@blueprintjs/datetime2": "^0.9.35", - "@blueprintjs/icons": "^4.16.0", - "@blueprintjs/popover2": "^1.14.9", - "@blueprintjs/select": "^4.9.24", + "@blueprintjs/core": "^5.10.5", + "@blueprintjs/datetime": "^5.3.6", + "@blueprintjs/datetime2": "^2.3.7", + "@blueprintjs/icons": "^5.10.0", + "@blueprintjs/select": "^5.2.1", "@druid-toolkit/query": "^0.22.20", "@druid-toolkit/visuals-core": "^0.3.3", "@druid-toolkit/visuals-react": "^0.3.3", @@ -29,6 +28,7 @@ "d3-dsv": "^2.0.0", "d3-scale": "^3.3.0", "d3-selection": "^2.0.0", + "date-fns": "^2.28.0", "echarts": "^5.4.3", "file-saver": "^2.0.5", "fontsource-open-sans": "^3.0.9", @@ -816,36 +816,35 @@ "dev": true }, "node_modules/@blueprintjs/colors": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.2.1.tgz", - "integrity": "sha512-Cx7J2YnUuxn+fi+y5XtXnBB7+cFHN4xBrRkaAetp78i3VTCXjUk+d1omrOr8TqbRucUXTdrhbZOUHpzRLFcJpQ==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/@blueprintjs/colors/-/colors-5.1.1.tgz", + "integrity": "sha512-Mni/GgCYLaMf5U5zsCN42skOG49w3U0QmUFuJgFZ/1pv+3cHF/9xR4L4dXcj5DtgJoHkmUbK36PR5mdFB65WEA==", "dependencies": { - "tslib": "~2.5.0" + "tslib": "~2.6.2" } }, "node_modules/@blueprintjs/core": { - "version": "4.20.2", - "resolved": "https://registry.npmjs.org/@blueprintjs/core/-/core-4.20.2.tgz", - "integrity": "sha512-5v4Nr0jozfAjiOkjY4zvt1XSpt4ldnrSaxtwo506S2cxJYfwFeMTmDshXNPFcc8L1fjZMxi0IWI2WABXzZXS6w==", + "version": "5.10.5", + "resolved": "https://registry.npmjs.org/@blueprintjs/core/-/core-5.10.5.tgz", + "integrity": "sha512-mvTB+Ox31nt9830hEgVOi/A53QI71hpOzV/7i3ZgzzrYAaEGgFMcwa7X0kn9PSOGfxw87nWL9VpYSirnzpC6lw==", "dependencies": { - "@blueprintjs/colors": "^4.2.1", - "@blueprintjs/icons": "^4.16.0", - "@juggle/resize-observer": "^3.4.0", - "@types/dom4": "^2.0.2", + "@blueprintjs/colors": "^5.1.1", + "@blueprintjs/icons": "^5.10.0", + "@popperjs/core": "^2.11.8", "classnames": "^2.3.1", - "dom4": "^2.1.5", "normalize.css": "^8.0.1", - "popper.js": "^1.16.1", - "react-popper": "^1.3.11", + "react-popper": "^2.3.0", "react-transition-group": "^4.4.5", - "tslib": "~2.5.0" + "react-uid": "^2.3.3", + "tslib": "~2.6.2", + "use-sync-external-store": "^1.2.0" }, "bin": { "upgrade-blueprint-2.0.0-rename": "scripts/upgrade-blueprint-2.0.0-rename.sh", "upgrade-blueprint-3.0.0-rename": "scripts/upgrade-blueprint-3.0.0-rename.sh" }, "peerDependencies": { - "@types/react": "^16.14.32 || 17 || 18", + "@types/react": "^16.14.41 || 17 || 18", "react": "^16.8 || 17 || 18", "react-dom": "^16.8 || 17 || 18" }, @@ -855,35 +854,22 @@ } } }, - "node_modules/@blueprintjs/core/node_modules/react-popper": { - "version": "1.3.11", - "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.11.tgz", - "integrity": "sha512-VSA/bS+pSndSF2fiasHK/PTEEAyOpX60+H5EPAjoArr8JGm+oihu4UbrqcEBpQibJxBVCpYyjAX7abJ+7DoYVg==", - "dependencies": { - "@babel/runtime": "^7.1.2", - "@hypnosphi/create-react-context": "^0.3.1", - "deep-equal": "^1.1.1", - "popper.js": "^1.14.4", - "prop-types": "^15.6.1", - "typed-styles": "^0.0.7", - "warning": "^4.0.2" - }, - "peerDependencies": { - "react": "0.14.x || ^15.0.0 || ^16.0.0 || ^17.0.0" - } - }, "node_modules/@blueprintjs/datetime": { - "version": "4.4.36", - "resolved": "https://registry.npmjs.org/@blueprintjs/datetime/-/datetime-4.4.36.tgz", - "integrity": "sha512-+0zMGorGNjR/5lEB2t7sjVX0jWPVgmFkHTIezhAIQgJAj0upcxF3SuvnrpVjJKA3Ug6/0wZ+76eLPbpNz9CVzA==", + "version": "5.3.7", + "resolved": "https://registry.npmjs.org/@blueprintjs/datetime/-/datetime-5.3.7.tgz", + "integrity": "sha512-6rDMqSU8jeiAlMxS30MYAQc4X1sfMGWwFjfs3IoKxJfcfieN+ytus5G+if6zjsSKUjdhL9+qBTgKRo3VJJEQ3g==", "dependencies": { - "@blueprintjs/core": "^4.20.1", + "@blueprintjs/core": "^5.10.5", + "@blueprintjs/icons": "^5.10.0", + "@blueprintjs/select": "^5.2.1", "classnames": "^2.3.1", + "date-fns": "^2.28.0", + "date-fns-tz": "^2.0.0", "react-day-picker": "7.4.9", - "tslib": "~2.5.0" + "tslib": "~2.6.2" }, "peerDependencies": { - "@types/react": "^16.14.32 || 17", + "@types/react": "^16.14.41 || 17", "react": "^16.8 || 17", "react-dom": "^16.8 || 17" }, @@ -894,24 +880,23 @@ } }, "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==", + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@blueprintjs/datetime2/-/datetime2-2.3.7.tgz", + "integrity": "sha512-Q6IBo5hcvoDtH9FsFaysZhadXNS6iyhuyaRY+rJD3y3qLaUt6wiYDhw5LN6L4wuasbPO1g0lVDwY6bkGuIG4jg==", "dependencies": { - "@blueprintjs/core": "^4.20.1", - "@blueprintjs/datetime": "^4.4.36", - "@blueprintjs/popover2": "^1.14.9", - "@blueprintjs/select": "^4.9.22", + "@blueprintjs/core": "^5.10.5", + "@blueprintjs/datetime": "^5.3.7", + "@blueprintjs/icons": "^5.10.0", "classnames": "^2.3.1", "date-fns": "^2.28.0", - "date-fns-tz": "^1.3.7", - "lodash": "^4.17.21", - "tslib": "~2.5.0" + "react-day-picker": "^8.10.0", + "react-innertext": "^1.1.5", + "tslib": "~2.6.2" }, "peerDependencies": { - "@types/react": "^16.14.32 || 17", - "react": "^16.8 || 17", - "react-dom": "^16.8 || 17" + "@types/react": "^16.14.41 || 17 || 18", + "react": "^16.8 || 17 || 18", + "react-dom": "^16.8 || 17 || 18" }, "peerDependenciesMeta": { "@types/react": { @@ -919,31 +904,30 @@ } } }, + "node_modules/@blueprintjs/datetime2/node_modules/react-day-picker": { + "version": "8.10.1", + "resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-8.10.1.tgz", + "integrity": "sha512-TMx7fNbhLk15eqcMt+7Z7S2KF7mfTId/XJDjKE8f+IUcFn0l08/kI4FiYTL/0yuOLmEcbR4Fwe3GJf/NiiMnPA==", + "funding": { + "type": "individual", + "url": "https://github.com/sponsors/gpbl" + }, + "peerDependencies": { + "date-fns": "^2.28.0 || ^3.0.0", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + } + }, "node_modules/@blueprintjs/icons": { - "version": "4.16.0", - "resolved": "https://registry.npmjs.org/@blueprintjs/icons/-/icons-4.16.0.tgz", - "integrity": "sha512-cyfgjUZcZCtQrXWUV8FwqYTFEzduV4a0N7yhOU38jY+cBRCLu/sDrD0Osvfk4DGRvNe4YjY7pohVLFSxpg68Uw==", + "version": "5.10.0", + "resolved": "https://registry.npmjs.org/@blueprintjs/icons/-/icons-5.10.0.tgz", + "integrity": "sha512-Qp9H2U2/m6+p0Lh9ACuF2O6o0uVINMFimo+EgasgGaLx8SkJsl7ApB3hYQ+iRSYlQWotnoqd4Vtzj4c7sKukHQ==", "dependencies": { "change-case": "^4.1.2", "classnames": "^2.3.1", - "tslib": "~2.5.0" - } - }, - "node_modules/@blueprintjs/popover2": { - "version": "1.14.11", - "resolved": "https://registry.npmjs.org/@blueprintjs/popover2/-/popover2-1.14.11.tgz", - "integrity": "sha512-5XAjeb2mlWjYXC0pqrNDLzHSsX85Zaiv8jixxUN9abarMUUFKGATgGF8MRsWTLAW94Gli6CB1lzVkrYkRHHf6Q==", - "dependencies": { - "@blueprintjs/core": "^4.20.2", - "@juggle/resize-observer": "^3.4.0", - "@popperjs/core": "^2.11.7", - "classnames": "^2.3.1", - "dom4": "^2.1.5", - "react-popper": "^2.3.0", - "tslib": "~2.5.0" + "tslib": "~2.6.2" }, "peerDependencies": { - "@types/react": "^16.14.32 || 17 || 18", + "@types/react": "^16.14.41 || 17 || 18", "react": "^16.8 || 17 || 18", "react-dom": "^16.8 || 17 || 18" }, @@ -954,17 +938,17 @@ } }, "node_modules/@blueprintjs/select": { - "version": "4.9.24", - "resolved": "https://registry.npmjs.org/@blueprintjs/select/-/select-4.9.24.tgz", - "integrity": "sha512-OTjesxH/7UZvM7yAdHJ5u3sIjX1N8Rs4CQQ22AfqNl82SIROqkuXI31XEl6YNX1GsYfmAMiw0K7XohEKOMXR5g==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/@blueprintjs/select/-/select-5.2.1.tgz", + "integrity": "sha512-rXM9ik2mLd394g+sxwbHv2bGfrLbcdY9gFftqmJmm3vu7XJ2kRrsC1oOlNSC4dNBpUdHnyAzBTHEu81B1LkRbQ==", "dependencies": { - "@blueprintjs/core": "^4.20.2", - "@blueprintjs/popover2": "^1.14.11", + "@blueprintjs/core": "^5.10.5", + "@blueprintjs/icons": "^5.10.0", "classnames": "^2.3.1", - "tslib": "~2.5.0" + "tslib": "~2.6.2" }, "peerDependencies": { - "@types/react": "^16.14.32 || 17 || 18", + "@types/react": "^16.14.41 || 17 || 18", "react": "^16.8 || 17 || 18", "react-dom": "^16.8 || 17 || 18" }, @@ -1291,19 +1275,6 @@ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, - "node_modules/@hypnosphi/create-react-context": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@hypnosphi/create-react-context/-/create-react-context-0.3.1.tgz", - "integrity": "sha512-V1klUed202XahrWJLLOT3EXNeCpFHCcJntdFGI15ntCwau+jfT386w7OFTMaCqOgXUH1fa0w/I1oZs+i/Rfr0A==", - "dependencies": { - "gud": "^1.0.0", - "warning": "^4.0.3" - }, - "peerDependencies": { - "prop-types": "^15.0.0", - "react": ">=0.14.0" - } - }, "node_modules/@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -2539,11 +2510,6 @@ "integrity": "sha512-9MVYlmIgmRR31C5b4FVSWtuMmBHh2mOWQYfl7XAYOa8dsnb7iEmUmRSWSFgXFtkjxO65d7hTUHQC+RhR/9IWFg==", "dev": true }, - "node_modules/@types/dom4": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@types/dom4/-/dom4-2.0.2.tgz", - "integrity": "sha512-Rt4IC1T7xkCWa0OG1oSsPa0iqnxlDeQqKXZAHrQGLb7wFGncWm85MaxKUjAGejOrUynOgWlFi4c6S6IyJwoK4g==" - }, "node_modules/@types/enzyme": { "version": "3.10.17", "resolved": "https://registry.npmjs.org/@types/enzyme/-/enzyme-3.10.17.tgz", @@ -4448,6 +4414,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dev": true, "dependencies": { "function-bind": "^1.1.1", "get-intrinsic": "^1.0.2" @@ -5521,11 +5488,11 @@ } }, "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==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-2.0.1.tgz", + "integrity": "sha512-fJCG3Pwx8HUoLhkepdsP7Z5RsucUi+ZBOxyM5d0ZZ6c4SdYustq0VMmOu6Wf7bli+yS/Jwp91TOCqn9jMcVrUA==", "peerDependencies": { - "date-fns": ">=2.0.0" + "date-fns": "2.x" } }, "node_modules/debounce": { @@ -5594,22 +5561,6 @@ } } }, - "node_modules/deep-equal": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", - "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", - "dependencies": { - "is-arguments": "^1.0.4", - "is-date-object": "^1.0.1", - "is-regex": "^1.0.4", - "object-is": "^1.0.1", - "object-keys": "^1.1.1", - "regexp.prototype.flags": "^1.2.0" - }, - "funding": { - "url": "https://github.com/sponsors/ljharb" - } - }, "node_modules/deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", @@ -5650,6 +5601,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", + "dev": true, "dependencies": { "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" @@ -5802,11 +5754,6 @@ "entities": "^1.1.1" } }, - "node_modules/dom4": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/dom4/-/dom4-2.1.6.tgz", - "integrity": "sha512-JkCVGnN4ofKGbjf5Uvc8mmxaATIErKQKSgACdBXpsQ3fY6DlIpAyWfiBSrGkttATssbDCp3psiAKWXk5gmjycA==" - }, "node_modules/domelementtype": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", @@ -7634,6 +7581,7 @@ "version": "1.2.3", "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "dev": true, "funding": { "url": "https://github.com/sponsors/ljharb" } @@ -7660,6 +7608,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", + "dev": true, "dependencies": { "function-bind": "^1.1.1", "has": "^1.0.3", @@ -7836,11 +7785,6 @@ "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", "dev": true }, - "node_modules/gud": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz", - "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw==" - }, "node_modules/gzip-size": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz", @@ -7917,6 +7861,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "dev": true, "dependencies": { "get-intrinsic": "^1.1.1" }, @@ -7940,6 +7885,7 @@ "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "dev": true, "engines": { "node": ">= 0.4" }, @@ -7951,6 +7897,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", + "dev": true, "dependencies": { "has-symbols": "^1.0.2" }, @@ -8504,6 +8451,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", + "dev": true, "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -8636,6 +8584,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", + "dev": true, "dependencies": { "has-tostringtag": "^1.0.0" }, @@ -8787,6 +8736,7 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "dev": true, "dependencies": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -11512,7 +11462,8 @@ "node_modules/lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "dev": true }, "node_modules/lodash.debounce": { "version": "4.0.8", @@ -12329,6 +12280,7 @@ "version": "1.1.5", "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==", + "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.1.3" @@ -12344,6 +12296,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true, "engines": { "node": ">= 0.4" } @@ -12812,16 +12765,6 @@ "node": ">=4" } }, - "node_modules/popper.js": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", - "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==", - "deprecated": "You can find the new Popper v2 at @popperjs/core, this package is dedicated to the legacy v1", - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/popperjs" - } - }, "node_modules/postcss": { "version": "8.4.31", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", @@ -14745,6 +14688,15 @@ "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz", "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==" }, + "node_modules/react-innertext": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/react-innertext/-/react-innertext-1.1.5.tgz", + "integrity": "sha512-PWAqdqhxhHIv80dT9znP2KvS+hfkbRovFp4zFYHFFlOoQLRiawIic81gKb3U1wEyJZgMwgs3JoLtwryASRWP3Q==", + "peerDependencies": { + "@types/react": ">=0.0.0 <=99", + "react": ">=0.0.0 <=99" + } + }, "node_modules/react-is": { "version": "16.8.6", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz", @@ -14856,6 +14808,26 @@ "react-dom": ">=16.6.0" } }, + "node_modules/react-uid": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/react-uid/-/react-uid-2.3.3.tgz", + "integrity": "sha512-iNpDovcb9qBpBTo8iUgqRSQOS8GV3bWoNaTaUptHkXtAooXSo0OWe7vN6TqqB8x3x0bNBbQx96kkmSltQ5h9kQ==", + "dependencies": { + "tslib": "^2.0.0" + }, + "engines": { + "node": ">=10" + }, + "peerDependencies": { + "@types/react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react": "^16.8.0 || ^17.0.0 || ^18.0.0" + }, + "peerDependenciesMeta": { + "@types/react": { + "optional": true + } + } + }, "node_modules/read-installed": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/read-installed/-/read-installed-4.0.3.tgz", @@ -15028,6 +15000,7 @@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz", "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==", + "dev": true, "dependencies": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -17228,9 +17201,9 @@ } }, "node_modules/tslib": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", - "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", + "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, "node_modules/tsutils": { "version": "3.21.0", @@ -17313,11 +17286,6 @@ "url": "https://github.com/sponsors/ljharb" } }, - "node_modules/typed-styles": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/typed-styles/-/typed-styles-0.0.7.tgz", - "integrity": "sha512-pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q==" - }, "node_modules/typedarray-to-buffer": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", @@ -19022,107 +18990,86 @@ "dev": true }, "@blueprintjs/colors": { - "version": "4.2.1", - "resolved": "https://registry.npmjs.org/@blueprintjs/colors/-/colors-4.2.1.tgz", - "integrity": "sha512-Cx7J2YnUuxn+fi+y5XtXnBB7+cFHN4xBrRkaAetp78i3VTCXjUk+d1omrOr8TqbRucUXTdrhbZOUHpzRLFcJpQ==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/@blueprintjs/colors/-/colors-5.1.1.tgz", + "integrity": "sha512-Mni/GgCYLaMf5U5zsCN42skOG49w3U0QmUFuJgFZ/1pv+3cHF/9xR4L4dXcj5DtgJoHkmUbK36PR5mdFB65WEA==", "requires": { - "tslib": "~2.5.0" + "tslib": "~2.6.2" } }, "@blueprintjs/core": { - "version": "4.20.2", - "resolved": "https://registry.npmjs.org/@blueprintjs/core/-/core-4.20.2.tgz", - "integrity": "sha512-5v4Nr0jozfAjiOkjY4zvt1XSpt4ldnrSaxtwo506S2cxJYfwFeMTmDshXNPFcc8L1fjZMxi0IWI2WABXzZXS6w==", + "version": "5.10.5", + "resolved": "https://registry.npmjs.org/@blueprintjs/core/-/core-5.10.5.tgz", + "integrity": "sha512-mvTB+Ox31nt9830hEgVOi/A53QI71hpOzV/7i3ZgzzrYAaEGgFMcwa7X0kn9PSOGfxw87nWL9VpYSirnzpC6lw==", "requires": { - "@blueprintjs/colors": "^4.2.1", - "@blueprintjs/icons": "^4.16.0", - "@juggle/resize-observer": "^3.4.0", - "@types/dom4": "^2.0.2", + "@blueprintjs/colors": "^5.1.1", + "@blueprintjs/icons": "^5.10.0", + "@popperjs/core": "^2.11.8", "classnames": "^2.3.1", - "dom4": "^2.1.5", "normalize.css": "^8.0.1", - "popper.js": "^1.16.1", - "react-popper": "^1.3.11", + "react-popper": "^2.3.0", "react-transition-group": "^4.4.5", - "tslib": "~2.5.0" - }, - "dependencies": { - "react-popper": { - "version": "1.3.11", - "resolved": "https://registry.npmjs.org/react-popper/-/react-popper-1.3.11.tgz", - "integrity": "sha512-VSA/bS+pSndSF2fiasHK/PTEEAyOpX60+H5EPAjoArr8JGm+oihu4UbrqcEBpQibJxBVCpYyjAX7abJ+7DoYVg==", - "requires": { - "@babel/runtime": "^7.1.2", - "@hypnosphi/create-react-context": "^0.3.1", - "deep-equal": "^1.1.1", - "popper.js": "^1.14.4", - "prop-types": "^15.6.1", - "typed-styles": "^0.0.7", - "warning": "^4.0.2" - } - } + "react-uid": "^2.3.3", + "tslib": "~2.6.2", + "use-sync-external-store": "^1.2.0" } }, "@blueprintjs/datetime": { - "version": "4.4.36", - "resolved": "https://registry.npmjs.org/@blueprintjs/datetime/-/datetime-4.4.36.tgz", - "integrity": "sha512-+0zMGorGNjR/5lEB2t7sjVX0jWPVgmFkHTIezhAIQgJAj0upcxF3SuvnrpVjJKA3Ug6/0wZ+76eLPbpNz9CVzA==", + "version": "5.3.7", + "resolved": "https://registry.npmjs.org/@blueprintjs/datetime/-/datetime-5.3.7.tgz", + "integrity": "sha512-6rDMqSU8jeiAlMxS30MYAQc4X1sfMGWwFjfs3IoKxJfcfieN+ytus5G+if6zjsSKUjdhL9+qBTgKRo3VJJEQ3g==", "requires": { - "@blueprintjs/core": "^4.20.1", + "@blueprintjs/core": "^5.10.5", + "@blueprintjs/icons": "^5.10.0", + "@blueprintjs/select": "^5.2.1", "classnames": "^2.3.1", + "date-fns": "^2.28.0", + "date-fns-tz": "^2.0.0", "react-day-picker": "7.4.9", - "tslib": "~2.5.0" + "tslib": "~2.6.2" } }, "@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==", + "version": "2.3.7", + "resolved": "https://registry.npmjs.org/@blueprintjs/datetime2/-/datetime2-2.3.7.tgz", + "integrity": "sha512-Q6IBo5hcvoDtH9FsFaysZhadXNS6iyhuyaRY+rJD3y3qLaUt6wiYDhw5LN6L4wuasbPO1g0lVDwY6bkGuIG4jg==", "requires": { - "@blueprintjs/core": "^4.20.1", - "@blueprintjs/datetime": "^4.4.36", - "@blueprintjs/popover2": "^1.14.9", - "@blueprintjs/select": "^4.9.22", + "@blueprintjs/core": "^5.10.5", + "@blueprintjs/datetime": "^5.3.7", + "@blueprintjs/icons": "^5.10.0", "classnames": "^2.3.1", "date-fns": "^2.28.0", - "date-fns-tz": "^1.3.7", - "lodash": "^4.17.21", - "tslib": "~2.5.0" + "react-day-picker": "^8.10.0", + "react-innertext": "^1.1.5", + "tslib": "~2.6.2" + }, + "dependencies": { + "react-day-picker": { + "version": "8.10.1", + "resolved": "https://registry.npmjs.org/react-day-picker/-/react-day-picker-8.10.1.tgz", + "integrity": "sha512-TMx7fNbhLk15eqcMt+7Z7S2KF7mfTId/XJDjKE8f+IUcFn0l08/kI4FiYTL/0yuOLmEcbR4Fwe3GJf/NiiMnPA==" + } } }, "@blueprintjs/icons": { - "version": "4.16.0", - "resolved": "https://registry.npmjs.org/@blueprintjs/icons/-/icons-4.16.0.tgz", - "integrity": "sha512-cyfgjUZcZCtQrXWUV8FwqYTFEzduV4a0N7yhOU38jY+cBRCLu/sDrD0Osvfk4DGRvNe4YjY7pohVLFSxpg68Uw==", + "version": "5.10.0", + "resolved": "https://registry.npmjs.org/@blueprintjs/icons/-/icons-5.10.0.tgz", + "integrity": "sha512-Qp9H2U2/m6+p0Lh9ACuF2O6o0uVINMFimo+EgasgGaLx8SkJsl7ApB3hYQ+iRSYlQWotnoqd4Vtzj4c7sKukHQ==", "requires": { "change-case": "^4.1.2", "classnames": "^2.3.1", - "tslib": "~2.5.0" - } - }, - "@blueprintjs/popover2": { - "version": "1.14.11", - "resolved": "https://registry.npmjs.org/@blueprintjs/popover2/-/popover2-1.14.11.tgz", - "integrity": "sha512-5XAjeb2mlWjYXC0pqrNDLzHSsX85Zaiv8jixxUN9abarMUUFKGATgGF8MRsWTLAW94Gli6CB1lzVkrYkRHHf6Q==", - "requires": { - "@blueprintjs/core": "^4.20.2", - "@juggle/resize-observer": "^3.4.0", - "@popperjs/core": "^2.11.7", - "classnames": "^2.3.1", - "dom4": "^2.1.5", - "react-popper": "^2.3.0", - "tslib": "~2.5.0" + "tslib": "~2.6.2" } }, "@blueprintjs/select": { - "version": "4.9.24", - "resolved": "https://registry.npmjs.org/@blueprintjs/select/-/select-4.9.24.tgz", - "integrity": "sha512-OTjesxH/7UZvM7yAdHJ5u3sIjX1N8Rs4CQQ22AfqNl82SIROqkuXI31XEl6YNX1GsYfmAMiw0K7XohEKOMXR5g==", + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/@blueprintjs/select/-/select-5.2.1.tgz", + "integrity": "sha512-rXM9ik2mLd394g+sxwbHv2bGfrLbcdY9gFftqmJmm3vu7XJ2kRrsC1oOlNSC4dNBpUdHnyAzBTHEu81B1LkRbQ==", "requires": { - "@blueprintjs/core": "^4.20.2", - "@blueprintjs/popover2": "^1.14.11", + "@blueprintjs/core": "^5.10.5", + "@blueprintjs/icons": "^5.10.0", "classnames": "^2.3.1", - "tslib": "~2.5.0" + "tslib": "~2.6.2" } }, "@cspotcode/source-map-support": { @@ -19374,15 +19321,6 @@ "integrity": "sha512-ZnQMnLV4e7hDlUvw8H+U8ASL02SS2Gn6+9Ac3wGGLIe7+je2AeAOxPY+izIPJDfFDb7eDjev0Us8MO1iFRN8hA==", "dev": true }, - "@hypnosphi/create-react-context": { - "version": "0.3.1", - "resolved": "https://registry.npmjs.org/@hypnosphi/create-react-context/-/create-react-context-0.3.1.tgz", - "integrity": "sha512-V1klUed202XahrWJLLOT3EXNeCpFHCcJntdFGI15ntCwau+jfT386w7OFTMaCqOgXUH1fa0w/I1oZs+i/Rfr0A==", - "requires": { - "gud": "^1.0.0", - "warning": "^4.0.3" - } - }, "@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -20379,11 +20317,6 @@ "integrity": "sha512-9MVYlmIgmRR31C5b4FVSWtuMmBHh2mOWQYfl7XAYOa8dsnb7iEmUmRSWSFgXFtkjxO65d7hTUHQC+RhR/9IWFg==", "dev": true }, - "@types/dom4": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/@types/dom4/-/dom4-2.0.2.tgz", - "integrity": "sha512-Rt4IC1T7xkCWa0OG1oSsPa0iqnxlDeQqKXZAHrQGLb7wFGncWm85MaxKUjAGejOrUynOgWlFi4c6S6IyJwoK4g==" - }, "@types/enzyme": { "version": "3.10.17", "resolved": "https://registry.npmjs.org/@types/enzyme/-/enzyme-3.10.17.tgz", @@ -21905,6 +21838,7 @@ "version": "1.0.2", "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz", "integrity": "sha512-7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA==", + "dev": true, "requires": { "function-bind": "^1.1.1", "get-intrinsic": "^1.0.2" @@ -22706,9 +22640,9 @@ } }, "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==" + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/date-fns-tz/-/date-fns-tz-2.0.1.tgz", + "integrity": "sha512-fJCG3Pwx8HUoLhkepdsP7Z5RsucUi+ZBOxyM5d0ZZ6c4SdYustq0VMmOu6Wf7bli+yS/Jwp91TOCqn9jMcVrUA==" }, "debounce": { "version": "1.2.1", @@ -22759,19 +22693,6 @@ "integrity": "sha512-+LxW+KLWxu3HW3M2w2ympwtqPrqYRzU8fqi6Fhd18fBALe15blJPI/I4+UHveMVG6lJqB4JNd4UG0S5cnVHwIg==", "dev": true }, - "deep-equal": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.1.1.tgz", - "integrity": "sha512-yd9c5AdiqVcR+JjcwUQb9DkhJc8ngNr0MahEBGvDiJw8puWab2yZlh+nkasOnZP+EGTAP6rRp2JzJhJZzvNF8g==", - "requires": { - "is-arguments": "^1.0.4", - "is-date-object": "^1.0.1", - "is-regex": "^1.0.4", - "object-is": "^1.0.1", - "object-keys": "^1.1.1", - "regexp.prototype.flags": "^1.2.0" - } - }, "deep-is": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", @@ -22803,6 +22724,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.0.tgz", "integrity": "sha512-xvqAVKGfT1+UAvPwKTVw/njhdQ8ZhXK4lI0bCIuCMrp2up9nPnaDftrLtmpTazqd1o+UY4zgzU+avtMbDP+ldA==", + "dev": true, "requires": { "has-property-descriptors": "^1.0.0", "object-keys": "^1.1.1" @@ -22921,11 +22843,6 @@ "entities": "^1.1.1" } }, - "dom4": { - "version": "2.1.6", - "resolved": "https://registry.npmjs.org/dom4/-/dom4-2.1.6.tgz", - "integrity": "sha512-JkCVGnN4ofKGbjf5Uvc8mmxaATIErKQKSgACdBXpsQ3fY6DlIpAyWfiBSrGkttATssbDCp3psiAKWXk5gmjycA==" - }, "domelementtype": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.1.tgz", @@ -24312,7 +24229,8 @@ "functions-have-names": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", - "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==" + "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", + "dev": true }, "gensync": { "version": "1.0.0-beta.2", @@ -24330,6 +24248,7 @@ "version": "1.2.0", "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.2.0.tgz", "integrity": "sha512-L049y6nFOuom5wGyRc3/gdTLO94dySVKRACj1RmJZBQXlbTMhtNIgkWkUHq+jYmZvKf14EW1EoJnnjbmoHij0Q==", + "dev": true, "requires": { "function-bind": "^1.1.1", "has": "^1.0.3", @@ -24458,11 +24377,6 @@ "integrity": "sha512-bzh50DW9kTPM00T8y4o8vQg89Di9oLJVLW/KaOGIXJWP/iqCN6WKYkbNOF04vFLJhwcpYUh9ydh/+5vpOqV4YQ==", "dev": true }, - "gud": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/gud/-/gud-1.0.0.tgz", - "integrity": "sha512-zGEOVKFM5sVPPrYs7J5/hYEw2Pof8KCyOwyhG8sAF26mCAeUFAcYPu1mwB7hhpIP29zOIBaDqwuHdLp0jvZXjw==" - }, "gzip-size": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz", @@ -24518,6 +24432,7 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz", "integrity": "sha512-62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ==", + "dev": true, "requires": { "get-intrinsic": "^1.1.1" } @@ -24531,12 +24446,14 @@ "has-symbols": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz", - "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==" + "integrity": "sha512-l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A==", + "dev": true }, "has-tostringtag": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz", "integrity": "sha512-kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ==", + "dev": true, "requires": { "has-symbols": "^1.0.2" } @@ -24965,6 +24882,7 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.1.1.tgz", "integrity": "sha512-8Q7EARjzEnKpt/PCD7e1cgUS0a6X8u5tdSiMqXhojOdoV9TsMsiO+9VLC5vAmO8N7/GmXn7yjR8qnA6bVAEzfA==", + "dev": true, "requires": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -25047,6 +24965,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.5.tgz", "integrity": "sha512-9YQaSxsAiSwcvS33MBk3wTCVnWK+HhF8VZR2jRxehM16QcVOdHqPn4VPHmRK4lSr38n9JriurInLcP90xsYNfQ==", + "dev": true, "requires": { "has-tostringtag": "^1.0.0" } @@ -25142,6 +25061,7 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz", "integrity": "sha512-kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg==", + "dev": true, "requires": { "call-bind": "^1.0.2", "has-tostringtag": "^1.0.0" @@ -27159,7 +27079,8 @@ "lodash": { "version": "4.17.21", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==" + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "dev": true }, "lodash.debounce": { "version": "4.0.8", @@ -27787,6 +27708,7 @@ "version": "1.1.5", "resolved": "https://registry.npmjs.org/object-is/-/object-is-1.1.5.tgz", "integrity": "sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==", + "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.1.3" @@ -27795,7 +27717,8 @@ "object-keys": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==" + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true }, "object.assign": { "version": "4.1.4", @@ -28136,11 +28059,6 @@ "integrity": "sha512-Nc3IT5yHzflTfbjgqWcCPpo7DaKy4FnpB0l/zCAW0Tc7jxAiuqSxHasntB3D7887LSrA93kDJ9IXovxJYxyLCA==", "dev": true }, - "popper.js": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/popper.js/-/popper.js-1.16.1.tgz", - "integrity": "sha512-Wb4p1J4zyFTbM+u6WuO4XstYx4Ky9Cewe4DWrel7B0w6VVICvPwdOpotjzcf6eD8TsckVnIMNONQyPIUFOUbCQ==" - }, "postcss": { "version": "8.4.31", "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.31.tgz", @@ -29525,6 +29443,11 @@ "resolved": "https://registry.npmjs.org/react-fast-compare/-/react-fast-compare-3.2.2.tgz", "integrity": "sha512-nsO+KSNgo1SbJqJEYRE9ERzo7YtYbou/OqjSQKxV7jcKox7+usiUVZOAC+XnDOABXggQTno0Y1CpVnuWEc1boQ==" }, + "react-innertext": { + "version": "1.1.5", + "resolved": "https://registry.npmjs.org/react-innertext/-/react-innertext-1.1.5.tgz", + "integrity": "sha512-PWAqdqhxhHIv80dT9znP2KvS+hfkbRovFp4zFYHFFlOoQLRiawIic81gKb3U1wEyJZgMwgs3JoLtwryASRWP3Q==" + }, "react-is": { "version": "16.8.6", "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.8.6.tgz", @@ -29611,6 +29534,14 @@ "prop-types": "^15.6.2" } }, + "react-uid": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/react-uid/-/react-uid-2.3.3.tgz", + "integrity": "sha512-iNpDovcb9qBpBTo8iUgqRSQOS8GV3bWoNaTaUptHkXtAooXSo0OWe7vN6TqqB8x3x0bNBbQx96kkmSltQ5h9kQ==", + "requires": { + "tslib": "^2.0.0" + } + }, "read-installed": { "version": "4.0.3", "resolved": "https://registry.npmjs.org/read-installed/-/read-installed-4.0.3.tgz", @@ -29752,6 +29683,7 @@ "version": "1.5.0", "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.0.tgz", "integrity": "sha512-0SutC3pNudRKgquxGoRGIz946MZVHqbNfPjBdxeOhBrdgDKlRoXmYLQN9xRbrR09ZXWeGAdPuif7egofn6v5LA==", + "dev": true, "requires": { "call-bind": "^1.0.2", "define-properties": "^1.2.0", @@ -31384,9 +31316,9 @@ } }, "tslib": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.5.3.tgz", - "integrity": "sha512-mSxlJJwl3BMEQCUNnxXBU9jP4JBktcEGhURcPR6VQVlnP0FdDEsIaz0C35dXNGLyRfrATNofF0F5p2KPxQgB+w==" + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.6.3.tgz", + "integrity": "sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ==" }, "tsutils": { "version": "3.21.0", @@ -31447,11 +31379,6 @@ "is-typed-array": "^1.1.9" } }, - "typed-styles": { - "version": "0.0.7", - "resolved": "https://registry.npmjs.org/typed-styles/-/typed-styles-0.0.7.tgz", - "integrity": "sha512-pzP0PWoZUhsECYjABgCGQlRGL1n7tOHsgwYv3oIiEpJwGhFTuty/YNeduxQYzXXa3Ge5BdT6sHYIQYpl4uJ+5Q==" - }, "typedarray-to-buffer": { "version": "3.1.5", "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", diff --git a/web-console/package.json b/web-console/package.json index 6e38ba24684..b45b1bdb865 100644 --- a/web-console/package.json +++ b/web-console/package.json @@ -63,12 +63,11 @@ "not ie 11" ], "dependencies": { - "@blueprintjs/core": "^4.20.1", - "@blueprintjs/datetime": "^4.4.36", - "@blueprintjs/datetime2": "^0.9.35", - "@blueprintjs/icons": "^4.16.0", - "@blueprintjs/popover2": "^1.14.9", - "@blueprintjs/select": "^4.9.24", + "@blueprintjs/core": "^5.10.5", + "@blueprintjs/datetime": "^5.3.6", + "@blueprintjs/datetime2": "^2.3.7", + "@blueprintjs/icons": "^5.10.0", + "@blueprintjs/select": "^5.2.1", "@druid-toolkit/query": "^0.22.20", "@druid-toolkit/visuals-core": "^0.3.3", "@druid-toolkit/visuals-react": "^0.3.3", @@ -83,6 +82,7 @@ "d3-dsv": "^2.0.0", "d3-scale": "^3.3.0", "d3-selection": "^2.0.0", + "date-fns": "^2.28.0", "echarts": "^5.4.3", "file-saver": "^2.0.5", "fontsource-open-sans": "^3.0.9", diff --git a/web-console/src/blueprint-overrides/_index.scss b/web-console/src/blueprint-overrides/_index.scss index c345d815b80..1f5c774dfce 100644 --- a/web-console/src/blueprint-overrides/_index.scss +++ b/web-console/src/blueprint-overrides/_index.scss @@ -25,3 +25,4 @@ @import 'components/navbar/navbar'; @import 'components/card/card'; @import 'special-switch-modes'; +@import 'segmented-control'; diff --git a/web-console/src/components/date-range-selector/date-range-selector.scss b/web-console/src/blueprint-overrides/_segmented-control.scss similarity index 84% rename from web-console/src/components/date-range-selector/date-range-selector.scss rename to web-console/src/blueprint-overrides/_segmented-control.scss index 39df4d75f2a..8382d04a198 100644 --- a/web-console/src/components/date-range-selector/date-range-selector.scss +++ b/web-console/src/blueprint-overrides/_segmented-control.scss @@ -16,14 +16,7 @@ * limitations under the License. */ -@import '../../variables'; - -.date-range-selector { - .#{$bp-ns}-popover-target { - display: block; - } - - * { - cursor: pointer; - } +// Adding div explicitly to make this selector slightly stronger +.#{$ns}-dark div.#{$ns}-segmented-control { + background-color: $dark-gray3-half; } diff --git a/web-console/src/blueprint-overrides/_special-switch-modes.scss b/web-console/src/blueprint-overrides/_special-switch-modes.scss index 267ac4a2726..0d4c3928a27 100644 --- a/web-console/src/blueprint-overrides/_special-switch-modes.scss +++ b/web-console/src/blueprint-overrides/_special-switch-modes.scss @@ -16,23 +16,23 @@ * limitations under the License. */ -.bp4-dark .bp4-switch.bp4-control { +.#{$ns}-dark .#{$ns}-switch.#{$ns}-control { &.legacy-switch { - input:checked ~ .bp4-control-indicator { + input:checked ~ .#{$ns}-control-indicator { background: $orange5; } - &:hover input:checked ~ .bp4-control-indicator { + &:hover input:checked ~ .#{$ns}-control-indicator { background: $orange2; } } &.danger-switch { - input:checked ~ .bp4-control-indicator { + input:checked ~ .#{$ns}-control-indicator { background: $red5; } - &:hover input:checked ~ .bp4-control-indicator { + &:hover input:checked ~ .#{$ns}-control-indicator { background: $red2; } } diff --git a/web-console/src/blueprint-overrides/common/_colors.scss b/web-console/src/blueprint-overrides/common/_colors.scss index ca10be55628..a3286230217 100644 --- a/web-console/src/blueprint-overrides/common/_colors.scss +++ b/web-console/src/blueprint-overrides/common/_colors.scss @@ -23,6 +23,7 @@ $black: #0f1320; // Changed $dark-gray1: #181c2d; // Changed $dark-gray2: #24283b; $dark-gray3: #2f344e; +$dark-gray3-half: #343953; $dark-gray4: #383d57; $dark-gray5: #414765; diff --git a/web-console/src/blueprint-overrides/common/_variables.scss b/web-console/src/blueprint-overrides/common/_variables.scss index 1c3695693d0..d3fa168cbc3 100644 --- a/web-console/src/blueprint-overrides/common/_variables.scss +++ b/web-console/src/blueprint-overrides/common/_variables.scss @@ -20,7 +20,7 @@ // Namespace appended to the beginning of each CSS class: `.#{$ns}-button`. // Do not quote this value, for Less consumers. -$ns: bp4; +$ns: bp5; // easily the most important variable, so it comes up top // (so other variables can use it to define themselves) diff --git a/web-console/src/components/action-cell/__snapshots__/action-cell.spec.tsx.snap b/web-console/src/components/action-cell/__snapshots__/action-cell.spec.tsx.snap index a5bdd46adf1..4af64af7f53 100644 --- a/web-console/src/components/action-cell/__snapshots__/action-cell.spec.tsx.snap +++ b/web-console/src/components/action-cell/__snapshots__/action-cell.spec.tsx.snap @@ -6,8 +6,7 @@ exports[`ActionCell matches snapshot 1`] = ` >