@xh/hoist 75.0.0-SNAPSHOT.1752777363110 → 75.0.0-SNAPSHOT.1752860174147

package/cmp/zoneGrid/ZoneGridModel.ts

@@ -39,6 +39,7 @@ import {
     managed,
     PlainObject,
     Some,
+    Thunkable,
     VSide,
     XH
 } from '@xh/hoist/core';
@@ -146,6 +147,9 @@ export interface ZoneGridConfig {
     /** Column ID(s) by which to do full-width grouping. */
     groupBy?: Some<string>;
 
+    /** Group level to expand to on initial load. 0 = all collapsed, 1 = only top level expanded. */
+    expandToLevel?: number;
+
     /** True (default) to show a count of group member rows within each full-width group row. */
     showGroupRowCounts?: boolean;
 
@@ -231,6 +235,13 @@ export interface ZoneGridConfig {
      */
     onCellContextMenu?: (e: CellContextMenuEvent) => void;
 
+    /**
+     * Array of labels (or a function returning one) that describes the individual depth
+     * levels in a tree or grouped grid. If provided, will be used to construct expand/collapse
+     * options in the default context menu.
+     */
+    levelLabels?: Thunkable<string[]>;
+
     /**
      * Number of clicks required to expand / collapse a parent row in a tree grid. Defaults
      * to 2 for desktop, 1 for mobile. Any other value prevents clicks on row body from
@@ -419,7 +430,7 @@ export class ZoneGridModel extends HoistModel {
         'copyWithHeaders',
         'copyCell',
         '-',
-        'expandCollapseAll',
+        'expandCollapse',
         '-',
         'restoreDefaults',
         '-',

package/core/exception/Exception.ts

@@ -210,7 +210,7 @@ export class Exception {
 
     private static createInternal(attributes: PlainObject, baseError?: Error) {
         const {message, ...rest} = attributes;
-        return Object.assign(
+        const ret = Object.assign(
             baseError ?? new Error(message),
             {
                 isRoutine: false,
@@ -218,6 +218,11 @@ export class Exception {
             },
             rest
         ) as HoistException;
+
+        // statuses of 0, 4XX, 5XX are server errors, so stack irrelevant and potentially misleading
+        if (ret.stack == null || /^[045]/.test(ret.httpStatus)) delete ret.stack;
+
+        return ret;
     }
 }
 

package/core/exception/ExceptionHandler.ts

@@ -185,8 +185,7 @@ export class ExceptionHandler {
     async logOnServerAsync(options: ExceptionHandlerLoggingOptions): Promise<boolean> {
         const {exception, userAlerted, userMessage} = options;
         try {
-            const error = this.stringifyErrorSafely(exception),
-                username = XH.getUsername();
+            const username = XH.getUsername();
 
             if (!username) {
                 logWarn('Error report cannot be submitted to UI server - user unknown', this);
@@ -194,7 +193,7 @@ export class ExceptionHandler {
             }
 
             const data: PlainObject = {
-                error: JSON.parse(error),
+                error: this.sanitizeException(exception),
                 userAlerted
             };
             if (userMessage) data.userMessage = stripTags(userMessage);
@@ -216,8 +215,16 @@ export class ExceptionHandler {
     }
 
     /**
-     * Serialize an error object safely for submission to server, or user display.
-     * This method will avoid circular references and will trim the depth of the object.
+     * Sanitize an exception for submission to server. This method will avoid circular references
+     * trim the depth of the object, and redact sensitive info (e.g. passwords).
+     */
+    sanitizeException(exception: HoistException): PlainObject {
+        return JSON.parse(this.stringifyErrorSafely(exception));
+    }
+
+    /**
+     * Serialize an error object safely for user display.  This method will avoid circular
+     * references, trim the depth of the object, and redact sensitive info (e.g. passwords).
      */
     stringifyErrorSafely(exception: HoistException): string {
         try {
@@ -287,8 +294,6 @@ export class ExceptionHandler {
             this.hideParams(e, opts);
         }
 
-        this.cleanStack(e);
-
         return {e, opts};
     }
 
@@ -342,12 +347,6 @@ export class ExceptionHandler {
         return e.name === 'SessionMismatchException';
     }
 
-    private cleanStack(e: HoistException) {
-        // statuses of 0, 4XX, 5XX are server errors, so the javascript stack
-        // is irrelevant and potentially misleading
-        if (/^[045]/.test(e.httpStatus)) delete e.stack;
-    }
-
     private cloneAndTrim(obj, depth = 5) {
         // Create a depth-constrained, deep copy of an object for safe-use in stringify
         //   - Skip private _XXXX properties.

package/data/RecordAction.ts

@@ -34,7 +34,7 @@ export interface RecordActionSpec extends TestSupportProps {
     actionFn?: (data: ActionFnData) => void;
 
     /** Function called prior to showing this item. */
-    displayFn?: (data: DisplayFnData) => PlainObject;
+    displayFn?: (data: ActionFnData) => RecordActionSpec;
 
     /** Sub-actions for this action. */
     items?: RecordActionLike[];
@@ -107,7 +107,7 @@ export class RecordAction {
     className: string;
     tooltip: string;
     actionFn: (data: ActionFnData) => void;
-    displayFn: (data: DisplayFnData) => PlainObject;
+    displayFn: (data: ActionFnData) => PlainObject;
     items: Array<RecordAction | string>;
     disabled: boolean;
     hidden: boolean;
@@ -207,8 +207,3 @@ export class RecordAction {
         );
     }
 }
-
-interface DisplayFnData extends ActionFnData {
-    /** Default display config for the action */
-    defaultConfig?: PlainObject;
-}

package/desktop/cmp/leftrightchooser/LeftRightChooser.ts

@@ -4,7 +4,8 @@
  *
  * Copyright © 2025 Extremely Heavy Industries Inc.
  */
-import {grid, GridProps} from '@xh/hoist/cmp/grid';
+import {GridOptions} from '@ag-grid-community/core';
+import {grid} from '@xh/hoist/cmp/grid';
 import {hframe, vbox} from '@xh/hoist/cmp/layout';
 import {BoxProps, hoistCmp, HoistProps, uses} from '@xh/hoist/core';
 import '@xh/hoist/desktop/register';
@@ -12,7 +13,6 @@ import {chooserToolbar} from './impl/ChooserToolbar';
 import {description} from './impl/Description';
 import './LeftRightChooser.scss';
 import {LeftRightChooserModel} from './LeftRightChooserModel';
-import {cloneDeep} from 'lodash';
 
 export interface LeftRightChooserProps extends HoistProps<LeftRightChooserModel>, BoxProps {}
 
@@ -28,19 +28,11 @@ export const [LeftRightChooser, leftRightChooser] = hoistCmp.withFactory<LeftRig
     className: 'xh-lr-chooser',
 
     render({model, ...props}, ref) {
-        const {leftModel, rightModel, leftGroupingExpanded, rightGroupingExpanded} = model,
-            gridOptions: GridProps = {
-                agOptions: {
-                    defaultColDef: {
-                        resizable: false
-                    }
-                }
-            },
-            leftGridOptions = cloneDeep(gridOptions),
-            rightGridOptions = cloneDeep(gridOptions);
-
-        if (!leftGroupingExpanded) leftGridOptions.agOptions.groupDefaultExpanded = 0;
-        if (!rightGroupingExpanded) rightGridOptions.agOptions.groupDefaultExpanded = 0;
+        const agOptions: GridOptions = {
+            defaultColDef: {
+                resizable: false
+            }
+        };
 
         return vbox({
             ref,
@@ -48,9 +40,9 @@ export const [LeftRightChooser, leftRightChooser] = hoistCmp.withFactory<LeftRig
                 hframe({
                     className: 'xh-lr-chooser__grid-frame',
                     items: [
-                        grid({model: leftModel, ...leftGridOptions}),
+                        grid({model: model.leftModel, agOptions}),
                         chooserToolbar(),
-                        grid({model: rightModel, ...rightGridOptions})
+                        grid({model: model.rightModel, agOptions})
                     ]
                 }),
                 description()

package/desktop/cmp/leftrightchooser/LeftRightChooserModel.ts

@@ -186,6 +186,7 @@ export class LeftRightChooserModel extends HoistModel {
             onRowDoubleClicked: e => this.onRowDoubleClicked(e),
             columns: [leftTextCol, groupCol],
             contextMenu: false,
+            expandToLevel: leftGroupingExpanded ? 1 : 0,
             xhImpl: true
         });
 
@@ -197,6 +198,7 @@ export class LeftRightChooserModel extends HoistModel {
             onRowDoubleClicked: e => this.onRowDoubleClicked(e),
             columns: [rightTextCol, groupCol],
             contextMenu: false,
+            expandToLevel: rightGroupingExpanded ? 1 : 0,
             xhImpl: true
         });
 

package/package.json

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

package/promise/Promise.ts

@@ -202,8 +202,10 @@ const enhancePromise = promisePrototype => {
             if (!options) return this;
 
             const startTime = Date.now(),
-                doTrack = (exception: unknown = null) => {
-                    if (exception && exception['isRoutine']) return;
+                doTrack = (rejectReason: unknown = null) => {
+                    const exception = rejectReason != null ? Exception.create(rejectReason) : null;
+
+                    if (exception?.isRoutine) return;
 
                     const endTime = Date.now(),
                         opts: TrackOptions = isString(options) ? {message: options} : {...options};
@@ -222,7 +224,14 @@ const enhancePromise = promisePrototype => {
                     ) {
                         opts.elapsed = null;
                     }
-                    if (exception) opts.severity = 'ERROR';
+                    if (exception) {
+                        opts.severity = 'ERROR';
+                        opts.data = {
+                            error: XH.exceptionHandler.sanitizeException(exception),
+                            data: opts.data
+                        };
+                        opts.correlationId = opts.correlationId ?? exception.correlationId;
+                    }
 
                     XH.track(opts);
                 };