@xh/hoist 67.0.0-SNAPSHOT.1725046027559 → 67.0.0-SNAPSHOT.1725048431197

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/connpool/ConnPoolMonitorPanel.ts

@@ -35,6 +35,7 @@ export const connPoolMonitorPanel = hoistCmp.factory({
                     omit: readonly,
                     onClick: () => model.takeSnapshotAsync()
                 }),
+                '-',
                 button({
                     text: 'Reset Stats',
                     icon: Icon.reset(),

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

@@ -18,9 +18,9 @@ import {isEmpty} from 'lodash';
 
 export class HzObjectModel extends BaseInstanceModel {
     clearAction: RecordActionSpec = {
-        icon: Icon.reset(),
         text: 'Clear Objects',
-        intent: 'danger',
+        icon: Icon.reset(),
+        intent: 'warning',
         actionFn: () => this.clearAsync(),
         displayFn: ({selectedRecords}) => ({
             hidden: AppModel.readonly,
@@ -80,8 +80,9 @@ export class HzObjectModel extends BaseInstanceModel {
                 ),
                 confirmProps: {
                     text: 'Clear Objects',
+                    icon: Icon.reset(),
+                    intent: 'warning',
                     outlined: true,
-                    intent: 'danger',
                     autoFocus: false
                 }
             }))
@@ -115,7 +116,8 @@ export class HzObjectModel extends BaseInstanceModel {
             ),
             confirmProps: {
                 text: 'Clear Hibernate Caches',
-                intent: 'danger',
+                icon: Icon.reset(),
+                intent: 'warning',
                 outlined: true,
                 autoFocus: false
             }

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

@@ -25,10 +25,11 @@ export const hzObjectPanel = hoistCmp.factory({
                     selModel: model.gridModel.selModel,
                     actions: [model.clearAction]
                 }),
+                '-',
                 button({
                     text: 'Clear Hibernate Caches',
                     icon: Icon.reset(),
-                    intent: 'danger',
+                    intent: 'warning',
                     tooltip: 'Clear the Hibernate caches using the native Hibernate API',
                     onClick: () => model.clearHibernateCachesAsync()
                 }),

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

@@ -36,12 +36,14 @@ export const memoryMonitorPanel = hoistCmp.factory({
                     omit: readonly,
                     onClick: () => model.takeSnapshotAsync()
                 }),
+                '-',
                 button({
                     text: 'Request GC',
                     icon: Icon.trash(),
                     omit: readonly,
                     onClick: () => model.requestGcAsync()
                 }),
+                '-',
                 button({
                     text: 'Dump Heap',
                     icon: Icon.fileArchive(),

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

@@ -18,9 +18,9 @@ import {isEmpty, lowerFirst} from 'lodash';
 
 export class ServiceModel extends BaseInstanceModel {
     clearCachesAction: RecordActionSpec = {
-        icon: Icon.reset(),
         text: 'Clear Caches',
-        intent: 'danger',
+        icon: Icon.reset(),
+        intent: 'warning',
         actionFn: () => this.clearCachesAsync(false),
         displayFn: () => ({
             hidden: AppModel.readonly,
@@ -30,9 +30,9 @@ export class ServiceModel extends BaseInstanceModel {
     };
 
     clearClusterCachesAction: RecordActionSpec = {
-        icon: Icon.reset(),
         text: 'Clear Caches (entire cluster)',
-        intent: 'danger',
+        icon: Icon.reset(),
+        intent: 'warning',
         actionFn: () => this.clearCachesAsync(true),
         displayFn: () => ({
             hidden: AppModel.readonly || !this.parent.isMultiInstance
@@ -91,8 +91,9 @@ export class ServiceModel extends BaseInstanceModel {
             ),
             confirmProps: {
                 text: 'Clear Caches',
+                icon: Icon.reset(),
+                intent: 'warning',
                 outlined: true,
-                intent: 'danger',
                 autoFocus: false
             }
         });

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

@@ -117,8 +117,8 @@ export class WebSocketModel extends BaseInstanceModel {
         if (isEmpty(selectedRecords)) return;
 
         const message = await XH.prompt<string>({
-            title: 'Force suspend',
-            icon: Icon.stopCircle(),
+            title: 'Please confirm...',
+            icon: Icon.warning(),
             confirmProps: {
                 text: 'Force Suspend',
                 icon: Icon.stopCircle(),

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/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/RolePanel.ts

@@ -45,7 +45,12 @@ export const rolePanel = hoistCmp.factory({
                     }),
                     '-',
                     filterChooser({flex: 1}),
-                    switchInput({bind: 'showInGroups', label: 'Show in Groups', labelSide: 'left'})
+                    '-',
+                    switchInput({
+                        bind: 'showInGroups',
+                        label: 'Group by Category',
+                        labelSide: 'left'
+                    })
                 ],
                 item: hframe(vframe(grid(), roleGraph()), detailsPanel())
             }),

package/admin/tabs/userData/roles/graph/RoleGraph.ts

@@ -6,7 +6,7 @@
  */
 import {chart} from '@xh/hoist/cmp/chart';
 import {errorBoundary} from '@xh/hoist/cmp/error';
-import {div, hspacer, placeholder} from '@xh/hoist/cmp/layout';
+import {div, filler, placeholder, span} from '@xh/hoist/cmp/layout';
 import {creates, hoistCmp} from '@xh/hoist/core';
 import {button} from '@xh/hoist/desktop/cmp/button';
 import {buttonGroupInput, slider, switchInput} from '@xh/hoist/desktop/cmp/input';
@@ -29,7 +29,7 @@ export const roleGraph = hoistCmp.factory({
         return panel({
             compactHeader: true,
             icon: Icon.treeGraph(),
-            title: role ? `Relationships - ${role.name} ` : 'Relationships',
+            title: role ? `${role.name} Relationships` : 'Relationships',
             item: div({
                 item: div({
                     style: {margin: 'auto'},
@@ -48,15 +48,31 @@ export const roleGraph = hoistCmp.factory({
                         items: [
                             button({
                                 value: 'effective',
-                                text: `Granted to ${role?.effectiveRoles.length} ${pluralize('role', role?.effectiveRoles.length)}`
+                                text: `Granted to ${pluralize('role', role?.effectiveRoles.length, true)}`
                             }),
                             button({
                                 value: 'inherited',
-                                text: `Inheriting from ${role?.inheritedRoles.length} ${pluralize('role', role?.inheritedRoles.length)}`
+                                text: `Inheriting from ${pluralize('role', role?.inheritedRoles.length, true)}`
                             })
                         ]
                     }),
-                    hspacer(10),
+                    filler(),
+                    span('Limit to one level'),
+                    switchInput({
+                        bind: 'limitToOneLevel'
+                    }),
+                    '-',
+                    span('Zoom'),
+                    slider({
+                        paddingLeft: 2,
+                        overflow: 'visible',
+                        bind: 'widthScale',
+                        min: 0,
+                        max: 2,
+                        stepSize: 0.005,
+                        labelRenderer: false
+                    }),
+                    '-',
                     buttonGroupInput({
                         bind: 'inverted',
                         items: [
@@ -69,21 +85,6 @@ export const roleGraph = hoistCmp.factory({
                                 icon: Icon.treeGraph({rotation: 270})
                             })
                         ]
-                    }),
-                    hspacer(10),
-                    'Zoom',
-                    slider({
-                        paddingLeft: 2,
-                        overflow: 'visible',
-                        bind: 'widthScale',
-                        min: 0,
-                        max: 2,
-                        stepSize: 0.005,
-                        labelRenderer: false
-                    }),
-                    'Limit to one level',
-                    switchInput({
-                        bind: 'limitToOneLevel'
                     })
                 ],
                 omit: !role

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()

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/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.1725046027559",
+  "version": "67.0.0-SNAPSHOT.1725048431197",
   "description": "Hoist add-on for building and deploying React Applications.",
   "repository": "github:xh/hoist-react",
   "homepage": "https://xh.io",