@open-mercato/ui 0.6.6-develop.6228.1.cf483c68b5 → 0.6.6-develop.6241.1.47c01ad4ed

package/dist/backend/DataTable.js

@@ -34,7 +34,7 @@ import { resolveInjectedIcon } from "./injection/resolveInjectedIcon.js";
 import { serializeExport, defaultExportFilename } from "@open-mercato/shared/lib/crud/exporters";
 import { apiCall, withScopedApiRequestHeaders } from "./utils/apiCall.js";
 import { buildOptimisticLockHeader } from "./utils/optimisticLock.js";
-import { surfaceRecordConflict } from "./conflicts/index.js";
+import { useGuardedMutation } from "./injection/useGuardedMutation.js";
 import { raiseCrudError } from "./utils/serverErrors.js";
 import { PerspectiveSidebar } from "./PerspectiveSidebar.js";
 import { Popover, PopoverTrigger, PopoverContent } from "../primitives/popover.js";
@@ -1215,6 +1215,19 @@ function DataTable({
     initialPerspectiveAppliedRef.current = true;
   }, [perspectiveTableId, applyPerspectiveSettings, advancedFilter]);
   const perspectiveQueryKey = ["table-perspectives", perspectiveTableId];
+  const perspectiveMutationContextId = `data-table-perspectives:${perspectiveTableId ?? "unknown"}`;
+  const { runMutation: runPerspectiveMutation, retryLastMutation: retryPerspectiveMutation } = useGuardedMutation({
+    contextId: perspectiveMutationContextId,
+    blockedMessage: t("ui.forms.flash.saveBlocked", "Save blocked by validation")
+  });
+  const perspectiveMutationContext = React.useMemo(
+    () => ({
+      formId: perspectiveMutationContextId,
+      resourceKind: "perspective",
+      retryLastMutation: retryPerspectiveMutation
+    }),
+    [perspectiveMutationContextId, retryPerspectiveMutation]
+  );
   const savePerspectiveMutation = useMutation({
     mutationFn: async (input) => {
       if (!perspectiveTableId) throw new Error("Missing table id");
@@ -1230,26 +1243,32 @@ function DataTable({
         console.debug("[DataTable] perspective payload", payload);
       }
       const existing = input.perspectiveId ? perspectiveData?.perspectives.find((p) => p.id === input.perspectiveId) ?? null : null;
-      const call = await withScopedApiRequestHeaders(
-        buildOptimisticLockHeader(existing?.updatedAt ?? null),
-        () => apiCall(
-          `/api/perspectives/${encodeURIComponent(perspectiveTableId)}`,
-          {
-            method: "POST",
-            headers: { "Content-Type": "application/json" },
-            body: JSON.stringify(payload)
+      return runPerspectiveMutation({
+        operation: async () => {
+          const call = await withScopedApiRequestHeaders(
+            buildOptimisticLockHeader(existing?.updatedAt ?? null),
+            () => apiCall(
+              `/api/perspectives/${encodeURIComponent(perspectiveTableId)}`,
+              {
+                method: "POST",
+                headers: { "Content-Type": "application/json" },
+                body: JSON.stringify(payload)
+              }
+            )
+          );
+          if (call.status === 404) {
+            throw new Error(t("ui.dataTable.perspectives.error.apiUnavailable", "Perspectives API is not available. Run `yarn generate` to regenerate module routes and restart the dev server."));
           }
-        )
-      );
-      if (call.status === 404) {
-        throw new Error(t("ui.dataTable.perspectives.error.apiUnavailable", "Perspectives API is not available. Run `yarn generate` to regenerate module routes and restart the dev server."));
-      }
-      if (!call.ok) {
-        await raiseCrudError(call.response, t("ui.dataTable.perspectives.error.save", "Failed to save perspective"));
-      }
-      const result = call.result;
-      if (!result) throw new Error(t("ui.dataTable.perspectives.error.save", "Failed to save perspective"));
-      return result;
+          if (!call.ok) {
+            await raiseCrudError(call.response, t("ui.dataTable.perspectives.error.save", "Failed to save perspective"));
+          }
+          const result = call.result;
+          if (!result) throw new Error(t("ui.dataTable.perspectives.error.save", "Failed to save perspective"));
+          return result;
+        },
+        context: perspectiveMutationContext,
+        mutationPayload: payload
+      });
     },
     onSuccess: (data2) => {
       if (perspectiveTableId) {
@@ -1259,11 +1278,10 @@ function DataTable({
         applyPerspectiveSettings(data2.perspective.settings, data2.perspective.id);
       }
     },
-    onError: (error2) => {
+    onError: () => {
       if (perspectiveTableId) {
         void queryClient.invalidateQueries({ queryKey: perspectiveQueryKey });
       }
-      surfaceRecordConflict(error2, t);
     }
   });
   const resolveColumnLabel = React.useCallback((column) => {
@@ -1283,14 +1301,20 @@ function DataTable({
   const deletePerspectiveMutation = useMutation({
     mutationFn: async ({ perspectiveId }) => {
       if (!perspectiveTableId) throw new Error("Missing table id");
-      const call = await apiCall(
-        `/api/perspectives/${encodeURIComponent(perspectiveTableId)}/${encodeURIComponent(perspectiveId)}`,
-        { method: "DELETE" }
-      );
-      if (call.status === 404) throw new Error(t("ui.dataTable.perspectives.error.apiUnavailable", "Perspectives API is not available. Run `yarn generate` and restart the dev server."));
-      if (!call.ok) {
-        await raiseCrudError(call.response, t("ui.dataTable.perspectives.error.delete", "Failed to delete perspective"));
-      }
+      await runPerspectiveMutation({
+        operation: async () => {
+          const call = await apiCall(
+            `/api/perspectives/${encodeURIComponent(perspectiveTableId)}/${encodeURIComponent(perspectiveId)}`,
+            { method: "DELETE" }
+          );
+          if (call.status === 404) throw new Error(t("ui.dataTable.perspectives.error.apiUnavailable", "Perspectives API is not available. Run `yarn generate` and restart the dev server."));
+          if (!call.ok) {
+            await raiseCrudError(call.response, t("ui.dataTable.perspectives.error.delete", "Failed to delete perspective"));
+          }
+        },
+        context: perspectiveMutationContext,
+        mutationPayload: { perspectiveId }
+      });
     },
     onMutate: ({ perspectiveId }) => {
       setDeletingIds((prev) => prev.includes(perspectiveId) ? prev : [...prev, perspectiveId]);
@@ -1318,14 +1342,20 @@ function DataTable({
   const clearRoleMutation = useMutation({
     mutationFn: async ({ roleId }) => {
       if (!perspectiveTableId) throw new Error("Missing table id");
-      const call = await apiCall(
-        `/api/perspectives/${encodeURIComponent(perspectiveTableId)}/roles/${encodeURIComponent(roleId)}`,
-        { method: "DELETE" }
-      );
-      if (call.status === 404) throw new Error(t("ui.dataTable.perspectives.error.apiUnavailable", "Perspectives API is not available. Run `yarn generate` and restart the dev server."));
-      if (!call.ok) {
-        await raiseCrudError(call.response, t("ui.dataTable.perspectives.error.clearRoles", "Failed to clear role perspectives"));
-      }
+      await runPerspectiveMutation({
+        operation: async () => {
+          const call = await apiCall(
+            `/api/perspectives/${encodeURIComponent(perspectiveTableId)}/roles/${encodeURIComponent(roleId)}`,
+            { method: "DELETE" }
+          );
+          if (call.status === 404) throw new Error(t("ui.dataTable.perspectives.error.apiUnavailable", "Perspectives API is not available. Run `yarn generate` and restart the dev server."));
+          if (!call.ok) {
+            await raiseCrudError(call.response, t("ui.dataTable.perspectives.error.clearRoles", "Failed to clear role perspectives"));
+          }
+        },
+        context: perspectiveMutationContext,
+        mutationPayload: { roleId }
+      });
     },
     onMutate: ({ roleId }) => {
       setRoleClearingIds((prev) => prev.includes(roleId) ? prev : [...prev, roleId]);