OpenRAG is a comprehensive, single package Retrieval-Augmented Generation platform built on Langflow, Docling, and Opensearch.
Python
fix: Ingestion of buckets not working right after connection is tested - CPD #75506 (#1942) (#2019)
Rico Furtado36f115f790d1
diff --git a/frontend/components/connectors/aws-s3/bucket-view.tsx b/frontend/components/connectors/aws-s3/bucket-view.tsxindex f2887084c..5e859828f 100644--- a/frontend/components/connectors/aws-s3/bucket-view.tsx+++ b/frontend/components/connectors/aws-s3/bucket-view.tsx@@ -2,6 +2,7 @@import type { useSyncConnector } from "@/app/api/mutations/useSyncConnector";import { useS3BucketStatusQuery } from "@/app/api/queries/useS3BucketStatusQuery";+import { useS3DefaultsQuery } from "@/app/api/queries/useS3DefaultsQuery";import { SharedBucketView } from "../shared-bucket-view";export interface S3BucketViewProps {@@ -25,6 +26,7 @@ export function S3BucketView({error: bucketsError,refetch,} = useS3BucketStatusQuery(connector.connectionId, { enabled: true });+ const { data: defaults } = useS3DefaultsQuery({ enabled: true });return (<SharedBucketViewconnector={connector}@@ -37,6 +39,11 @@ export function S3BucketView({addTask={addTask}onBack={onBack}onDone={onDone}+ initialSelectedBuckets={+ defaults?.connection_id === connector.connectionId+ ? defaults?.bucket_names+ : undefined+ }/>);}diff --git a/frontend/components/connectors/shared-bucket-view.tsx b/frontend/components/connectors/shared-bucket-view.tsxindex 54c59c71e..92c589529 100644--- a/frontend/components/connectors/shared-bucket-view.tsx+++ b/frontend/components/connectors/shared-bucket-view.tsx@@ -2,7 +2,7 @@import { useQueryClient } from "@tanstack/react-query";import { ArrowLeft, FileSearch, FolderOpen, RefreshCw } from "lucide-react";-import { useState } from "react";+import { useEffect, useRef, useState } from "react";import { toast } from "sonner";import type { useSyncConnector } from "@/app/api/mutations/useSyncConnector";import { useGetSettingsQuery } from "@/app/api/queries/useGetSettingsQuery";@@ -30,6 +30,8 @@ export interface SharedBucketViewProps {onDone: () => void;/** When true, show the "Make documents available to all users" toggle. COS ingestion only. */showShared?: boolean;+ /** Buckets to pre-select once `buckets` has loaded, e.g. from saved connector defaults. */+ initialSelectedBuckets?: string[];}export function SharedBucketView({@@ -44,6 +46,7 @@ export function SharedBucketView({onBack,onDone,showShared = false,+ initialSelectedBuckets,}: SharedBucketViewProps) {const queryClient = useQueryClient();const { isAuthenticated, isNoAuthMode } = useAuth();@@ -56,12 +59,31 @@ export function SharedBucketView({const [selectedBuckets, setSelectedBuckets] = useState<Set<string>>(new Set(),);+ const hasAppliedInitial = useRef(false);const [ingestSettings, setIngestSettings] = useSessionIngestSettings();const [isSettingsOpen, setIsSettingsOpen] = useState(false);const [browseDialogBucket, setBrowseDialogBucket] = useState<string | null>(null,);+ useEffect(() => {+ if (+ !hasAppliedInitial.current &&+ buckets?.length &&+ initialSelectedBuckets?.length+ ) {+ hasAppliedInitial.current = true;+ if (selectedBuckets.size === 0) {+ const valid = initialSelectedBuckets.filter((name) =>+ buckets.some((b) => b.name === name),+ );+ if (valid.length) {+ setSelectedBuckets(new Set(valid));+ }+ }+ }+ }, [buckets, initialSelectedBuckets]); // eslint-disable-line react-hooks/exhaustive-deps+const invalidate = () => {queryClient.invalidateQueries({ queryKey: invalidateQueryKey });};diff --git a/frontend/enhancements/connectors/ibm-cos/components/bucket-view.tsx b/frontend/enhancements/connectors/ibm-cos/components/bucket-view.tsxindex 870ba651a..050cea0a0 100644--- a/frontend/enhancements/connectors/ibm-cos/components/bucket-view.tsx+++ b/frontend/enhancements/connectors/ibm-cos/components/bucket-view.tsx@@ -3,6 +3,7 @@import type { useSyncConnector } from "@/app/api/mutations/useSyncConnector";import { SharedBucketView } from "@/components/connectors/shared-bucket-view";import { useIBMCOSBucketStatusQuery } from "../useIBMCOSBucketStatusQuery";+import { useIBMCOSDefaultsQuery } from "../useIBMCOSDefaultsQuery";export interface IBMCOSBucketViewProps {connector: any;@@ -25,6 +26,7 @@ export function IBMCOSBucketView({error: bucketsError,refetch,} = useIBMCOSBucketStatusQuery(connector.connectionId, { enabled: true });+ const { data: defaults } = useIBMCOSDefaultsQuery({ enabled: true });return (<SharedBucketViewconnector={connector}@@ -38,6 +40,11 @@ export function IBMCOSBucketView({onBack={onBack}onDone={onDone}showShared+ initialSelectedBuckets={+ defaults?.connection_id === connector.connectionId+ ? defaults?.bucket_names+ : undefined+ }/>);}