web-mojo 2.1.1098 → 2.1.1100

package/dist/chunks/{FormView-kvFr4UJs.js → FormView-BhNE8_ux.js}

@@ -6198,15 +6198,25 @@ class FormView extends View {
    */
   async executeBatchSave() {
     if (this.isSaving || this.pendingSaveFields.size === 0) return;
+    const changes = Object.fromEntries(this.pendingSaveFields);
+    const fieldNames = Array.from(this.pendingSaveFields.keys());
     try {
       this.isSaving = true;
-      const changes = Object.fromEntries(this.pendingSaveFields);
-      const fieldNames = Array.from(this.pendingSaveFields.keys());
       this.pendingSaveFields.clear();
       this.batchSaveTimeout = null;
       this._isFormDrivenChange = true;
       if (typeof this.model.save === "function") {
-        await this.model.save(changes);
+        const resp = await this.model.save(changes);
+        if (!resp || !resp.success || resp.data && !resp.data.status) {
+          const errorMsg = resp?.data?.error || resp?.error || resp?.message || "Save failed";
+          this.getApp()?.toast?.error(errorMsg);
+          this.revertFields(fieldNames);
+          fieldNames.forEach((fieldName) => {
+            const statusManager = this.getFieldStatusManager(fieldName);
+            statusManager.showStatus("error", { message: errorMsg });
+          });
+          return;
+        }
       } else {
         Object.entries(changes).forEach(([key, val]) => {
           this.model.set(key, val);
@@ -6218,7 +6228,9 @@ class FormView extends View {
       });
     } catch (error) {
       console.error("Batch save error:", error);
-      Array.from(this.pendingSaveFields.keys()).forEach((fieldName) => {
+      this.getApp()?.toast?.error(error.message || "An error occurred while saving");
+      this.revertFields(fieldNames);
+      fieldNames.forEach((fieldName) => {
         const statusManager = this.getFieldStatusManager(fieldName);
         statusManager.showStatus("error", { message: error.message });
       });
@@ -6226,6 +6238,38 @@ class FormView extends View {
       this.isSaving = false;
     }
   }
+  /**
+   * Revert form fields to their original model values
+   * Called when save fails to keep UI in sync with server state
+   * @param {Array<string>} fieldNames - Names of fields to revert
+   * @private
+   */
+  revertFields(fieldNames) {
+    if (!this.model) return;
+    const wasPopulating = this._isPopulating;
+    this._isPopulating = true;
+    try {
+      fieldNames.forEach((fieldName) => {
+        const originalValue = this.model.get(fieldName);
+        this.data[fieldName] = originalValue;
+        const fieldElement = this.element?.querySelector(`[name="${fieldName}"]`);
+        if (fieldElement) {
+          const fieldConfig = this.getFormFieldConfig(fieldName);
+          if (fieldConfig) {
+            this.setFieldValue(fieldElement, fieldConfig, originalValue);
+          } else {
+            if (fieldElement.type === "checkbox") {
+              fieldElement.checked = Boolean(originalValue);
+            } else {
+              fieldElement.value = originalValue ?? "";
+            }
+          }
+        }
+      });
+    } finally {
+      this._isPopulating = wasPopulating;
+    }
+  }
   /**
    * Get or create a field status manager for a specific field
    * @param {string} fieldName - Name of the field
@@ -7784,4 +7828,4 @@ export {
   applyFileDropMixin as a,
   FormView$1 as b
 };
-//# sourceMappingURL=FormView-kvFr4UJs.js.map
+//# sourceMappingURL=FormView-BhNE8_ux.js.map