merge 2.48.0 into 5041

Author: vlad-dargel

.circleci/build/release-docker.sh

@@ -2,7 +2,7 @@
 set -e
 
 HELP="Args:
--v - Semver (2.46.0)
+-v - Semver (2.48.0)
 -d - Build image repository (Ex: -d redisinsight)
 -r - Target repository (Ex: -r redis/redisinsight)
 "

electron-builder.json

@@ -198,6 +198,11 @@
       "to": "defaults",
       "filter": ["**/*"]
     },
+    {
+      "from": "./redisinsight/api/data",
+      "to": "data",
+      "filter": ["**/*"]
+    },
     {
       "from": "LICENSE",
       "to": "LICENSE.redisinsight.txt"

redisinsight/api/config/default.ts

@@ -27,12 +27,16 @@ const defaultPluginsUri = join('/', proxyPath, 'static', 'plugins');
 const pluginsAssetsUri = join('/', proxyPath, 'static', 'resources', 'plugins');
 
 const socketPath = join('/', proxyPath, 'socket.io');
+const dataDir = process.env.RI_BUILD_TYPE === 'ELECTRON' && process['resourcesPath']
+  ? join(process['resourcesPath'], 'data')
+  : join(__dirname, '..', 'data');
 
 export default {
   dir_path: {
     tmpDir: os.tmpdir(),
     homedir,
     prevHomedir: homedir,
+    dataDir: process.env.RI_DATA_DIR || dataDir,
     staticDir,
     defaultsDir,
     logs: join(homedir, 'logs'),
@@ -71,7 +75,7 @@ export default {
     tlsKey: process.env.RI_SERVER_TLS_KEY,
     staticContent: !!process.env.RI_SERVE_STATICS || true,
     buildType: process.env.RI_BUILD_TYPE || 'DOCKER_ON_PREMISE',
-    appVersion: process.env.RI_APP_VERSION || '2.46.0',
+    appVersion: process.env.RI_APP_VERSION || '2.48.0',
     requestTimeout: parseInt(process.env.RI_REQUEST_TIMEOUT, 10) || 25000,
     excludeRoutes: [],
     excludeAuthRoutes: [],

redisinsight/api/config/swagger.ts

@@ -5,7 +5,7 @@ const SWAGGER_CONFIG: Omit<OpenAPIObject, 'paths'> = {
   info: {
     title: 'RedisInsight Backend API',
     description: 'RedisInsight Backend API',
-    version: '2.46.0',
+    version: '2.48.0',
   },
   tags: [],
 };

redisinsight/api/config/test.ts

@@ -1,4 +1,7 @@
 export default {
+  dir_path: {
+    dataDir: process.env.RI_DATA_DIR || '.test_run/data',
+  },
   server: {
     env: 'test',
     requestTimeout: parseInt(process.env.RI_REQUEST_TIMEOUT, 10) || 1000,

redisinsight/api/data/common

@@ -0,0 +1 @@
+set foo bar

redisinsight/api/data/json

@@ -0,0 +1 @@
+json.set jsonKey . "{\"key\":\"value\"}"

redisinsight/api/data/manifest.json

@@ -0,0 +1,11 @@
+{
+  "files": [
+    {
+      "path": "common"
+    },
+    {
+      "path": "json",
+      "modules": ["rejson"]
+    }
+  ]
+}

redisinsight/api/nest-cli.json

@@ -10,6 +10,10 @@
       {
         "include": "../defaults/**/*",
         "outDir": "dist/defaults"
+      },
+      {
+        "include": "../data/**/*",
+        "outDir": "dist/data"
       }
     ]
   }

redisinsight/api/package.json

@@ -1,6 +1,6 @@
 {
   "name": "redisinsight-api",
-  "version": "2.46.0",
+  "version": "2.48.0",
   "description": "RedisInsight API",
   "private": true,
   "author": {
@@ -62,6 +62,7 @@
     "busboy": "^1.6.0",
     "class-transformer": "^0.2.3",
     "class-validator": "^0.14.0",
+    "combined-stream": "^1.0.8",
     "connect-timeout": "^1.9.0",
     "date-fns": "^2.29.3",
     "detect-port": "^1.5.1",