@xh/hoist 71.0.0-SNAPSHOT.1736191971390 → 71.0.0-SNAPSHOT.1736192713803

package/build/types/cmp/viewmanager/DataAccess.d.ts

@@ -15,7 +15,7 @@ export declare class DataAccess<T> {
         state: ViewUserState;
     }>;
     /** Fetch the latest version of a view. */
-    fetchViewAsync(token: String): Promise<View<T>>;
+    fetchViewAsync(info: ViewInfo): Promise<View<T>>;
     /** Create a new view, owned by the current user.*/
     createViewAsync(spec: ViewCreateSpec): Promise<View<T>>;
     /** Update all aspects of a view's metadata.*/

package/build/types/cmp/viewmanager/ViewManagerModel.d.ts

@@ -183,7 +183,9 @@ export declare class ViewManagerModel<T = PlainObject> extends HoistModel {
      */
     private constructor();
     doLoadAsync(loadSpec: LoadSpec): Promise<void>;
-    selectViewAsync(token: string): Promise<void>;
+    selectViewAsync(info: ViewInfo, opts?: {
+        alertUnsavedChanges: boolean;
+    }): Promise<void>;
     saveAsAsync(spec: ViewCreateSpec): Promise<void>;
     saveAsync(): Promise<void>;
     resetAsync(): Promise<void>;

package/cmp/viewmanager/DataAccess.ts

@@ -48,14 +48,14 @@ export class DataAccess<T> {
     }
 
     /** Fetch the latest version of a view. */
-    async fetchViewAsync(token: String): Promise<View<T>> {
+    async fetchViewAsync(info: ViewInfo): Promise<View<T>> {
         const {model} = this;
-        if (!token) return View.createDefault(model);
+        if (!info) return View.createDefault(model);
         try {
-            const raw = await XH.fetchJson({url: 'xhView/get', params: {token}});
+            const raw = await XH.fetchJson({url: 'xhView/get', params: {token: info.token}});
             return View.fromBlob(raw, model);
         } catch (e) {
-            throw XH.exception({message: `Unable to fetch view with token ${token}`, cause: e});
+            throw XH.exception({message: `Unable to fetch ${info.typedName}`, cause: e});
         }
     }
 

package/cmp/viewmanager/ViewManagerModel.ts

@@ -21,7 +21,7 @@ import {fmtDateTime} from '@xh/hoist/format';
 import {action, bindable, makeObservable, observable, comparer, runInAction} from '@xh/hoist/mobx';
 import {olderThan, SECONDS} from '@xh/hoist/utils/datetime';
 import {executeIfFunction, pluralize, throwIf} from '@xh/hoist/utils/js';
-import {find, isEqual, isNil, isNull, isUndefined, lowerCase} from 'lodash';
+import {find, isEqual, isNil, isNull, isUndefined, lowerCase, uniqBy} from 'lodash';
 import {ReactNode} from 'react';
 import {ViewInfo} from './ViewInfo';
 import {View} from './View';
@@ -337,7 +337,7 @@ export class ViewManagerModel<T = PlainObject> extends HoistModel {
             if (!view.isDefault) {
                 const latestInfo = find(views, {token: view.token});
                 if (latestInfo && latestInfo.lastUpdated > view.lastUpdated) {
-                    this.loadViewAsync(view.token, this.pendingValue);
+                    this.loadViewAsync(latestInfo, this.pendingValue);
                 }
             }
         } catch (e) {
@@ -346,18 +346,23 @@ export class ViewManagerModel<T = PlainObject> extends HoistModel {
         }
     }
 
-    async selectViewAsync(token: string): Promise<void> {
+    async selectViewAsync(info: ViewInfo, opts = {alertUnsavedChanges: true}): Promise<void> {
         // ensure any pending auto-save gets completed
         if (this.isValueDirty && this.isViewAutoSavable) {
             await this.maybeAutoSaveAsync();
         }
 
         // if still dirty, require confirm
-        if (this.isValueDirty && this.view.isOwned && !(await this.confirmDiscardChangesAsync())) {
+        if (
+            opts.alertUnsavedChanges &&
+            this.isValueDirty &&
+            this.view.isOwned &&
+            !(await this.confirmDiscardChangesAsync())
+        ) {
             return;
         }
 
-        return this.loadViewAsync(token);
+        await this.loadViewAsync(info).catch(e => this.handleException(e));
     }
 
     async saveAsAsync(spec: ViewCreateSpec): Promise<void> {
@@ -394,7 +399,7 @@ export class ViewManagerModel<T = PlainObject> extends HoistModel {
     }
 
     async resetAsync(): Promise<void> {
-        await this.loadViewAsync(this.view.info.token).catch(e => this.handleException(e));
+        await this.loadViewAsync(this.view.info).catch(e => this.handleException(e));
     }
 
     //--------------------------------
@@ -478,7 +483,7 @@ export class ViewManagerModel<T = PlainObject> extends HoistModel {
         const {views} = this;
 
         if (toDelete.some(view => view.isCurrentView) && !views.some(view => view.isCurrentView)) {
-            await this.loadViewAsync(this.initialViewSpec?.(views)?.token);
+            await this.loadViewAsync(this.initialViewSpec?.(views));
         }
 
         if (exception) throw exception;
@@ -564,13 +569,13 @@ export class ViewManagerModel<T = PlainObject> extends HoistModel {
     }
 
     private async loadViewAsync(
-        token: String,
+        info: ViewInfo,
         pendingValue: PendingValue<T> = null
     ): Promise<void> {
         return this.dataAccess
-            .fetchViewAsync(token)
+            .fetchViewAsync(info)
             .thenAction(latest => {
-                this.setAsView(latest, pendingValue?.token == token ? pendingValue : null);
+                this.setAsView(latest, pendingValue?.token == info?.token ? pendingValue : null);
                 this.providers.forEach(it => it.pushStateToTarget());
                 this.lastPushed = Date.now();
             })
@@ -604,7 +609,7 @@ export class ViewManagerModel<T = PlainObject> extends HoistModel {
         this.pendingValue = pendingValue;
         // Ensure we update meta-data as well.
         if (!view.isDefault) {
-            this.views = this.views.map(v => (v.token === view.token ? view.info : v));
+            this.views = uniqBy([view.info, ...this.views], 'token');
         }
     }
 
@@ -644,7 +649,7 @@ export class ViewManagerModel<T = PlainObject> extends HoistModel {
 
     private async maybeConfirmSaveAsync(view: View, pendingValue: PendingValue<T>) {
         // Get latest from server for reference
-        const latest = await this.dataAccess.fetchViewAsync(view.info.token),
+        const latest = await this.dataAccess.fetchViewAsync(view.info),
             isGlobal = latest.isGlobal,
             isStale = latest.lastUpdated > pendingValue.baseUpdated;
         if (!isStale && !isGlobal) return true;

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).catchDefault()
+                onClick: () => model.selectViewAsync(null)
             })
         );
     }
@@ -168,6 +168,6 @@ function viewMenuItem(view: ViewInfo, model: ViewManagerModel): ReactNode {
         text: view.name,
         title: title.join(' | '),
         icon,
-        onClick: () => model.selectViewAsync(view.token).catchDefault()
+        onClick: () => model.selectViewAsync(view)
     });
 }

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

@@ -86,7 +86,7 @@ export class ManageDialogModel extends HoistModel {
     }
 
     activateSelectedViewAndClose() {
-        this.viewManagerModel.selectViewAsync(this.selectedView.token).catchDefault();
+        this.viewManagerModel.selectViewAsync(this.selectedView);
         this.close();
     }
 

package/package.json

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