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

package/CHANGELOG.md

@@ -11,6 +11,7 @@ is not expected to affect any applications.
 * Added new AppStates `AUTHENTICATING`, `INITIALIZING_HOIST`, and `INITIALIZING_APP` to support
 more granular tracking and timing of app startup lifecycle.
 * Improved the default "Loaded App" activity tracking entry with more granular data on load timing.
+* `RestGrid` now displays an optional refresh button in its toolbar.
 
 ### ⚙️ Technical
 

package/admin/tabs/activity/clienterrors/ClientErrorsModel.ts

@@ -180,6 +180,10 @@ export class ClientErrorsModel extends HoistModel {
         this.startDay = this.endDay.subtract(value, unit).nextDay();
     }
 
+    isInterval(value, unit) {
+        return this.startDay === this.endDay.subtract(value, unit).nextDay();
+    }
+
     @computed
     private get query() {
         return {

package/admin/tabs/activity/clienterrors/ClientErrorsPanel.ts

@@ -49,25 +49,29 @@ const tbar = hoistCmp.factory<ClientErrorsModel>(({model}) => {
                 text: '6m',
                 outlined: true,
                 width: 40,
-                onClick: () => model.adjustStartDate(6, 'months')
+                onClick: () => model.adjustStartDate(6, 'months'),
+                active: model.isInterval(6, 'months')
             }),
             button({
                 text: '1m',
                 outlined: true,
                 width: 40,
-                onClick: () => model.adjustStartDate(1, 'months')
+                onClick: () => model.adjustStartDate(1, 'months'),
+                active: model.isInterval(1, 'months')
             }),
             button({
                 text: '7d',
                 outlined: true,
                 width: 40,
-                onClick: () => model.adjustStartDate(7, 'days')
+                onClick: () => model.adjustStartDate(7, 'days'),
+                active: model.isInterval(7, 'days')
             }),
             button({
                 text: '1d',
                 outlined: true,
                 width: 40,
-                onClick: () => model.adjustStartDate(1, 'days')
+                onClick: () => model.adjustStartDate(1, 'days'),
+                active: model.isInterval(1, 'days')
             })
         ),
         hspacer(),

package/admin/tabs/activity/tracking/ActivityTrackingModel.ts

@@ -288,6 +288,11 @@ export class ActivityTrackingModel extends HoistModel {
         });
     }
 
+    isInterval(value, unit) {
+        const {startDay, endDay} = this.formModel.values;
+        return startDay === endDay.subtract(value, unit).nextDay();
+    }
+
     cubeLabelComparator(valA, valB, sortDir, abs, {recordA, recordB, defaultComparator}) {
         const rawA = recordA?.raw,
             rawB = recordB?.raw,

package/admin/tabs/activity/tracking/ActivityTrackingPanel.ts

@@ -69,25 +69,29 @@ const tbar = hoistCmp.factory<ActivityTrackingModel>(({model}) => {
                         text: '6m',
                         outlined: true,
                         width: 40,
-                        onClick: () => model.adjustStartDate(6, 'months')
+                        onClick: () => model.adjustStartDate(6, 'months'),
+                        active: model.isInterval(6, 'months')
                     }),
                     button({
                         text: '1m',
                         outlined: true,
                         width: 40,
-                        onClick: () => model.adjustStartDate(1, 'months')
+                        onClick: () => model.adjustStartDate(1, 'months'),
+                        active: model.isInterval(1, 'months')
                     }),
                     button({
                         text: '7d',
                         outlined: true,
                         width: 40,
-                        onClick: () => model.adjustStartDate(7, 'days')
+                        onClick: () => model.adjustStartDate(7, 'days'),
+                        active: model.isInterval(7, 'days')
                     }),
                     button({
                         text: '1d',
                         outlined: true,
                         width: 40,
-                        onClick: () => model.adjustStartDate(1, 'days')
+                        onClick: () => model.adjustStartDate(1, 'days'),
+                        active: model.isInterval(1, 'days')
                     })
                 ),
                 toolbarSep(),

package/admin/tabs/cluster/logs/levels/LogLevelDialogModel.ts

@@ -48,6 +48,7 @@ export class LogLevelDialogModel extends HoistModel {
             enableExport: true,
             exportOptions: {filename: exportFilenameWithDate('log-levels')},
             readonly: AppModel.readonly,
+            showRefreshButton: true,
             store: {
                 url: 'rest/logLevelAdmin',
                 fieldDefaults: {disableXssProtection: true},

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

@@ -43,6 +43,7 @@ export class PrefEditorModel extends HoistModel {
             enableExport: true,
             exportOptions: {filename: exportFilenameWithDate('prefs')},
             selModel: 'multiple',
+            showRefreshButton: true,
             store: {
                 url: 'rest/preferenceAdmin',
                 reloadLookupsOnLoad: true,

package/build/types/admin/tabs/activity/clienterrors/ClientErrorsModel.d.ts

@@ -22,6 +22,7 @@ export declare class ClientErrorsModel extends HoistModel {
     showEntryDetail(detailRec: StoreRecord): void;
     adjustDates(dir: 'subtract' | 'add'): void;
     adjustStartDate(value: any, unit: any): void;
+    isInterval(value: any, unit: any): boolean;
     private get query();
     private get defaultStartDay();
     private get defaultEndDay();

package/build/types/admin/tabs/activity/tracking/ActivityTrackingModel.d.ts

@@ -39,6 +39,7 @@ export declare class ActivityTrackingModel extends HoistModel {
     resetQuery(): void;
     adjustDates(dir: any): void;
     adjustStartDate(value: any, unit: any): void;
+    isInterval(value: any, unit: any): boolean;
     cubeLabelComparator(valA: any, valB: any, sortDir: any, abs: any, { recordA, recordB, defaultComparator }: {
         recordA: any;
         recordB: any;

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

@@ -18,7 +18,9 @@ export interface RestGridConfig extends GridConfig {
     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. */
+    /** Show a refresh button in the toolbar. Defaults to false. **/
+    showRefreshButton?: boolean;
+    /** Warning to display before actions on a selection of records. */
     actionWarning?: {
         add?: string | ((recs: StoreRecord[]) => string);
         del?: string | ((recs: StoreRecord[]) => string);
@@ -70,6 +72,7 @@ export declare class RestGridModel extends HoistModel {
     toolbarActions: Array<RecordAction | RecordActionSpec>;
     menuActions: Array<RecordAction | RecordActionSpec | '-'>;
     formActions: Array<RecordAction | RecordActionSpec>;
+    showRefreshButton: boolean;
     prepareCloneFn: (input: {
         record: StoreRecord;
         clone: PlainObject;
@@ -83,7 +86,7 @@ export declare class RestGridModel extends HoistModel {
     get selModel(): import("@xh/hoist/data").StoreSelectionModel;
     get selectedRecords(): StoreRecord[];
     get selectedRecord(): StoreRecord;
-    constructor({ readonly, toolbarActions, menuActions, formActions, actionWarning, prepareCloneFn, unit, filterFields, editors, onRowDoubleClicked, store, appData, ...rest }: RestGridConfig);
+    constructor({ readonly, toolbarActions, menuActions, formActions, showRefreshButton, actionWarning, prepareCloneFn, unit, filterFields, editors, onRowDoubleClicked, store, appData, ...rest }: RestGridConfig);
     /** Load the underlying store. */
     doLoadAsync(loadSpec: any): Promise<void>;
     /** Load the underlying store. */

package/desktop/cmp/rest/RestGridModel.ts

@@ -34,7 +34,10 @@ export interface RestGridConfig extends GridConfig {
     /** Actions to display in the form toolbar. Defaults to delete. */
     formActions?: Array<RecordAction | RecordActionSpec>;
 
-    /** Warning to display before actions on a selection of  records. */
+    /** Show a refresh button in the toolbar. Defaults to false. **/
+    showRefreshButton?: boolean;
+
+    /** Warning to display before actions on a selection of records. */
     actionWarning?: {
         add?: string | ((recs: StoreRecord[]) => string);
         del?: string | ((recs: StoreRecord[]) => string);
@@ -97,6 +100,7 @@ export class RestGridModel extends HoistModel {
     toolbarActions: Array<RecordAction | RecordActionSpec>;
     menuActions: Array<RecordAction | RecordActionSpec | '-'>;
     formActions: Array<RecordAction | RecordActionSpec>;
+    showRefreshButton: boolean;
     prepareCloneFn: (input: {record: StoreRecord; clone: PlainObject}) => void;
     unit: string;
     filterFields: string[] = null;
@@ -133,6 +137,7 @@ export class RestGridModel extends HoistModel {
         toolbarActions = !readonly ? [addAction, editAction, deleteAction] : [viewAction],
         menuActions = !readonly ? [addAction, editAction, deleteAction] : [viewAction],
         formActions = !readonly ? [deleteAction] : [],
+        showRefreshButton = false,
         actionWarning,
         prepareCloneFn,
         unit = 'record',
@@ -149,6 +154,7 @@ export class RestGridModel extends HoistModel {
         this.toolbarActions = toolbarActions;
         this.menuActions = menuActions;
         this.formActions = formActions;
+        this.showRefreshButton = showRefreshButton;
 
         this.actionWarning = Object.assign(this.actionWarning, actionWarning);
 

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

@@ -54,7 +54,10 @@ export const restGridToolbar = hoistCmp.factory({
                 gridModel,
                 omit: !model.gridModel.enableExport
             }),
-            refreshButton({model})
+            refreshButton({
+                model,
+                omit: !model.showRefreshButton
+            })
         );
     }
 });

package/package.json

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