@xh/hoist 72.5.0 → 72.5.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Changelog
 
+## v72.5.1 - 2025-04-15
+
+### 🐞 Bug Fixes
+
+* Allow the display of very long log lines in Admin log viewer.
+
 ## v72.5.0 - 2025-04-14
 
 ### 🎁 New Features

package/admin/tabs/cluster/instances/logs/LogDisplayModel.ts

@@ -138,18 +138,23 @@ export class LogDisplayModel extends HoistModel {
             sizingMode: 'tiny',
             emptyText: 'No log entries found...',
             sortBy: 'rowNum|asc',
+            autosizeOptions: {mode: 'disabled'},
             store: {
                 idSpec: 'rowNum'
             },
             columns: [
                 {
                     field: {name: 'rowNum', type: 'number'},
-                    width: 4,
+                    width: 60,
+                    pinned: true,
                     cellClass: 'xh-log-display__row-number'
                 },
                 {
                     field: 'rowContent',
-                    width: 1200,
+                    // Hard-code to a very wide value - allows us to avoid autosize overhead while
+                    // ensuring that all but crazy-long lines are readable. We trust Admins can
+                    // ignore excess horizontal scrolling for this component.
+                    width: 5000,
                     autosizable: false,
                     cellClass: 'xh-log-display__row-content'
                 }
@@ -179,20 +184,11 @@ export class LogDisplayModel extends HoistModel {
     }
 
     private updateGridData(data) {
-        const {tailActive, gridModel} = this;
-        let maxRowLength = 200;
-        const gridData = data.map(row => {
-            if (row[1].length > maxRowLength) {
-                maxRowLength = row[1].length;
-            }
-            return {
+        const {tailActive, gridModel} = this,
+            gridData = data.map(row => ({
                 rowNum: row[0],
                 rowContent: row[1]
-            };
-        });
-
-        // Estimate the length of the row in pixels based on (character count) * (font size)
-        gridModel.setColumnState([{colId: 'rowContent', width: maxRowLength * 6}]);
+            }));
 
         gridModel.loadData(gridData);
 

package/build/types/svc/WebSocketService.d.ts

@@ -83,6 +83,7 @@ export declare class WebSocketService extends HoistService {
     private buildWebSocketUrl;
     private maybeLogMessage;
     private noteTelemetryEvent;
+    private ensureEnabled;
 }
 /**
  * Wrapper class to encapsulate and manage a subscription to messages for a given topic + handler.

package/package.json

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

package/svc/WebSocketService.ts

@@ -61,7 +61,7 @@ export class WebSocketService extends HoistService {
     /** Set to true to log all sent/received messages - very chatty. */
     logMessages: boolean = false;
 
-    telemetry: WebSocketTelemetry = null;
+    telemetry: WebSocketTelemetry = {channelKey: null, subscriptionCount: 0, events: {}};
 
     private _timer: Timer;
     private _socket: WebSocket;
@@ -83,7 +83,6 @@ export class WebSocketService extends HoistService {
             this.enabled = false;
             return;
         }
-        this.telemetry = {channelKey: null, subscriptionCount: 0, events: {}};
 
         this.connect();
 
@@ -109,6 +108,7 @@ export class WebSocketService extends HoistService {
      *      dispose of their subs on destroy.
      */
     subscribe(topic: string, fn: (msg: WebSocketMessage) => any): WebSocketSubscription {
+        this.ensureEnabled();
         const subs = this.getSubsForTopic(topic),
             existingSub = find(subs, {fn});
 
@@ -126,6 +126,7 @@ export class WebSocketService extends HoistService {
      * @param subscription - WebSocketSubscription returned when the subscription was established.
      */
     unsubscribe(subscription: WebSocketSubscription) {
+        this.ensureEnabled();
         const subs = this.getSubsForTopic(subscription.topic);
         pull(subs, subscription);
         this.telemetry.subscriptionCount--;
@@ -135,6 +136,7 @@ export class WebSocketService extends HoistService {
      * Send a message back to the server via the connected websocket.
      */
     sendMessage(message: WebSocketMessage) {
+        this.ensureEnabled();
         this.updateConnectedStatus();
         throwIf(!this.connected, 'Unable to send message via websocket - not connected.');
 
@@ -320,6 +322,10 @@ export class WebSocketService extends HoistService {
         evtTel.count++;
         evtTel.lastTime = Date.now();
     }
+
+    private ensureEnabled() {
+        throwIf(!this.enabled, 'Operation not available.  WebSocketService is disabled.');
+    }
 }
 
 /**