From 027d5bcfad7d29bad7f35237b9b529cb8f540fdc Mon Sep 17 00:00:00 2001 From: asimonok Date: Fri, 12 Jul 2024 09:40:02 +0300 Subject: [PATCH 1/5] Show dates in dashboard timeZone --- package-lock.json | 301 +++++++++++++++++- package.json | 2 +- .../ElementSections/ElementSections.tsx | 9 + src/components/FormElement/FormElement.tsx | 30 +- src/components/FormElements/FormElements.tsx | 16 +- src/components/FormPanel/FormPanel.tsx | 3 + 6 files changed, 346 insertions(+), 15 deletions(-) diff --git a/package-lock.json b/package-lock.json index 806cbd8d..453f160f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,18 +1,18 @@ { "name": "volkovlabs-form-panel", - "version": "4.0.0", + "version": "4.2.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "volkovlabs-form-panel", - "version": "4.0.0", + "version": "4.2.0", "license": "Apache-2.0", "dependencies": { "@emotion/css": "^11.11.2", "@grafana/data": "^11.1.0", "@grafana/runtime": "^11.1.0", - "@grafana/ui": "^11.1.0", + "@grafana/ui": "^11.2.0-186891", "@hello-pangea/dnd": "^16.6.0", "@volkovlabs/components": "^2.6.0", "react": "^18.3.1", @@ -1396,6 +1396,89 @@ "react-dom": "^18.0.0" } }, + "node_modules/@grafana/runtime/node_modules/@grafana/ui": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.0.tgz", + "integrity": "sha512-oOOOjvH8GzCyflOuI6q5Dan/4UuOkZ6YnpuPubU4a5LUqAVKJvrudtqdUmQPvpbuQ7pWzYQ8UNoBtVRptSQQdg==", + "dependencies": { + "@emotion/css": "11.11.2", + "@emotion/react": "11.11.4", + "@floating-ui/react": "0.26.16", + "@grafana/data": "11.1.0", + "@grafana/e2e-selectors": "11.1.0", + "@grafana/faro-web-sdk": "^1.3.6", + "@grafana/schema": "11.1.0", + "@leeoniya/ufuzzy": "1.0.14", + "@monaco-editor/react": "4.6.0", + "@popperjs/core": "2.11.8", + "@react-aria/dialog": "3.5.14", + "@react-aria/focus": "3.17.1", + "@react-aria/overlays": "3.22.1", + "@react-aria/utils": "3.24.1", + "ansicolor": "1.1.100", + "calculate-size": "1.1.1", + "classnames": "2.5.1", + "d3": "7.9.0", + "date-fns": "3.6.0", + "hoist-non-react-statics": "3.3.2", + "i18next": "^23.0.0", + "i18next-browser-languagedetector": "^7.0.2", + "immutable": "4.3.6", + "is-hotkey": "0.2.0", + "jquery": "3.7.1", + "lodash": "4.17.21", + "micro-memoize": "^4.1.2", + "moment": "2.30.1", + "monaco-editor": "0.34.1", + "ol": "7.4.0", + "prismjs": "1.29.0", + "rc-cascader": "3.26.0", + "rc-drawer": "7.2.0", + "rc-slider": "10.6.2", + "rc-time-picker": "^3.7.3", + "rc-tooltip": "6.2.0", + "react-beautiful-dnd": "13.1.1", + "react-calendar": "4.8.0", + "react-colorful": "5.6.1", + "react-custom-scrollbars-2": "4.5.0", + "react-dropzone": "14.2.3", + "react-highlight-words": "0.20.0", + "react-hook-form": "^7.49.2", + "react-i18next": "^14.0.0", + "react-inlinesvg": "3.0.2", + "react-loading-skeleton": "3.4.0", + "react-router-dom": "5.3.3", + "react-select": "5.8.0", + "react-table": "7.8.0", + "react-transition-group": "4.4.5", + "react-use": "17.5.0", + "react-window": "1.8.10", + "rxjs": "7.8.1", + "slate": "0.47.9", + "slate-plain-serializer": "0.7.13", + "slate-react": "0.22.10", + "tinycolor2": "1.6.0", + "tslib": "2.6.3", + "uplot": "1.6.30", + "uuid": "9.0.1" + }, + "peerDependencies": { + "react": "^18.0.0", + "react-dom": "^18.0.0" + } + }, + "node_modules/@grafana/runtime/node_modules/uuid": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "bin": { + "uuid": "dist/bin/uuid" + } + }, "node_modules/@grafana/schema": { "version": "11.1.0", "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.0.tgz", @@ -1410,17 +1493,17 @@ "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" }, "node_modules/@grafana/ui": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.0.tgz", - "integrity": "sha512-oOOOjvH8GzCyflOuI6q5Dan/4UuOkZ6YnpuPubU4a5LUqAVKJvrudtqdUmQPvpbuQ7pWzYQ8UNoBtVRptSQQdg==", + "version": "11.2.0-186891", + "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.2.0-186891.tgz", + "integrity": "sha512-5UKPXPvqjhxODnNKQFOXdG8zLdiez+v0yKGX1gJmFCQyAR5xeeTgcM1SKXr2wz5N0oN9rxh+71uF/Zc0YpUN5g==", "dependencies": { "@emotion/css": "11.11.2", "@emotion/react": "11.11.4", "@floating-ui/react": "0.26.16", - "@grafana/data": "11.1.0", - "@grafana/e2e-selectors": "11.1.0", + "@grafana/data": "11.2.0-186891", + "@grafana/e2e-selectors": "11.2.0-186891", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.0", + "@grafana/schema": "11.2.0-186891", "@leeoniya/ufuzzy": "1.0.14", "@monaco-editor/react": "4.6.0", "@popperjs/core": "2.11.8", @@ -1428,11 +1511,13 @@ "@react-aria/focus": "3.17.1", "@react-aria/overlays": "3.22.1", "@react-aria/utils": "3.24.1", + "@tanstack/react-virtual": "^3.5.1", "ansicolor": "1.1.100", "calculate-size": "1.1.1", "classnames": "2.5.1", "d3": "7.9.0", "date-fns": "3.6.0", + "downshift": "^9.0.6", "hoist-non-react-statics": "3.3.2", "i18next": "^23.0.0", "i18next-browser-languagedetector": "^7.0.2", @@ -1480,6 +1565,71 @@ "react-dom": "^18.0.0" } }, + "node_modules/@grafana/ui/node_modules/@grafana/data": { + "version": "11.2.0-186891", + "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.2.0-186891.tgz", + "integrity": "sha512-2/qE5yDkH71uWMZsB5PvlYd/GT4rae2fg6Y+izKlklq9NJBnJwk/p7UdP1a1KU6IGdeItzikdjz+w+a8N+KTPg==", + "dependencies": { + "@braintree/sanitize-url": "7.0.1", + "@grafana/schema": "11.2.0-186891", + "@types/d3-interpolate": "^3.0.0", + "@types/string-hash": "1.1.3", + "d3-interpolate": "3.0.1", + "date-fns": "3.6.0", + "dompurify": "^3.0.0", + "eventemitter3": "5.0.1", + "fast_array_intersect": "1.1.0", + "history": "4.10.1", + "lodash": "4.17.21", + "marked": "12.0.2", + "marked-mangle": "1.1.7", + "moment": "2.30.1", + "moment-timezone": "0.5.45", + "ol": "7.4.0", + "papaparse": "5.4.1", + "react-use": "17.5.0", + "rxjs": "7.8.1", + "string-hash": "^1.1.3", + "tinycolor2": "1.6.0", + "tslib": "2.6.3", + "uplot": "1.6.30", + "xss": "^1.0.14" + }, + "peerDependencies": { + "react": "^18.0.0", + "react-dom": "^18.0.0" + } + }, + "node_modules/@grafana/ui/node_modules/@grafana/e2e-selectors": { + "version": "11.2.0-186891", + "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.2.0-186891.tgz", + "integrity": "sha512-uCKDWqhga+9X3Zq5e/+bVOk8Xq8J8Whbx99RRz4/9zyhitWhXBVDnWrr6QhGOFI0rB4L4kcQy30jlpM+iSqf7w==", + "dependencies": { + "@grafana/tsconfig": "^1.3.0-rc1", + "tslib": "2.6.3", + "typescript": "5.4.5" + } + }, + "node_modules/@grafana/ui/node_modules/@grafana/schema": { + "version": "11.2.0-186891", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.2.0-186891.tgz", + "integrity": "sha512-+Xfa4nkqABQt0wuEP/8PyZEKnEdd4w7vgPBjOsmO12TsK09YkTzKEtXYiWCOFoHRG6hpBEb681paU6JRhcN4dA==", + "dependencies": { + "tslib": "2.6.3" + } + }, + "node_modules/@grafana/ui/node_modules/typescript": { + "version": "5.4.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", + "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, "node_modules/@grafana/ui/node_modules/uuid": { "version": "9.0.1", "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", @@ -3346,6 +3496,31 @@ "@swc/counter": "^0.1.3" } }, + "node_modules/@tanstack/react-virtual": { + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.8.3.tgz", + "integrity": "sha512-9ICwbDUUzN99CJIGc373i8NLoj6zFTKI2Hlcmo0+lCSAhPQ5mxq4dGOMKmLYoEFyHcGQ64Bd6ZVbnPpM6lNK5w==", + "dependencies": { + "@tanstack/virtual-core": "3.8.3" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/tannerlinsley" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" + } + }, + "node_modules/@tanstack/virtual-core": { + "version": "3.8.3", + "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.8.3.tgz", + "integrity": "sha512-vd2A2TnM5lbnWZnHi9B+L2gPtkSeOtJOAw358JqokIH1+v2J7vUAzFVPwB/wrye12RFOurffXu33plm4uQ+JBQ==", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/tannerlinsley" + } + }, "node_modules/@testing-library/dom": { "version": "10.2.0", "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.2.0.tgz", @@ -4125,6 +4300,89 @@ "react-dom": "^18.0.0" } }, + "node_modules/@volkovlabs/components/node_modules/@grafana/ui": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.0.tgz", + "integrity": "sha512-oOOOjvH8GzCyflOuI6q5Dan/4UuOkZ6YnpuPubU4a5LUqAVKJvrudtqdUmQPvpbuQ7pWzYQ8UNoBtVRptSQQdg==", + "dependencies": { + "@emotion/css": "11.11.2", + "@emotion/react": "11.11.4", + "@floating-ui/react": "0.26.16", + "@grafana/data": "11.1.0", + "@grafana/e2e-selectors": "11.1.0", + "@grafana/faro-web-sdk": "^1.3.6", + "@grafana/schema": "11.1.0", + "@leeoniya/ufuzzy": "1.0.14", + "@monaco-editor/react": "4.6.0", + "@popperjs/core": "2.11.8", + "@react-aria/dialog": "3.5.14", + "@react-aria/focus": "3.17.1", + "@react-aria/overlays": "3.22.1", + "@react-aria/utils": "3.24.1", + "ansicolor": "1.1.100", + "calculate-size": "1.1.1", + "classnames": "2.5.1", + "d3": "7.9.0", + "date-fns": "3.6.0", + "hoist-non-react-statics": "3.3.2", + "i18next": "^23.0.0", + "i18next-browser-languagedetector": "^7.0.2", + "immutable": "4.3.6", + "is-hotkey": "0.2.0", + "jquery": "3.7.1", + "lodash": "4.17.21", + "micro-memoize": "^4.1.2", + "moment": "2.30.1", + "monaco-editor": "0.34.1", + "ol": "7.4.0", + "prismjs": "1.29.0", + "rc-cascader": "3.26.0", + "rc-drawer": "7.2.0", + "rc-slider": "10.6.2", + "rc-time-picker": "^3.7.3", + "rc-tooltip": "6.2.0", + "react-beautiful-dnd": "13.1.1", + "react-calendar": "4.8.0", + "react-colorful": "5.6.1", + "react-custom-scrollbars-2": "4.5.0", + "react-dropzone": "14.2.3", + "react-highlight-words": "0.20.0", + "react-hook-form": "^7.49.2", + "react-i18next": "^14.0.0", + "react-inlinesvg": "3.0.2", + "react-loading-skeleton": "3.4.0", + "react-router-dom": "5.3.3", + "react-select": "5.8.0", + "react-table": "7.8.0", + "react-transition-group": "4.4.5", + "react-use": "17.5.0", + "react-window": "1.8.10", + "rxjs": "7.8.1", + "slate": "0.47.9", + "slate-plain-serializer": "0.7.13", + "slate-react": "0.22.10", + "tinycolor2": "1.6.0", + "tslib": "2.6.3", + "uplot": "1.6.30", + "uuid": "9.0.1" + }, + "peerDependencies": { + "react": "^18.0.0", + "react-dom": "^18.0.0" + } + }, + "node_modules/@volkovlabs/components/node_modules/uuid": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "bin": { + "uuid": "dist/bin/uuid" + } + }, "node_modules/@volkovlabs/eslint-config": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/@volkovlabs/eslint-config/-/eslint-config-1.3.0.tgz", @@ -5432,6 +5690,11 @@ "resolved": "https://registry.npmjs.org/component-indexof/-/component-indexof-0.0.3.tgz", "integrity": "sha512-puDQKvx/64HZXb4hBwIcvQLaLgux8o1CbWl39s41hrIIZDl1lJiD5jc22gj3RBeGK0ovxALDYpIbyjqDUUl0rw==" }, + "node_modules/compute-scroll-into-view": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-3.1.0.tgz", + "integrity": "sha512-rj8l8pD4bJ1nx+dAkMhV1xB5RuZEyVysfxJqB1pRchh1KVvwOv9b7CGB8ZfjTImVv2oF+sYMUkMZq6Na5Ftmbg==" + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -6466,6 +6729,26 @@ "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.5.tgz", "integrity": "sha512-lwG+n5h8QNpxtyrJW/gJWckL+1/DQiYMX8f7t8Z2AZTPw1esVrqjI63i7Zc2Gz0aKzLVMYC1V1PL/ky+aY/NgA==" }, + "node_modules/downshift": { + "version": "9.0.6", + "resolved": "https://registry.npmjs.org/downshift/-/downshift-9.0.6.tgz", + "integrity": "sha512-lkqWh0eb34XuH+3z3/BH/LGVRV7ur0rielSlxtlQKsjAFF/wc/c0wsM9phUGXyzK2g1QWHoNHQyc+vVAheI17Q==", + "dependencies": { + "@babel/runtime": "^7.24.5", + "compute-scroll-into-view": "^3.1.0", + "prop-types": "^15.8.1", + "react-is": "18.2.0", + "tslib": "^2.6.2" + }, + "peerDependencies": { + "react": ">=16.12.0" + } + }, + "node_modules/downshift/node_modules/react-is": { + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==" + }, "node_modules/earcut": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/earcut/-/earcut-2.2.4.tgz", diff --git a/package.json b/package.json index 9cfe7f8f..8f0ee5cb 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "@emotion/css": "^11.11.2", "@grafana/data": "^11.1.0", "@grafana/runtime": "^11.1.0", - "@grafana/ui": "^11.1.0", + "@grafana/ui": "^11.2.0-186891", "@hello-pangea/dnd": "^16.6.0", "@volkovlabs/components": "^2.6.0", "react": "^18.3.1", diff --git a/src/components/ElementSections/ElementSections.tsx b/src/components/ElementSections/ElementSections.tsx index 87cd22b8..8ea33898 100644 --- a/src/components/ElementSections/ElementSections.tsx +++ b/src/components/ElementSections/ElementSections.tsx @@ -59,6 +59,13 @@ interface Props { * On Change Section Expanded State */ onChangeSectionExpandedState: (id: string, isExpanded: boolean) => void; + + /** + * Time Zone + * + * @type {string} + */ + timeZone: string; } /** @@ -73,6 +80,7 @@ export const ElementSections: React.FC = ({ data, sectionsExpandedState, onChangeSectionExpandedState, + timeZone, }) => { /** * Theme and Styles @@ -128,6 +136,7 @@ export const ElementSections: React.FC = ({ section={section} replaceVariables={replaceVariables} data={data} + timeZone={timeZone} /> )} diff --git a/src/components/FormElement/FormElement.tsx b/src/components/FormElement/FormElement.tsx index 6bbd44ea..6f99f002 100644 --- a/src/components/FormElement/FormElement.tsx +++ b/src/components/FormElement/FormElement.tsx @@ -1,5 +1,5 @@ import { cx } from '@emotion/css'; -import { DateTime, dateTime } from '@grafana/data'; +import { dateTime, DateTime, dateTimeForTimeZone, getTimeZone } from '@grafana/data'; import { Checkbox, DatePickerWithInput, @@ -19,7 +19,7 @@ import { } from '@grafana/ui'; import { AutosizeCodeEditor, NumberInput } from '@volkovlabs/components'; import Slider from 'rc-slider'; -import React, { ChangeEvent } from 'react'; +import React, { ChangeEvent, useCallback } from 'react'; import { BOOLEAN_ELEMENT_OPTIONS, FormElementType, TEST_IDS } from '../../constants'; import { CodeLanguage, LinkTarget, LocalFormElement } from '../../types'; @@ -46,18 +46,37 @@ interface Props { * Highlight Class */ highlightClass: (element: LocalFormElement) => string; + + /** + * Time Zone + * + * @type {string} + */ + timeZone: string; } /** * Form Element */ -export const FormElement: React.FC = ({ element, onChange, highlightClass }) => { +export const FormElement: React.FC = ({ element, onChange, highlightClass, timeZone }) => { /** * Styles and Theme */ const theme = useTheme2(); const styles = useStyles2(getStyles); + /** + * To Date Time With Time Zone + */ + const toDateTimeWithTimeZone = useCallback( + (date?: string) => { + return dateTimeForTimeZone(getTimeZone({ timeZone }), date); + }, + [timeZone] + ); + + console.log('timeZone', timeZone); + return ( = ({ element, onChange, highlightClass } }} data-testid={TEST_IDS.formElements.fieldDateTime} + timeZone={timeZone} /> )} @@ -324,7 +344,9 @@ export const FormElement: React.FC = ({ element, onChange, highlightClass > { onChange({ ...element, diff --git a/src/components/FormElements/FormElements.tsx b/src/components/FormElements/FormElements.tsx index 5a4d8284..dfbefc6c 100644 --- a/src/components/FormElements/FormElements.tsx +++ b/src/components/FormElements/FormElements.tsx @@ -49,6 +49,11 @@ interface Props { * Data */ data: PanelData; + + /** + * Time Zone + */ + timeZone: string; } /** @@ -62,6 +67,7 @@ export const FormElements: React.FC = ({ initial, replaceVariables, data, + timeZone, }) => { /** * Theme and Styles @@ -119,7 +125,15 @@ export const FormElements: React.FC = ({ /** * Return */ - return ; + return ( + + ); })} ); diff --git a/src/components/FormPanel/FormPanel.tsx b/src/components/FormPanel/FormPanel.tsx index 0f9f518a..455275c5 100644 --- a/src/components/FormPanel/FormPanel.tsx +++ b/src/components/FormPanel/FormPanel.tsx @@ -78,6 +78,7 @@ export const FormPanel: React.FC = ({ eventBus, replaceVariables, data, + timeZone, }) => { const [loading, setLoading] = useState(LoadingMode.INITIAL); const [error, setError] = useState(''); @@ -912,6 +913,7 @@ export const FormPanel: React.FC = ({ initial={initial} section={null} replaceVariables={replaceVariables} + timeZone={timeZone} /> ) : ( @@ -924,6 +926,7 @@ export const FormPanel: React.FC = ({ replaceVariables={replaceVariables} sectionsExpandedState={sectionsExpandedState} onChangeSectionExpandedState={onChangeSectionExpandedState} + timeZone={timeZone} /> )} From a844efc8709c3194298519d7cd68fe5015500cc3 Mon Sep 17 00:00:00 2001 From: asimonok Date: Fri, 12 Jul 2024 09:40:26 +0300 Subject: [PATCH 2/5] Fix lint errors --- src/components/FormElement/FormElement.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/components/FormElement/FormElement.tsx b/src/components/FormElement/FormElement.tsx index 6f99f002..d8035762 100644 --- a/src/components/FormElement/FormElement.tsx +++ b/src/components/FormElement/FormElement.tsx @@ -1,5 +1,5 @@ import { cx } from '@emotion/css'; -import { dateTime, DateTime, dateTimeForTimeZone, getTimeZone } from '@grafana/data'; +import { DateTime, dateTime, dateTimeForTimeZone, getTimeZone } from '@grafana/data'; import { Checkbox, DatePickerWithInput, @@ -75,8 +75,6 @@ export const FormElement: React.FC = ({ element, onChange, highlightClass [timeZone] ); - console.log('timeZone', timeZone); - return ( Date: Mon, 2 Sep 2024 15:01:05 +0300 Subject: [PATCH 3/5] Fix after merge --- package-lock.json | 711 ++++++++++++++---- package.json | 2 +- .../CustomCodeEditor.test.tsx | 13 +- src/components/FormElement/FormElement.tsx | 17 +- .../DateTimeElement/DateTimeElement.tsx | 10 +- .../components/TimeElement/TimeElement.tsx | 25 +- src/components/FormElements/FormElements.tsx | 7 +- 7 files changed, 623 insertions(+), 162 deletions(-) diff --git a/package-lock.json b/package-lock.json index 803945dd..c27b728f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "@emotion/css": "^11.11.2", "@grafana/data": "^11.1.0", "@grafana/runtime": "^11.1.0", - "@grafana/ui": "^11.1.0", + "@grafana/ui": "^11.2.0", "@hello-pangea/dnd": "^16.6.0", "@volkovlabs/components": "^2.8.1", "react": "^18.3.1", @@ -985,12 +985,12 @@ } }, "node_modules/@floating-ui/react": { - "version": "0.26.16", - "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.26.16.tgz", - "integrity": "sha512-HEf43zxZNAI/E781QIVpYSF3K2VH4TTYZpqecjdsFkjsaU1EbaWcM++kw0HXFffj7gDUcBFevX8s0rQGQpxkow==", + "version": "0.26.22", + "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.26.22.tgz", + "integrity": "sha512-LNv4azPt8SpT4WW7Kku5JNVjLk2GcS0bGGjFTAgqOONRFo9r/aaGHHPpdiIuQbB1t8shmWyWqTTUDmZ9fcNshg==", "dependencies": { - "@floating-ui/react-dom": "^2.1.0", - "@floating-ui/utils": "^0.2.0", + "@floating-ui/react-dom": "^2.1.1", + "@floating-ui/utils": "^0.2.7", "tabbable": "^6.0.0" }, "peerDependencies": { @@ -1011,9 +1011,9 @@ } }, "node_modules/@floating-ui/utils": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.3.tgz", - "integrity": "sha512-XGndio0l5/Gvd6CLIABvsav9HHezgDFFhDfHk1bvLfr9ni8dojqLSvBbotJEjmIwNHL7vK4QzBJTdBRoB+c1ww==" + "version": "0.2.7", + "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.7.tgz", + "integrity": "sha512-X8R8Oj771YRl/w+c1HqAC1szL8zWQRwFvgDwT129k9ACdBoud/+/rX9V0qiMl6LWUdP9voC2nDVZYPMQQsb6eA==" }, "node_modules/@formatjs/ecma402-abstract": { "version": "2.0.0", @@ -1397,20 +1397,21 @@ "react-dom": "^18.0.0" } }, - "node_modules/@grafana/schema": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.0.tgz", - "integrity": "sha512-HxKeMNrvRDkxBHfwExGZ9MdPYf68n8tctH3aCMFMf/csdlM5EEmgYOOJ1yVLVSxAqiZcb8y6TmL+2QOuP0RK3A==", + "node_modules/@grafana/runtime/node_modules/@floating-ui/react": { + "version": "0.26.16", + "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.26.16.tgz", + "integrity": "sha512-HEf43zxZNAI/E781QIVpYSF3K2VH4TTYZpqecjdsFkjsaU1EbaWcM++kw0HXFffj7gDUcBFevX8s0rQGQpxkow==", "dependencies": { - "tslib": "2.6.3" + "@floating-ui/react-dom": "^2.1.0", + "@floating-ui/utils": "^0.2.0", + "tabbable": "^6.0.0" + }, + "peerDependencies": { + "react": ">=16.8.0", + "react-dom": ">=16.8.0" } }, - "node_modules/@grafana/tsconfig": { - "version": "1.3.0-rc1", - "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", - "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" - }, - "node_modules/@grafana/ui": { + "node_modules/@grafana/runtime/node_modules/@grafana/ui": { "version": "11.1.0", "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.0.tgz", "integrity": "sha512-oOOOjvH8GzCyflOuI6q5Dan/4UuOkZ6YnpuPubU4a5LUqAVKJvrudtqdUmQPvpbuQ7pWzYQ8UNoBtVRptSQQdg==", @@ -1481,6 +1482,317 @@ "react-dom": "^18.0.0" } }, + "node_modules/@grafana/runtime/node_modules/@react-aria/dialog": { + "version": "3.5.14", + "resolved": "https://registry.npmjs.org/@react-aria/dialog/-/dialog-3.5.14.tgz", + "integrity": "sha512-oqDCjQ8hxe3GStf48XWBf2CliEnxlR9GgSYPHJPUc69WBj68D9rVcCW3kogJnLAnwIyf3FnzbX4wSjvUa88sAQ==", + "dependencies": { + "@react-aria/focus": "^3.17.1", + "@react-aria/overlays": "^3.22.1", + "@react-aria/utils": "^3.24.1", + "@react-types/dialog": "^3.5.10", + "@react-types/shared": "^3.23.1", + "@swc/helpers": "^0.5.0" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0", + "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" + } + }, + "node_modules/@grafana/runtime/node_modules/@react-aria/focus": { + "version": "3.17.1", + "resolved": "https://registry.npmjs.org/@react-aria/focus/-/focus-3.17.1.tgz", + "integrity": "sha512-FLTySoSNqX++u0nWZJPPN5etXY0WBxaIe/YuL/GTEeuqUIuC/2bJSaw5hlsM6T2yjy6Y/VAxBcKSdAFUlU6njQ==", + "dependencies": { + "@react-aria/interactions": "^3.21.3", + "@react-aria/utils": "^3.24.1", + "@react-types/shared": "^3.23.1", + "@swc/helpers": "^0.5.0", + "clsx": "^2.0.0" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" + } + }, + "node_modules/@grafana/runtime/node_modules/@react-aria/overlays": { + "version": "3.22.1", + "resolved": "https://registry.npmjs.org/@react-aria/overlays/-/overlays-3.22.1.tgz", + "integrity": "sha512-GHiFMWO4EQ6+j6b5QCnNoOYiyx1Gk8ZiwLzzglCI4q1NY5AG2EAmfU4Z1+Gtrf2S5Y0zHbumC7rs9GnPoGLUYg==", + "dependencies": { + "@react-aria/focus": "^3.17.1", + "@react-aria/i18n": "^3.11.1", + "@react-aria/interactions": "^3.21.3", + "@react-aria/ssr": "^3.9.4", + "@react-aria/utils": "^3.24.1", + "@react-aria/visually-hidden": "^3.8.12", + "@react-stately/overlays": "^3.6.7", + "@react-types/button": "^3.9.4", + "@react-types/overlays": "^3.8.7", + "@react-types/shared": "^3.23.1", + "@swc/helpers": "^0.5.0" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0", + "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" + } + }, + "node_modules/@grafana/runtime/node_modules/@react-aria/utils": { + "version": "3.24.1", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.24.1.tgz", + "integrity": "sha512-O3s9qhPMd6n42x9sKeJ3lhu5V1Tlnzhu6Yk8QOvDuXf7UGuUjXf9mzfHJt1dYzID4l9Fwm8toczBzPM9t0jc8Q==", + "dependencies": { + "@react-aria/ssr": "^3.9.4", + "@react-stately/utils": "^3.10.1", + "@react-types/shared": "^3.23.1", + "@swc/helpers": "^0.5.0", + "clsx": "^2.0.0" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" + } + }, + "node_modules/@grafana/runtime/node_modules/rc-cascader": { + "version": "3.26.0", + "resolved": "https://registry.npmjs.org/rc-cascader/-/rc-cascader-3.26.0.tgz", + "integrity": "sha512-L1dml383TPSJD1I11YwxuVbmqaJY64psZqFp1ETlgl3LEOwDu76Cyl11fw5dmjJhMlUWwM5dECQfqJgfebhUjg==", + "dependencies": { + "@babel/runtime": "^7.12.5", + "array-tree-filter": "^2.1.0", + "classnames": "^2.3.1", + "rc-select": "~14.14.0", + "rc-tree": "~5.8.1", + "rc-util": "^5.37.0" + }, + "peerDependencies": { + "react": ">=16.9.0", + "react-dom": ">=16.9.0" + } + }, + "node_modules/@grafana/runtime/node_modules/rc-select": { + "version": "14.14.0", + "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-14.14.0.tgz", + "integrity": "sha512-Uo2wulrjoPPRLCPd7zlK4ZFVJxlTN//yp1xWP/U+TUOQCyXrT+Duvq/Si5OzVcmQyWAUSbsplc2OwNNhvbOeKQ==", + "dependencies": { + "@babel/runtime": "^7.10.1", + "@rc-component/trigger": "^2.1.1", + "classnames": "2.x", + "rc-motion": "^2.0.1", + "rc-overflow": "^1.3.1", + "rc-util": "^5.16.1", + "rc-virtual-list": "^3.5.2" + }, + "engines": { + "node": ">=8.x" + }, + "peerDependencies": { + "react": "*", + "react-dom": "*" + } + }, + "node_modules/@grafana/runtime/node_modules/uuid": { + "version": "9.0.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", + "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", + "funding": [ + "https://github.com/sponsors/broofa", + "https://github.com/sponsors/ctavan" + ], + "bin": { + "uuid": "dist/bin/uuid" + } + }, + "node_modules/@grafana/schema": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.0.tgz", + "integrity": "sha512-HxKeMNrvRDkxBHfwExGZ9MdPYf68n8tctH3aCMFMf/csdlM5EEmgYOOJ1yVLVSxAqiZcb8y6TmL+2QOuP0RK3A==", + "dependencies": { + "tslib": "2.6.3" + } + }, + "node_modules/@grafana/tsconfig": { + "version": "1.3.0-rc1", + "resolved": "https://registry.npmjs.org/@grafana/tsconfig/-/tsconfig-1.3.0-rc1.tgz", + "integrity": "sha512-bi+qFOptejg/a2/WmCDVxQLQtobhKd3y+B6mxFBOMmzElqgr30MPnN60THTou6dGwtfw+ExX1H5FGm9DM35Qrw==" + }, + "node_modules/@grafana/ui": { + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.2.0.tgz", + "integrity": "sha512-tG1V/ajIwRfIx9m+rXrg6NFE6dI6ZYc89FOHVmh2QRTukElgQ0VIdkvumFiR38NdHsAh5wGNkgST91Z6RRyryQ==", + "dependencies": { + "@emotion/css": "11.11.2", + "@emotion/react": "11.11.4", + "@floating-ui/react": "0.26.22", + "@grafana/data": "11.2.0", + "@grafana/e2e-selectors": "11.2.0", + "@grafana/faro-web-sdk": "^1.3.6", + "@grafana/schema": "11.2.0", + "@hello-pangea/dnd": "16.6.0", + "@leeoniya/ufuzzy": "1.0.14", + "@monaco-editor/react": "4.6.0", + "@popperjs/core": "2.11.8", + "@react-aria/dialog": "3.5.16", + "@react-aria/focus": "3.18.1", + "@react-aria/overlays": "3.23.1", + "@react-aria/utils": "3.25.1", + "@tanstack/react-virtual": "^3.5.1", + "@types/jquery": "3.5.30", + "@types/lodash": "4.17.7", + "@types/react-table": "7.7.20", + "ansicolor": "1.1.100", + "calculate-size": "1.1.1", + "classnames": "2.5.1", + "d3": "7.9.0", + "date-fns": "3.6.0", + "downshift": "^9.0.6", + "hoist-non-react-statics": "3.3.2", + "i18next": "^23.0.0", + "i18next-browser-languagedetector": "^7.0.2", + "immutable": "4.3.7", + "is-hotkey": "0.2.0", + "jquery": "3.7.1", + "lodash": "4.17.21", + "micro-memoize": "^4.1.2", + "moment": "2.30.1", + "monaco-editor": "0.34.1", + "ol": "7.4.0", + "prismjs": "1.29.0", + "rc-cascader": "3.27.0", + "rc-drawer": "7.2.0", + "rc-slider": "10.6.2", + "rc-time-picker": "^3.7.3", + "rc-tooltip": "6.2.0", + "react-calendar": "4.8.0", + "react-colorful": "5.6.1", + "react-custom-scrollbars-2": "4.5.0", + "react-dropzone": "14.2.3", + "react-highlight-words": "0.20.0", + "react-hook-form": "^7.49.2", + "react-i18next": "^14.0.0", + "react-inlinesvg": "3.0.2", + "react-loading-skeleton": "3.4.0", + "react-router-dom": "5.3.3", + "react-select": "5.8.0", + "react-table": "7.8.0", + "react-transition-group": "4.4.5", + "react-use": "17.5.1", + "react-window": "1.8.10", + "rxjs": "7.8.1", + "slate": "0.47.9", + "slate-plain-serializer": "0.7.13", + "slate-react": "0.22.10", + "tinycolor2": "1.6.0", + "tslib": "2.6.3", + "uplot": "1.6.30", + "uuid": "9.0.1" + }, + "peerDependencies": { + "react": "^18.0.0", + "react-dom": "^18.0.0" + } + }, + "node_modules/@grafana/ui/node_modules/@grafana/data": { + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.2.0.tgz", + "integrity": "sha512-mMek4DWhoegojMfb4/vIFm/jYj/88b/xu2RHKqa4h1ySdQ0wgOFhN9ea5n3Beo68RrEQa2RINaDa36DSTsHJrQ==", + "dependencies": { + "@braintree/sanitize-url": "7.0.1", + "@grafana/schema": "11.2.0", + "@types/d3-interpolate": "^3.0.0", + "@types/string-hash": "1.1.3", + "d3-interpolate": "3.0.1", + "date-fns": "3.6.0", + "dompurify": "^3.0.0", + "eventemitter3": "5.0.1", + "fast_array_intersect": "1.1.0", + "history": "4.10.1", + "lodash": "4.17.21", + "marked": "12.0.2", + "marked-mangle": "1.1.9", + "moment": "2.30.1", + "moment-timezone": "0.5.45", + "ol": "7.4.0", + "papaparse": "5.4.1", + "react-use": "17.5.1", + "rxjs": "7.8.1", + "string-hash": "^1.1.3", + "tinycolor2": "1.6.0", + "tslib": "2.6.3", + "uplot": "1.6.30", + "xss": "^1.0.14" + }, + "peerDependencies": { + "react": "^18.0.0", + "react-dom": "^18.0.0" + } + }, + "node_modules/@grafana/ui/node_modules/@grafana/e2e-selectors": { + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.2.0.tgz", + "integrity": "sha512-13iHPt6bz7gfgO9WbqPpSla5SEalKtXhgBrCNHTZbGoZhiDkl/kl6wSWYepnXIEs2psyXnABaLpMfg/nXNgSyQ==", + "dependencies": { + "@grafana/tsconfig": "^1.3.0-rc1", + "tslib": "2.6.3", + "typescript": "5.4.5" + } + }, + "node_modules/@grafana/ui/node_modules/@grafana/schema": { + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.2.0.tgz", + "integrity": "sha512-ajW/O0uLgoNrtmxWefgUxJC1DFDyQOjnidzdoWDQbBAbw2fxxhXSYmY1v5Z9ZvVjxuWH7gn636cpA2PfRLNkcw==", + "dependencies": { + "tslib": "2.6.3" + } + }, + "node_modules/@grafana/ui/node_modules/immutable": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz", + "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==" + }, + "node_modules/@grafana/ui/node_modules/marked-mangle": { + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/marked-mangle/-/marked-mangle-1.1.9.tgz", + "integrity": "sha512-eLTXr1xQzba/WZp/trPS0HkR9W02ifasH6IWPrBv++eO2m8POiwV4muQ6Tof2C5Fhdo3z8ggXs6VGw1f931Vsg==", + "peerDependencies": { + "marked": ">=4 <15" + } + }, + "node_modules/@grafana/ui/node_modules/react-use": { + "version": "17.5.1", + "resolved": "https://registry.npmjs.org/react-use/-/react-use-17.5.1.tgz", + "integrity": "sha512-LG/uPEVRflLWMwi3j/sZqR00nF6JGqTTDblkXK2nzXsIvij06hXl1V/MZIlwj1OKIQUtlh1l9jK8gLsRyCQxMg==", + "dependencies": { + "@types/js-cookie": "^2.2.6", + "@xobotyi/scrollbar-width": "^1.9.5", + "copy-to-clipboard": "^3.3.1", + "fast-deep-equal": "^3.1.3", + "fast-shallow-equal": "^1.0.0", + "js-cookie": "^2.2.1", + "nano-css": "^5.6.2", + "react-universal-interface": "^0.6.2", + "resize-observer-polyfill": "^1.5.1", + "screenfull": "^5.1.0", + "set-harmonic-interval": "^1.0.1", + "throttle-debounce": "^3.0.1", + "ts-easing": "^0.2.0", + "tslib": "^2.1.0" + }, + "peerDependencies": { + "react": "*", + "react-dom": "*" + } + }, + "node_modules/@grafana/ui/node_modules/typescript": { + "version": "5.4.5", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", + "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", + "bin": { + "tsc": "bin/tsc", + "tsserver": "bin/tsserver" + }, + "engines": { + "node": ">=14.17" + } + }, "node_modules/@grafana/ui/node_modules/uuid": { "version": "9.0.1", "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", @@ -1569,9 +1881,9 @@ "dev": true }, "node_modules/@internationalized/date": { - "version": "3.5.4", - "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.5.4.tgz", - "integrity": "sha512-qoVJVro+O0rBaw+8HPjUB1iH8Ihf8oziEnqMnvhJUSuVIrHOuZ6eNLHNvzXJKUvAtaDiqMnRlg8Z2mgh09BlUw==", + "version": "3.5.5", + "resolved": "https://registry.npmjs.org/@internationalized/date/-/date-3.5.5.tgz", + "integrity": "sha512-H+CfYvOZ0LTJeeLOqm19E3uj/4YjrmOFtBufDHPfvtI80hFAMqtrp7oCACpe4Cil5l8S0Qu/9dYfZc/5lY8WQQ==", "dependencies": { "@swc/helpers": "^0.5.0" } @@ -2879,95 +3191,125 @@ } }, "node_modules/@react-aria/dialog": { - "version": "3.5.14", - "resolved": "https://registry.npmjs.org/@react-aria/dialog/-/dialog-3.5.14.tgz", - "integrity": "sha512-oqDCjQ8hxe3GStf48XWBf2CliEnxlR9GgSYPHJPUc69WBj68D9rVcCW3kogJnLAnwIyf3FnzbX4wSjvUa88sAQ==", - "dependencies": { - "@react-aria/focus": "^3.17.1", - "@react-aria/overlays": "^3.22.1", - "@react-aria/utils": "^3.24.1", - "@react-types/dialog": "^3.5.10", - "@react-types/shared": "^3.23.1", + "version": "3.5.16", + "resolved": "https://registry.npmjs.org/@react-aria/dialog/-/dialog-3.5.16.tgz", + "integrity": "sha512-2clBSQQaoqCjAUkHnMA/noZ1ZnFbEVU67fL9M1QfokezAyLAlyCyD9XSed6+Td/Ncj80N3/Lax65XAlvWCyOlg==", + "dependencies": { + "@react-aria/focus": "^3.18.1", + "@react-aria/overlays": "^3.23.1", + "@react-aria/utils": "^3.25.1", + "@react-types/dialog": "^3.5.12", + "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0", - "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0", + "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" } }, "node_modules/@react-aria/focus": { - "version": "3.17.1", - "resolved": "https://registry.npmjs.org/@react-aria/focus/-/focus-3.17.1.tgz", - "integrity": "sha512-FLTySoSNqX++u0nWZJPPN5etXY0WBxaIe/YuL/GTEeuqUIuC/2bJSaw5hlsM6T2yjy6Y/VAxBcKSdAFUlU6njQ==", + "version": "3.18.1", + "resolved": "https://registry.npmjs.org/@react-aria/focus/-/focus-3.18.1.tgz", + "integrity": "sha512-N0Cy61WCIv+57mbqC7hiZAsB+3rF5n4JKabxUmg/2RTJL6lq7hJ5N4gx75ymKxkN8GnVDwt4pKZah48Wopa5jw==", "dependencies": { - "@react-aria/interactions": "^3.21.3", - "@react-aria/utils": "^3.24.1", - "@react-types/shared": "^3.23.1", + "@react-aria/interactions": "^3.22.1", + "@react-aria/utils": "^3.25.1", + "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" } }, "node_modules/@react-aria/i18n": { - "version": "3.11.1", - "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.11.1.tgz", - "integrity": "sha512-vuiBHw1kZruNMYeKkTGGnmPyMnM5T+gT8bz97H1FqIq1hQ6OPzmtBZ6W6l6OIMjeHI5oJo4utTwfZl495GALFQ==", + "version": "3.12.2", + "resolved": "https://registry.npmjs.org/@react-aria/i18n/-/i18n-3.12.2.tgz", + "integrity": "sha512-PvEyC6JWylTpe8dQEWqQwV6GiA+pbTxHQd//BxtMSapRW3JT9obObAnb/nFhj3HthkUvqHyj0oO1bfeN+mtD8A==", "dependencies": { - "@internationalized/date": "^3.5.4", + "@internationalized/date": "^3.5.5", "@internationalized/message": "^3.1.4", "@internationalized/number": "^3.5.3", "@internationalized/string": "^3.2.3", - "@react-aria/ssr": "^3.9.4", - "@react-aria/utils": "^3.24.1", - "@react-types/shared": "^3.23.1", + "@react-aria/ssr": "^3.9.5", + "@react-aria/utils": "^3.25.2", + "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + } + }, + "node_modules/@react-aria/i18n/node_modules/@react-aria/utils": { + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", + "dependencies": { + "@react-aria/ssr": "^3.9.5", + "@react-stately/utils": "^3.10.3", + "@react-types/shared": "^3.24.1", + "@swc/helpers": "^0.5.0", + "clsx": "^2.0.0" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" } }, "node_modules/@react-aria/interactions": { - "version": "3.21.3", - "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.21.3.tgz", - "integrity": "sha512-BWIuf4qCs5FreDJ9AguawLVS0lV9UU+sK4CCnbCNNmYqOWY+1+gRXCsnOM32K+oMESBxilAjdHW5n1hsMqYMpA==", + "version": "3.22.2", + "resolved": "https://registry.npmjs.org/@react-aria/interactions/-/interactions-3.22.2.tgz", + "integrity": "sha512-xE/77fRVSlqHp2sfkrMeNLrqf2amF/RyuAS6T5oDJemRSgYM3UoxTbWjucPhfnoW7r32pFPHHgz4lbdX8xqD/g==", "dependencies": { - "@react-aria/ssr": "^3.9.4", - "@react-aria/utils": "^3.24.1", - "@react-types/shared": "^3.23.1", + "@react-aria/ssr": "^3.9.5", + "@react-aria/utils": "^3.25.2", + "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" } }, - "node_modules/@react-aria/overlays": { - "version": "3.22.1", - "resolved": "https://registry.npmjs.org/@react-aria/overlays/-/overlays-3.22.1.tgz", - "integrity": "sha512-GHiFMWO4EQ6+j6b5QCnNoOYiyx1Gk8ZiwLzzglCI4q1NY5AG2EAmfU4Z1+Gtrf2S5Y0zHbumC7rs9GnPoGLUYg==", + "node_modules/@react-aria/interactions/node_modules/@react-aria/utils": { + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", "dependencies": { - "@react-aria/focus": "^3.17.1", - "@react-aria/i18n": "^3.11.1", - "@react-aria/interactions": "^3.21.3", - "@react-aria/ssr": "^3.9.4", - "@react-aria/utils": "^3.24.1", - "@react-aria/visually-hidden": "^3.8.12", - "@react-stately/overlays": "^3.6.7", - "@react-types/button": "^3.9.4", - "@react-types/overlays": "^3.8.7", - "@react-types/shared": "^3.23.1", + "@react-aria/ssr": "^3.9.5", + "@react-stately/utils": "^3.10.3", + "@react-types/shared": "^3.24.1", + "@swc/helpers": "^0.5.0", + "clsx": "^2.0.0" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + } + }, + "node_modules/@react-aria/overlays": { + "version": "3.23.1", + "resolved": "https://registry.npmjs.org/@react-aria/overlays/-/overlays-3.23.1.tgz", + "integrity": "sha512-qNV3pGThvRXjhdHCfqN9Eg4uD+nFm2DoK6d5e9LFd1+xCkKbT88afDBIcLmeG7fgfmukb1sNmzCJQJt8Svk54g==", + "dependencies": { + "@react-aria/focus": "^3.18.1", + "@react-aria/i18n": "^3.12.1", + "@react-aria/interactions": "^3.22.1", + "@react-aria/ssr": "^3.9.5", + "@react-aria/utils": "^3.25.1", + "@react-aria/visually-hidden": "^3.8.14", + "@react-stately/overlays": "^3.6.9", + "@react-types/button": "^3.9.6", + "@react-types/overlays": "^3.8.9", + "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0", - "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0", + "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" } }, "node_modules/@react-aria/ssr": { - "version": "3.9.4", - "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.9.4.tgz", - "integrity": "sha512-4jmAigVq409qcJvQyuorsmBR4+9r3+JEC60wC+Y0MZV0HCtTmm8D9guYXlJMdx0SSkgj0hHAyFm/HvPNFofCoQ==", + "version": "3.9.5", + "resolved": "https://registry.npmjs.org/@react-aria/ssr/-/ssr-3.9.5.tgz", + "integrity": "sha512-xEwGKoysu+oXulibNUSkXf8itW0npHHTa6c4AyYeZIJyRoegeteYuFpZUBPtIDE8RfHdNsSmE1ssOkxRnwbkuQ==", "dependencies": { "@swc/helpers": "^0.5.0" }, @@ -2975,102 +3317,117 @@ "node": ">= 12" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" } }, "node_modules/@react-aria/utils": { - "version": "3.24.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.24.1.tgz", - "integrity": "sha512-O3s9qhPMd6n42x9sKeJ3lhu5V1Tlnzhu6Yk8QOvDuXf7UGuUjXf9mzfHJt1dYzID4l9Fwm8toczBzPM9t0jc8Q==", + "version": "3.25.1", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.1.tgz", + "integrity": "sha512-5Uj864e7T5+yj78ZfLnfHqmypLiqW2mN+nsdslog2z5ssunTqjolVeM15ootXskjISlZ7MojLpq97kIC4nlnAw==", "dependencies": { - "@react-aria/ssr": "^3.9.4", - "@react-stately/utils": "^3.10.1", - "@react-types/shared": "^3.23.1", + "@react-aria/ssr": "^3.9.5", + "@react-stately/utils": "^3.10.2", + "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0", "clsx": "^2.0.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" } }, "node_modules/@react-aria/visually-hidden": { - "version": "3.8.12", - "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.12.tgz", - "integrity": "sha512-Bawm+2Cmw3Xrlr7ARzl2RLtKh0lNUdJ0eNqzWcyx4c0VHUAWtThmH5l+HRqFUGzzutFZVo89SAy40BAbd0gjVw==", + "version": "3.8.15", + "resolved": "https://registry.npmjs.org/@react-aria/visually-hidden/-/visually-hidden-3.8.15.tgz", + "integrity": "sha512-l+sJ7xTdD5Sd6+rDNDaeJCSPnHOsI+BaJyApvb/YcVgHa7rB47lp6TXCWUCDItcPY4JqRGyeByRJVrtzBFTWCw==", "dependencies": { - "@react-aria/interactions": "^3.21.3", - "@react-aria/utils": "^3.24.1", - "@react-types/shared": "^3.23.1", + "@react-aria/interactions": "^3.22.2", + "@react-aria/utils": "^3.25.2", + "@react-types/shared": "^3.24.1", "@swc/helpers": "^0.5.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" + } + }, + "node_modules/@react-aria/visually-hidden/node_modules/@react-aria/utils": { + "version": "3.25.2", + "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.25.2.tgz", + "integrity": "sha512-GdIvG8GBJJZygB4L2QJP1Gabyn2mjFsha73I2wSe+o4DYeGWoJiMZRM06PyTIxLH4S7Sn7eVDtsSBfkc2VY/NA==", + "dependencies": { + "@react-aria/ssr": "^3.9.5", + "@react-stately/utils": "^3.10.3", + "@react-types/shared": "^3.24.1", + "@swc/helpers": "^0.5.0", + "clsx": "^2.0.0" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" } }, "node_modules/@react-stately/overlays": { - "version": "3.6.7", - "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.7.tgz", - "integrity": "sha512-6zp8v/iNUm6YQap0loaFx6PlvN8C0DgWHNlrlzMtMmNuvjhjR0wYXVaTfNoUZBWj25tlDM81ukXOjpRXg9rLrw==", + "version": "3.6.10", + "resolved": "https://registry.npmjs.org/@react-stately/overlays/-/overlays-3.6.10.tgz", + "integrity": "sha512-XxZ2qScT5JPwGk9qiVJE4dtVh3AXTcYwGRA5RsHzC26oyVVsegPqY2PmNJGblAh6Q57VyodoVUyebE0Eo5CzRw==", "dependencies": { - "@react-stately/utils": "^3.10.1", - "@react-types/overlays": "^3.8.7", + "@react-stately/utils": "^3.10.3", + "@react-types/overlays": "^3.8.9", "@swc/helpers": "^0.5.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" } }, "node_modules/@react-stately/utils": { - "version": "3.10.1", - "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.1.tgz", - "integrity": "sha512-VS/EHRyicef25zDZcM/ClpzYMC5i2YGN6uegOeQawmgfGjb02yaCX0F0zR69Pod9m2Hr3wunTbtpgVXvYbZItg==", + "version": "3.10.3", + "resolved": "https://registry.npmjs.org/@react-stately/utils/-/utils-3.10.3.tgz", + "integrity": "sha512-moClv7MlVSHpbYtQIkm0Cx+on8Pgt1XqtPx6fy9rQFb2DNc9u1G3AUVnqA17buOkH1vLxAtX4MedlxMWyRCYYA==", "dependencies": { "@swc/helpers": "^0.5.0" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" } }, "node_modules/@react-types/button": { - "version": "3.9.4", - "resolved": "https://registry.npmjs.org/@react-types/button/-/button-3.9.4.tgz", - "integrity": "sha512-raeQBJUxBp0axNF74TXB8/H50GY8Q3eV6cEKMbZFP1+Dzr09Ngv0tJBeW0ewAxAguNH5DRoMUAUGIXtSXskVdA==", + "version": "3.9.6", + "resolved": "https://registry.npmjs.org/@react-types/button/-/button-3.9.6.tgz", + "integrity": "sha512-8lA+D5JLbNyQikf8M/cPP2cji91aVTcqjrGpDqI7sQnaLFikM8eFR6l1ZWGtZS5MCcbfooko77ha35SYplSQvw==", "dependencies": { - "@react-types/shared": "^3.23.1" + "@react-types/shared": "^3.24.1" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" } }, "node_modules/@react-types/dialog": { - "version": "3.5.10", - "resolved": "https://registry.npmjs.org/@react-types/dialog/-/dialog-3.5.10.tgz", - "integrity": "sha512-S9ga+edOLNLZw7/zVOnZdT5T40etpzUYBXEKdFPbxyPYnERvRxJAsC1/ASuBU9fQAXMRgLZzADWV+wJoGS/X9g==", + "version": "3.5.12", + "resolved": "https://registry.npmjs.org/@react-types/dialog/-/dialog-3.5.12.tgz", + "integrity": "sha512-JmpQbSpXltqEyYfEwoqDolABIiojeExkqolHNdQlayIsfFuSxZxNwXZPOpz58Ri/iwv21JP7K3QF0Gb2Ohxl9w==", "dependencies": { - "@react-types/overlays": "^3.8.7", - "@react-types/shared": "^3.23.1" + "@react-types/overlays": "^3.8.9", + "@react-types/shared": "^3.24.1" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" } }, "node_modules/@react-types/overlays": { - "version": "3.8.7", - "resolved": "https://registry.npmjs.org/@react-types/overlays/-/overlays-3.8.7.tgz", - "integrity": "sha512-zCOYvI4at2DkhVpviIClJ7bRrLXYhSg3Z3v9xymuPH3mkiuuP/dm8mUCtkyY4UhVeUTHmrQh1bzaOP00A+SSQA==", + "version": "3.8.9", + "resolved": "https://registry.npmjs.org/@react-types/overlays/-/overlays-3.8.9.tgz", + "integrity": "sha512-9ni9upQgXPnR+K9cWmbYWvm3ll9gH8P/XsEZprqIV5zNLMF334jADK48h4jafb1X9RFnj0WbHo6BqcSObzjTig==", "dependencies": { - "@react-types/shared": "^3.23.1" + "@react-types/shared": "^3.24.1" }, "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" } }, "node_modules/@react-types/shared": { - "version": "3.23.1", - "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.23.1.tgz", - "integrity": "sha512-5d+3HbFDxGZjhbMBeFHRQhexMFt4pUce3okyRtUVKbbedQFUrtXSBg9VszgF2RTeQDKDkMCIQDtz5ccP/Lk1gw==", + "version": "3.24.1", + "resolved": "https://registry.npmjs.org/@react-types/shared/-/shared-3.24.1.tgz", + "integrity": "sha512-AUQeGYEm/zDTN6zLzdXolDxz3Jk5dDL7f506F07U8tBwxNNI3WRdhU84G0/AaFikOZzDXhOZDr3MhQMzyE7Ydw==", "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" + "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0 || ^19.0.0" } }, "node_modules/@sinclair/typebox": { @@ -3347,6 +3704,31 @@ "@swc/counter": "^0.1.3" } }, + "node_modules/@tanstack/react-virtual": { + "version": "3.10.6", + "resolved": "https://registry.npmjs.org/@tanstack/react-virtual/-/react-virtual-3.10.6.tgz", + "integrity": "sha512-xaSy6uUxB92O8mngHZ6CvbhGuqxQ5lIZWCBy+FjhrbHmOwc6BnOnKkYm2FsB1/BpKw/+FVctlMbEtI+F6I1aJg==", + "dependencies": { + "@tanstack/virtual-core": "3.10.6" + }, + "funding": { + "type": "github", + "url": "https://github.com/sponsors/tannerlinsley" + }, + "peerDependencies": { + "react": "^16.8.0 || ^17.0.0 || ^18.0.0", + "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0" + } + }, + "node_modules/@tanstack/virtual-core": { + "version": "3.10.6", + "resolved": "https://registry.npmjs.org/@tanstack/virtual-core/-/virtual-core-3.10.6.tgz", + "integrity": "sha512-1giLc4dzgEKLMx5pgKjL6HlG5fjZMgCjzlKAlpr7yoUtetVPELgER1NtephAI910nMwfPTHNyWKSFmJdHkz2Cw==", + "funding": { + "type": "github", + "url": "https://github.com/sponsors/tannerlinsley" + } + }, "node_modules/@testing-library/dom": { "version": "10.2.0", "resolved": "https://registry.npmjs.org/@testing-library/dom/-/dom-10.2.0.tgz", @@ -3771,6 +4153,14 @@ "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==", "dev": true }, + "node_modules/@types/jquery": { + "version": "3.5.30", + "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.30.tgz", + "integrity": "sha512-nbWKkkyb919DOUxjmRVk8vwtDb0/k8FKncmUKFi+NY+QXqWltooxTrswvz4LspQwxvLdvzBN1TImr6cw3aQx2A==", + "dependencies": { + "@types/sizzle": "*" + } + }, "node_modules/@types/js-cookie": { "version": "2.2.7", "resolved": "https://registry.npmjs.org/@types/js-cookie/-/js-cookie-2.2.7.tgz", @@ -3794,10 +4184,9 @@ "dev": true }, "node_modules/@types/lodash": { - "version": "4.17.5", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.5.tgz", - "integrity": "sha512-MBIOHVZqVqgfro1euRDWX7OO0fBVUUMrN6Pwm8LQsz8cWhEpihlvR70ENj3f40j58TNxZaWv2ndSkInykNBBJw==", - "dev": true + "version": "4.17.7", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.7.tgz", + "integrity": "sha512-8wTvZawATi/lsmNu10/j2hk1KEP0IvjubqPE3cu1Xz7xfXXt5oCq3SNUz4fMIP4XGF9Ky+Ue2tBA3hcS7LSBlA==" }, "node_modules/@types/node": { "version": "20.14.9", @@ -3845,6 +4234,14 @@ "redux": "^4.0.0" } }, + "node_modules/@types/react-table": { + "version": "7.7.20", + "resolved": "https://registry.npmjs.org/@types/react-table/-/react-table-7.7.20.tgz", + "integrity": "sha512-ahMp4pmjVlnExxNwxyaDrFgmKxSbPwU23sGQw2gJK4EhCvnvmib2s/O/+y1dfV57dXOwpr2plfyBol+vEHbi2w==", + "dependencies": { + "@types/react": "*" + } + }, "node_modules/@types/react-transition-group": { "version": "4.4.10", "resolved": "https://registry.npmjs.org/@types/react-transition-group/-/react-transition-group-4.4.10.tgz", @@ -3859,6 +4256,11 @@ "integrity": "sha512-I8EUhyrgfLrcTkzV3TSsGyl1tSuPrEDzr0yd5m90UgNxQkyDXULk3b6MlQqTCpZpNtWe1K0hzclnZkTcLBe2UQ==", "dev": true }, + "node_modules/@types/sizzle": { + "version": "2.3.8", + "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.8.tgz", + "integrity": "sha512-0vWLNK2D5MT9dg0iOo8GlKguPAU02QjmZitPEsXRuJXU/OGIOt9vT9Fc26wtYuavLxtO45v9PGleoL9Z0k1LHg==" + }, "node_modules/@types/stack-utils": { "version": "2.0.3", "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz", @@ -5421,6 +5823,11 @@ "resolved": "https://registry.npmjs.org/component-indexof/-/component-indexof-0.0.3.tgz", "integrity": "sha512-puDQKvx/64HZXb4hBwIcvQLaLgux8o1CbWl39s41hrIIZDl1lJiD5jc22gj3RBeGK0ovxALDYpIbyjqDUUl0rw==" }, + "node_modules/compute-scroll-into-view": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/compute-scroll-into-view/-/compute-scroll-into-view-3.1.0.tgz", + "integrity": "sha512-rj8l8pD4bJ1nx+dAkMhV1xB5RuZEyVysfxJqB1pRchh1KVvwOv9b7CGB8ZfjTImVv2oF+sYMUkMZq6Na5Ftmbg==" + }, "node_modules/concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -6454,6 +6861,26 @@ "resolved": "https://registry.npmjs.org/dompurify/-/dompurify-3.1.5.tgz", "integrity": "sha512-lwG+n5h8QNpxtyrJW/gJWckL+1/DQiYMX8f7t8Z2AZTPw1esVrqjI63i7Zc2Gz0aKzLVMYC1V1PL/ky+aY/NgA==" }, + "node_modules/downshift": { + "version": "9.0.8", + "resolved": "https://registry.npmjs.org/downshift/-/downshift-9.0.8.tgz", + "integrity": "sha512-59BWD7+hSUQIM1DeNPLirNNnZIO9qMdIK5GQ/Uo8q34gT4B78RBlb9dhzgnh0HfQTJj4T/JKYD8KoLAlMWnTsA==", + "dependencies": { + "@babel/runtime": "^7.24.5", + "compute-scroll-into-view": "^3.1.0", + "prop-types": "^15.8.1", + "react-is": "18.2.0", + "tslib": "^2.6.2" + }, + "peerDependencies": { + "react": ">=16.12.0" + } + }, + "node_modules/downshift/node_modules/react-is": { + "version": "18.2.0", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-18.2.0.tgz", + "integrity": "sha512-xWGDIW6x921xtzPkhiULtthJHoJvBbF3q26fzloPCK0hsvxtPVelvftw3zjbHWSkR2km9Z+4uxbDDK/6Zw9B8w==" + }, "node_modules/earcut": { "version": "2.2.4", "resolved": "https://registry.npmjs.org/earcut/-/earcut-2.2.4.tgz", @@ -7367,11 +7794,6 @@ "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", "dev": true }, - "node_modules/fast-loops": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/fast-loops/-/fast-loops-1.1.3.tgz", - "integrity": "sha512-8EZzEP0eKkEEVX+drtd9mtuQ+/QrlfW/5MlwcwK5Nds6EkZ/tRzEexkzUY2mIssnAyVLT+TKHuRXmFNNXYUd6g==" - }, "node_modules/fast-shallow-equal": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/fast-shallow-equal/-/fast-shallow-equal-1.0.0.tgz", @@ -8377,12 +8799,11 @@ "dev": true }, "node_modules/inline-style-prefixer": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-7.0.0.tgz", - "integrity": "sha512-I7GEdScunP1dQ6IM2mQWh6v0mOYdYmH3Bp31UecKdrcUgcURTcctSe1IECdUznSHKSmsHtjrT3CwCPI1pyxfUQ==", + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-7.0.1.tgz", + "integrity": "sha512-lhYo5qNTQp3EvSSp3sRvXMbVQTLrvGV6DycRMJ5dm2BLMiJ30wpXKdDdgX+GmJZ5uQMucwRKHamXSst3Sj/Giw==", "dependencies": { - "css-in-js-utils": "^3.1.0", - "fast-loops": "^1.1.3" + "css-in-js-utils": "^3.1.0" } }, "node_modules/internal-slot": { @@ -11542,15 +11963,15 @@ "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==" }, "node_modules/nano-css": { - "version": "5.6.1", - "resolved": "https://registry.npmjs.org/nano-css/-/nano-css-5.6.1.tgz", - "integrity": "sha512-T2Mhc//CepkTa3X4pUhKgbEheJHYAxD0VptuqFhDbGMUWVV2m+lkNiW/Ieuj35wrfC8Zm0l7HvssQh7zcEttSw==", + "version": "5.6.2", + "resolved": "https://registry.npmjs.org/nano-css/-/nano-css-5.6.2.tgz", + "integrity": "sha512-+6bHaC8dSDGALM1HJjOHVXpuastdu2xFoZlC77Jh4cg+33Zcgm+Gxd+1xsnpZK14eyHObSp82+ll5y3SX75liw==", "dependencies": { "@jridgewell/sourcemap-codec": "^1.4.15", "css-tree": "^1.1.2", "csstype": "^3.1.2", "fastest-stable-stringify": "^2.0.2", - "inline-style-prefixer": "^7.0.0", + "inline-style-prefixer": "^7.0.1", "rtl-css-js": "^1.16.1", "stacktrace-js": "^2.0.2", "stylis": "^4.3.0" @@ -12588,14 +13009,14 @@ } }, "node_modules/rc-cascader": { - "version": "3.26.0", - "resolved": "https://registry.npmjs.org/rc-cascader/-/rc-cascader-3.26.0.tgz", - "integrity": "sha512-L1dml383TPSJD1I11YwxuVbmqaJY64psZqFp1ETlgl3LEOwDu76Cyl11fw5dmjJhMlUWwM5dECQfqJgfebhUjg==", + "version": "3.27.0", + "resolved": "https://registry.npmjs.org/rc-cascader/-/rc-cascader-3.27.0.tgz", + "integrity": "sha512-z5uq8VvQadFUBiuZJ7YF5UAUGNkZtdEtcEYiIA94N/Kc2MIKr6lEbN5HyVddvYSgwWlKqnL6pH5bFXFuIK3MNg==", "dependencies": { "@babel/runtime": "^7.12.5", "array-tree-filter": "^2.1.0", "classnames": "^2.3.1", - "rc-select": "~14.14.0", + "rc-select": "~14.15.0", "rc-tree": "~5.8.1", "rc-util": "^5.37.0" }, @@ -12665,9 +13086,9 @@ } }, "node_modules/rc-select": { - "version": "14.14.0", - "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-14.14.0.tgz", - "integrity": "sha512-Uo2wulrjoPPRLCPd7zlK4ZFVJxlTN//yp1xWP/U+TUOQCyXrT+Duvq/Si5OzVcmQyWAUSbsplc2OwNNhvbOeKQ==", + "version": "14.15.1", + "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-14.15.1.tgz", + "integrity": "sha512-mGvuwW1RMm1NCSI8ZUoRoLRK51R2Nb+QJnmiAvbDRcjh2//ulCkxeV6ZRFTECPpE1t2DPfyqZMPw90SVJzQ7wQ==", "dependencies": { "@babel/runtime": "^7.10.1", "@rc-component/trigger": "^2.1.1", diff --git a/package.json b/package.json index f634aea5..de34a55d 100644 --- a/package.json +++ b/package.json @@ -4,7 +4,7 @@ "@emotion/css": "^11.11.2", "@grafana/data": "^11.1.0", "@grafana/runtime": "^11.1.0", - "@grafana/ui": "^11.2.0-186891", + "@grafana/ui": "^11.2.0", "@hello-pangea/dnd": "^16.6.0", "@volkovlabs/components": "^2.8.1", "react": "^18.3.1", diff --git a/src/components/CustomCodeEditor/CustomCodeEditor.test.tsx b/src/components/CustomCodeEditor/CustomCodeEditor.test.tsx index cae4e26b..f91651af 100644 --- a/src/components/CustomCodeEditor/CustomCodeEditor.test.tsx +++ b/src/components/CustomCodeEditor/CustomCodeEditor.test.tsx @@ -1,11 +1,12 @@ import { getTemplateSrv } from '@grafana/runtime'; import { CodeEditor, CodeEditorSuggestionItemKind } from '@grafana/ui'; import { render, screen } from '@testing-library/react'; -import React from 'react'; +import React, { useEffect } from 'react'; + +import { CODE_EDITOR_SUGGESTIONS } from '@/constants'; +import { CodeEditorType } from '@/types'; +import { getCustomCodeEditorSelectors } from '@/utils'; -import { CODE_EDITOR_SUGGESTIONS } from '../../constants'; -import { CodeEditorType } from '../../types'; -import { getCustomCodeEditorSelectors } from '../../utils'; import { CustomCodeEditor } from './CustomCodeEditor'; /** @@ -70,7 +71,9 @@ describe('Custom Code Editor', () => { }; jest.mocked(CodeEditor).mockImplementationOnce(({ onEditorDidMount }: any) => { - onEditorDidMount(editor); + useEffect(() => { + onEditorDidMount(editor); + }, [onEditorDidMount]); return null; }); diff --git a/src/components/FormElement/FormElement.tsx b/src/components/FormElement/FormElement.tsx index b1a4e2ac..8070218a 100644 --- a/src/components/FormElement/FormElement.tsx +++ b/src/components/FormElement/FormElement.tsx @@ -3,8 +3,9 @@ import { InterpolateFunction } from '@grafana/data'; import { InlineFieldRow, InlineLabel, useStyles2 } from '@grafana/ui'; import React from 'react'; -import { FormElementType, TEST_IDS } from '../../constants'; -import { CustomButtonShow, ExecuteCustomCodeParams, LocalFormElement } from '../../types'; +import { FormElementType, TEST_IDS } from '@/constants'; +import { CustomButtonShow, ExecuteCustomCodeParams, LocalFormElement } from '@/types'; + import { BooleanElement, CheckboxListElement, @@ -67,6 +68,13 @@ interface Props { * @type {[id: string]: unknown} */ initial: { [id: string]: unknown }; + + /** + * Time Zone + * + * @type {string} + */ + timeZone: string; } /** @@ -79,6 +87,7 @@ export const FormElement: React.FC = ({ executeCustomCode, elements, initial, + timeZone, }) => { /** * Styles and Theme @@ -115,10 +124,10 @@ export const FormElement: React.FC = ({ return ; } case FormElementType.DATETIME: { - return ; + return ; } case FormElementType.TIME: { - return ; + return ; } case FormElementType.SLIDER: { return ; diff --git a/src/components/FormElement/components/DateTimeElement/DateTimeElement.tsx b/src/components/FormElement/components/DateTimeElement/DateTimeElement.tsx index f8934089..3cffb496 100644 --- a/src/components/FormElement/components/DateTimeElement/DateTimeElement.tsx +++ b/src/components/FormElement/components/DateTimeElement/DateTimeElement.tsx @@ -21,12 +21,19 @@ interface Props { * On Change */ onChange: (element: T) => void; + + /** + * Time Zone + * + * @type {string} + */ + timeZone: string; } /** * Date Time Element */ -export const DateTimeElement: React.FC = ({ element, onChange }) => { +export const DateTimeElement: React.FC = ({ element, onChange, timeZone }) => { return ( = ({ element, onChange }) => { } }} data-testid={TEST_IDS.formElements.fieldDateTime} + timeZone={timeZone} /> )} diff --git a/src/components/FormElement/components/TimeElement/TimeElement.tsx b/src/components/FormElement/components/TimeElement/TimeElement.tsx index b8e9b9dd..6ebba517 100644 --- a/src/components/FormElement/components/TimeElement/TimeElement.tsx +++ b/src/components/FormElement/components/TimeElement/TimeElement.tsx @@ -1,6 +1,6 @@ -import { DateTime, dateTime } from '@grafana/data'; +import { DateTime, dateTimeForTimeZone, getTimeZone } from '@grafana/data'; import { InlineField, TimeOfDayPicker } from '@grafana/ui'; -import React from 'react'; +import React, { useCallback } from 'react'; import { FormElementType, TEST_IDS } from '@/constants'; import { FormElementByType, LocalFormElement } from '@/types'; @@ -21,12 +21,29 @@ interface Props { * On Change */ onChange: (element: T) => void; + + /** + * Time Zone + * + * @type {string} + */ + timeZone: string; } /** * Time Element */ -export const TimeElement: React.FC = ({ element, onChange }) => { +export const TimeElement: React.FC = ({ element, onChange, timeZone }) => { + /** + * To Date Time With Time Zone + */ + const toDateTimeWithTimeZone = useCallback( + (date?: string) => { + return dateTimeForTimeZone(getTimeZone({ timeZone }), date); + }, + [timeZone] + ); + return ( = ({ element, onChange }) => { > { onChange({ ...element, diff --git a/src/components/FormElements/FormElements.tsx b/src/components/FormElements/FormElements.tsx index 29d96bfe..d4454c95 100644 --- a/src/components/FormElements/FormElements.tsx +++ b/src/components/FormElements/FormElements.tsx @@ -3,8 +3,9 @@ import { InterpolateFunction, PanelData } from '@grafana/data'; import { useTheme2 } from '@grafana/ui'; import React, { useCallback, useMemo } from 'react'; -import { INITIAL_HIGHLIGHT_COLOR_DEFAULT, TEST_IDS } from '../../constants'; -import { ExecuteCustomCodeParams, LayoutSection, LocalFormElement, PanelOptions } from '../../types'; +import { INITIAL_HIGHLIGHT_COLOR_DEFAULT, TEST_IDS } from '@/constants'; +import { ExecuteCustomCodeParams, LayoutSection, LocalFormElement, PanelOptions } from '@/types'; + import { FormElement } from '../FormElement'; /** @@ -59,6 +60,8 @@ interface Props { /** * Time Zone + * + * @type {string} */ timeZone: string; } From d06da65011f6830abf21722c315c6333be70ce0f Mon Sep 17 00:00:00 2001 From: Mikhail Volkov Date: Mon, 2 Sep 2024 19:43:01 -0400 Subject: [PATCH 4/5] Update version --- CHANGELOG.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7aff954d..f834ec8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,11 @@ # Change Log +## 4.5.0 (IN PROGRESS) + +### Features / Enhancements + +- Updated date and time input timezone (#452) + ## 4.4.0 (2024-08-29) ### Features / Enhancements diff --git a/package.json b/package.json index de34a55d..70dd9365 100644 --- a/package.json +++ b/package.json @@ -77,5 +77,5 @@ "test:ci": "jest --maxWorkers 4 --coverage", "upgrade": "npm upgrade --save" }, - "version": "4.4.0" + "version": "4.5.0" } From 5e764a27a7cf25be94e0ebd5bc6eb01a06b6153b Mon Sep 17 00:00:00 2001 From: Mikhail Volkov Date: Mon, 2 Sep 2024 19:44:16 -0400 Subject: [PATCH 5/5] Update 11.2 --- README.md | 2 +- package-lock.json | 427 ++++------------------------------------------ package.json | 4 +- 3 files changed, 34 insertions(+), 399 deletions(-) diff --git a/README.md b/README.md index 53671a6f..94228494 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ ![Forms](https://raw.githubusercontent.com/volkovlabs/business-forms/main/src/img/panel.png) -![Grafana](https://img.shields.io/badge/Grafana-11.1-orange) +![Grafana](https://img.shields.io/badge/Grafana-11.2-orange) [![YouTube](https://img.shields.io/badge/YouTube-Playlist-red)](https://www.youtube.com/playlist?list=PLPow72ygztmRXSNBxyw0sFnnvNRY_CsSA) ![CI](https://github.com/volkovlabs/business-forms/workflows/CI/badge.svg) ![E2E](https://github.com/volkovlabs/business-forms/workflows/E2E/badge.svg) diff --git a/package-lock.json b/package-lock.json index c27b728f..59a57ae5 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,17 +1,17 @@ { "name": "business-forms", - "version": "4.4.0", + "version": "4.5.0", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "business-forms", - "version": "4.4.0", + "version": "4.5.0", "license": "Apache-2.0", "dependencies": { "@emotion/css": "^11.11.2", - "@grafana/data": "^11.1.0", - "@grafana/runtime": "^11.1.0", + "@grafana/data": "^11.2.0", + "@grafana/runtime": "^11.2.0", "@grafana/ui": "^11.2.0", "@hello-pangea/dnd": "^16.6.0", "@volkovlabs/components": "^2.8.1", @@ -1060,12 +1060,12 @@ } }, "node_modules/@grafana/data": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.1.0.tgz", - "integrity": "sha512-kD8kLlpvl9oLStaprTPgy71u4Q+F9FyGGbNN5PuOfh+9Og8Gy5W77OFEhnrMbT0PxckKDmEjOaMkTlybF3yQjg==", + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.2.0.tgz", + "integrity": "sha512-mMek4DWhoegojMfb4/vIFm/jYj/88b/xu2RHKqa4h1ySdQ0wgOFhN9ea5n3Beo68RrEQa2RINaDa36DSTsHJrQ==", "dependencies": { "@braintree/sanitize-url": "7.0.1", - "@grafana/schema": "11.1.0", + "@grafana/schema": "11.2.0", "@types/d3-interpolate": "^3.0.0", "@types/string-hash": "1.1.3", "d3-interpolate": "3.0.1", @@ -1076,12 +1076,12 @@ "history": "4.10.1", "lodash": "4.17.21", "marked": "12.0.2", - "marked-mangle": "1.1.7", + "marked-mangle": "1.1.9", "moment": "2.30.1", "moment-timezone": "0.5.45", "ol": "7.4.0", "papaparse": "5.4.1", - "react-use": "17.5.0", + "react-use": "17.5.1", "rxjs": "7.8.1", "string-hash": "^1.1.3", "tinycolor2": "1.6.0", @@ -1095,9 +1095,9 @@ } }, "node_modules/@grafana/e2e-selectors": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.1.0.tgz", - "integrity": "sha512-i7R5MJEgBq6LwnVP7TPMRSMi+Va8fRv2YhQ+FOrd2pzQgkfslUZL2CB8+D6/kzoxy5drsSh5hBsNwP/oe2NFuw==", + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.2.0.tgz", + "integrity": "sha512-13iHPt6bz7gfgO9WbqPpSla5SEalKtXhgBrCNHTZbGoZhiDkl/kl6wSWYepnXIEs2psyXnABaLpMfg/nXNgSyQ==", "dependencies": { "@grafana/tsconfig": "^1.3.0-rc1", "tslib": "2.6.3", @@ -1378,15 +1378,15 @@ } }, "node_modules/@grafana/runtime": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.1.0.tgz", - "integrity": "sha512-LK+itxAhoX67IwpWxrLBqT3QreVWPgkngEhH0sS/Jm0XgrBrXz92Gh04sY4F5NKHo7LR+/o46aYPZ3l8IpVCaw==", + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/@grafana/runtime/-/runtime-11.2.0.tgz", + "integrity": "sha512-UQ/wAOE/4wt+dnCkHzYe/TfwFTt6s5BgzwACeU9Ik2Zc40Hi8vk1jdd5ky5q4fItzAfd9h0tczP2iURZPpsIHg==", "dependencies": { - "@grafana/data": "11.1.0", - "@grafana/e2e-selectors": "11.1.0", + "@grafana/data": "11.2.0", + "@grafana/e2e-selectors": "11.2.0", "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.0", - "@grafana/ui": "11.1.0", + "@grafana/schema": "11.2.0", + "@grafana/ui": "11.2.0", "history": "4.10.1", "lodash": "4.17.21", "rxjs": "7.8.1", @@ -1397,214 +1397,10 @@ "react-dom": "^18.0.0" } }, - "node_modules/@grafana/runtime/node_modules/@floating-ui/react": { - "version": "0.26.16", - "resolved": "https://registry.npmjs.org/@floating-ui/react/-/react-0.26.16.tgz", - "integrity": "sha512-HEf43zxZNAI/E781QIVpYSF3K2VH4TTYZpqecjdsFkjsaU1EbaWcM++kw0HXFffj7gDUcBFevX8s0rQGQpxkow==", - "dependencies": { - "@floating-ui/react-dom": "^2.1.0", - "@floating-ui/utils": "^0.2.0", - "tabbable": "^6.0.0" - }, - "peerDependencies": { - "react": ">=16.8.0", - "react-dom": ">=16.8.0" - } - }, - "node_modules/@grafana/runtime/node_modules/@grafana/ui": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/@grafana/ui/-/ui-11.1.0.tgz", - "integrity": "sha512-oOOOjvH8GzCyflOuI6q5Dan/4UuOkZ6YnpuPubU4a5LUqAVKJvrudtqdUmQPvpbuQ7pWzYQ8UNoBtVRptSQQdg==", - "dependencies": { - "@emotion/css": "11.11.2", - "@emotion/react": "11.11.4", - "@floating-ui/react": "0.26.16", - "@grafana/data": "11.1.0", - "@grafana/e2e-selectors": "11.1.0", - "@grafana/faro-web-sdk": "^1.3.6", - "@grafana/schema": "11.1.0", - "@leeoniya/ufuzzy": "1.0.14", - "@monaco-editor/react": "4.6.0", - "@popperjs/core": "2.11.8", - "@react-aria/dialog": "3.5.14", - "@react-aria/focus": "3.17.1", - "@react-aria/overlays": "3.22.1", - "@react-aria/utils": "3.24.1", - "ansicolor": "1.1.100", - "calculate-size": "1.1.1", - "classnames": "2.5.1", - "d3": "7.9.0", - "date-fns": "3.6.0", - "hoist-non-react-statics": "3.3.2", - "i18next": "^23.0.0", - "i18next-browser-languagedetector": "^7.0.2", - "immutable": "4.3.6", - "is-hotkey": "0.2.0", - "jquery": "3.7.1", - "lodash": "4.17.21", - "micro-memoize": "^4.1.2", - "moment": "2.30.1", - "monaco-editor": "0.34.1", - "ol": "7.4.0", - "prismjs": "1.29.0", - "rc-cascader": "3.26.0", - "rc-drawer": "7.2.0", - "rc-slider": "10.6.2", - "rc-time-picker": "^3.7.3", - "rc-tooltip": "6.2.0", - "react-beautiful-dnd": "13.1.1", - "react-calendar": "4.8.0", - "react-colorful": "5.6.1", - "react-custom-scrollbars-2": "4.5.0", - "react-dropzone": "14.2.3", - "react-highlight-words": "0.20.0", - "react-hook-form": "^7.49.2", - "react-i18next": "^14.0.0", - "react-inlinesvg": "3.0.2", - "react-loading-skeleton": "3.4.0", - "react-router-dom": "5.3.3", - "react-select": "5.8.0", - "react-table": "7.8.0", - "react-transition-group": "4.4.5", - "react-use": "17.5.0", - "react-window": "1.8.10", - "rxjs": "7.8.1", - "slate": "0.47.9", - "slate-plain-serializer": "0.7.13", - "slate-react": "0.22.10", - "tinycolor2": "1.6.0", - "tslib": "2.6.3", - "uplot": "1.6.30", - "uuid": "9.0.1" - }, - "peerDependencies": { - "react": "^18.0.0", - "react-dom": "^18.0.0" - } - }, - "node_modules/@grafana/runtime/node_modules/@react-aria/dialog": { - "version": "3.5.14", - "resolved": "https://registry.npmjs.org/@react-aria/dialog/-/dialog-3.5.14.tgz", - "integrity": "sha512-oqDCjQ8hxe3GStf48XWBf2CliEnxlR9GgSYPHJPUc69WBj68D9rVcCW3kogJnLAnwIyf3FnzbX4wSjvUa88sAQ==", - "dependencies": { - "@react-aria/focus": "^3.17.1", - "@react-aria/overlays": "^3.22.1", - "@react-aria/utils": "^3.24.1", - "@react-types/dialog": "^3.5.10", - "@react-types/shared": "^3.23.1", - "@swc/helpers": "^0.5.0" - }, - "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0", - "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" - } - }, - "node_modules/@grafana/runtime/node_modules/@react-aria/focus": { - "version": "3.17.1", - "resolved": "https://registry.npmjs.org/@react-aria/focus/-/focus-3.17.1.tgz", - "integrity": "sha512-FLTySoSNqX++u0nWZJPPN5etXY0WBxaIe/YuL/GTEeuqUIuC/2bJSaw5hlsM6T2yjy6Y/VAxBcKSdAFUlU6njQ==", - "dependencies": { - "@react-aria/interactions": "^3.21.3", - "@react-aria/utils": "^3.24.1", - "@react-types/shared": "^3.23.1", - "@swc/helpers": "^0.5.0", - "clsx": "^2.0.0" - }, - "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" - } - }, - "node_modules/@grafana/runtime/node_modules/@react-aria/overlays": { - "version": "3.22.1", - "resolved": "https://registry.npmjs.org/@react-aria/overlays/-/overlays-3.22.1.tgz", - "integrity": "sha512-GHiFMWO4EQ6+j6b5QCnNoOYiyx1Gk8ZiwLzzglCI4q1NY5AG2EAmfU4Z1+Gtrf2S5Y0zHbumC7rs9GnPoGLUYg==", - "dependencies": { - "@react-aria/focus": "^3.17.1", - "@react-aria/i18n": "^3.11.1", - "@react-aria/interactions": "^3.21.3", - "@react-aria/ssr": "^3.9.4", - "@react-aria/utils": "^3.24.1", - "@react-aria/visually-hidden": "^3.8.12", - "@react-stately/overlays": "^3.6.7", - "@react-types/button": "^3.9.4", - "@react-types/overlays": "^3.8.7", - "@react-types/shared": "^3.23.1", - "@swc/helpers": "^0.5.0" - }, - "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0", - "react-dom": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" - } - }, - "node_modules/@grafana/runtime/node_modules/@react-aria/utils": { - "version": "3.24.1", - "resolved": "https://registry.npmjs.org/@react-aria/utils/-/utils-3.24.1.tgz", - "integrity": "sha512-O3s9qhPMd6n42x9sKeJ3lhu5V1Tlnzhu6Yk8QOvDuXf7UGuUjXf9mzfHJt1dYzID4l9Fwm8toczBzPM9t0jc8Q==", - "dependencies": { - "@react-aria/ssr": "^3.9.4", - "@react-stately/utils": "^3.10.1", - "@react-types/shared": "^3.23.1", - "@swc/helpers": "^0.5.0", - "clsx": "^2.0.0" - }, - "peerDependencies": { - "react": "^16.8.0 || ^17.0.0-rc.1 || ^18.0.0" - } - }, - "node_modules/@grafana/runtime/node_modules/rc-cascader": { - "version": "3.26.0", - "resolved": "https://registry.npmjs.org/rc-cascader/-/rc-cascader-3.26.0.tgz", - "integrity": "sha512-L1dml383TPSJD1I11YwxuVbmqaJY64psZqFp1ETlgl3LEOwDu76Cyl11fw5dmjJhMlUWwM5dECQfqJgfebhUjg==", - "dependencies": { - "@babel/runtime": "^7.12.5", - "array-tree-filter": "^2.1.0", - "classnames": "^2.3.1", - "rc-select": "~14.14.0", - "rc-tree": "~5.8.1", - "rc-util": "^5.37.0" - }, - "peerDependencies": { - "react": ">=16.9.0", - "react-dom": ">=16.9.0" - } - }, - "node_modules/@grafana/runtime/node_modules/rc-select": { - "version": "14.14.0", - "resolved": "https://registry.npmjs.org/rc-select/-/rc-select-14.14.0.tgz", - "integrity": "sha512-Uo2wulrjoPPRLCPd7zlK4ZFVJxlTN//yp1xWP/U+TUOQCyXrT+Duvq/Si5OzVcmQyWAUSbsplc2OwNNhvbOeKQ==", - "dependencies": { - "@babel/runtime": "^7.10.1", - "@rc-component/trigger": "^2.1.1", - "classnames": "2.x", - "rc-motion": "^2.0.1", - "rc-overflow": "^1.3.1", - "rc-util": "^5.16.1", - "rc-virtual-list": "^3.5.2" - }, - "engines": { - "node": ">=8.x" - }, - "peerDependencies": { - "react": "*", - "react-dom": "*" - } - }, - "node_modules/@grafana/runtime/node_modules/uuid": { - "version": "9.0.1", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", - "integrity": "sha512-b+1eJOlsR9K8HJpow9Ok3fiWOWSIcIzXodvv0rQjVoOVNpWMpxf1wZNpt4y9h10odCNrqnYp1OBzRktckBe3sA==", - "funding": [ - "https://github.com/sponsors/broofa", - "https://github.com/sponsors/ctavan" - ], - "bin": { - "uuid": "dist/bin/uuid" - } - }, "node_modules/@grafana/schema": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.1.0.tgz", - "integrity": "sha512-HxKeMNrvRDkxBHfwExGZ9MdPYf68n8tctH3aCMFMf/csdlM5EEmgYOOJ1yVLVSxAqiZcb8y6TmL+2QOuP0RK3A==", + "version": "11.2.0", + "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.2.0.tgz", + "integrity": "sha512-ajW/O0uLgoNrtmxWefgUxJC1DFDyQOjnidzdoWDQbBAbw2fxxhXSYmY1v5Z9ZvVjxuWH7gn636cpA2PfRLNkcw==", "dependencies": { "tslib": "2.6.3" } @@ -1690,109 +1486,11 @@ "react-dom": "^18.0.0" } }, - "node_modules/@grafana/ui/node_modules/@grafana/data": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/@grafana/data/-/data-11.2.0.tgz", - "integrity": "sha512-mMek4DWhoegojMfb4/vIFm/jYj/88b/xu2RHKqa4h1ySdQ0wgOFhN9ea5n3Beo68RrEQa2RINaDa36DSTsHJrQ==", - "dependencies": { - "@braintree/sanitize-url": "7.0.1", - "@grafana/schema": "11.2.0", - "@types/d3-interpolate": "^3.0.0", - "@types/string-hash": "1.1.3", - "d3-interpolate": "3.0.1", - "date-fns": "3.6.0", - "dompurify": "^3.0.0", - "eventemitter3": "5.0.1", - "fast_array_intersect": "1.1.0", - "history": "4.10.1", - "lodash": "4.17.21", - "marked": "12.0.2", - "marked-mangle": "1.1.9", - "moment": "2.30.1", - "moment-timezone": "0.5.45", - "ol": "7.4.0", - "papaparse": "5.4.1", - "react-use": "17.5.1", - "rxjs": "7.8.1", - "string-hash": "^1.1.3", - "tinycolor2": "1.6.0", - "tslib": "2.6.3", - "uplot": "1.6.30", - "xss": "^1.0.14" - }, - "peerDependencies": { - "react": "^18.0.0", - "react-dom": "^18.0.0" - } - }, - "node_modules/@grafana/ui/node_modules/@grafana/e2e-selectors": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/@grafana/e2e-selectors/-/e2e-selectors-11.2.0.tgz", - "integrity": "sha512-13iHPt6bz7gfgO9WbqPpSla5SEalKtXhgBrCNHTZbGoZhiDkl/kl6wSWYepnXIEs2psyXnABaLpMfg/nXNgSyQ==", - "dependencies": { - "@grafana/tsconfig": "^1.3.0-rc1", - "tslib": "2.6.3", - "typescript": "5.4.5" - } - }, - "node_modules/@grafana/ui/node_modules/@grafana/schema": { - "version": "11.2.0", - "resolved": "https://registry.npmjs.org/@grafana/schema/-/schema-11.2.0.tgz", - "integrity": "sha512-ajW/O0uLgoNrtmxWefgUxJC1DFDyQOjnidzdoWDQbBAbw2fxxhXSYmY1v5Z9ZvVjxuWH7gn636cpA2PfRLNkcw==", - "dependencies": { - "tslib": "2.6.3" - } - }, "node_modules/@grafana/ui/node_modules/immutable": { "version": "4.3.7", "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz", "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==" }, - "node_modules/@grafana/ui/node_modules/marked-mangle": { - "version": "1.1.9", - "resolved": "https://registry.npmjs.org/marked-mangle/-/marked-mangle-1.1.9.tgz", - "integrity": "sha512-eLTXr1xQzba/WZp/trPS0HkR9W02ifasH6IWPrBv++eO2m8POiwV4muQ6Tof2C5Fhdo3z8ggXs6VGw1f931Vsg==", - "peerDependencies": { - "marked": ">=4 <15" - } - }, - "node_modules/@grafana/ui/node_modules/react-use": { - "version": "17.5.1", - "resolved": "https://registry.npmjs.org/react-use/-/react-use-17.5.1.tgz", - "integrity": "sha512-LG/uPEVRflLWMwi3j/sZqR00nF6JGqTTDblkXK2nzXsIvij06hXl1V/MZIlwj1OKIQUtlh1l9jK8gLsRyCQxMg==", - "dependencies": { - "@types/js-cookie": "^2.2.6", - "@xobotyi/scrollbar-width": "^1.9.5", - "copy-to-clipboard": "^3.3.1", - "fast-deep-equal": "^3.1.3", - "fast-shallow-equal": "^1.0.0", - "js-cookie": "^2.2.1", - "nano-css": "^5.6.2", - "react-universal-interface": "^0.6.2", - "resize-observer-polyfill": "^1.5.1", - "screenfull": "^5.1.0", - "set-harmonic-interval": "^1.0.1", - "throttle-debounce": "^3.0.1", - "ts-easing": "^0.2.0", - "tslib": "^2.1.0" - }, - "peerDependencies": { - "react": "*", - "react-dom": "*" - } - }, - "node_modules/@grafana/ui/node_modules/typescript": { - "version": "5.4.5", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.4.5.tgz", - "integrity": "sha512-vcI4UpRgg81oIRUFwR0WSIHKt11nJ7SAVlYNIu+QpqeyXP+gpQJy/Z4+F0aGxSE4MqwjyXvW/TzgkLAx2AGHwQ==", - "bin": { - "tsc": "bin/tsc", - "tsserver": "bin/tsserver" - }, - "engines": { - "node": ">=14.17" - } - }, "node_modules/@grafana/ui/node_modules/uuid": { "version": "9.0.1", "resolved": "https://registry.npmjs.org/uuid/-/uuid-9.0.1.tgz", @@ -4223,17 +3921,6 @@ "@types/react": "*" } }, - "node_modules/@types/react-redux": { - "version": "7.1.33", - "resolved": "https://registry.npmjs.org/@types/react-redux/-/react-redux-7.1.33.tgz", - "integrity": "sha512-NF8m5AjWCkert+fosDsN3hAlHzpjSiXlVy9EgQEmLoBhaNXbmyeGs/aj5dQzKuF+/q+S7JQagorGDW8pJ28Hmg==", - "dependencies": { - "@types/hoist-non-react-statics": "^3.3.0", - "@types/react": "*", - "hoist-non-react-statics": "^3.3.0", - "redux": "^4.0.0" - } - }, "node_modules/@types/react-table": { "version": "7.7.20", "resolved": "https://registry.npmjs.org/@types/react-table/-/react-table-7.7.20.tgz", @@ -11765,11 +11452,11 @@ } }, "node_modules/marked-mangle": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/marked-mangle/-/marked-mangle-1.1.7.tgz", - "integrity": "sha512-bLsXKovJEEs/Dl++TBPmjX8ALFmrH5G0doTs+BdDOloBKWYRf3acyJghce78SnwInDkNPJ6crubr4MnFG7urOA==", + "version": "1.1.9", + "resolved": "https://registry.npmjs.org/marked-mangle/-/marked-mangle-1.1.9.tgz", + "integrity": "sha512-eLTXr1xQzba/WZp/trPS0HkR9W02ifasH6IWPrBv++eO2m8POiwV4muQ6Tof2C5Fhdo3z8ggXs6VGw1f931Vsg==", "peerDependencies": { - "marked": ">=4 <13" + "marked": ">=4 <15" } }, "node_modules/mdn-data": { @@ -13242,58 +12929,6 @@ "node": ">=0.10.0" } }, - "node_modules/react-beautiful-dnd": { - "version": "13.1.1", - "resolved": "https://registry.npmjs.org/react-beautiful-dnd/-/react-beautiful-dnd-13.1.1.tgz", - "integrity": "sha512-0Lvs4tq2VcrEjEgDXHjT98r+63drkKEgqyxdA7qD3mvKwga6a5SscbdLPO2IExotU1jW8L0Ksdl0Cj2AF67nPQ==", - "dependencies": { - "@babel/runtime": "^7.9.2", - "css-box-model": "^1.2.0", - "memoize-one": "^5.1.1", - "raf-schd": "^4.0.2", - "react-redux": "^7.2.0", - "redux": "^4.0.4", - "use-memo-one": "^1.1.1" - }, - "peerDependencies": { - "react": "^16.8.5 || ^17.0.0 || ^18.0.0", - "react-dom": "^16.8.5 || ^17.0.0 || ^18.0.0" - } - }, - "node_modules/react-beautiful-dnd/node_modules/memoize-one": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz", - "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q==" - }, - "node_modules/react-beautiful-dnd/node_modules/react-is": { - "version": "17.0.2", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", - "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==" - }, - "node_modules/react-beautiful-dnd/node_modules/react-redux": { - "version": "7.2.9", - "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-7.2.9.tgz", - "integrity": "sha512-Gx4L3uM182jEEayZfRbI/G11ZpYdNAnBs70lFVMNdHJI76XYtR+7m0MN+eAs7UHBPhWXcnFPaS+9owSCJQHNpQ==", - "dependencies": { - "@babel/runtime": "^7.15.4", - "@types/react-redux": "^7.1.20", - "hoist-non-react-statics": "^3.3.2", - "loose-envify": "^1.4.0", - "prop-types": "^15.7.2", - "react-is": "^17.0.2" - }, - "peerDependencies": { - "react": "^16.8.3 || ^17 || ^18" - }, - "peerDependenciesMeta": { - "react-dom": { - "optional": true - }, - "react-native": { - "optional": true - } - } - }, "node_modules/react-calendar": { "version": "4.8.0", "resolved": "https://registry.npmjs.org/react-calendar/-/react-calendar-4.8.0.tgz", @@ -13624,9 +13259,9 @@ } }, "node_modules/react-use": { - "version": "17.5.0", - "resolved": "https://registry.npmjs.org/react-use/-/react-use-17.5.0.tgz", - "integrity": "sha512-PbfwSPMwp/hoL847rLnm/qkjg3sTRCvn6YhUZiHaUa3FA6/aNoFX79ul5Xt70O1rK+9GxSVqkY0eTwMdsR/bWg==", + "version": "17.5.1", + "resolved": "https://registry.npmjs.org/react-use/-/react-use-17.5.1.tgz", + "integrity": "sha512-LG/uPEVRflLWMwi3j/sZqR00nF6JGqTTDblkXK2nzXsIvij06hXl1V/MZIlwj1OKIQUtlh1l9jK8gLsRyCQxMg==", "dependencies": { "@types/js-cookie": "^2.2.6", "@xobotyi/scrollbar-width": "^1.9.5", @@ -13634,7 +13269,7 @@ "fast-deep-equal": "^3.1.3", "fast-shallow-equal": "^1.0.0", "js-cookie": "^2.2.1", - "nano-css": "^5.6.1", + "nano-css": "^5.6.2", "react-universal-interface": "^0.6.2", "resize-observer-polyfill": "^1.5.1", "screenfull": "^5.1.0", diff --git a/package.json b/package.json index 70dd9365..a4bad04c 100644 --- a/package.json +++ b/package.json @@ -2,8 +2,8 @@ "author": "Volkov Labs", "dependencies": { "@emotion/css": "^11.11.2", - "@grafana/data": "^11.1.0", - "@grafana/runtime": "^11.1.0", + "@grafana/data": "^11.2.0", + "@grafana/runtime": "^11.2.0", "@grafana/ui": "^11.2.0", "@hello-pangea/dnd": "^16.6.0", "@volkovlabs/components": "^2.8.1",