Skip to content

OpenRAG is a comprehensive, single package Retrieval-Augmented Generation platform built on Langflow, Docling, and Opensearch.

Python

fix: restrict ingestion to containers section shows up correctly and error message isn't duplicated (#2071)

Zephyrus0e2f173d1832
diff --git a/frontend/enhancements/connectors/azure-blob/settings-dialog.tsx b/frontend/enhancements/connectors/azure-blob/settings-dialog.tsx
index 7164e25d2..a172d44b9 100644
--- a/frontend/enhancements/connectors/azure-blob/settings-dialog.tsx
+++ b/frontend/enhancements/connectors/azure-blob/settings-dialog.tsx
@@ -49,12 +49,18 @@ export default function AzureBlobSettingsDialog({
const [selectedContainers, setSelectedContainers] = useState<string[]>(
defaults?.container_names ?? [],
);
- useEffect(() => {
- if (defaults?.container_names?.length) {
- setContainers(defaults.container_names);
- setSelectedContainers(defaults.container_names);
- }
- }, [defaults]);
+ const [showContainers, setShowContainers] = useState(
+ !!defaults?.container_names?.length,
+ );
+
+ const [prevDefaults, setPrevDefaults] = useState(defaults);
+ if (defaults !== prevDefaults) {
+ setPrevDefaults(defaults);
+ const names = defaults?.container_names ?? [];
+ setContainers(names.length ? names : null);
+ setSelectedContainers(names);
+ setShowContainers(names.length > 0);
+ }
const [isFetchingContainers, setIsFetchingContainers] = useState(false);
const [containersError, setContainersError] = useState<string | null>(null);
@@ -66,13 +72,16 @@ export default function AzureBlobSettingsDialog({
// can be cancelled if the user closes the dialog or starts a new test.
const testAbortRef = useRef<AbortController | null>(null);
- // Abort any in-flight test request when the component unmounts (i.e. when
- // the dialog is closed, since connector-cards renders it only while open).
+ // Abort any in-flight test request when the dialog closes. The dialog
+ // component itself stays mounted (connector-cards renders it unconditionally
+ // and just toggles `open`), so an unmount-only cleanup would never fire here
+ // — without this, a canceled test could still resolve and repopulate the
+ // container list after the user closed the dialog.
useEffect(() => {
- return () => {
+ if (!open) {
testAbortRef.current?.abort();
- };
- }, []);
+ }
+ }, [open]);
const handleTestConnection = handleSubmit(async (data) => {
// Cancel any previous in-flight test before starting a new one.
@@ -107,6 +116,7 @@ export default function AzureBlobSettingsDialog({
const fetched: string[] = json.containers;
setContainers(fetched);
setSelectedContainers((prev) => prev.filter((c) => fetched.includes(c)));
+ setShowContainers(true);
} catch (err: unknown) {
// Ignore cancellations — they are intentional (dialog closed or new test
// started) and must not surface an error message to the user.
@@ -114,6 +124,8 @@ export default function AzureBlobSettingsDialog({
setContainersError(
err instanceof Error ? err.message : "Connection failed",
);
+ setShowContainers(false);
+ setContainers(null);
} finally {
// Only clear the loading flag if this invocation is still the active one.
// If the user started a second test while this one was in flight, the
@@ -127,6 +139,7 @@ export default function AzureBlobSettingsDialog({
const onSubmit = handleSubmit(async (data) => {
setFormError(null);
+ setContainersError(null);
if (containers === null) {
setFormError("Test the connection first to validate credentials.");
return;
@@ -197,6 +210,13 @@ export default function AzureBlobSettingsDialog({
connectionStringSet={defaults?.connection_string_set}
accountKeySet={defaults?.account_key_set}
formError={formError}
+ showContainers={showContainers}
+ onAuthModeChange={() => {
+ setShowContainers(false);
+ setContainers(null);
+ setContainersError(null);
+ setFormError(null);
+ }}
/>
<DialogFooter className="mt-4">
diff --git a/frontend/enhancements/connectors/azure-blob/settings-form.tsx b/frontend/enhancements/connectors/azure-blob/settings-form.tsx
index 872d74c65..a979bb610 100644
--- a/frontend/enhancements/connectors/azure-blob/settings-form.tsx
+++ b/frontend/enhancements/connectors/azure-blob/settings-form.tsx
@@ -29,6 +29,8 @@ interface AzureBlobSettingsFormProps {
connectionStringSet?: boolean;
accountKeySet?: boolean;
formError?: string | null;
+ showContainers?: boolean;
+ onAuthModeChange?: () => void;
}
export function AzureBlobSettingsForm({
@@ -41,6 +43,8 @@ export function AzureBlobSettingsForm({
connectionStringSet,
accountKeySet,
formError,
+ showContainers,
+ onAuthModeChange,
}: AzureBlobSettingsFormProps) {
const {
register,
@@ -69,7 +73,13 @@ export function AzureBlobSettingsForm({
control={control}
name="auth_mode"
render={({ field }) => (
- <Tabs value={field.value} onValueChange={(v) => field.onChange(v)}>
+ <Tabs
+ value={field.value}
+ onValueChange={(v) => {
+ field.onChange(v);
+ onAuthModeChange?.();
+ }}
+ >
<TabsList className="w-full">
<TabsTrigger value="connection_string">
<span className="font-semibold text-sm">
@@ -213,7 +223,7 @@ export function AzureBlobSettingsForm({
)}
{/* Container selector */}
- {containers !== null && (
+ {containers !== null && showContainers && (
<div className="space-y-2">
<div className="flex items-center justify-between">
<Label className="text-sm font-medium">