@xh/hoist 68.0.0-SNAPSHOT.1726062354143 → 68.0.0-SNAPSHOT.1726067879775

package/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## 68.0.0-SNAPSHOT - unreleased
 
+### ⚙️ Technical
+
+* Updated Admin Console's Cluster tab to refresh more frequently.
+
 ## 67.0.0 - 2024-09-03
 
 ### 💥 Breaking Changes (upgrade difficulty: 🟢 LOW - Hoist Core update only)

package/admin/tabs/cluster/ClusterTabModel.ts

@@ -22,6 +22,8 @@ import {TabContainerModel} from '@xh/hoist/cmp/tab';
 import {HoistModel, LoadSpec, managed, PlainObject, XH} from '@xh/hoist/core';
 import {RecordActionSpec} from '@xh/hoist/data';
 import {Icon} from '@xh/hoist/icon';
+import {Timer} from '@xh/hoist/utils/async';
+import {SECONDS} from '@xh/hoist/utils/datetime';
 import {ReactNode} from 'react';
 
 export class ClusterTabModel extends HoistModel {
@@ -36,8 +38,9 @@ export class ClusterTabModel extends HoistModel {
         recordsRequired: 1
     };
 
-    @managed gridModel: GridModel = this.createGridModel();
-    @managed tabModel: TabContainerModel = this.createTabModel();
+    @managed readonly gridModel: GridModel = this.createGridModel();
+    @managed readonly tabModel: TabContainerModel = this.createTabModel();
+    @managed readonly timer: Timer;
 
     get instance(): PlainObject {
         return this.gridModel.selectedRecord?.data;
@@ -57,6 +60,7 @@ export class ClusterTabModel extends HoistModel {
             let data = await XH.fetchJson({url: 'clusterAdmin/allInstances', loadSpec});
             data = data.map(row => ({
                 ...row,
+                isLocal: row.name == XH.environmentService.serverInstance,
                 usedHeapMb: row.memory?.usedHeapMb,
                 usedPctMax: row.memory?.usedPctMax
             }));
@@ -64,6 +68,7 @@ export class ClusterTabModel extends HoistModel {
             gridModel.loadData(data);
             await gridModel.preSelectFirstAsync();
         } catch (e) {
+            gridModel.clear();
             XH.handleException(e);
         }
     }
@@ -71,6 +76,12 @@ export class ClusterTabModel extends HoistModel {
     constructor() {
         super();
 
+        this.timer = Timer.create({
+            runFn: this.autoRefreshAsync,
+            interval: 5 * SECONDS,
+            delay: true
+        });
+
         this.addReaction(
             {
                 track: () => this.instanceName,
@@ -80,7 +91,7 @@ export class ClusterTabModel extends HoistModel {
             },
             {
                 track: () => XH.environmentService.serverInstance,
-                run: () => this.gridModel.agApi.refreshCells({force: true})
+                run: this.refreshAsync
             }
         );
     }
@@ -91,6 +102,7 @@ export class ClusterTabModel extends HoistModel {
                 idSpec: 'name',
                 fields: [
                     {name: 'name', type: 'string'},
+                    {name: 'isLocal', type: 'bool'},
                     {name: 'isPrimary', type: 'bool'},
                     {name: 'isReady', type: 'bool'},
                     {name: 'wsConnections', type: 'int'},
@@ -178,7 +190,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.name === XH.environmentService.serverInstance) content.push(badge('local'));
+        if (instance.isLocal) content.push(badge('local'));
         return hbox(content);
     }
 

package/admin/tabs/monitor/MonitorTabModel.ts

@@ -18,7 +18,8 @@ export class MonitorTabModel extends HoistModel {
 
     @observable.ref results: MonitorResults[] = [];
     @observable lastRun: number = null;
-    @managed timer: Timer = null;
+
+    @managed readonly timer: Timer;
 
     @bindable @persist showInactive = false;
     @bindable showEditorDialog = false;
@@ -60,14 +61,14 @@ export class MonitorTabModel extends HoistModel {
         makeObservable(this);
 
         this.timer = Timer.create({
-            runFn: () => this.autoRefreshAsync(),
+            runFn: this.autoRefreshAsync,
             interval: 5 * SECONDS,
             delay: true
         });
 
         this.addReaction({
             track: () => this.showInactive,
-            run: () => this.refreshAsync()
+            run: this.refreshAsync
         });
     }
 

package/build/types/admin/tabs/cluster/ClusterTabModel.d.ts

@@ -2,14 +2,16 @@ import { GridModel } from '@xh/hoist/cmp/grid';
 import { TabContainerModel } from '@xh/hoist/cmp/tab';
 import { HoistModel, LoadSpec, PlainObject } from '@xh/hoist/core';
 import { RecordActionSpec } from '@xh/hoist/data';
+import { Timer } from '@xh/hoist/utils/async';
 import { ReactNode } from 'react';
 export declare class ClusterTabModel extends HoistModel {
     persistWith: {
         localStorageKey: string;
     };
     shutdownAction: RecordActionSpec;
-    gridModel: GridModel;
-    tabModel: TabContainerModel;
+    readonly gridModel: GridModel;
+    readonly tabModel: TabContainerModel;
+    readonly timer: Timer;
     get instance(): PlainObject;
     get instanceName(): string;
     get isMultiInstance(): boolean;

package/build/types/admin/tabs/monitor/MonitorTabModel.d.ts

@@ -7,7 +7,7 @@ export declare class MonitorTabModel extends HoistModel {
     };
     results: MonitorResults[];
     lastRun: number;
-    timer: Timer;
+    readonly timer: Timer;
     showInactive: boolean;
     showEditorDialog: boolean;
     get passed(): number;

package/package.json

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