@xh/hoist 79.0.0-SNAPSHOT.1766104125611 → 79.0.0-SNAPSHOT.1766166832103

package/CHANGELOG.md

@@ -12,6 +12,10 @@
 
 ### 💥 Breaking Changes
 
+* Renamed `LoadSupport.loadModel` to `LoadSupport.loadObserver` for clarity. This property is a
+  `TaskObserver` instance, not a `HoistModel`. The getter methods `HoistModel.loadModel` and
+  `HoistService.loadModel` remain as aliases but are now deprecated and scheduled for removal in
+  v82. Applications should update their code to use `loadObserver` instead of `loadModel`.
 * Renamed `GridModel.applyColumnStateChanges()` to `updateColumnState()` for clarity and better
   symmetry with `setColumnState()`. The prior method remains as an alias but is now deprecated and
   scheduled for removal in v82.

package/admin/differ/DifferModel.ts

@@ -357,7 +357,7 @@ export class DifferModel extends HoistModel {
                 this.parentModel.gridModel.loadAsync();
                 this.detailModel.close();
             })
-            .linkTo(this.loadModel)
+            .linkTo(this.loadObserver)
             .catchDefault();
     }
 

package/admin/tabs/clients/activity/ClientDetailPanel.ts

@@ -54,7 +54,7 @@ const clientDetail = hoistCmp.factory<ClientDetailModel>(({model}) => {
             panel({
                 item: activityDetailView(),
                 mask: mask({
-                    bind: model.loadModel,
+                    bind: model.loadObserver,
                     spinner: true,
                     message: 'Loading activity...'
                 })

package/admin/tabs/cluster/instances/InstancesTabModel.ts

@@ -229,7 +229,7 @@ export class InstancesTabModel extends HoistModel {
             params: {instance: instance.name}
         })
             .finally(() => this.loadAsync())
-            .linkTo({observer: this.loadModel, message: 'Attempting instance shutdown'})
+            .linkTo({observer: this.loadObserver, message: 'Attempting instance shutdown'})
             .catchDefault();
     }
 

package/admin/tabs/cluster/instances/connpool/ConnPoolMonitorModel.ts

@@ -140,7 +140,7 @@ export class ConnPoolMonitorModel extends BaseInstanceModel {
             await XH.fetchJson({
                 url: 'connectionPoolMonitorAdmin/takeSnapshot',
                 params: {instance: this.instanceName}
-            }).linkTo(this.loadModel);
+            }).linkTo(this.loadObserver);
             await this.refreshAsync();
             XH.successToast('Updated snapshot loaded.');
         } catch (e) {
@@ -153,7 +153,7 @@ export class ConnPoolMonitorModel extends BaseInstanceModel {
             await XH.fetchJson({
                 url: 'connectionPoolMonitorAdmin/resetStats',
                 params: {instance: this.instanceName}
-            }).linkTo(this.loadModel);
+            }).linkTo(this.loadObserver);
             await this.refreshAsync();
             XH.successToast('Connection pool stats reset.');
         } catch (e) {

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

@@ -36,7 +36,7 @@ export const logDisplay = hoistCmp.factory({
             model: model.panelModel,
             loadingIndicator: loadingIndicator({
                 message: 'Loading log contents...',
-                bind: model.loadModel
+                bind: model.loadObserver
             })
         });
     }

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

@@ -203,7 +203,7 @@ export class LogDisplayModel extends HoistModel {
         if (
             tailActive &&
             olderThan(this.lastLoadCompleted, 5 * SECONDS) &&
-            !this.loadModel.isPending &&
+            !this.loadObserver.isPending &&
             this.parent.isVisible
         ) {
             this.loadLog();

package/admin/tabs/cluster/instances/memory/MemoryMonitorModel.ts

@@ -61,7 +61,7 @@ export class MemoryMonitorModel extends BaseInstanceModel {
             await XH.fetchJson({
                 url: 'memoryMonitorAdmin/takeSnapshot',
                 params: {instance: this.instanceName}
-            }).linkTo(this.loadModel);
+            }).linkTo(this.loadObserver);
             await this.loadAsync();
             XH.successToast('Updated snapshot loaded');
         } catch (e) {
@@ -74,7 +74,7 @@ export class MemoryMonitorModel extends BaseInstanceModel {
             await XH.fetchJson({
                 url: 'memoryMonitorAdmin/requestGc',
                 params: {instance: this.instanceName}
-            }).linkTo(this.loadModel);
+            }).linkTo(this.loadObserver);
             await this.loadAsync();
             XH.successToast('GC run complete');
         } catch (e) {
@@ -101,7 +101,7 @@ export class MemoryMonitorModel extends BaseInstanceModel {
                     instance: this.instanceName,
                     filename
                 }
-            }).linkTo(this.loadModel);
+            }).linkTo(this.loadObserver);
             await this.loadAsync();
             XH.successToast('Heap dumped successfully to ' + filename);
         } catch (e) {

package/admin/tabs/cluster/objects/ClusterObjectsModel.ts

@@ -149,7 +149,7 @@ export class ClusterObjectsModel extends HoistModel {
                 body: {
                     names: cacheRecords.map(it => it.id)
                 }
-            }).linkTo(this.loadModel);
+            }).linkTo(this.loadObserver);
 
             await this.refreshAsync();
             XH.successToast(`${pluralize('Hibernate Cache', count, true)} cleared.`);
@@ -179,7 +179,7 @@ export class ClusterObjectsModel extends HoistModel {
         try {
             await XH.fetchJson({
                 url: 'clusterObjectsAdmin/clearAllHibernateCaches'
-            }).linkTo(this.loadModel);
+            }).linkTo(this.loadObserver);
 
             await this.refreshAsync();
             XH.successToast('All Hibernate Caches cleared.');

package/admin/tabs/general/alertBanner/AlertBannerModel.ts

@@ -106,7 +106,7 @@ export class AlertBannerModel extends HoistModel {
     }
 
     async saveAsync() {
-        return this.saveInternalAsync().linkTo(this.loadModel).catchDefault();
+        return this.saveInternalAsync().linkTo(this.loadObserver).catchDefault();
     }
 
     resetForm() {

package/admin/tabs/userData/roles/RoleModel.ts

@@ -197,7 +197,7 @@ export class RoleModel extends HoistModel {
             actionFn: ({record}) =>
                 this.deleteAsync(record.data as HoistRole)
                     .catchDefault()
-                    .linkTo(this.loadModel),
+                    .linkTo(this.loadObserver),
             recordsRequired: 1
         };
     }

package/build/types/core/HoistService.d.ts

@@ -1,4 +1,4 @@
-import { HoistBase, LoadSupport, LoadSpec, Loadable, PlainObject } from './';
+import { HoistBase, LoadSupport, LoadSpec, Loadable, PlainObject, TaskObserver } from './';
 /**
  * Core superclass for Services in Hoist. Services are special classes used in both Hoist and
  * application code as centralized points for managing app-wide state and loading / processing
@@ -42,7 +42,8 @@ export declare class HoistService extends HoistBase implements Loadable {
      * `LoadSupport` will automatically be created and installed to support the extensions below.
      */
     loadSupport: LoadSupport;
-    get loadModel(): import("./TaskObserver").TaskObserver;
+    get loadObserver(): TaskObserver;
+    get loadModel(): TaskObserver;
     get lastLoadRequested(): Date;
     get lastLoadCompleted(): Date;
     get lastLoadException(): any;

package/build/types/core/load/LoadSupport.d.ts

@@ -13,7 +13,7 @@ import { LoadSpec, Loadable } from './';
 export declare class LoadSupport extends HoistBase implements Loadable {
     lastRequested: LoadSpec;
     lastSucceeded: LoadSpec;
-    loadModel: TaskObserver;
+    loadObserver: TaskObserver;
     lastLoadRequested: Date;
     lastLoadCompleted: Date;
     lastLoadException: any;

package/build/types/core/load/Loadable.d.ts

@@ -6,9 +6,9 @@ import { LoadSpec } from './';
 export interface Loadable {
     /**
      * For tracking the loading of this object.
-     * Note that this model will *not* track auto-refreshes.
+     * Note that this object will *not* track auto-refreshes.
      */
-    loadModel: TaskObserver;
+    loadObserver: TaskObserver;
     /** Date when last load was initiated. */
     lastLoadRequested: Date;
     /** Date when last load was completed. */

package/build/types/core/model/HoistModel.d.ts

@@ -1,4 +1,4 @@
-import { DefaultHoistProps, HoistBase, LoadSpecConfig, PlainObject } from '../';
+import { DefaultHoistProps, HoistBase, LoadSpecConfig, PlainObject, TaskObserver } from '../';
 import { Loadable, LoadSpec, LoadSupport } from '../load';
 import { ModelSelector } from './';
 import { Class } from 'type-fest';
@@ -63,7 +63,8 @@ export declare abstract class HoistModel extends HoistBase implements Loadable {
      * See the class-level comments above for additional details.
      */
     loadSupport: LoadSupport;
-    get loadModel(): import("../TaskObserver").TaskObserver;
+    get loadObserver(): TaskObserver;
+    get loadModel(): TaskObserver;
     get lastLoadRequested(): Date;
     get lastLoadCompleted(): Date;
     get lastLoadException(): any;

package/build/types/data/UrlStore.d.ts

@@ -1,4 +1,4 @@
-import { LoadSupport, LoadSpec, Loadable, PlainObject } from '@xh/hoist/core';
+import { LoadSupport, LoadSpec, Loadable, PlainObject, TaskObserver } from '@xh/hoist/core';
 import { Store, StoreConfig } from './Store';
 export interface UrlStoreConfig extends StoreConfig {
     /** URL from which to load data. */
@@ -14,7 +14,8 @@ export declare class UrlStore extends Store implements Loadable {
     dataRoot: string;
     loadSupport: LoadSupport;
     constructor({ url, dataRoot, ...storeConfig }: UrlStoreConfig);
-    get loadModel(): import("@xh/hoist/core").TaskObserver;
+    get loadObserver(): TaskObserver;
+    get loadModel(): TaskObserver;
     get lastLoadRequested(): Date;
     get lastLoadCompleted(): Date;
     get lastLoadException(): any;

package/build/types/desktop/cmp/rest/impl/RestFormModel.d.ts

@@ -1,5 +1,5 @@
 import { FormModel } from '@xh/hoist/cmp/form';
-import { HoistModel, PlainObject } from '@xh/hoist/core';
+import { HoistModel, PlainObject, TaskObserver } from '@xh/hoist/core';
 import { RestGridEditor, RestGridModel } from '@xh/hoist/desktop/cmp/rest';
 import { RestField } from '../data/RestField';
 /**
@@ -24,7 +24,8 @@ export declare class RestFormModel extends HoistModel {
     get editors(): RestGridEditor[];
     get gridModel(): import("../../../../cmp/grid").GridModel;
     get store(): import("@xh/hoist/desktop/cmp/rest").RestStore;
-    get loadModel(): import("@xh/hoist/core").TaskObserver;
+    get loadObserver(): TaskObserver;
+    get loadModel(): TaskObserver;
     constructor(parent: RestGridModel);
     getStoreField(field: string): RestField;
     getFormFieldModel(field: string): import("@xh/hoist/cmp/form").BaseFieldModel;

package/core/HoistService.ts

@@ -4,7 +4,8 @@
  *
  * Copyright © 2025 Extremely Heavy Industries Inc.
  */
-import {HoistBase, managed, LoadSupport, LoadSpec, Loadable, PlainObject} from './';
+import {HoistBase, managed, LoadSupport, LoadSpec, Loadable, PlainObject, TaskObserver} from './';
+import {apiDeprecated} from '@xh/hoist/utils/js';
 
 /**
  * Core superclass for Services in Hoist. Services are special classes used in both Hoist and
@@ -65,8 +66,15 @@ export class HoistService extends HoistBase implements Loadable {
     @managed
     loadSupport: LoadSupport;
 
+    get loadObserver(): TaskObserver {
+        return this.loadSupport?.loadObserver;
+    }
     get loadModel() {
-        return this.loadSupport?.loadModel;
+        apiDeprecated('HoistService.loadModel', {
+            v: 'v82',
+            msg: 'Use HoistService.loadObserver instead.'
+        });
+        return this.loadSupport?.loadObserver;
     }
     get lastLoadRequested() {
         return this.loadSupport?.lastLoadRequested;

package/core/load/LoadSupport.ts

@@ -32,7 +32,7 @@ export class LoadSupport extends HoistBase implements Loadable {
     lastSucceeded: LoadSpec = null;
 
     @managed
-    loadModel: TaskObserver = TaskObserver.trackLast();
+    loadObserver: TaskObserver = TaskObserver.trackLast();
 
     @observable.ref
     lastLoadRequested: Date = null;
@@ -71,13 +71,13 @@ export class LoadSupport extends HoistBase implements Loadable {
     }
 
     async doLoadAsync(loadSpec: LoadSpec) {
-        let {target, loadModel} = this;
+        let {target, loadObserver} = this;
 
         // Auto-refresh:
-        // Skip if we have a pending triggered refresh, and never link to loadModel
+        // Skip if we have a pending triggered refresh, and never link to loadObserver
         if (loadSpec.isAutoRefresh) {
-            if (loadModel.isPending) return;
-            loadModel = null;
+            if (loadObserver.isPending) return;
+            loadObserver = null;
         }
 
         runInAction(() => (this.lastLoadRequested = new Date()));
@@ -87,7 +87,7 @@ export class LoadSupport extends HoistBase implements Loadable {
 
         return target
             .doLoadAsync(loadSpec)
-            .linkTo(loadModel)
+            .linkTo(loadObserver)
             .catch(e => {
                 exception = e;
                 throw e;

package/core/load/Loadable.ts

@@ -13,9 +13,9 @@ import {LoadSpec} from './';
 export interface Loadable {
     /**
      * For tracking the loading of this object.
-     * Note that this model will *not* track auto-refreshes.
+     * Note that this object will *not* track auto-refreshes.
      */
-    loadModel: TaskObserver;
+    loadObserver: TaskObserver;
 
     /** Date when last load was initiated. */
     lastLoadRequested: Date;

package/core/model/HoistModel.ts

@@ -5,9 +5,9 @@
  * Copyright © 2025 Extremely Heavy Industries Inc.
  */
 import {action, computed, comparer, makeObservable, observable} from '@xh/hoist/mobx';
-import {warnIf} from '@xh/hoist/utils/js';
+import {apiDeprecated, warnIf} from '@xh/hoist/utils/js';
 import {isFunction} from 'lodash';
-import {DefaultHoistProps, HoistBase, LoadSpecConfig, managed, PlainObject} from '../';
+import {DefaultHoistProps, HoistBase, LoadSpecConfig, managed, PlainObject, TaskObserver} from '../';
 import {instanceManager} from '../impl/InstanceManager';
 import {Loadable, LoadSpec, LoadSupport} from '../load';
 import {ModelSelector} from './';
@@ -97,8 +97,15 @@ export abstract class HoistModel extends HoistBase implements Loadable {
     @managed
     loadSupport: LoadSupport;
 
+    get loadObserver(): TaskObserver {
+        return this.loadSupport?.loadObserver;
+    }
     get loadModel() {
-        return this.loadSupport?.loadModel;
+        apiDeprecated('HoistModel.loadModel', {
+            v: 'v82',
+            msg: 'Use HoistModel.loadObserver instead.'
+        });
+        return this.loadSupport?.loadObserver;
     }
     get lastLoadRequested() {
         return this.loadSupport?.lastLoadRequested;

package/data/UrlStore.ts

@@ -5,7 +5,8 @@
  * Copyright © 2025 Extremely Heavy Industries Inc.
  */
 
-import {XH, managed, LoadSupport, LoadSpec, Loadable, PlainObject} from '@xh/hoist/core';
+import {XH, managed, LoadSupport, LoadSpec, Loadable, PlainObject, TaskObserver} from '@xh/hoist/core';
+import {apiDeprecated} from '@xh/hoist/utils/js';
 
 import {Store, StoreConfig} from './Store';
 
@@ -33,8 +34,15 @@ export class UrlStore extends Store implements Loadable {
         this.dataRoot = dataRoot;
     }
 
+    get loadObserver(): TaskObserver {
+        return this.loadSupport.loadObserver;
+    }
     get loadModel() {
-        return this.loadSupport.loadModel;
+        apiDeprecated('UrlStore.loadModel', {
+            v: 'v82',
+            msg: 'Use UrlStore.loadObserver instead.'
+        });
+        return this.loadSupport.loadObserver;
     }
     get lastLoadRequested() {
         return this.loadSupport.lastLoadRequested;

package/desktop/cmp/panel/Panel.ts

@@ -255,15 +255,15 @@ function parseLoadDecorator(propVal: any, propName: string, ctxModel: HoistModel
     if (isValidElement(propVal)) return propVal;
     if (propVal === true) return cmp({isDisplayed: true});
     if (propVal === 'onLoad') {
-        const loadModel = ctxModel?.loadModel;
-        if (!loadModel) {
+        const loadObserver = ctxModel?.loadObserver;
+        if (!loadObserver) {
             logWarn(
                 `Cannot use 'onLoad' for '${propName}'. The linked context model (${ctxModel?.constructor.name} ${ctxModel?.xhId}) must enable LoadSupport to support this feature.`,
                 Panel
             );
             return null;
         }
-        return cmp({bind: loadModel, spinner: true});
+        return cmp({bind: loadObserver, spinner: true});
     }
     return cmp({bind: propVal, spinner: true});
 }

package/desktop/cmp/rest/RestGrid.ts

@@ -99,9 +99,9 @@ const innerToolbar = hoistCmp.factory({
 
 function getMaskFromProp(model, mask) {
     if (isValidElement(mask)) {
-        mask = cloneElement<MaskProps>(mask, {bind: model.loadModel});
+        mask = cloneElement<MaskProps>(mask, {bind: model.loadObserver});
     } else if (mask === true) {
-        mask = model.loadModel;
+        mask = model.loadObserver;
     }
     return mask;
 }

package/desktop/cmp/rest/RestGridModel.ts

@@ -208,7 +208,7 @@ export class RestGridModel extends HoistModel {
         return this.store
             .deleteRecordAsync(record)
             .then(() => this.formModel.close())
-            .linkTo(this.loadModel)
+            .linkTo(this.loadObserver)
             .catchDefault();
     }
 
@@ -224,7 +224,7 @@ export class RestGridModel extends HoistModel {
 
                 XH.toast({intent, message});
             })
-            .linkTo(this.loadModel)
+            .linkTo(this.loadObserver)
             .catchDefault();
     }
 

package/desktop/cmp/rest/data/RestStore.ts

@@ -51,7 +51,7 @@ export class RestStore extends UrlStore {
             .then(() => {
                 this.updateData({remove: [rec.id]});
             })
-            .linkTo(this.loadModel);
+            .linkTo(this.loadObserver);
     }
 
     async bulkDeleteRecordsAsync(records: StoreRecord[]) {
@@ -60,18 +60,18 @@ export class RestStore extends UrlStore {
             resp = await XH.fetchJson({
                 url: `${url}/bulkDelete`,
                 params: {ids}
-            }).linkTo(this.loadModel);
+            }).linkTo(this.loadObserver);
 
         await this.loadAsync();
         return resp;
     }
 
     async addRecordAsync(rec: {id?: StoreRecordId; data: PlainObject}) {
-        return this.saveRecordInternalAsync(rec, true).linkTo(this.loadModel);
+        return this.saveRecordInternalAsync(rec, true).linkTo(this.loadObserver);
     }
 
     async saveRecordAsync(rec: {id: StoreRecordId; data: PlainObject}) {
-        return this.saveRecordInternalAsync(rec, false).linkTo(this.loadModel);
+        return this.saveRecordInternalAsync(rec, false).linkTo(this.loadObserver);
     }
 
     async bulkUpdateRecordsAsync(ids: StoreRecordId[], newParams: PlainObject) {
@@ -81,7 +81,7 @@ export class RestStore extends UrlStore {
                     url: `${url}/bulkUpdate`,
                     body: {ids, newParams}
                 })
-                .linkTo(this.loadModel);
+                .linkTo(this.loadObserver);
 
         await this.loadAsync();
         return resp;

package/desktop/cmp/rest/impl/RestFormModel.ts

@@ -5,11 +5,11 @@
  * Copyright © 2025 Extremely Heavy Industries Inc.
  */
 import {FormModel} from '@xh/hoist/cmp/form';
-import {HoistModel, managed, PlainObject, XH} from '@xh/hoist/core';
+import {HoistModel, managed, PlainObject, TaskObserver, XH} from '@xh/hoist/core';
 import {required} from '@xh/hoist/data';
 import {RestGridEditor, RestGridModel} from '@xh/hoist/desktop/cmp/rest';
 import {action, makeObservable, observable} from '@xh/hoist/mobx';
-import {mergeDeep, throwIf} from '@xh/hoist/utils/js';
+import {apiDeprecated, mergeDeep, throwIf} from '@xh/hoist/utils/js';
 import {isFunction, isNil} from 'lodash';
 import {createRef} from 'react';
 import {RestField} from '../data/RestField';
@@ -52,8 +52,15 @@ export class RestFormModel extends HoistModel {
     get store() {
         return this.parent.store;
     }
+    override get loadObserver(): TaskObserver {
+        return this.store.loadSupport.loadObserver;
+    }
     override get loadModel() {
-        return this.store.loadSupport.loadModel;
+        apiDeprecated('RestFormModel.loadModel', {
+            v: 'v82',
+            msg: 'Use RestFormModel.loadObserver instead.'
+        });
+        return this.store.loadSupport.loadObserver;
     }
 
     constructor(parent: RestGridModel) {
@@ -169,7 +176,7 @@ export class RestFormModel extends HoistModel {
 
         return saveFn()
             .then(() => this.close())
-            .linkTo(this.loadModel)
+            .linkTo(this.loadObserver)
             .catchDefault();
     }
 

package/desktop/cmp/viewmanager/dialog/ManageDialogModel.ts

@@ -42,7 +42,7 @@ export class ManageDialogModel extends HoistModel {
     readonly updateTask = TaskObserver.trackLast();
 
     get loadTask(): TaskObserver {
-        return this.viewManagerModel.loadModel;
+        return this.viewManagerModel.loadObserver;
     }
 
     get gridModel(): GridModel {

package/desktop/cmp/viewmanager/dialog/ViewPanelModel.ts

@@ -27,7 +27,7 @@ export class ViewPanelModel extends HoistModel {
     }
 
     get loadTask(): TaskObserver {
-        return this.parent.loadModel;
+        return this.parent.loadObserver;
     }
 
     constructor(parent: ManageDialogModel) {

package/mobile/cmp/panel/Panel.ts

@@ -138,15 +138,15 @@ function parseLoadDecorator(propVal: any, propName: string, ctxModel: HoistModel
     if (propVal === true) return cmp({isDisplayed: true});
     if (isValidElement(propVal)) return propVal;
     if (propVal === 'onLoad') {
-        const loadModel = ctxModel?.loadModel;
-        if (!loadModel) {
+        const loadObserver = ctxModel?.loadObserver;
+        if (!loadObserver) {
             logWarn(
                 `Cannot use 'onLoad' for '${propName}'. The linked context model (${ctxModel?.constructor.name} ${ctxModel?.xhId}) must enable LoadSupport to support this feature.`,
                 Panel
             );
             return null;
         }
-        return cmp({bind: loadModel, spinner: true});
+        return cmp({bind: loadObserver, spinner: true});
     }
     return cmp({bind: propVal, spinner: true});
 }

package/package.json

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