IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2024-12-28 01:41:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Loki/Prometheus Query Editor: Disabled cmd/ctrl+f keybinding within the editor (#86418)

Browse Source 
* Prom: disable cmd f within the editor

* Loki: disable cmd f within the editor

* Update public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryField.tsx

Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>

* Monaco: upgrade to 0.34.1

* Loki/Prometheus: allow native search to be displayed

* Formatting

* Monaco: upgrade to 0.34.1

https://github.com/microsoft/monaco-editor/issues/102#issuecomment-1282897640

---------

Co-authored-by: Sven Grossmann <sven.grossmann@grafana.com>
This commit is contained in:
Matias Chomicki 2024-04-17 16:38:43 +02:00 committed by GitHub
parent 9baf96dbd2
commit ec43edd8a1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 32 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@ -344,7 +344,7 @@
"ml-regression-simple-linear": "^3.0.0", "ml-regression-simple-linear": "^3.0.0",
"moment": "2.30.1", "moment": "2.30.1",
"moment-timezone": "0.5.45", "moment-timezone": "0.5.45",
"monaco-editor": "0.34.0", "monaco-editor": "0.34.1",
"monaco-promql": "1.7.4", "monaco-promql": "1.7.4",
"mousetrap": "1.6.5", "mousetrap": "1.6.5",
"mousetrap-global-bind": "1.1.0", "mousetrap-global-bind": "1.1.0",

7
packages/grafana-prometheus/src/components/monaco-query-field/MonacoQueryField.tsx
View File

@ -222,6 +222,13 @@ const MonacoQueryField = (props: Props) => {
'isEditorFocused' + id 'isEditorFocused' + id
); );
// Fixes Monaco capturing the search key binding and displaying a useless search box within the Editor.
// See https://github.com/grafana/grafana/issues/85850
monaco.editor.addKeybindingRule({
keybinding: monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyF,
command: null,
});
/* Something in this configuration of monaco doesn't bubble up [mod]+K, which the /* Something in this configuration of monaco doesn't bubble up [mod]+K, which the
command palette uses. Pass the event out of monaco manually command palette uses. Pass the event out of monaco manually
*/ */

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

@ -75,7 +75,7 @@
"lodash": "4.17.21", "lodash": "4.17.21",
"micro-memoize": "^4.1.2", "micro-memoize": "^4.1.2",
"moment": "2.30.1", "moment": "2.30.1",
"monaco-editor": "0.34.0", "monaco-editor": "0.34.1",
"ol": "7.4.0", "ol": "7.4.0",
"prismjs": "1.29.0", "prismjs": "1.29.0",
"rc-cascader": "3.24.1", "rc-cascader": "3.24.1",

2
public/app/plugins/datasource/azuremonitor/package.json
View File

@ -15,7 +15,7 @@
"i18next": "^23.0.0", "i18next": "^23.0.0",
"immer": "10.0.4", "immer": "10.0.4",
"lodash": "4.17.21", "lodash": "4.17.21",
"monaco-editor": "0.34.0", "monaco-editor": "0.34.1",
"prismjs": "1.29.0", "prismjs": "1.29.0",
"react": "18.2.0", "react": "18.2.0",
"react-use": "17.5.0", "react-use": "17.5.0",

2
public/app/plugins/datasource/cloud-monitoring/package.json
View File

@ -16,7 +16,7 @@
"i18next": "^23.0.0", "i18next": "^23.0.0",
"immer": "10.0.4", "immer": "10.0.4",
"lodash": "4.17.21", "lodash": "4.17.21",
"monaco-editor": "0.34.0", "monaco-editor": "0.34.1",
"prismjs": "1.29.0", "prismjs": "1.29.0",
"react": "18.2.0", "react": "18.2.0",
"react-use": "17.5.0", "react-use": "17.5.0",

2
public/app/plugins/datasource/grafana-pyroscope-datasource/package.json
View File

@ -11,7 +11,7 @@
"@grafana/ui": "11.1.0-pre", "@grafana/ui": "11.1.0-pre",
"fast-deep-equal": "^3.1.3", "fast-deep-equal": "^3.1.3",
"lodash": "4.17.21", "lodash": "4.17.21",
"monaco-editor": "0.34.0", "monaco-editor": "0.34.1",
"prismjs": "1.29.0", "prismjs": "1.29.0",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",

7
public/app/plugins/datasource/loki/components/monaco-query-field/MonacoQueryField.tsx
View File

@ -264,6 +264,13 @@ const MonacoQueryField = ({
'isEditorFocused' + id 'isEditorFocused' + id
); );
// Fixes Monaco capturing the search key binding and displaying a useless search box within the Editor.
// See https://github.com/grafana/grafana/issues/85850
monaco.editor.addKeybindingRule({
keybinding: monaco.KeyMod.CtrlCmd | monaco.KeyCode.KeyF,
command: null,
});
editor.onDidFocusEditorText(() => { editor.onDidFocusEditorText(() => {
isEditorFocused.set(true); isEditorFocused.set(true);
if (editor.getValue().trim() === '') { if (editor.getValue().trim() === '') {

2
public/app/plugins/datasource/parca/package.json
View File

@ -10,7 +10,7 @@
"@grafana/schema": "11.1.0-pre", "@grafana/schema": "11.1.0-pre",
"@grafana/ui": "11.1.0-pre", "@grafana/ui": "11.1.0-pre",
"lodash": "4.17.21", "lodash": "4.17.21",
"monaco-editor": "0.34.0", "monaco-editor": "0.34.1",
"react": "18.2.0", "react": "18.2.0",
"react-use": "17.5.0", "react-use": "17.5.0",
"rxjs": "7.8.1", "rxjs": "7.8.1",

2
public/app/plugins/datasource/tempo/package.json
View File

@ -25,7 +25,7 @@
"i18next": "^23.0.0", "i18next": "^23.0.0",
"lodash": "4.17.21", "lodash": "4.17.21",
"lru-cache": "10.2.0", "lru-cache": "10.2.0",
"monaco-editor": "0.34.0", "monaco-editor": "0.34.1",
"prismjs": "1.29.0", "prismjs": "1.29.0",
"react": "18.2.0", "react": "18.2.0",
"react-dom": "18.2.0", "react-dom": "18.2.0",

22
yarn.lock
View File

@ -3323,7 +3323,7 @@ __metadata:
i18next: "npm:^23.0.0" i18next: "npm:^23.0.0"
immer: "npm:10.0.4" immer: "npm:10.0.4"
lodash: "npm:4.17.21" lodash: "npm:4.17.21"
monaco-editor: "npm:0.34.0" monaco-editor: "npm:0.34.1"
prismjs: "npm:1.29.0" prismjs: "npm:1.29.0"
react: "npm:18.2.0" react: "npm:18.2.0"
react-select-event: "npm:5.5.1" react-select-event: "npm:5.5.1"
@ -3361,7 +3361,7 @@ __metadata:
fast-deep-equal: "npm:^3.1.3" fast-deep-equal: "npm:^3.1.3"
jest: "npm:29.7.0" jest: "npm:29.7.0"
lodash: "npm:4.17.21" lodash: "npm:4.17.21"
monaco-editor: "npm:0.34.0" monaco-editor: "npm:0.34.1"
prismjs: "npm:1.29.0" prismjs: "npm:1.29.0"
react: "npm:18.2.0" react: "npm:18.2.0"
react-dom: "npm:18.2.0" react-dom: "npm:18.2.0"
@ -3461,7 +3461,7 @@ __metadata:
"@types/lodash": "npm:4.17.0" "@types/lodash": "npm:4.17.0"
"@types/react": "npm:18.2.78" "@types/react": "npm:18.2.78"
lodash: "npm:4.17.21" lodash: "npm:4.17.21"
monaco-editor: "npm:0.34.0" monaco-editor: "npm:0.34.1"
react: "npm:18.2.0" react: "npm:18.2.0"
react-use: "npm:17.5.0" react-use: "npm:17.5.0"
rxjs: "npm:7.8.1" rxjs: "npm:7.8.1"
@ -3501,7 +3501,7 @@ __metadata:
i18next: "npm:^23.0.0" i18next: "npm:^23.0.0"
immer: "npm:10.0.4" immer: "npm:10.0.4"
lodash: "npm:4.17.21" lodash: "npm:4.17.21"
monaco-editor: "npm:0.34.0" monaco-editor: "npm:0.34.1"
prismjs: "npm:1.29.0" prismjs: "npm:1.29.0"
react: "npm:18.2.0" react: "npm:18.2.0"
react-select-event: "npm:5.5.1" react-select-event: "npm:5.5.1"
@ -3555,7 +3555,7 @@ __metadata:
i18next: "npm:^23.0.0" i18next: "npm:^23.0.0"
lodash: "npm:4.17.21" lodash: "npm:4.17.21"
lru-cache: "npm:10.2.0" lru-cache: "npm:10.2.0"
monaco-editor: "npm:0.34.0" monaco-editor: "npm:0.34.1"
prismjs: "npm:1.29.0" prismjs: "npm:1.29.0"
react: "npm:18.2.0" react: "npm:18.2.0"
react-dom: "npm:18.2.0" react-dom: "npm:18.2.0"
@ -4359,7 +4359,7 @@ __metadata:
micro-memoize: "npm:^4.1.2" micro-memoize: "npm:^4.1.2"
mock-raf: "npm:1.0.1" mock-raf: "npm:1.0.1"
moment: "npm:2.30.1" moment: "npm:2.30.1"
monaco-editor: "npm:0.34.0" monaco-editor: "npm:0.34.1"
ol: "npm:7.4.0" ol: "npm:7.4.0"
prismjs: "npm:1.29.0" prismjs: "npm:1.29.0"
process: "npm:^0.11.10" process: "npm:^0.11.10"
@ -18815,7 +18815,7 @@ __metadata:
ml-regression-simple-linear: "npm:^3.0.0" ml-regression-simple-linear: "npm:^3.0.0"
moment: "npm:2.30.1" moment: "npm:2.30.1"
moment-timezone: "npm:0.5.45" moment-timezone: "npm:0.5.45"
monaco-editor: "npm:0.34.0" monaco-editor: "npm:0.34.1"
monaco-promql: "npm:1.7.4" monaco-promql: "npm:1.7.4"
mousetrap: "npm:1.6.5" mousetrap: "npm:1.6.5"
mousetrap-global-bind: "npm:1.1.0" mousetrap-global-bind: "npm:1.1.0"
@ -23202,10 +23202,10 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"monaco-editor@npm:0.34.0": "monaco-editor@npm:0.34.1":
version: 0.34.0 version: 0.34.1
resolution: "monaco-editor@npm:0.34.0" resolution: "monaco-editor@npm:0.34.1"
checksum: 10/c7c2c88bc8f83817e67ab55d84a4469af7f5f566cc3df1c27bdd00ad2071b88688b23847608e8c948a445afa543929b7bcd9b5ff5b7b53da15f6f2b628eb76ac checksum: 10/50cde6f68f27cd66fbaadb7efe0e6ce46748e4bb552ddaa84451fbda18e5ff970a1fa79371c04618927c1f6348839747e3d4804fe383040bad2137527f8a38e4
languageName: node languageName: node
linkType: hard linkType: hard