@xh/hoist 71.0.0-SNAPSHOT.1736120910674 → 71.0.0-SNAPSHOT.1736185761842

package/cmp/viewmanager/ViewManagerModel.ts

@@ -357,7 +357,7 @@ export class ViewManagerModel<T = PlainObject> extends HoistModel {
             return;
         }
 
-        await this.loadViewAsync(info).catch(e => this.handleException(e));
+        return this.loadViewAsync(info);
     }
 
     async saveAsAsync(spec: ViewCreateSpec): Promise<void> {

package/desktop/cmp/viewmanager/ViewMenu.ts

@@ -63,7 +63,7 @@ function getNavMenuItems(model: ViewManagerModel): ReactNode[] {
                 className: 'xh-view-manager__menu-item',
                 icon: view.isDefault ? Icon.check() : Icon.placeholder(),
                 text: `Default ${startCase(typeDisplayName)}`,
-                onClick: () => model.selectViewAsync(null)
+                onClick: () => model.selectViewAsync(null).catchDefault()
             })
         );
     }
@@ -168,6 +168,6 @@ function viewMenuItem(view: ViewInfo, model: ViewManagerModel): ReactNode {
         text: view.name,
         title: title.join(' | '),
         icon,
-        onClick: () => model.selectViewAsync(view)
+        onClick: () => model.selectViewAsync(view).catchDefault()
     });
 }

package/desktop/cmp/viewmanager/dialog/ManageDialogModel.ts

@@ -86,7 +86,7 @@ export class ManageDialogModel extends HoistModel {
     }
 
     activateSelectedViewAndClose() {
-        this.viewManagerModel.selectViewAsync(this.selectedView);
+        this.viewManagerModel.selectViewAsync(this.selectedView).catchDefault();
         this.close();
     }
 
@@ -220,13 +220,21 @@ export class ManageDialogModel extends HoistModel {
     }
 
     private async doMakeGlobalAsync(view: ViewInfo) {
-        const {globalDisplayName, typeDisplayName} = this.viewManagerModel,
-            {typedName} = view,
-            msgs = [
-                `The ${typedName} will become a ${globalDisplayName} ${typeDisplayName} visible to all other ${XH.appName} users.`,
-                strong('Are you sure you want to proceed?')
-            ];
+        const {globalDisplayName, typeDisplayName, globalViews} = this.viewManagerModel,
+            {typedName} = view;
+
+        if (some(globalViews, {name: view.name})) {
+            XH.alert({
+                title: 'Alert',
+                message: `There is already a ${globalDisplayName} ${typedName}. Please rename or edit it instead.`
+            });
+            return;
+        }
 
+        const msgs = [
+            `The ${typedName} will become a ${globalDisplayName} ${typeDisplayName} visible to all other ${XH.appName} users.`,
+            strong('Are you sure you want to proceed?')
+        ];
         const confirmed = await XH.confirm({
             message: fragment(msgs.map(m => p(m))),
             confirmProps: {

package/desktop/cmp/viewmanager/dialog/ViewPanel.ts

@@ -16,7 +16,7 @@ import {ViewPanelModel} from '@xh/hoist/desktop/cmp/viewmanager/dialog/ViewPanel
 import {getGroupOptions} from '@xh/hoist/desktop/cmp/viewmanager/dialog/Utils';
 import {fmtDateTime} from '@xh/hoist/format';
 import {Icon} from '@xh/hoist/icon';
-import {capitalize} from 'lodash';
+import {capitalize, some} from 'lodash';
 
 /**
  * Form to edit or view details on a single saved view within the ViewManager manage dialog.
@@ -128,7 +128,7 @@ const formButtons = hoistCmp.factory<ViewPanelModel>({
             });
         }
 
-        const {enableGlobal, globalDisplayName, manageGlobal, typeDisplayName} =
+        const {enableGlobal, globalDisplayName, manageGlobal, typeDisplayName, globalViews} =
             parent.viewManagerModel;
         return vbox({
             style: {gap: 10, alignItems: 'center'},
@@ -148,6 +148,7 @@ const formButtons = hoistCmp.factory<ViewPanelModel>({
                     icon: Icon.globe(),
                     width: 200,
                     outlined: true,
+                    disabled: some(globalViews, {name: view.name}),
                     omit: readonly || view.isGlobal || !enableGlobal || !manageGlobal,
                     onClick: () => parent.makeGlobalAsync(view)
                 }),

package/package.json

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