@xh/hoist 68.0.0-SNAPSHOT.1726237236739 → 68.0.0-SNAPSHOT.1726258981470

package/admin/tabs/cluster/BaseInstanceModel.ts

@@ -9,8 +9,12 @@ import {HoistModel, LoadSpec, lookup, PlainObject, XH} from '@xh/hoist/core';
 import {fmtDateTimeSec, fmtJson} from '@xh/hoist/format';
 import {DAYS} from '@xh/hoist/utils/datetime';
 import {cloneDeep, forOwn, isArray, isNumber, isPlainObject} from 'lodash';
+import {createRef} from 'react';
+import {isDisplayed} from '@xh/hoist/utils/js';
 
 export class BaseInstanceModel extends HoistModel {
+    viewRef = createRef<HTMLElement>();
+
     @lookup(() => ClusterTabModel) parent: ClusterTabModel;
 
     get instanceName(): string {
@@ -24,20 +28,28 @@ export class BaseInstanceModel extends HoistModel {
     }
 
     handleLoadException(e: unknown, loadSpec: LoadSpec) {
-        const instanceNotFound = this.isInstanceNotFound(e);
+        const instanceNotFound = this.isInstanceNotFound(e),
+            connDown = this.parent.lastLoadException,
+            {isVisible} = this,
+            {isAutoRefresh} = loadSpec;
         XH.handleException(e, {
-            showAlert: !loadSpec.isAutoRefresh && !instanceNotFound,
-            logOnServer: !instanceNotFound
+            alertType: 'toast',
+            showAlert: !instanceNotFound && !connDown && isVisible,
+            logOnServer: !instanceNotFound && !connDown && isVisible && !isAutoRefresh
         });
     }
 
-    isInstanceNotFound(e: unknown): boolean {
-        return e['name'] == 'InstanceNotFoundException';
+    get isVisible() {
+        return isDisplayed(this.viewRef.current);
     }
 
     //-------------------
     // Implementation
     //-------------------
+    private isInstanceNotFound(e: unknown): boolean {
+        return e['name'] == 'InstanceNotFoundException';
+    }
+
     private processTimestamps(stats: PlainObject) {
         forOwn(stats, (v, k) => {
             // Convert numbers that look like recent timestamps to date values.

package/admin/tabs/cluster/ClusterTab.ts

@@ -10,14 +10,13 @@ import {creates, hoistCmp} from '@xh/hoist/core';
 import {mask} from '@xh/hoist/desktop/cmp/mask';
 import {panel} from '@xh/hoist/desktop/cmp/panel';
 import {tabSwitcher} from '@xh/hoist/desktop/cmp/tab';
-import {box, hspacer, placeholder, vframe} from '@xh/hoist/cmp/layout';
+import {box, div, hspacer, p, placeholder, vframe} from '@xh/hoist/cmp/layout';
 import {ClusterTabModel} from './ClusterTabModel';
 import {Icon} from '@xh/hoist/icon';
 
 export const clusterTab = hoistCmp.factory({
     model: creates(ClusterTabModel),
     render({model}) {
-        const {instance} = model;
         return vframe(
             panel({
                 modelConfig: {
@@ -29,19 +28,45 @@ export const clusterTab = hoistCmp.factory({
                 },
                 item: grid()
             }),
-            instance?.isReady
-                ? panel({
-                      compactHeader: true,
-                      tbar: [
-                          box({width: 150, item: model.formatInstance(instance)}),
-                          hspacer(25),
-                          tabSwitcher()
-                      ],
-                      flex: 1,
-                      item: tabContainer()
-                  })
-                : placeholder(Icon.server(), 'Select a running instance above.'),
-            mask({bind: model.loadModel})
+            detailPanel(),
+            failedConnectionMask()
         );
     }
 });
+
+export const detailPanel = hoistCmp.factory<ClusterTabModel>({
+    render({model}) {
+        const {instance, lastLoadException} = model;
+        if (!instance?.isReady) {
+            return placeholder({
+                items: [Icon.server(), 'Select a running instance above.'],
+                omit: lastLoadException
+            });
+        }
+
+        return panel({
+            compactHeader: true,
+            tbar: [
+                box({width: 150, item: model.formatInstance(instance)}),
+                hspacer(25),
+                tabSwitcher()
+            ],
+            flex: 1,
+            item: tabContainer()
+        });
+    }
+});
+
+export const failedConnectionMask = hoistCmp.factory<ClusterTabModel>({
+    render({model}) {
+        return mask({
+            message: div(
+                p('Attempting to connect to cluster.'),
+                p('Local instance may be unavailable, please wait.')
+            ),
+            isDisplayed: true,
+            spinner: true,
+            omit: !model.lastLoadException
+        });
+    }
+});

package/admin/tabs/cluster/ClusterTabModel.ts

@@ -18,10 +18,11 @@ import {badge} from '@xh/hoist/cmp/badge';
 import {GridModel, numberCol} from '@xh/hoist/cmp/grid';
 import {hbox} from '@xh/hoist/cmp/layout';
 import {getRelativeTimestamp} from '@xh/hoist/cmp/relativetimestamp';
-import {TabContainerModel} from '@xh/hoist/cmp/tab';
-import {HoistModel, LoadSpec, managed, PlainObject, XH} from '@xh/hoist/core';
+import {TabContainerModel, TabModel} from '@xh/hoist/cmp/tab';
+import {HoistModel, LoadSpec, lookup, managed, PlainObject, XH} from '@xh/hoist/core';
 import {RecordActionSpec} from '@xh/hoist/data';
 import {Icon} from '@xh/hoist/icon';
+import {makeObservable} from '@xh/hoist/mobx';
 import {Timer} from '@xh/hoist/utils/async';
 import {SECONDS} from '@xh/hoist/utils/datetime';
 import {ReactNode} from 'react';
@@ -29,6 +30,8 @@ import {ReactNode} from 'react';
 export class ClusterTabModel extends HoistModel {
     override persistWith = {localStorageKey: 'xhAdminClusterTabState'};
 
+    @lookup(TabModel) private tabModel: TabModel;
+
     shutdownAction: RecordActionSpec = {
         icon: Icon.skull(),
         text: 'Shutdown Instance',
@@ -39,7 +42,7 @@ export class ClusterTabModel extends HoistModel {
     };
 
     @managed readonly gridModel: GridModel = this.createGridModel();
-    @managed readonly tabModel: TabContainerModel = this.createTabModel();
+    @managed readonly tabContainerModel: TabContainerModel = this.createTabContainerModel();
     @managed readonly timer: Timer;
 
     get instance(): PlainObject {
@@ -56,28 +59,25 @@ export class ClusterTabModel extends HoistModel {
 
     override async doLoadAsync(loadSpec: LoadSpec) {
         const {gridModel} = this;
-        try {
-            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
-            }));
-
-            gridModel.loadData(data);
-            await gridModel.preSelectFirstAsync();
-        } catch (e) {
-            gridModel.clear();
-            XH.handleException(e);
-        }
+        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
+        }));
+        gridModel.loadData(data);
+        await gridModel.preSelectFirstAsync();
     }
 
     constructor() {
         super();
+        makeObservable(this);
 
         this.timer = Timer.create({
-            runFn: this.autoRefreshAsync,
+            runFn: () => {
+                if (this.tabModel?.isActive) this.autoRefreshAsync();
+            },
             interval: 5 * SECONDS,
             delay: true
         });
@@ -86,7 +86,7 @@ export class ClusterTabModel extends HoistModel {
             {
                 track: () => this.instanceName,
                 run: instName => {
-                    if (instName) this.tabModel.refreshContextModel.refreshAsync();
+                    if (instName) this.tabContainerModel.refreshContextModel.refreshAsync();
                 }
             },
             {
@@ -161,7 +161,7 @@ export class ClusterTabModel extends HoistModel {
         });
     }
 
-    createTabModel() {
+    createTabContainerModel() {
         return new TabContainerModel({
             route: 'default.cluster',
             switcher: false,

package/admin/tabs/cluster/connpool/ConnPoolMonitorPanel.ts

@@ -60,7 +60,8 @@ export const connPoolMonitorPanel = hoistCmp.factory({
                 ),
                 poolConfigPanel()
             ),
-            mask: 'onLoad'
+            mask: 'onLoad',
+            ref: model.viewRef
         });
     }
 });

package/admin/tabs/cluster/environment/ServerEnvPanel.ts

@@ -28,7 +28,8 @@ export const serverEnvPanel = hoistCmp.factory({
                 exportButton()
             ],
             item: lastLoadException ? errorMessage({error: lastLoadException}) : grid(),
-            mask: 'onLoad'
+            mask: 'onLoad',
+            ref: model.viewRef
         });
     }
 });

package/admin/tabs/cluster/hzobject/HzObjectPanel.ts

@@ -40,7 +40,8 @@ export const hzObjectPanel = hoistCmp.factory({
                 exportButton()
             ],
             item: hframe(grid(), detailsPanel()),
-            mask: 'onLoad'
+            mask: 'onLoad',
+            ref: model.viewRef
         });
     }
 });

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

@@ -11,7 +11,7 @@ import {Icon} from '@xh/hoist/icon';
 import {bindable, makeObservable} from '@xh/hoist/mobx';
 import {Timer} from '@xh/hoist/utils/async';
 import {olderThan, ONE_SECOND, SECONDS} from '@xh/hoist/utils/datetime';
-import {debounced, isDisplayed} from '@xh/hoist/utils/js';
+import {debounced} from '@xh/hoist/utils/js';
 import {escapeRegExp, maxBy} from 'lodash';
 import {LogViewerModel} from './LogViewerModel';
 
@@ -105,26 +105,21 @@ export class LogDisplayModel extends HoistModel {
             return;
         }
 
-        try {
-            const response = await XH.fetchJson({
-                url: 'logViewerAdmin/getFile',
-                params: {
-                    filename: parent.file,
-                    startLine: this.startLine,
-                    maxLines: this.maxLines,
-                    pattern: this.regexOption ? this.pattern : escapeRegExp(this.pattern),
-                    caseSensitive: this.caseSensitive,
-                    instance: parent.instanceName
-                },
-                loadSpec
-            });
-            if (!response.success) throw XH.exception(response.exception);
-            this.updateGridData(response.content);
-        } catch (e) {
-            // Show errors inline in the viewer vs. a modal alert or catchDefault().
-            const msg = e.message || 'An unknown error occurred';
-            this.updateGridData([[0, `Error: ${msg}`]]);
-        }
+        const response = await XH.fetchJson({
+            url: 'logViewerAdmin/getFile',
+            params: {
+                filename: parent.file,
+                startLine: this.startLine,
+                maxLines: this.maxLines,
+                pattern: this.regexOption ? this.pattern : escapeRegExp(this.pattern),
+                caseSensitive: this.caseSensitive,
+                instance: parent.instanceName
+            },
+            loadSpec
+        });
+        // Backward compatibility for Hoist Core < v22, which returned exception in-band
+        if (!response.success) throw XH.exception(response.exception);
+        this.updateGridData(response.content);
     }
 
     async scrollToTail() {
@@ -209,14 +204,13 @@ export class LogDisplayModel extends HoistModel {
     }
 
     private autoRefreshLines() {
-        const {tailActive, parent} = this,
-            {viewRef} = parent;
+        const {tailActive} = this;
 
         if (
             tailActive &&
             olderThan(this.lastLoadCompleted, 5 * SECONDS) &&
             !this.loadModel.isPending &&
-            isDisplayed(viewRef.current)
+            this.parent.isVisible
         ) {
             this.loadLog();
         }

package/admin/tabs/cluster/logs/LogViewer.ts

@@ -29,7 +29,6 @@ export const logViewer = hoistCmp.factory({
 
         return hframe({
             className,
-            ref: model.viewRef,
             items: [
                 panel({
                     collapsedTitle: 'Log Files',
@@ -57,7 +56,8 @@ export const logViewer = hoistCmp.factory({
                 }),
                 logDisplay(),
                 model.showLogLevelDialog ? logLevelDialog() : null
-            ]
+            ],
+            ref: model.viewRef
         });
     }
 });

package/admin/tabs/cluster/logs/LogViewerModel.ts

@@ -14,7 +14,6 @@ import {compactDateRenderer, fmtNumber} from '@xh/hoist/format';
 import {Icon} from '@xh/hoist/icon';
 import {bindable, makeObservable, observable} from '@xh/hoist/mobx';
 import download from 'downloadjs';
-import {createRef} from 'react';
 import {LogDisplayModel} from './LogDisplayModel';
 
 /**
@@ -23,8 +22,6 @@ import {LogDisplayModel} from './LogDisplayModel';
 export class LogViewerModel extends BaseInstanceModel {
     @observable file: string = null;
 
-    viewRef = createRef<HTMLElement>();
-
     @managed
     logDisplayModel = new LogDisplayModel(this);
 

package/admin/tabs/cluster/memory/MemoryMonitorPanel.ts

@@ -69,7 +69,8 @@ export const memoryMonitorPanel = hoistCmp.factory({
                     item: chart()
                 })
             ],
-            mask: 'onLoad'
+            mask: 'onLoad',
+            ref: model.viewRef
         });
     }
 });

package/admin/tabs/cluster/services/ServicePanel.ts

@@ -41,7 +41,8 @@ export const servicePanel = hoistCmp.factory({
                 }),
                 detailsPanel()
             ),
-            mask: 'onLoad'
+            mask: 'onLoad',
+            ref: model.viewRef
         });
     }
 });

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

@@ -15,16 +15,12 @@ import {Icon} from '@xh/hoist/icon';
 import {makeObservable, observable, runInAction} from '@xh/hoist/mobx';
 import {Timer} from '@xh/hoist/utils/async';
 import {SECONDS} from '@xh/hoist/utils/datetime';
-import {isDisplayed} from '@xh/hoist/utils/js';
 import {isEmpty} from 'lodash';
-import {createRef} from 'react';
 import * as WSCol from './WebSocketColumns';
 import {RecordActionSpec} from '@xh/hoist/data';
 import {AppModel} from '@xh/hoist/admin/AppModel';
 
 export class WebSocketModel extends BaseInstanceModel {
-    viewRef = createRef<HTMLElement>();
-
     @observable
     lastRefresh: number;
 
@@ -87,9 +83,7 @@ export class WebSocketModel extends BaseInstanceModel {
 
         this._timer = Timer.create({
             runFn: () => {
-                if (isDisplayed(this.viewRef.current)) {
-                    this.autoRefreshAsync();
-                }
+                if (this.isVisible) this.autoRefreshAsync();
             },
             interval: 5 * SECONDS,
             delay: true

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

@@ -1,10 +1,13 @@
+/// <reference types="react" />
 import { ClusterTabModel } from '@xh/hoist/admin/tabs/cluster/ClusterTabModel';
 import { HoistModel, LoadSpec, PlainObject } from '@xh/hoist/core';
 export declare class BaseInstanceModel extends HoistModel {
+    viewRef: import("react").RefObject<HTMLElement>;
     parent: ClusterTabModel;
     get instanceName(): string;
     fmtStats(stats: PlainObject): string;
     handleLoadException(e: unknown, loadSpec: LoadSpec): void;
-    isInstanceNotFound(e: unknown): boolean;
+    get isVisible(): boolean;
+    private isInstanceNotFound;
     private processTimestamps;
 }

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

@@ -1,2 +1,4 @@
 import { ClusterTabModel } from './ClusterTabModel';
 export declare const clusterTab: import("@xh/hoist/core").ElementFactory<import("@xh/hoist/core").DefaultHoistProps<ClusterTabModel>>;
+export declare const detailPanel: import("@xh/hoist/core").ElementFactory<import("@xh/hoist/core").DefaultHoistProps<ClusterTabModel>>;
+export declare const failedConnectionMask: import("@xh/hoist/core").ElementFactory<import("@xh/hoist/core").DefaultHoistProps<ClusterTabModel>>;

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

@@ -8,9 +8,10 @@ export declare class ClusterTabModel extends HoistModel {
     persistWith: {
         localStorageKey: string;
     };
+    private tabModel;
     shutdownAction: RecordActionSpec;
     readonly gridModel: GridModel;
-    readonly tabModel: TabContainerModel;
+    readonly tabContainerModel: TabContainerModel;
     readonly timer: Timer;
     get instance(): PlainObject;
     get instanceName(): string;
@@ -18,7 +19,7 @@ export declare class ClusterTabModel extends HoistModel {
     doLoadAsync(loadSpec: LoadSpec): Promise<void>;
     constructor();
     private createGridModel;
-    createTabModel(): TabContainerModel;
+    createTabContainerModel(): TabContainerModel;
     formatInstance(instance: PlainObject): ReactNode;
     shutdownInstanceAsync(instance: PlainObject): Promise<void>;
 }

package/build/types/admin/tabs/cluster/logs/LogViewerModel.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="react" />
 import { BaseInstanceModel } from '@xh/hoist/admin/tabs/cluster/BaseInstanceModel';
 import { GridModel } from '@xh/hoist/cmp/grid';
 import { LoadSpec } from '@xh/hoist/core';
@@ -9,7 +8,6 @@ import { LogDisplayModel } from './LogDisplayModel';
  */
 export declare class LogViewerModel extends BaseInstanceModel {
     file: string;
-    viewRef: import("react").RefObject<HTMLElement>;
     logDisplayModel: LogDisplayModel;
     filesGridModel: GridModel;
     instanceOnly: boolean;

package/build/types/admin/tabs/cluster/websocket/WebSocketModel.d.ts

@@ -1,10 +1,8 @@
-/// <reference types="react" />
 import { BaseInstanceModel } from '@xh/hoist/admin/tabs/cluster/BaseInstanceModel';
 import { GridModel } from '@xh/hoist/cmp/grid';
 import { LoadSpec } from '@xh/hoist/core';
 import { RecordActionSpec } from '@xh/hoist/data';
 export declare class WebSocketModel extends BaseInstanceModel {
-    viewRef: import("react").RefObject<HTMLElement>;
     lastRefresh: number;
     gridModel: GridModel;
     private _timer;

package/core/exception/ExceptionHandler.ts

@@ -127,7 +127,7 @@ export class ExceptionHandler {
                     ),
                     actionButtonProps: {
                         icon: Icon.search(),
-                        onClick: () => exceptionDialogModel.show(e, opts)
+                        onClick: () => exceptionDialogModel.showDetails(e, opts)
                     },
                     intent: showAsError ? 'danger' : 'primary',
                     ...ExceptionHandler.TOAST_PROPS

package/package.json

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