Skip to content

Commit c7eb066

Browse files
committed
RI-6280 put telemetry in the right place
1 parent 65973cb commit c7eb066

File tree

3 files changed

+11
-59
lines changed

3 files changed

+11
-59
lines changed

redisinsight/ui/src/components/navigation-menu/NavigationMenu.spec.tsx

Lines changed: 0 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,11 @@ import { BuildType } from 'uiSrc/constants/env'
44
import { EXTERNAL_LINKS } from 'uiSrc/constants/links'
55
import { appInfoSelector } from 'uiSrc/slices/app/info'
66
import { cleanup, mockedStore, render, screen, fireEvent } from 'uiSrc/utils/test-utils'
7-
import { sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
87

98
import { connectedInstanceSelector } from 'uiSrc/slices/instances/instances'
109
import { appContextSelector } from 'uiSrc/slices/app/context'
1110
import NavigationMenu from './NavigationMenu'
1211

13-
jest.mock('uiSrc/telemetry', () => ({
14-
...jest.requireActual('uiSrc/telemetry'),
15-
sendEventTelemetry: jest.fn(),
16-
}))
17-
1812
let store: typeof mockedStore
1913
beforeEach(() => {
2014
cleanup()
@@ -190,35 +184,4 @@ describe('NavigationMenu', () => {
190184
expect(screen.getByTestId('pipeline-status-page-btn')).toBeTruthy()
191185
expect(screen.getByTestId('pipeline-management-page-btn')).toBeTruthy()
192186
})
193-
194-
it('should call proper telemetry event after click on rdi button', () => {
195-
(appContextSelector as jest.Mock).mockImplementation(() => ({
196-
...appContextSelector,
197-
workspace: 'redisDataIntegration'
198-
}))
199-
const sendEventTelemetryMock = jest.fn();
200-
(sendEventTelemetry as jest.Mock).mockImplementation(() => sendEventTelemetryMock)
201-
202-
render(<NavigationMenu />)
203-
204-
fireEvent.click(screen.getByTestId('pipeline-status-page-btn'))
205-
206-
expect(sendEventTelemetry).toBeCalledWith({
207-
event: TelemetryEvent.OPEN_RDI_CLICKED,
208-
eventData: {
209-
rdiId: 'mockRdiId',
210-
source: 'button',
211-
}
212-
})
213-
214-
fireEvent.click(screen.getByTestId('pipeline-management-page-btn'))
215-
216-
expect(sendEventTelemetry).toBeCalledWith({
217-
event: TelemetryEvent.OPEN_RDI_CLICKED,
218-
eventData: {
219-
rdiId: 'mockRdiId',
220-
source: 'button',
221-
}
222-
})
223-
})
224187
})

redisinsight/ui/src/components/navigation-menu/NavigationMenu.tsx

Lines changed: 2 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ import { FeatureFlagComponent } from 'uiSrc/components'
4343

4444
import { appContextSelector } from 'uiSrc/slices/app/context'
4545
import { AppWorkspace } from 'uiSrc/slices/interfaces'
46-
import { TelemetryEvent, sendEventTelemetry } from 'uiSrc/telemetry'
4746
import HelpMenu from './components/help-menu/HelpMenu'
4847
import NotificationMenu from './components/notifications-center'
4948

@@ -178,16 +177,7 @@ const NavigationMenu = () => {
178177
tooltipText: 'Pipeline Status',
179178
pageName: PageNames.rdiStatistics,
180179
ariaLabel: 'Pipeline Status page button',
181-
onClick: () => {
182-
sendEventTelemetry({
183-
event: TelemetryEvent.OPEN_RDI_CLICKED,
184-
eventData: {
185-
rdiId: connectedRdiInstanceId,
186-
source: 'button',
187-
}
188-
})
189-
handleGoPage(Pages.rdiStatistics(connectedRdiInstanceId))
190-
},
180+
onClick: () => handleGoPage(Pages.rdiStatistics(connectedRdiInstanceId)),
191181
dataTestId: 'pipeline-status-page-btn',
192182
isActivePage: activePage === `/${PageNames.rdiStatistics}`,
193183
getClassName() {
@@ -201,16 +191,7 @@ const NavigationMenu = () => {
201191
tooltipText: 'Pipeline Management',
202192
pageName: PageNames.rdiPipelineManagement,
203193
ariaLabel: 'Pipeline Management page button',
204-
onClick: () => {
205-
sendEventTelemetry({
206-
event: TelemetryEvent.OPEN_RDI_CLICKED,
207-
eventData: {
208-
rdiId: connectedRdiInstanceId,
209-
source: 'button',
210-
}
211-
})
212-
handleGoPage(Pages.rdiPipelineManagement(connectedRdiInstanceId))
213-
},
194+
onClick: () => handleGoPage(Pages.rdiPipelineManagement(connectedRdiInstanceId)),
214195
dataTestId: 'pipeline-management-page-btn',
215196
isActivePage: isPipelineManagementPath(),
216197
getClassName() {

redisinsight/ui/src/pages/rdi/home/instance-list/RdiInstancesListWrapper.tsx

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,15 @@ const RdiInstancesListWrapper = ({ width, onEditInstance, editedInstance, onDele
7171
const handleCheckConnectToInstance = (id: string) => {
7272
dispatch(checkConnectToRdiInstanceAction(
7373
id,
74-
(id: string) => history.push(Pages.rdiPipeline(id)),
74+
(id: string) => {
75+
sendEventTelemetry({
76+
event: TelemetryEvent.OPEN_RDI_CLICKED,
77+
eventData: {
78+
rdiId: id,
79+
}
80+
})
81+
history.push(Pages.rdiPipeline(id))
82+
},
7583
() => dispatch(setAppContextConnectedRdiInstanceId(''))
7684
))
7785
}

0 commit comments

Comments
 (0)