Skip to content

A full-featured CRM built with React, shadcn/ui, and Supabase.

Merge branch 'main' into fix/import-dialog

Jerome66133239262a
diff --cc doc/src/content/docs/users/import-data.mdx
index b2d952a8,f7119a24..7ab68d41
--- a/doc/src/content/docs/users/import-data.mdx
+++ b/doc/src/content/docs/users/import-data.mdx
@@@ -11,7 -14,9 +14,11 @@@ Atomic CRM imports contacts, companies
<video src="https://github.com/user-attachments/assets/a1133cf0-0287-4fc0-b61b-5a0b88617cfc" controls className="w-full aspect-1304/814"></video>
- An example of the expected CSV file is available in the contact import modal:
+ For each resource, the dialog offers a sample CSV file to download, showing the expected columns. Columns the CRM does not know are ignored, and columns you omit are left empty.
+
++The import runs in the background: the dialog closes as soon as it starts, and a progress snackbar reports how many records have landed, so you can keep using the CRM while it runs. Stop it from that snackbar at any time.
++
+ ### Contacts
```csv
first_name,last_name,gender,title,background,first_seen,last_seen,has_newsletter,status,tags,linkedin_url,company,email_work,email_home,email_other,phone_work,phone_home,phone_other
diff --cc registry.json
index 8c7c2067,10be3178..2f20432b
--- a/registry.json
+++ b/registry.json
@@@ -161,6 -161,6 +161,10 @@@
"path": "src/components/atomic-crm/sales/useGetSalesName.ts",
"type": "registry:component"
},
++ {
++ "path": "src/components/atomic-crm/sales/salesErrorNotification.ts",
++ "type": "registry:component"
++ },
{
"path": "src/components/atomic-crm/sales/index.ts",
"type": "registry:component"
@@@ -609,6 -621,46 +625,54 @@@
"path": "src/components/atomic-crm/deals/ContactList.tsx",
"type": "registry:component"
},
+ {
+ "path": "src/components/atomic-crm/dataImport/useImportableResources.ts",
+ "type": "registry:component"
+ },
+ {
+ "path": "src/components/atomic-crm/dataImport/useDealImport.ts",
+ "type": "registry:component"
+ },
+ {
+ "path": "src/components/atomic-crm/dataImport/useCompanyResolver.ts",
+ "type": "registry:component"
+ },
+ {
+ "path": "src/components/atomic-crm/dataImport/useCompanyImport.ts",
+ "type": "registry:component"
+ },
+ {
+ "path": "src/components/atomic-crm/dataImport/types.ts",
+ "type": "registry:component"
+ },
+ {
+ "path": "src/components/atomic-crm/dataImport/parseCell.ts",
+ "type": "registry:component"
+ },
+ {
+ "path": "src/components/atomic-crm/dataImport/fetchRecordsWithCache.ts",
+ "type": "registry:component"
+ },
+ {
+ "path": "src/components/atomic-crm/dataImport/createEachRow.ts",
+ "type": "registry:component"
+ },
++ {
++ "path": "src/components/atomic-crm/dataImport/DataImportProvider.tsx",
++ "type": "registry:component"
++ },
++ {
++ "path": "src/components/atomic-crm/dataImport/DataImportProgressToast.tsx",
++ "type": "registry:component"
++ },
+ {
+ "path": "src/components/atomic-crm/dataImport/DataImportDialog.tsx",
+ "type": "registry:component"
+ },
+ {
+ "path": "src/components/atomic-crm/dataImport/DataImportButton.tsx",
+ "type": "registry:component"
+ },
{
"path": "src/components/atomic-crm/dashboard/Welcome.tsx",
"type": "registry:component"
diff --cc src/components/atomic-crm/dataImport/DataImport.test.tsx
index daeb2068,00000000..7e08b2a5
mode 100644,000000..100644
--- a/src/components/atomic-crm/dataImport/DataImport.test.tsx
+++ b/src/components/atomic-crm/dataImport/DataImport.test.tsx
@@@ -1,292 -1,0 +1,296 @@@
+import { useState, type ReactNode } from "react";
+import { render } from "vitest-browser-react";
+import { page } from "vitest/browser";
+import {
+ useNotify,
+ type CreateParams,
+ type CreateResult,
+ type DataProvider,
+} from "ra-core";
+import { toast } from "sonner";
+
+import { StoryWrapper } from "@/test/StoryWrapper";
- import { ContactImportButton } from "./ContactImportButton";
++import { DataImportButton } from "./DataImportButton";
+
+const ROW_COUNT = 80;
+
+const csv = [
+ "first_name,last_name",
+ ...Array.from({ length: ROW_COUNT }, (_, index) => `Ada${index},Lovelace`),
+].join("\n");
+
+let createDelay = 200;
+let createdCount = 0;
+
+const NotifyTrigger = () => {
+ const notify = useNotify();
+ return (
+ <button onClick={() => notify("Contact updated", { type: "success" })}>
+ notify
+ </button>
+ );
+};
+
+const UnmountableImportControls = () => {
+ const [isMounted, setIsMounted] = useState(true);
+ return (
+ <>
+ <button onClick={() => setIsMounted(false)}>unmount contact list</button>
- {isMounted ? <ContactImportButton /> : <p>contact list unmounted</p>}
++ {isMounted ? (
++ <DataImportButton resource="contacts" />
++ ) : (
++ <p>contact list unmounted</p>
++ )}
+ </>
+ );
+};
+
+const createContact = async (
+ _resource: string,
+ params: CreateParams,
+): Promise<CreateResult> => {
+ await new Promise((resolve) => setTimeout(resolve, createDelay));
+ createdCount += 1;
+ return { data: { ...params.data, id: createdCount } };
+};
+
+const ImportHarness = ({ children }: { children?: ReactNode }) => (
+ <StoryWrapper
+ dataProvider={{ create: createContact as DataProvider["create"] }}
+ >
+ {children ?? (
+ <>
- <ContactImportButton />
++ <DataImportButton resource="contacts" />
+ <NotifyTrigger />
+ </>
+ )}
+ </StoryWrapper>
+);
+
+type Screen = Awaited<ReturnType<typeof render>>;
+
+const openImportDialog = (screen: Screen) =>
+ screen.getByRole("button", { name: /import csv/i }).click();
+
+const selectCsvFile = () => {
+ const input = document.querySelector<HTMLInputElement>('input[type="file"]');
+ if (!input) throw new Error("The import dialog has no file input");
+ return page
+ .elementLocator(input)
+ .upload(new File([csv], "contacts.csv", { type: "text/csv" }));
+};
+
+const submitImportDialog = (screen: Screen) =>
+ screen
+ .getByRole("toolbar")
- .getByRole("button", { name: /import csv/i })
++ .getByRole("button", { name: /start import/i })
+ .click();
+
+const startImport = async (screen: Screen) => {
+ await openImportDialog(screen);
+ await selectCsvFile();
+ await submitImportDialog(screen);
+ await expect
- .element(screen.getByText(/Importing contacts/))
++ .element(screen.getByText(/Import in progress/))
+ .toBeInTheDocument();
+};
+
+const finishRemainingBatchesFast = () => {
+ createDelay = 0;
+};
+
+const getToasterPositions = () =>
+ Array.from(document.querySelectorAll("[data-sonner-toaster]")).map(
+ (toaster) => ({
+ position: `${toaster.getAttribute("data-y-position")}-${toaster.getAttribute("data-x-position")}`,
+ text: (toaster as HTMLElement).innerText,
+ }),
+ );
+
+const dispatchBeforeUnload = () => {
+ const event = new Event("beforeunload", { cancelable: true });
+ window.dispatchEvent(event);
+ return event;
+};
+
+beforeEach(() => {
+ createDelay = 200;
+ createdCount = 0;
+});
+
+afterEach(() => {
+ toast.dismiss();
+});
+
- describe("contact import", () => {
++describe("data import", () => {
+ it("reports progress in a snackbar and notifies when the import ends", async () => {
+ const screen = await render(<ImportHarness />);
+
+ await startImport(screen);
+
+ await expect
- .element(screen.getByText(new RegExp(`/ ${ROW_COUNT} contacts`)))
++ .element(screen.getByText(new RegExp(`/ ${ROW_COUNT} records`)))
+ .toBeInTheDocument();
+
+ finishRemainingBatchesFast();
+
+ await expect
+ .element(
+ screen.getByText(
- `Contacts import complete. Imported ${ROW_COUNT} contacts, with 0 errors`,
++ `Import complete. Imported ${ROW_COUNT} records, with 0 errors`,
+ ),
+ )
+ .toBeInTheDocument();
+ await expect
- .element(screen.getByText(/Importing contacts/))
++ .element(screen.getByText(/Import in progress/))
+ .not.toBeInTheDocument();
+ });
+
+ it("closes the dialog when the import starts", async () => {
+ const screen = await render(<ImportHarness />);
+
+ await startImport(screen);
+
+ await expect.element(screen.getByRole("dialog")).not.toBeInTheDocument();
+
+ finishRemainingBatchesFast();
+
+ await expect
+ .element(
+ screen.getByText(
- `Contacts import complete. Imported ${ROW_COUNT} contacts, with 0 errors`,
++ `Import complete. Imported ${ROW_COUNT} records, with 0 errors`,
+ ),
+ )
+ .toBeInTheDocument();
+ expect(createdCount).toBe(ROW_COUNT);
+ });
+
+ it("prevents starting a second import while one is running", async () => {
+ const screen = await render(<ImportHarness />);
+
+ await startImport(screen);
+
+ await expect
+ .element(screen.getByRole("button", { name: /import csv/i }))
+ .toBeDisabled();
+
+ finishRemainingBatchesFast();
+
+ await expect
- .element(screen.getByText(/Contacts import complete/))
++ .element(screen.getByText(/Import complete/))
+ .toBeInTheDocument();
+ await expect
+ .element(screen.getByRole("button", { name: /import csv/i }))
+ .toBeEnabled();
+ });
+
+ it("asks the browser to confirm leaving the page only while the import runs", async () => {
+ const screen = await render(<ImportHarness />);
+
+ expect(dispatchBeforeUnload().defaultPrevented).toBe(false);
+
+ await startImport(screen);
+
+ expect(dispatchBeforeUnload().defaultPrevented).toBe(true);
+
+ finishRemainingBatchesFast();
+
+ await expect
- .element(screen.getByText(/Contacts import complete/))
++ .element(screen.getByText(/Import complete/))
+ .toBeInTheDocument();
+
+ expect(dispatchBeforeUnload().defaultPrevented).toBe(false);
+ });
+
+ it("keeps the progress snackbar in its own stack when another notification pops up", async () => {
+ const screen = await render(<ImportHarness />);
+
+ await startImport(screen);
+
+ await screen.getByRole("button", { name: "notify" }).click();
+ await expect.element(screen.getByText("Contact updated")).toBeVisible();
+
+ const positions = getToasterPositions();
+ const progressStack = positions.find((stack) =>
- /Importing contacts/.test(stack.text),
++ /Import in progress/.test(stack.text),
+ );
+ const notificationStack = positions.find((stack) =>
+ /Contact updated/.test(stack.text),
+ );
+
+ expect(progressStack?.position).toBe("bottom-right");
+ expect(notificationStack?.position).toBe("bottom-center");
+ expect(progressStack).not.toBe(notificationStack);
+
+ finishRemainingBatchesFast();
+ await expect
- .element(screen.getByText(/Contacts import complete/))
++ .element(screen.getByText(/Import complete/))
+ .toBeInTheDocument();
+ });
+
+ it("keeps importing after the subtree holding the import button unmounts", async () => {
+ const screen = await render(
+ <ImportHarness>
+ <UnmountableImportControls />
+ </ImportHarness>,
+ );
+
+ await startImport(screen);
+
+ await screen.getByRole("button", { name: "unmount contact list" }).click();
+ await expect
+ .element(screen.getByText("contact list unmounted"))
+ .toBeVisible();
+ await expect
+ .element(screen.getByRole("button", { name: /import csv/i }))
+ .not.toBeInTheDocument();
+
+ await expect
- .element(screen.getByText(/Importing contacts/))
++ .element(screen.getByText(/Import in progress/))
+ .toBeInTheDocument();
+
+ finishRemainingBatchesFast();
+
+ await expect
+ .element(
+ screen.getByText(
- `Contacts import complete. Imported ${ROW_COUNT} contacts, with 0 errors`,
++ `Import complete. Imported ${ROW_COUNT} records, with 0 errors`,
+ ),
+ )
+ .toBeInTheDocument();
+ expect(createdCount).toBe(ROW_COUNT);
+ });
+
+ it("disables the dialog submit button until a file is selected", async () => {
+ const screen = await render(<ImportHarness />);
+
+ await openImportDialog(screen);
+
+ await expect.element(screen.getByText(/Download CSV sample/)).toBeVisible();
+ await expect
+ .element(
+ screen
+ .getByRole("toolbar")
- .getByRole("button", { name: /import csv/i }),
++ .getByRole("button", { name: /start import/i }),
+ )
+ .toBeDisabled();
+ });
+
+ it("stops the import from the progress snackbar", async () => {
+ const screen = await render(<ImportHarness />);
+
+ await startImport(screen);
+
+ await screen.getByRole("button", { name: /stop import/i }).click();
+
+ await expect
- .element(screen.getByText(/Importing contacts/))
++ .element(screen.getByText(/Import in progress/))
+ .not.toBeInTheDocument();
+
+ const createdWhenStopped = createdCount;
+ await expect
- .element(screen.getByText(/Contacts import complete/))
++ .element(screen.getByText(/Import complete/))
+ .not.toBeInTheDocument();
+ expect(createdWhenStopped).toBeLessThan(ROW_COUNT);
+ });
+});
diff --cc src/components/atomic-crm/dataImport/DataImportButton.tsx
index 00000000,c154e770..8ce6336e
mode 000000,100644..100644
--- a/src/components/atomic-crm/dataImport/DataImportButton.tsx
+++ b/src/components/atomic-crm/dataImport/DataImportButton.tsx
@@@ -1,0 -1,49 +1,39 @@@
-import { useState } from "react";
+ import { Upload } from "lucide-react";
+ import { useTranslate } from "ra-core";
+ import { Button } from "@/components/ui/button";
+
-import { DataImportDialog } from "./DataImportDialog";
++import { useDataImportContext } from "./DataImportProvider";
+ import type { ImportableResourceName } from "./useImportableResources";
-import { useImportableResources } from "./useImportableResources";
+
+ /**
+ * Imports a CSV file into the CRM. Given a `resource`, it imports into that one
+ * and the dialog opens without a resource dropdown; otherwise the dialog offers
+ * every importable resource.
+ */
+ export const DataImportButton = ({
+ resource,
+ }: {
+ resource?: ImportableResourceName;
+ }) => {
+ const translate = useTranslate();
- const [dialogOpen, setDialogOpen] = useState(false);
- const importableResources = useImportableResources();
- const resources = resource
- ? importableResources.filter(({ name }) => name === resource)
- : importableResources;
++ const { resources, isImporting, openDialog } = useDataImportContext();
++ const available = resource
++ ? resources.filter(({ name }) => name === resource)
++ : resources;
+
+ // The resource may not be registered in this Admin, e.g. deals on mobile
- if (!resources.length) return null;
++ if (!available.length) return null;
+
+ return (
- <>
- <Button
- variant="outline"
- onClick={() => setDialogOpen(true)}
- className="flex items-center gap-2 cursor-pointer"
- >
- <Upload />{" "}
- {translate(
- resource ? "crm.data_import.button" : "crm.data_import.title",
- )}
- </Button>
- <DataImportDialog
- open={dialogOpen}
- onClose={() => setDialogOpen(false)}
- resources={resources}
- />
- </>
++ <Button
++ variant="outline"
++ onClick={() => openDialog(resource)}
++ disabled={isImporting}
++ title={isImporting ? translate("crm.data_import.in_progress") : undefined}
++ className="flex items-center gap-2 cursor-pointer"
++ >
++ <Upload />{" "}
++ {translate(resource ? "crm.data_import.button" : "crm.data_import.title")}
++ </Button>
+ );
+ };
diff --cc src/components/atomic-crm/dataImport/DataImportDialog.tsx
index 00000000,d0c1b37a..c5a33b23
mode 000000,100644..100644
--- a/src/components/atomic-crm/dataImport/DataImportDialog.tsx
+++ b/src/components/atomic-crm/dataImport/DataImportDialog.tsx
@@@ -1,0 -1,258 +1,149 @@@
+ import { useEffect, useState } from "react";
-import type { MouseEvent } from "react";
-import { Loader2 } from "lucide-react";
+ import {
+ Form,
+ useGetResourceLabel,
- useRefresh,
+ useResourceTranslation,
+ useTranslate,
+ } from "ra-core";
+ import { Link } from "react-router";
+ import { Alert, AlertDescription } from "@/components/ui/alert";
+ import { Button } from "@/components/ui/button";
+ import {
+ Dialog,
+ DialogContent,
+ DialogHeader,
+ DialogTitle,
+ } from "@/components/ui/dialog";
+ import { Label } from "@/components/ui/label";
+ import {
+ Select,
+ SelectContent,
+ SelectItem,
+ SelectTrigger,
+ SelectValue,
+ } from "@/components/ui/select";
+ import { FormToolbar } from "@/components/admin/simple-form";
+ import { FileInput } from "@/components/admin/file-input";
+ import { FileField } from "@/components/admin/file-field";
+
-import { usePapaParse } from "../misc/usePapaParse";
-import type { ImportableResource, ImportRow } from "./types";
++import type { ImportableResource } from "./types";
++import type { ImportableResourceName } from "./useImportableResources";
+
+ type DataImportDialogProps = {
+ open: boolean;
- onClose(): void;
+ /** Resources offered in the dropdown. A single one hides the dropdown. */
+ resources: ImportableResource[];
++ resource: ImportableResource;
++ onResourceChange(name: ImportableResourceName): void;
++ onStart(file: File): void;
++ onClose(): void;
+ };
+
+ export function DataImportDialog({
+ open,
- onClose,
+ resources,
++ resource,
++ onResourceChange,
++ onStart,
++ onClose,
+ }: DataImportDialogProps) {
+ const translate = useTranslate();
+ const getResourceLabel = useGetResourceLabel();
- const refresh = useRefresh();
- const [resourceName, setResourceName] = useState(resources[0].name);
+ const [file, setFile] = useState<File | null>(null);
+
- // The resource is read from `resources` on every render, keeping only the
- // selected name in state: `useConfigurationLoader` fills the configuration
- // asynchronously, so a resource object captured at mount would keep its
- // `processBatch` pinned to `defaultConfiguration` — importing a deal into a
- // stage that does not exist in a customized pipeline, and with no `sales_id`.
- const resource =
- resources.find(({ name }) => name === resourceName) ?? resources[0];
++ useEffect(() => {
++ setFile(null);
++ }, [resource.name, open]);
+
+ // Importing a single resource names the dialog after it, falling back to the
+ // generic heading for a resource that has no title of its own.
+ const title = useResourceTranslation({
+ resourceI18nKey:
+ resources.length === 1
+ ? `resources.${resource.name}.import.title`
+ : undefined,
+ baseI18nKey: "crm.data_import.title",
+ });
- const { importer, parseCsv, reset } = usePapaParse<ImportRow>({
- batchSize: 10,
- textColumns: resource.textColumns,
- processBatch: resource.processBatch,
- });
+
+ const sampleUrl = `data:text/csv;name=${sampleFileName(resource.name)};charset=utf-8,${encodeURIComponent(resource.sampleCsv)}`;
+
- useEffect(() => {
- if (importer.state === "complete") {
- refresh();
- }
- }, [importer.state, refresh]);
-
+ const handleResourceChange = (name: string) => {
+ const next = resources.find((candidate) => candidate.name === name);
+ if (!next) return;
- setFile(null);
- setResourceName(next.name);
- };
-
- const handleFileChange = (file: File | null) => {
- setFile(file);
++ onResourceChange(next.name);
+ };
+
- const startImport = () => {
++ const handleStart = () => {
+ if (!file) return;
- parseCsv(file);
- };
-
- const handleClose = () => {
- reset();
- setFile(null);
- onClose();
- };
-
- const handleReset = (e: MouseEvent<HTMLButtonElement>) => {
- e.preventDefault();
- reset();
++ onStart(file);
+ };
+
+ return (
- <Dialog open={open} onOpenChange={handleClose}>
++ <Dialog open={open} onOpenChange={(isOpen) => !isOpen && onClose()}>
+ <DialogContent className="max-w-[calc(100%-2rem)] gap-6 p-6 sm:max-w-2xl sm:p-8">
+ {/* Remount the form on resource change so no file survives the switch */}
+ <Form key={resource.name} className="flex flex-col gap-6">
+ <DialogHeader>
+ <DialogTitle>{title}</DialogTitle>
+ </DialogHeader>
+
+ <div className="flex flex-col space-y-6">
+ {resources.length > 1 && (
+ <div className="flex flex-col gap-2">
+ <Label htmlFor="data-import-resource">
+ {translate("crm.data_import.resource")}
+ </Label>
+ <Select
+ value={resource.name}
+ onValueChange={handleResourceChange}
- disabled={importer.state !== "idle"}
+ >
+ <SelectTrigger id="data-import-resource" className="w-full">
+ <SelectValue />
+ </SelectTrigger>
+ <SelectContent>
+ {resources.map(({ name }) => (
+ <SelectItem key={name} value={name}>
+ {getResourceLabel(name, 2)}
+ </SelectItem>
+ ))}
+ </SelectContent>
+ </Select>
+ </div>
+ )}
+
- {importer.state === "running" && (
- <div className="flex flex-col gap-2">
- <Alert>
- <AlertDescription className="flex flex-row gap-4">
- <Loader2 className="h-5 w-5 animate-spin" />
- {translate("crm.data_import.running")}
- </AlertDescription>
- </Alert>
-
- <div className="text-sm">
- {translate("crm.data_import.progress", {
- importCount: importer.importCount,
- rowCount: importer.rowCount,
- errorCount: importer.errorCount,
- })}
- {importer.remainingTime !== null && (
- <>
- {" "}
- {translate("crm.data_import.remaining_time")}{" "}
- <strong>
- {millisecondsToTime(importer.remainingTime)}
- </strong>
- .{" "}
- <button
- onClick={handleReset}
- className="text-red-600 underline hover:text-red-800"
- >
- {translate("crm.data_import.stop")}
- </button>
- </>
- )}
- </div>
- </div>
- )}
-
- {importer.state === "error" && (
- <Alert variant="destructive">
- <AlertDescription>
- {translate("crm.data_import.error")}
- </AlertDescription>
- </Alert>
- )}
-
- {importer.state === "complete" && (
- <Alert>
- <AlertDescription>
- {translate("crm.data_import.complete", {
- importCount: importer.importCount,
- errorCount: importer.errorCount,
- })}
- </AlertDescription>
- </Alert>
- )}
-
- {importer.state === "idle" && (
- <>
- <Alert>
- <AlertDescription className="flex flex-col gap-4">
- {translate("crm.data_import.sample_hint")}
- <Button asChild variant="outline" size="sm">
- <Link
- to={sampleUrl}
- download={sampleFileName(resource.name)}
- >
- {translate("crm.data_import.sample_download")}
- </Link>
- </Button>
- </AlertDescription>
- </Alert>
-
- <FileInput
- source="csv"
- label="crm.data_import.csv_file"
- accept={{ "text/csv": [".csv"] }}
- onChange={handleFileChange}
- >
- <FileField source="src" title="title" target="_blank" />
- </FileInput>
- </>
- )}
++ <Alert>
++ <AlertDescription className="flex flex-col gap-4">
++ {translate("crm.data_import.sample_hint")}
++ <Button asChild variant="outline" size="sm">
++ <Link to={sampleUrl} download={sampleFileName(resource.name)}>
++ {translate("crm.data_import.sample_download")}
++ </Link>
++ </Button>
++ </AlertDescription>
++ </Alert>
++
++ <FileInput
++ source="csv"
++ label="crm.data_import.csv_file"
++ accept={{ "text/csv": [".csv"] }}
++ onChange={setFile}
++ >
++ <FileField source="src" title="title" target="_blank" />
++ </FileInput>
+ </div>
+ </Form>
+
+ <div className="flex justify-start">
+ <FormToolbar>
- {importer.state === "idle" ? (
- <Button onClick={startImport} disabled={!file}>
- {translate("crm.data_import.start")}
- </Button>
- ) : (
- <Button
- variant="outline"
- onClick={handleClose}
- disabled={importer.state === "running"}
- >
- {translate("ra.action.close")}
- </Button>
- )}
++ <Button onClick={handleStart} disabled={!file}>
++ {translate("crm.data_import.start")}
++ </Button>
+ </FormToolbar>
+ </div>
+ </DialogContent>
+ </Dialog>
+ );
+ }
+
+ const sampleFileName = (resourceName: string) =>
+ `crm_${resourceName}_sample.csv`;
-
-const millisecondsToTime = (ms: number) => {
- const seconds = Math.floor((ms / 1000) % 60);
- const minutes = Math.floor((ms / (60 * 1000)) % 60);
-
- return `${minutes}m ${seconds}s`;
-};
diff --cc src/components/atomic-crm/dataImport/DataImportProgressToast.tsx
index 00000000,00000000..7a09f520
new file mode 100644
--- /dev/null
+++ b/src/components/atomic-crm/dataImport/DataImportProgressToast.tsx
@@@ -1,0 -1,0 +1,102 @@@
++import { useEffect } from "react";
++import { useTranslate } from "ra-core";
++import { toast } from "sonner";
++
++import { Button } from "@/components/ui/button";
++import { Progress } from "@/components/ui/progress";
++
++import type { ImportState } from "../misc/usePapaParse";
++
++const TOAST_ID = "data-import-progress";
++
++export const DataImportProgressToast = ({
++ importer,
++ onStop,
++}: {
++ importer: ImportState;
++ onStop(): void;
++}) => {
++ const translate = useTranslate();
++
++ const isImporting =
++ importer.state === "parsing" || importer.state === "running";
++ const hasProgress = importer.state === "running";
++ const rowCount = importer.state === "running" ? importer.rowCount : 0;
++ const importCount = importer.state === "running" ? importer.importCount : 0;
++ const errorCount = importer.state === "running" ? importer.errorCount : 0;
++ const remainingTime =
++ importer.state === "running" ? importer.remainingTime : null;
++
++ useEffect(() => {
++ if (!isImporting) return;
++
++ return () => {
++ toast.dismiss(TOAST_ID);
++ };
++ }, [isImporting]);
++
++ useEffect(() => {
++ if (!isImporting) return;
++
++ toast.custom(
++ () => (
++ <div className="bg-popover text-popover-foreground flex w-full flex-col gap-2 rounded-md border p-4 shadow-lg">
++ <div className="flex flex-row items-start justify-between gap-4">
++ <p className="text-sm font-medium">
++ {translate("crm.data_import.in_progress")}
++ </p>
++ <Button
++ variant="link"
++ size="sm"
++ onClick={onStop}
++ className="text-destructive h-auto p-0 text-xs"
++ >
++ {translate("crm.data_import.stop")}
++ </Button>
++ </div>
++ {hasProgress && (
++ <>
++ <Progress
++ value={rowCount ? (importCount / rowCount) * 100 : 0}
++ aria-label={translate("crm.data_import.in_progress")}
++ />
++ <p className="text-muted-foreground text-xs">
++ {translate("crm.data_import.progress", {
++ importCount,
++ rowCount,
++ errorCount,
++ })}
++ {remainingTime !== null && (
++ <>
++ {" "}
++ {translate("crm.data_import.remaining_time")}{" "}
++ <strong>{millisecondsToTime(remainingTime)}</strong>.
++ </>
++ )}
++ </p>
++ </>
++ )}
++ </div>
++ ),
++ { id: TOAST_ID, duration: Infinity, position: "bottom-right" },
++ );
++ }, [
++ isImporting,
++ hasProgress,
++ importCount,
++ rowCount,
++ errorCount,
++ remainingTime,
++ translate,
++ onStop,
++ ]);
++
++ return null;
++};
++
++const millisecondsToTime = (ms: number) => {
++ const seconds = Math.floor((ms / 1000) % 60);
++ const minutes = Math.floor((ms / (60 * 1000)) % 60);
++
++ return `${minutes}m ${seconds}s`;
++};
diff --cc src/components/atomic-crm/dataImport/DataImportProvider.tsx
index 00000000,00000000..0f653830
new file mode 100644
--- /dev/null
+++ b/src/components/atomic-crm/dataImport/DataImportProvider.tsx
@@@ -1,0 -1,0 +1,141 @@@
++/* eslint-disable react-refresh/only-export-components */
++import {
++ createContext,
++ useCallback,
++ useContext,
++ useEffect,
++ useMemo,
++ useState,
++ type ReactNode,
++} from "react";
++import { useNotify, useRefresh } from "ra-core";
++
++import { usePapaParse } from "../misc/usePapaParse";
++import { DataImportDialog } from "./DataImportDialog";
++import { DataImportProgressToast } from "./DataImportProgressToast";
++import type { ImportableResource, ImportRow } from "./types";
++import type { ImportableResourceName } from "./useImportableResources";
++import { useImportableResources } from "./useImportableResources";
++
++type DataImportContextValue = {
++ resources: ImportableResource[];
++ isImporting: boolean;
++ openDialog(resource?: ImportableResourceName): void;
++};
++
++const DataImportContext = createContext<DataImportContextValue | undefined>(
++ undefined,
++);
++
++export const useDataImportContext = () => {
++ const context = useContext(DataImportContext);
++ if (!context) {
++ throw new Error(
++ "useDataImportContext must be used inside a <DataImportProvider>",
++ );
++ }
++ return context;
++};
++
++export const DataImportProvider = ({ children }: { children: ReactNode }) => {
++ const notify = useNotify();
++ const refresh = useRefresh();
++ const resources = useImportableResources();
++ const [isDialogOpen, setIsDialogOpen] = useState(false);
++ const [pinnedName, setPinnedName] = useState<ImportableResourceName | null>(
++ null,
++ );
++ const [resourceName, setResourceName] =
++ useState<ImportableResourceName | null>(null);
++
++ // The resource is read from `resources` on every render, keeping only the
++ // selected name in state: `useConfigurationLoader` fills the configuration
++ // asynchronously, so a resource object captured at mount would keep its
++ // `processBatch` pinned to `defaultConfiguration` — importing a deal into a
++ // stage that does not exist in a customized pipeline, and with no `sales_id`.
++ const resource =
++ resources.find(({ name }) => name === resourceName) ?? resources[0];
++
++ const { importer, parseCsv, reset } = usePapaParse<ImportRow>({
++ batchSize: 10,
++ textColumns: resource?.textColumns,
++ processBatch: resource?.processBatch ?? rejectImport,
++ });
++
++ const isImporting =
++ importer.state === "parsing" || importer.state === "running";
++
++ useEffect(() => {
++ if (importer.state === "complete") {
++ refresh();
++ notify("crm.data_import.complete", {
++ type: "success",
++ messageArgs: {
++ importCount: importer.importCount,
++ errorCount: importer.errorCount,
++ },
++ });
++ }
++ if (importer.state === "error") {
++ notify("crm.data_import.error", { type: "error" });
++ }
++ }, [importer, notify, refresh]);
++
++ useEffect(() => {
++ if (!isImporting) return;
++
++ const confirmLeave = (event: BeforeUnloadEvent) => {
++ event.preventDefault();
++ event.returnValue = "";
++ };
++
++ window.addEventListener("beforeunload", confirmLeave);
++ return () => window.removeEventListener("beforeunload", confirmLeave);
++ }, [isImporting]);
++
++ const openDialog = useCallback(
++ (pinned?: ImportableResourceName) => {
++ if (importer.state === "complete" || importer.state === "error") {
++ reset();
++ }
++ setPinnedName(pinned ?? null);
++ setResourceName(pinned ?? resources[0]?.name ?? null);
++ setIsDialogOpen(true);
++ },
++ [importer.state, reset, resources],
++ );
++
++ const startImport = (file: File) => {
++ parseCsv(file);
++ setIsDialogOpen(false);
++ };
++
++ const value = useMemo(
++ () => ({ resources, isImporting, openDialog }),
++ [resources, isImporting, openDialog],
++ );
++
++ return (
++ <DataImportContext.Provider value={value}>
++ {children}
++ {resource && (
++ <DataImportDialog
++ open={isDialogOpen}
++ resources={
++ pinnedName
++ ? resources.filter(({ name }) => name === pinnedName)
++ : resources
++ }
++ resource={resource}
++ onResourceChange={setResourceName}
++ onStart={startImport}
++ onClose={() => setIsDialogOpen(false)}
++ />
++ )}
++ <DataImportProgressToast importer={importer} onStop={reset} />
++ </DataImportContext.Provider>
++ );
++};
++
++const rejectImport = () =>
++ Promise.reject(new Error("No importable resource is registered"));
diff --cc src/components/atomic-crm/layout/Layout.tsx
index d98e8664,41981658..17d64e40
--- a/src/components/atomic-crm/layout/Layout.tsx
+++ b/src/components/atomic-crm/layout/Layout.tsx
@@@ -4,14 -4,13 +4,14 @@@ import { Notification } from "@/compone
import { Error } from "@/components/admin/error";
import { Skeleton } from "@/components/ui/skeleton";
- import { ContactImportProvider } from "../contacts/ContactImportProvider";
++import { DataImportProvider } from "../dataImport/DataImportProvider";
import { useConfigurationLoader } from "../root/useConfigurationLoader";
import Header from "./Header";
export const Layout = ({ children }: { children: ReactNode }) => {
useConfigurationLoader();
return (
- <ContactImportProvider>
- <>
++ <DataImportProvider>
<Header />
<main className="max-w-screen-xl mx-auto pt-4 px-4" id="main-content">
<ErrorBoundary FallbackComponent={Error}>
@@@ -21,6 -20,6 +21,6 @@@
</ErrorBoundary>
</main>
<Notification />
- </ContactImportProvider>
- </>
++ </DataImportProvider>
);
};
diff --cc src/components/atomic-crm/layout/MobileLayout.tsx
index ddb8bf00,6be718a7..7b703bbd
--- a/src/components/atomic-crm/layout/MobileLayout.tsx
+++ b/src/components/atomic-crm/layout/MobileLayout.tsx
@@@ -4,14 -4,15 +4,16 @@@ import { Skeleton } from "@/components/
import { Suspense, type ReactNode } from "react";
import { ErrorBoundary } from "react-error-boundary";
- import { ContactImportProvider } from "../contacts/ContactImportProvider";
++import { DataImportProvider } from "../dataImport/DataImportProvider";
import { useConfigurationLoader } from "../root/useConfigurationLoader";
import { MobileNavigation } from "./MobileNavigation";
+ import { PullToRefresh } from "./PullToRefresh";
export const MobileLayout = ({ children }: { children: ReactNode }) => {
useConfigurationLoader();
return (
- <ContactImportProvider>
- <>
++ <DataImportProvider>
+ <PullToRefresh />
<ErrorBoundary FallbackComponent={Error}>
<Suspense fallback={<Skeleton className="h-12 w-12 rounded-full" />}>
{children}
@@@ -19,6 -20,6 +21,6 @@@
</ErrorBoundary>
<MobileNavigation />
<Notification mobileOffset={{ bottom: "72px" }} />
- </ContactImportProvider>
- </>
++ </DataImportProvider>
);
};
diff --cc src/components/atomic-crm/providers/commons/englishCrmMessages.ts
index 9496dc71,40f11c16..879dfbfc
--- a/src/components/atomic-crm/providers/commons/englishCrmMessages.ts
+++ b/src/components/atomic-crm/providers/commons/englishCrmMessages.ts
@@@ -439,8 -432,26 +432,26 @@@ export const englishCrmMessages =
},
upcoming_tasks: "Upcoming Tasks",
},
+ data_import: {
+ button: "Import CSV",
+ complete:
+ "Import complete. Imported %{importCount} records, with %{errorCount} errors",
+ csv_file: "CSV File",
+ error:
+ "Failed to import this file, please make sure you provided a valid CSV file.",
++ in_progress: "Import in progress…",
+ progress:
+ "Imported %{importCount} / %{rowCount} records, with %{errorCount} errors.",
+ remaining_time: "Estimated remaining time:",
+ resource: "Resource",
- running: "The import is running, please do not close this tab.",
+ sample_download: "Download CSV sample",
+ sample_hint: "Here is a sample CSV file you can use as a template",
+ start: "Start import",
+ stop: "Stop import",
+ title: "Import data",
+ },
header: {
- import_data: "Import data",
+ import_data: "Import from JSON",
},
image_editor: {
change: "Change",
diff --cc src/components/atomic-crm/providers/commons/frenchCrmMessages.ts
index cdecd792,c1421e60..77d753ce
--- a/src/components/atomic-crm/providers/commons/frenchCrmMessages.ts
+++ b/src/components/atomic-crm/providers/commons/frenchCrmMessages.ts
@@@ -446,8 -438,27 +438,27 @@@ export const frenchCrmMessages =
},
upcoming_tasks: "Tâches à venir",
},
+ data_import: {
+ button: "Importer un fichier CSV",
+ complete:
+ "Import terminé. %{importCount} enregistrements importés, %{errorCount} erreurs",
+ csv_file: "Fichier CSV",
+ error:
+ "Échec de l'importation de ce fichier. Veuillez vous assurer que vous avez fourni un fichier CSV valide.",
++ in_progress: "Import en cours…",
+ progress:
+ "%{importCount} / %{rowCount} enregistrements importés, avec %{errorCount} erreurs.",
+ remaining_time: "Temps restant estimé :",
+ resource: "Ressource",
- running: "L'import est en cours, merci de ne pas fermer cet onglet.",
+ sample_download: "Télécharger un exemple CSV",
+ sample_hint:
+ "Voici un exemple de fichier CSV que vous pouvez utiliser comme modèle",
+ start: "Démarrer l'import",
+ stop: "Arrêter l'importation",
+ title: "Importer des données",
+ },
header: {
- import_data: "Importer des données",
+ import_data: "Importer depuis JSON",
},
image_editor: {
change: "Changer",
diff --cc src/test/StoryWrapper.tsx
index 9c824b16,8e01ac73..ee7e4421
--- a/src/test/StoryWrapper.tsx
+++ b/src/test/StoryWrapper.tsx
@@@ -13,7 -13,6 +13,7 @@@ import type
Deal,
Sale,
} from "@/components/atomic-crm/types";
- import { ContactImportProvider } from "@/components/atomic-crm/contacts/ContactImportProvider";
++import { DataImportProvider } from "@/components/atomic-crm/dataImport/DataImportProvider";
import { CRM } from "@/components/atomic-crm/root/CRM";
import { testI18nProvider } from "@/components/atomic-crm/providers/commons/i18nProvider";
@@@ -171,10 -170,10 +171,10 @@@ export const StoryWrapper = (
store={store}
disableTelemetry
layout={({ children }) => (
- <ContactImportProvider>
- <>
++ <DataImportProvider>
{children}
<Notification />
- </ContactImportProvider>
- </>
++ </DataImportProvider>
)}
/>
</MemoryRouter>