@open-mercato/ui 0.6.6-develop.6255.1.a6ee4a57c1 → 0.6.6-develop.6256.1.9fc16aedc4

package/dist/backend/DataTable.js

@@ -788,6 +788,7 @@ function DataTable({
           perspectives: [],
           defaultPerspectiveId: null,
           rolePerspectives: [],
+          manageableRolePerspectives: [],
           roles: [],
           canApplyToRoles: false
         };
@@ -1215,6 +1216,10 @@ function DataTable({
     initialPerspectiveAppliedRef.current = true;
   }, [perspectiveTableId, applyPerspectiveSettings, advancedFilter]);
   const perspectiveQueryKey = ["table-perspectives", perspectiveTableId];
+  const rolePerspectivesForLocking = React.useMemo(
+    () => perspectiveData?.manageableRolePerspectives ?? perspectiveData?.rolePerspectives ?? [],
+    [perspectiveData]
+  );
   const perspectiveMutationContextId = `data-table-perspectives:${perspectiveTableId ?? "unknown"}`;
   const { runMutation: runPerspectiveMutation, retryLastMutation: retryPerspectiveMutation } = useGuardedMutation({
     contextId: perspectiveMutationContextId,
@@ -1231,13 +1236,28 @@ function DataTable({
   const savePerspectiveMutation = useMutation({
     mutationFn: async (input) => {
       if (!perspectiveTableId) throw new Error("Missing table id");
+      const roleExpectedUpdatedAtByRoleId = {};
+      const roleExpectedUpdatedAtByPerspectiveId = {};
+      for (const roleId of input.applyToRoles) {
+        const rolePerspectives = rolePerspectivesForLocking.filter((p) => p.roleId === roleId);
+        const matching = rolePerspectives.find((p) => p.name.trim() === input.name.trim()) ?? null;
+        const defaultPerspective = input.setRoleDefault ? rolePerspectives.find((p) => p.isDefault) ?? null : null;
+        for (const candidate of [matching, defaultPerspective]) {
+          if (!candidate?.updatedAt) continue;
+          roleExpectedUpdatedAtByPerspectiveId[candidate.id] = candidate.updatedAt;
+        }
+        const roleFallback = matching ?? defaultPerspective;
+        if (roleFallback?.updatedAt) roleExpectedUpdatedAtByRoleId[roleId] = roleFallback.updatedAt;
+      }
       const payload = {
         perspectiveId: input.perspectiveId ?? void 0,
         name: input.name,
         settings: input.settings ?? getCurrentSettings(),
         isDefault: input.isDefault,
         applyToRoles: input.applyToRoles,
-        setRoleDefault: input.setRoleDefault
+        setRoleDefault: input.setRoleDefault,
+        ...Object.keys(roleExpectedUpdatedAtByRoleId).length > 0 ? { roleExpectedUpdatedAtByRoleId } : {},
+        ...Object.keys(roleExpectedUpdatedAtByPerspectiveId).length > 0 ? { roleExpectedUpdatedAtByPerspectiveId } : {}
       };
       if (process.env.NODE_ENV !== "production") {
         console.debug("[DataTable] perspective payload", payload);
@@ -1301,11 +1321,15 @@ function DataTable({
   const deletePerspectiveMutation = useMutation({
     mutationFn: async ({ perspectiveId }) => {
       if (!perspectiveTableId) throw new Error("Missing table id");
+      const existing = perspectiveData?.perspectives.find((p) => p.id === perspectiveId) ?? null;
       await runPerspectiveMutation({
         operation: async () => {
-          const call = await apiCall(
-            `/api/perspectives/${encodeURIComponent(perspectiveTableId)}/${encodeURIComponent(perspectiveId)}`,
-            { method: "DELETE" }
+          const call = await withScopedApiRequestHeaders(
+            buildOptimisticLockHeader(existing?.updatedAt ?? null),
+            () => 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) {
@@ -1337,16 +1361,29 @@ function DataTable({
         setActivePerspectiveId(null);
         initialPerspectiveAppliedRef.current = false;
       }
+    },
+    onError: () => {
+      if (perspectiveTableId) {
+        void queryClient.invalidateQueries({ queryKey: perspectiveQueryKey });
+      }
     }
   });
   const clearRoleMutation = useMutation({
-    mutationFn: async ({ roleId }) => {
+    mutationFn: async ({ roleId, updatedAt, expectedUpdatedAtByPerspectiveId }) => {
       if (!perspectiveTableId) throw new Error("Missing table id");
+      const hasPerRowVersions = expectedUpdatedAtByPerspectiveId && Object.keys(expectedUpdatedAtByPerspectiveId).length > 0;
       await runPerspectiveMutation({
         operation: async () => {
-          const call = await apiCall(
-            `/api/perspectives/${encodeURIComponent(perspectiveTableId)}/roles/${encodeURIComponent(roleId)}`,
-            { method: "DELETE" }
+          const call = await withScopedApiRequestHeaders(
+            hasPerRowVersions ? {} : buildOptimisticLockHeader(updatedAt ?? null),
+            () => apiCall(
+              `/api/perspectives/${encodeURIComponent(perspectiveTableId)}/roles/${encodeURIComponent(roleId)}`,
+              hasPerRowVersions ? {
+                method: "DELETE",
+                headers: { "Content-Type": "application/json" },
+                body: JSON.stringify({ roleExpectedUpdatedAtByPerspectiveId: expectedUpdatedAtByPerspectiveId })
+              } : { 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) {
@@ -1378,6 +1415,11 @@ function DataTable({
           initialPerspectiveAppliedRef.current = false;
         }
       }
+    },
+    onError: () => {
+      if (perspectiveTableId) {
+        void queryClient.invalidateQueries({ queryKey: perspectiveQueryKey });
+      }
     }
   });
   const handlePerspectiveActivate = React.useCallback((item, _source) => {
@@ -1397,9 +1439,16 @@ function DataTable({
   const handlePerspectiveDelete = React.useCallback(async (perspectiveId) => {
     await deletePerspectiveMutation.mutateAsync({ perspectiveId });
   }, [deletePerspectiveMutation]);
-  const handleClearRole = React.useCallback(async (roleId) => {
-    await clearRoleMutation.mutateAsync({ roleId });
-  }, [clearRoleMutation]);
+  const handleClearRole = React.useCallback(async (perspective2) => {
+    const expectedUpdatedAtByPerspectiveId = Object.fromEntries(
+      rolePerspectivesForLocking.filter((item) => item.roleId === perspective2.roleId && item.updatedAt).map((item) => [item.id, item.updatedAt])
+    );
+    await clearRoleMutation.mutateAsync({
+      roleId: perspective2.roleId,
+      updatedAt: perspective2.updatedAt ?? null,
+      expectedUpdatedAtByPerspectiveId
+    });
+  }, [clearRoleMutation, rolePerspectivesForLocking]);
   const handleColumnChooserToggle = React.useCallback((key) => {
     const column = table.getColumn(key);
     if (!column) return;