Skip to content

Commit e25d3f3

Browse files
author
Artem
committed
*RI-3809 - BE bugfix. Command executionTime was not shown in the workbench history
*RI-3811 - BE bugfix. Telemetry events were not sent
1 parent 7f1eb62 commit e25d3f3

File tree

7 files changed

+16
-3
lines changed

7 files changed

+16
-3
lines changed

redisinsight/api/src/core.module.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,13 @@ import { DatabaseModule } from 'src/modules/database/database.module';
55
import { CertificateModule } from 'src/modules/certificate/certificate.module';
66
import { EventEmitterModule } from '@nestjs/event-emitter';
77
import { RedisModule } from 'src/modules/redis/redis.module';
8+
import { AnalyticsModule } from 'src/modules/analytics/analytics.module';
89

910
@Global()
1011
@Module({
1112
imports: [
1213
EventEmitterModule.forRoot(),
14+
AnalyticsModule,
1315
EncryptionModule.register(),
1416
SettingsModule.register(),
1517
CertificateModule.register(),
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import { Module } from '@nestjs/common';
2+
import { AnalyticsService } from 'src/modules/analytics/analytics.service';
3+
4+
@Module({
5+
providers: [
6+
AnalyticsService,
7+
],
8+
})
9+
export class AnalyticsModule {}

redisinsight/api/src/modules/workbench/entities/command-execution.entity.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ export class CommandExecutionEntity {
8181
encryption: string;
8282

8383
@Column({ nullable: true })
84+
@Expose()
8485
executionTime?: number;
8586

8687
@CreateDateColumn()

redisinsight/api/test/api/workbench/GET-databases-id-workbench-command_executions-id.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ const responseSchema = Joi.object().keys({
3232
mode: Joi.string().required(),
3333
summary: Joi.string().allow(null),
3434
resultsMode: Joi.string().allow(null),
35-
executionTime: Joi.number().allow(null),
35+
executionTime: Joi.number().required(),
3636
nodeOptions: Joi.object().keys({
3737
host: Joi.string().required(),
3838
port: Joi.number().required(),

redisinsight/api/test/api/workbench/GET-databases-id-workbench-command_executions.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ const responseSchema = Joi.array().items(Joi.object().keys({
2020
mode: Joi.string().required(),
2121
summary: Joi.string().allow(null),
2222
resultsMode: Joi.string().allow(null),
23-
executionTime: Joi.number().allow(null),
23+
executionTime: Joi.number().required(),
2424
nodeOptions: Joi.object().keys({
2525
host: Joi.string().required(),
2626
port: Joi.number().required(),

redisinsight/api/test/api/workbench/POST-databases-id-workbench-command_executions.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ const responseSchema = Joi.array().items(Joi.object().keys({
7171
enableRedirection: Joi.boolean().required(),
7272
}).allow(null),
7373
createdAt: Joi.date().required(),
74-
executionTime: Joi.number().integer().allow(null),
74+
executionTime: Joi.number().integer(),
7575
isNotStored: Joi.boolean(),
7676
summary: Joi.object({
7777
total: Joi.number(),

redisinsight/api/test/helpers/local-db.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@ export const generateNCommandExecutions = async (
119119
role: 'ALL',
120120
mode: 'ASCII',
121121
encryption: constants.TEST_ENCRYPTION_STRATEGY,
122+
executionTime: Math.round(Math.random() * 10000),
122123
createdAt: new Date(),
123124
...partial,
124125
}));

0 commit comments

Comments
 (0)