Skip to content

#RI-2462-add non editor telemetry events #759

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 10, 2022
Merged

#RI-2462-add non editor telemetry events #759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion redisinsight/ui/src/components/query/Query/Query.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ import cx from 'classnames'
import { EuiButtonIcon, EuiText, EuiToolTip } from '@elastic/eui'
import * as monacoEditor from 'monaco-editor/esm/vs/editor/editor.api'
import MonacoEditor, { monaco } from 'react-monaco-editor'
import { useParams } from 'react-router-dom'

import {
Theme,
Expand Down Expand Up @@ -34,6 +35,7 @@ import { appRedisCommandsSelector } from 'uiSrc/slices/app/redis-commands'
import { IEditorMount, ISnippetController } from 'uiSrc/pages/workbench/interfaces'
import { CommandExecutionUI } from 'uiSrc/slices/interfaces'
import { darkTheme, lightTheme } from 'uiSrc/constants/monaco/cypher'
import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'

import { workbenchResultsSelector } from 'uiSrc/slices/workbench/wb-results'
import DedicatedEditor from 'uiSrc/components/query/DedicatedEditor/DedicatedEditor'
Expand Down Expand Up @@ -77,6 +79,8 @@ const Query = (props: Props) => {
const { theme } = useContext(ThemeContext)
const monacoObjects = useRef<Nullable<IEditorMount>>(null)

const { instanceId = '' } = useParams<{ instanceId: string }>()

let disposeCompletionItemProvider = () => {}
let disposeSignatureHelpProvider = () => {}

Expand Down Expand Up @@ -125,7 +129,7 @@ const Query = (props: Props) => {
const triggerUpdateCursorPosition = (editor: monacoEditor.editor.IStandaloneCodeEditor) => {
const position = editor.getPosition()
isDedicatedEditorOpenRef.current = false
editor.trigger('mouse', '_moveTo', { position: { lineNumber: 1, column: 1 }})
editor.trigger('mouse', '_moveTo', { position: { lineNumber: 1, column: 1 } })
editor.trigger('mouse', '_moveTo', { position })
editor.focus()
}
Expand All @@ -137,6 +141,13 @@ const Query = (props: Props) => {
setIsDedicatedEditorOpen(true)
editor.updateOptions({ readOnly: true })
hideSyntaxWidget(editor)
sendEventTelemetry({
event: TelemetryEvent.WORKBENCH_NON_REDIS_EDITOR_OPENED,
eventData: {
databaseId: instanceId,
lang: syntaxCommand.current.lang,
}
})
}

const onChange = (value: string = '') => {
Expand Down Expand Up @@ -305,6 +316,14 @@ const Query = (props: Props) => {

editor.updateOptions({ readOnly: false })
triggerUpdateCursorPosition(editor)

sendEventTelemetry({
event: TelemetryEvent.WORKBENCH_NON_REDIS_EDITOR_CANCELLED,
eventData: {
databaseId: instanceId,
lang: syntaxCommand.current.lang,
}
})
}

const updateArgFromDedicatedEditor = (value: string = '') => {
Expand Down Expand Up @@ -333,6 +352,13 @@ const Query = (props: Props) => {
])
setIsDedicatedEditorOpen(false)
triggerUpdateCursorPosition(editor)
sendEventTelemetry({
event: TelemetryEvent.WORKBENCH_NON_REDIS_EDITOR_SAVED,
eventData: {
databaseId: instanceId,
lang: syntaxCommand.current.lang,
}
})
}

const editorDidMount = (
Expand Down
3 changes: 3 additions & 0 deletions redisinsight/ui/src/telemetry/events.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,9 @@ export enum TelemetryEvent {
WORKBENCH_RESULTS_COLLAPSED = 'WORKBENCH_RESULTS_COLLAPSED',
WORKBENCH_RESULTS_EXPANDED = 'WORKBENCH_RESULTS_EXPANDED',
WORKBENCH_RESULT_VIEW_CHANGED = 'WORKBENCH_RESULT_VIEW_CHANGED',
WORKBENCH_NON_REDIS_EDITOR_OPENED = 'WORKBENCH_NON_REDIS_EDITOR_OPENED',
WORKBENCH_NON_REDIS_EDITOR_CANCELLED = 'WORKBENCH_NON_REDIS_EDITOR_CANCELLED',
WORKBENCH_NON_REDIS_EDITOR_SAVED = 'WORKBENCH_NON_REDIS_EDITOR_SAVED',

PROFILER_OPENED = 'PROFILER_OPENED',
PROFILER_STARTED = 'PROFILER_STARTED',
Expand Down