Skip to content

Commit 478ea1a

Browse files
rsergeenkorsergeenko
committed
Merge branch 'main' into feature/RI-2640_profiler-logs
# Conflicts: # redisinsight/ui/src/components/monitor/Monitor/styles.module.scss # redisinsight/ui/src/components/monitor/MonitorOutputList/MonitorOutputList.tsx
2 parents 367b9e7 + 61902f5 commit 478ea1a

File tree

127 files changed

+4183
-4561
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

127 files changed

+4183
-4561
lines changed

‎package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@
142142
"@types/express": "^4.17.3",
143143
"@types/html-entities": "^1.3.4",
144144
"@types/ioredis": "^4.26.0",
145+
"@types/is-glob": "^4.0.2",
145146
"@types/jest": "^26.0.15",
146147
"@types/lodash": "^4.14.171",
147148
"@types/node": "14.14.10",
@@ -242,6 +243,7 @@
242243
"formik": "^2.2.9",
243244
"html-entities": "^2.3.2",
244245
"html-react-parser": "^1.2.4",
246+
"jsonpath": "^1.1.1",
245247
"lodash": "^4.17.21",
246248
"react": "^17.0.1",
247249
"react-contenteditable": "^3.3.5",

‎redisinsight/api/migration/1650278664000-sni.ts‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import {MigrationInterface, QueryRunner} from "typeorm";
2+
3+
export class sni1650278664000 implements MigrationInterface {
4+
name = 'sni1650278664000'
5+
6+
public async up(queryRunner: QueryRunner): Promise<void> {
7+
await queryRunner.query(`CREATE TABLE "temporary_database_instance" ("id" varchar PRIMARY KEY NOT NULL, "host" varchar NOT NULL, "port" integer NOT NULL, "name" varchar NOT NULL, "username" varchar, "password" varchar, "tls" boolean NOT NULL, "verifyServerCert" boolean NOT NULL, "lastConnection" datetime, "caCertId" varchar, "clientCertId" varchar, "connectionType" varchar NOT NULL DEFAULT ('STANDALONE'), "nodes" varchar, "nameFromProvider" varchar, "sentinelMasterName" varchar, "sentinelMasterUsername" varchar, "sentinelMasterPassword" varchar, "provider" varchar DEFAULT ('UNKNOWN'), "modules" varchar NOT NULL DEFAULT ('[]'), "db" integer, "encryption" varchar, "tlsServername" varchar, CONSTRAINT "FK_3b9b625266c00feb2d66a9f36e4" FOREIGN KEY ("clientCertId") REFERENCES "client_certificate" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_d1bc747b5938e22b4b708d8e9a5" FOREIGN KEY ("caCertId") REFERENCES "ca_certificate" ("id") ON DELETE SET NULL ON UPDATE NO ACTION)`);
8+
await queryRunner.query(`INSERT INTO "temporary_database_instance"("id", "host", "port", "name", "username", "password", "tls", "verifyServerCert", "lastConnection", "caCertId", "clientCertId", "connectionType", "nodes", "nameFromProvider", "sentinelMasterName", "sentinelMasterUsername", "sentinelMasterPassword", "provider", "modules", "db", "encryption") SELECT "id", "host", "port", "name", "username", "password", "tls", "verifyServerCert", "lastConnection", "caCertId", "clientCertId", "connectionType", "nodes", "nameFromProvider", "sentinelMasterName", "sentinelMasterUsername", "sentinelMasterPassword", "provider", "modules", "db", "encryption" FROM "database_instance"`);
9+
await queryRunner.query(`DROP TABLE "database_instance"`);
10+
await queryRunner.query(`ALTER TABLE "temporary_database_instance" RENAME TO "database_instance"`);
11+
}
12+
13+
public async down(queryRunner: QueryRunner): Promise<void> {
14+
await queryRunner.query(`ALTER TABLE "database_instance" RENAME TO "temporary_database_instance"`);
15+
await queryRunner.query(`CREATE TABLE "database_instance" ("id" varchar PRIMARY KEY NOT NULL, "host" varchar NOT NULL, "port" integer NOT NULL, "name" varchar NOT NULL, "username" varchar, "password" varchar, "tls" boolean NOT NULL, "verifyServerCert" boolean NOT NULL, "lastConnection" datetime, "caCertId" varchar, "clientCertId" varchar, "connectionType" varchar NOT NULL DEFAULT ('STANDALONE'), "nodes" varchar, "nameFromProvider" varchar, "sentinelMasterName" varchar, "sentinelMasterUsername" varchar, "sentinelMasterPassword" varchar, "provider" varchar DEFAULT ('UNKNOWN'), "modules" varchar NOT NULL DEFAULT ('[]'), "db" integer, "encryption" varchar, CONSTRAINT "FK_3b9b625266c00feb2d66a9f36e4" FOREIGN KEY ("clientCertId") REFERENCES "client_certificate" ("id") ON DELETE SET NULL ON UPDATE NO ACTION, CONSTRAINT "FK_d1bc747b5938e22b4b708d8e9a5" FOREIGN KEY ("caCertId") REFERENCES "ca_certificate" ("id") ON DELETE SET NULL ON UPDATE NO ACTION)`);
16+
await queryRunner.query(`INSERT INTO "database_instance"("id", "host", "port", "name", "username", "password", "tls", "verifyServerCert", "lastConnection", "caCertId", "clientCertId", "connectionType", "nodes", "nameFromProvider", "sentinelMasterName", "sentinelMasterUsername", "sentinelMasterPassword", "provider", "modules", "db", "encryption") SELECT "id", "host", "port", "name", "username", "password", "tls", "verifyServerCert", "lastConnection", "caCertId", "clientCertId", "connectionType", "nodes", "nameFromProvider", "sentinelMasterName", "sentinelMasterUsername", "sentinelMasterPassword", "provider", "modules", "db", "encryption" FROM "temporary_database_instance"`);
17+
await queryRunner.query(`DROP TABLE "temporary_database_instance"`);
18+
}
19+
20+
}

‎redisinsight/api/migration/index.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import { databaseDbIndex1634219846022 } from './1634219846022-database-db-index'
1212
import { encryption1634557312500 } from './1634557312500-encryption';
1313
import { commandExecution1641795882696 } from './1641795882696-command-execution';
1414
import { pluginState1641805606399 } from './1641805606399-plugin-state';
15+
import { sni1650278664000 } from "./1650278664000-sni";
1516

1617
export default [
1718
initialMigration1614164490968,
@@ -28,4 +29,5 @@ export default [
2829
encryption1634557312500,
2930
commandExecution1641795882696,
3031
pluginState1641805606399,
32+
sni1650278664000,
3133
];

‎redisinsight/api/package.json‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@
5858
"fs-extra": "^10.0.0",
5959
"ioredis": "^4.27.1",
6060
"is-glob": "^4.0.1",
61-
"jsonpath": "^1.1.1",
6261
"keytar": "^7.7.0",
6362
"lodash": "^4.17.20",
6463
"nest-router": "^1.0.9",

‎redisinsight/api/src/__mocks__/analytics.ts‎

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -7,22 +7,6 @@ export const mockInstancesAnalyticsService = () => ({
77
sendConnectionFailedEvent: jest.fn(),
88
});
99

10-
export const mockBrowserAnalyticsService = () => ({
11-
sendKeysScannedEvent: jest.fn(),
12-
sendKeyAddedEvent: jest.fn(),
13-
sendKeyTTLChangedEvent: jest.fn(),
14-
sendKeysDeletedEvent: jest.fn(),
15-
sendKeyValueAddedEvent: jest.fn(),
16-
sendKeyValueEditedEvent: jest.fn(),
17-
sendKeyValueRemovedEvent: jest.fn(),
18-
sendKeyScannedEvent: jest.fn(),
19-
sendGetListElementByIndexEvent: jest.fn(),
20-
sendJsonPropertyAddedEvent: jest.fn(),
21-
sendJsonPropertyEditedEvent: jest.fn(),
22-
sendJsonPropertyDeletedEvent: jest.fn(),
23-
sendJsonArrayPropertyAppendEvent: jest.fn(),
24-
});
25-
2610
export const mockCliAnalyticsService = () => ({
2711
sendClientCreatedEvent: jest.fn(),
2812
sendClientCreationFailedEvent: jest.fn(),

‎redisinsight/api/src/constants/telemetry-events.ts‎

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,6 @@ export enum TelemetryEvents {
2323
SentinelMasterGroupsDiscoverySucceed = 'CONFIG_DATABASES_REDIS_SENTINEL_AUTODISCOVERY_SUCCEEDED',
2424
SentinelMasterGroupsDiscoveryFailed = 'CONFIG_DATABASES_REDIS_SENTINEL_AUTODISCOVERY_FAILED',
2525

26-
// Events for browser tool
27-
BrowserKeysScanned = 'BROWSER_KEYS_SCANNED',
28-
BrowserKeysScannedWithFilters = 'BROWSER_KEYS_SCANNED_WITH_FILTER_ENABLED',
29-
BrowserKeyAdded = 'BROWSER_KEY_ADDED',
30-
BrowserKeyTTLChanged = 'BROWSER_KEY_TTL_CHANGED',
31-
BrowserKeysDeleted = 'BROWSER_KEYS_DELETED',
32-
BrowserKeyValueFiltered = 'BROWSER_KEY_VALUE_FILTERED',
33-
BrowserKeyValueAdded = 'BROWSER_KEY_VALUE_ADDED',
34-
BrowserKeyValueEdited = 'BROWSER_KEY_VALUE_EDITED',
35-
BrowserKeyValueRemoved = 'BROWSER_KEY_VALUE_REMOVED',
36-
BrowserKeyValueDeleted = 'BROWSER_KEY_VALUE_FILTERED',
37-
BrowserJSONPropertyEdited = 'BROWSER_JSON_PROPERTY_EDITED',
38-
BrowserJSONPropertyAdded = 'BROWSER_JSON_PROPERTY_ADDED',
39-
BrowserJSONPropertyDeleted = 'BROWSER_JSON_PROPERTY_DELETED',
40-
4126
// Events for cli tool
4227
ClientCreated = 'CLIENT_CREATED',
4328
ClientCreationFailed = 'CLIENT_CREATION_FAILED',

‎redisinsight/api/src/modules/browser/browser.module.ts‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@ import { ZSetBusinessService } from './services/z-set-business/z-set-business.se
1818
import { RejsonRlBusinessService } from './services/rejson-rl-business/rejson-rl-business.service';
1919
import { BrowserToolService } from './services/browser-tool/browser-tool.service';
2020
import { BrowserToolClusterService } from './services/browser-tool-cluster/browser-tool-cluster.service';
21-
import { BrowserAnalyticsService } from './services/browser-analytics/browser-analytics.service';
2221

2322
@Module({
2423
imports: [SharedModule],
@@ -41,7 +40,6 @@ import { BrowserAnalyticsService } from './services/browser-analytics/browser-an
4140
HashBusinessService,
4241
BrowserToolService,
4342
BrowserToolClusterService,
44-
BrowserAnalyticsService,
4543
],
4644
})
4745
export class BrowserModule implements NestModule {

0 commit comments

Comments
 (0)