apunkt/SurfSense
1
0
Fork 0
mirror of https://github.com/MODSetter/SurfSense.git synced 2026-06-16 21:05:20 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix: Google Drive folder handling and connector page updates

Browse source
This commit is contained in:
CREDO23 2025-12-28 19:57:10 +02:00
parent 10c98745cd
commit 27beac4f62
4 changed files with 40 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

33
surfsense_web/app/dashboard/[search_space_id]/connectors/add/google-drive-connector/page.tsx
View file

@ -1,11 +1,13 @@
"use client";
import { useAtomValue } from "jotai";
import { ArrowLeft, Check, ExternalLink, Loader2 } from "lucide-react";
import { motion } from "motion/react";
import Link from "next/link";
import { useParams, useRouter, useSearchParams } from "next/navigation";
import { useParams, useRouter } from "next/navigation";
import { useEffect, useState } from "react";
import { toast } from "sonner";
import { connectorsAtom } from "@/atoms/connectors/connector-query.atoms";
import { Button } from "@/components/ui/button";
import {
Card,
@ -17,45 +19,30 @@ import {
} from "@/components/ui/card";
import { EnumConnectorName } from "@/contracts/enums/connector";
import { getConnectorIcon } from "@/contracts/enums/connectorIcons";
import {
type SearchSourceConnector,
useSearchSourceConnectors,
} from "@/hooks/use-search-source-connectors";
import type { SearchSourceConnector } from "@/contracts/types/connector.types";
import { authenticatedFetch } from "@/lib/auth-utils";
export default function GoogleDriveConnectorPage() {
const router = useRouter();
const params = useParams();
const searchParams = useSearchParams();
const searchSpaceId = params.search_space_id as string;
const [isConnecting, setIsConnecting] = useState(false);
const [doesConnectorExist, setDoesConnectorExist] = useState(false);
const { fetchConnectors } = useSearchSourceConnectors(true, Number.parseInt(searchSpaceId));
const { refetch: fetchConnectors } = useAtomValue(connectorsAtom);
// Check if connector exists and handle OAuth success
useEffect(() => {
const success = searchParams.get("success");
fetchConnectors(Number.parseInt(searchSpaceId)).then((data) => {
const driveConnector = data.find(
fetchConnectors().then((data) => {
const connectors = data.data || [];
const connector = connectors.find(
(c: SearchSourceConnector) => c.connector_type === EnumConnectorName.GOOGLE_DRIVE_CONNECTOR
);
if (driveConnector) {
if (connector) {
setDoesConnectorExist(true);
// If just connected, show success and redirect
if (success === "true") {
toast.success("Google Drive connected successfully!");
setTimeout(() => {
router.push(`/dashboard/${searchSpaceId}/connectors`);
}, 1500);
}
}
});
}, [searchParams, fetchConnectors, searchSpaceId, router]);
}, []);
const handleConnectGoogle = async () => {
try {

12
surfsense_web/hooks/use-search-source-connectors.ts
View file

@ -268,8 +268,8 @@ export const useSearchSourceConnectors = (lazy: boolean = false, searchSpaceId?:
searchSpaceId: string | number,
startDate?: string,
endDate?: string,
folderId?: string,
folderName?: string
folderIds?: string,
folderNames?: string
) => {
try {
// Build query parameters
@ -282,11 +282,11 @@ export const useSearchSourceConnectors = (lazy: boolean = false, searchSpaceId?:
if (endDate) {
params.append("end_date", endDate);
}
if (folderId) {
params.append("folder_id", folderId);
if (folderIds) {
params.append("folder_ids", folderIds);
}
if (folderName) {
params.append("folder_name", folderName);
if (folderNames) {
params.append("folder_names", folderNames);
}
const response = await authenticatedFetch(