@xh/hoist 71.0.0-SNAPSHOT.1733372979467 → 71.0.0-SNAPSHOT.1733376295239

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

@@ -156,7 +156,6 @@ export declare class ViewManagerModel<T = PlainObject> extends HoistModel {
      * initial load before binding to persistable components.
      */
     private constructor();
-    private initAsync;
     doLoadAsync(loadSpec: LoadSpec): Promise<void>;
     selectViewAsync(info: ViewInfo): Promise<void>;
     saveAsync(): Promise<void>;
@@ -171,6 +170,7 @@ export declare class ViewManagerModel<T = PlainObject> extends HoistModel {
     openManageDialog(): void;
     closeManageDialog(): void;
     validateViewNameAsync(name: string, existing?: ViewInfo): Promise<string>;
+    private initAsync;
     private loadViewAsync;
     private maybeAutoSaveAsync;
     private setAsView;

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

@@ -13,6 +13,7 @@ export declare class ViewToBlobApi<T> {
     fetchViewInfosAsync(): Promise<ViewInfo[]>;
     fetchViewAsync(info: ViewInfo): Promise<View<T>>;
     createViewAsync(name: string, description: string, value: PlainObject): Promise<View<T>>;
-    updateViewAsync(view: ViewInfo, name: string, description: string, isGlobal: boolean): Promise<void>;
+    updateViewInfoAsync(view: ViewInfo, name: string, description: string, isGlobal: boolean): Promise<View<T>>;
+    updateViewValueAsync(view: View<T>, value: Partial<T>): Promise<View<T>>;
     deleteViewAsync(view: ViewInfo): Promise<void>;
 }

package/cmp/viewmanager/ViewManagerModel.ts

@@ -291,34 +291,6 @@ export class ViewManagerModel<T = PlainObject> extends HoistModel {
         this.api = new ViewToBlobApi(this);
     }
 
-    private async initAsync() {
-        try {
-            const views = await this.api.fetchViewInfosAsync();
-            runInAction(() => (this.views = views));
-
-            if (this.persistWith) {
-                this.initPersist(this.persistWith);
-                await when(() => !this.selectTask.isPending);
-            }
-
-            // If the initial view not initialized from persistence, assign it.
-            if (!this.view) {
-                await this.loadViewAsync(this.initialViewSpec?.(views), this.pendingValue);
-            }
-        } catch (e) {
-            // Always ensure at least default view is installed.
-            if (!this.view) this.loadViewAsync(null, this.pendingValue);
-
-            this.handleException(e, {showAlert: false, logOnServer: true});
-        }
-
-        this.addReaction({
-            track: () => [this.pendingValue, this.autoSave],
-            run: () => this.maybeAutoSaveAsync(),
-            debounce: 5 * SECONDS
-        });
-    }
-
     override async doLoadAsync(loadSpec: LoadSpec) {
         try {
             // 1) Update all view info
@@ -358,21 +330,20 @@ export class ViewManagerModel<T = PlainObject> extends HoistModel {
             this.logError('Unexpected conditions for call to save, skipping');
             return;
         }
-        const {pendingValue} = this,
-            {info} = this.view;
+        const {pendingValue, view, api} = this;
         try {
-            if (!(await this.maybeConfirmSaveAsync(info, pendingValue))) {
+            if (!(await this.maybeConfirmSaveAsync(view.info, pendingValue))) {
                 return;
             }
-            const update = await XH.jsonBlobService
-                .updateAsync(info.token, {value: pendingValue.value})
+            const updated = await api
+                .updateViewValueAsync(view, pendingValue.value)
                 .linkTo(this.saveTask);
 
-            this.setAsView(View.fromBlob(update, this));
-            this.noteSuccess(`Saved ${info.typedName}`);
+            this.setAsView(updated);
+            this.noteSuccess(`Saved ${view.info.typedName}`);
         } catch (e) {
             this.handleException(e, {
-                message: `Failed to save ${info.typedName}.  If this persists consider \`Save As...\`.`
+                message: `Failed to save ${view.info.typedName}.  If this persists consider \`Save As...\`.`
             });
         }
         this.refreshAsync();
@@ -468,6 +439,34 @@ export class ViewManagerModel<T = PlainObject> extends HoistModel {
     //------------------
     // Implementation
     //------------------
+    private async initAsync() {
+        try {
+            const views = await this.api.fetchViewInfosAsync();
+            runInAction(() => (this.views = views));
+
+            if (this.persistWith) {
+                this.initPersist(this.persistWith);
+                await when(() => !this.selectTask.isPending);
+            }
+
+            // If the initial view not initialized from persistence, assign it.
+            if (!this.view) {
+                await this.loadViewAsync(this.initialViewSpec?.(views), this.pendingValue);
+            }
+        } catch (e) {
+            // Always ensure at least default view is installed.
+            if (!this.view) this.loadViewAsync(null, this.pendingValue);
+
+            this.handleException(e, {showAlert: false, logOnServer: true});
+        }
+
+        this.addReaction({
+            track: () => [this.pendingValue, this.autoSave],
+            run: () => this.maybeAutoSaveAsync(),
+            debounce: 5 * SECONDS
+        });
+    }
+
     private async loadViewAsync(
         info: ViewInfo,
         pendingValue: PendingValue<T> = null
@@ -483,18 +482,19 @@ export class ViewManagerModel<T = PlainObject> extends HoistModel {
     }
 
     private async maybeAutoSaveAsync() {
-        const {pendingValue, isViewAutoSavable, view} = this;
+        const {pendingValue, isViewAutoSavable, view, api} = this;
         if (isViewAutoSavable && pendingValue) {
             try {
-                const raw = await XH.jsonBlobService
-                    .updateAsync(view.token, {value: pendingValue.value})
+                const updated = await api
+                    .updateViewValueAsync(view, pendingValue.value)
                     .linkTo(this.saveTask);
-                this.setAsView(View.fromBlob(raw, this));
+
+                this.setAsView(updated);
             } catch (e) {
                 // TODO: How to alert but avoid for flaky or spam when user editing a deleted view
                 // Keep count and alert server and user once at count n?
                 XH.handleException(e, {
-                    message: `Failing AutoSave for ${this.view.info.typedName}`,
+                    message: `Failing AutoSave for ${view.info.typedName}`,
                     showAlert: false,
                     logOnServer: false
                 });

package/cmp/viewmanager/ViewToBlobApi.ts

@@ -70,18 +70,36 @@ export class ViewToBlobApi<T> {
         }
     }
 
-    async updateViewAsync(view: ViewInfo, name: string, description: string, isGlobal: boolean) {
+    async updateViewInfoAsync(
+        view: ViewInfo,
+        name: string,
+        description: string,
+        isGlobal: boolean
+    ): Promise<View<T>> {
         try {
-            await XH.jsonBlobService.updateAsync(view.token, {
+            const blob = await XH.jsonBlobService.updateAsync(view.token, {
                 name: name.trim(),
                 description: description?.trim(),
                 acl: isGlobal ? '*' : null
             });
+            return View.fromBlob(blob, this.owner);
         } catch (e) {
             throw XH.exception({message: `Unable to update ${view.typedName}`, cause: e});
         }
     }
 
+    async updateViewValueAsync(view: View<T>, value: Partial<T>): Promise<View<T>> {
+        try {
+            const blob = await XH.jsonBlobService.updateAsync(view.token, {value});
+            return View.fromBlob(blob, this.owner);
+        } catch (e) {
+            throw XH.exception({
+                message: `Unable to update value for ${view.info.typedName}`,
+                cause: e
+            });
+        }
+    }
+
     async deleteViewAsync(view: ViewInfo) {
         try {
             await XH.jsonBlobService.archiveAsync(view.token);

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

@@ -158,7 +158,7 @@ export class ManageDialogModel extends HoistModel {
     ) {
         const {viewManagerModel} = this;
 
-        await viewManagerModel.api.updateViewAsync(view, name, description, isGlobal);
+        await viewManagerModel.api.updateViewInfoAsync(view, name, description, isGlobal);
         await viewManagerModel.refreshAsync();
         await this.refreshAsync();
 

package/package.json

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