Skip to content

Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.

fix later-batch problem

Andrey4a29ea075b80
diff --git a/frontend/src/pages/pam/PamDiscoveryPage/components/DiscoverySourceDetailSheet.tsx b/frontend/src/pages/pam/PamDiscoveryPage/components/DiscoverySourceDetailSheet.tsx
index 96d2c76d8e..783d2c55f7 100644
--- a/frontend/src/pages/pam/PamDiscoveryPage/components/DiscoverySourceDetailSheet.tsx
+++ b/frontend/src/pages/pam/PamDiscoveryPage/components/DiscoverySourceDetailSheet.tsx
@@ -915,7 +915,13 @@ export const DiscoverySourceDetailSheet = ({ isOpen, sourceId, onOpenChange }: P
sourceId={sourceId}
credentialAccountId={source?.credentialAccountId}
accounts={selectedAccounts}
- onImported={() => setSelected({})}
+ onImported={(discoveredAccountIds) =>
+ setSelected((prev) =>
+ Object.fromEntries(
+ Object.entries(prev).filter(([id]) => !discoveredAccountIds.includes(id))
+ )
+ )
+ }
/>
)}
</>
diff --git a/frontend/src/pages/pam/PamDiscoveryPage/components/ImportDiscoveredModal.tsx b/frontend/src/pages/pam/PamDiscoveryPage/components/ImportDiscoveredModal.tsx
index 51c0deaaa6..6dcc9f2837 100644
--- a/frontend/src/pages/pam/PamDiscoveryPage/components/ImportDiscoveredModal.tsx
+++ b/frontend/src/pages/pam/PamDiscoveryPage/components/ImportDiscoveredModal.tsx
@@ -44,7 +44,7 @@ type Props = {
sourceId: string;
credentialAccountId?: string;
accounts: TPamDiscoveredAccount[];
- onImported: () => void;
+ onImported: (discoveredAccountIds: string[]) => void;
};
export const ImportDiscoveredModal = ({
@@ -125,6 +125,7 @@ export const ImportDiscoveredModal = ({
: [items];
const results: TImportPamDiscoveredAccountResult[] = [];
+ let isComplete = false;
setIsImporting(true);
try {
for (const batch of batches) {
@@ -136,12 +137,13 @@ export const ImportDiscoveredModal = ({
});
results.push(...batchResults);
}
+ isComplete = true;
} catch {
// A failed request returns a 4xx that the global request handler surfaces as a toast
- return;
} finally {
setIsImporting(false);
}
+ if (results.length === 0) return;
const imported = results.filter((r) => r.status === "imported").length;
const failed = results.length - imported;
@@ -154,8 +156,10 @@ export const ImportDiscoveredModal = ({
type: failed > 0 || rotationFailures.length > 0 ? "info" : "success",
text: `Imported ${imported} account${imported === 1 ? "" : "s"}${failed > 0 ? `, ${failed} failed` : ""}${rotationNote}`
});
+ // earlier batches already went through, so drop them from the selection and keep the rest for a retry
+ onImported(results.map((r) => r.discoveredAccountId));
+ if (!isComplete) return;
reset();
- onImported();
onOpenChange(false);
};