IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-12 08:35:43 -06:00
Code Issues Packages Projects Releases Wiki Activity

Update Monthly patch updates (#49257)

Browse Source 
* Update Monthly patch updates

* remove @types/slate update and run prettier

* fix @types/slate resolution

* lockfile update

* more fixes

Co-authored-by: Renovate Bot <bot@renovateapp.com>
Co-authored-by: Ashley Harrison <ashley.harrison@grafana.com>
This commit is contained in:
renovate[bot] 2022-05-20 13:07:07 +01:00 committed by GitHub
parent f1f5f01309
commit be7de1041a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 1717 additions and 1801 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

785
.yarn/releases/yarn-3.2.0.cjs vendored
View File

File diff suppressed because one or more lines are too long

786
.yarn/releases/yarn-3.2.1.cjs vendored Executable file
View File

File diff suppressed because one or more lines are too long

2
.yarnrc.yml
View File

@ -78,4 +78,4 @@ plugins:
- path: .yarn/plugins/@yarnpkg/plugin-outdated.cjs
spec: "https://mskelton.dev/yarn-outdated/v2"
yarnPath: .yarn/releases/yarn-3.2.0.cjs
yarnPath: .yarn/releases/yarn-3.2.1.cjs

132
package.json
View File

@ -83,34 +83,34 @@
"@babel/plugin-proposal-object-rest-spread": "7.17.3",
"@babel/plugin-proposal-optional-chaining": "7.17.12",
"@babel/plugin-syntax-dynamic-import": "7.8.3",
"@babel/plugin-transform-react-constant-elements": "7.17.6",
"@babel/plugin-transform-react-constant-elements": "7.17.12",
"@babel/plugin-transform-runtime": "7.17.0",
"@babel/plugin-transform-typescript": "7.17.12",
"@babel/preset-env": "7.17.10",
"@babel/preset-react": "7.17.12",
"@babel/preset-typescript": "7.17.12",
"@betterer/betterer": "5.3.0",
"@betterer/cli": "5.3.0",
"@betterer/regexp": "5.3.0",
"@betterer/betterer": "5.3.5",
"@betterer/cli": "5.3.5",
"@betterer/regexp": "5.3.5",
"@emotion/eslint-plugin": "11.7.0",
"@grafana/api-documenter": "7.11.2",
"@grafana/e2e": "workspace:*",
"@grafana/eslint-config": "3.0.0",
"@grafana/toolkit": "workspace:*",
"@grafana/tsconfig": "^1.2.0-rc1",
"@lingui/cli": "3.13.2",
"@lingui/macro": "3.13.2",
"@microsoft/api-extractor": "7.24.0",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.4",
"@react-types/button": "3.4.4",
"@react-types/menu": "3.5.2",
"@react-types/overlays": "3.5.4",
"@lingui/cli": "3.13.3",
"@lingui/macro": "3.13.3",
"@microsoft/api-extractor": "7.24.1",
"@pmmmwh/react-refresh-webpack-plugin": "0.5.6",
"@react-types/button": "3.4.5",
"@react-types/menu": "3.5.3",
"@react-types/overlays": "3.5.5",
"@react-types/shared": "3.12.0",
"@rtsao/plugin-proposal-class-properties": "7.0.1-patch.1",
"@swc/core": "1.2.160",
"@swc/helpers": "0.3.8",
"@swc/core": "1.2.187",
"@swc/helpers": "0.3.13",
"@testing-library/dom": "8.13.0",
"@testing-library/jest-dom": "5.16.2",
"@testing-library/jest-dom": "5.16.4",
"@testing-library/react": "12.1.4",
"@testing-library/react-hooks": "8.0.0",
"@testing-library/user-event": "14.2.0",
@ -122,9 +122,9 @@
"@types/d3-force": "^2.1.0",
"@types/d3-scale-chromatic": "1.3.1",
"@types/debounce-promise": "3.1.4",
"@types/enzyme": "3.10.11",
"@types/enzyme": "3.10.12",
"@types/enzyme-adapter-react-16": "1.0.6",
"@types/eslint": "8.4.1",
"@types/eslint": "8.4.2",
"@types/file-saver": "2.0.5",
"@types/google.analytics": "^0.0.42",
"@types/grafana__slate-react": "npm:@types/slate-react@0.22.5",
@ -135,10 +135,10 @@
"@types/js-yaml": "^4.0.5",
"@types/jsurl": "^1.2.28",
"@types/lingui__macro": "^3",
"@types/lodash": "4.14.181",
"@types/lodash": "4.14.182",
"@types/logfmt": "^1.2.1",
"@types/mousetrap": "1.6.9",
"@types/node": "16.11.26",
"@types/node": "16.11.36",
"@types/papaparse": "5.3.2",
"@types/pluralize": "^0.0.29",
"@types/prismjs": "1.26.0",
@ -149,9 +149,9 @@
"@types/react-grid-layout": "1.3.2",
"@types/react-highlight-words": "0.16.4",
"@types/react-loadable": "5.5.6",
"@types/react-redux": "7.1.23",
"@types/react-redux": "7.1.24",
"@types/react-router-dom": "5.3.3",
"@types/react-table": "^7",
"@types/react-table": "7.7.12",
"@types/react-test-renderer": "17.0.1",
"@types/react-transition-group": "4.4.4",
"@types/react-virtualized-auto-sizer": "1.0.1",
@ -168,11 +168,11 @@
"@types/uuid": "8.3.4",
"@typescript-eslint/eslint-plugin": "5.25.0",
"@typescript-eslint/parser": "5.25.0",
"@wojtekmaj/enzyme-adapter-react-17": "0.6.6",
"autoprefixer": "10.4.4",
"@wojtekmaj/enzyme-adapter-react-17": "0.6.7",
"autoprefixer": "10.4.7",
"axios": "0.27.2",
"babel-jest": "27.5.1",
"babel-loader": "8.2.4",
"babel-loader": "8.2.5",
"babel-plugin-angularjs-annotate": "0.10.0",
"babel-plugin-macros": "3.1.0",
"copy-webpack-plugin": "9.0.1",
@ -192,7 +192,7 @@
"eslint-webpack-plugin": "3.1.1",
"expose-loader": "4.0.0",
"file-loader": "6.2.0",
"fork-ts-checker-webpack-plugin": "7.2.1",
"fork-ts-checker-webpack-plugin": "7.2.11",
"fs-extra": "10.1.0",
"glob": "8.0.3",
"html-loader": "3.1.0",
@ -213,12 +213,12 @@
"mutationobserver-shim": "0.3.7",
"ngtemplate-loader": "2.1.0",
"node-notifier": "10.0.1",
"nodemon": "2.0.15",
"postcss": "8.4.12",
"nodemon": "2.0.16",
"postcss": "8.4.14",
"postcss-loader": "7.0.0",
"postcss-reporter": "7.0.5",
"postcss-scss": "4.0.3",
"prettier": "2.6.0",
"postcss-scss": "4.0.4",
"prettier": "2.6.2",
"raw-loader": "4.0.2",
"react-refresh": "0.11.0",
"react-select-event": "5.5.0",
@ -239,7 +239,7 @@
"ts-node": "10.7.0",
"typescript": "4.6.4",
"wait-on": "6.0.1",
"webpack": "5.72.0",
"webpack": "5.72.1",
"webpack-bundle-analyzer": "4.5.0",
"webpack-cli": "4.9.2",
"webpack-dev-server": "4.9.0",
@ -248,7 +248,7 @@
"dependencies": {
"@emotion/css": "11.9.0",
"@emotion/react": "11.9.0",
"@grafana/aws-sdk": "0.0.35",
"@grafana/aws-sdk": "0.0.36",
"@grafana/data": "workspace:*",
"@grafana/e2e-selectors": "workspace:*",
"@grafana/experimental": "^0.0.2-canary.30",
@ -259,29 +259,29 @@
"@grafana/slate-react": "0.22.10-grafana",
"@grafana/ui": "workspace:*",
"@jaegertracing/jaeger-ui-components": "workspace:*",
"@kusto/monaco-kusto": "5.1.1",
"@kusto/monaco-kusto": "5.1.3",
"@lezer/common": "0.15.12",
"@lezer/lr": "0.15.8",
"@lingui/core": "3.13.2",
"@lingui/react": "3.13.2",
"@lingui/core": "3.13.3",
"@lingui/react": "3.13.3",
"@opentelemetry/api": "1.1.0",
"@opentelemetry/exporter-collector": "0.25.0",
"@opentelemetry/semantic-conventions": "1.2.0",
"@popperjs/core": "2.11.4",
"@react-aria/button": "3.4.3",
"@react-aria/dialog": "3.1.8",
"@react-aria/focus": "3.5.4",
"@react-aria/interactions": "3.8.3",
"@react-aria/menu": "3.4.3",
"@react-aria/overlays": "3.8.1",
"@popperjs/core": "2.11.5",
"@react-aria/button": "3.4.4",
"@react-aria/dialog": "3.1.9",
"@react-aria/focus": "3.5.5",
"@react-aria/interactions": "3.8.4",
"@react-aria/menu": "3.4.4",
"@react-aria/overlays": "3.8.2",
"@react-aria/utils": "3.12.0",
"@react-stately/collections": "3.3.7",
"@react-stately/menu": "3.2.6",
"@react-stately/tree": "3.2.3",
"@reduxjs/toolkit": "1.8.0",
"@sentry/browser": "6.19.1",
"@sentry/types": "6.19.1",
"@sentry/utils": "6.19.1",
"@react-stately/collections": "3.3.8",
"@react-stately/menu": "3.2.7",
"@react-stately/tree": "3.2.4",
"@reduxjs/toolkit": "1.8.1",
"@sentry/browser": "6.19.7",
"@sentry/types": "6.19.7",
"@sentry/utils": "6.19.7",
"@types/react-resizable": "3.0.0",
"@visx/event": "2.6.0",
"@visx/gradient": "2.10.0",
@ -290,15 +290,15 @@
"@visx/shape": "2.10.0",
"@visx/tooltip": "2.10.0",
"@welldone-software/why-did-you-render": "7.0.1",
"angular": "1.8.2",
"angular": "1.8.3",
"angular-bindonce": "0.3.1",
"angular-route": "1.8.2",
"angular-sanitize": "1.8.2",
"angular-route": "1.8.3",
"angular-sanitize": "1.8.3",
"app": "link:./public/app",
"baron": "3.0.3",
"brace": "0.11.1",
"calculate-size": "1.1.1",
"centrifuge": "2.8.4",
"centrifuge": "2.8.5",
"classnames": "2.3.1",
"comlink": "4.3.1",
"common-tags": "1.8.2",
@ -312,26 +312,26 @@
"emotion": "11.0.0",
"eventemitter3": "4.0.7",
"fast-deep-equal": "^3.1.3",
"fast-json-patch": "3.1.0",
"fast-json-patch": "3.1.1",
"file-saver": "2.0.5",
"history": "4.10.1",
"hoist-non-react-statics": "3.3.2",
"immer": "9.0.12",
"immer": "9.0.14",
"immutable": "4.0.0",
"jquery": "3.6.0",
"js-yaml": "^4.1.0",
"json-source-map": "0.6.1",
"jsurl": "^0.1.5",
"kbar": "^0.1.0-beta.30",
"kbar": "0.1.0-beta.34",
"lezer-promql": "0.22.0",
"lodash": "4.17.21",
"logfmt": "^1.3.2",
"lru-cache": "7.10.1",
"memoize-one": "6.0.0",
"moment": "2.29.2",
"moment": "2.29.3",
"moment-timezone": "0.5.34",
"monaco-editor": "^0.31.1",
"monaco-promql": "^1.7.2",
"monaco-promql": "1.7.4",
"mousetrap": "1.6.5",
"mousetrap-global-bind": "1.1.0",
"moveable": "0.29.8",
@ -344,12 +344,12 @@
"rc-drawer": "4.4.3",
"rc-slider": "9.7.5",
"rc-time-picker": "3.7.3",
"re-resizable": "6.9.5",
"re-resizable": "6.9.9",
"react": "17.0.2",
"react-beautiful-dnd": "13.1.0",
"react-diff-viewer": "^3.1.1",
"react-dom": "17.0.2",
"react-draggable": "4.4.4",
"react-draggable": "4.4.5",
"react-grid-layout": "1.3.4",
"react-highlight-words": "0.18.0",
"react-hook-form": "7.5.3",
@ -368,7 +368,7 @@
"react-transition-group": "4.4.2",
"react-use": "17.3.2",
"react-virtualized-auto-sizer": "1.0.6",
"react-window": "1.8.6",
"react-window": "1.8.7",
"react-window-infinite-loader": "^1.0.7",
"redux": "4.2.0",
"redux-thunk": "2.4.1",
@ -379,7 +379,7 @@
"sass": "link:./public/sass",
"search-query-parser": "1.6.0",
"selecto": "1.16.2",
"semver": "^7.1.3",
"semver": "7.3.7",
"slate": "0.47.8",
"slate-plain-serializer": "0.7.10",
"symbol-observable": "4.0.0",
@ -394,13 +394,13 @@
"whatwg-fetch": "3.6.2"
},
"resolutions": {
"underscore": "1.13.2",
"underscore": "1.13.3",
"@types/slate": "0.47.2",
"@microsoft/api-extractor-model": "7.17.2",
"@rushstack/node-core-library": "3.45.1",
"@rushstack/rig-package": "0.3.8",
"@microsoft/api-extractor-model": "7.17.3",
"@rushstack/node-core-library": "3.45.5",
"@rushstack/rig-package": "0.3.11",
"@rushstack/ts-command-line": "4.11.0",
"@storybook/react/webpack": "5.72.0",
"@storybook/react/webpack": "5.72.1",
"node-fetch": "2.6.7"
},
"workspaces": {
@ -412,5 +412,5 @@
"engines": {
"node": ">= 16"
},
"packageManager": "yarn@3.2.0"
"packageManager": "yarn@3.2.1"
}

14
packages/grafana-data/package.json
View File

@ -28,8 +28,8 @@
"date-fns": "2.28.0",
"eventemitter3": "4.0.7",
"lodash": "4.17.21",
"marked": "4.0.12",
"moment": "2.29.2",
"marked": "4.0.16",
"moment": "2.29.3",
"moment-timezone": "0.5.34",
"ol": "6.14.1",
"papaparse": "5.3.2",
@ -46,18 +46,18 @@
"@rollup/plugin-commonjs": "22.0.0",
"@rollup/plugin-json": "4.1.0",
"@rollup/plugin-node-resolve": "13.3.0",
"@swc/helpers": "0.3.8",
"@swc/helpers": "0.3.13",
"@testing-library/dom": "8.13.0",
"@testing-library/jest-dom": "5.16.2",
"@testing-library/jest-dom": "5.16.4",
"@testing-library/react": "12.1.4",
"@testing-library/react-hooks": "8.0.0",
"@testing-library/user-event": "14.2.0",
"@types/history": "4.7.11",
"@types/jest": "27.4.1",
"@types/jquery": "3.5.14",
"@types/lodash": "4.14.181",
"@types/lodash": "4.14.182",
"@types/marked": "4.0.3",
"@types/node": "16.11.26",
"@types/node": "16.11.36",
"@types/papaparse": "5.3.2",
"@types/react": "17.0.42",
"@types/react-dom": "17.0.14",
@ -68,7 +68,7 @@
"history": "4.10.1",
"react-test-renderer": "17.0.2",
"rimraf": "3.0.2",
"rollup": "2.74.0",
"rollup": "2.74.1",
"rollup-plugin-sourcemaps": "0.6.3",
"rollup-plugin-terser": "7.0.2",
"sinon": "14.0.0",

4
packages/grafana-e2e-selectors/package.json
View File

@ -26,9 +26,9 @@
"devDependencies": {
"@rollup/plugin-commonjs": "22.0.0",
"@rollup/plugin-node-resolve": "13.3.0",
"@types/node": "16.11.26",
"@types/node": "16.11.36",
"rimraf": "3.0.2",
"rollup": "2.74.0",
"rollup": "2.74.1",
"rollup-plugin-sourcemaps": "0.6.3",
"rollup-plugin-terser": "7.0.2"
},

12
packages/grafana-e2e/package.json
View File

@ -34,14 +34,14 @@
"@rollup/plugin-commonjs": "22.0.0",
"@rollup/plugin-node-resolve": "13.3.0",
"@types/chrome-remote-interface": "0.31.4",
"@types/lodash": "4.14.181",
"@types/node": "16.11.26",
"@types/lodash": "4.14.182",
"@types/node": "16.11.36",
"@types/uuid": "8.3.4",
"rollup": "2.74.0",
"rollup": "2.74.1",
"rollup-plugin-copy": "3.4.0",
"rollup-plugin-sourcemaps": "0.6.3",
"rollup-plugin-terser": "7.0.2",
"webpack": "5.72.0"
"webpack": "5.72.1"
},
"types": "src/index.ts",
"dependencies": {
@ -51,13 +51,13 @@
"@grafana/e2e-selectors": "9.0.0-pre",
"@grafana/tsconfig": "^1.2.0-rc1",
"@mochajs/json-file-reporter": "^1.2.0",
"babel-loader": "8.2.4",
"babel-loader": "8.2.5",
"blink-diff": "1.0.13",
"chrome-remote-interface": "0.31.2",
"commander": "8.3.0",
"cypress": "9.5.1",
"cypress-file-upload": "5.0.8",
"devtools-protocol": "0.0.982423",
"devtools-protocol": "0.0.1005560",
"execa": "5.1.1",
"lodash": "4.17.21",
"mocha": "10.0.0",

6
packages/grafana-runtime/package.json
View File

@ -25,7 +25,7 @@
"@grafana/data": "9.0.0-pre",
"@grafana/e2e-selectors": "9.0.0-pre",
"@grafana/ui": "9.0.0-pre",
"@sentry/browser": "6.19.1",
"@sentry/browser": "6.19.7",
"history": "4.10.1",
"lodash": "4.17.21",
"react": "17.0.2",
@ -44,13 +44,13 @@
"@types/angular": "1.8.4",
"@types/history": "4.7.11",
"@types/jest": "27.4.1",
"@types/lodash": "4.14.181",
"@types/lodash": "4.14.182",
"@types/react": "17.0.42",
"@types/react-dom": "17.0.14",
"@types/systemjs": "^0.20.6",
"lodash": "4.17.21",
"rimraf": "3.0.2",
"rollup": "2.74.0",
"rollup": "2.74.1",
"rollup-plugin-sourcemaps": "0.6.3",
"rollup-plugin-terser": "7.0.2",
"typescript": "4.6.4"

4
packages/grafana-schema/package.json
View File

@ -26,9 +26,9 @@
"@rollup/plugin-commonjs": "22.0.0",
"@rollup/plugin-json": "4.1.0",
"@rollup/plugin-node-resolve": "13.3.0",
"@swc/helpers": "0.3.8",
"@swc/helpers": "0.3.13",
"rimraf": "3.0.2",
"rollup": "2.74.0",
"rollup": "2.74.1",
"rollup-plugin-sourcemaps": "0.6.3",
"rollup-plugin-terser": "7.0.2",
"typescript": "4.6.4"

46
packages/grafana-ui/package.json
View File

@ -32,20 +32,20 @@
"dependencies": {
"@emotion/css": "11.9.0",
"@emotion/react": "11.9.0",
"@grafana/aws-sdk": "0.0.35",
"@grafana/aws-sdk": "0.0.36",
"@grafana/data": "9.0.0-pre",
"@grafana/e2e-selectors": "9.0.0-pre",
"@grafana/schema": "9.0.0-pre",
"@grafana/slate-react": "0.22.10-grafana",
"@monaco-editor/react": "4.3.1",
"@popperjs/core": "2.11.4",
"@react-aria/button": "3.4.3",
"@react-aria/dialog": "3.1.8",
"@react-aria/focus": "3.5.4",
"@react-aria/menu": "3.4.3",
"@react-aria/overlays": "3.8.1",
"@react-stately/menu": "3.2.6",
"@sentry/browser": "6.19.1",
"@popperjs/core": "2.11.5",
"@react-aria/button": "3.4.4",
"@react-aria/dialog": "3.1.9",
"@react-aria/focus": "3.5.5",
"@react-aria/menu": "3.4.4",
"@react-aria/overlays": "3.8.2",
"@react-stately/menu": "3.2.7",
"@sentry/browser": "6.19.7",
"ansicolor": "1.1.100",
"calculate-size": "1.1.1",
"classnames": "2.3.1",
@ -58,7 +58,7 @@
"jquery": "3.6.0",
"lodash": "4.17.21",
"memoize-one": "6.0.0",
"moment": "2.29.2",
"moment": "2.29.3",
"monaco-editor": "^0.31.1",
"ol": "6.14.1",
"prismjs": "1.28.0",
@ -84,7 +84,7 @@
"react-table": "7.8.0",
"react-transition-group": "4.4.2",
"react-use": "17.3.2",
"react-window": "1.8.6",
"react-window": "1.8.7",
"rxjs": "7.5.5",
"slate": "0.47.8",
"slate-plain-serializer": "0.7.10",
@ -113,33 +113,33 @@
"@storybook/manager-webpack5": "6.4.21",
"@storybook/react": "6.4.21",
"@storybook/theming": "6.4.21",
"@swc/helpers": "0.3.8",
"@swc/helpers": "0.3.13",
"@testing-library/dom": "8.13.0",
"@testing-library/jest-dom": "5.16.2",
"@testing-library/jest-dom": "5.16.4",
"@testing-library/react": "12.1.4",
"@testing-library/react-hooks": "8.0.0",
"@testing-library/user-event": "14.2.0",
"@types/classnames": "2.3.0",
"@types/common-tags": "^1.8.0",
"@types/d3": "7.1.0",
"@types/enzyme": "3.10.11",
"@types/enzyme": "3.10.12",
"@types/enzyme-adapter-react-16": "1.0.6",
"@types/grafana__slate-react": "npm:@types/slate-react@0.22.5",
"@types/hoist-non-react-statics": "3.3.1",
"@types/is-hotkey": "0.1.7",
"@types/jest": "27.4.1",
"@types/jquery": "3.5.14",
"@types/lodash": "4.14.181",
"@types/lodash": "4.14.182",
"@types/mock-raf": "1.0.3",
"@types/node": "16.11.26",
"@types/node": "16.11.36",
"@types/prismjs": "1.26.0",
"@types/react": "17.0.42",
"@types/react-beautiful-dnd": "13.1.2",
"@types/react-calendar": "3.5.0",
"@types/react-calendar": "3.5.1",
"@types/react-color": "3.0.6",
"@types/react-dom": "17.0.14",
"@types/react-router-dom": "5.3.3",
"@types/react-table": "7.7.10",
"@types/react-table": "7.7.12",
"@types/react-test-renderer": "17.0.1",
"@types/react-transition-group": "4.4.4",
"@types/react-window": "1.8.5",
@ -149,8 +149,8 @@
"@types/testing-library__react-hooks": "^3.2.0",
"@types/tinycolor2": "1.4.3",
"@types/uuid": "8.3.4",
"@wojtekmaj/enzyme-adapter-react-17": "0.6.6",
"babel-loader": "8.2.4",
"@wojtekmaj/enzyme-adapter-react-17": "0.6.7",
"babel-loader": "8.2.5",
"common-tags": "1.8.2",
"css-loader": "6.7.1",
"css-minimizer-webpack-plugin": "4.0.0",
@ -158,14 +158,14 @@
"enzyme": "3.11.0",
"expose-loader": "4.0.0",
"mock-raf": "1.0.1",
"postcss": "8.4.12",
"postcss": "8.4.14",
"postcss-loader": "7.0.0",
"process": "^0.11.10",
"raw-loader": "4.0.2",
"react-docgen-typescript-loader": "3.7.2",
"react-test-renderer": "17.0.2",
"rimraf": "3.0.2",
"rollup": "2.74.0",
"rollup": "2.74.1",
"rollup-plugin-sourcemaps": "0.6.3",
"rollup-plugin-svg-import": "^1.6.0",
"rollup-plugin-terser": "7.0.2",
@ -175,7 +175,7 @@
"terser-webpack-plugin": "5.3.1",
"ts-loader": "8.0.11",
"typescript": "4.6.4",
"webpack": "5.72.0",
"webpack": "5.72.1",
"webpack-filter-warnings-plugin": "1.2.1"
},
"types": "src/index.ts"

2
packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/CalendarBody.tsx
View File

@ -32,7 +32,7 @@ export function Body({ onChange, from, to, timeZone }: TimePickerCalendarProps)
Body.displayName = 'Body';
export function inputToValue(from: DateTime, to: DateTime, invalidDateDefault: Date = new Date()): Date[] {
export function inputToValue(from: DateTime, to: DateTime, invalidDateDefault: Date = new Date()): [Date, Date] {
const fromAsDate = from.toDate();
const toAsDate = to.toDate();
const fromAsValidDate = dateTime(fromAsDate).isValid() ? fromAsDate : invalidDateDefault;

6
packages/jaeger-ui-components/package.json
View File

@ -16,8 +16,8 @@
"@types/deep-freeze": "^0.1.1",
"@types/grafana__slate-react": "npm:@types/slate-react@0.22.5",
"@types/hoist-non-react-statics": "^3.3.1",
"@types/lodash": "4.14.181",
"@types/prop-types": "^15",
"@types/lodash": "4.14.182",
"@types/prop-types": "15.7.5",
"@types/react": "17.0.42",
"@types/react-icons": "2.2.7",
"@types/reselect": "2.2.0",
@ -42,7 +42,7 @@
"lodash": "4.17.21",
"lru-memoize": "^1.1.0",
"memoize-one": "6.0.0",
"moment": "2.29.2",
"moment": "2.29.3",
"moment-timezone": "0.5.34",
"prop-types": "15.8.1",
"react": "17.0.2",

5
public/app/features/explore/state/main.ts
View File

@ -23,8 +23,9 @@ export interface SyncTimesPayload {
}
export const syncTimesAction = createAction<SyncTimesPayload>('explore/syncTimes');
export const richHistoryUpdatedAction =
createAction<{ richHistory: RichHistoryQuery[]; exploreId: ExploreId }>('explore/richHistoryUpdated');
export const richHistoryUpdatedAction = createAction<{ richHistory: RichHistoryQuery[]; exploreId: ExploreId }>(
'explore/richHistoryUpdated'
);
export const richHistoryStorageFullAction = createAction('explore/richHistoryStorageFullAction');
export const richHistoryLimitExceededAction = createAction('explore/richHistoryLimitExceededAction');
export const richHistoryMigrationFailedAction = createAction('explore/richHistoryMigrationFailedAction');

2
public/app/features/live/centrifuge/channel.ts
View File

@ -90,7 +90,7 @@ export class CentrifugeLiveChannel<T = any> {
},
error: (ctx: SubscribeErrorContext) => {
this.currentStatus.timestamp = Date.now();
this.currentStatus.error = ctx.error;
this.currentStatus.error = ctx.message;
this.sendStatus();
},
subscribe: (ctx: SubscribeSuccessContext) => {

10
public/app/plugins/datasource/elasticsearch/components/QueryEditor/MetricAggregationsEditor/state/actions.ts
View File

@ -6,10 +6,12 @@ export const addMetric = createAction<MetricAggregation['id']>('@metrics/add');
export const removeMetric = createAction<MetricAggregation['id']>('@metrics/remove');
export const toggleMetricVisibility = createAction<MetricAggregation['id']>('@metrics/toggle_visibility');
export const changeMetricField = createAction<{ id: MetricAggregation['id']; field: string }>('@metrics/change_field');
export const changeMetricType =
createAction<{ id: MetricAggregation['id']; type: MetricAggregation['type'] }>('@metrics/change_type');
export const changeMetricAttribute =
createAction<{ metric: MetricAggregation; attribute: string; newValue: any }>('@metrics/change_attr');
export const changeMetricType = createAction<{ id: MetricAggregation['id']; type: MetricAggregation['type'] }>(
'@metrics/change_type'
);
export const changeMetricAttribute = createAction<{ metric: MetricAggregation; attribute: string; newValue: any }>(
'@metrics/change_attr'
);
export const changeMetricSetting = createAction<{
metric: MetricAggregationWithSettings;
settingName: string;

1702
yarn.lock
View File

File diff suppressed because it is too large Load Diff