Skip to content

Commit b9f78c0

Browse files
#RI-4586 - resolve comments
1 parent 3a3f76f commit b9f78c0

File tree

2 files changed

+11
-16
lines changed

2 files changed

+11
-16
lines changed

redisinsight/ui/src/telemetry/interfaces.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ export enum RedisModules {
5555
'Triggers & Functions' = 'redisgears'
5656
}
5757

58-
interface IModuleSummary {
58+
export interface IModuleSummary {
5959
loaded: boolean
6060
version?: number
6161
semanticVersion?: string

redisinsight/ui/src/telemetry/telemetryUtils.ts

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { ApiEndpoints, BrowserStorageItem, KeyTypes, StreamViews } from 'uiSrc/c
1111
import { KeyViewType } from 'uiSrc/slices/interfaces/keys'
1212
import { StreamViewType } from 'uiSrc/slices/interfaces/stream'
1313
import { checkIsAnalyticsGranted, getInfoServer } from 'uiSrc/telemetry/checkAnalytics'
14+
import { IModuleSummary } from 'uiSrc/telemetry/interfaces'
1415
import { AdditionalRedisModule } from 'apiSrc/modules/database/models/additional.redis.module'
1516
import {
1617
ITelemetrySendEvent,
@@ -230,37 +231,31 @@ const getEnumKeyBValue = (myEnum: any, enumValue: number | string): string => {
230231
return index > -1 ? keys[index] : ''
231232
}
232233

234+
const getModuleSummaryToSent = (module: AdditionalRedisModule): IModuleSummary => ({
235+
loaded: true,
236+
version: module.version,
237+
semanticVersion: module.semanticVersion,
238+
})
239+
233240
const getRedisModulesSummary = (modules: AdditionalRedisModule[] = []): IRedisModulesSummary => {
234241
const summary = cloneDeep(DEFAULT_SUMMARY)
235242
try {
236243
modules.forEach(((module) => {
237244
if (SUPPORTED_REDIS_MODULES[module.name]) {
238245
const moduleName = getEnumKeyBValue(RedisModules, module.name)
239-
summary[moduleName] = {
240-
loaded: true,
241-
version: module.version,
242-
semanticVersion: module.semanticVersion,
243-
}
246+
summary[moduleName as keyof typeof RedisModules] = getModuleSummaryToSent(module)
244247
return
245248
}
246249

247250
if (isRedisearchAvailable([module])) {
248251
const redisearchName = getEnumKeyBValue(RedisModules, RedisModules.RediSearch)
249-
summary[redisearchName] = {
250-
loaded: true,
251-
version: module.version,
252-
semanticVersion: module.semanticVersion,
253-
}
252+
summary[redisearchName as keyof typeof RedisModules] = getModuleSummaryToSent(module)
254253
return
255254
}
256255

257256
if (isTriggeredAndFunctionsAvailable([module])) {
258257
const triggeredAndFunctionsName = getEnumKeyBValue(RedisModules, RedisModules['Triggers & Functions'])
259-
summary[triggeredAndFunctionsName] = {
260-
loaded: true,
261-
version: module.version,
262-
semanticVersion: module.semanticVersion,
263-
}
258+
summary[triggeredAndFunctionsName as keyof typeof RedisModules] = getModuleSummaryToSent(module)
264259
return
265260
}
266261

0 commit comments

Comments
 (0)