From 75cbb1783dcb453f46ffc86ddc909fcb1b0c212f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ida=20=C5=A0tambuk?= Date: Wed, 8 Feb 2023 18:04:19 +0100 Subject: [PATCH 1/4] Add Query Editor Header component --- .gitignore | 3 +- package.json | 12 +- src/index.ts | 2 +- .../QueryEditor/QueryEditorHeader.test.tsx | 29 + src/sql/QueryEditor/QueryEditorHeader.tsx | 63 ++ src/sql/QueryEditor/index.ts | 1 + yarn.lock | 758 ++++++++++++------ 7 files changed, 627 insertions(+), 241 deletions(-) create mode 100644 src/sql/QueryEditor/QueryEditorHeader.test.tsx create mode 100644 src/sql/QueryEditor/QueryEditorHeader.tsx diff --git a/.gitignore b/.gitignore index 920dff8..d3adfb6 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,5 @@ cypress/videos/ dist/ compiled/ yarn-error.log -.idea/ \ No newline at end of file +.idea/ +.DS_Store diff --git a/package.json b/package.json index 4c02027..ba875a1 100644 --- a/package.json +++ b/package.json @@ -26,11 +26,15 @@ "repository": "github:grafana/grafana-aws-sdk-react", "author": "Grafana Labs (https://grafana.com)", "license": "Apache-2.0", - "dependencies": {}, + "dependencies": { + "@grafana/async-query-data": "0.1.4", + "@grafana/experimental": "1.1.0" + }, "devDependencies": { - "@grafana/data": "9.2.3", - "@grafana/toolkit": "9.2.3", - "@grafana/ui": "9.2.3", + "@grafana/data": "9.3.2", + "@grafana/runtime": "9.3.6", + "@grafana/toolkit": "9.3.2", + "@grafana/ui": "9.3.2", "@rollup/plugin-node-resolve": "^15.0.1", "@testing-library/jest-dom": "5.16.5", "@testing-library/react": "12.1.5", diff --git a/src/index.ts b/src/index.ts index 3f35372..c488604 100644 --- a/src/index.ts +++ b/src/index.ts @@ -3,7 +3,7 @@ export { SIGV4ConnectionConfig } from './SIGV4ConnectionConfig'; export { ConfigSelect, InlineInput } from './sql/ConfigEditor'; export { ResourceSelector, type ResourceSelectorProps } from './sql/ResourceSelector'; export { type SQLQuery } from './sql/types'; -export { QueryCodeEditor, FormatSelect, FillValueSelect, FillValueOptions } from './sql/QueryEditor'; +export { QueryEditorHeader, QueryCodeEditor, FormatSelect, FillValueSelect, FillValueOptions } from './sql/QueryEditor'; export * from './sql/utils'; export * from './types'; export * from './regions'; diff --git a/src/sql/QueryEditor/QueryEditorHeader.test.tsx b/src/sql/QueryEditor/QueryEditorHeader.test.tsx new file mode 100644 index 0000000..27065a2 --- /dev/null +++ b/src/sql/QueryEditor/QueryEditorHeader.test.tsx @@ -0,0 +1,29 @@ +import '@testing-library/jest-dom/extend-expect'; +import React from 'react'; +import { render, screen } from '@testing-library/react'; +import { mockQuery } from './__mocks__/query'; +import { Props as QueryEditorHeaderProps, QueryEditorHeader } from './QueryEditorHeader'; +import { DataQuery, DataSourceApi, DataSourceJsonData } from '@grafana/data'; +import { RunQueryButtons } from '@grafana/async-query-data'; + +const props: QueryEditorHeaderProps = { + query: mockQuery, + onChange: jest.fn(), + onRunQuery: jest.fn(), + enableRunButton: false, + datasource: {} as DataSourceApi, +}; +jest.mock('@grafana/async-query-data', () => ({ + RunQueryButtons: jest.fn(() =>
Buttons
), +})); + +describe('QueryEditorHeader', () => { + it('should display RunQueryButtons if showAsyncQueryButtons prop is true', async () => { + render(); + expect(RunQueryButtons).toHaveBeenCalled(); + }); + it('should display the run button if showAsyncQueryButtons prop is false', async () => { + render(); + expect(screen.getByText('Run query')).toBeInTheDocument(); + }); +}); diff --git a/src/sql/QueryEditor/QueryEditorHeader.tsx b/src/sql/QueryEditor/QueryEditorHeader.tsx new file mode 100644 index 0000000..baef965 --- /dev/null +++ b/src/sql/QueryEditor/QueryEditorHeader.tsx @@ -0,0 +1,63 @@ +import React from 'react'; + +import { DataQuery, DataSourceApi, DataSourceJsonData, LoadingState, QueryEditorProps } from '@grafana/data'; +import { EditorHeader, FlexItem } from '@grafana/experimental'; +import { Button } from '@grafana/ui'; +import { RunQueryButtons } from '@grafana/async-query-data'; + +export interface Props< + Datasource extends DataSourceApi, + TQuery extends DataQuery, + JsonData extends DataSourceJsonData +> extends QueryEditorProps { + showAsyncQueryButtons?: boolean; + extraHeaderElementLeft?: JSX.Element; + extraHeaderElementRight?: JSX.Element; + enableRunButton: boolean; + cancel?: (target: TQuery) => void; + onRunQuery: () => void; +} + +export function QueryEditorHeader< + Datasource extends DataSourceApi, + TQuery extends DataQuery, + JsonData extends DataSourceJsonData +>({ + query, + showAsyncQueryButtons, + extraHeaderElementLeft, + extraHeaderElementRight, + enableRunButton, + onRunQuery, + data, + cancel, +}: Props): JSX.Element { + return ( + <> + + {extraHeaderElementLeft} + + {showAsyncQueryButtons ? ( + + ) : ( + + )} + {extraHeaderElementRight} + + + ); +} diff --git a/src/sql/QueryEditor/index.ts b/src/sql/QueryEditor/index.ts index 4fc1374..5539146 100644 --- a/src/sql/QueryEditor/index.ts +++ b/src/sql/QueryEditor/index.ts @@ -1,3 +1,4 @@ export { QueryCodeEditor } from './QueryCodeEditor'; +export { QueryEditorHeader } from './QueryEditorHeader'; export { FormatSelect } from './FormatSelect'; export { FillValueSelect, FillValueOptions } from './FillValueSelect'; diff --git a/yarn.lock b/yarn.lock index 6be1cd7..027ff47 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1015,13 +1015,20 @@ "@babel/helper-validator-option" "^7.18.6" "@babel/plugin-transform-typescript" "^7.18.6" -"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.13.10", "@babel/runtime@^7.15.4", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": +"@babel/runtime@^7.0.0", "@babel/runtime@^7.1.2", "@babel/runtime@^7.10.1", "@babel/runtime@^7.11.1", "@babel/runtime@^7.11.2", "@babel/runtime@^7.12.0", "@babel/runtime@^7.12.13", "@babel/runtime@^7.12.5", "@babel/runtime@^7.15.4", "@babel/runtime@^7.18.3", "@babel/runtime@^7.20.0", "@babel/runtime@^7.5.5", "@babel/runtime@^7.6.2", "@babel/runtime@^7.8.4", "@babel/runtime@^7.8.7", "@babel/runtime@^7.9.2": version "7.20.6" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.6.tgz#facf4879bfed9b5326326273a64220f099b0fce3" integrity sha512-Q+8MqP7TiHMWzSfwiJwXCjyf4GYA4Dgw3emg/7xmwsdLJOZUp+nMqcOwOzzYheuM1rhDu8FSj2l0aoMygEuXuA== dependencies: regenerator-runtime "^0.13.11" +"@babel/runtime@^7.20.6": + version "7.20.13" + resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.20.13.tgz#7055ab8a7cff2b8f6058bf6ae45ff84ad2aded4b" + integrity sha512-gt3PKXs0DBoL9xCvOIIZ2NEqAGZqHjAnmVbfQtB620V0uReIQutpel14KcneZuer7UioY8ALKZ7iocavvzTNFA== + dependencies: + regenerator-runtime "^0.13.11" + "@babel/template@^7.18.10", "@babel/template@^7.18.6", "@babel/template@^7.3.3": version "7.18.10" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.18.10.tgz#6f9134835970d1dbf0835c0d100c9f38de0c5e71" @@ -1061,10 +1068,10 @@ resolved "https://registry.yarnpkg.com/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz#75a2e8b51cb758a7553d6804a5932d7aace75c39" integrity sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw== -"@braintree/sanitize-url@6.0.0": - version "6.0.0" - resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-6.0.0.tgz#fe364f025ba74f6de6c837a84ef44bdb1d61e68f" - integrity sha512-mgmE7XBYY/21erpzhexk4Cj1cyTQ9LzvnTxtzM17BJ7ERMNE6W72mQRo0I1Ud8eFJ+RVVIcBNhLFZ3GX4XFz5w== +"@braintree/sanitize-url@6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/@braintree/sanitize-url/-/sanitize-url-6.0.1.tgz#45ff061b9ded1c6e4474b33b336ebb1b986b825a" + integrity sha512-zr9Qs9KFQiEvMWdZesjcmRJlUck5NR+eKGS1uyKk+oYTWwlYrsoPEi6VmG6/TzBD1hKCGEimrhTgGS6hvn/xIQ== "@csstools/postcss-color-function@^1.0.3": version "1.1.1" @@ -1131,7 +1138,7 @@ resolved "https://registry.yarnpkg.com/@csstools/selector-specificity/-/selector-specificity-2.0.2.tgz#1bfafe4b7ed0f3e4105837e056e0a89b108ebe36" integrity sha512-IkpVW/ehM1hWKln4fCA3NzJU8KwD+kIOvPZA4cqxoJHtE21CCzjyp+Kxbu0i5I4tBNOlXPL9mjwnWlL0VEG4Fg== -"@emotion/babel-plugin@^11.10.5", "@emotion/babel-plugin@^11.7.1": +"@emotion/babel-plugin@^11.10.5": version "11.10.5" resolved "https://registry.yarnpkg.com/@emotion/babel-plugin/-/babel-plugin-11.10.5.tgz#65fa6e1790ddc9e23cc22658a4c5dea423c55c3c" integrity sha512-xE7/hyLHJac7D2Ve9dKroBBZqBT7WuPQmWcq7HSGb84sUuP4mlOWoB8dvVfD9yk5DHkU1m6RW7xSoDtnQHNQeA== @@ -1149,7 +1156,7 @@ source-map "^0.5.7" stylis "4.1.3" -"@emotion/cache@^11.10.5", "@emotion/cache@^11.4.0", "@emotion/cache@^11.7.1", "@emotion/cache@^11.9.3": +"@emotion/cache@^11.10.5", "@emotion/cache@^11.4.0": version "11.10.5" resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.10.5.tgz#c142da9351f94e47527ed458f7bbbbe40bb13c12" integrity sha512-dGYHWyzTdmK+f2+EnIGBpkz1lKc4Zbj2KHd4cX3Wi8/OWr5pKslNjc3yABKH4adRGCvSX4VDC0i04mrrq0aiRA== @@ -1160,16 +1167,16 @@ "@emotion/weak-memoize" "^0.3.0" stylis "4.1.3" -"@emotion/css@11.9.0": - version "11.9.0" - resolved "https://registry.yarnpkg.com/@emotion/css/-/css-11.9.0.tgz#d5aeaca5ed19fc61cbdc9e032ad0b32fa6e366be" - integrity sha512-S9UjCxSrxEHawOLnWw4upTwfYKb0gVQdatHejn3W9kPyXxmKv3HmjVfJ84kDLmdX8jR20OuDQwaJ4Um24qD9vA== +"@emotion/css@11.10.5": + version "11.10.5" + resolved "https://registry.yarnpkg.com/@emotion/css/-/css-11.10.5.tgz#ca01bb83ce60517bc3a5c01d27ccf552fed84d9d" + integrity sha512-maJy0wG82hWsiwfJpc3WrYsyVwUbdu+sdIseKUB+/OLjB8zgc3tqkT6eO0Yt0AhIkJwGGnmMY/xmQwEAgQ4JHA== dependencies: - "@emotion/babel-plugin" "^11.7.1" - "@emotion/cache" "^11.7.1" - "@emotion/serialize" "^1.0.3" - "@emotion/sheet" "^1.0.3" - "@emotion/utils" "^1.0.0" + "@emotion/babel-plugin" "^11.10.5" + "@emotion/cache" "^11.10.5" + "@emotion/serialize" "^1.1.1" + "@emotion/sheet" "^1.2.1" + "@emotion/utils" "^1.2.0" "@emotion/hash@^0.9.0": version "0.9.0" @@ -1181,20 +1188,7 @@ resolved "https://registry.yarnpkg.com/@emotion/memoize/-/memoize-0.8.0.tgz#f580f9beb67176fa57aae70b08ed510e1b18980f" integrity sha512-G/YwXTkv7Den9mXDO7AhLWkE3q+I92B+VqAE+dYG4NGPaHZGvt3G8Q0p9vmE+sq7rTGphUbAvmQ9YpbfMQGGlA== -"@emotion/react@11.9.3": - version "11.9.3" - resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.9.3.tgz#f4f4f34444f6654a2e550f5dab4f2d360c101df9" - integrity sha512-g9Q1GcTOlzOEjqwuLF/Zd9LC+4FljjPjDfxSM7KmEakm+hsHXk+bYZ2q+/hTJzr0OUNkujo72pXLQvXj6H+GJQ== - dependencies: - "@babel/runtime" "^7.13.10" - "@emotion/babel-plugin" "^11.7.1" - "@emotion/cache" "^11.9.3" - "@emotion/serialize" "^1.0.4" - "@emotion/utils" "^1.1.0" - "@emotion/weak-memoize" "^0.2.5" - hoist-non-react-statics "^3.3.1" - -"@emotion/react@^11.8.1": +"@emotion/react@11.10.5", "@emotion/react@^11.8.1": version "11.10.5" resolved "https://registry.yarnpkg.com/@emotion/react/-/react-11.10.5.tgz#95fff612a5de1efa9c0d535384d3cfa115fe175d" integrity sha512-TZs6235tCJ/7iF6/rvTaOH4oxQg2gMAcdHemjwLKIjKz4rRuYe1HJ2TQJKnAcRAfOUDdU8XoDadCe1rl72iv8A== @@ -1208,7 +1202,7 @@ "@emotion/weak-memoize" "^0.3.0" hoist-non-react-statics "^3.3.1" -"@emotion/serialize@^1.0.3", "@emotion/serialize@^1.0.4", "@emotion/serialize@^1.1.1": +"@emotion/serialize@^1.1.1": version "1.1.1" resolved "https://registry.yarnpkg.com/@emotion/serialize/-/serialize-1.1.1.tgz#0595701b1902feded8a96d293b26be3f5c1a5cf0" integrity sha512-Zl/0LFggN7+L1liljxXdsVSVlg6E/Z/olVWpfxUTxOAmi8NU7YoeWeLfi1RmnB2TATHoaWwIBRoL+FvAJiTUQA== @@ -1219,7 +1213,7 @@ "@emotion/utils" "^1.2.0" csstype "^3.0.2" -"@emotion/sheet@^1.0.3", "@emotion/sheet@^1.2.1": +"@emotion/sheet@^1.2.1": version "1.2.1" resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.2.1.tgz#0767e0305230e894897cadb6c8df2c51e61a6c2c" integrity sha512-zxRBwl93sHMsOj4zs+OslQKg/uhF38MB+OMKoCrVuS0nyTkqnau+BM3WGEoOptg9Oz45T/aIGs1qbVAsEFo3nA== @@ -1234,16 +1228,11 @@ resolved "https://registry.yarnpkg.com/@emotion/use-insertion-effect-with-fallbacks/-/use-insertion-effect-with-fallbacks-1.0.0.tgz#ffadaec35dbb7885bd54de3fa267ab2f860294df" integrity sha512-1eEgUGmkaljiBnRMTdksDV1W4kUnmwgp7X9G8B++9GYwl1lUdqSndSriIrTJ0N7LQaoauY9JJ2yhiOYK5+NI4A== -"@emotion/utils@^1.0.0", "@emotion/utils@^1.1.0", "@emotion/utils@^1.2.0": +"@emotion/utils@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@emotion/utils/-/utils-1.2.0.tgz#9716eaccbc6b5ded2ea5a90d65562609aab0f561" integrity sha512-sn3WH53Kzpw8oQ5mgMmIzzyAaH2ZqFEbozVVBSYp538E06OSE6ytOp7pRAjNQR+Q/orwqdQYJSe2m3hCOeznkw== -"@emotion/weak-memoize@^0.2.5": - version "0.2.5" - resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.2.5.tgz#8eed982e2ee6f7f4e44c253e12962980791efd46" - integrity sha512-6U71C2Wp7r5XtFtQzYrW5iKFT67OixrSxjI4MptCHzdSVlgabczzqLe0ZSgnub/5Kp4hSbpDB1tMytZY9pwxxA== - "@emotion/weak-memoize@^0.3.0": version "0.3.0" resolved "https://registry.yarnpkg.com/@emotion/weak-memoize/-/weak-memoize-0.3.0.tgz#ea89004119dc42db2e1dba0f97d553f7372f6fcb" @@ -1383,6 +1372,18 @@ minimatch "^3.1.2" strip-json-comments "^3.1.1" +"@floating-ui/core@^1.2.0": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@floating-ui/core/-/core-1.2.0.tgz#ae7ae7923d41f3d84cb2fd88740a89436610bbec" + integrity sha512-GHUXPEhMEmTpnpIfesFA2KAoMJPb1SPQw964tToQwt+BbGXdhqTCWT1rOb0VURGylsxsYxiGMnseJ3IlclVpVA== + +"@floating-ui/dom@^1.0.1": + version "1.2.0" + resolved "https://registry.yarnpkg.com/@floating-ui/dom/-/dom-1.2.0.tgz#a60212069cc58961c478037c30eba4b191c75316" + integrity sha512-QXzg57o1cjLz3cGETzKXjI3kx1xyS49DW9l7kV2jw2c8Yftd434t2hllX0sVGn2Q8MtcW/4pNm8bfE1/4n6mng== + dependencies: + "@floating-ui/core" "^1.2.0" + "@formatjs/ecma402-abstract@1.14.3": version "1.14.3" resolved "https://registry.yarnpkg.com/@formatjs/ecma402-abstract/-/ecma402-abstract-1.14.3.tgz#6428f243538a11126180d121ce8d4b2f17465738" @@ -1422,40 +1423,82 @@ dependencies: tslib "^2.4.0" -"@grafana/data@9.2.3": - version "9.2.3" - resolved "https://registry.yarnpkg.com/@grafana/data/-/data-9.2.3.tgz#ef8fcbb3de75a3e24dc65419beceae2125b2d052" - integrity sha512-2gTStevikAAlOIlFE00fTf/6qQxtqpDjIIUDAhv1u0TqM9+R8wJX0vQSGUdW3LQ/EgtoW5uMGAK4ehiOnDhpOg== +"@grafana/async-query-data@0.1.4": + version "0.1.4" + resolved "https://registry.yarnpkg.com/@grafana/async-query-data/-/async-query-data-0.1.4.tgz#ac24e32822a8032dd1ee10ce7dcb8c2e276c58b0" + integrity sha512-3d7fm2sf5x/+JKTt4T6MSS/veB2J/YGfQp5Ck0Tbqtc5YIoI0p1JY+vFWfCstEHyVd1H0Ep/q/VSxf4VAs9YKQ== + dependencies: + tslib "^2.4.1" + +"@grafana/data@9.3.2": + version "9.3.2" + resolved "https://registry.yarnpkg.com/@grafana/data/-/data-9.3.2.tgz#90b80f6e720d8fcd243cfb5e3401a8edaffc3514" + integrity sha512-LZke9PndJZs0//AGNhdWbvpPP6pZBgSAmkREbMKAII6jEBcWfJ51+aCn/S97ioIlenXwcmiSU01P0HQvc652vA== dependencies: - "@braintree/sanitize-url" "6.0.0" - "@grafana/schema" "9.2.3" + "@braintree/sanitize-url" "6.0.1" + "@grafana/schema" "9.3.2" "@types/d3-interpolate" "^1.4.0" d3-interpolate "1.4.0" - date-fns "2.29.1" + date-fns "2.29.3" eventemitter3 "4.0.7" fast_array_intersect "1.1.0" history "4.10.1" lodash "4.17.21" - marked "4.1.0" + marked "4.2.0" moment "2.29.4" - moment-timezone "0.5.35" - ol "6.15.1" + moment-timezone "0.5.38" + ol "7.1.0" papaparse "5.3.2" - regenerator-runtime "0.13.9" - rxjs "7.5.6" + regenerator-runtime "0.13.10" + rxjs "7.5.7" tinycolor2 "1.4.2" - tslib "2.4.0" - uplot "1.6.22" - xss "1.0.13" + tslib "2.4.1" + uplot "1.6.23" + xss "1.0.14" -"@grafana/e2e-selectors@9.2.3": - version "9.2.3" - resolved "https://registry.yarnpkg.com/@grafana/e2e-selectors/-/e2e-selectors-9.2.3.tgz#31ed4b5d02d740dadf0a4cd77be0dcfbe95db8e8" - integrity sha512-3r2ObghrnucGai0PSs8okEVsCdODthxQzo5mw90/oSEsBVwWJCF9NY8PLaoctcuP+B4w4OYs9L8CBuhkzudKCw== +"@grafana/data@9.3.6": + version "9.3.6" + resolved "https://registry.yarnpkg.com/@grafana/data/-/data-9.3.6.tgz#ac55539d0e941991701698b5157a31f59a6c81c6" + integrity sha512-PTRJZ2k4nSTuZLtsqiY/oDOTf6ul1pLt54vi/7Gb4U+GOmd5nUdc/zU+S9MN4iJfzS5INby0Df8zwUO1BV82qQ== + dependencies: + "@braintree/sanitize-url" "6.0.1" + "@grafana/schema" "9.3.6" + "@types/d3-interpolate" "^1.4.0" + d3-interpolate "1.4.0" + date-fns "2.29.3" + eventemitter3 "4.0.7" + fast_array_intersect "1.1.0" + history "4.10.1" + lodash "4.17.21" + marked "4.2.0" + moment "2.29.4" + moment-timezone "0.5.38" + ol "7.1.0" + papaparse "5.3.2" + regenerator-runtime "0.13.10" + rxjs "7.5.7" + tinycolor2 "1.4.2" + tslib "2.4.1" + uplot "1.6.23" + xss "1.0.14" + +"@grafana/e2e-selectors@9.3.2": + version "9.3.2" + resolved "https://registry.yarnpkg.com/@grafana/e2e-selectors/-/e2e-selectors-9.3.2.tgz#cf13e9ec9e293cc2de2372a371eaf8327c1059ec" + integrity sha512-kxtYYK8OC152yhk0Q+YLwxKZxV3xC5WrYU+5nKTWl2bW4I8srVzxN9ts0MqPVcME6DN6blA8JUf6BWNa6YfSAQ== dependencies: "@grafana/tsconfig" "^1.2.0-rc1" - tslib "2.4.0" - typescript "4.8.2" + tslib "2.4.1" + typescript "4.8.4" + +"@grafana/e2e-selectors@9.3.6": + version "9.3.6" + resolved "https://registry.yarnpkg.com/@grafana/e2e-selectors/-/e2e-selectors-9.3.6.tgz#892244dee5eca6f2bc32922a02ae142fef4c9293" + integrity sha512-IoVt72P0RF3OlmVN3whfj/t4DCbA1jI/FrXx0eKyZTfxrnMD1J/I5E78g4n5z8vEp+wc5H7YoWXI0NuaTtdnGw== + dependencies: + "@grafana/tsconfig" "^1.2.0-rc1" + tslib "2.4.1" + typescript "4.8.4" "@grafana/eslint-config@5.0.0": version "5.0.0" @@ -1471,17 +1514,66 @@ eslint-plugin-react-hooks "4.3.0" typescript "4.6.4" -"@grafana/schema@9.2.3": - version "9.2.3" - resolved "https://registry.yarnpkg.com/@grafana/schema/-/schema-9.2.3.tgz#5896eb9a49d8f174c12c74b3aab007f513561e8d" - integrity sha512-tHPRV59EAsSMFnvc4FNLc23sathThm3w51O1pv+9fJrMXe0t6SNU0cSGXf/BkwK4QMNJvvbiGm1Jlte54qgW9w== +"@grafana/experimental@1.1.0": + version "1.1.0" + resolved "https://registry.yarnpkg.com/@grafana/experimental/-/experimental-1.1.0.tgz#36b9644b1e61c782ed42b4805c5e297f2cc3f8bf" + integrity sha512-pQhYhw+jB7Q+t8rLcd1jcx91BiFDNslBATJkNIgO9I2Bah+ww+2RH1hUGVoJNPL84vW7WRU7w9k/L7FJs7/L6Q== dependencies: - tslib "2.4.0" + "@types/uuid" "^8.3.3" + uuid "^8.3.2" + +"@grafana/faro-core@^1.0.0-beta2": + version "1.0.0-beta4" + resolved "https://registry.yarnpkg.com/@grafana/faro-core/-/faro-core-1.0.0-beta4.tgz#2f38e18764c0a3c3f1af889d510a2896bcb742ab" + integrity sha512-tB7705aYCByw4CNWt3WNoV39+sZCudBMiStmiEKHzM17VRRLBjPcrMQTkVYu4zMkEAdWMuAdYhT3xjzHlQpXIA== + dependencies: + "@opentelemetry/api" "^1.3.0" + "@opentelemetry/api-metrics" "^0.33.0" + "@opentelemetry/otlp-transformer" "^0.34.0" + +"@grafana/faro-web-sdk@1.0.0-beta2": + version "1.0.0-beta2" + resolved "https://registry.yarnpkg.com/@grafana/faro-web-sdk/-/faro-web-sdk-1.0.0-beta2.tgz#d096a350d6366a108428a205753c797802eb480d" + integrity sha512-Z/ZbMpBG4/+ZHuPntVTANvStBP1pkDT3+oqKDYW3O4iP4wBhIUyXk7Pmr9LJZIjcStBizEFMH/N/F/gyD5DHjQ== + dependencies: + "@grafana/faro-core" "^1.0.0-beta2" + ua-parser-js "^1.0.32" + web-vitals "^3.0.4" + +"@grafana/runtime@9.3.6": + version "9.3.6" + resolved "https://registry.yarnpkg.com/@grafana/runtime/-/runtime-9.3.6.tgz#1c606d589ea1df49c72e04c42583e64ef3e02f6b" + integrity sha512-rcEg4D8x5RWJ8LkN7DBsrS6sJbsn+1DBW1JV2pJ4CTWI/37ssdykk51hmKH1azVGcFYTouhpHz9qmFDnWqU3hw== + dependencies: + "@grafana/data" "9.3.6" + "@grafana/e2e-selectors" "9.3.6" + "@grafana/faro-web-sdk" "1.0.0-beta2" + "@grafana/ui" "9.3.6" + "@sentry/browser" "6.19.7" + history "4.10.1" + lodash "4.17.21" + rxjs "7.5.7" + systemjs "0.20.19" + tslib "2.4.1" -"@grafana/toolkit@9.2.3": - version "9.2.3" - resolved "https://registry.yarnpkg.com/@grafana/toolkit/-/toolkit-9.2.3.tgz#54b2f8214145898b370da2292e6723325911207b" - integrity sha512-IMhRA+J9pOWpdJrjNOXYG9E4UkKZoSdy9csZG7WXTS6dh8hMzimKRAdEJQwqHphzq4Uawik9elwCdHMyEOBSlA== +"@grafana/schema@9.3.2": + version "9.3.2" + resolved "https://registry.yarnpkg.com/@grafana/schema/-/schema-9.3.2.tgz#386d7a5b90c5bdec8bb2d290362a7664462cec10" + integrity sha512-VXdo9E3lFWu/N6WU4BicaapzXZ4N+kQ5R2VNvWb6WA/oV4SW5dVeUHJOna8+s75K7WfLqNL5dyDQRIoKCbzyow== + dependencies: + tslib "2.4.1" + +"@grafana/schema@9.3.6": + version "9.3.6" + resolved "https://registry.yarnpkg.com/@grafana/schema/-/schema-9.3.6.tgz#e0b02c78adc31403fbc33ab6007c631b8664f9a4" + integrity sha512-nY+UQ5b4hN8xJUaiYVzZpF/pcD34OKRuBuKf7A+WggzbUGx+yosE5iPNbzZw1zGDeX4h83W+tIVKgwVZ+L0CBw== + dependencies: + tslib "2.4.1" + +"@grafana/toolkit@9.3.2": + version "9.3.2" + resolved "https://registry.yarnpkg.com/@grafana/toolkit/-/toolkit-9.3.2.tgz#6e632269b5b3dd3c234bf8637bc1864f3b856d0a" + integrity sha512-vEufDoC532lSy00I8kXu3ATSRvO9pQuYbKdqG/4wffOtVUTH4mHPp9Yqi9sEE9ZPLjWTHwOQdGKfcllibZaFyA== dependencies: "@babel/core" "7.18.9" "@babel/plugin-proposal-class-properties" "7.18.6" @@ -1495,10 +1587,10 @@ "@babel/preset-env" "7.18.9" "@babel/preset-react" "7.18.6" "@babel/preset-typescript" "7.18.6" - "@grafana/data" "9.2.3" + "@grafana/data" "9.3.2" "@grafana/eslint-config" "5.0.0" "@grafana/tsconfig" "^1.2.0-rc1" - "@grafana/ui" "9.2.3" + "@grafana/ui" "9.3.2" "@jest/core" "27.5.1" "@types/command-exists" "^1.2.0" "@types/eslint" "8.4.1" @@ -1573,18 +1665,19 @@ resolved "https://registry.yarnpkg.com/@grafana/tsconfig/-/tsconfig-1.2.0-rc1.tgz#10973c978ec95b0ea637511254b5f478bce04de7" integrity sha512-+SgQeBQ1pT6D/E3/dEdADqTrlgdIGuexUZ8EU+8KxQFKUeFeU7/3z/ayI2q/wpJ/Kr6WxBBNlrST6aOKia19Ag== -"@grafana/ui@9.2.3": - version "9.2.3" - resolved "https://registry.yarnpkg.com/@grafana/ui/-/ui-9.2.3.tgz#b7b957a118fa8a1382cab4ec5f5dcc3b7b64d9d1" - integrity sha512-0XmjDqV4wieD17EsJE8n+EGEsMKo2NxPqcib8AfqC7o5xtWMdYnWwDPcs1h9y5K5pA9ulBcCfrHlUYo4LbhSZQ== - dependencies: - "@emotion/css" "11.9.0" - "@emotion/react" "11.9.3" - "@grafana/data" "9.2.3" - "@grafana/e2e-selectors" "9.2.3" - "@grafana/schema" "9.2.3" - "@monaco-editor/react" "4.4.5" - "@popperjs/core" "2.11.5" +"@grafana/ui@9.3.2": + version "9.3.2" + resolved "https://registry.yarnpkg.com/@grafana/ui/-/ui-9.3.2.tgz#4854d3df62f3e6c8a1026c0995f96999a95f1738" + integrity sha512-ptFzG0DeJOh8JwGoJXVqWVpAJLgNCw/rRd0nI/1t4CKIjRsizQsyWANcS+3e3syvi48UMwzHlDuCkoL61MVNcQ== + dependencies: + "@emotion/css" "11.10.5" + "@emotion/react" "11.10.5" + "@grafana/data" "9.3.2" + "@grafana/e2e-selectors" "9.3.2" + "@grafana/schema" "9.3.2" + "@leeoniya/ufuzzy" "0.8.0" + "@monaco-editor/react" "4.4.6" + "@popperjs/core" "2.11.6" "@react-aria/button" "3.6.1" "@react-aria/dialog" "3.3.1" "@react-aria/focus" "3.8.0" @@ -1595,49 +1688,122 @@ "@sentry/browser" "6.19.7" ansicolor "1.1.100" calculate-size "1.1.1" - classnames "2.3.1" - core-js "3.25.1" + classnames "2.3.2" + core-js "3.26.0" d3 "5.15.0" - date-fns "2.29.1" + date-fns "2.29.3" hoist-non-react-statics "3.3.2" + i18next "^22.0.0" immutable "4.1.0" is-hotkey "0.2.0" - jquery "3.6.0" + jquery "3.6.1" lodash "4.17.21" memoize-one "6.0.0" moment "2.29.4" monaco-editor "0.34.0" - ol "6.15.1" + ol "7.1.0" prismjs "1.29.0" - rc-cascader "3.6.1" + rc-cascader "3.7.0" rc-drawer "4.4.3" - rc-slider "9.7.5" + rc-slider "10.0.1" rc-time-picker "^3.7.3" - react-beautiful-dnd "13.1.0" - react-calendar "3.7.0" - react-colorful "5.5.1" + rc-tooltip "5.2.2" + react-beautiful-dnd "13.1.1" + react-calendar "3.9.0" + react-colorful "5.6.1" react-custom-scrollbars-2 "4.5.0" - react-dropzone "14.2.2" + react-dropzone "14.2.3" react-highlight-words "0.18.0" react-hook-form "7.5.3" - react-inlinesvg "3.0.0" + react-i18next "^12.0.0" + react-inlinesvg "3.0.1" react-popper "2.3.0" - react-popper-tooltip "^4.3.1" + react-popper-tooltip "4.4.2" react-router-dom "^5.2.0" - react-select "5.4.0" + react-select "5.6.0" react-select-event "^5.1.0" react-table "7.8.0" - react-transition-group "4.4.2" + react-transition-group "4.4.5" react-use "17.4.0" - react-window "1.8.7" - rxjs "7.5.6" + react-window "1.8.8" + rxjs "7.5.7" slate "0.47.9" - slate-plain-serializer "0.7.11" + slate-plain-serializer "0.7.13" slate-react "0.22.10" tinycolor2 "1.4.2" - tslib "2.4.0" - uplot "1.6.22" - uuid "8.3.2" + tslib "2.4.1" + uplot "1.6.23" + uuid "9.0.0" + +"@grafana/ui@9.3.6": + version "9.3.6" + resolved "https://registry.yarnpkg.com/@grafana/ui/-/ui-9.3.6.tgz#81c3cc4c8f0045bf0a9648cbdab1db4f40c9d502" + integrity sha512-41m7H5fgX4NhMTH8W7Bq2/EpwwKDbSD7bfdvsJBOXrATaQExd8ag393fPFz8+WvgF/JQ921MZv8/zdwoVUvwZg== + dependencies: + "@emotion/css" "11.10.5" + "@emotion/react" "11.10.5" + "@grafana/data" "9.3.6" + "@grafana/e2e-selectors" "9.3.6" + "@grafana/schema" "9.3.6" + "@leeoniya/ufuzzy" "0.8.0" + "@monaco-editor/react" "4.4.6" + "@popperjs/core" "2.11.6" + "@react-aria/button" "3.6.1" + "@react-aria/dialog" "3.3.1" + "@react-aria/focus" "3.8.0" + "@react-aria/menu" "3.6.1" + "@react-aria/overlays" "3.10.1" + "@react-aria/utils" "3.13.1" + "@react-stately/menu" "3.4.1" + "@sentry/browser" "6.19.7" + ansicolor "1.1.100" + calculate-size "1.1.1" + classnames "2.3.2" + core-js "3.26.0" + d3 "5.15.0" + date-fns "2.29.3" + hoist-non-react-statics "3.3.2" + i18next "^22.0.0" + immutable "4.1.0" + is-hotkey "0.2.0" + jquery "3.6.1" + lodash "4.17.21" + memoize-one "6.0.0" + moment "2.29.4" + monaco-editor "0.34.0" + ol "7.1.0" + prismjs "1.29.0" + rc-cascader "3.7.0" + rc-drawer "4.4.3" + rc-slider "10.0.1" + rc-time-picker "^3.7.3" + rc-tooltip "5.2.2" + react-beautiful-dnd "13.1.1" + react-calendar "3.9.0" + react-colorful "5.6.1" + react-custom-scrollbars-2 "4.5.0" + react-dropzone "14.2.3" + react-highlight-words "0.18.0" + react-hook-form "7.5.3" + react-i18next "^12.0.0" + react-inlinesvg "3.0.1" + react-popper "2.3.0" + react-popper-tooltip "4.4.2" + react-router-dom "^5.2.0" + react-select "5.6.0" + react-select-event "^5.1.0" + react-table "7.8.0" + react-transition-group "4.4.5" + react-use "17.4.0" + react-window "1.8.8" + rxjs "7.5.7" + slate "0.47.9" + slate-plain-serializer "0.7.13" + slate-react "0.22.10" + tinycolor2 "1.4.2" + tslib "2.4.1" + uplot "1.6.23" + uuid "9.0.0" "@humanwhocodes/config-array@^0.9.2": version "0.9.5" @@ -1953,6 +2119,11 @@ resolved "https://registry.yarnpkg.com/@kwsites/promise-deferred/-/promise-deferred-1.1.1.tgz#8ace5259254426ccef57f3175bc64ed7095ed919" integrity sha512-GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw== +"@leeoniya/ufuzzy@0.8.0": + version "0.8.0" + resolved "https://registry.yarnpkg.com/@leeoniya/ufuzzy/-/ufuzzy-0.8.0.tgz#2ccfc29453e168ce5866bf6dee89771db404a7f7" + integrity sha512-EOc0fEsIqe6CDZxC14efhybnPcXyJi7VaZby40mWASZD0CI78ONoF+4+LGlcT58jsAIwEims5ARbRqo+BVHEAQ== + "@mapbox/jsonlint-lines-primitives@~2.0.2": version "2.0.2" resolved "https://registry.yarnpkg.com/@mapbox/jsonlint-lines-primitives/-/jsonlint-lines-primitives-2.0.2.tgz#ce56e539f83552b58d10d672ea4d6fc9adc7b234" @@ -1989,10 +2160,10 @@ dependencies: state-local "^1.0.6" -"@monaco-editor/react@4.4.5": - version "4.4.5" - resolved "https://registry.yarnpkg.com/@monaco-editor/react/-/react-4.4.5.tgz#beabe491efeb2457441a00d1c7651c653697f65b" - integrity sha512-IImtzU7sRc66OOaQVCG+5PFHkSWnnhrUWGBuH6zNmH2h0YgmAhcjHZQc/6MY9JWEbUtVF1WPBMJ9u1XuFbRrVA== +"@monaco-editor/react@4.4.6": + version "4.4.6" + resolved "https://registry.yarnpkg.com/@monaco-editor/react/-/react-4.4.6.tgz#8ae500b0edf85276d860ed702e7056c316548218" + integrity sha512-Gr3uz3LYf33wlFE3eRnta4RxP5FSNxiIV9ENn2D2/rN8KgGAD8ecvcITRtsbbyuOuNkwbuHYxfeaz2Vr+CtyFA== dependencies: "@monaco-editor/loader" "^1.3.2" prop-types "^15.7.2" @@ -2018,17 +2189,72 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" +"@opentelemetry/api-metrics@^0.33.0": + version "0.33.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/api-metrics/-/api-metrics-0.33.0.tgz#753d355289b7811ad254d6e5b0193bd1b9f23ab0" + integrity sha512-78evfPRRRnJA6uZ3xuBuS3VZlXTO/LRs+Ff1iv3O/7DgibCtq9k27T6Zlj8yRdJDFmcjcbQrvC0/CpDpWHaZYA== + dependencies: + "@opentelemetry/api" "^1.0.0" + +"@opentelemetry/api@^1.0.0", "@opentelemetry/api@^1.3.0": + version "1.4.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/api/-/api-1.4.0.tgz#2c91791a9ba6ca0a0f4aaac5e45d58df13639ac8" + integrity sha512-IgMK9i3sFGNUqPMbjABm0G26g0QCKCUBfglhQ7rQq6WcxbKfEHRcmwsoER4hZcuYqJgkYn2OeuoJIv7Jsftp7g== + +"@opentelemetry/core@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/core/-/core-1.8.0.tgz#cca18594dd48ded6dc0d08c7e789c79af0315934" + integrity sha512-6SDjwBML4Am0AQmy7z1j6HGrWDgeK8awBRUvl1PGw6HayViMk4QpnUXvv4HTHisecgVBy43NE/cstWprm8tIfw== + dependencies: + "@opentelemetry/semantic-conventions" "1.8.0" + +"@opentelemetry/otlp-transformer@^0.34.0": + version "0.34.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/otlp-transformer/-/otlp-transformer-0.34.0.tgz#71023706233c7bc6c3cdcf954c749fea9338084c" + integrity sha512-NghPJvn3pVoWBuhWyBe1n/nWIrj1D1EFUH/bIkWEp0CMVWFLux6R+BkRPZQo5klTcj8xFhCZZIZsL/ubkYPryg== + dependencies: + "@opentelemetry/core" "1.8.0" + "@opentelemetry/resources" "1.8.0" + "@opentelemetry/sdk-metrics" "1.8.0" + "@opentelemetry/sdk-trace-base" "1.8.0" + +"@opentelemetry/resources@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/resources/-/resources-1.8.0.tgz#260be9742cf7bceccc0db928d8ca8d64391acfe3" + integrity sha512-KSyMH6Jvss/PFDy16z5qkCK0ERlpyqixb1xwb73wLMvVq+j7i89lobDjw3JkpCcd1Ws0J6jAI4fw28Zufj2ssg== + dependencies: + "@opentelemetry/core" "1.8.0" + "@opentelemetry/semantic-conventions" "1.8.0" + +"@opentelemetry/sdk-metrics@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-metrics/-/sdk-metrics-1.8.0.tgz#d061060f03861ab3f345d0f924922bc1a6396157" + integrity sha512-+KYb+uj0vHhl8xzJO+oChS4oP1e+/2Wl3SXoHoIdcEjd1TQfDV+lxOm4oqxWq6wykXvI35/JHyejxSoT+qxGmg== + dependencies: + "@opentelemetry/core" "1.8.0" + "@opentelemetry/resources" "1.8.0" + lodash.merge "4.6.2" + +"@opentelemetry/sdk-trace-base@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/sdk-trace-base/-/sdk-trace-base-1.8.0.tgz#70713aab90978a16dea188c8335209f857be7384" + integrity sha512-iH41m0UTddnCKJzZx3M85vlhKzRcmT48pUeBbnzsGrq4nIay1oWVHKM5nhB5r8qRDGvd/n7f/YLCXClxwM0tvA== + dependencies: + "@opentelemetry/core" "1.8.0" + "@opentelemetry/resources" "1.8.0" + "@opentelemetry/semantic-conventions" "1.8.0" + +"@opentelemetry/semantic-conventions@1.8.0": + version "1.8.0" + resolved "https://registry.yarnpkg.com/@opentelemetry/semantic-conventions/-/semantic-conventions-1.8.0.tgz#fe2aa90e6df050a11cd57f5c0f47b0641fd2cad3" + integrity sha512-TYh1MRcm4JnvpqtqOwT9WYaBYY4KERHdToxs/suDTLviGRsQkIjS5yYROTYTSJQUnYLOn/TuOh5GoMwfLSU+Ew== + "@petamoriken/float16@^3.4.7": version "3.7.0" resolved "https://registry.yarnpkg.com/@petamoriken/float16/-/float16-3.7.0.tgz#92c7a1015fcbbf3b33b332654e402cc23d232a09" integrity sha512-g7w35q4bt7MoM3nZKrk5COiIO+qevZjjS7bJO5pYrB0ZKABUXFBOgr2VBY66LmeI3FzkH5AZ+1uNmNHYjeuUjQ== -"@popperjs/core@2.11.5": - version "2.11.5" - resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.5.tgz#db5a11bf66bdab39569719555b0f76e138d7bd64" - integrity sha512-9X2obfABZuDVLCgPK9aX0a/x4jaOEweTTWE2+9sr0Qqqevj2Uv5XorvusThmc9XGYpS9yI+fhh8RTafBtGposw== - -"@popperjs/core@^2.11.5": +"@popperjs/core@2.11.6", "@popperjs/core@^2.11.5": version "2.11.6" resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.6.tgz#cee20bd55e68a1720bdab363ecf0c821ded4cd45" integrity sha512-50/17A98tWUfQ176raKiOGXuYpLyyVMkxxG6oylzL3BPOlA6ADGdK7EYunSa4I064xerltq9TGXs8HmOk5E+vw== @@ -2937,6 +3163,11 @@ dependencies: source-map "^0.6.1" +"@types/uuid@^8.3.3": + version "8.3.4" + resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.4.tgz#bd86a43617df0594787d38b735f55c805becf1bc" + integrity sha512-c/I8ZRb51j+pYGAu5CrFMRxqZ2ke4y2grEBO5AUjgSkSk+qT2Ea+OdWElz/OiMf5MNpn2b17kuVBwZLQJXzihw== + "@types/webpack-dev-server@3": version "3.11.6" resolved "https://registry.yarnpkg.com/@types/webpack-dev-server/-/webpack-dev-server-3.11.6.tgz#d8888cfd2f0630203e13d3ed7833a4d11b8a34dc" @@ -3869,12 +4100,7 @@ cjs-module-lexer@^1.0.0: resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz#9f84ba3244a512f3a54e5277e8eef4c489864e40" integrity sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA== -classnames@2.3.1: - version "2.3.1" - resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.1.tgz#dfcfa3891e306ec1dad105d0e88f4417b8535e8e" - integrity sha512-OlQdbZ7gLfGarSqxesMesDa5uz7KFbID8Kpq/SxIoNGDqY8lSYs0D+hhtBXhcdB3rcbXArFr7vlHheLk1voeNA== - -classnames@2.x, classnames@^2.2.1, classnames@^2.2.5, classnames@^2.2.6, classnames@^2.3.1: +classnames@2.3.2, classnames@2.x, classnames@^2.2.1, classnames@^2.2.5, classnames@^2.2.6, classnames@^2.3.1: version "2.3.2" resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.3.2.tgz#351d813bf0137fcc6a76a16b88208d2560a0d924" integrity sha512-CSbhY4cFEJRe6/GQzIk5qXZ4Jeg5pcsP7b5peFSDpffpe1cqjASH/n9UTjBwOp6XpMSTwQ8Za2K5V02ueA7Tmw== @@ -4058,10 +4284,10 @@ core-js-compat@^3.21.0, core-js-compat@^3.22.1: dependencies: browserslist "^4.21.4" -core-js@3.25.1: - version "3.25.1" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.25.1.tgz#5818e09de0db8956e16bf10e2a7141e931b7c69c" - integrity sha512-sr0FY4lnO1hkQ4gLDr24K0DGnweGO1QwSj5BpfQjpSJPdqWalja4cTps29Y/PJVG/P7FYlPDkH3hO+Tr0CvDgQ== +core-js@3.26.0: + version "3.26.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.26.0.tgz#a516db0ed0811be10eac5d94f3b8463d03faccfe" + integrity sha512-+DkDrhoR4Y0PxDz6rurahuB+I45OsEUv8E1maPTB6OuHRohMMcznBq9TMpdpDMm/hUPob/mJJS3PqgbHpMTQgw== core-js@^2.4.0: version "2.6.12" @@ -4565,10 +4791,10 @@ data-urls@^2.0.0: whatwg-mimetype "^2.3.0" whatwg-url "^8.0.0" -date-fns@2.29.1: - version "2.29.1" - resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.1.tgz#9667c2615525e552b5135a3116b95b1961456e60" - integrity sha512-dlLD5rKaKxpFdnjrs+5azHDFOPEu4ANy/LTh04A1DTzMM7qoajmKCBc8pkKRFT41CNzw+4gQh79X5C+Jq27HAw== +date-fns@2.29.3: + version "2.29.3" + resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.29.3.tgz#27402d2fc67eb442b511b70bbdf98e6411cd68a8" + integrity sha512-dDCnyH2WnnKusqvZZ6+jA1O51Ibt8ZMRNkDZdyAyK4YfbDwa/cEmuztzG5pk6hqlp9aSBPYcjOlktquahGwGeA== debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.2, debug@^4.3.4: version "4.3.4" @@ -4795,6 +5021,11 @@ duplexer@^0.1.2: resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz#3abe43aef3835f8ae077d136ddce0f276b0400e6" integrity sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg== +earcut@^2.2.3: + version "2.2.4" + resolved "https://registry.yarnpkg.com/earcut/-/earcut-2.2.4.tgz#6d02fd4d68160c114825d06890a92ecaae60343a" + integrity sha512-/pjZsA1b4RPHbeWZQn66SWS8nZZWLQQ23oE3Eam7aroEFGEvwKAsJfZ9ytiEMycfzXWpca4FA9QIOehf7PocBQ== + electron-to-chromium@^1.4.251: version "1.4.284" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.284.tgz#61046d1e4cab3a25238f6bf7413795270f125592" @@ -5794,6 +6025,13 @@ html-minifier-terser@^6.0.2: relateurl "^0.2.7" terser "^5.10.0" +html-parse-stringify@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/html-parse-stringify/-/html-parse-stringify-3.0.1.tgz#dfc1017347ce9f77c8141a507f233040c59c55d2" + integrity sha512-KknJ50kTInJ7qIScF3jeaFRpMpE8/lfiTdzf/twXyPBLAGrLRTmkz3AdTnKeh40X8k9L2fdYwEp/42WGXIRGcg== + dependencies: + void-elements "3.1.0" + html-webpack-plugin@^5.5.0: version "5.5.0" resolved "https://registry.yarnpkg.com/html-webpack-plugin/-/html-webpack-plugin-5.5.0.tgz#c3911936f57681c1f9f4d8b68c158cd9dfe52f50" @@ -5862,6 +6100,13 @@ hyphenate-style-name@^1.0.3: resolved "https://registry.yarnpkg.com/hyphenate-style-name/-/hyphenate-style-name-1.0.4.tgz#691879af8e220aea5750e8827db4ef62a54e361d" integrity sha512-ygGZLjmXfPHj+ZWh6LwbC37l43MhfztxetbFCoYTM2VjkIUpeHgSNn7QIyVFj7YQ1Wl9Cbw5sholVJPzWvC2MQ== +i18next@^22.0.0: + version "22.4.9" + resolved "https://registry.yarnpkg.com/i18next/-/i18next-22.4.9.tgz#98c8384c6bd41ff937da98b1e809ba03d3b41053" + integrity sha512-8gWMmUz460KJDQp/ob3MNUX84cVuDRY9PLFPnV8d+Qezz/6dkjxwOaH70xjrCNDO+JrUL25iXfAIN9wUkInNZw== + dependencies: + "@babel/runtime" "^7.20.6" + iconv-lite@0.4, iconv-lite@0.4.24, iconv-lite@^0.4.24: version "0.4.24" resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.4.24.tgz#2022b4b25fbddc21d2f524974a474aafe733908b" @@ -6806,10 +7051,10 @@ joycon@^3.1.1: resolved "https://registry.yarnpkg.com/joycon/-/joycon-3.1.1.tgz#bce8596d6ae808f8b68168f5fc69280996894f03" integrity sha512-34wB/Y7MW7bzjKRjUKTa46I2Z7eV62Rkhva+KkopW7Qvv/OSWBqvkSY7vusOPrNuZcUG3tApvdVgNB8POj3SPw== -jquery@3.6.0: - version "3.6.0" - resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470" - integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw== +jquery@3.6.1: + version "3.6.1" + resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.1.tgz#fab0408f8b45fc19f956205773b62b292c147a16" + integrity sha512-opJeO4nCucVnsjiXOE+/PcCgYw9Gwpvs/a6B1LL/lQhwWwpbVEVYDZ1FokFr8PRc7ghYlrFPuyHuiiDNTQxmcw== js-cookie@^2.2.1: version "2.2.1" @@ -7062,7 +7307,7 @@ lodash.memoize@4.x, lodash.memoize@^4.1.1, lodash.memoize@^4.1.2: resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe" integrity sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag== -lodash.merge@^4.6.2: +lodash.merge@4.6.2, lodash.merge@^4.6.2: version "4.6.2" resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== @@ -7150,10 +7395,10 @@ mapbox-to-css-font@^2.4.1: resolved "https://registry.yarnpkg.com/mapbox-to-css-font/-/mapbox-to-css-font-2.4.1.tgz#41bf38faed36b7dab069828aa3654e4bd91a1eda" integrity sha512-QQ/iKiM43DM9+aujTL45Iz5o7gDeSFmy4LPl3HZmNcwCE++NxGazf+yFpY+wCb+YS23sDa1ghpo3zrNFOcHlow== -marked@4.1.0: - version "4.1.0" - resolved "https://registry.yarnpkg.com/marked/-/marked-4.1.0.tgz#3fc6e7485f21c1ca5d6ec4a39de820e146954796" - integrity sha512-+Z6KDjSPa6/723PQYyc1axYZpYYpDnECDaU6hkaf5gqBieBkMKYReL5hteF2QizhlMbgbo8umXl/clZ67+GlsA== +marked@4.2.0: + version "4.2.0" + resolved "https://registry.yarnpkg.com/marked/-/marked-4.2.0.tgz#f1683b077626a6c53e28926b798a18184aa13a91" + integrity sha512-1qWHjHlBKwjnDfrkxd0L3Yx4LTad/WO7+d13YsXAC/ZfKj7p0xkLV3sDXJzfWgL7GfW4IBZwMAYWaz+ifyQouQ== md5-file@^5.0.0: version "5.0.0" @@ -7172,12 +7417,12 @@ memfs@^3.1.2, memfs@^3.4.1: dependencies: fs-monkey "^1.0.3" -memoize-one@6.0.0: +memoize-one@6.0.0, memoize-one@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-6.0.0.tgz#b2591b871ed82948aee4727dc6abceeeac8c1045" integrity sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw== -"memoize-one@>=3.1.1 <6", memoize-one@^5.0.0, memoize-one@^5.1.1: +"memoize-one@>=3.1.1 <6", memoize-one@^5.1.1: version "5.2.1" resolved "https://registry.yarnpkg.com/memoize-one/-/memoize-one-5.2.1.tgz#8337aa3c4335581839ec01c3d594090cebe8f00e" integrity sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q== @@ -7261,10 +7506,10 @@ mkdirp@^1.0.4: resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e" integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw== -moment-timezone@0.5.35: - version "0.5.35" - resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.35.tgz#6fa2631bdbe8ff04f6b8753f7199516be6dc9839" - integrity sha512-cY/pBOEXepQvlgli06ttCTKcIf8cD1nmNwOKQQAdHBqYApQSpAqotBMX0RJZNgMp6i0PlZuf1mFtnlyEkwyvFw== +moment-timezone@0.5.38: + version "0.5.38" + resolved "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.38.tgz#9674a5397b8be7c13de820fd387d8afa0f725aad" + integrity sha512-nMIrzGah4+oYZPflDvLZUgoVUO4fvAqHstvG3xAUnMolWncuAiLDWNnJZj6EwJGMGfb1ZcuTFE6GI3hNOVWI/Q== dependencies: moment ">= 2.9.0" @@ -7480,21 +7725,22 @@ object.values@^1.1.5: define-properties "^1.1.4" es-abstract "^1.20.4" -ol-mapbox-style@^8.0.5: - version "8.2.1" - resolved "https://registry.yarnpkg.com/ol-mapbox-style/-/ol-mapbox-style-8.2.1.tgz#0f0c252b6495853a137d7e4dd3f915fab664b356" - integrity sha512-3kBBuZC627vDL8vnUdfVbCbfkhkcZj2kXPHQcuLhC4JJEA+XkEVEtEde8x8+AZctRbHwBkSiubTPaRukgLxIRw== +ol-mapbox-style@9.1.0: + version "9.1.0" + resolved "https://registry.yarnpkg.com/ol-mapbox-style/-/ol-mapbox-style-9.1.0.tgz#1504b1a2c3cc23482c3c95cd55a1cf1d2ac8a451" + integrity sha512-R/XE6FdviaXNdnSw6ItHSEreMtQU68cwQCGv4Kl8yG0V1dZhnI5JWr8IOphJwffPVxfWTCnJb5aALGSB89MvhA== dependencies: "@mapbox/mapbox-gl-style-spec" "^13.23.1" mapbox-to-css-font "^2.4.1" -ol@6.15.1: - version "6.15.1" - resolved "https://registry.yarnpkg.com/ol/-/ol-6.15.1.tgz#364f459939ef71f970b2376a821a896529f65e3a" - integrity sha512-ZG2CKTpJ8Q+tPywYysVwPk+yevwJzlbwjRKhoCvd7kLVWMbfBl1O/+Kg/yrZZrhG9FNXbFH4GeOZ5yVRqo3P4w== +ol@7.1.0: + version "7.1.0" + resolved "https://registry.yarnpkg.com/ol/-/ol-7.1.0.tgz#aab69a0539e59d6a4361cbc0f69f8b00c7298c9c" + integrity sha512-mAeV5Ca4mFhYaJoGWNZnIMN5VNnFTf63FgZjBiYu/DjQDGKNsD5QyvvqVziioVdOOgl6b8rPB/ypj2XNBinPwA== dependencies: + earcut "^2.2.3" geotiff "2.0.4" - ol-mapbox-style "^8.0.5" + ol-mapbox-style "9.1.0" pbf "3.2.1" rbush "^3.0.1" @@ -8416,16 +8662,16 @@ rc-animate@2.x: rc-util "^4.15.3" react-lifecycles-compat "^3.0.4" -rc-cascader@3.6.1: - version "3.6.1" - resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-3.6.1.tgz#2e94fb3ed770ffd71d87ebcf17a9b44a6442e76f" - integrity sha512-+GmN2Z0IybKT45t0Z94jkjmsOHGxAliobR2tzt05/Gw0AKBYLHX5bdvsVXR7abPnarYyYzZ/cWe8CoFgDjAFNw== +rc-cascader@3.7.0: + version "3.7.0" + resolved "https://registry.yarnpkg.com/rc-cascader/-/rc-cascader-3.7.0.tgz#98134df578ce1cca22be8fb4319b04df4f3dca36" + integrity sha512-SFtGpwmYN7RaWEAGTS4Rkc62ZV/qmQGg/tajr/7mfIkleuu8ro9Hlk6J+aA0x1YS4zlaZBtTcSaXM01QMiEV/A== dependencies: "@babel/runtime" "^7.12.5" array-tree-filter "^2.1.0" classnames "^2.3.1" rc-select "~14.1.0" - rc-tree "~5.6.3" + rc-tree "~5.7.0" rc-util "^5.6.1" rc-drawer@4.4.3: @@ -8479,15 +8725,14 @@ rc-select@~14.1.0: rc-util "^5.16.1" rc-virtual-list "^3.2.0" -rc-slider@9.7.5: - version "9.7.5" - resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-9.7.5.tgz#193141c68e99b1dc3b746daeb6bf852946f5b7f4" - integrity sha512-LV/MWcXFjco1epPbdw1JlLXlTgmWpB9/Y/P2yinf8Pg3wElHxA9uajN21lJiWtZjf5SCUekfSP6QMJfDo4t1hg== +rc-slider@10.0.1: + version "10.0.1" + resolved "https://registry.yarnpkg.com/rc-slider/-/rc-slider-10.0.1.tgz#7058c68ff1e1aa4e7c3536e5e10128bdbccb87f9" + integrity sha512-igTKF3zBet7oS/3yNiIlmU8KnZ45npmrmHlUUio8PNbIhzMcsh+oE/r2UD42Y6YD2D/s+kzCQkzQrPD6RY435Q== dependencies: "@babel/runtime" "^7.10.1" classnames "^2.2.5" - rc-tooltip "^5.0.1" - rc-util "^5.16.1" + rc-util "^5.18.1" shallowequal "^1.1.0" rc-time-picker@^3.7.3: @@ -8502,7 +8747,7 @@ rc-time-picker@^3.7.3: rc-trigger "^2.2.0" react-lifecycles-compat "^3.0.4" -rc-tooltip@^5.0.1: +rc-tooltip@5.2.2: version "5.2.2" resolved "https://registry.yarnpkg.com/rc-tooltip/-/rc-tooltip-5.2.2.tgz#e5cafa8ecebf78108936a0bcb93c150fa81ac93b" integrity sha512-jtQzU/18S6EI3lhSGoDYhPqNpWajMtS5VV/ld1LwyfrDByQpYmw/LW6U7oFXXLukjfDHQ7Ju705A82PRNFWYhg== @@ -8511,10 +8756,10 @@ rc-tooltip@^5.0.1: classnames "^2.3.1" rc-trigger "^5.0.0" -rc-tree@~5.6.3: - version "5.6.9" - resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-5.6.9.tgz#b73290a6dcad65e4ed5d8dc21cb198b30316404b" - integrity sha512-si8aGuWQ2/sh2Ibk+WdUdDeAxoviT/+kDY+NLtJ+RhqfySqPFqWM5uHTwgFRrWUvKCqEeE/PjCYuuhHrK7Y7+A== +rc-tree@~5.7.0: + version "5.7.2" + resolved "https://registry.yarnpkg.com/rc-tree/-/rc-tree-5.7.2.tgz#270ea7d9e1b2e5e81cd3659eba2fbd022a4831f6" + integrity sha512-nmnL6qLnfwVckO5zoqKL2I9UhwDqzyCtjITQCkwhimyz1zfuFkG5ZPIXpzD/Guzso94qQA/QrMsvzic5W6QDjg== dependencies: "@babel/runtime" "^7.10.1" classnames "2.x" @@ -8566,6 +8811,14 @@ rc-util@^5.15.0, rc-util@^5.16.1, rc-util@^5.19.2, rc-util@^5.21.0, rc-util@^5.3 react-is "^16.12.0" shallowequal "^1.1.0" +rc-util@^5.18.1: + version "5.27.2" + resolved "https://registry.yarnpkg.com/rc-util/-/rc-util-5.27.2.tgz#472a7bab26a62856c2c016d18dc6356e46d01012" + integrity sha512-8XHRbeJOWlTR2Hk1K2xLaPOf7lZu+3taskAGuqOPccA676vB3ygrz3ZgdrA3wml40CzR9RlIEHDWwI7FZT3wBQ== + dependencies: + "@babel/runtime" "^7.18.3" + react-is "^16.12.0" + rc-virtual-list@^3.2.0, rc-virtual-list@^3.4.8: version "3.4.11" resolved "https://registry.yarnpkg.com/rc-virtual-list/-/rc-virtual-list-3.4.11.tgz#97f5e947380d546a2ca8ad229d8e41e9b33b20c6" @@ -8576,10 +8829,10 @@ rc-virtual-list@^3.2.0, rc-virtual-list@^3.4.8: rc-resize-observer "^1.0.0" rc-util "^5.15.0" -react-beautiful-dnd@13.1.0: - version "13.1.0" - resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-13.1.0.tgz#ec97c81093593526454b0de69852ae433783844d" - integrity sha512-aGvblPZTJowOWUNiwd6tNfEpgkX5OxmpqxHKNW/4VmvZTNTbeiq7bA3bn5T+QSF2uibXB0D1DmJsb1aC/+3cUA== +react-beautiful-dnd@13.1.1: + version "13.1.1" + resolved "https://registry.yarnpkg.com/react-beautiful-dnd/-/react-beautiful-dnd-13.1.1.tgz#b0f3087a5840920abf8bb2325f1ffa46d8c4d0a2" + integrity sha512-0Lvs4tq2VcrEjEgDXHjT98r+63drkKEgqyxdA7qD3mvKwga6a5SscbdLPO2IExotU1jW8L0Ksdl0Cj2AF67nPQ== dependencies: "@babel/runtime" "^7.9.2" css-box-model "^1.2.0" @@ -8589,20 +8842,20 @@ react-beautiful-dnd@13.1.0: redux "^4.0.4" use-memo-one "^1.1.1" -react-calendar@3.7.0: - version "3.7.0" - resolved "https://registry.yarnpkg.com/react-calendar/-/react-calendar-3.7.0.tgz#951d56e91afb33b1c1e019cb790349fbffcc6894" - integrity sha512-zkK95zWLWLC6w3O7p3SHx/FJXEyyD2UMd4jr3CrKD+G73N+G5vEwrXxYQCNivIPoFNBjqoyYYGlkHA+TBDPLCw== +react-calendar@3.9.0: + version "3.9.0" + resolved "https://registry.yarnpkg.com/react-calendar/-/react-calendar-3.9.0.tgz#4dfe342ef61574c0e819e49847981076c7af58ea" + integrity sha512-g6RJCEaPovHTiV2bMhBUfm0a1YoMj4bOUpL8hQSLmR1Glhc7lgRLtZBd4mcC4jkoGsb+hv9uA/QH4pZcm5l9lQ== dependencies: "@wojtekmaj/date-utils" "^1.0.2" get-user-locale "^1.2.0" merge-class-names "^1.1.1" prop-types "^15.6.0" -react-colorful@5.5.1: - version "5.5.1" - resolved "https://registry.yarnpkg.com/react-colorful/-/react-colorful-5.5.1.tgz#29d9c4e496f2ca784dd2bb5053a3a4340cfaf784" - integrity sha512-M1TJH2X3RXEt12sWkpa6hLc/bbYS0H6F4rIqjQZ+RxNBstpY67d9TrFXtqdZwhpmBXcCwEi7stKqFue3ZRkiOg== +react-colorful@5.6.1: + version "5.6.1" + resolved "https://registry.yarnpkg.com/react-colorful/-/react-colorful-5.6.1.tgz#7dc2aed2d7c72fac89694e834d179e32f3da563b" + integrity sha512-1exovf0uGTGyq5mXQT0zgQ80uvj2PCwvF8zY1RN9/vbJVSjSo3fsB/4L3ObbF7u70NduSiK4xu4Y6q1MHoUGEw== react-custom-scrollbars-2@4.5.0: version "4.5.0" @@ -8652,10 +8905,10 @@ react-dom@17.0.2: object-assign "^4.1.1" scheduler "^0.20.2" -react-dropzone@14.2.2: - version "14.2.2" - resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-14.2.2.tgz#a75a0676055fe9e2cb78578df4dedb4c42b54f98" - integrity sha512-5oyGN/B5rNhop2ggUnxztXBQ6q6zii+OMEftPzsxAR2hhpVWz0nAV+3Ktxo2h5bZzdcCKrpd8bfWAVsveIBM+w== +react-dropzone@14.2.3: + version "14.2.3" + resolved "https://registry.yarnpkg.com/react-dropzone/-/react-dropzone-14.2.3.tgz#0acab68308fda2d54d1273a1e626264e13d4e84b" + integrity sha512-O3om8I+PkFKbxCukfIR3QAGftYXDZfOE2N1mr/7qebQJHs7U+/RSL/9xomJNpRg9kM5h9soQSdf0Gc7OHF5Fug== dependencies: attr-accept "^2.2.2" file-selector "^0.6.0" @@ -8697,6 +8950,14 @@ react-hook-form@7.5.3: resolved "https://registry.yarnpkg.com/react-hook-form/-/react-hook-form-7.5.3.tgz#9a624fa14ec153b154891c5ebddae02ec5c2e40f" integrity sha512-5T0mfJ4kCPKljd7t3Rgp7lML4Y2+kaZIeMdN6Zo/J7gBQ+WkrDBHOftdOtz4X+7/eqHGak5yL5evNpYdA9abVA== +react-i18next@^12.0.0: + version "12.1.5" + resolved "https://registry.yarnpkg.com/react-i18next/-/react-i18next-12.1.5.tgz#b65f5733dd2f96188a9359c009b7dbe27443f009" + integrity sha512-7PQAv6DA0TcStG96fle+8RfTwxVbHVlZZJPoEszwUNvDuWpGldJmNWa3ZPesEsZQZGF6GkzwvEh6p57qpFD2gQ== + dependencies: + "@babel/runtime" "^7.20.6" + html-parse-stringify "^3.0.1" + react-immutable-proptypes@^2.1.0: version "2.2.0" resolved "https://registry.yarnpkg.com/react-immutable-proptypes/-/react-immutable-proptypes-2.2.0.tgz#cce96d68cc3c18e89617cbf3092d08e35126af4a" @@ -8704,10 +8965,10 @@ react-immutable-proptypes@^2.1.0: dependencies: invariant "^2.2.2" -react-inlinesvg@3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/react-inlinesvg/-/react-inlinesvg-3.0.0.tgz#801c6bac1535334586708cd346f4b1125dcfa8f9" - integrity sha512-zUt0DW3cKBk+vYZJJCzJqA9STRb+ZFmKLQFWurTvM4UR6vyHT8kHZSzyZZseX9BUNbTFJAfirtwpt97BWDJoSg== +react-inlinesvg@3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/react-inlinesvg/-/react-inlinesvg-3.0.1.tgz#2133f5d2c770ac405060db2ce1c13eed30e7e83b" + integrity sha512-cBfoyfseNI2PkDA7ZKIlDoHq0eMfpoC3DhKBQNC+/X1M4ZQB+aXW+YiNPUDDDKXUsGDUIZWWiZWNFeauDIVdoA== dependencies: exenv "^1.2.2" react-from-dom "^0.6.2" @@ -8732,7 +8993,7 @@ react-lifecycles-compat@^3.0.4: resolved "https://registry.yarnpkg.com/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz#4f1a273afdfc8f3488a8c516bfda78f872352362" integrity sha512-fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA== -react-popper-tooltip@^4.3.1: +react-popper-tooltip@4.4.2: version "4.4.2" resolved "https://registry.yarnpkg.com/react-popper-tooltip/-/react-popper-tooltip-4.4.2.tgz#0dc4894b8e00ba731f89bd2d30584f6032ec6163" integrity sha512-y48r0mpzysRTZAIh8m2kpZ8S1YPNqGtQPDrlXYSGvDS1c1GpG/NUXbsbIdfbhXfmSaRJuTcaT6N1q3CKuHRVbg== @@ -8796,35 +9057,27 @@ react-select-event@^5.1.0, react-select-event@^5.3.0: dependencies: "@testing-library/dom" ">=7" -react-select@5.4.0: - version "5.4.0" - resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.4.0.tgz#81f6ac73906126706f104751ee14437bd16798f4" - integrity sha512-CjE9RFLUvChd5SdlfG4vqxZd55AZJRrLrHzkQyTYeHlpOztqcgnyftYAolJ0SGsBev6zAs6qFrjm6KU3eo2hzg== +react-select@5.6.0: + version "5.6.0" + resolved "https://registry.yarnpkg.com/react-select/-/react-select-5.6.0.tgz#d987f4c86b3dcd32307a0104e503e4e8a9777a34" + integrity sha512-uUvP/72rA8NGhOL16RVBaeC12Wa4NUE0iXIa6hz0YRno9ZgxTmpuMeKzjR7vHcwmigpVCoe0prP+3NVb6Obq8Q== dependencies: "@babel/runtime" "^7.12.0" "@emotion/cache" "^11.4.0" "@emotion/react" "^11.8.1" + "@floating-ui/dom" "^1.0.1" "@types/react-transition-group" "^4.4.0" - memoize-one "^5.0.0" + memoize-one "^6.0.0" prop-types "^15.6.0" react-transition-group "^4.3.0" + use-isomorphic-layout-effect "^1.1.2" react-table@7.8.0: version "7.8.0" resolved "https://registry.yarnpkg.com/react-table/-/react-table-7.8.0.tgz#07858c01c1718c09f7f1aed7034fcfd7bda907d2" integrity sha512-hNaz4ygkZO4bESeFfnfOft73iBUj8K5oKi1EcSHPAibEydfsX2MyU6Z8KCr3mv3C9Kqqh71U+DhZkFvibbnPbA== -react-transition-group@4.4.2: - version "4.4.2" - resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470" - integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg== - dependencies: - "@babel/runtime" "^7.5.5" - dom-helpers "^5.0.1" - loose-envify "^1.4.0" - prop-types "^15.6.2" - -react-transition-group@^4.3.0: +react-transition-group@4.4.5, react-transition-group@^4.3.0: version "4.4.5" resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.5.tgz#e53d4e3f3344da8521489fbef8f2581d42becdd1" integrity sha512-pZcd1MCJoiKiBR2NRxeCRg13uCXbydPnmB4EOeRrY7480qNWO8IIgQG6zlDkm6uRMsURXPuKq0GWtiM59a5Q6g== @@ -8859,10 +9112,10 @@ react-use@17.4.0: ts-easing "^0.2.0" tslib "^2.1.0" -react-window@1.8.7: - version "1.8.7" - resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.7.tgz#5e9fd0d23f48f432d7022cdb327219353a15f0d4" - integrity sha512-JHEZbPXBpKMmoNO1bNhoXOOLg/ujhL/BU4IqVU9r8eQPcy5KQnGHIHDRkJ0ns9IM5+Aq5LNwt3j8t3tIrePQzA== +react-window@1.8.8: + version "1.8.8" + resolved "https://registry.yarnpkg.com/react-window/-/react-window-1.8.8.tgz#1b52919f009ddf91970cbdb2050a6c7be44df243" + integrity sha512-D4IiBeRtGXziZ1n0XklnFGu7h9gU684zepqyKzgPNzrsrk7xOCxni+TCckjg2Nr/DiaEEGVVmnhYSlT2rB47dQ== dependencies: "@babel/runtime" "^7.0.0" memoize-one ">=3.1.1 <6" @@ -8925,10 +9178,10 @@ regenerate@^1.4.2: resolved "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.2.tgz#b9346d8827e8f5a32f7ba29637d398b69014848a" integrity sha512-zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A== -regenerator-runtime@0.13.9: - version "0.13.9" - resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52" - integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA== +regenerator-runtime@0.13.10: + version "0.13.10" + resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.10.tgz#ed07b19616bcbec5da6274ebc75ae95634bfc2ee" + integrity sha512-KepLsg4dU12hryUO7bp/axHAKvwGOCV0sGloQtpagJ12ai+ojVDqkeGSiRX1zlq+kjIMZ1t7gpze+26QqtdGqw== regenerator-runtime@^0.11.0: version "0.11.1" @@ -9159,10 +9412,10 @@ rw@1, rw@^1.3.3: resolved "https://registry.yarnpkg.com/rw/-/rw-1.3.3.tgz#3f862dfa91ab766b14885ef4d01124bfda074fb4" integrity sha512-PdhdWy89SiZogBLaw42zdeqtRJ//zFd2PgQavcICDUgJT5oW10QCRKbJ6bg4r0/UY2M6BWd5tkxuGFRvCkgfHQ== -rxjs@7.5.6: - version "7.5.6" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.6.tgz#0446577557862afd6903517ce7cae79ecb9662bc" - integrity sha512-dnyv2/YsXhnm461G+R/Pe5bWP41Nm6LBXEYWI6eiFP4fiwx6WRI/CD0zbdVAudd9xwLEF2IDcKXLHit0FYjUzw== +rxjs@7.5.7: + version "7.5.7" + resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.7.tgz#2ec0d57fdc89ece220d2e702730ae8f1e49def39" + integrity sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA== dependencies: tslib "^2.1.0" @@ -9392,12 +9645,7 @@ slate-hotkeys@^0.2.9: is-hotkey "0.1.4" slate-dev-environment "^0.2.2" -slate-plain-serializer@0.7.11: - version "0.7.11" - resolved "https://registry.yarnpkg.com/slate-plain-serializer/-/slate-plain-serializer-0.7.11.tgz#74ff6eb949e9fbd92ad98ed833d74d5082f2688b" - integrity sha512-vzXQ68GiHHcTUcAB6ggf2qN/sX9BoLs77SMHacp5Gkg+oHAA/NxRzRH4efDAhpiJqfJZDrA3rQySK6+Y7KAuwg== - -slate-plain-serializer@^0.7.11: +slate-plain-serializer@0.7.13, slate-plain-serializer@^0.7.11: version "0.7.13" resolved "https://registry.yarnpkg.com/slate-plain-serializer/-/slate-plain-serializer-0.7.13.tgz#6de8f5c645dd749f1b2e4426c20de74bfd213adf" integrity sha512-TtrlaslxQBEMV0LYdf3s7VAbTxRPe1xaW10WNNGAzGA855/0RhkaHjKkQiRjHv5rvbRleVf7Nxr9fH+4uErfxQ== @@ -9728,6 +9976,11 @@ symbol-tree@^3.2.4: resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2" integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw== +systemjs@0.20.19: + version "0.20.19" + resolved "https://registry.yarnpkg.com/systemjs/-/systemjs-0.20.19.tgz#c2b9e79c19f4bea53a19b1ed3f974ffb463be949" + integrity sha512-H/rKwNEEyej/+IhkmFNmKFyJul8tbH/muiPq5TyNoVTwsGhUjRsN3NlFnFQUvFXA3+GQmsXkCNXU6QKPl779aw== + tapable@^1.0.0: version "1.1.3" resolved "https://registry.yarnpkg.com/tapable/-/tapable-1.1.3.tgz#a1fccc06b58db61fd7a45da2da44f5f3a3e67ba2" @@ -9927,15 +10180,20 @@ tslib@2.4.0: resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.0.tgz#7cecaa7f073ce680a05847aa77be941098f36dc3" integrity sha512-d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ== +tslib@2.4.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.4.0: + version "2.4.1" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e" + integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA== + tslib@^1.8.1, tslib@^1.9.3: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.3, tslib@^2.1.0, tslib@^2.3.0, tslib@^2.4.0: - version "2.4.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.4.1.tgz#0d0bfbaac2880b91e22df0768e55be9753a5b17e" - integrity sha512-tGyy4dAjRIEwI7BzsB0lynWgOpfqjUdq91XXAlIWD2OwKBH7oCl/GZG/HT4BOHrTlPMOASlMQ7veyTqpmRcrNA== +tslib@^2.4.1: + version "2.5.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.5.0.tgz#42bfed86f5787aeb41d031866c8f402429e0fddf" + integrity sha512-336iVw3rtn2BUK7ORdIAHTyxHGRIHVReokCR3XjbckJMK7ms8FysBfhLR8IXnAgy7T0PTPNBWKiH514FOW/WSg== tsutils@^3.21.0: version "3.21.0" @@ -9995,6 +10253,16 @@ typescript@4.8.2: resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.2.tgz#e3b33d5ccfb5914e4eeab6699cf208adee3fd790" integrity sha512-C0I1UsrrDHo2fYI5oaCGbSejwX4ch+9Y5jTQELvovfmFkK3HHSZJB8MSJcWLmCUBzQBchCrZ9rMRV6GuNrvGtw== +typescript@4.8.4: + version "4.8.4" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.8.4.tgz#c464abca159669597be5f96b8943500b238e60e6" + integrity sha512-QCh+85mCy+h0IGff8r5XWzOVSbBO+KfeYrMQh7NJ58QujwcE22u+NUSmUxqF+un70P9GXKxa2HCNiTTMJknyjQ== + +ua-parser-js@^1.0.32: + version "1.0.33" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-1.0.33.tgz#f21f01233e90e7ed0f059ceab46eb190ff17f8f4" + integrity sha512-RqshF7TPTE0XLYAqmjlu5cLLuGdKrNu9O1KLA/qp39QtbZwuzwv1dT46DZSopoUMsYgXpB3Cv8a03FI8b74oFQ== + unbox-primitive@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.2.tgz#29032021057d5e6cdbd08c5129c226dff8ed6f9e" @@ -10046,10 +10314,10 @@ update-browserslist-db@^1.0.9: escalade "^3.1.1" picocolors "^1.0.0" -uplot@1.6.22: - version "1.6.22" - resolved "https://registry.yarnpkg.com/uplot/-/uplot-1.6.22.tgz#28a136c7c5fce92ce5e25f38f19314a029bec390" - integrity sha512-2jtSb/YHUgtmIUn0+QJjf7ggcJicb5PKe7ijBiRDTPsG/f8F/MFayZ+g6/0kATNkDyF/qQsHJDmCp6cxncg1EQ== +uplot@1.6.23: + version "1.6.23" + resolved "https://registry.yarnpkg.com/uplot/-/uplot-1.6.23.tgz#3fdc341d9806cc15e95618a8d0f4ddfffa9c4ce7" + integrity sha512-zERH8HUbHE6kYyAqfP58SYuESp9M5jphSrMjsyckAM0DJ8C39SEI19YrpVvTCTLZB5joFUBPOwueRnJCdV2OdQ== uri-js@^4.2.2: version "4.4.1" @@ -10066,6 +10334,11 @@ url-parse@^1.5.3: querystringify "^2.1.1" requires-port "^1.0.0" +use-isomorphic-layout-effect@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/use-isomorphic-layout-effect/-/use-isomorphic-layout-effect-1.1.2.tgz#497cefb13d863d687b08477d9e5a164ad8c1a6fb" + integrity sha512-49L8yCO3iGT/ZF9QttjwLF/ZD9Iwto5LnH5LmEdk/6cFmXddqi2ulF0edxTwjj+7mqvpVVGQWvbXZdn32wRSHA== + use-memo-one@^1.1.1: version "1.1.3" resolved "https://registry.yarnpkg.com/use-memo-one/-/use-memo-one-1.1.3.tgz#2fd2e43a2169eabc7496960ace8c79efef975e99" @@ -10081,7 +10354,12 @@ utila@~0.4: resolved "https://registry.yarnpkg.com/utila/-/utila-0.4.0.tgz#8a16a05d445657a3aea5eecc5b12a4fa5379772c" integrity sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA== -uuid@8.3.2, uuid@^8.3.2: +uuid@9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-9.0.0.tgz#592f550650024a38ceb0c562f2f6aa435761efb5" + integrity sha512-MXcSTerfPa4uqyzStbRoTgt5XIe3x5+42+q1sDuy3R5MDk66URdLMOZe5aPX/SQd+kuYAh0FdP/pO28IkQyTeg== + +uuid@^8.3.2: version "8.3.2" resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2" integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg== @@ -10105,6 +10383,11 @@ value-equal@^1.0.1: resolved "https://registry.yarnpkg.com/value-equal/-/value-equal-1.0.1.tgz#1e0b794c734c5c0cade179c437d356d931a34d6c" integrity sha512-NOJ6JZCAWr0zlxZt+xqCHNTEKOsrks2HQd4MqhP1qy4z1SkbEP467eNx6TgDKXMvUOb+OENfJCZwM+16n7fRfw== +void-elements@3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/void-elements/-/void-elements-3.1.0.tgz#614f7fbf8d801f0bb5f0661f5b2f5785750e4f09" + integrity sha512-Dhxzh5HZuiHQhbvTW9AMetFfBHDMYpo23Uo9btPXgdYP+3T5S+p+jgNy7spra+veYhBP2dCSgxR/i2Y02h5/6w== + w3c-hr-time@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz#0a89cdf5cc15822df9c360543676963e0cc308cd" @@ -10148,6 +10431,11 @@ wcwidth@^1.0.1: dependencies: defaults "^1.0.3" +web-vitals@^3.0.4: + version "3.1.1" + resolved "https://registry.yarnpkg.com/web-vitals/-/web-vitals-3.1.1.tgz#bb124a03df7a135617f495c5bb7dbc30ecf2cce3" + integrity sha512-qvllU+ZeQChqzBhZ1oyXmWsjJ8a2jHYpH8AMaVuf29yscOPZfTQTjQFRX6+eADTdsDE8IanOZ0cetweHMs8/2A== + web-worker@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/web-worker/-/web-worker-1.2.0.tgz#5d85a04a7fbc1e7db58f66595d7a3ac7c9c180da" @@ -10320,10 +10608,10 @@ xmlchars@^2.2.0: resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb" integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw== -xss@1.0.13: - version "1.0.13" - resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.13.tgz#6e48f616128b39f366dfadc57411e1eb5b341c6c" - integrity sha512-clu7dxTm1e8Mo5fz3n/oW3UCXBfV89xZ72jM8yzo1vR/pIS0w3sgB3XV2H8Vm6zfGnHL0FzvLJPJEBhd86/z4Q== +xss@1.0.14: + version "1.0.14" + resolved "https://registry.yarnpkg.com/xss/-/xss-1.0.14.tgz#4f3efbde75ad0d82e9921cc3c95e6590dd336694" + integrity sha512-og7TEJhXvn1a7kzZGQ7ETjdQVS2UfZyTlsEdDOqvQF7GoxNfY+0YLCzBy1kPdsDDx4QuNAonQPddpsn6Xl/7sw== dependencies: commander "^2.20.3" cssfilter "0.0.10" From 05bcb50460a0dd99eb072fc8eb1495f746b05940 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ida=20=C5=A0tambuk?= Date: Thu, 9 Feb 2023 09:54:11 +0100 Subject: [PATCH 2/4] Fix test --- src/sql/QueryEditor/QueryEditorHeader.test.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/src/sql/QueryEditor/QueryEditorHeader.test.tsx b/src/sql/QueryEditor/QueryEditorHeader.test.tsx index 27065a2..4e9bcee 100644 --- a/src/sql/QueryEditor/QueryEditorHeader.test.tsx +++ b/src/sql/QueryEditor/QueryEditorHeader.test.tsx @@ -25,5 +25,6 @@ describe('QueryEditorHeader', () => { it('should display the run button if showAsyncQueryButtons prop is false', async () => { render(); expect(screen.getByText('Run query')).toBeInTheDocument(); + expect(screen.queryByText('Cancel query')).not.toBeInTheDocument(); }); }); From d9072b72a18e8a69dbfade27c404fb6d13cd4c43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ida=20=C5=A0tambuk?= Date: Fri, 10 Feb 2023 11:47:54 +0100 Subject: [PATCH 3/4] Improve test, update version of grafana/runtime --- package.json | 2 +- .../QueryEditor/QueryEditorHeader.test.tsx | 14 +- src/sql/QueryEditor/QueryEditorHeader.tsx | 50 ++++--- yarn.lock | 126 +----------------- 4 files changed, 43 insertions(+), 149 deletions(-) diff --git a/package.json b/package.json index ba875a1..6799d89 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ }, "devDependencies": { "@grafana/data": "9.3.2", - "@grafana/runtime": "9.3.6", + "@grafana/runtime": "9.3.2", "@grafana/toolkit": "9.3.2", "@grafana/ui": "9.3.2", "@rollup/plugin-node-resolve": "^15.0.1", diff --git a/src/sql/QueryEditor/QueryEditorHeader.test.tsx b/src/sql/QueryEditor/QueryEditorHeader.test.tsx index 4e9bcee..e08ad6f 100644 --- a/src/sql/QueryEditor/QueryEditorHeader.test.tsx +++ b/src/sql/QueryEditor/QueryEditorHeader.test.tsx @@ -1,10 +1,11 @@ import '@testing-library/jest-dom/extend-expect'; import React from 'react'; -import { render, screen } from '@testing-library/react'; +import { render } from '@testing-library/react'; import { mockQuery } from './__mocks__/query'; import { Props as QueryEditorHeaderProps, QueryEditorHeader } from './QueryEditorHeader'; import { DataQuery, DataSourceApi, DataSourceJsonData } from '@grafana/data'; import { RunQueryButtons } from '@grafana/async-query-data'; +import { Button } from '@grafana/ui'; const props: QueryEditorHeaderProps = { query: mockQuery, @@ -16,15 +17,22 @@ const props: QueryEditorHeaderProps ({ RunQueryButtons: jest.fn(() =>
Buttons
), })); +jest.mock('@grafana/ui', () => ({ + ...jest.requireActual('@grafana/ui'), + Button: jest.fn(() =>
Button
), +})); describe('QueryEditorHeader', () => { + afterEach(() => { + jest.clearAllMocks(); + }); it('should display RunQueryButtons if showAsyncQueryButtons prop is true', async () => { render(); expect(RunQueryButtons).toHaveBeenCalled(); }); it('should display the run button if showAsyncQueryButtons prop is false', async () => { render(); - expect(screen.getByText('Run query')).toBeInTheDocument(); - expect(screen.queryByText('Cancel query')).not.toBeInTheDocument(); + expect(Button).toHaveBeenCalled(); + expect(RunQueryButtons).not.toHaveBeenCalled(); }); }); diff --git a/src/sql/QueryEditor/QueryEditorHeader.tsx b/src/sql/QueryEditor/QueryEditorHeader.tsx index baef965..f208c52 100644 --- a/src/sql/QueryEditor/QueryEditorHeader.tsx +++ b/src/sql/QueryEditor/QueryEditorHeader.tsx @@ -33,31 +33,29 @@ export function QueryEditorHeader< cancel, }: Props): JSX.Element { return ( - <> - - {extraHeaderElementLeft} - - {showAsyncQueryButtons ? ( - - ) : ( - - )} - {extraHeaderElementRight} - - + + {extraHeaderElementLeft} + + {showAsyncQueryButtons ? ( + + ) : ( + + )} + {extraHeaderElementRight} + ); } diff --git a/yarn.lock b/yarn.lock index 027ff47..0701621 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1456,32 +1456,6 @@ uplot "1.6.23" xss "1.0.14" -"@grafana/data@9.3.6": - version "9.3.6" - resolved "https://registry.yarnpkg.com/@grafana/data/-/data-9.3.6.tgz#ac55539d0e941991701698b5157a31f59a6c81c6" - integrity sha512-PTRJZ2k4nSTuZLtsqiY/oDOTf6ul1pLt54vi/7Gb4U+GOmd5nUdc/zU+S9MN4iJfzS5INby0Df8zwUO1BV82qQ== - dependencies: - "@braintree/sanitize-url" "6.0.1" - "@grafana/schema" "9.3.6" - "@types/d3-interpolate" "^1.4.0" - d3-interpolate "1.4.0" - date-fns "2.29.3" - eventemitter3 "4.0.7" - fast_array_intersect "1.1.0" - history "4.10.1" - lodash "4.17.21" - marked "4.2.0" - moment "2.29.4" - moment-timezone "0.5.38" - ol "7.1.0" - papaparse "5.3.2" - regenerator-runtime "0.13.10" - rxjs "7.5.7" - tinycolor2 "1.4.2" - tslib "2.4.1" - uplot "1.6.23" - xss "1.0.14" - "@grafana/e2e-selectors@9.3.2": version "9.3.2" resolved "https://registry.yarnpkg.com/@grafana/e2e-selectors/-/e2e-selectors-9.3.2.tgz#cf13e9ec9e293cc2de2372a371eaf8327c1059ec" @@ -1491,15 +1465,6 @@ tslib "2.4.1" typescript "4.8.4" -"@grafana/e2e-selectors@9.3.6": - version "9.3.6" - resolved "https://registry.yarnpkg.com/@grafana/e2e-selectors/-/e2e-selectors-9.3.6.tgz#892244dee5eca6f2bc32922a02ae142fef4c9293" - integrity sha512-IoVt72P0RF3OlmVN3whfj/t4DCbA1jI/FrXx0eKyZTfxrnMD1J/I5E78g4n5z8vEp+wc5H7YoWXI0NuaTtdnGw== - dependencies: - "@grafana/tsconfig" "^1.2.0-rc1" - tslib "2.4.1" - typescript "4.8.4" - "@grafana/eslint-config@5.0.0": version "5.0.0" resolved "https://registry.yarnpkg.com/@grafana/eslint-config/-/eslint-config-5.0.0.tgz#e08a89d378772340bc6cd1872ec4d15666269aba" @@ -1540,15 +1505,15 @@ ua-parser-js "^1.0.32" web-vitals "^3.0.4" -"@grafana/runtime@9.3.6": - version "9.3.6" - resolved "https://registry.yarnpkg.com/@grafana/runtime/-/runtime-9.3.6.tgz#1c606d589ea1df49c72e04c42583e64ef3e02f6b" - integrity sha512-rcEg4D8x5RWJ8LkN7DBsrS6sJbsn+1DBW1JV2pJ4CTWI/37ssdykk51hmKH1azVGcFYTouhpHz9qmFDnWqU3hw== +"@grafana/runtime@9.3.2": + version "9.3.2" + resolved "https://registry.yarnpkg.com/@grafana/runtime/-/runtime-9.3.2.tgz#19a19d790dff6bf7c5275156ad66e198acbfd5f0" + integrity sha512-EqAWLSUeMpHEHz0kjFr+vrj0h6KNhPTVGeD2Y/BxYwaaqLmAG99ZGvGTmGv88h8Zx5CfI0MVOAKU4dcDNmRmpA== dependencies: - "@grafana/data" "9.3.6" - "@grafana/e2e-selectors" "9.3.6" + "@grafana/data" "9.3.2" + "@grafana/e2e-selectors" "9.3.2" "@grafana/faro-web-sdk" "1.0.0-beta2" - "@grafana/ui" "9.3.6" + "@grafana/ui" "9.3.2" "@sentry/browser" "6.19.7" history "4.10.1" lodash "4.17.21" @@ -1563,13 +1528,6 @@ dependencies: tslib "2.4.1" -"@grafana/schema@9.3.6": - version "9.3.6" - resolved "https://registry.yarnpkg.com/@grafana/schema/-/schema-9.3.6.tgz#e0b02c78adc31403fbc33ab6007c631b8664f9a4" - integrity sha512-nY+UQ5b4hN8xJUaiYVzZpF/pcD34OKRuBuKf7A+WggzbUGx+yosE5iPNbzZw1zGDeX4h83W+tIVKgwVZ+L0CBw== - dependencies: - tslib "2.4.1" - "@grafana/toolkit@9.3.2": version "9.3.2" resolved "https://registry.yarnpkg.com/@grafana/toolkit/-/toolkit-9.3.2.tgz#6e632269b5b3dd3c234bf8637bc1864f3b856d0a" @@ -1735,76 +1693,6 @@ uplot "1.6.23" uuid "9.0.0" -"@grafana/ui@9.3.6": - version "9.3.6" - resolved "https://registry.yarnpkg.com/@grafana/ui/-/ui-9.3.6.tgz#81c3cc4c8f0045bf0a9648cbdab1db4f40c9d502" - integrity sha512-41m7H5fgX4NhMTH8W7Bq2/EpwwKDbSD7bfdvsJBOXrATaQExd8ag393fPFz8+WvgF/JQ921MZv8/zdwoVUvwZg== - dependencies: - "@emotion/css" "11.10.5" - "@emotion/react" "11.10.5" - "@grafana/data" "9.3.6" - "@grafana/e2e-selectors" "9.3.6" - "@grafana/schema" "9.3.6" - "@leeoniya/ufuzzy" "0.8.0" - "@monaco-editor/react" "4.4.6" - "@popperjs/core" "2.11.6" - "@react-aria/button" "3.6.1" - "@react-aria/dialog" "3.3.1" - "@react-aria/focus" "3.8.0" - "@react-aria/menu" "3.6.1" - "@react-aria/overlays" "3.10.1" - "@react-aria/utils" "3.13.1" - "@react-stately/menu" "3.4.1" - "@sentry/browser" "6.19.7" - ansicolor "1.1.100" - calculate-size "1.1.1" - classnames "2.3.2" - core-js "3.26.0" - d3 "5.15.0" - date-fns "2.29.3" - hoist-non-react-statics "3.3.2" - i18next "^22.0.0" - immutable "4.1.0" - is-hotkey "0.2.0" - jquery "3.6.1" - lodash "4.17.21" - memoize-one "6.0.0" - moment "2.29.4" - monaco-editor "0.34.0" - ol "7.1.0" - prismjs "1.29.0" - rc-cascader "3.7.0" - rc-drawer "4.4.3" - rc-slider "10.0.1" - rc-time-picker "^3.7.3" - rc-tooltip "5.2.2" - react-beautiful-dnd "13.1.1" - react-calendar "3.9.0" - react-colorful "5.6.1" - react-custom-scrollbars-2 "4.5.0" - react-dropzone "14.2.3" - react-highlight-words "0.18.0" - react-hook-form "7.5.3" - react-i18next "^12.0.0" - react-inlinesvg "3.0.1" - react-popper "2.3.0" - react-popper-tooltip "4.4.2" - react-router-dom "^5.2.0" - react-select "5.6.0" - react-select-event "^5.1.0" - react-table "7.8.0" - react-transition-group "4.4.5" - react-use "17.4.0" - react-window "1.8.8" - rxjs "7.5.7" - slate "0.47.9" - slate-plain-serializer "0.7.13" - slate-react "0.22.10" - tinycolor2 "1.4.2" - tslib "2.4.1" - uplot "1.6.23" - uuid "9.0.0" - "@humanwhocodes/config-array@^0.9.2": version "0.9.5" resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.9.5.tgz#2cbaf9a89460da24b5ca6531b8bbfc23e1df50c7" From d5c3bb9f208956a600fd15decbefe0caa373d43c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ida=20=C5=A0tambuk?= Date: Fri, 10 Feb 2023 16:24:45 +0100 Subject: [PATCH 4/4] Prepare release 0.0.43 --- CHANGELOG.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 998caa2..6d7d343 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ # Change Log All notable changes to this project will be documented in this file. + +## v0.0.43 + +- Query Editor: Add `QueryEditorHeader` component +- UI: Export default label width for Configs + ## v0.0.42 - Export DEFAULT_LABEL_WIDTH for Config Editor components diff --git a/package.json b/package.json index 6799d89..ca71056 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@grafana/aws-sdk", - "version": "0.0.42", + "version": "0.0.43", "description": "Common AWS features for grafana", "main": "dist/index.js", "publishConfig": {