@xh/hoist 67.0.0-SNAPSHOT.1724362478970 → 67.0.0-SNAPSHOT.1724719449021

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

@@ -9,6 +9,7 @@ import {filler} from '@xh/hoist/cmp/layout';
 import {hoistCmp, uses} from '@xh/hoist/core';
 import {button} from '@xh/hoist/desktop/cmp/button';
 import {select} 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';
 import {dialog, dialogBody} from '@xh/hoist/kit/blueprint';
@@ -17,7 +18,7 @@ export const recategorizeDialog = hoistCmp.factory({
     model: uses(RecategorizeDialogModel),
 
     render({model}) {
-        const {isOpen} = model;
+        const {isOpen, savingTask} = model;
         if (!isOpen) return null;
 
         return dialog({
@@ -26,22 +27,24 @@ export const recategorizeDialog = hoistCmp.factory({
             style: {width: 300},
             isOpen: true,
             isCloseButtonShown: false,
-            items: [
-                dialogBody(
+            item: panel({
+                mask: savingTask,
+                item: dialogBody(
                     select({
+                        autoFocus: true,
                         bind: 'categoryName',
                         enableCreate: true,
                         options: model.options,
                         width: 260
                     })
                 ),
-                tbar()
-            ]
+                bbar: bbar()
+            })
         });
     }
 });
 
-const tbar = hoistCmp.factory<RecategorizeDialogModel>(({model}) => {
+const bbar = hoistCmp.factory<RecategorizeDialogModel>(({model}) => {
     return toolbar(
         filler(),
         button({

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

@@ -5,7 +5,7 @@
  * Copyright © 2024 Extremely Heavy Industries Inc.
  */
 import {RoleModel} from '@xh/hoist/admin/tabs/userData/roles/RoleModel';
-import {HoistModel, XH} from '@xh/hoist/core';
+import {HoistModel, TaskObserver, XH} from '@xh/hoist/core';
 import {StoreRecord} from '@xh/hoist/data';
 import {Icon} from '@xh/hoist/icon/Icon';
 import {action, bindable, makeObservable, observable} from '@xh/hoist/mobx';
@@ -15,6 +15,8 @@ export class RecategorizeDialogModel extends HoistModel {
     private parent: RoleModel;
     selectedRecords: StoreRecord[];
 
+    readonly savingTask = TaskObserver.trackLast();
+
     @bindable categoryName = null;
     @observable isOpen = false;
 
@@ -53,17 +55,21 @@ export class RecategorizeDialogModel extends HoistModel {
             it => !it.isGroupRow
         );
         const roles: string[] = map(roleSpec, it => it.name);
-        await XH.fetchService
-            .postJson({
-                url: 'roleAdmin/bulkCategoryUpdate',
-                body: {
-                    roles,
-                    category: this.categoryName === '_CLEAR_ROLES_' ? null : this.categoryName
-                }
-            })
-            .catchDefault();
-        await this.parent.refreshAsync();
-        this.close();
+        try {
+            await XH.fetchService
+                .postJson({
+                    url: 'roleAdmin/bulkCategoryUpdate',
+                    body: {
+                        roles,
+                        category: this.categoryName === '_CLEAR_ROLES_' ? null : this.categoryName
+                    }
+                })
+                .linkTo(this.savingTask);
+            await this.parent.refreshAsync();
+            this.close();
+        } catch (e) {
+            XH.handleException(e);
+        }
     }
 
     //-----------------

package/build/types/admin/tabs/userData/roles/recategorize/RecategorizeDialogModel.d.ts

@@ -1,8 +1,9 @@
-import { HoistModel } from '@xh/hoist/core';
+import { HoistModel, TaskObserver } from '@xh/hoist/core';
 import { StoreRecord } from '@xh/hoist/data';
 export declare class RecategorizeDialogModel extends HoistModel {
     private parent;
     selectedRecords: StoreRecord[];
+    readonly savingTask: TaskObserver;
     categoryName: any;
     isOpen: boolean;
     recategorizeAction(): {

package/package.json

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