Merge remote-tracking branch 'origin/feature/RI-5590-upload-data-for-empty-db' into release/2.48.0

Author: vlad-dargel

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

@@ -24,12 +24,16 @@ const defaultPluginsUri = process.env.RI_PROXY_PATH ? `/${process.env.RI_PROXY_P
 const pluginsAssetsUri = process.env.RI_PROXY_PATH ? `/${process.env.RI_PROXY_PATH}/static/resources/plugins` : '/static/resources/plugins';
 
 const socketPath = process.env.RI_PROXY_PATH ? `/${process.env.RI_PROXY_PATH}/socket.io` : '/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'),

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

@@ -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",

redisinsight/api/src/__mocks__/bulk-actions.ts

@@ -26,6 +26,26 @@ export const mockBulkActionOverview = {
   },
 };
 
+export const mockDefaultDataManifest = {
+  files: [
+    {
+      path: 'test_common',
+    },
+    {
+      path: 'test_json',
+      modules: ['rejson'],
+    },
+    {
+      path: 'not_existing',
+      modules: ['not_existing_module'],
+    },
+  ],
+};
+
+export const mockCombinedStream = {
+  append: jest.fn(),
+};
+
 export const mockBulkActionOverviewMatcher = {
   ...mockBulkActionOverview,
   duration: jasmine.any(Number),

redisinsight/api/src/__mocks__/databases.ts

@@ -41,6 +41,43 @@ export const mockDatabase = Object.assign(new Database(), {
   version: '7.0',
 });
 
+export const mockDatabaseModules = [
+  {
+    name: 'rg',
+    version: 10204,
+    semanticVersion: '1.2.4',
+  },
+  {
+    name: 'bf',
+    version: 20209,
+    semanticVersion: '2.2.9',
+  },
+  {
+    name: 'timeseries',
+    version: 10616,
+    semanticVersion: '1.6.16',
+  },
+  {
+    name: 'search',
+    version: 999999,
+    semanticVersion: '99.99.99',
+  },
+  {
+    name: 'graph',
+    version: 20815,
+    semanticVersion: '2.8.15',
+  },
+  {
+    name: 'ReJSON',
+    version: 20011,
+    semanticVersion: '2.0.11',
+  },
+  {
+    name: 'ai',
+    version: 10205,
+    semanticVersion: '1.2.5',
+  },
+];
 export const mockDatabaseWithCloudDetails = Object.assign(new Database(), {
   ...mockDatabase,
   cloudDetails: mockCloudDatabaseDetails,