@xh/hoist 67.0.0-SNAPSHOT.1725042567416 → 67.0.0-SNAPSHOT.1725047531773

package/admin/regroup/RegroupDialog.ts

@@ -50,9 +50,10 @@ const tbar = hoistCmp.factory<RegroupDialogModel>(({model}) => {
             onClick: () => model.close()
         }),
         button({
-            text: 'Save',
+            text: 'Save Changes',
             icon: Icon.check(),
             intent: 'success',
+            outlined: true,
             disabled: model.groupName == null,
             onClick: () => model.saveAsync()
         })

package/admin/tabs/cluster/ClusterTabModel.ts

@@ -184,10 +184,8 @@ export class ClusterTabModel extends HoistModel {
                 confirmProps: {
                     icon: Icon.skull(),
                     text: 'Shutdown Now',
-                    intent: 'danger'
-                },
-                cancelProps: {
-                    autoFocus: true
+                    intent: 'danger',
+                    autoFocus: false
                 }
             }))
         )

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

@@ -91,8 +91,8 @@ export class ServiceModel extends BaseInstanceModel {
             ),
             confirmProps: {
                 text: 'Clear Caches',
-                outlined: true,
                 intent: 'danger',
+                outlined: true,
                 autoFocus: false
             }
         });

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

@@ -277,7 +277,8 @@ export class AlertBannerModel extends HoistModel {
                 confirmProps: {
                     text: 'Yes, modify the banner',
                     intent: 'primary',
-                    outlined: true
+                    outlined: true,
+                    autoFocus: false
                 }
             });
             if (!finalConfirm) return;

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

@@ -227,9 +227,10 @@ const formPanel = hoistCmp.factory<AlertBannerModel>(({model}) => {
                     onClick: () => model.resetForm()
                 }),
                 button({
-                    text: 'Save',
+                    text: 'Save Changes',
                     icon: Icon.check(),
                     intent: 'success',
+                    outlined: true,
                     disabled: !isValid || !isDirty,
                     onClick: () => model.saveAsync()
                 })

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

@@ -94,6 +94,7 @@ export class ConfigPanelModel extends HoistModel {
                 editAction,
                 cloneAction,
                 deleteAction,
+                '-',
                 this.regroupDialogModel.regroupAction
             ],
             prepareCloneFn: ({clone}) => (clone.name = `${clone.name}_CLONE`),

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

@@ -79,6 +79,7 @@ export class PrefEditorModel extends HoistModel {
                 addAction,
                 editAction,
                 deleteAction,
+                '-',
                 this.regroupDialogModel.regroupAction
             ],
             columns: [

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

@@ -125,10 +125,12 @@ export class RoleModel extends HoistModel {
         if (this.readonly) return false;
 
         const confirm = await XH.confirm({
-            icon: Icon.warning(),
-            title: 'Confirm delete?',
-            message: `Are you sure you want to delete "${role.name}"? This may affect access to this applications.`,
-            confirmProps: {intent: 'danger', text: 'Confirm Delete'}
+            message: `Are you sure you want to delete "${role.name}"? This may affect access to this application.`,
+            confirmProps: {
+                text: 'Yes, delete role',
+                intent: 'danger',
+                autoFocus: false
+            }
         });
         if (!confirm) return false;
 
@@ -197,8 +199,9 @@ export class RoleModel extends HoistModel {
     private groupByAction(): RecordActionSpec {
         return {
             text: 'Group By Category',
+            icon: Icon.treeList(),
             displayFn: () => ({
-                icon: this.showInGroups ? Icon.checkCircle() : Icon.circle()
+                text: this.showInGroups ? 'Ungroup Grid' : 'Group by Category'
             }),
             actionFn: () => {
                 this.showInGroups = !this.showInGroups;
@@ -350,15 +353,17 @@ export class RoleModel extends HoistModel {
 
     private getContextMenuItems() {
         return this.readonly
-            ? [this.groupByAction(), ...GridModel.defaultContextMenu]
+            ? [this.groupByAction(), '-', ...GridModel.defaultContextMenu]
             : [
                   this.addAction(),
                   this.editAction(),
                   this.cloneAction(),
                   this.deleteAction(),
+                  '-',
                   this.recategorizeDialogModel.recategorizeAction(),
                   '-',
                   this.groupByAction(),
+                  '-',
                   ...GridModel.defaultContextMenu
               ];
     }

package/admin/tabs/userData/roles/editor/RoleEditor.ts

@@ -33,23 +33,24 @@ export const roleEditor = hoistCmp.factory({
                 mask: savingTask,
                 bbar: [
                     button({
-                        onClick: () => model.deleteAsync(),
+                        text: 'Delete',
                         icon: Icon.delete(),
                         intent: 'danger',
-                        text: 'Delete',
-                        disabled: !role
+                        disabled: !role,
+                        onClick: () => model.deleteAsync()
                     }),
                     filler(),
                     button({
-                        onClick: () => model.cancel(),
-                        text: 'Cancel'
+                        text: 'Cancel',
+                        onClick: () => model.cancel()
                     }),
                     button({
-                        onClick: () => model.saveAsync(),
+                        text: 'Save Changes',
                         icon: Icon.check(),
                         intent: 'success',
-                        text: 'Save',
-                        disabled: saveDisabled
+                        outlined: true,
+                        disabled: saveDisabled,
+                        onClick: () => model.saveAsync()
                     })
                 ]
             })

package/admin/tabs/userData/roles/editor/RoleEditorModel.ts

@@ -5,7 +5,6 @@
  * Copyright © 2024 Extremely Heavy Industries Inc.
  */
 import {HoistModel, managed, TaskObserver, XH} from '@xh/hoist/core';
-import {Icon} from '@xh/hoist/icon';
 import {action, computed, makeObservable, observable} from '@xh/hoist/mobx';
 import {omit} from 'lodash';
 import {RoleModel} from '../RoleModel';
@@ -78,15 +77,13 @@ export class RoleEditorModel extends HoistModel {
             this.doCancel();
         } else {
             XH.confirm({
-                icon: Icon.warning(),
-                title: 'Discard unsaved changes?',
                 message: 'You have unsaved changes. Are you sure you wish to proceed?',
                 cancelProps: {
                     text: 'Keep editing'
                 },
                 confirmProps: {
-                    intent: 'danger',
-                    text: 'Discard changes'
+                    text: 'Discard Changes',
+                    intent: 'danger'
                 },
                 onConfirm: () => this.doCancel()
             });

package/admin/tabs/userData/roles/editor/form/RoleFormModel.ts

@@ -159,6 +159,7 @@ export class RoleFormModel extends HoistModel {
         return new GridModel({
             emptyText: 'None added.',
             hideHeaders: true,
+            showHover: true,
             selModel: 'multiple',
             store: {
                 fields: [{name: 'error', type: 'string'}],
@@ -194,6 +195,7 @@ export class RoleFormModel extends HoistModel {
                             ...props,
                             inputProps: {
                                 enableCreate: entity !== 'ROLE',
+                                createMessageFn: user => `Add ${user}`,
                                 options: this.filterSelected(options, selected)
                             }
                         });

package/admin/tabs/userData/roles/recategorize/RecategorizeDialog.ts

@@ -24,7 +24,7 @@ export const recategorizeDialog = hoistCmp.factory({
         return dialog({
             title: `Change Category (${model.selectedRecords.length} roles)`,
             icon: Icon.folder(),
-            style: {width: 300},
+            style: {width: 400},
             isOpen: true,
             isCloseButtonShown: false,
             item: panel({
@@ -35,7 +35,7 @@ export const recategorizeDialog = hoistCmp.factory({
                         bind: 'categoryName',
                         enableCreate: true,
                         options: model.options,
-                        width: 260
+                        width: '100%'
                     })
                 ),
                 bbar: bbar()
@@ -52,9 +52,10 @@ const bbar = hoistCmp.factory<RecategorizeDialogModel>(({model}) => {
             onClick: () => model.close()
         }),
         button({
-            text: 'Save',
+            text: 'Save Changes',
             icon: Icon.check(),
             intent: 'success',
+            outlined: true,
             disabled: model.categoryName == null,
             onClick: () => model.saveAsync()
         })

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

@@ -1,21 +1,21 @@
 import { RowDoubleClickedEvent } from '@ag-grid-community/core';
 import { BaseFieldConfig } from '@xh/hoist/cmp/form';
 import { GridConfig, GridModel } from '@xh/hoist/cmp/grid';
-import { HoistModel, PlainObject, ElementSpec } from '@xh/hoist/core';
+import { ElementSpec, HoistModel, PlainObject } from '@xh/hoist/core';
 import '@xh/hoist/desktop/register';
 import { RecordAction, RecordActionSpec, StoreRecord } from '@xh/hoist/data';
+import { ExportOptions } from '@xh/hoist/svc';
+import { FormFieldProps } from '../form';
 import { RestStore, RestStoreConfig } from './data/RestStore';
 import { RestFormModel } from './impl/RestFormModel';
-import { FormFieldProps } from '../form';
-import { ExportOptions } from '@xh/hoist/svc';
 export interface RestGridConfig extends GridConfig {
     store?: RestStore | RestStoreConfig;
     /** Prevent users from creating, updating, or destroying a record. Defaults to false. */
     readonly?: boolean;
     /** Actions to display in the toolbar. Defaults to add, edit, delete. */
     toolbarActions?: Array<RecordAction | RecordActionSpec>;
-    /** actions to display in the grid context menu. Defaults to add, edit, delete. */
-    menuActions?: Array<RecordAction | RecordActionSpec>;
+    /** Actions to display in the grid context menu. Defaults to add, edit, delete. */
+    menuActions?: Array<RecordAction | RecordActionSpec | '-'>;
     /** Actions to display in the form toolbar. Defaults to delete. */
     formActions?: Array<RecordAction | RecordActionSpec>;
     /** Warning to display before actions on a selection of  records. */
@@ -68,7 +68,7 @@ export declare class RestGridModel extends HoistModel {
     readonly: boolean;
     editors: RestGridEditor[];
     toolbarActions: Array<RecordAction | RecordActionSpec>;
-    menuActions: Array<RecordAction | RecordActionSpec>;
+    menuActions: Array<RecordAction | RecordActionSpec | '-'>;
     formActions: Array<RecordAction | RecordActionSpec>;
     prepareCloneFn: (input: {
         record: StoreRecord;

package/desktop/cmp/rest/RestGridModel.ts

@@ -8,17 +8,16 @@
 import {RowDoubleClickedEvent} from '@ag-grid-community/core';
 import {BaseFieldConfig} from '@xh/hoist/cmp/form';
 import {GridConfig, GridModel} from '@xh/hoist/cmp/grid';
-import {HoistModel, managed, PlainObject, ElementSpec, XH} from '@xh/hoist/core';
+import {ElementSpec, HoistModel, managed, PlainObject, XH} from '@xh/hoist/core';
 import '@xh/hoist/desktop/register';
 import {RecordAction, RecordActionSpec, StoreRecord} from '@xh/hoist/data';
-import {Icon} from '@xh/hoist/icon/Icon';
+import {ExportOptions} from '@xh/hoist/svc';
 import {pluralize, throwIf, withDefault} from '@xh/hoist/utils/js';
 import {isFunction} from 'lodash';
-import {RestStore, RestStoreConfig} from './data/RestStore';
-import {RestFormModel} from './impl/RestFormModel';
 import {FormFieldProps} from '../form';
 import {addAction, deleteAction, editAction, viewAction} from './Actions';
-import {ExportOptions} from '@xh/hoist/svc';
+import {RestStore, RestStoreConfig} from './data/RestStore';
+import {RestFormModel} from './impl/RestFormModel';
 
 export interface RestGridConfig extends GridConfig {
     store?: RestStore | RestStoreConfig;
@@ -29,8 +28,8 @@ export interface RestGridConfig extends GridConfig {
     /** Actions to display in the toolbar. Defaults to add, edit, delete. */
     toolbarActions?: Array<RecordAction | RecordActionSpec>;
 
-    /** actions to display in the grid context menu. Defaults to add, edit, delete. */
-    menuActions?: Array<RecordAction | RecordActionSpec>;
+    /** Actions to display in the grid context menu. Defaults to add, edit, delete. */
+    menuActions?: Array<RecordAction | RecordActionSpec | '-'>;
 
     /** Actions to display in the form toolbar. Defaults to delete. */
     formActions?: Array<RecordAction | RecordActionSpec>;
@@ -96,7 +95,7 @@ export class RestGridModel extends HoistModel {
     readonly: boolean;
     editors: RestGridEditor[];
     toolbarActions: Array<RecordAction | RecordActionSpec>;
-    menuActions: Array<RecordAction | RecordActionSpec>;
+    menuActions: Array<RecordAction | RecordActionSpec | '-'>;
     formActions: Array<RecordAction | RecordActionSpec>;
     prepareCloneFn: (input: {record: StoreRecord; clone: PlainObject}) => void;
     unit: string;
@@ -243,9 +242,7 @@ export class RestGridModel extends HoistModel {
             warning = this.actionWarning.del,
             message = isFunction(warning) ? warning(records) : warning;
 
-        message
-            ? XH.confirm({message, title: 'Warning', icon: Icon.warning(), onConfirm: delFn})
-            : delFn();
+        message ? XH.confirm({message, title: 'Warning', onConfirm: delFn}) : delFn();
     }
 
     async exportAsync(options?: ExportOptions) {

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

@@ -80,9 +80,10 @@ const tbar = hoistCmp.factory<RestFormModel>(({model}) => {
             onClick: () => model.close()
         }),
         button({
-            text: 'Save',
+            text: 'Save Changes',
             icon: Icon.check(),
             intent: 'success',
+            outlined: true,
             disabled: !model.isAdd && !formModel.isDirty,
             onClick: () => model.validateAndSaveAsync(),
             omit: formModel.readonly

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

@@ -8,9 +8,8 @@ import {FormModel} from '@xh/hoist/cmp/form';
 import {HoistModel, managed, PlainObject, XH} from '@xh/hoist/core';
 import {required} from '@xh/hoist/data';
 import {RestGridEditor, RestGridModel} from '@xh/hoist/desktop/cmp/rest';
-import {Icon} from '@xh/hoist/icon';
 import {action, makeObservable, observable} from '@xh/hoist/mobx';
-import {throwIf, mergeDeep} from '@xh/hoist/utils/js';
+import {mergeDeep, throwIf} from '@xh/hoist/utils/js';
 import {isFunction, isNil} from 'lodash';
 import {createRef} from 'react';
 import {RestField} from '../data/RestField';
@@ -119,7 +118,7 @@ export class RestFormModel extends HoistModel {
         const warning = this.actionWarning[this.isAdd ? 'add' : 'edit'],
             message = isFunction(warning) ? warning([this.currentRecord]) : warning;
         if (message) {
-            if (!(await XH.confirm({message, title: 'Warning', icon: Icon.warning()}))) {
+            if (!(await XH.confirm({message, title: 'Warning'}))) {
                 return;
             }
         }

package/package.json

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