🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor
Edward Cui47f317895e36
diff --git a/client/src/api/admin/import.ts b/client/src/api/admin/import.tsindex 29dcb73cf..6c2bb4772 100644--- a/client/src/api/admin/import.ts+++ b/client/src/api/admin/import.ts@@ -1,6 +1,5 @@import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";import { authedFetch } from "@/api/utils";-import { useStore } from "@/lib/store";import { APIResponse } from "@/api/types";interface GetSiteImportsResponse {@@ -25,9 +24,7 @@ interface ImportSiteDataResponse {message: string;}-export function useGetSiteImports() {- const { site } = useStore();-+export function useGetSiteImports(site: number) {return useQuery({queryKey: ["get-site-imports", site],queryFn: async () => await authedFetch<APIResponse<GetSiteImportsResponse[]>>(`/get-site-imports/${site}`),@@ -42,8 +39,7 @@ export function useGetSiteImports() {});}-export function useImportSiteData() {- const { site } = useStore();+export function useImportSiteData(site: number) {const queryClient = useQueryClient();return useMutation({diff --git a/client/src/components/SiteSettings/ImportManager.tsx b/client/src/components/SiteSettings/ImportManager.tsxindex ed79d6bb2..95693de07 100644--- a/client/src/components/SiteSettings/ImportManager.tsx+++ b/client/src/components/SiteSettings/ImportManager.tsx@@ -39,6 +39,11 @@ import { DateTime } from "luxon";import { useGetSiteImports, useImportSiteData } from "@/api/admin/import";import { SplitDateRangePicker, DateRange, formatDateRange } from "@/components/SplitDateRangePicker";+interface ImportManagerProps {+ siteId: number;+ disabled: boolean;+}+interface FileValidationError {type: "size" | "type" | "name";message: string;@@ -48,7 +53,7 @@ const MAX_FILE_SIZE = 100 * 1024 * 1024; // 100MBconst ALLOWED_FILE_TYPES = ["text/csv"];const ALLOWED_EXTENSIONS = [".csv"];-export function ImportManager({ disabled }: { disabled: boolean }) {+export function ImportManager({ siteId, disabled }: ImportManagerProps) {const [file, setFile] = useState<File | null>(null);const [source] = useState("umami");const [dateRange, setDateRange] = useState<DateRange>({});@@ -56,8 +61,8 @@ export function ImportManager({ disabled }: { disabled: boolean }) {const [showConfirmDialog, setShowConfirmDialog] = useState(false);const [isManualRefresh, setIsManualRefresh] = useState(false);- const { data, isLoading, error, refetch } = useGetSiteImports();- const mutation = useImportSiteData();+ const { data, isLoading, error, refetch } = useGetSiteImports(siteId);+ const mutation = useImportSiteData(siteId);const validateFile = useCallback((file: File): FileValidationError | null => {// Check file sizediff --git a/client/src/components/SiteSettings/SiteSettings.tsx b/client/src/components/SiteSettings/SiteSettings.tsxindex 54f13f348..daa391b3c 100644--- a/client/src/components/SiteSettings/SiteSettings.tsx+++ b/client/src/components/SiteSettings/SiteSettings.tsx@@ -107,7 +107,7 @@ function SiteSettingsInner({value="import"className="pt-4 space-y-4 max-h-[70vh] overflow-y-auto">- <ImportManager disabled={disabled} />+ <ImportManager siteId={siteMetadata.siteId} disabled={disabled} /></TabsContent></Tabs>