diff --git a/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/BarHitsOptions/BarHitsOptions.tsx b/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/BarHitsOptions/BarHitsOptions.tsx index 060caf608e..c195c33e88 100644 --- a/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/BarHitsOptions/BarHitsOptions.tsx +++ b/app/vmui/packages/vmui/src/components/Chart/BarHitsChart/BarHitsOptions/BarHitsOptions.tsx @@ -5,10 +5,11 @@ import "./style.scss"; import useStateSearchParams from "../../../../hooks/useStateSearchParams"; import { useSearchParams } from "react-router-dom"; import Button from "../../../Main/Button/Button"; -import { SettingsIcon, VisibilityIcon, VisibilityOffIcon } from "../../../Main/Icons"; +import { SettingsIcon, TipIcon, VisibilityIcon, VisibilityOffIcon } from "../../../Main/Icons"; import Tooltip from "../../../Main/Tooltip/Tooltip"; import Popper from "../../../Main/Popper/Popper"; import useBoolean from "../../../../hooks/useBoolean"; +import ShortcutKeys from "../../../Main/ShortcutKeys/ShortcutKeys"; interface Props { onChange: (options: GraphOptions) => void; @@ -61,6 +62,13 @@ const BarHitsOptions: FC = ({ onChange }) => { return (
+ + +
+ {children} +
{openList && ( @@ -62,9 +54,6 @@ const ShortcutKeys: FC<{ showTitle?: boolean }> = ({ showTitle }) => { className="vm-shortcuts-section" key={section.title} > - {section.readMore && ( -
{section.readMore}
- )}

{section.title}

diff --git a/app/vmui/packages/vmui/src/components/Main/ShortcutKeys/constants/keyList.tsx b/app/vmui/packages/vmui/src/components/Main/ShortcutKeys/constants/keyList.tsx index a448f12d4c..92895988c8 100644 --- a/app/vmui/packages/vmui/src/components/Main/ShortcutKeys/constants/keyList.tsx +++ b/app/vmui/packages/vmui/src/components/Main/ShortcutKeys/constants/keyList.tsx @@ -1,6 +1,4 @@ import { isMacOs } from "../../../../utils/detect-device"; -import { VisibilityIcon } from "../../Icons"; -import GraphTips from "../../../Chart/GraphTips/GraphTips"; const ctrlMeta = {isMacOs() ? "Cmd" : "Ctrl"}; @@ -26,10 +24,6 @@ const keyList = [ keys: <>{ctrlMeta} + Arrow Down, description: "Next command from the Query history" }, - { - keys: <>{ctrlMeta} + click by , - description: "Toggle multiple queries" - }, { keys: AUTOCOMPLETE_QUICK_KEY, description: "Show quick autocomplete tips" @@ -38,7 +32,6 @@ const keyList = [ }, { title: "Graph", - readMore: , list: [ { keys: <>{ctrlMeta} + scroll Up or +, @@ -53,12 +46,8 @@ const keyList = [ description: "Move the graph left/right" }, { - keys: <>click, - description: "Select the series in the legend" - }, - { - keys: <>{ctrlMeta} + click, - description: "Toggle multiple series in the legend" + keys: <>click on legend item, + description: "Open the legend item menu" } ] }, diff --git a/app/vmui/packages/vmui/src/components/Main/ShortcutKeys/style.scss b/app/vmui/packages/vmui/src/components/Main/ShortcutKeys/style.scss index b9da067f06..92d778619f 100644 --- a/app/vmui/packages/vmui/src/components/Main/ShortcutKeys/style.scss +++ b/app/vmui/packages/vmui/src/components/Main/ShortcutKeys/style.scss @@ -15,15 +15,10 @@ &__title { font-weight: bold; + line-height: 24px; margin-bottom: $padding-global; } - &__read-more { - position: absolute; - top: -8px; - right: 0; - } - &-list { display: grid; gap: $padding-global; diff --git a/app/vmui/packages/vmui/src/layouts/LogsLayout/ControlsLogsLayout.tsx b/app/vmui/packages/vmui/src/layouts/LogsLayout/ControlsLogsLayout.tsx index d7a4d490de..63f0f771b4 100644 --- a/app/vmui/packages/vmui/src/layouts/LogsLayout/ControlsLogsLayout.tsx +++ b/app/vmui/packages/vmui/src/layouts/LogsLayout/ControlsLogsLayout.tsx @@ -5,8 +5,13 @@ import { ControlsProps } from "../Header/HeaderControls/HeaderControls"; import { TimeSelector } from "../../components/Configurators/TimeRangeSettings/TimeSelector/TimeSelector"; import TenantsFields from "../../components/Configurators/GlobalSettings/TenantsConfiguration/TenantsFields"; import { ExecutionControls } from "../../components/Configurators/TimeRangeSettings/ExecutionControls/ExecutionControls"; +import ShortcutKeys from "../../components/Main/ShortcutKeys/ShortcutKeys"; +import { getAppModeEnable } from "../../utils/app-mode"; +import Button from "../../components/Main/Button/Button"; +import { KeyboardIcon } from "../../components/Main/Icons"; const ControlsLogsLayout: FC = ({ isMobile, headerSetup }) => { + const appModeEnable = getAppModeEnable(); const settingsRef = useRef(null); return ( @@ -21,6 +26,16 @@ const ControlsLogsLayout: FC = ({ isMobile, headerSetup }) => { {headerSetup?.timeSelector && } {headerSetup?.executionControls && } + {!isMobile && ( + +
); }; diff --git a/docs/victorialogs/CHANGELOG.md b/docs/victorialogs/CHANGELOG.md index 933939cc08..224ad79ca1 100644 --- a/docs/victorialogs/CHANGELOG.md +++ b/docs/victorialogs/CHANGELOG.md @@ -22,6 +22,7 @@ according to the follosing docs: ## tip * FEATURE: [syslog data ingestion](https://docs.victoriametrics.com/victorialogs/data-ingestion/syslog/): add support for automatic parsing of [`@cee` messages](http://cee.mitre.org/language/1.0-beta1/clt.html#syslog). Thanks to @exherb for the pull request [#842](https://github.com/VictoriaMetrics/VictoriaLogs/pull/842). +* FEATURE: [web UI](https://docs.victoriametrics.com/victorialogs/querying/#web-ui): add the help button with shortcuts reference and controls for charts and query input. See [#77](https://github.com/VictoriaMetrics/VictoriaLogs/issues/77). * BUGFIX: [delete API](https://docs.victoriametrics.com/victorialogs/#how-to-delete-logs): prevent from possible fatal error (panic) at `block_stream_merger.go:237` during the deletion of the logs. See [#825](https://github.com/VictoriaMetrics/VictoriaLogs/issues/825).