fix websocket->webSocket

Kong · Sep 7, 2022 · a5b1850 · a5b1850
1 parent ee5e0f7
commit a5b1850
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 15 deletions.
diff --git a/packages/insomnia/src/common/render.ts b/packages/insomnia/src/common/render.ts
@@ -563,7 +563,7 @@ export async function getRenderContextAncestors(base?: Request | GrpcRequest | W
   return await db.withAncestors<RenderContextAncestor>(base || null, [
     models.request.type,
     models.grpcRequest.type,
-    models.websocketRequest.type,
+    models.webSocketRequest.type,
     models.requestGroup.type,
     models.workspace.type,
     models.project.type,

diff --git a/packages/insomnia/src/main/network/websocket.ts b/packages/insomnia/src/main/network/websocket.ts
@@ -16,7 +16,7 @@ import {
 
 import { AUTH_BASIC, AUTH_BEARER } from '../../common/constants';
 import { generateId } from '../../common/misc';
-import { websocketRequest } from '../../models';
+import { webSocketRequest } from '../../models';
 import * as models from '../../models';
 import { Environment } from '../../models/environment';
 import { RequestAuthentication, RequestHeader } from '../../models/request';
@@ -135,7 +135,7 @@ const createWebSocketConnection = async (
     console.warn('Connection still open to ' + existingConnection.url);
     return;
   }
-  const request = await websocketRequest.getById(options.requestId);
+  const request = await webSocketRequest.getById(options.requestId);
   const responseId = generateId('res');
   if (!request) {
     return;

diff --git a/packages/insomnia/src/models/helpers/request-operations.ts b/packages/insomnia/src/models/helpers/request-operations.ts
@@ -8,7 +8,7 @@ export function getById(requestId: string): Promise<Request | GrpcRequest | WebS
     return models.grpcRequest.getById(requestId);
   }
   if (isWebSocketRequestId(requestId)) {
-    return models.websocketRequest.getById(requestId);
+    return models.webSocketRequest.getById(requestId);
   }
   return models.request.getById(requestId);
 }
@@ -18,7 +18,7 @@ export function remove(request: Request | GrpcRequest | WebSocketRequest) {
     return models.grpcRequest.remove(request);
   }
   if (isWebSocketRequest(request)) {
-    return models.websocketRequest.remove(request);
+    return models.webSocketRequest.remove(request);
   }
   return models.request.remove(request);
 }
@@ -32,7 +32,7 @@ export function update<T extends object>(request: T, patch: Partial<T> = {}): Pr
   // @ts-expect-error -- TSCONVERSION
   if (isWebSocketRequest(request)) {
     // @ts-expect-error -- TSCONVERSION
-    return models.websocketRequest.update(request, patch);
+    return models.webSocketRequest.update(request, patch);
   }
   // @ts-expect-error -- TSCONVERSION
   return models.request.update(request, patch);
@@ -47,7 +47,7 @@ export function duplicate<T extends object>(request: T, patch: Partial<T> = {}):
   // @ts-expect-error -- TSCONVERSION
   if (isWebSocketRequest(request)) {
     // @ts-expect-error -- TSCONVERSION
-    return models.websocketRequest.duplicate(request, patch);
+    return models.webSocketRequest.duplicate(request, patch);
   }
   // @ts-expect-error -- TSCONVERSION
   return models.request.duplicate(request, patch);

diff --git a/packages/insomnia/src/models/index.ts b/packages/insomnia/src/models/index.ts
@@ -36,7 +36,7 @@ import * as _stats from './stats';
 import * as _unitTest from './unit-test';
 import * as _unitTestResult from './unit-test-result';
 import * as _unitTestSuite from './unit-test-suite';
-import * as _websocketRequest from './websocket-request';
+import * as _webSocketRequest from './websocket-request';
 import * as _workspace from './workspace';
 import * as _workspaceMeta from './workspace-meta';
 
@@ -77,7 +77,7 @@ export const protoFile = _protoFile;
 export const protoDirectory = _protoDirectory;
 export const grpcRequest = _grpcRequest;
 export const grpcRequestMeta = _grpcRequestMeta;
-export const websocketRequest = _websocketRequest;
+export const webSocketRequest = _webSocketRequest;
 export const workspace = _workspace;
 export const workspaceMeta = _workspaceMeta;
 
@@ -111,7 +111,7 @@ export function all() {
     protoDirectory,
     grpcRequest,
     grpcRequestMeta,
-    websocketRequest,
+    webSocketRequest,
   ] as const;
 }
 
@@ -211,7 +211,7 @@ export async function initModel<T extends BaseModel>(type: string, ...sources: R
 
 export const MODELS_BY_EXPORT_TYPE: Record<string, any> = {
   [EXPORT_TYPE_REQUEST]: request,
-  [EXPORT_TYPE_WEBSOCKET_REQUEST]: websocketRequest,
+  [EXPORT_TYPE_WEBSOCKET_REQUEST]: webSocketRequest,
   [EXPORT_TYPE_GRPC_REQUEST]: grpcRequest,
   [EXPORT_TYPE_REQUEST_GROUP]: requestGroup,
   [EXPORT_TYPE_UNIT_TEST_SUITE]: unitTestSuite,

diff --git a/packages/insomnia/src/ui/components/websockets/websocket-request-pane.tsx b/packages/insomnia/src/ui/components/websockets/websocket-request-pane.tsx
@@ -29,6 +29,7 @@ const SendMessageForm = styled.form({
 });
 const SendButton = styled.button({
   padding: '0 var(--padding-md)',
+  marginLeft: 'var(--padding-xs)',
   height: '100%',
   border: '1px solid var(--hl-lg)',
   borderRadius: 'var(--radius-md)',
@@ -127,7 +128,7 @@ export const WebSocketRequestPane: FC<Props> = ({ request, workspaceId, environm
   const disabled = readyState === ReadyState.OPEN || readyState === ReadyState.CLOSING;
   const handleOnChange = (url: string) => {
     if (url !== request.url) {
-      models.websocketRequest.update(request, { url });
+      models.webSocketRequest.update(request, { url });
     }
   };
   const [payloadType, setPayloadType] = useState(CONTENT_TYPE_JSON);

diff --git a/packages/insomnia/src/ui/hooks/create-request.ts b/packages/insomnia/src/ui/hooks/create-request.ts
@@ -111,7 +111,7 @@ export const createRequest: RequestCreator = async ({
     }
 
     case 'WebSocket': {
-      const request = await models.websocketRequest.create({
+      const request = await models.webSocketRequest.create({
         parentId,
         name: 'New WebSocket Request',
       });

diff --git a/packages/insomnia/src/ui/redux/__tests__/sidebar-selectors.test.ts b/packages/insomnia/src/ui/redux/__tests__/sidebar-selectors.test.ts
@@ -17,7 +17,7 @@ const grpcRequestModelBuilder = createBuilder(grpcRequestModelSchema);
 
 describe('shouldShowInSidebar', () => {
   const allTypes = models.types();
-  const supported = [models.request.type, models.requestGroup.type, models.grpcRequest.type, models.websocketRequest.type];
+  const supported = [models.request.type, models.requestGroup.type, models.grpcRequest.type, models.webSocketRequest.type];
   const unsupported = difference(allTypes, supported);
 
   it.each(supported)('should show %s in sidebar', type => {

diff --git a/packages/insomnia/src/ui/redux/modules/entities.ts b/packages/insomnia/src/ui/redux/modules/entities.ts
@@ -200,6 +200,6 @@ export async function allDocs() {
     ...(await models.protoDirectory.all()),
     ...(await models.grpcRequest.all()),
     ...(await models.grpcRequestMeta.all()),
-    ...(await models.websocketRequest.all()),
+    ...(await models.webSocketRequest.all()),
   ];
 }