Skip to content

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

task edit

Jean-Baptiste Kaiser7097462fc658
diff --git a/registry.json b/registry.json
index bde82506..c5b0059a 100644
--- a/registry.json
+++ b/registry.json
@@ -36,6 +36,10 @@
"path": "src/components/atomic-crm/tasks/TasksIterator.tsx",
"type": "registry:component"
},
+ {
+ "path": "src/components/atomic-crm/tasks/TaskFormContent.tsx",
+ "type": "registry:component"
+ },
{
"path": "src/components/atomic-crm/tasks/TaskEdit.tsx",
"type": "registry:component"
@@ -48,6 +52,10 @@
"path": "src/components/atomic-crm/tasks/MobileTasksList.tsx",
"type": "registry:component"
},
+ {
+ "path": "src/components/atomic-crm/tasks/MobileTaskEdit.tsx",
+ "type": "registry:component"
+ },
{
"path": "src/components/atomic-crm/tasks/AddTask.tsx",
"type": "registry:component"
diff --git a/src/components/atomic-crm/contacts/ContactShow.tsx b/src/components/atomic-crm/contacts/ContactShow.tsx
index ee15859d..92a42ad1 100644
--- a/src/components/atomic-crm/contacts/ContactShow.tsx
+++ b/src/components/atomic-crm/contacts/ContactShow.tsx
@@ -38,7 +38,7 @@ const ContactShowContentMobile = () => {
<>
<MobileHeader>
<ListButton />
- <div className="flex flex-1 items-center gap-2 text-secondary-foreground no-underline py-3">
+ <div className="flex flex-1">
<h1 className="text-xl font-semibold">Contacts</h1>
</div>
</MobileHeader>
diff --git a/src/components/atomic-crm/root/CRM.tsx b/src/components/atomic-crm/root/CRM.tsx
index 8de6ceb9..c030457b 100644
--- a/src/components/atomic-crm/root/CRM.tsx
+++ b/src/components/atomic-crm/root/CRM.tsx
@@ -45,6 +45,7 @@ import { i18nProvider } from "./i18nProvider";
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";
export type CRMProps = {
dataProvider?: DataProvider;
@@ -214,7 +215,7 @@ const MobileAdmin = (props: CoreAdminProps) => {
</CustomRoutes>
<Resource name="contacts" {...contacts} />
<Resource name="contactNotes" />
- <Resource name="tasks" list={MobileTasksList} />
+ <Resource name="tasks" list={MobileTasksList} edit={MobileTaskEdit} />
</Admin>
);
};
diff --git a/src/components/atomic-crm/tasks/AddTask.tsx b/src/components/atomic-crm/tasks/AddTask.tsx
index d5f4e04e..58d5c7fc 100644
--- a/src/components/atomic-crm/tasks/AddTask.tsx
+++ b/src/components/atomic-crm/tasks/AddTask.tsx
@@ -3,7 +3,6 @@ import {
CreateBase,
Form,
RecordRepresentation,
- required,
useDataProvider,
useGetIdentity,
useNotify,
@@ -11,11 +10,6 @@ import {
useUpdate,
} from "ra-core";
import { useState } from "react";
-import { AutocompleteInput } from "@/components/admin/autocomplete-input";
-import { ReferenceInput } from "@/components/admin/reference-input";
-import { TextInput } from "@/components/admin/text-input";
-import { DateInput } from "@/components/admin/date-input";
-import { SelectInput } from "@/components/admin/select-input";
import { SaveButton } from "@/components/admin/form";
import { Button } from "@/components/ui/button";
import {
@@ -32,8 +26,7 @@ import {
TooltipTrigger,
} from "@/components/ui/tooltip";
-import { contactOptionText } from "../misc/ContactOption";
-import { useConfigurationContext } from "../root/ConfigurationContext";
+import { TaskFormContent } from "./TaskFormContent";
export const AddTask = ({
selectContact,
@@ -46,7 +39,6 @@ export const AddTask = ({
const dataProvider = useDataProvider();
const [update] = useUpdate();
const notify = useNotify();
- const { taskTypes } = useConfigurationContext();
const contact = useRecordContext();
const [open, setOpen] = useState(false);
const handleOpen = () => {
@@ -138,47 +130,7 @@ export const AddTask = ({
)}
</DialogTitle>
</DialogHeader>
- <div className="flex flex-col gap-4">
- <TextInput
- autoFocus
- source="text"
- label="Description"
- validate={required()}
- multiline
- className="m-0"
- helperText={false}
- />
- {selectContact && (
- <ReferenceInput
- source="contact_id"
- reference="contacts_summary"
- >
- <AutocompleteInput
- label="Contact"
- optionText={contactOptionText}
- helperText={false}
- validate={required()}
- />
- </ReferenceInput>
- )}
-
- <div className="grid grid-cols-2 gap-4">
- <DateInput
- source="due_date"
- helperText={false}
- validate={required()}
- />
- <SelectInput
- source="type"
- validate={required()}
- choices={taskTypes.map((type) => ({
- id: type,
- name: type,
- }))}
- helperText={false}
- />
- </div>
- </div>
+ <TaskFormContent selectContact={selectContact} />
<DialogFooter className="w-full justify-end">
<SaveButton />
</DialogFooter>
diff --git a/src/components/atomic-crm/tasks/MobileTaskEdit.tsx b/src/components/atomic-crm/tasks/MobileTaskEdit.tsx
new file mode 100644
index 00000000..e13cd7da
--- /dev/null
+++ b/src/components/atomic-crm/tasks/MobileTaskEdit.tsx
@@ -0,0 +1,40 @@
+import { EditBase, Form, RecordRepresentation } from "ra-core";
+import MobileHeader from "../layout/MobileHeader";
+import { MobileContent } from "../layout/MobileContent";
+import { TaskFormContent } from "./TaskFormContent";
+import { DeleteButton, ReferenceField, SaveButton } from "@/components/admin";
+import { ListButton } from "../misc/ListButton";
+
+export const MobileTaskEdit = () => (
+ <EditBase>
+ <MobileHeader>
+ <ListButton />
+ <div className="flex flex-1">
+ <ReferenceField
+ source="contact_id"
+ reference="contacts"
+ render={({ referenceRecord: contact }) => (
+ <h1 className="text-xl font-semibold text-ellipsis overflow-hidden whitespace-nowrap">
+ Edit Task
+ {contact ? (
+ <>
+ {" for "}
+ <RecordRepresentation record={contact} resource="contacts" />
+ </>
+ ) : null}
+ </h1>
+ )}
+ />
+ </div>
+ </MobileHeader>
+ <MobileContent>
+ <Form>
+ <TaskFormContent />
+ <div className="flex flex-col gap-2 mt-6">
+ <SaveButton />
+ <DeleteButton />
+ </div>
+ </Form>
+ </MobileContent>
+ </EditBase>
+);
diff --git a/src/components/atomic-crm/tasks/Task.tsx b/src/components/atomic-crm/tasks/Task.tsx
index 1b727477..92a19506 100644
--- a/src/components/atomic-crm/tasks/Task.tsx
+++ b/src/components/atomic-crm/tasks/Task.tsx
@@ -1,6 +1,11 @@
import { useQueryClient } from "@tanstack/react-query";
import { MoreVertical } from "lucide-react";
-import { useDeleteWithUndoController, useNotify, useUpdate } from "ra-core";
+import {
+ useCreatePath,
+ useDeleteWithUndoController,
+ useNotify,
+ useUpdate,
+} from "ra-core";
import { useEffect, useState } from "react";
import { ReferenceField } from "@/components/admin/reference-field";
import { DateField } from "@/components/admin/date-field";
@@ -15,6 +20,8 @@ import {
import type { Contact, Task as TData } from "../types";
import { TaskEdit } from "./TaskEdit";
+import { useIsMobile } from "@/hooks/use-mobile";
+import { useNavigate } from "react-router";
export const Task = ({
task,
@@ -23,6 +30,9 @@ export const Task = ({
task: TData;
showContact?: boolean;
}) => {
+ const isMobile = useIsMobile();
+ const navigate = useNavigate();
+ const createPath = useCreatePath();
const notify = useNotify();
const queryClient = useQueryClient();
@@ -45,6 +55,15 @@ export const Task = ({
});
const handleEdit = () => {
+ if (isMobile) {
+ const path = createPath({
+ resource: "tasks",
+ id: task.id,
+ type: "edit",
+ });
+ navigate(path);
+ return;
+ }
setOpenEdit(true);
};
@@ -176,7 +195,7 @@ export const Task = ({
</div>
{/* This part is for editing the Task directly via a Dialog */}
- {openEdit && (
+ {!isMobile && openEdit && (
<TaskEdit taskId={task.id} open={openEdit} close={handleCloseEdit} />
)}
</>
diff --git a/src/components/atomic-crm/tasks/TaskEdit.tsx b/src/components/atomic-crm/tasks/TaskEdit.tsx
index 13a8aeb0..3af69ef7 100644
--- a/src/components/atomic-crm/tasks/TaskEdit.tsx
+++ b/src/components/atomic-crm/tasks/TaskEdit.tsx
@@ -1,8 +1,5 @@
-import { EditBase, Form, required, useNotify, type Identifier } from "ra-core";
+import { EditBase, Form, useNotify, type Identifier } from "ra-core";
import { DeleteButton } from "@/components/admin/delete-button";
-import { TextInput } from "@/components/admin/text-input";
-import { DateInput } from "@/components/admin/date-input";
-import { SelectInput } from "@/components/admin/select-input";
import { SaveButton } from "@/components/admin/form";
import {
Dialog,
@@ -12,7 +9,7 @@ import {
DialogTitle,
} from "@/components/ui/dialog";
-import { useConfigurationContext } from "../root/ConfigurationContext";
+import { TaskFormContent } from "./TaskFormContent";
export const TaskEdit = ({
open,
@@ -23,7 +20,6 @@ export const TaskEdit = ({
open: boolean;
close: () => void;
}) => {
- const { taskTypes } = useConfigurationContext();
const notify = useNotify();
return (
<Dialog open={open} onOpenChange={close}>
@@ -48,30 +44,7 @@ export const TaskEdit = ({
<DialogHeader>
<DialogTitle>Edit task</DialogTitle>
</DialogHeader>
- <TextInput
- autoFocus
- source="text"
- label="Description"
- validate={required()}
- multiline
- helperText={false}
- />
- <div className="grid grid-cols-2 gap-4">
- <DateInput
- source="due_date"
- helperText={false}
- validate={required()}
- />
- <SelectInput
- source="type"
- choices={taskTypes.map((type) => ({
- id: type,
- name: type,
- }))}
- helperText={false}
- validate={required()}
- />
- </div>
+ <TaskFormContent />
<DialogFooter className="w-full sm:justify-between gap-4">
<DeleteButton
mutationOptions={{
diff --git a/src/components/atomic-crm/tasks/TaskFormContent.tsx b/src/components/atomic-crm/tasks/TaskFormContent.tsx
new file mode 100644
index 00000000..ccd580eb
--- /dev/null
+++ b/src/components/atomic-crm/tasks/TaskFormContent.tsx
@@ -0,0 +1,53 @@
+import { AutocompleteInput } from "@/components/admin/autocomplete-input";
+import { DateInput } from "@/components/admin/date-input";
+import { ReferenceInput } from "@/components/admin/reference-input";
+import { SelectInput } from "@/components/admin/select-input";
+import { TextInput } from "@/components/admin/text-input";
+import { required } from "ra-core";
+
+import { contactOptionText } from "../misc/ContactOption";
+import { useConfigurationContext } from "../root/ConfigurationContext";
+
+export const TaskFormContent = ({
+ selectContact,
+}: {
+ selectContact?: boolean;
+}) => {
+ const { taskTypes } = useConfigurationContext();
+ return (
+ <div className="flex flex-col gap-4">
+ <TextInput
+ autoFocus
+ source="text"
+ label="Description"
+ validate={required()}
+ multiline
+ className="m-0"
+ helperText={false}
+ />
+ {selectContact && (
+ <ReferenceInput source="contact_id" reference="contacts_summary">
+ <AutocompleteInput
+ label="Contact"
+ optionText={contactOptionText}
+ helperText={false}
+ validate={required()}
+ />
+ </ReferenceInput>
+ )}
+
+ <div className="grid grid-cols-2 gap-4">
+ <DateInput source="due_date" helperText={false} validate={required()} />
+ <SelectInput
+ source="type"
+ validate={required()}
+ choices={taskTypes.map((type) => ({
+ id: type,
+ name: type,
+ }))}
+ helperText={false}
+ />
+ </div>
+ </div>
+ );
+};