🐸 Rybbit - open-source and privacy-friendly alternative to Google Analytics that is 10x more intuitive.
Refactor
Edward Cuidf8722b7c04d
diff --git a/client/src/components/SiteSettings/ImportManager.tsx b/client/src/components/SiteSettings/ImportManager.tsxindex 0a990061e..a8dcf4430 100644--- a/client/src/components/SiteSettings/ImportManager.tsx+++ b/client/src/components/SiteSettings/ImportManager.tsx@@ -36,7 +36,8 @@ import {} from "lucide-react";import { DateTime } from "luxon";import { useGetSiteImports, useImportSiteData } from "@/api/admin/import";-import { SplitDateRangePicker, DateRange, formatDateRange } from "@/components/SplitDateRangePicker";+import { SplitDateRangePicker, DateRange } from "@/components/SplitDateRangePicker";+import { format } from "date-fns";interface ImportManagerProps {siteId: number;@@ -125,12 +126,14 @@ export function ImportManager({ siteId, disabled }: ImportManagerProps) {const handleImport = () => {if (file && source) {- const formattedDateRange = formatDateRange(dateRange);+ const startDate = dateRange.startDate ? format(dateRange.startDate, "yyyy-MM-dd") : undefined;+ const endDate = dateRange.endDate ? format(dateRange.endDate, "yyyy-MM-dd") : undefined;mutation.mutate({file,source,- ...formattedDateRange+ startDate,+ endDate,});setFile(null);setShowConfirmDialog(false);diff --git a/client/src/components/SplitDateRangePicker.tsx b/client/src/components/SplitDateRangePicker.tsxindex 8889bdc68..e2ae4dfe6 100644--- a/client/src/components/SplitDateRangePicker.tsx+++ b/client/src/components/SplitDateRangePicker.tsx@@ -188,28 +188,3 @@ export function SplitDateRangePicker({</div>);}--export const formatDateRange = (- dateRange: DateRange,- dateFormat: string = "yyyy-MM-dd"-): { startDate?: string; endDate?: string } => {- const result: { startDate?: string; endDate?: string } = {};-- if (dateRange.startDate) {- result.startDate = format(dateRange.startDate, dateFormat);- }- if (dateRange.endDate) {- result.endDate = format(dateRange.endDate, dateFormat);- }-- return result;-};--export const isValidDateRange = (dateRange: DateRange): boolean => {- const { startDate, endDate } = dateRange;-- if (!startDate && !endDate) return true; // Empty range is valid- if (!startDate || !endDate) return true; // Partial range is valid-- return startDate <= endDate;-};