@xh/hoist 73.0.0-SNAPSHOT.1742503059030 → 73.0.0-SNAPSHOT.1743106945210

package/CHANGELOG.md

@@ -2,6 +2,8 @@
 
 ## v73.0.0-SNAPSHOT - unreleased
 
+* Support for reporting Client Version in Admin WebSockets tab.
+
 ## v72.2.0 - 2025-03-13
 
 ### 🎁 New Features

package/admin/tabs/cluster/instances/websocket/WebSocketColumns.ts

@@ -72,3 +72,12 @@ export const lastReceivedTime: ColumnSpec = {
     ...Col.compactDate,
     width: 140
 };
+
+export const clientAppVersion: ColumnSpec = {
+    field: {
+        name: 'clientAppVersion',
+        type: 'string',
+        displayName: 'Client Version'
+    },
+    width: 120
+};

package/admin/tabs/cluster/instances/websocket/WebSocketModel.ts

@@ -77,7 +77,8 @@ export class WebSocketModel extends BaseInstanceModel {
                 WSCol.sentMessageCount,
                 WSCol.lastSentTime,
                 WSCol.receivedMessageCount,
-                WSCol.lastReceivedTime
+                WSCol.lastReceivedTime,
+                WSCol.clientAppVersion
             ]
         });
 

package/build/types/admin/tabs/cluster/instances/websocket/WebSocketColumns.d.ts

@@ -6,3 +6,4 @@ export declare const sentMessageCount: ColumnSpec;
 export declare const lastSentTime: ColumnSpec;
 export declare const receivedMessageCount: ColumnSpec;
 export declare const lastReceivedTime: ColumnSpec;
+export declare const clientAppVersion: ColumnSpec;

package/desktop/cmp/grid/editors/BooleanEditor.ts

@@ -49,11 +49,23 @@ export const [BooleanEditor, booleanEditor] = hoistCmp.withFactory<BooleanEditor
     }
 });
 
-function useInstantEditor({onValueChange, initialValue, stopEditing}: CustomCellEditorProps, ref) {
+function useInstantEditor(
+    {onValueChange, initialValue, stopEditing, eventKey, eGridCell}: CustomCellEditorProps,
+    ref
+) {
+    // Don't toggle if the user has tabbed into the editor. See https://github.com/xh/hoist-react/issues/3943.
+    // Fortunately, `eventKey` is null for tab, so we can use that to accept other keyboard events.
+    // Unfortunately, it is also null for mouse events, so we check if the grid cell is currently
+    // underneath the mouse position via `:hover` selector.
     useEffect(() => {
-        onValueChange(!initialValue);
+        const els = document.querySelectorAll(':hover'),
+            topEl = els[els.length - 1];
+
+        if (eventKey || topEl === eGridCell) {
+            onValueChange(!initialValue);
+        }
         stopEditing();
-    }, [stopEditing, initialValue, onValueChange]);
+    }, [stopEditing, initialValue, onValueChange, eventKey, eGridCell]);
 
     return null;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xh/hoist",
-  "version": "73.0.0-SNAPSHOT.1742503059030",
+  "version": "73.0.0-SNAPSHOT.1743106945210",
   "description": "Hoist add-on for building and deploying React Applications.",
   "repository": "github:xh/hoist-react",
   "homepage": "https://xh.io",

package/svc/WebSocketService.ts

@@ -282,8 +282,7 @@ export class WebSocketService extends HoistService {
 
     buildWebSocketUrl() {
         const protocol = window.location.protocol == 'https:' ? 'wss:' : 'ws:',
-            endpoint = 'xhWebSocket';
-
+            endpoint = 'xhWebSocket?clientAppVersion=' + XH.appVersion;
         return XH.isDevelopmentMode
             ? `${protocol}//${XH.baseUrl.split('//')[1]}${endpoint}`
             : `${protocol}//${window.location.host}${XH.baseUrl}${endpoint}`;