@xh/hoist 73.0.0-SNAPSHOT.1741882685374 → 73.0.0-SNAPSHOT.1741967769000

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

@@ -149,7 +149,7 @@ export class InstancesTabModel extends HoistModel {
                 },
                 {
                     ...usedHeapMb,
-                    headerName: 'Heap (MB)'
+                    headerName: 'Heap (mb)'
                 },
                 {
                     ...usedPctMax,
@@ -214,11 +214,12 @@ export class InstancesTabModel extends HoistModel {
     private async shutdownInstanceAsync(instance: PlainObject) {
         if (
             !(await XH.confirm({
-                message: `Are you SURE you want to shutdown instance ${instance.name}?`,
+                message: `Are you sure you wish to immediately terminate instance ${instance.name}?`,
                 confirmProps: {
                     icon: Icon.skull(),
-                    text: 'Shutdown Now',
+                    text: 'Yes, kill the instance',
                     intent: 'danger',
+                    outlined: true,
                     autoFocus: false
                 }
             }))

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

@@ -6,12 +6,12 @@
  */
 import {clock} from '@xh/hoist/cmp/clock';
 import {grid} from '@xh/hoist/cmp/grid';
-import {code, filler, fragment, hspacer, label, placeholder} from '@xh/hoist/cmp/layout';
+import {filler, fragment, hspacer, label, placeholder} from '@xh/hoist/cmp/layout';
+import {loadingIndicator} from '@xh/hoist/cmp/loadingindicator';
 import {hoistCmp, uses, XH} from '@xh/hoist/core';
 import {button, modalToggleButton} from '@xh/hoist/desktop/cmp/button';
 import {gridFindField} from '@xh/hoist/desktop/cmp/grid';
 import {numberInput, switchInput, textInput} from '@xh/hoist/desktop/cmp/input';
-import {loadingIndicator} from '@xh/hoist/cmp/loadingindicator';
 import {panel} from '@xh/hoist/desktop/cmp/panel';
 import {toolbar, toolbarSep} from '@xh/hoist/desktop/cmp/toolbar';
 import {Icon} from '@xh/hoist/icon';
@@ -48,7 +48,7 @@ const tbar = hoistCmp.factory<LogDisplayModel>(({model}) => {
         numberInput({
             bind: 'startLine',
             min: 1,
-            width: 80,
+            width: 70,
             disabled: model.tail,
             displayWithCommas: true
         }),
@@ -57,13 +57,13 @@ const tbar = hoistCmp.factory<LogDisplayModel>(({model}) => {
         numberInput({
             bind: 'maxLines',
             min: 1,
-            width: 80,
+            width: 70,
             displayWithCommas: true
         }),
         '-',
         textInput({
             bind: 'pattern',
-            placeholder: 'Filter',
+            placeholder: 'Filter lines...',
             leftIcon: Icon.filter(),
             flex: 1,
             rightElement: fragment(
@@ -85,7 +85,7 @@ const tbar = hoistCmp.factory<LogDisplayModel>(({model}) => {
                 })
             )
         }),
-        gridFindField({flex: 1}),
+        gridFindField({flex: 1, placeholder: 'Find lines...'}),
         '-',
         switchInput({
             bind: 'tail',
@@ -123,16 +123,14 @@ const bbar = hoistCmp.factory<LogDisplayModel>({
             }),
             filler(),
             Icon.clock(),
-            code(
-                clock({
-                    timezone: zone,
-                    format: 'HH:mm',
-                    suffix: fmtTimeZone(zone, offset)
-                })
-            ),
+            clock({
+                timezone: zone,
+                format: 'HH:mm',
+                suffix: fmtTimeZone(zone, offset)
+            }),
             fragment({
                 omit: !logRootPath,
-                items: [toolbarSep(), Icon.folder(), code(logRootPath)]
+                items: [toolbarSep(), Icon.folder({className: 'xh-margin-right'}), logRootPath]
             })
         );
     }

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

@@ -5,8 +5,8 @@
  * Copyright © 2025 Extremely Heavy Industries Inc.
  */
 import {logLevelDialog} from '@xh/hoist/admin/tabs/cluster/instances/logs/levels/LogLevelDialog';
-import {grid} from '@xh/hoist/cmp/grid';
-import {hframe} from '@xh/hoist/cmp/layout';
+import {grid, gridCountLabel} from '@xh/hoist/cmp/grid';
+import {filler, hframe} from '@xh/hoist/cmp/layout';
 import {storeFilterField} from '@xh/hoist/cmp/store';
 import {creates, hoistCmp} from '@xh/hoist/core';
 import {errorMessage} from '@xh/hoist/cmp/error';
@@ -37,9 +37,8 @@ export const logViewer = hoistCmp.factory({
                         side: 'left',
                         defaultSize: 380
                     },
-                    item: grid(),
-                    bbar: [
-                        storeFilterField({flex: 1}),
+                    tbar: [
+                        storeFilterField({flex: 1, placeholder: 'Filter files...'}),
                         select({
                             leftIcon: Icon.server(),
                             bind: 'instanceOnly',
@@ -53,6 +52,8 @@ export const logViewer = hoistCmp.factory({
                             ]
                         })
                     ],
+                    item: grid(),
+                    bbar: [filler(), gridCountLabel({unit: 'log file'})],
                     mask: 'onLoad'
                 }),
                 logDisplay(),

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

@@ -13,6 +13,7 @@ import {RecordActionSpec} from '@xh/hoist/data';
 import {compactDateRenderer, fmtNumber} from '@xh/hoist/format';
 import {Icon} from '@xh/hoist/icon';
 import {bindable, makeObservable, observable} from '@xh/hoist/mobx';
+import {pluralize} from '@xh/hoist/utils/js';
 import download from 'downloadjs';
 import {LogDisplayModel} from './LogDisplayModel';
 
@@ -119,7 +120,13 @@ export class LogViewerModel extends BaseInstanceModel {
             if (!count) return;
 
             const confirmed = await XH.confirm({
-                message: `Delete ${count} log files on the server? This cannot be undone.`
+                message: `Are you sure you want to delete ${pluralize('log file', count, true)}? This cannot be undone.`,
+                confirmProps: {
+                    text: `Yes, delete the ${pluralize('file', count)}`,
+                    intent: 'danger',
+                    outlined: true,
+                    autoFocus: false
+                }
             });
             if (!confirmed) return;
 

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

@@ -131,6 +131,7 @@ export class MemoryMonitorModel extends BaseInstanceModel {
                 },
                 {
                     groupId: 'GC',
+                    headerName: 'Garbage Collection',
                     headerAlign: 'center',
                     children: [collectionCount, avgCollectionTime, pctCollectionTime]
                 }

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

@@ -5,7 +5,6 @@
  * Copyright © 2025 Extremely Heavy Industries Inc.
  */
 import {HoistModel, LoadSpec, lookup, PlainObject, XH} from '@xh/hoist/core';
-import {StoreRecord} from '@xh/hoist/data';
 import {bindable} from '@xh/hoist/mobx';
 import {ServiceModel} from './ServiceModel';
 
@@ -14,7 +13,7 @@ export class DetailsModel extends HoistModel {
     parent: ServiceModel;
 
     @bindable.ref
-    svcName: StoreRecord;
+    svcName: String;
 
     @bindable.ref
     stats: PlainObject;

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

@@ -11,6 +11,7 @@ import {errorMessage} from '@xh/hoist/cmp/error';
 import {panel} from '@xh/hoist/desktop/cmp/panel';
 import {jsonInput} from '@xh/hoist/desktop/cmp/input';
 import {Icon} from '@xh/hoist/icon';
+import {isEmpty} from 'lodash';
 
 export const detailsPanel = hoistCmp.factory({
     model: creates(DetailsModel),
@@ -18,7 +19,7 @@ export const detailsPanel = hoistCmp.factory({
     render({model}) {
         const {svcName} = model;
         return panel({
-            title: svcName ? `Stats: ${svcName}` : 'Stats',
+            title: svcName ?? 'Stats',
             mask: 'onLoad',
             icon: Icon.info(),
             compactHeader: true,
@@ -42,18 +43,22 @@ const stats = hoistCmp.factory<DetailsModel>({
             });
         }
 
-        if (stats == null) return null;
-
-        return panel(
-            jsonInput({
-                readonly: true,
-                width: '100%',
-                height: '100%',
-                enableSearch: true,
-                showFullscreenButton: false,
-                editorProps: {lineNumbers: false},
-                value: model.parent.fmtStats(stats)
-            })
-        );
+        return isEmpty(stats)
+            ? placeholder(
+                  ...(loadModel.isPending
+                      ? []
+                      : [Icon.questionCircle(), 'This service does not report any admin stats.'])
+              )
+            : panel(
+                  jsonInput({
+                      readonly: true,
+                      width: '100%',
+                      height: '100%',
+                      enableSearch: true,
+                      showFullscreenButton: false,
+                      editorProps: {lineNumbers: false},
+                      value: model.parent.fmtStats(stats)
+                  })
+              );
     }
 });

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

@@ -10,7 +10,7 @@ import {timestampNoYear} from '@xh/hoist/admin/columns';
 import {BaseInstanceModel} from '@xh/hoist/admin/tabs/cluster/instances/BaseInstanceModel';
 import {GridModel} from '@xh/hoist/cmp/grid';
 import {br, fragment} from '@xh/hoist/cmp/layout';
-import {LoadSpec, managed, XH} from '@xh/hoist/core';
+import {LoadSpec, managed, PlainObject, XH} from '@xh/hoist/core';
 import {FilterLike, FilterTestFn, RecordActionSpec} from '@xh/hoist/data';
 import {Icon} from '@xh/hoist/icon';
 import {bindable, makeObservable} from '@xh/hoist/mobx';
@@ -52,15 +52,16 @@ export class ServiceModel extends BaseInstanceModel {
         selModel: 'multiple',
         enableExport: true,
         exportOptions: {filename: exportFilenameWithDate('services')},
+        groupBy: 'provider',
         store: {
             idSpec: 'name',
             processRawData: this.processRawData,
             fields: [
                 {name: 'provider', type: 'string'},
                 {name: 'name', type: 'string'},
-                {name: 'displayName', type: 'string'},
+                {name: 'displayName', type: 'string', displayName: 'Service'},
                 {name: 'initializedDate', type: 'date', displayName: 'Initialized'},
-                {name: 'lastCachesCleared', type: 'date', displayName: 'Last Cleared'}
+                {name: 'lastCachesCleared', type: 'date', displayName: 'Caches Last Cleared'}
             ]
         },
         sortBy: ['provider', 'displayName'],
@@ -81,6 +82,7 @@ export class ServiceModel extends BaseInstanceModel {
     constructor() {
         super();
         makeObservable(this);
+
         this.addReaction({
             track: () => [this.textFilter, this.typeFilter],
             run: this.applyFilters,
@@ -91,6 +93,7 @@ export class ServiceModel extends BaseInstanceModel {
     async clearCachesAsync(entireCluster: boolean) {
         const {gridModel, instanceName, loadModel} = this,
             {selectedRecords} = gridModel;
+
         if (isEmpty(selectedRecords)) return;
 
         const cacheStr =
@@ -131,19 +134,24 @@ export class ServiceModel extends BaseInstanceModel {
     }
 
     override async doLoadAsync(loadSpec: LoadSpec) {
+        const {gridModel, instanceName: instance} = this;
         try {
             const data = await XH.fetchJson({
                 url: 'serviceManagerAdmin/listServices',
-                params: {instance: this.instanceName},
+                params: {instance},
                 loadSpec
             });
-            return this.gridModel.loadData(data);
+
+            if (!loadSpec.isStale) {
+                gridModel.loadData(data);
+                gridModel.preSelectFirstAsync();
+            }
         } catch (e) {
             this.handleLoadException(e, loadSpec);
         }
     }
 
-    private processRawData(r) {
+    private processRawData(r: PlainObject) {
         const provider = r.name && r.name.startsWith('hoistCore') ? 'Hoist' : 'App';
         const displayName = lowerFirst(r.name.replace('hoistCore', ''));
         return {provider, displayName, ...r};

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

@@ -9,11 +9,11 @@ import {grid, gridCountLabel} from '@xh/hoist/cmp/grid';
 import {filler, hframe} from '@xh/hoist/cmp/layout';
 import {storeFilterField} from '@xh/hoist/cmp/store';
 import {creates, hoistCmp, uses} from '@xh/hoist/core';
-import {exportButton} from '@xh/hoist/desktop/cmp/button';
+import {button, exportButton} from '@xh/hoist/desktop/cmp/button';
+import {buttonGroupInput} from '@xh/hoist/desktop/cmp/input';
 import {panel} from '@xh/hoist/desktop/cmp/panel';
 import {recordActionBar} from '@xh/hoist/desktop/cmp/record';
 import {toolbar} from '@xh/hoist/desktop/cmp/toolbar';
-import {select} from '@xh/hoist/desktop/cmp/input';
 import {ServiceModel} from './ServiceModel';
 
 export const servicePanel = hoistCmp.factory({
@@ -52,15 +52,14 @@ const bbar = hoistCmp.factory({
             filler(),
             gridCountLabel({unit: 'service'}),
             '-',
-            select({
-                options: [
-                    {value: 'all', label: 'All'},
-                    {value: 'app', label: 'App Only'},
-                    {value: 'hoist', label: 'Hoist Only'}
-                ],
-                width: 125,
+            buttonGroupInput({
                 bind: 'typeFilter',
-                hideDropdownIndicator: true
+                outlined: true,
+                items: [
+                    button({value: 'all', text: 'All'}),
+                    button({value: 'app', text: 'App'}),
+                    button({value: 'hoist', text: 'Hoist'})
+                ]
             }),
             storeFilterField({
                 matchMode: 'any',

package/build/types/admin/tabs/cluster/instances/services/DetailsModel.d.ts

@@ -1,11 +1,10 @@
 import { HoistModel, LoadSpec, PlainObject } from '@xh/hoist/core';
-import { StoreRecord } from '@xh/hoist/data';
 import { ServiceModel } from './ServiceModel';
 export declare class DetailsModel extends HoistModel {
     parent: ServiceModel;
-    svcName: StoreRecord;
+    svcName: String;
     stats: PlainObject;
-    get selectedRecord(): StoreRecord;
+    get selectedRecord(): import("../../../../../data").StoreRecord;
     onLinked(): void;
     doLoadAsync(loadSpec: LoadSpec): Promise<void>;
 }

package/package.json

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