Skip to content

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

task add

Jean-Baptiste Kaiser23c72792863d
diff --git a/registry.json b/registry.json
index c5b0059a..a8ea9330 100644
--- a/registry.json
+++ b/registry.json
@@ -56,6 +56,10 @@
"path": "src/components/atomic-crm/tasks/MobileTaskEdit.tsx",
"type": "registry:component"
},
+ {
+ "path": "src/components/atomic-crm/tasks/MobileTaskCreate.tsx",
+ "type": "registry:component"
+ },
{
"path": "src/components/atomic-crm/tasks/AddTask.tsx",
"type": "registry:component"
diff --git a/src/components/atomic-crm/contacts/ContactTasksList.tsx b/src/components/atomic-crm/contacts/ContactTasksList.tsx
index 6dce3666..e1037de1 100644
--- a/src/components/atomic-crm/contacts/ContactTasksList.tsx
+++ b/src/components/atomic-crm/contacts/ContactTasksList.tsx
@@ -8,7 +8,6 @@ import {
import { useRecordContext } from "ra-core";
import { TasksListFilter } from "../dashboard/TasksListFilter";
-import { AddTask } from "../tasks/AddTask";
import type { Contact } from "../types";
const today = new Date();
@@ -73,7 +72,6 @@ export const ContactTasksList = () => {
filter={taskFilters.later}
contactId={record.id}
/>
- <AddTask />
</div>
);
};
diff --git a/src/components/atomic-crm/layout/MobileNavigation.tsx b/src/components/atomic-crm/layout/MobileNavigation.tsx
index ebbbfa38..a11b932b 100644
--- a/src/components/atomic-crm/layout/MobileNavigation.tsx
+++ b/src/components/atomic-crm/layout/MobileNavigation.tsx
@@ -21,8 +21,20 @@ import {
Sun,
Users,
} from "lucide-react";
-import { Translate, useAuthProvider, useGetIdentity, useLogout } from "ra-core";
-import { Link, matchPath, useLocation } from "react-router";
+import {
+ Translate,
+ useAuthProvider,
+ useCreatePath,
+ useGetIdentity,
+ useLogout,
+} from "ra-core";
+import {
+ Link,
+ matchPath,
+ useLocation,
+ useMatch,
+ useNavigate,
+} from "react-router";
export const MobileNavigation = () => {
const location = useLocation();
@@ -101,27 +113,54 @@ const NavigationButton = ({
</Button>
);
-const CreateButton = () => (
- <DropdownMenu>
- <DropdownMenuTrigger asChild>
- <Button
- variant="default"
- size="icon"
- className="h-16 w-16 rounded-full -mt-3"
- aria-label="Create"
- >
- <Plus className="size-10" />
- </Button>
- </DropdownMenuTrigger>
- <DropdownMenuContent>
- <DropdownMenuItem className="h-12 px-4 text-base">
- Contact
- </DropdownMenuItem>
- <DropdownMenuItem className="h-12 px-4 text-base">Note</DropdownMenuItem>
- <DropdownMenuItem className="h-12 px-4 text-base">Task</DropdownMenuItem>
- </DropdownMenuContent>
- </DropdownMenu>
-);
+const CreateButton = () => {
+ const contact_id = useMatch("/contacts/:id/*")?.params.id;
+ const navigate = useNavigate();
+ const createPath = useCreatePath();
+
+ return (
+ <DropdownMenu>
+ <DropdownMenuTrigger asChild>
+ <Button
+ variant="default"
+ size="icon"
+ className="h-16 w-16 rounded-full -mt-3"
+ aria-label="Create"
+ >
+ <Plus className="size-10" />
+ </Button>
+ </DropdownMenuTrigger>
+ <DropdownMenuContent>
+ <DropdownMenuItem className="h-12 px-4 text-base">
+ Contact
+ </DropdownMenuItem>
+ <DropdownMenuItem className="h-12 px-4 text-base">
+ Note
+ </DropdownMenuItem>
+ <DropdownMenuItem
+ className="h-12 px-4 text-base"
+ onSelect={() => {
+ navigate(
+ createPath({
+ resource: "tasks",
+ type: "create",
+ }),
+ {
+ state: contact_id
+ ? {
+ record: { contact_id },
+ }
+ : undefined,
+ },
+ );
+ }}
+ >
+ Task
+ </DropdownMenuItem>
+ </DropdownMenuContent>
+ </DropdownMenu>
+ );
+};
const SettingsButton = () => {
const authProvider = useAuthProvider();
diff --git a/src/components/atomic-crm/root/CRM.tsx b/src/components/atomic-crm/root/CRM.tsx
index c030457b..21d71f39 100644
--- a/src/components/atomic-crm/root/CRM.tsx
+++ b/src/components/atomic-crm/root/CRM.tsx
@@ -46,6 +46,7 @@ import { StartPage } from "../login/StartPage.tsx";
import { useIsMobile } from "@/hooks/use-mobile.ts";
import { MobileTasksList } from "../tasks/MobileTasksList.tsx";
import { MobileTaskEdit } from "../tasks/MobileTaskEdit.tsx";
+import { MobileTaskCreate } from "../tasks/MobileTaskCreate.tsx";
export type CRMProps = {
dataProvider?: DataProvider;
@@ -215,7 +216,12 @@ const MobileAdmin = (props: CoreAdminProps) => {
</CustomRoutes>
<Resource name="contacts" {...contacts} />
<Resource name="contactNotes" />
- <Resource name="tasks" list={MobileTasksList} edit={MobileTaskEdit} />
+ <Resource
+ name="tasks"
+ list={MobileTasksList}
+ edit={MobileTaskEdit}
+ create={MobileTaskCreate}
+ />
</Admin>
);
};
diff --git a/src/components/atomic-crm/tasks/AddTask.tsx b/src/components/atomic-crm/tasks/AddTask.tsx
index 58d5c7fc..c573aab4 100644
--- a/src/components/atomic-crm/tasks/AddTask.tsx
+++ b/src/components/atomic-crm/tasks/AddTask.tsx
@@ -106,10 +106,9 @@ export const AddTask = ({
transform={(data) => {
const dueDate = new Date(data.due_date);
dueDate.setHours(0, 0, 0, 0);
- data.due_date = dueDate.toISOString();
return {
...data,
- due_date: new Date(data.due_date).toISOString(),
+ due_date: dueDate.toISOString(),
};
}}
mutationOptions={{ onSuccess: handleSuccess }}
diff --git a/src/components/atomic-crm/tasks/MobileTaskCreate.tsx b/src/components/atomic-crm/tasks/MobileTaskCreate.tsx
new file mode 100644
index 00000000..c18c7c7f
--- /dev/null
+++ b/src/components/atomic-crm/tasks/MobileTaskCreate.tsx
@@ -0,0 +1,92 @@
+import { SaveButton } from "@/components/admin";
+import {
+ CreateBase,
+ Form,
+ RecordRepresentation,
+ useDataProvider,
+ useGetIdentity,
+ useGetOne,
+ useNotify,
+ useRecordFromLocation,
+ useRedirect,
+ useUpdate,
+} from "ra-core";
+import { MobileContent } from "../layout/MobileContent";
+import MobileHeader from "../layout/MobileHeader";
+import { ListButton } from "../misc/ListButton";
+import { TaskFormContent } from "./TaskFormContent";
+
+export const MobileTaskCreate = () => {
+ const { identity } = useGetIdentity();
+ const dataProvider = useDataProvider();
+ const [update] = useUpdate();
+ const notify = useNotify();
+ const redirect = useRedirect();
+ const recordFromLocation = useRecordFromLocation();
+ const contact_id = recordFromLocation?.contact_id;
+ const selectContact = contact_id == null;
+
+ const { data: contact } = useGetOne(
+ "contacts",
+ { id: contact_id! },
+ { enabled: !!contact_id },
+ );
+
+ const handleSuccess = async (data: any) => {
+ const contact = await dataProvider.getOne("contacts", {
+ id: data.contact_id,
+ });
+ if (!contact.data) return;
+
+ await update("contacts", {
+ id: contact.data.id,
+ data: { last_seen: new Date().toISOString() },
+ previousData: contact.data,
+ });
+
+ notify("Task added");
+ redirect("list", "tasks");
+ };
+
+ if (!identity) return null;
+
+ return (
+ <CreateBase
+ record={{
+ type: "None",
+ contact_id: contact?.id,
+ due_date: new Date().toISOString().slice(0, 10),
+ sales_id: identity.id,
+ }}
+ transform={(data) => {
+ const dueDate = new Date(data.due_date);
+ dueDate.setHours(0, 0, 0, 0);
+ return {
+ ...data,
+ due_date: dueDate.toISOString(),
+ };
+ }}
+ mutationOptions={{ onSuccess: handleSuccess }}
+ >
+ <MobileHeader>
+ <ListButton />
+ <div className="flex flex-1">
+ <h1 className="text-xl font-semibold text-ellipsis overflow-hidden whitespace-nowrap">
+ {!selectContact ? "Create Task for " : "Create Task"}
+ {!selectContact && (
+ <RecordRepresentation record={contact} resource="contacts" />
+ )}
+ </h1>
+ </div>
+ </MobileHeader>
+ <MobileContent>
+ <Form>
+ <TaskFormContent selectContact={selectContact} />
+ <div className="flex flex-col gap-2 mt-6">
+ <SaveButton />
+ </div>
+ </Form>
+ </MobileContent>
+ </CreateBase>
+ );
+};