Skip to content

Commit 77ce494

Browse files
egor-zalenskiegor-zalenski
committed
Merge branch 'refs/heads/be/feature/RI-6349_Fix_mas_build' into e2e/feature/RI-6325_fix_e2e_restart
2 parents d00d62a + 0a2030e commit 77ce494

File tree

72 files changed

+1139
-270
lines changed

Some content is hidden

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

72 files changed

+1139
-270
lines changed

‎.github/workflows/pipeline-build-macos.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ jobs:
7373
7474
yarn package:stage && yarn package:mas
7575
rm -rf release/mac
76+
7677
mv release/mas-universal/Redis-Insight-mac-universal-mas.pkg release/Redis-Insight-mac-universal-mas.pkg
7778
7879
# handle manual builds

‎electron-builder.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@
77
"node_modules",
88
"package.json"
99
],
10-
"npmRebuild": false,
1110
"artifactName": "Redis-Insight-${os}-${arch}.${ext}",
1211
"compression": "normal",
1312
"asarUnpack": [
1413
"node_modules/keytar",
15-
"node_modules/sqlite3",
16-
"node_modules/cpu-features"
14+
"node_modules/sqlite3"
1715
],
1816
"protocols": [{
1917
"name": "RedisInsight",

‎package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,6 @@
7878
"**/trim": "0.0.3",
7979
"word-wrap": "1.2.4",
8080
"**/semver": "^7.5.2",
81-
"@electron/notarize": "2.5.0",
8281
"rawproto/protobufjs": "^7.2.5",
8382
"webpack-bundle-analyzer/ws": "^7.5.10",
8483
"msw/path-to-regexp": "^6.3.0",
@@ -235,7 +234,7 @@
235234
"gzip-js": "^0.3.2",
236235
"html-entities": "^2.3.2",
237236
"html-react-parser": "^1.2.4",
238-
"java-object-serialization": "^0.1.1",
237+
"java-object-serialization": "^0.1.2",
239238
"js-yaml": "^4.1.0",
240239
"json-bigint": "^1.0.0",
241240
"jsonpath": "^1.1.1",

‎redisinsight/api/package.json‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
"@nestjs/platform-socket.io/socket.io": "^4.8.0",
4949
"@nestjs/cli/**/braces": "^3.0.3",
5050
"**/semver": "^7.5.2",
51+
"**/cpu-features": "file:./stubs/cpu-features",
5152
"winston-daily-rotate-file/**/file-stream-rotator": "^1.0.0"
5253
},
5354
"dependencies": {

‎redisinsight/api/src/__mocks__/custom-tutorial.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ export const globalCustomTutorialManifest = {
143143
_actions: [CustomTutorialActions.CREATE],
144144
args: {
145145
withBorder: true,
146-
initialIsOpen: true,
146+
initialIsOpen: false,
147147
},
148148
children: [
149149
mockCustomTutorialManifest,

‎redisinsight/api/src/modules/browser/rejson-rl/rejson-rl.service.spec.ts‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ describe('JsonService', () => {
215215
expect(result).toEqual({
216216
downloaded: true,
217217
path: testPath,
218-
data: testData,
218+
data: JSON.stringify(testData),
219219
});
220220
});
221221
it('should return data (number)', async () => {
@@ -236,7 +236,7 @@ describe('JsonService', () => {
236236
expect(result).toEqual({
237237
downloaded: true,
238238
path: testPath,
239-
data: testData,
239+
data: JSON.stringify(testData),
240240
});
241241
});
242242
it('should return data (integer)', async () => {
@@ -257,7 +257,7 @@ describe('JsonService', () => {
257257
expect(result).toEqual({
258258
downloaded: true,
259259
path: testPath,
260-
data: testData,
260+
data: JSON.stringify(testData),
261261
});
262262
});
263263
it('should return data (boolean)', async () => {
@@ -278,7 +278,7 @@ describe('JsonService', () => {
278278
expect(result).toEqual({
279279
downloaded: true,
280280
path: testPath,
281-
data: testData,
281+
data: JSON.stringify(testData),
282282
});
283283
});
284284
it('should return data (null)', async () => {
@@ -299,7 +299,7 @@ describe('JsonService', () => {
299299
expect(result).toEqual({
300300
downloaded: true,
301301
path: testPath,
302-
data: testData,
302+
data: JSON.stringify(testData),
303303
});
304304
});
305305
it('should return data (array)', async () => {
@@ -328,7 +328,7 @@ describe('JsonService', () => {
328328
expect(result).toEqual({
329329
downloaded: true,
330330
path: testPath,
331-
data: testData,
331+
data: JSON.stringify(testData),
332332
});
333333
});
334334
it('should return data (object)', async () => {
@@ -355,7 +355,7 @@ describe('JsonService', () => {
355355
expect(result).toEqual({
356356
downloaded: true,
357357
path: testPath,
358-
data: testData,
358+
data: JSON.stringify(testData),
359359
});
360360
});
361361
it('should return full json data when forceRetrieve is true', async () => {
@@ -393,7 +393,7 @@ describe('JsonService', () => {
393393
expect(result).toEqual({
394394
downloaded: true,
395395
path: testPath,
396-
data: testData,
396+
data: JSON.stringify(testData),
397397
});
398398
});
399399
});
@@ -432,7 +432,7 @@ describe('JsonService', () => {
432432
expect(result).toEqual({
433433
downloaded: true,
434434
path: testPath,
435-
data: testData,
435+
data: JSON.stringify(testData),
436436
});
437437
});
438438

@@ -462,7 +462,7 @@ describe('JsonService', () => {
462462
expect(result).toEqual({
463463
downloaded: true,
464464
path: testPath,
465-
data: testData,
465+
data: JSON.stringify(testData),
466466
});
467467
});
468468
});
@@ -503,11 +503,11 @@ describe('JsonService', () => {
503503
expect(result).toEqual({
504504
downloaded: false,
505505
path: testPath,
506-
data: testData,
506+
data: JSON.stringify(testData),
507507
type: 'string',
508508
});
509509
});
510-
it('should return array with scalar values and safe struct types descriptions', async () => {
510+
it('should return array with scalar values as strings and safe struct types descriptions', async () => {
511511
const testData = [
512512
12,
513513
3.14,
@@ -555,35 +555,35 @@ describe('JsonService', () => {
555555
path: '[0]',
556556
cardinality: 1,
557557
type: 'integer',
558-
value: testData[0],
558+
value: String(testData[0]),
559559
},
560560
{
561561
key: 1,
562562
path: '[1]',
563563
cardinality: 1,
564564
type: 'number',
565-
value: testData[1],
565+
value: String(testData[1]),
566566
},
567567
{
568568
key: 2,
569569
path: '[2]',
570570
cardinality: 1,
571571
type: 'string',
572-
value: testData[2],
572+
value: `"${testData[2]}"`,
573573
},
574574
{
575575
key: 3,
576576
path: '[3]',
577577
cardinality: 1,
578578
type: 'boolean',
579-
value: testData[3],
579+
value: String(testData[3]),
580580
},
581581
{
582582
key: 4,
583583
path: '[4]',
584584
cardinality: 1,
585585
type: 'null',
586-
value: testData[4],
586+
value: String(testData[4]),
587587
},
588588
{
589589
key: 5,
@@ -654,19 +654,19 @@ describe('JsonService', () => {
654654
path: `${path}[0]`,
655655
cardinality: 1,
656656
type: 'integer',
657-
value: testData[0],
657+
value: String(testData[0]),
658658
},
659659
{
660660
key: 1,
661661
path: `${path}[1]`,
662662
cardinality: 1,
663663
type: 'string',
664-
value: testData[1],
664+
value: `"${testData[1]}"`,
665665
},
666666
],
667667
});
668668
});
669-
it('should return object with scalar values and safe struct types descriptions', async () => {
669+
it('should return object with scalar values as strings and safe struct types descriptions', async () => {
670670
const testData = {
671671
fInt: 12,
672672
fNum: 3.14,
@@ -752,35 +752,35 @@ describe('JsonService', () => {
752752
path: '["fInt"]',
753753
cardinality: 1,
754754
type: 'integer',
755-
value: testData.fInt,
755+
value: String(testData.fInt),
756756
},
757757
{
758758
key: 'fNum',
759759
path: '["fNum"]',
760760
cardinality: 1,
761761
type: 'number',
762-
value: testData.fNum,
762+
value: String(testData.fNum),
763763
},
764764
{
765765
key: 'fStr',
766766
path: '["fStr"]',
767767
cardinality: 1,
768768
type: 'string',
769-
value: testData.fStr,
769+
value: `"${testData.fStr}"`,
770770
},
771771
{
772772
key: 'fBool',
773773
path: '["fBool"]',
774774
cardinality: 1,
775775
type: 'boolean',
776-
value: testData.fBool,
776+
value: String(testData.fBool),
777777
},
778778
{
779779
key: 'fNull',
780780
path: '["fNull"]',
781781
cardinality: 1,
782782
type: 'null',
783-
value: testData.fNull,
783+
value: String(testData.fNull),
784784
},
785785
{
786786
key: 'fArr',
@@ -797,7 +797,7 @@ describe('JsonService', () => {
797797
],
798798
});
799799
});
800-
it('should return object with scalar values in a custom path', async () => {
800+
it('should return object with scalar values as strings in a custom path', async () => {
801801
const path = '["customPath"]';
802802
const testData = {
803803
fInt: 12,
@@ -855,14 +855,14 @@ describe('JsonService', () => {
855855
path: `${path}["fInt"]`,
856856
cardinality: 1,
857857
type: 'integer',
858-
value: testData.fInt,
858+
value: String(testData.fInt),
859859
},
860860
{
861861
key: 'fStr',
862862
path: `${path}["fStr"]`,
863863
cardinality: 1,
864864
type: 'string',
865-
value: testData.fStr,
865+
value: `"${testData.fStr}"`,
866866
},
867867
],
868868
});

‎redisinsight/api/src/modules/browser/rejson-rl/rejson-rl.service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ export class RejsonRlService {
5151
);
5252
}
5353

54-
return JSON.parse(data);
54+
return data
5555
}
5656

5757
private async estimateSize(

‎redisinsight/api/src/modules/custom-tutorial/custom-tutorial.service.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ export class CustomTutorialService {
145145
_actions: [CustomTutorialActions.CREATE],
146146
args: {
147147
withBorder: true,
148-
initialIsOpen: true,
148+
initialIsOpen: false,
149149
},
150150
children,
151151
};

‎redisinsight/api/stubs/cpu-features/index.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
module.exports = {};

‎redisinsight/api/stubs/cpu-features/package.json‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{
2+
"name": "cpu-features",
3+
"version": "1.0.0",
4+
"main": "index.js"
5+
}

0 commit comments

Comments
 (0)