@xh/hoist 69.0.0-SNAPSHOT.1728431598764 → 69.0.0-SNAPSHOT.1728501806283

package/admin/tabs/cluster/connpool/ConnPoolMonitorPanel.ts

@@ -14,6 +14,7 @@ import {button, exportButton} from '@xh/hoist/desktop/cmp/button';
 import {errorMessage} from '@xh/hoist/desktop/cmp/error';
 import {jsonInput} from '@xh/hoist/desktop/cmp/input';
 import {panel} from '@xh/hoist/desktop/cmp/panel';
+import {toolbar} from '@xh/hoist/desktop/cmp/toolbar';
 import {Icon} from '@xh/hoist/icon';
 
 export const connPoolMonitorPanel = hoistCmp.factory({
@@ -26,28 +27,8 @@ export const connPoolMonitorPanel = hoistCmp.factory({
             });
         }
 
-        const {readonly} = AppModel;
         return panel({
-            bbar: [
-                button({
-                    text: 'Take Snapshot',
-                    icon: Icon.camera(),
-                    omit: readonly,
-                    onClick: () => model.takeSnapshotAsync()
-                }),
-                '-',
-                button({
-                    text: 'Reset Stats',
-                    icon: Icon.reset(),
-                    omit: readonly,
-                    onClick: () => model.resetStatsAsync()
-                }),
-                filler(),
-                gridCountLabel({unit: 'snapshot'}),
-                '-',
-                exportButton()
-            ],
-            items: hframe(
+            item: hframe(
                 vframe(
                     grid(),
                     panel({
@@ -60,12 +41,38 @@ export const connPoolMonitorPanel = hoistCmp.factory({
                 ),
                 poolConfigPanel()
             ),
-            mask: 'onLoad',
-            ref: model.viewRef
+            bbar: bbar(),
+            ref: model.viewRef,
+            mask: 'onLoad'
         });
     }
 });
 
+const bbar = hoistCmp.factory<ConnPoolMonitorModel>({
+    render({model}) {
+        const {readonly} = AppModel;
+        return toolbar(
+            button({
+                text: 'Take Snapshot',
+                icon: Icon.camera(),
+                omit: readonly,
+                onClick: () => model.takeSnapshotAsync()
+            }),
+            '-',
+            button({
+                text: 'Reset Stats',
+                icon: Icon.reset(),
+                omit: readonly,
+                onClick: () => model.resetStatsAsync()
+            }),
+            filler(),
+            gridCountLabel({unit: 'snapshot'}),
+            '-',
+            exportButton()
+        );
+    }
+});
+
 const poolConfigPanel = hoistCmp.factory<ConnPoolMonitorModel>({
     render({model}) {
         return panel({

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

@@ -13,6 +13,7 @@ import * as Col from '@xh/hoist/cmp/grid/columns';
 import {br, fragment} from '@xh/hoist/cmp/layout';
 import {LoadSpec, managed, PlainObject, XH} from '@xh/hoist/core';
 import {RecordActionSpec} from '@xh/hoist/data';
+import {PanelModel} from '@xh/hoist/desktop/cmp/panel';
 import {Icon} from '@xh/hoist/icon';
 import {bindable, makeObservable} from '@xh/hoist/mobx';
 import {first, isEmpty, last} from 'lodash';
@@ -20,6 +21,11 @@ import {first, isEmpty, last} from 'lodash';
 export class HzObjectModel extends BaseInstanceModel {
     @bindable groupBy: 'type' | 'owner' = 'owner';
 
+    @managed detailPanelModel = new PanelModel({
+        side: 'right',
+        defaultSize: 450
+    });
+
     clearAction: RecordActionSpec = {
         text: 'Clear Objects',
         icon: Icon.reset(),
@@ -37,6 +43,7 @@ export class HzObjectModel extends BaseInstanceModel {
     gridModel = new GridModel({
         selModel: 'multiple',
         enableExport: true,
+        autosizeOptions: {mode: 'managed', includeCollapsedChildren: true},
         exportOptions: {filename: exportFilenameWithDate('distributed-objects'), columns: 'ALL'},
         sortBy: 'displayName',
         groupBy: this.groupBy,
@@ -54,10 +61,10 @@ export class HzObjectModel extends BaseInstanceModel {
             processRawData: o => this.processRawData(o)
         },
         columns: [
-            {field: 'displayName', flex: 1},
+            {field: 'displayName'},
             {field: 'owner'},
             {field: 'type'},
-            {field: 'size', displayName: 'Entry Count', ...Col.number, width: 130},
+            {field: 'size', displayName: 'Entries', ...Col.number},
             {
                 ...timestampNoYear,
                 field: 'lastUpdateTime',

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

@@ -62,8 +62,7 @@ const detailsPanel = hoistCmp.factory({
     }
 });
 
-const bbar = hoistCmp.factory({
-    model: uses(HzObjectModel),
+const bbar = hoistCmp.factory<HzObjectModel>({
     render({model}) {
         return toolbar(
             recordActionBar({
@@ -89,7 +88,8 @@ const bbar = hoistCmp.factory({
                 ],
                 width: 125,
                 bind: 'groupBy',
-                hideDropdownIndicator: true
+                hideDropdownIndicator: true,
+                enableFilter: false
             }),
             storeFilterField({matchMode: 'any'}),
             exportButton()

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

@@ -8,11 +8,12 @@ import {AppModel} from '@xh/hoist/admin/AppModel';
 import {MemoryMonitorModel} from '@xh/hoist/admin/tabs/cluster/memory/MemoryMonitorModel';
 import {chart} from '@xh/hoist/cmp/chart';
 import {grid, gridCountLabel} from '@xh/hoist/cmp/grid';
-import {filler} from '@xh/hoist/cmp/layout';
+import {filler, vframe} from '@xh/hoist/cmp/layout';
 import {creates, hoistCmp} from '@xh/hoist/core';
 import {button, exportButton} from '@xh/hoist/desktop/cmp/button';
 import {errorMessage} from '@xh/hoist/desktop/cmp/error';
 import {panel} from '@xh/hoist/desktop/cmp/panel';
+import {toolbar} from '@xh/hoist/desktop/cmp/toolbar';
 import {Icon} from '@xh/hoist/icon';
 import {isNil} from 'lodash';
 
@@ -26,40 +27,8 @@ export const memoryMonitorPanel = hoistCmp.factory({
             });
         }
 
-        const {readonly} = AppModel,
-            dumpDisabled = isNil(model.heapDumpDir);
         return panel({
-            bbar: [
-                button({
-                    text: 'Take Snapshot',
-                    icon: Icon.camera(),
-                    omit: readonly,
-                    onClick: () => model.takeSnapshotAsync()
-                }),
-                '-',
-                button({
-                    text: 'Request GC',
-                    icon: Icon.trash(),
-                    omit: readonly,
-                    onClick: () => model.requestGcAsync()
-                }),
-                '-',
-                button({
-                    text: 'Dump Heap',
-                    icon: Icon.fileArchive(),
-                    omit: readonly,
-                    disabled: dumpDisabled,
-                    tooltip: dumpDisabled
-                        ? 'Missing required config xhMemoryMonitoringConfig.heapDumpDir'
-                        : null,
-                    onClick: () => model.dumpHeapAsync()
-                }),
-                filler(),
-                gridCountLabel({unit: 'snapshot'}),
-                '-',
-                exportButton()
-            ],
-            items: [
+            item: vframe(
                 grid(),
                 panel({
                     modelConfig: {
@@ -68,9 +37,48 @@ export const memoryMonitorPanel = hoistCmp.factory({
                     },
                     item: chart()
                 })
-            ],
-            mask: 'onLoad',
-            ref: model.viewRef
+            ),
+            bbar: bbar(),
+            ref: model.viewRef,
+            mask: 'onLoad'
         });
     }
 });
+
+const bbar = hoistCmp.factory<MemoryMonitorModel>({
+    render({model}) {
+        const {readonly} = AppModel,
+            dumpDisabled = isNil(model.heapDumpDir);
+
+        return toolbar(
+            button({
+                text: 'Take Snapshot',
+                icon: Icon.camera(),
+                omit: readonly,
+                onClick: () => model.takeSnapshotAsync()
+            }),
+            '-',
+            button({
+                text: 'Request GC',
+                icon: Icon.trash(),
+                omit: readonly,
+                onClick: () => model.requestGcAsync()
+            }),
+            '-',
+            button({
+                text: 'Dump Heap',
+                icon: Icon.fileArchive(),
+                omit: readonly,
+                disabled: dumpDisabled,
+                tooltip: dumpDisabled
+                    ? 'Missing required config xhMemoryMonitoringConfig.heapDumpDir'
+                    : null,
+                onClick: () => model.dumpHeapAsync()
+            }),
+            filler(),
+            gridCountLabel({unit: 'snapshot'}),
+            '-',
+            exportButton()
+        );
+    }
+});

package/build/types/admin/tabs/cluster/hzobject/HzObjectModel.d.ts

@@ -2,8 +2,10 @@ import { BaseInstanceModel } from '@xh/hoist/admin/tabs/cluster/BaseInstanceMode
 import { GridModel } from '@xh/hoist/cmp/grid';
 import { LoadSpec } from '@xh/hoist/core';
 import { RecordActionSpec } from '@xh/hoist/data';
+import { PanelModel } from '@xh/hoist/desktop/cmp/panel';
 export declare class HzObjectModel extends BaseInstanceModel {
     groupBy: 'type' | 'owner';
+    detailPanelModel: PanelModel;
     clearAction: RecordActionSpec;
     gridModel: GridModel;
     constructor();

package/package.json

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