Merge branch 'finos:main' into application-settings-management

finos · Jul 2, 2024 · d97b9be · d97b9be
2 parents f75096a + fb9f886
commit d97b9be
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/vuu-ui/packages/vuu-data-remote/src/connection-manager.ts b/vuu-ui/packages/vuu-data-remote/src/connection-manager.ts
@@ -4,9 +4,6 @@ import {
   ServerProxySubscribeMessage,
   TableSchema,
   VuuUIMessageIn,
-  VuuUIMessageInRPC,
-  VuuUIMessageInTableList,
-  VuuUIMessageInTableMeta,
   VuuUIMessageOut,
   WebSocketProtocol,
 } from "@finos/vuu-data-types";
@@ -24,6 +21,7 @@ import {
   getLoggingConfigForWorker,
   isConnectionQualityMetrics,
   isConnectionStatusMessage,
+  isRequestResponse,
   isTableSchemaMessage,
   messageHasResult,
   uuid,
@@ -176,19 +174,12 @@ function handleMessageFromWorker({
     ConnectionManager.emit("connection-status", message);
   } else if (isConnectionQualityMetrics(message)) {
     ConnectionManager.emit("connection-metrics", message);
-  } else {
-    const requestId = (message as VuuUIMessageInRPC).requestId;
+  } else if (isRequestResponse(message)) {
+    const { requestId } = message;
     if (pendingRequests.has(requestId)) {
       const { resolve } = pendingRequests.get(requestId);
       pendingRequests.delete(requestId);
-      const {
-        type: _1,
-        requestId: _2,
-        ...rest
-      } = message as
-        | VuuUIMessageInRPC
-        | VuuUIMessageInTableList
-        | VuuUIMessageInTableMeta;
+      const { requestId: _, ...messageWithoutRequestId } = message;
 
       if (messageHasResult(message)) {
         resolve(message.result);
@@ -200,7 +191,7 @@ function handleMessageFromWorker({
       } else if (isTableSchemaMessage(message)) {
         resolve(message.tableSchema);
       } else {
-        resolve(rest);
+        resolve(messageWithoutRequestId);
       }
     } else {
       console.warn(

diff --git a/vuu-ui/packages/vuu-data-types/index.d.ts b/vuu-ui/packages/vuu-data-types/index.d.ts
@@ -625,18 +625,22 @@ export interface VuuUIMessageInMenuRej {
   type: "VIEW_PORT_MENU_REJ";
 }
 
-export type VuuUIMessageIn =
-  | VuuUIMessageInConnected
-  | VuuUIMessageInConnectionFailed
-  | VuuUIMessageInWorkerReady
-  | VuuUIMessageInRPC
-  | ViewportRpcResponse
+export type VuuUiMessageInRequestResponse =
+  | VuuUIMessageInMenuRej
   | MenuRpcResponse
   | MenuRpcReject
-  | VuuUIMessageInTableList
-  | VuuUIMessageInTableMeta
+  | VuuUIMessageInRPC
   | VuuUIMessageInRPCEditReject
-  | VuuUIMessageInRPCEditResponse;
+  | VuuUIMessageInRPCEditResponse
+  | ViewportRpcResponse
+  | VuuUIMessageInTableList
+  | VuuUIMessageInTableMeta;
+
+export type VuuUIMessageIn =
+  | VuuUiMessageInRequestResponse
+  | VuuUIMessageInConnected
+  | VuuUIMessageInConnectionFailed
+  | VuuUIMessageInWorkerReady;
 
 export type WebSocketProtocol = string | string[] | undefined;
 

diff --git a/vuu-ui/packages/vuu-utils/src/protocol-message-utils.ts b/vuu-ui/packages/vuu-utils/src/protocol-message-utils.ts
@@ -1,9 +1,10 @@
-import {
+import type {
   MenuRpcAction,
   MenuRpcResponse,
   OpenDialogActionWithSchema,
   RpcResponse,
   VuuUIMessageOut,
+  VuuUiMessageInRequestResponse,
 } from "@finos/vuu-data-types";
 import {
   ClientToServerMenuRPC,
@@ -28,6 +29,10 @@ export const isVuuMenuRpcRequest = (
   message: VuuUIMessageOut | VuuRpcRequest | ClientToServerMenuRPC
 ): message is ClientToServerMenuRPC => MENU_RPC_TYPES.includes(message["type"]);
 
+export const isRequestResponse = (
+  message: object
+): message is VuuUiMessageInRequestResponse => "requestId" in message;
+
 export const isOpenSessionTableDialogMessage = (
   rpcResponse: RpcResponse
 ): rpcResponse is MenuRpcResponse<OpenDialogActionWithSchema> =>