@data-fair/lib-vue 1.25.4 → 1.25.5

package/edit-fetch.d.ts

@@ -4,6 +4,7 @@ import { AsyncActionOptions } from './async-action.js';
 type UseEditFetchOptions = UseFetchOptions & {
     patch?: boolean;
     saveOptions?: AsyncActionOptions;
+    fetchAfterSave?: boolean;
 };
 type OptionalUrl = string | null | undefined;
 export declare function useEditFetch<T extends Record<string, any>>(url: OptionalUrl | Ref<OptionalUrl> | (() => OptionalUrl), options?: UseEditFetchOptions): {

package/edit-fetch.js

@@ -14,16 +14,16 @@ export function useEditFetch(url, options = {}) {
         data.value = clone(fetch.data.value);
     });
     const hasDiff = computed(() => !equal(data.value, serverData.value));
-    const getPatch = () => {
-        if (!data.value || !serverData.value)
+    const getPatch = (oldData, newData) => {
+        if (!oldData || !newData)
             return null;
         const patch = {};
-        for (const key of Object.keys(data.value)) {
-            if (!equal(data.value[key], serverData.value[key]))
-                patch[key] = data.value[key];
+        for (const key of Object.keys(newData)) {
+            if (!equal(newData[key], oldData[key]))
+                patch[key] = newData[key];
         }
-        for (const key of Object.keys(serverData.value)) {
-            if (!(key in data.value))
+        for (const key of Object.keys(oldData)) {
+            if (!(key in newData))
                 patch[key] = null;
         }
         return patch;
@@ -31,17 +31,26 @@ export function useEditFetch(url, options = {}) {
     const save = useAsyncAction(async () => {
         if (!data.value || !serverData.value || !fetch.data.value)
             throw new Error('cannot save data that has not been fetched yet');
+        let res;
+        const dataBeforeSave = clone(data.value);
         if (options.patch) {
-            const patch = getPatch();
+            const patch = getPatch(serverData.value, data.value);
             if (!Object.keys(patch).length)
                 return;
-            serverData.value = await ofetch(fetch.fullUrl.value, { method: 'PATCH', body: patch });
+            res = await ofetch(fetch.fullUrl.value, { method: 'PATCH', body: patch });
         }
         else {
             // TODO: add if-unmodified-since header ?
-            serverData.value = await ofetch(fetch.fullUrl.value, { method: 'PUT', body: data.value });
+            res = await ofetch(fetch.fullUrl.value, { method: 'PUT', body: data.value });
+        }
+        if (options.fetchAfterSave || !res) {
+            fetch.refresh();
+        }
+        else {
+            serverData.value = clone(res);
+            // case of server-side calculated properties, updatedAt, etc
+            Object.assign(data.value, getPatch(dataBeforeSave, res));
         }
-        serverData.value = clone(data.value);
     }, options.saveOptions);
     return {
         fetch,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-fair/lib-vue",
-  "version": "1.25.4",
+  "version": "1.25.5",
   "description": "Composables and other utilities for Vue applications in the data-fair stack.",
   "main": "index.js",
   "files": [