@xh/hoist 67.0.0-SNAPSHOT.1725050936701 → 67.0.0-SNAPSHOT.1725151485260

package/CHANGELOG.md

@@ -37,6 +37,8 @@
 
 * Fixed Admin Console bug where a role with a dot in its name could not be deleted.
 * Fixed inline `SelectEditor` to ensure new value is flushed before grid editing stops.
+* `WebSocketService` now attempts to establish a new connection when app's server instance changes.
+
 
 ### ✨ Styles
 

package/admin/tabs/cluster/ClusterTabModel.ts

@@ -71,12 +71,18 @@ export class ClusterTabModel extends HoistModel {
     constructor() {
         super();
 
-        this.addReaction({
-            track: () => this.instanceName,
-            run: instName => {
-                if (instName) this.tabModel.refreshContextModel.refreshAsync();
+        this.addReaction(
+            {
+                track: () => this.instanceName,
+                run: instName => {
+                    if (instName) this.tabModel.refreshContextModel.refreshAsync();
+                }
+            },
+            {
+                track: () => XH.environmentService.serverInstance,
+                run: () => this.gridModel.agApi.refreshCells({force: true})
             }
-        });
+        );
     }
 
     private createGridModel() {
@@ -86,7 +92,6 @@ export class ClusterTabModel extends HoistModel {
                 fields: [
                     {name: 'name', type: 'string'},
                     {name: 'isPrimary', type: 'bool'},
-                    {name: 'isLocal', type: 'bool'},
                     {name: 'isReady', type: 'bool'},
                     {name: 'wsConnections', type: 'int'},
                     {name: 'startupTime', type: 'date'},
@@ -173,7 +178,7 @@ export class ClusterTabModel extends HoistModel {
     formatInstance(instance: PlainObject): ReactNode {
         const content = [instance.name];
         if (instance.isPrimary) content.push(badge({item: 'primary', intent: 'primary'}));
-        if (instance.isLocal) content.push(badge('local'));
+        if (instance.name === XH.environmentService.serverInstance) content.push(badge('local'));
         return hbox(content);
     }
 

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

@@ -64,6 +64,7 @@ export declare class WebSocketService extends HoistService {
     connect(): void;
     disconnect(): void;
     heartbeatOrReconnect(): void;
+    private onServerInstanceChange;
     shutdown(): void;
     onOpen(ev: any): void;
     onClose(ev: any): void;

package/data/Field.ts

@@ -173,5 +173,6 @@ export type FieldType = (typeof FieldType)[keyof typeof FieldType];
  * @returns fieldName transformed into user-facing / longer name for display.
  */
 export function genDisplayName(fieldName: string): string {
-    return fieldName === 'id' ? 'ID' : startCase(fieldName);
+    // Handle common cases of "id" -> "ID" and "foo_id" -> "Foo ID" (vs "Foo Id")
+    return startCase(fieldName).replace(/(^| )Id\b/g, '$1ID');
 }

package/package.json

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

package/svc/WebSocketService.ts

@@ -71,7 +71,8 @@ export class WebSocketService extends HoistService {
 
     override async initAsync() {
         if (!this.enabled) return;
-        if (XH.environmentService.get('webSocketsEnabled') === false) {
+        const {environmentService} = XH;
+        if (environmentService.get('webSocketsEnabled') === false) {
             this.logError(
                 `WebSockets enabled on this client app but disabled on server. Adjust your server-side config.`
             );
@@ -81,6 +82,11 @@ export class WebSocketService extends HoistService {
 
         this.connect();
 
+        this.addReaction({
+            track: () => environmentService.serverInstance,
+            run: () => this.onServerInstanceChange()
+        });
+
         this._timer = Timer.create({
             runFn: () => this.heartbeatOrReconnect(),
             interval: 10 * SECONDS,
@@ -175,6 +181,12 @@ export class WebSocketService extends HoistService {
         }
     }
 
+    private onServerInstanceChange() {
+        this.logWarn('Server instance changed - attempting to connect to new instance.');
+        this.disconnect();
+        this.connect();
+    }
+
     shutdown() {
         if (this._timer) this._timer.cancel();
         this.disconnect();