fix(org): treat a failed retention re-read as unconfirmed

refetch() resolves on failure with the last good data, so a save or removal could write a stale
document over another admin's change.

Author: waleedlatif1

apps/sim/platform/app/(shell)/settings/_components/sections/data-retention/data-retention-section.round-trip.test.tsx

@@ -30,11 +30,13 @@ vi.mock(
       changed,
       onChange,
       onSave,
+      onRemove,
     }: {
       draft: PolicyDraft
       changed: boolean
       onChange: (draft: PolicyDraft) => void
       onSave: () => void
+      onRemove: () => Promise<void>
     }): ReactNode => (
       <div>
         <output>{draft.logDays}</output>
@@ -47,6 +49,16 @@ vi.mock(
         <button type='button' disabled={!changed} onClick={onSave}>
           Save
         </button>
+        <button
+          type='button'
+          onClick={() =>
+            void onRemove().catch((error: Error) => {
+              window.document.body.dataset.removeError = error.message
+            })
+          }
+        >
+          Remove
+        </button>
       </div>
     ),
   })
@@ -122,6 +134,7 @@ describe('DataRetentionSection across saves', () => {
     server.writes = []
     server.answer = (body) => retentionDocument((body.logRetentionHours ?? 0) / 24)
     server.read = async () => ({ success: true, data: server.document })
+    delete window.document.body.dataset.removeError
     apiClientRequestMockFns.mockRequestJson
       .mockReset()
       .mockImplementation(
@@ -198,6 +211,38 @@ describe('DataRetentionSection across saves', () => {
     expect(emcnMockFns.mockToast.error).not.toHaveBeenCalled()
   })
 
+  describe('the read before a write fails', () => {
+    async function failNextReads(start: () => Promise<void>) {
+      server.read = async () => {
+        throw new Error('read failed')
+      }
+      await start()
+      await settle()
+    }
+
+    it('writes nothing over the document from before the failure, and says so', async () => {
+      server.document = retentionDocument(60)
+      await click('Organization')
+      await click('keep logs 7 days')
+      await failNextReads(() => click('Save'))
+
+      expect(server.writes).toEqual([])
+      expect(emcnMockFns.mockToast.error).toHaveBeenCalledWith(
+        'Could not confirm the latest retention settings. Nothing was saved.'
+      )
+    })
+
+    it('removes nothing over the document from before the failure', async () => {
+      await click('Organization')
+      await failNextReads(() => click('Remove'))
+
+      expect(server.writes).toEqual([])
+      expect(window.document.body.dataset.removeError).toBe(
+        'Could not confirm the latest retention settings.'
+      )
+    })
+  })
+
   it('shows the route answer without waiting on the read that follows the save', async () => {
     server.answer = () => retentionDocument(90)
     await click('Organization')

apps/sim/platform/app/(shell)/settings/_components/sections/data-retention/data-retention-section.tsx

@@ -199,7 +199,7 @@ interface RetentionFormProps {
   initialData: DataRetentionResponse
   organizationId: string
   workspaceOptions: { value: string; label: string }[]
-  refetch: () => Promise<{ data?: DataRetentionResponse }>
+  refetch: () => Promise<{ data?: DataRetentionResponse; isError: boolean }>
 }
 
 /**
@@ -236,8 +236,9 @@ function RetentionForm({
         withOverrides={withOverrides}
         isSaving={update.isPending}
         readLatest={async () => {
-          const { data } = await refetch()
-          return data ? snapshotFrom(data) : null
+          // A failed refetch still resolves, carrying the last good document.
+          const { data, isError } = await refetch()
+          return data && !isError ? snapshotFrom(data) : null
         }}
         persist={persist}
         onClose={() => setSelection(null)}