Skip to content

Commit 15906c0

Browse files
author
Artem
committed
Merge branch 'main' into build/rstack
2 parents aa764cf + 1274a8f commit 15906c0

File tree

122 files changed

+4465
-1732
lines changed

Some content is hidden

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

122 files changed

+4465
-1732
lines changed

‎Dockerfile‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ RUN set -ex \
5050
&& chown avahi:avahi /var/run/avahi-daemon \
5151
&& chmod 777 /var/run/avahi-daemon
5252

53+
RUN apt-get install net-tools
5354
RUN apt-get install -y dbus-x11 gnome-keyring libsecret-1-0
5455
RUN dbus-uuidgen > /var/lib/dbus/machine-id
5556

‎babel.config.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,8 @@ module.exports = (api) => {
4848
require('@babel/plugin-syntax-import-meta'),
4949
[require('@babel/plugin-proposal-class-properties'), { loose: true }],
5050
require('@babel/plugin-proposal-json-strings'),
51+
[require('@babel/plugin-proposal-private-property-in-object'), { loose: true }],
52+
[require('@babel/plugin-proposal-private-methods'), { loose: true }],
5153

5254
...(development ? developmentPlugins : productionPlugins),
5355
],

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,8 @@ export default merge(baseConfig, {
135135
loader: 'file-loader',
136136
options: {
137137
name: '[hash]-[name].[ext]',
138-
outputPath: 'static',
139-
publicPath: 'static',
138+
outputPath: 'fonts',
139+
publicPath: 'fonts',
140140
},
141141
},
142142
],
@@ -150,8 +150,8 @@ export default merge(baseConfig, {
150150
loader: 'file-loader',
151151
options: {
152152
name: '[hash]-[name].[ext]',
153-
outputPath: 'static',
154-
publicPath: 'static',
153+
outputPath: 'fonts',
154+
publicPath: 'fonts',
155155
},
156156
},
157157
],
@@ -169,8 +169,8 @@ export default merge(baseConfig, {
169169
loader: 'file-loader',
170170
options: {
171171
name: '[hash]-[name].[ext]',
172-
outputPath: 'static',
173-
publicPath: 'static',
172+
outputPath: 'fonts',
173+
publicPath: 'fonts',
174174
},
175175
},
176176
],
@@ -209,6 +209,7 @@ export default merge(baseConfig, {
209209
BASE_API_URL: 'http://localhost',
210210
RESOURCES_BASE_URL: 'http://localhost',
211211
SCAN_COUNT_DEFAULT: '500',
212+
SCAN_TREE_COUNT_DEFAULT: '10000',
212213
BUILD_TYPE: 'ELECTRON',
213214
APP_VERSION: version,
214215
SEGMENT_WRITE_KEY:

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ export default merge(baseConfig, {
5151
BASE_API_URL: 'http://localhost',
5252
RESOURCES_BASE_URL: 'http://localhost',
5353
SCAN_COUNT_DEFAULT: '500',
54+
SCAN_TREE_COUNT_DEFAULT: '10000',
5455
SEGMENT_WRITE_KEY:
5556
'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
5657
}),

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,8 @@ export default merge(baseConfig, {
119119
loader: 'file-loader',
120120
options: {
121121
name: '[hash]-[name].[ext]',
122-
outputPath: 'static',
123-
publicPath: 'static',
122+
outputPath: 'fonts',
123+
publicPath: 'fonts',
124124
},
125125
},
126126
],
@@ -134,8 +134,8 @@ export default merge(baseConfig, {
134134
loader: 'file-loader',
135135
options: {
136136
name: '[hash]-[name].[ext]',
137-
outputPath: 'static',
138-
publicPath: 'static',
137+
outputPath: 'fonts',
138+
publicPath: 'fonts',
139139
},
140140
},
141141
],
@@ -153,8 +153,8 @@ export default merge(baseConfig, {
153153
loader: 'file-loader',
154154
options: {
155155
name: '[hash]-[name].[ext]',
156-
outputPath: 'static',
157-
publicPath: 'static',
156+
outputPath: 'fonts',
157+
publicPath: 'fonts',
158158
},
159159
},
160160
],
@@ -197,6 +197,7 @@ export default merge(baseConfig, {
197197
RESOURCES_BASE_URL: process.env.SERVER_TLS_CERT && process.env.SERVER_TLS_KEY ? 'https://localhost' : 'http://localhost',
198198
APP_ENV: 'electron',
199199
SCAN_COUNT_DEFAULT: '500',
200+
SCAN_TREE_COUNT_DEFAULT: '10000',
200201
SEGMENT_WRITE_KEY:
201202
'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
202203
}),

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ export default merge(baseConfig, {
2020
RESOURCES_BASE_URL: process.env.SERVER_TLS_CERT && process.env.SERVER_TLS_KEY ? 'https://localhost' : 'http://localhost',
2121
APP_ENV: 'electron',
2222
SCAN_COUNT_DEFAULT: '500',
23+
SCAN_COUNT_MEMORY_ANALYSES: '10000',
2324
SEGMENT_WRITE_KEY:
2425
'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
2526
}),

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ export default merge(commonConfig, {
107107
loader: 'file-loader',
108108
options: {
109109
name: '[hash]-[name].[ext]',
110-
outputPath: 'static',
111-
publicPath: 'static',
110+
outputPath: 'fonts',
111+
publicPath: 'fonts',
112112
},
113113
},
114114
],
@@ -122,8 +122,8 @@ export default merge(commonConfig, {
122122
loader: 'file-loader',
123123
options: {
124124
name: '[hash]-[name].[ext]',
125-
outputPath: 'static',
126-
publicPath: 'static',
125+
outputPath: 'fonts',
126+
publicPath: 'fonts',
127127
},
128128
},
129129
],
@@ -141,8 +141,8 @@ export default merge(commonConfig, {
141141
loader: 'file-loader',
142142
options: {
143143
name: '[hash]-[name].[ext]',
144-
outputPath: 'static',
145-
publicPath: 'static',
144+
outputPath: 'fonts',
145+
publicPath: 'fonts',
146146
},
147147
},
148148
],
@@ -187,6 +187,7 @@ export default merge(commonConfig, {
187187
BASE_API_URL: `http://${require('os').hostname()}`,
188188
RESOURCES_BASE_URL: `http://${require('os').hostname()}`,
189189
SCAN_COUNT_DEFAULT: '500',
190+
SCAN_TREE_COUNT_DEFAULT: '10000',
190191
SEGMENT_WRITE_KEY:
191192
'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
192193
}),

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ export default merge(commonConfig, {
5252
RESOURCES_BASE_URL:
5353
process.env.SERVER_TLS_CERT && process.env.SERVER_TLS_KEY ? 'https://localhost' : 'http://localhost',
5454
SCAN_COUNT_DEFAULT: '500',
55+
SCAN_TREE_COUNT_DEFAULT: '10000',
5556
SEGMENT_WRITE_KEY:
5657
'SEGMENT_WRITE_KEY' in process.env ? process.env.SEGMENT_WRITE_KEY : 'SOURCE_WRITE_KEY',
5758
}),
@@ -130,8 +131,8 @@ export default merge(commonConfig, {
130131
loader: 'file-loader',
131132
options: {
132133
name: '[hash]-[name].[ext]',
133-
outputPath: 'static',
134-
publicPath: 'static',
134+
outputPath: 'fonts',
135+
publicPath: 'fonts',
135136
},
136137
},
137138
],
@@ -145,8 +146,8 @@ export default merge(commonConfig, {
145146
loader: 'file-loader',
146147
options: {
147148
name: '[hash]-[name].[ext]',
148-
outputPath: 'static',
149-
publicPath: 'static',
149+
outputPath: 'fonts',
150+
publicPath: 'fonts',
150151
},
151152
},
152153
],
@@ -164,8 +165,8 @@ export default merge(commonConfig, {
164165
loader: 'file-loader',
165166
options: {
166167
name: '[hash]-[name].[ext]',
167-
outputPath: 'static',
168-
publicPath: 'static',
168+
outputPath: 'fonts',
169+
publicPath: 'fonts',
169170
},
170171
},
171172
],

‎package.json‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,6 @@
134134
"@teamsupercell/typings-for-css-modules-loader": "^2.4.0",
135135
"@testing-library/jest-dom": "^5.11.6",
136136
"@testing-library/react": "^11.2.2",
137-
"@testing-library/react-hooks": "^5.0.3",
138137
"@types/axios": "^0.14.0",
139138
"@types/classnames": "^2.2.11",
140139
"@types/date-fns": "^2.6.0",
@@ -251,8 +250,12 @@
251250
"react-jsx-parser": "^1.28.4",
252251
"react-monaco-editor": "^0.44.0",
253252
"react-redux": "^7.2.2",
253+
"react-rnd": "^10.3.5",
254254
"react-router-dom": "^5.2.0",
255255
"react-virtualized": "^9.22.2",
256+
"react-virtualized-auto-sizer": "^1.0.6",
257+
"react-vtree": "^3.0.0-beta.3",
258+
"react-window": "^1.8.6",
256259
"rehype-stringify": "^9.0.2",
257260
"remark-gfm": "^3.0.1",
258261
"remark-parse": "^10.0.1",

‎redisinsight/api/src/main.ts‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,10 @@ export default async function bootstrap() {
1515
const port = process.env.API_PORT || serverConfig.port;
1616
const logger = WinstonModule.createLogger(LOGGER_CONFIG);
1717

18-
const options: NestApplicationOptions = {};
18+
const options: NestApplicationOptions = {
19+
logger,
20+
};
21+
1922
if (serverConfig.tls && serverConfig.tlsCert && serverConfig.tlsKey) {
2023
options.httpsOptions = {
2124
key: JSON.parse(`"${serverConfig.tlsKey}"`),
@@ -29,7 +32,6 @@ export default async function bootstrap() {
2932
app.use(bodyParser.urlencoded({ limit: '512mb', extended: true }));
3033
app.enableCors();
3134
app.setGlobalPrefix(serverConfig.globalPrefix);
32-
app.useLogger(logger);
3335

3436
if (process.env.APP_ENV !== 'electron') {
3537
SwaggerModule.setup(

0 commit comments

Comments
 (0)