Merge pull request #811 from RedisInsight/main

new rc

Author: egor-zalenski

.circleci/config.yml

@@ -298,6 +298,7 @@ jobs:
       - checkout
       - attach_workspace:
           at: .
+      - run: sudo apt-get install net-tools
       - run:
           name: .AppImage tests
           command: |
@@ -710,7 +711,7 @@ jobs:
           command: |
             applicationVersion=$(jq -r '.version' electron/package.json)
             echo "APP VERSION $applicationVersion"
-            ghr -t ${GH_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -prerelease -delete ${applicationVersion}
+            ghr -n ${applicationVersion} -t ${GH_TOKEN} -u ${CIRCLE_PROJECT_USERNAME} -r ${CIRCLE_PROJECT_REPONAME} -c ${CIRCLE_SHA1} -prerelease -delete ${applicationVersion}
 
   release-aws-test:
     executor: linux-executor
@@ -755,11 +756,13 @@ jobs:
             latestYmlFileName="latest.yml"
             downloadLatestFolderPath="public/latest"
             upgradeLatestFolderPath="public/upgrades"
+            releasesFolderPath="public/releases"
             appName=$(jq -r '.productName' electron-builder.json)
             appVersion=$(jq -r '.version' redisinsight/package.json)
 
             echo "export downloadLatestFolderPath=${downloadLatestFolderPath}" >> $BASH_ENV
             echo "export upgradeLatestFolderPath=${upgradeLatestFolderPath}" >> $BASH_ENV
+            echo "export releasesFolderPath=${releasesFolderPath}" >> $BASH_ENV
             echo "export applicationName=${appName}" >> $BASH_ENV
             echo "export applicationVersion=${appVersion}" >> $BASH_ENV
             echo "export appFileName=RedisInsight" >> $BASH_ENV
@@ -776,22 +779,24 @@ jobs:
       - run:
           name: Publish AWS S3
           command: |
-            # move last public version apps for download to /private/{last public version}
-            aws s3 mv s3://${AWS_BUCKET_NAME}/${downloadLatestFolderPath} \
-              s3://${AWS_BUCKET_NAME}/private/${previousApplicationVersion}/ --recursive
+            # remove previous build from the latest directory /public/latest
+            aws s3 rm s3://${AWS_BUCKET_NAME}/${downloadLatestFolderPath} --recursive
 
-            # move last public version apps for upgrades to /private/{last public version}
-            aws s3 mv s3://${AWS_BUCKET_NAME}/${upgradeLatestFolderPath} \
-              s3://${AWS_BUCKET_NAME}/private/${previousApplicationVersion}/ --recursive
+            # remove previous build from the upgrade directory /public/upgrades
+            aws s3 rm s3://${AWS_BUCKET_NAME}/${upgradeLatestFolderPath} --recursive
 
-            # move current version apps for download to /public/latest
+            # copy current version apps for download to /public/latest
             aws s3 cp s3://${AWS_BUCKET_NAME}/private/${applicationVersion}/ \
               s3://${AWS_BUCKET_NAME}/${downloadLatestFolderPath} --recursive  --exclude "*.zip"
 
             # copy current version apps for upgrades to /public/upgrades
-            aws s3 mv s3://${AWS_BUCKET_NAME}/private/${applicationVersion}/ \
+            aws s3 cp s3://${AWS_BUCKET_NAME}/private/${applicationVersion}/ \
               s3://${AWS_BUCKET_NAME}/${upgradeLatestFolderPath} --recursive
 
+            # !MOVE current version apps to releases folder /public/releases
+            aws s3 mv s3://${AWS_BUCKET_NAME}/private/${applicationVersion}/ \
+              s3://${AWS_BUCKET_NAME}/${releasesFolderPath}/${applicationVersion} --recursive
+
             # invalidate cloudfront cash
             aws cloudfront create-invalidation --distribution-id ${AWS_DISTRIBUTION_ID} --paths "/*"
 

.github/redisinsight_browser.png

@@ -202,7 +202,6 @@
     "opencollective-postinstall": "^2.0.3",
     "react-hot-loader": "^4.13.0",
     "react-refresh": "^0.9.0",
-    "react-test-renderer": "^17.0.1",
     "redux-mock-store": "^1.5.4",
     "regenerator-runtime": "^0.13.5",
     "rimraf": "^3.0.2",

package.json

@@ -27,3 +27,9 @@ export const mockSettingsAnalyticsService = () => ({
   sendAnalyticsAgreementChange: jest.fn(),
   sendSettingsUpdatedEvent: jest.fn(),
 });
+
+export const mockPubSubAnalyticsService = () => ({
+  sendMessagePublishedEvent: jest.fn(),
+  sendChannelSubscribeEvent: jest.fn(),
+  sendChannelUnsubscribeEvent: jest.fn(),
+});

redisinsight/api/src/__mocks__/analytics.ts

@@ -27,6 +27,7 @@ export const mockStandaloneDatabaseEntity: DatabaseInstanceEntity = {
   provider: HostingProvider.LOCALHOST,
   modules: '[]',
   encryption: null,
+  tlsServername: 'server-name',
 };
 
 export const mockOSSClusterDatabaseEntity: DatabaseInstanceEntity = {

redisinsight/api/src/__mocks__/redis-databases.ts

@@ -12,6 +12,7 @@ import { PluginModule } from 'src/modules/plugin/plugin.module';
 import { CommandsModule } from 'src/modules/commands/commands.module';
 import { WorkbenchModule } from 'src/modules/workbench/workbench.module';
 import { SlowLogModule } from 'src/modules/slow-log/slow-log.module';
+import { PubSubModule } from 'src/modules/pub-sub/pub-sub.module';
 import { SharedModule } from './modules/shared/shared.module';
 import { InstancesModule } from './modules/instances/instances.module';
 import { BrowserModule } from './modules/browser/browser.module';
@@ -43,6 +44,7 @@ const PATH_CONFIG = config.get('dir_path');
     PluginModule,
     CommandsModule,
     ProfilerModule,
+    PubSubModule,
     SlowLogModule,
     EventEmitterModule.forRoot(),
     ...(SERVER_CONFIG.staticContent

redisinsight/api/src/app.module.ts

@@ -6,6 +6,7 @@ import { RedisSentinelModule } from 'src/modules/redis-sentinel/redis-sentinel.m
 import { CliModule } from 'src/modules/cli/cli.module';
 import { WorkbenchModule } from 'src/modules/workbench/workbench.module';
 import { SlowLogModule } from 'src/modules/slow-log/slow-log.module';
+import { PubSubModule } from 'src/modules/pub-sub/pub-sub.module';
 
 export const routes: Routes = [
   {
@@ -28,6 +29,10 @@ export const routes: Routes = [
         path: '/:dbInstance',
         module: SlowLogModule,
       },
+      {
+        path: '/:dbInstance',
+        module: PubSubModule,
+      },
     ],
   },
   {

redisinsight/api/src/app.routes.ts

@@ -3,6 +3,7 @@ export default {
   INVALID_DATABASE_INSTANCE_ID: 'Invalid database instance id.',
   COMMAND_EXECUTION_NOT_FOUND: 'Command execution was not found.',
   PROFILER_LOG_FILE_NOT_FOUND: 'Profiler log file was not found.',
+  CONSUMER_GROUP_NOT_FOUND: 'Consumer Group with such name was not found.',
   PLUGIN_STATE_NOT_FOUND: 'Plugin state was not found.',
   UNDEFINED_INSTANCE_ID: 'Undefined redis database instance id.',
   NO_CONNECTION_TO_REDIS_DB: 'No connection to the Redis Database.',

redisinsight/api/src/constants/error-messages.ts

@@ -10,6 +10,8 @@ export enum RedisErrorCodes {
   ConnectionReset = 'ECONNRESET',
   Timeout = 'ETIMEDOUT',
   CommandSyntaxError = 'syntax error',
+  BusyGroup = 'BUSYGROUP',
+  NoGroup = 'NOGROUP',
   UnknownCommand = 'unknown command',
 }
 

redisinsight/api/src/constants/redis-error-codes.ts

@@ -45,4 +45,9 @@ export enum TelemetryEvents {
   // Slowlog
   SlowlogSetLogSlowerThan = 'SLOWLOG_SET_LOG_SLOWER_THAN',
   SlowlogSetMaxLen = 'SLOWLOG_SET_MAX_LEN',
+
+  // Pub/Sub
+  PubSubMessagePublished = 'PUBSUB_MESSAGE_PUBLISHED',
+  PubSubChannelSubscribed = 'PUBSUB_CHANNEL_SUBSCRIBED',
+  PubSubChannelUnsubscribed = 'PUBSUB_CHANNEL_UNSUBSCRIBED',
 }