Skip to content

Commit 9a14f96

Browse files
AmirAllayarovSofteqAmirAllayarovSofteq
committed
Merge branch 'main' of https://github.com/RedisInsight/RedisInsight into feature/RI-4061_upload_json
2 parents afac58d + ccefa72 commit 9a14f96

File tree

142 files changed

+8129
-222
lines changed

Some content is hidden

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

142 files changed

+8129
-222
lines changed

‎configs/webpack.config.main.prod.babel.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import path from 'path';
22
import webpack from 'webpack';
33
import { merge } from 'webpack-merge';
4+
import { toString } from 'lodash'
45
import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
56
import baseConfig from './webpack.config.base';
67
import DeleteSourceMaps from '../scripts/DeleteSourceMaps';
@@ -69,6 +70,9 @@ export default merge(baseConfig, {
6970
APP_VERSION: version,
7071
AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',
7172
SEGMENT_WRITE_KEY: 'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
73+
CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
74+
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
75+
: toString(30 * 1000), // 30 sec
7276
}),
7377
],
7478

‎configs/webpack.config.main.stage.babel.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import webpack from 'webpack';
22
import { merge } from 'webpack-merge';
33
import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
4+
import { toString } from 'lodash'
45
import mainProdConfig from './webpack.config.main.prod.babel';
56
import DeleteSourceMaps from '../scripts/DeleteSourceMaps';
67
import { version } from '../redisinsight/package.json';
@@ -29,6 +30,9 @@ export default merge(mainProdConfig, {
2930
APP_VERSION: version,
3031
AWS_BUCKET_NAME: 'AWS_BUCKET_NAME' in process.env ? process.env.AWS_BUCKET_NAME : '',
3132
SEGMENT_WRITE_KEY: 'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
33+
CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
34+
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
35+
: toString(30 * 1000), // 30 sec
3236
}),
3337
],
3438
});

‎configs/webpack.config.renderer.dev.babel.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ import path from 'path';
22
import webpack from 'webpack';
33
import { merge } from 'webpack-merge';
44
import { spawn } from 'child_process';
5+
import { toString } from 'lodash'
56
import ReactRefreshWebpackPlugin from '@pmmmwh/react-refresh-webpack-plugin';
67
import MonacoWebpackPlugin from 'monaco-editor-webpack-plugin';
78
import baseConfig from './webpack.config.base';
@@ -215,6 +216,9 @@ export default merge(baseConfig, {
215216
APP_VERSION: version,
216217
SEGMENT_WRITE_KEY:
217218
'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
219+
CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
220+
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
221+
: toString(30 * 1000), // 30 sec
218222
}),
219223

220224
new webpack.LoaderOptionsPlugin({

‎configs/webpack.config.renderer.dev.dll.babel.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import webpack from 'webpack';
22
import path from 'path';
33
import { merge } from 'webpack-merge';
4+
import { toString } from 'lodash'
45
import baseConfig from './webpack.config.base';
56
import { dependencies } from '../package.json';
67
import { dependencies as dependenciesApi } from '../redisinsight/package.json';
@@ -54,7 +55,10 @@ export default merge(baseConfig, {
5455
SCAN_TREE_COUNT_DEFAULT: '10000',
5556
PIPELINE_COUNT_DEFAULT: '5',
5657
SEGMENT_WRITE_KEY:
57-
'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
58+
'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
59+
CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
60+
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
61+
: toString(30 * 1000), // 30 sec
5862
}),
5963

6064
new webpack.LoaderOptionsPlugin({

‎configs/webpack.config.renderer.prod.babel.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import path from 'path';
22
import webpack from 'webpack';
3+
import { toString } from 'lodash'
34
import MiniCssExtractPlugin from 'mini-css-extract-plugin';
45
import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
56
import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
@@ -200,7 +201,10 @@ export default merge(baseConfig, {
200201
SCAN_TREE_COUNT_DEFAULT: '10000',
201202
PIPELINE_COUNT_DEFAULT: '5',
202203
SEGMENT_WRITE_KEY:
203-
'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
204+
'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
205+
CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
206+
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
207+
: toString(30 * 1000), // 30 sec
204208
}),
205209

206210
new MiniCssExtractPlugin({

‎configs/webpack.config.renderer.stage.babel.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import webpack from 'webpack';
22
import { merge } from 'webpack-merge';
3+
import { toString } from 'lodash'
34
import baseConfig from './webpack.config.base';
45
import rendererProdConfig from './webpack.config.renderer.prod.babel';
56
import DeleteSourceMaps from '../scripts/DeleteSourceMaps';
@@ -23,6 +24,9 @@ export default merge(baseConfig, {
2324
SCAN_COUNT_MEMORY_ANALYSES: '10000',
2425
SEGMENT_WRITE_KEY:
2526
'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
27+
CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
28+
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
29+
: toString(30 * 1000), // 30 sec
2630
}),
2731
],
2832
});

‎configs/webpack.config.web.dev.babel.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import path from 'path';
99
import webpack from 'webpack';
1010
import { merge } from 'webpack-merge';
1111
import ip from 'ip';
12+
import { toString } from 'lodash'
1213
import commonConfig from './webpack.config.web.common.babel';
1314

1415
function employCache(loaders) {
@@ -209,6 +210,9 @@ export default merge(commonConfig, {
209210
SCAN_TREE_COUNT_DEFAULT: '10000',
210211
SEGMENT_WRITE_KEY:
211212
'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
213+
CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
214+
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
215+
: toString(30 * 1000),
212216
}),
213217

214218
new webpack.LoaderOptionsPlugin({

‎configs/webpack.config.web.prod.babel.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { merge } from 'webpack-merge';
22
import { resolve } from 'path';
33
import webpack from 'webpack';
4+
import { toString } from 'lodash'
45
import TerserPlugin from 'terser-webpack-plugin';
56
import { BundleAnalyzerPlugin } from 'webpack-bundle-analyzer';
67
import CssMinimizerPlugin from 'css-minimizer-webpack-plugin';
@@ -56,6 +57,9 @@ export default merge(commonConfig, {
5657
PIPELINE_COUNT_DEFAULT: '5',
5758
SEGMENT_WRITE_KEY:
5859
'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
60+
CONNECTIONS_TIMEOUT_DEFAULT: 'CONNECTIONS_TIMEOUT_DEFAULT' in process.env
61+
? process.env.CONNECTIONS_TIMEOUT_DEFAULT
62+
: toString(30 * 1000), // 30 sec
5963
}),
6064

6165
new BundleAnalyzerPlugin({

‎redisinsight/api/config/default.ts‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,9 @@ export default {
144144
database_analysis: {
145145
maxItemsPerDb: parseInt(process.env.DATABASE_ANALYSIS_MAX_ITEMS_PER_DB, 10) || 5,
146146
},
147+
browser_history: {
148+
maxItemsPerModeInDb: parseInt(process.env.BROWSER_HISTORY_MAX_ITEMS_PER_MODE_IN_DB, 10) || 10,
149+
},
147150
commands: [
148151
{
149152
name: 'main',
@@ -186,6 +189,9 @@ export default {
186189
|| 'https://raw.githubusercontent.com/RedisBloom/RedisBloom/master/commands.json',
187190
},
188191
],
192+
connections: {
193+
timeout: parseInt(process.env.CONNECTIONS_TIMEOUT_DEFAULT, 10) || 30 * 1_000 // 30 sec
194+
},
189195
redisStack: {
190196
id: process.env.BUILD_TYPE === 'REDIS_STACK' ? process.env.REDIS_STACK_DATABASE_ID || 'redis-stack' : undefined,
191197
name: process.env.REDIS_STACK_DATABASE_NAME,

‎redisinsight/api/config/ormconfig.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import { CaCertificateEntity } from 'src/modules/certificate/entities/ca-certifi
1111
import { ClientCertificateEntity } from 'src/modules/certificate/entities/client-certificate.entity';
1212
import { DatabaseEntity } from 'src/modules/database/entities/database.entity';
1313
import { SshOptionsEntity } from 'src/modules/ssh/entities/ssh-options.entity';
14+
import { BrowserHistoryEntity } from 'src/modules/browser/entities/browser-history.entity';
1415
import migrations from '../migration';
1516
import * as config from '../src/utils/config';
1617

@@ -32,6 +33,7 @@ const ormConfig = {
3233
PluginStateEntity,
3334
NotificationEntity,
3435
DatabaseAnalysisEntity,
36+
BrowserHistoryEntity,
3537
SshOptionsEntity,
3638
],
3739
migrations,

0 commit comments

Comments
 (0)