From dc569475746f91be0d2e36349280af65844cd103 Mon Sep 17 00:00:00 2001 From: Jack Kavanagh Date: Thu, 15 Sep 2022 10:16:28 +0200 Subject: [PATCH] websocket team sync (#5180) * enable team sync in ws request * sync payload * add default payload name * make git sync work * fix test * hrmph * fix failing nedb test Co-authored-by: Filipe Freire --- packages/insomnia/src/models/websocket-payload.ts | 5 +++-- packages/insomnia/src/models/websocket-request.ts | 3 +-- .../insomnia/src/sync/git/__tests__/ne-db-client.test.ts | 2 ++ packages/insomnia/src/sync/git/ne-db-client.ts | 2 ++ 4 files changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/insomnia/src/models/websocket-payload.ts b/packages/insomnia/src/models/websocket-payload.ts index 80d28a17c7..bd062c4d05 100644 --- a/packages/insomnia/src/models/websocket-payload.ts +++ b/packages/insomnia/src/models/websocket-payload.ts @@ -9,10 +9,10 @@ export const prefix = 'ws-payload'; export const canDuplicate = true; -// @TODO: enable this at some point -export const canSync = false; +export const canSync = true; export interface BaseWebSocketPayload { + name: string; value: string; mode: string; } @@ -28,6 +28,7 @@ export const isWebSocketPayloadId = (id: string | null) => ( ); export const init = (): BaseWebSocketPayload => ({ + name: 'New Payload', value: '', mode: 'application/json', }); diff --git a/packages/insomnia/src/models/websocket-request.ts b/packages/insomnia/src/models/websocket-request.ts index 9b22d83b8c..62083bf690 100644 --- a/packages/insomnia/src/models/websocket-request.ts +++ b/packages/insomnia/src/models/websocket-request.ts @@ -10,8 +10,7 @@ export const prefix = 'ws-req'; export const canDuplicate = true; -// @TODO: enable this at some point -export const canSync = false; +export const canSync = true; export interface BaseWebSocketRequest { name: string; diff --git a/packages/insomnia/src/sync/git/__tests__/ne-db-client.test.ts b/packages/insomnia/src/sync/git/__tests__/ne-db-client.test.ts index fcf76b3f38..dec1e56aec 100644 --- a/packages/insomnia/src/sync/git/__tests__/ne-db-client.test.ts +++ b/packages/insomnia/src/sync/git/__tests__/ne-db-client.test.ts @@ -57,6 +57,8 @@ describe('NeDBClient', () => { models.requestGroup.type, models.unitTest.type, models.unitTestSuite.type, + models.webSocketPayload.type, + models.webSocketRequest.type, models.workspace.type, ]); expect(await neDbClient.readdir(reqDir)).toEqual(['req_1.yml', 'req_2.yml']); diff --git a/packages/insomnia/src/sync/git/ne-db-client.ts b/packages/insomnia/src/sync/git/ne-db-client.ts index a706aeac7d..25590cbd27 100644 --- a/packages/insomnia/src/sync/git/ne-db-client.ts +++ b/packages/insomnia/src/sync/git/ne-db-client.ts @@ -148,6 +148,8 @@ export class NeDBClient { models.grpcRequest.type, models.protoFile.type, models.protoDirectory.type, + models.webSocketRequest.type, + models.webSocketPayload.type, ]; } else if (type !== null && id === null) { const workspace = await db.get(models.workspace.type, this._workspaceId);