github-mirrors/VictoriaMetrics
1
0
Fork 0
mirror of https://github.com/VictoriaMetrics/VictoriaMetrics.git synced 2024-11-21 14:44:00 +00:00
Code Issues Projects Releases Packages Wiki Activity

vmui: fix multi-line query (#3448)

Browse source 
* fix: remove prevent nav by up/down keys for multi-line query

* fix: add query params encode in URL
This commit is contained in:
Yury Molodov 2022-12-06 06:56:54 +01:00 committed by Aliaksandr Valialkin
parent ff1c654006
commit 8f501ca220
No known key found for this signature in database
GPG key ID: A72BEC6CD3D0DED1
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/vmui/packages/vmui/src/components/Main/Autocomplete/Autocomplete.tsx
View file

@ -56,13 +56,14 @@ const Autocomplete: FC<AutocompleteProps> = ({
const handleKeyDown = (e: KeyboardEvent) => { const handleKeyDown = (e: KeyboardEvent) => {
const { key, ctrlKey, metaKey, shiftKey } = e; const { key, ctrlKey, metaKey, shiftKey } = e;
const modifiers = ctrlKey || metaKey || shiftKey; const modifiers = ctrlKey || metaKey || shiftKey;
const hasOptions = foundOptions.length;
if (key === "ArrowUp" && !modifiers) { if (key === "ArrowUp" && !modifiers && hasOptions) {
e.preventDefault(); e.preventDefault();
setFocusOption((prev) => prev <= 0 ? 0 : prev - 1); setFocusOption((prev) => prev <= 0 ? 0 : prev - 1);
} }
if (key === "ArrowDown" && !modifiers) { if (key === "ArrowDown" && !modifiers && hasOptions) {
e.preventDefault(); e.preventDefault();
const lastIndex = foundOptions.length - 1; const lastIndex = foundOptions.length - 1;
setFocusOption((prev) => prev >= lastIndex ? lastIndex : prev + 1); setFocusOption((prev) => prev >= lastIndex ? lastIndex : prev + 1);

2
app/vmui/packages/vmui/src/utils/query-string.ts
View file

@ -5,7 +5,7 @@ import { MAX_QUERY_FIELDS } from "../constants/graph";
export const setQueryStringWithoutPageReload = (params: Record<string, unknown>): void => { export const setQueryStringWithoutPageReload = (params: Record<string, unknown>): void => {
const w = window; const w = window;
if (w) { if (w) {
const qsValue = Object.entries(params).map(([k, v]) => `${k}=${v}`).join("&"); const qsValue = Object.entries(params).map(([k, v]) => `${k}=${encodeURIComponent(String(v))}`).join("&");
const qs = qsValue ? `?${qsValue}` : ""; const qs = qsValue ? `?${qsValue}` : "";
const newurl = `${w.location.protocol}//${w.location.host}${w.location.pathname}${qs}${w.location.hash}`; const newurl = `${w.location.protocol}//${w.location.host}${w.location.pathname}${qs}${w.location.hash}`;
w.history.pushState({ path: newurl }, "", newurl); w.history.pushState({ path: newurl }, "", newurl);