Skip to content

#RI-2733-update filtered event #556

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 2 commits into from
Apr 22, 2022
Merged

#RI-2733-update filtered event #556

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5d8e5ca
#RI-2733-update filtered event
AmirAllayarovSofteq Apr 20, 2022
6c5d2a3
#RI-2733-resolve comments
AmirAllayarovSofteq Apr 22, 2022
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
21 changes: 19 additions & 2 deletions redisinsight/ui/src/pages/browser/components/hash-details/HashDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import {
updateHashFieldsAction,
} from 'uiSrc/slices/hash'
import { formatLongName, Nullable } from 'uiSrc/utils'
import { sendEventTelemetry, TelemetryEvent, getBasedOnViewTypeEvent } from 'uiSrc/telemetry'
import { sendEventTelemetry, TelemetryEvent, getBasedOnViewTypeEvent, getMatchType } from 'uiSrc/telemetry'
import VirtualTable from 'uiSrc/components/virtual-table/VirtualTable'
import InlineItemEditor from 'uiSrc/components/inline-item-editor/InlineItemEditor'
import {
Expand All @@ -25,6 +25,7 @@ import { connectedInstanceSelector } from 'uiSrc/slices/instances'
import { SCAN_COUNT_DEFAULT } from 'uiSrc/constants/api'
import HelpTexts from 'uiSrc/constants/help-texts'
import {
GetHashFieldsResponse,
AddFieldsToHashDto,
HashFieldDto,
} from 'apiSrc/modules/browser/dto/hash.dto'
Expand Down Expand Up @@ -126,8 +127,24 @@ const HashDetails = (props: Props) => {
const fieldColumn = search.find((column) => column.id === 'field')
if (fieldColumn) {
const { value: match } = fieldColumn
const onSuccess = (data: GetHashFieldsResponse) => {
const matchValue = getMatchType(match)
sendEventTelemetry({
event: getBasedOnViewTypeEvent(
viewType,
TelemetryEvent.BROWSER_KEY_VALUE_FILTERED,
TelemetryEvent.TREE_VIEW_KEY_VALUE_FILTERED
),
eventData: {
databaseId: instanceId,
keyType: KeyTypes.Hash,
match: matchValue,
length: data.total,
}
})
}
setMatch(match)
dispatch(fetchHashFields(key, 0, SCAN_COUNT_DEFAULT, match || matchAllValue))
dispatch(fetchHashFields(key, 0, SCAN_COUNT_DEFAULT, match || matchAllValue, onSuccess))
}
}

Expand Down
24 changes: 22 additions & 2 deletions redisinsight/ui/src/pages/browser/components/list-details/ListDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,15 @@ import {
updateListValueStateSelector,
fetchSearchingListElementAction,
} from 'uiSrc/slices/list'
import { connectedInstanceSelector } from 'uiSrc/slices/instances'
import { sendEventTelemetry, TelemetryEvent, getBasedOnViewTypeEvent } from 'uiSrc/telemetry'
import { KeyTypes } from 'uiSrc/constants'
import {
ITableColumn,
IColumnSearchState,
} from 'uiSrc/components/virtual-table/interfaces'
import { formatLongName, validateListIndex } from 'uiSrc/utils'
import { selectedKeyDataSelector } from 'uiSrc/slices/keys'
import { selectedKeyDataSelector, keysSelector } from 'uiSrc/slices/keys'
import { NoResultsFoundText } from 'uiSrc/constants/texts'
import VirtualTable from 'uiSrc/components/virtual-table/VirtualTable'
import InlineItemEditor from 'uiSrc/components/inline-item-editor/InlineItemEditor'
Expand Down Expand Up @@ -53,6 +56,8 @@ const ListDetails = (props: Props) => {
)

const { name: key } = useSelector(selectedKeyDataSelector) ?? { name: '' }
const { id: instanceId } = useSelector(connectedInstanceSelector)
const { viewType } = useSelector(keysSelector)

const dispatch = useDispatch()

Expand Down Expand Up @@ -91,6 +96,20 @@ const ListDetails = (props: Props) => {

const handleSearch = (search: IColumnSearchState[]) => {
const indexColumn = search.find((column) => column.id === 'index')
const onSuccess = () => {
sendEventTelemetry({
event: getBasedOnViewTypeEvent(
viewType,
TelemetryEvent.BROWSER_KEY_VALUE_FILTERED,
TelemetryEvent.TREE_VIEW_KEY_VALUE_FILTERED
),
eventData: {
databaseId: instanceId,
keyType: KeyTypes.List,
match: 'EXACT_VALUE_NAME',
}
})
}

if (!indexColumn?.value) {
dispatch(fetchListElements(key, 0, SCAN_COUNT_DEFAULT))
Expand All @@ -102,7 +121,8 @@ const ListDetails = (props: Props) => {
dispatch(
fetchSearchingListElementAction(
key,
value ? +value : initSearchingIndex
value ? +value : initSearchingIndex,
onSuccess
)
)
}
Expand Down
21 changes: 19 additions & 2 deletions redisinsight/ui/src/pages/browser/components/set-details/SetDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {

import { formatLongName } from 'uiSrc/utils'
import { KeyTypes } from 'uiSrc/constants'
import { sendEventTelemetry, TelemetryEvent, getBasedOnViewTypeEvent } from 'uiSrc/telemetry'
import { sendEventTelemetry, TelemetryEvent, getBasedOnViewTypeEvent, getMatchType } from 'uiSrc/telemetry'
import { connectedInstanceSelector } from 'uiSrc/slices/instances'
import { selectedKeyDataSelector, keysSelector } from 'uiSrc/slices/keys'
import {
Expand All @@ -24,6 +24,7 @@ import { NoResultsFoundText } from 'uiSrc/constants/texts'
import { IColumnSearchState, ITableColumn } from 'uiSrc/components/virtual-table/interfaces'
import VirtualTable from 'uiSrc/components/virtual-table/VirtualTable'
import PopoverDelete from 'uiSrc/pages/browser/components/popover-delete/PopoverDelete'
import { GetSetMembersResponse } from 'apiSrc/modules/browser/dto/set.dto'

import styles from './styles.module.scss'

Expand Down Expand Up @@ -82,8 +83,24 @@ const SetDetails = (props: Props) => {
if (!fieldColumn) { return }

const { value: match } = fieldColumn
const onSuccess = (data: GetSetMembersResponse) => {
const matchValue = getMatchType(match)
sendEventTelemetry({
event: getBasedOnViewTypeEvent(
viewType,
TelemetryEvent.BROWSER_KEY_VALUE_FILTERED,
TelemetryEvent.TREE_VIEW_KEY_VALUE_FILTERED
),
eventData: {
databaseId: instanceId,
keyType: KeyTypes.Set,
match: matchValue,
length: data.total,
}
})
}
setMatch(match)
dispatch(fetchSetMembers(key, 0, SCAN_COUNT_DEFAULT, match || matchAllValue))
dispatch(fetchSetMembers(key, 0, SCAN_COUNT_DEFAULT, match || matchAllValue, onSuccess))
}

const columns:ITableColumn[] = [
Expand Down
22 changes: 19 additions & 3 deletions redisinsight/ui/src/pages/browser/components/zset-details/ZSetDetails.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ import HelpTexts from 'uiSrc/constants/help-texts'
import { NoResultsFoundText } from 'uiSrc/constants/texts'
import { selectedKeyDataSelector, keysSelector } from 'uiSrc/slices/keys'
import { formatLongName, validateScoreNumber } from 'uiSrc/utils'
import { sendEventTelemetry, TelemetryEvent, getBasedOnViewTypeEvent } from 'uiSrc/telemetry'
import { sendEventTelemetry, TelemetryEvent, getBasedOnViewTypeEvent, getMatchType } from 'uiSrc/telemetry'
import { connectedInstanceSelector } from 'uiSrc/slices/instances'
import VirtualTable from 'uiSrc/components/virtual-table/VirtualTable'
import InlineItemEditor from 'uiSrc/components/inline-item-editor/InlineItemEditor'
import { IColumnSearchState, ITableColumn } from 'uiSrc/components/virtual-table/interfaces'
import { AddMembersToZSetDto, ZSetMemberDto } from 'apiSrc/modules/browser/dto'
import { AddMembersToZSetDto, SearchZSetMembersResponse, ZSetMemberDto } from 'apiSrc/modules/browser/dto'
import PopoverDelete from '../popover-delete/PopoverDelete'

import styles from './styles.module.scss'
Expand Down Expand Up @@ -124,6 +124,22 @@ const ZSetDetails = (props: Props) => {
if (!fieldColumn) { return }

const { value: match } = fieldColumn
const onSuccess = (data: SearchZSetMembersResponse) => {
const matchValue = getMatchType(match)
sendEventTelemetry({
event: getBasedOnViewTypeEvent(
viewType,
TelemetryEvent.BROWSER_KEY_VALUE_FILTERED,
TelemetryEvent.TREE_VIEW_KEY_VALUE_FILTERED
),
eventData: {
databaseId: instanceId,
keyType: KeyTypes.ZSet,
match: matchValue,
length: data.total,
}
})
}
setMatch(match)
if (match === '') {
dispatch(
Expand All @@ -132,7 +148,7 @@ const ZSetDetails = (props: Props) => {
return
}
dispatch(
fetchSearchZSetMembers(key, 0, SCAN_COUNT_DEFAULT, match)
fetchSearchZSetMembers(key, 0, SCAN_COUNT_DEFAULT, match, onSuccess)
)
}

Expand Down
21 changes: 4 additions & 17 deletions redisinsight/ui/src/slices/hash.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { cloneDeep, remove, isNull } from 'lodash'
import { apiService } from 'uiSrc/services'
import { ApiEndpoints, KeyTypes } from 'uiSrc/constants'
import { getApiErrorMessage, getUrl, isStatusSuccessful } from 'uiSrc/utils'
import { getBasedOnViewTypeEvent, getMatchType, sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
import { getBasedOnViewTypeEvent, sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
import { SCAN_COUNT_DEFAULT } from 'uiSrc/constants/api'
import successMessages from 'uiSrc/components/notifications/success-messages'
import {
Expand Down Expand Up @@ -188,7 +188,8 @@ export function fetchHashFields(
key: string,
cursor: number,
count: number,
match: string
match: string,
onSuccess?: (data: GetHashFieldsResponse) => void,
) {
return async (dispatch: AppDispatch, stateInit: () => RootState) => {
dispatch(loadHashFields(isNull(match) ? '*' : match))
Expand All @@ -209,23 +210,9 @@ export function fetchHashFields(
)

if (isStatusSuccessful(status)) {
const matchValue = getMatchType(match)
sendEventTelemetry({
event: getBasedOnViewTypeEvent(
state.browser.keys?.viewType,
TelemetryEvent.BROWSER_KEY_VALUE_FILTERED,
TelemetryEvent.TREE_VIEW_KEY_VALUE_FILTERED
),
eventData: {
databaseId: state.connections.instances?.connectedInstance?.id,
keyType: KeyTypes.Hash,
match: matchValue,
length: data.total,
}
})

dispatch(loadHashFieldsSuccess(data))
dispatch(updateSelectedKeyRefreshTime(Date.now()))
onSuccess?.(data)
}
} catch (error) {
const errorMessage = getApiErrorMessage(error)
Expand Down
16 changes: 3 additions & 13 deletions redisinsight/ui/src/slices/list.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -282,7 +282,8 @@ export function fetchMoreListElements(
// Asynchronous thunk actions
export function fetchSearchingListElementAction(
key: string,
index: Nullable<number>
index: Nullable<number>,
onSuccess?: () => void,
) {
return async (dispatch: AppDispatch, stateInit: () => RootState) => {
dispatch(loadSearchingListElement(index))
Expand All @@ -302,18 +303,7 @@ export function fetchSearchingListElementAction(
if (isStatusSuccessful(status)) {
dispatch(loadSearchingListElementSuccess(data))
dispatch(updateSelectedKeyRefreshTime(Date.now()))
sendEventTelemetry({
event: getBasedOnViewTypeEvent(
state.browser.keys?.viewType,
TelemetryEvent.BROWSER_KEY_VALUE_FILTERED,
TelemetryEvent.TREE_VIEW_KEY_VALUE_FILTERED
),
eventData: {
databaseId: state.connections.instances?.connectedInstance?.id,
keyType: KeyTypes.List,
match: 'EXACT_VALUE_NAME',
}
})
onSuccess?.()
}
} catch (error) {
const errorMessage = getApiErrorMessage(error)
Expand Down
20 changes: 4 additions & 16 deletions redisinsight/ui/src/slices/set.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { remove } from 'lodash'
import { apiService } from 'uiSrc/services'
import { ApiEndpoints, KeyTypes } from 'uiSrc/constants'
import { getApiErrorMessage, getUrl, isStatusSuccessful } from 'uiSrc/utils'
import { getBasedOnViewTypeEvent, sendEventTelemetry, TelemetryEvent, getMatchType } from 'uiSrc/telemetry'
import { getBasedOnViewTypeEvent, sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
import {
AddMembersToSetDto,
GetSetMembersResponse,
Expand Down Expand Up @@ -149,7 +149,8 @@ export function fetchSetMembers(
key: string,
cursor: number,
count: number,
match: string
match: string,
onSuccess?: (data: GetSetMembersResponse) => void,
) {
return async (dispatch: AppDispatch, stateInit: () => RootState) => {
dispatch(loadSetMembers(match))
Expand All @@ -170,22 +171,9 @@ export function fetchSetMembers(
)

if (isStatusSuccessful(status)) {
const matchValue = getMatchType(match)
sendEventTelemetry({
event: getBasedOnViewTypeEvent(
state.browser.keys?.viewType,
TelemetryEvent.BROWSER_KEY_VALUE_FILTERED,
TelemetryEvent.TREE_VIEW_KEY_VALUE_FILTERED
),
eventData: {
databaseId: state.connections.instances?.connectedInstance?.id,
keyType: KeyTypes.Set,
match: matchValue,
length: data.total,
}
})
dispatch(loadSetMembersSuccess(data))
dispatch(updateSelectedKeyRefreshTime(Date.now()))
onSuccess?.(data)
}
} catch (error) {
const errorMessage = getApiErrorMessage(error)
Expand Down
20 changes: 4 additions & 16 deletions redisinsight/ui/src/slices/zset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { createSlice } from '@reduxjs/toolkit'
import { apiService } from 'uiSrc/services'
import { ApiEndpoints, SortOrder, KeyTypes } from 'uiSrc/constants'
import { getApiErrorMessage, getUrl, isStatusSuccessful } from 'uiSrc/utils'
import { getBasedOnViewTypeEvent, sendEventTelemetry, TelemetryEvent, getMatchType } from 'uiSrc/telemetry'
import { getBasedOnViewTypeEvent, sendEventTelemetry, TelemetryEvent } from 'uiSrc/telemetry'
import { StateZset } from 'uiSrc/slices/interfaces/zset'
import successMessages from 'uiSrc/components/notifications/success-messages'
import {
Expand Down Expand Up @@ -427,7 +427,8 @@ export function fetchSearchZSetMembers(
key: string,
cursor: number,
count: number,
match: string
match: string,
onSuccess?: (data: SearchZSetMembersResponse) => void,
) {
return async (dispatch: AppDispatch, stateInit: () => RootState) => {
dispatch(searchZSetMembers(isNull(match) ? '*' : match))
Expand All @@ -447,22 +448,9 @@ export function fetchSearchZSetMembers(
)

if (isStatusSuccessful(status)) {
const matchValue = getMatchType(match)
sendEventTelemetry({
event: getBasedOnViewTypeEvent(
state.browser.keys?.viewType,
TelemetryEvent.BROWSER_KEY_VALUE_FILTERED,
TelemetryEvent.TREE_VIEW_KEY_VALUE_FILTERED
),
eventData: {
databaseId: state.connections.instances?.connectedInstance?.id,
keyType: KeyTypes.ZSet,
match: matchValue,
length: data.total,
}
})
dispatch(searchZSetMembersSuccess(data))
dispatch(updateSelectedKeyRefreshTime(Date.now()))
onSuccess?.(data)
}
} catch (error) {
const errorMessage = getApiErrorMessage(error)
Expand Down