generated type guards

spq · Nov 19, 2024 · 32db284 · 32db284
1 parent 088cfed
commit 32db284
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/web/src/apiClient.guard.ts b/web/src/apiClient.guard.ts
@@ -2,8 +2,7 @@
  * Generated type guards for "apiClient.ts".
  * WARNING: Do not manually change this file.
  */
-import { Error, SearchResult, SearchResponse, StreamData, Statistics, PcapsResponse, ConvertersResponse, ProcessStderr, PcapOverIPResponse, TagsResponse, GraphResponse, ClientConfig } from "./apiClient";
-import { ConfigEvent } from "./stores/websocket";
+import { Error, SearchResult, SearchResponse, StreamData, Statistics, ClientConfig, PcapsResponse, ConvertersResponse, ProcessStderr, PcapOverIPResponse, TagsResponse, GraphResponse } from "./apiClient";
 
 export function isError(obj: unknown): obj is Error {
     const typedObj = obj as Error
@@ -139,7 +138,7 @@ export function isClientConfig(obj: unknown): obj is ClientConfig {
     return (
         (typedObj !== null &&
             typeof typedObj === "object" ||
-            typeof typedObj === "function") && 
+            typeof typedObj === "function") &&
         typeof typedObj["AutoInsertLimitToQuery"] === "boolean"
     )
 }

diff --git a/web/src/stores/websocket.guard.ts b/web/src/stores/websocket.guard.ts
@@ -3,6 +3,7 @@
  * WARNING: Do not manually change this file.
  */
 import { Event, TagEvent, ConverterEvent, PcapStatsEvent, ConfigEvent } from "./websocket";
+import { isClientConfig } from "../apiClient.guard";
 
 export function isEvent(obj: unknown): obj is Event {
     const typedObj = obj as Event
@@ -94,10 +95,8 @@ export function isConfigEvent(obj: unknown): obj is ConfigEvent {
     return (
         (typedObj !== null &&
             typeof typedObj === "object" ||
-            typeof typedObj === "function") && 
-        (typedObj["Config"] !== null &&
-            typeof typedObj["Config"] === "object" ||
-            typeof typedObj["Config"] === "function") &&
-        typeof typedObj["Config"]["AutoInsertLimitToQuery"] === "boolean"
+            typeof typedObj === "function") &&
+        typedObj["Type"] === "configUpdated" &&
+        isClientConfig(typedObj["Config"]) as boolean
     )
-}
+}