@xh/hoist 78.0.0-SNAPSHOT.1762310926429 → 78.0.0-SNAPSHOT.1762557528853

package/CHANGELOG.md

@@ -33,11 +33,6 @@
 * Fixed `AgGridModel.getExpandState()` not returning a full representation of expanded groups -
   an issue that primarily affected linked tree map visualizations.
 
-### ⚙️ Technical
-
-* Support Grails 7 service name conventions in admin client (backward compatible)
-
-
 ## 76.2.0 - 2025-10-22
 
 ### ⚙️ Technical

package/admin/tabs/cluster/instances/services/ServiceModel.ts

@@ -152,13 +152,7 @@ export class ServiceModel extends BaseInstanceModel {
     }
 
     private processRawData(r: PlainObject) {
-        // For Grails <=6, plugin is prefix in name.
-        // For Grails >7, we provide class to determine provider
-        // TODO: simplify when Hoist v34+ required.
-        const provider =
-            r.name.startsWith('hoistCore') || r.className?.startsWith('io.xh.hoist')
-                ? 'Hoist'
-                : 'App';
+        const provider = r.name && r.name.startsWith('hoistCore') ? 'Hoist' : 'App';
         const displayName = lowerFirst(r.name.replace('hoistCore', ''));
         return {provider, displayName, ...r};
     }

package/admin/tabs/general/config/ConfigPanelModel.ts

@@ -7,7 +7,7 @@
 import {exportFilenameWithDate} from '@xh/hoist/admin/AdminUtils';
 import {AppModel} from '@xh/hoist/admin/AppModel';
 import * as Col from '@xh/hoist/admin/columns';
-import {br, fragment, hbox, hspacer} from '@xh/hoist/cmp/layout';
+import {hbox, hspacer} from '@xh/hoist/cmp/layout';
 import {HoistModel, LoadSpec, managed, XH} from '@xh/hoist/core';
 import {FieldSpec} from '@xh/hoist/data';
 import {defaultReadonlyRenderer} from '@xh/hoist/desktop/cmp/form';
@@ -17,14 +17,14 @@ import {
     cloneAction,
     deleteAction,
     editAction,
-    RestGridModel
+    RestGridModel,
+    RestStore
 } from '@xh/hoist/desktop/cmp/rest';
-import {Icon} from '@xh/hoist/icon';
 import {action, makeObservable, observable} from '@xh/hoist/mobx';
-import {pluralize} from '@xh/hoist/utils/js';
 import {isNil, truncate} from 'lodash';
 import {DifferModel} from '../../../differ/DifferModel';
 import {RegroupDialogModel} from '../../../regroup/RegroupDialogModel';
+import {Icon} from '@xh/hoist/icon';
 
 export class ConfigPanelModel extends HoistModel {
     override persistWith = {localStorageKey: 'xhAdminConfigState'};
@@ -43,27 +43,18 @@ export class ConfigPanelModel extends HoistModel {
         super();
         makeObservable(this);
 
-        const {regroupAction} = this.regroupDialogModel,
-            required = true,
+        const required = true,
             enableCreate = true,
             hidden = true;
 
         this.gridModel = new RestGridModel({
-            // Core config
-            autosizeOptions: {mode: 'managed', includeCollapsedChildren: true},
+            readonly: AppModel.readonly,
+            persistWith: this.persistWith,
             colChooserModel: true,
             enableExport: true,
             exportOptions: {filename: exportFilenameWithDate('configs')},
-            filterFields: ['name', 'value', 'groupName', 'note'],
-            groupBy: 'groupName',
-            persistWith: this.persistWith,
-            prepareCloneFn: ({clone}) => (clone.name = `${clone.name}_CLONE`),
-            readonly: AppModel.readonly,
             selModel: 'multiple',
-            sortBy: 'name',
-            unit: 'config',
-            // Store + fields
-            store: {
+            store: new RestStore({
                 url: 'rest/configAdmin',
                 reloadLookupsOnLoad: true,
                 fieldDefaults: {enableXssProtection: false},
@@ -92,8 +83,25 @@ export class ConfigPanelModel extends HoistModel {
                         editable: false
                     }
                 ]
+            }),
+            actionWarning: {
+                del: records =>
+                    `Are you sure you want to delete ${records.length} config(s)? Deleting configs can break running apps.`
             },
-            // Cols + editors
+            toolbarActions: [addAction, editAction, cloneAction, deleteAction],
+            menuActions: [
+                addAction,
+                editAction,
+                cloneAction,
+                deleteAction,
+                '-',
+                this.regroupDialogModel.regroupAction
+            ],
+            prepareCloneFn: ({clone}) => (clone.name = `${clone.name}_CLONE`),
+            unit: 'config',
+            filterFields: ['name', 'value', 'groupName', 'note'],
+            sortBy: 'name',
+            groupBy: 'groupName',
             columns: [
                 {...Col.groupName, hidden},
                 {...Col.name},
@@ -130,19 +138,7 @@ export class ConfigPanelModel extends HoistModel {
                 {field: 'clientVisible'},
                 {field: 'lastUpdated'},
                 {field: 'lastUpdatedBy'}
-            ],
-            // Actions
-            actionWarning: {
-                del: records =>
-                    fragment(
-                        `Are you sure you want to delete ${pluralize('selected config', records.length, true)}?`,
-                        br(),
-                        br(),
-                        `Deleting configs can break running apps.`
-                    )
-            },
-            menuActions: [addAction, editAction, cloneAction, deleteAction, '-', regroupAction],
-            toolbarActions: [addAction, editAction, cloneAction, deleteAction]
+            ]
         });
     }
 

package/admin/tabs/userData/prefs/UserPreferenceModel.ts

@@ -25,19 +25,12 @@ export class UserPreferenceModel extends HoistModel {
             hidden = true;
 
         this.gridModel = new RestGridModel({
-            // Core config
-            autosizeOptions: {mode: 'managed', includeCollapsedChildren: true},
+            readonly: AppModel.readonly,
+            persistWith: {localStorageKey: 'xhAdminUserPreferenceState'},
             colChooserModel: true,
             enableExport: true,
             exportOptions: {filename: exportFilenameWithDate('user-prefs')},
-            filterFields: ['name', 'username'],
-            groupBy: 'groupName',
-            persistWith: {localStorageKey: 'xhAdminUserPreferenceState'},
-            readonly: AppModel.readonly,
             selModel: 'multiple',
-            sortBy: 'name',
-            unit: 'user preference',
-            // Store + fields
             store: {
                 url: 'rest/userPreferenceAdmin',
                 reloadLookupsOnLoad: true,
@@ -62,7 +55,10 @@ export class UserPreferenceModel extends HoistModel {
                     {...(Col.lastUpdatedBy.field as FieldSpec), editable: false}
                 ]
             },
-            // Cols + editors
+            sortBy: 'name',
+            groupBy: 'groupName',
+            unit: 'user preference',
+            filterFields: ['name', 'username'],
             columns: [
                 {...Col.name},
                 {...Col.type},

package/admin/tabs/userData/prefs/editor/PrefEditorModel.ts

@@ -7,13 +7,11 @@
 import {exportFilenameWithDate} from '@xh/hoist/admin/AdminUtils';
 import {AppModel} from '@xh/hoist/admin/AppModel';
 import * as Col from '@xh/hoist/admin/columns';
-import {br, fragment} from '@xh/hoist/cmp/layout';
 import {HoistModel, LoadSpec, managed, XH} from '@xh/hoist/core';
 import {FieldSpec} from '@xh/hoist/data';
 import {textArea} from '@xh/hoist/desktop/cmp/input';
 import {addAction, deleteAction, editAction, RestGridModel} from '@xh/hoist/desktop/cmp/rest';
 import {action, makeObservable, observable} from '@xh/hoist/mobx';
-import {pluralize} from '@xh/hoist/utils/js';
 import {DifferModel} from '../../../../differ/DifferModel';
 import {RegroupDialogModel} from '../../../../regroup/RegroupDialogModel';
 
@@ -34,26 +32,18 @@ export class PrefEditorModel extends HoistModel {
         super();
         makeObservable(this);
 
-        const {regroupAction} = this.regroupDialogModel,
-            required = true,
+        const required = true,
             enableCreate = true,
             hidden = true;
 
         this.gridModel = new RestGridModel({
-            // Core config
-            autosizeOptions: {mode: 'managed', includeCollapsedChildren: true},
+            readonly: AppModel.readonly,
+            persistWith: this.persistWith,
             colChooserModel: true,
             enableExport: true,
             exportOptions: {filename: exportFilenameWithDate('prefs')},
-            filterFields: ['name', 'groupName'],
-            groupBy: 'groupName',
-            persistWith: this.persistWith,
-            readonly: AppModel.readonly,
             selModel: 'multiple',
             showRefreshButton: true,
-            sortBy: 'name',
-            unit: 'preference',
-            // Store + fields
             store: {
                 url: 'rest/preferenceAdmin',
                 reloadLookupsOnLoad: true,
@@ -78,7 +68,21 @@ export class PrefEditorModel extends HoistModel {
                     {...(Col.lastUpdatedBy.field as FieldSpec), editable: false}
                 ]
             },
-            // Cols + Editors
+            sortBy: 'name',
+            groupBy: 'groupName',
+            unit: 'preference',
+            filterFields: ['name', 'groupName'],
+            actionWarning: {
+                del: records =>
+                    `Are you sure you want to delete ${records.length} preference(s)? Deleting preferences can break running apps.`
+            },
+            menuActions: [
+                addAction,
+                editAction,
+                deleteAction,
+                '-',
+                this.regroupDialogModel.regroupAction
+            ],
             columns: [
                 {...Col.name},
                 {...Col.type},
@@ -96,18 +100,7 @@ export class PrefEditorModel extends HoistModel {
                 {field: 'notes', formField: {item: textArea({height: 100})}},
                 {field: 'lastUpdated'},
                 {field: 'lastUpdatedBy'}
-            ],
-            // Actions
-            actionWarning: {
-                del: records =>
-                    fragment(
-                        `Are you sure you want to delete ${pluralize('selected preference', records.length, true)}?`,
-                        br(),
-                        br(),
-                        `Deleting preference definitions can break running apps.`
-                    )
-            },
-            menuActions: [addAction, editAction, deleteAction, '-', regroupAction]
+            ]
         });
     }
 

package/build/types/desktop/cmp/dash/canvas/DashCanvasModel.d.ts

@@ -20,6 +20,11 @@ export interface DashCanvasConfig extends DashConfig<DashCanvasViewSpec, DashCan
     maxRows?: number;
     /** Padding inside the container [x, y] in pixels. Defaults to same as `margin`. */
     containerPadding?: [number, number];
+    /**
+     * Whether an overlay with an Add View button should be rendered
+     * when the canvas is empty. Default true.
+     */
+    showAddViewButtonWhenEmpty?: boolean;
 }
 export interface DashCanvasItemState {
     layout: DashCanvasItemLayout;
@@ -45,7 +50,9 @@ export declare class DashCanvasModel extends DashModel<DashCanvasViewSpec, DashC
     compact: boolean;
     margin: [number, number];
     containerPadding: [number, number];
+    DROPPING_ELEM_ID: string;
     maxRows: number;
+    showAddViewButtonWhenEmpty: boolean;
     /** Current number of rows in canvas */
     get rows(): number;
     get isEmpty(): boolean;
@@ -54,7 +61,7 @@ export declare class DashCanvasModel extends DashModel<DashCanvasViewSpec, DashC
     isResizing: boolean;
     private isLoadingState;
     get rglLayout(): any[];
-    constructor({ viewSpecs, viewSpecDefaults, initialState, layoutLocked, contentLocked, renameLocked, persistWith, emptyText, addViewButtonText, columns, rowHeight, compact, margin, maxRows, containerPadding, extraMenuItems }: DashCanvasConfig);
+    constructor({ viewSpecs, viewSpecDefaults, initialState, layoutLocked, contentLocked, renameLocked, persistWith, emptyText, addViewButtonText, columns, rowHeight, compact, margin, maxRows, containerPadding, extraMenuItems, showAddViewButtonWhenEmpty }: DashCanvasConfig);
     /** Removes all views from the canvas */
     clear(): void;
     /**
@@ -77,6 +84,16 @@ export declare class DashCanvasModel extends DashModel<DashCanvasViewSpec, DashC
         width?: number;
         height?: number;
     }): DashCanvasViewModel;
+    dropViewIntoCanvas(specId: string, opts: {
+        title: string;
+        state: any;
+        layout: {
+            x: number;
+            y: number;
+            w: number;
+            h: number;
+        };
+    }, rglLayout: any[]): DashCanvasViewModel;
     /**
      * Remove a view from the DashCanvas
      * @param id - DashCanvasViewModel id to remove from the container

package/build/types/desktop/cmp/rest/RestGridModel.d.ts

@@ -1,11 +1,10 @@
+import { RowDoubleClickedEvent } from '@xh/hoist/kit/ag-grid';
 import { BaseFieldConfig } from '@xh/hoist/cmp/form';
 import { GridConfig, GridModel } from '@xh/hoist/cmp/grid';
 import { ElementSpec, HoistModel, PlainObject } from '@xh/hoist/core';
 import '@xh/hoist/desktop/register';
 import { RecordAction, RecordActionSpec, StoreRecord } from '@xh/hoist/data';
-import { RowDoubleClickedEvent } from '@xh/hoist/kit/ag-grid';
 import { ExportOptions } from '@xh/hoist/svc';
-import { ReactNode } from 'react';
 import { FormFieldProps } from '../form';
 import { RestStore, RestStoreConfig } from './data/RestStore';
 import { RestFormModel } from './impl/RestFormModel';
@@ -23,9 +22,9 @@ export interface RestGridConfig extends GridConfig {
     showRefreshButton?: boolean;
     /** Warning to display before actions on a selection of records. */
     actionWarning?: {
-        add?: ReactNode | ((recs: StoreRecord[]) => ReactNode);
-        del?: ReactNode | ((recs: StoreRecord[]) => ReactNode);
-        edit?: ReactNode | ((recs: StoreRecord[]) => ReactNode);
+        add?: string | ((recs: StoreRecord[]) => string);
+        del?: string | ((recs: StoreRecord[]) => string);
+        edit?: string | ((recs: StoreRecord[]) => string);
     };
     /** Name that describes records in this grid. */
     unit?: string;

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

@@ -16,9 +16,9 @@ export declare class RestFormModel extends HoistModel {
     dialogRef: import("react").RefObject<HTMLElement>;
     get unit(): string;
     get actionWarning(): {
-        add?: import("react").ReactNode | ((recs: import("@xh/hoist/data").StoreRecord[]) => import("react").ReactNode);
-        del?: import("react").ReactNode | ((recs: import("@xh/hoist/data").StoreRecord[]) => import("react").ReactNode);
-        edit?: import("react").ReactNode | ((recs: import("@xh/hoist/data").StoreRecord[]) => import("react").ReactNode);
+        add?: string | ((recs: import("@xh/hoist/data").StoreRecord[]) => string);
+        del?: string | ((recs: import("@xh/hoist/data").StoreRecord[]) => string);
+        edit?: string | ((recs: import("@xh/hoist/data").StoreRecord[]) => string);
     };
     get actions(): (import("@xh/hoist/data").RecordActionSpec | import("@xh/hoist/data").RecordAction)[];
     get editors(): RestGridEditor[];

package/desktop/cmp/dash/canvas/DashCanvas.ts

@@ -98,7 +98,7 @@ export const [DashCanvas, dashCanvas] = hoistCmp.withFactory<DashCanvasProps>({
                         ),
                         ...rglOptions
                     }),
-                    emptyContainerOverlay()
+                    emptyContainerOverlay({omit: !model.showAddViewButtonWhenEmpty})
                 ],
                 [TEST_ID]: testId
             })

package/desktop/cmp/dash/canvas/DashCanvasModel.ts

@@ -50,6 +50,12 @@ export interface DashCanvasConfig extends DashConfig<DashCanvasViewSpec, DashCan
 
     /** Padding inside the container [x, y] in pixels. Defaults to same as `margin`. */
     containerPadding?: [number, number];
+
+    /**
+     * Whether an overlay with an Add View button should be rendered
+     * when the canvas is empty. Default true.
+     */
+    showAddViewButtonWhenEmpty?: boolean;
 }
 
 export interface DashCanvasItemState {
@@ -86,7 +92,9 @@ export class DashCanvasModel
     //-----------------------------
     // Public properties
     //-----------------------------
+    DROPPING_ELEM_ID = '__dropping-elem__';
     maxRows: number;
+    showAddViewButtonWhenEmpty: boolean;
 
     /** Current number of rows in canvas */
     get rows(): number {
@@ -106,21 +114,25 @@ export class DashCanvasModel
     private isLoadingState: boolean;
 
     get rglLayout() {
-        return this.layout.map(it => {
-            const dashCanvasView = this.getView(it.i),
-                {autoHeight, viewSpec} = dashCanvasView;
-
-            return {
-                ...it,
-                resizeHandles: autoHeight
-                    ? ['w', 'e']
-                    : ['s', 'w', 'e', 'n', 'sw', 'nw', 'se', 'ne'],
-                maxH: viewSpec.maxHeight,
-                minH: viewSpec.minHeight,
-                maxW: viewSpec.maxWidth,
-                minW: viewSpec.minWidth
-            };
-        });
+        return this.layout
+            .map(it => {
+                const dashCanvasView = this.getView(it.i);
+                if (!dashCanvasView) return null;
+
+                const {autoHeight, viewSpec} = dashCanvasView;
+
+                return {
+                    ...it,
+                    resizeHandles: autoHeight
+                        ? ['w', 'e']
+                        : ['s', 'w', 'e', 'n', 'sw', 'nw', 'se', 'ne'],
+                    maxH: viewSpec.maxHeight,
+                    minH: viewSpec.minHeight,
+                    maxW: viewSpec.maxWidth,
+                    minW: viewSpec.minWidth
+                };
+            })
+            .filter(Boolean);
     }
 
     constructor({
@@ -139,7 +151,8 @@ export class DashCanvasModel
         margin = [10, 10],
         maxRows = Infinity,
         containerPadding = margin,
-        extraMenuItems
+        extraMenuItems,
+        showAddViewButtonWhenEmpty = true
     }: DashCanvasConfig) {
         super();
         makeObservable(this);
@@ -187,6 +200,7 @@ export class DashCanvasModel
         this.emptyText = emptyText;
         this.addViewButtonText = addViewButtonText;
         this.extraMenuItems = extraMenuItems;
+        this.showAddViewButtonWhenEmpty = showAddViewButtonWhenEmpty;
 
         this.loadState(initialState);
         this.state = this.buildState();
@@ -261,6 +275,27 @@ export class DashCanvasModel
         return this.addViewInternal(specId, {title, layout, state});
     }
 
+    @action dropViewIntoCanvas(
+        specId: string,
+        opts: {
+            title: string;
+            state: any;
+            layout: {
+                x: number;
+                y: number;
+                w: number;
+                h: number;
+            };
+        },
+        rglLayout: any[]
+    ): DashCanvasViewModel {
+        const newViewModel: DashCanvasViewModel = this.addViewInternal(specId, opts),
+            droppingItem: any = rglLayout.find(it => it.i === this.DROPPING_ELEM_ID);
+        droppingItem.i = newViewModel.id;
+        this.onRglLayoutChange(rglLayout);
+        return newViewModel;
+    }
+
     /**
      * Remove a view from the DashCanvas
      * @param id - DashCanvasViewModel id to remove from the container
@@ -386,6 +421,8 @@ export class DashCanvasModel
 
     onRglLayoutChange(rglLayout) {
         rglLayout = rglLayout.map(it => pick(it, ['i', 'x', 'y', 'w', 'h']));
+        if (rglLayout.some(it => it.i === this.DROPPING_ELEM_ID)) return;
+
         this.setLayout(rglLayout);
     }
 

package/desktop/cmp/rest/RestGridModel.ts

@@ -5,16 +5,15 @@
  * Copyright © 2025 Extremely Heavy Industries Inc.
  */
 
+import {RowDoubleClickedEvent} from '@xh/hoist/kit/ag-grid';
 import {BaseFieldConfig} from '@xh/hoist/cmp/form';
 import {GridConfig, GridModel} from '@xh/hoist/cmp/grid';
 import {ElementSpec, HoistModel, managed, PlainObject, XH} from '@xh/hoist/core';
 import '@xh/hoist/desktop/register';
 import {RecordAction, RecordActionSpec, StoreRecord} from '@xh/hoist/data';
-import {RowDoubleClickedEvent} from '@xh/hoist/kit/ag-grid';
 import {ExportOptions} from '@xh/hoist/svc';
 import {pluralize, throwIf, withDefault} from '@xh/hoist/utils/js';
 import {isFunction} from 'lodash';
-import {ReactNode} from 'react';
 import {FormFieldProps} from '../form';
 import {addAction, deleteAction, editAction, viewAction} from './Actions';
 import {RestStore, RestStoreConfig} from './data/RestStore';
@@ -40,9 +39,9 @@ export interface RestGridConfig extends GridConfig {
 
     /** Warning to display before actions on a selection of records. */
     actionWarning?: {
-        add?: ReactNode | ((recs: StoreRecord[]) => ReactNode);
-        del?: ReactNode | ((recs: StoreRecord[]) => ReactNode);
-        edit?: ReactNode | ((recs: StoreRecord[]) => ReactNode);
+        add?: string | ((recs: StoreRecord[]) => string);
+        del?: string | ((recs: StoreRecord[]) => string);
+        edit?: string | ((recs: StoreRecord[]) => string);
     };
 
     /** Name that describes records in this grid. */
@@ -110,7 +109,11 @@ export class RestGridModel extends HoistModel {
         add: null,
         edit: null,
         del: recs =>
-            `Are you sure you want to delete ${pluralize(`selected ${this.unit}`, recs.length, true)}?`
+            recs.length > 1
+                ? `Are you sure you want to delete the selected ${recs.length} ${pluralize(
+                      this.unit
+                  )}?`
+                : `Are you sure you want to delete the selected ${this.unit}?`
     };
 
     @managed gridModel: GridModel = null;

package/package.json

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