Merge pull request #10103 from marmelab/feat/crm-redirect-deleting-co…

…ntact Feat(crm): Redirect on company page when deleting an user from company
marmelab · Jul 30, 2024 · 164255b · 164255b
2 parents 79af843 + cdd1d7c
commit 164255b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 4 deletions.
diff --git a/examples/crm/src/companies/CompanyShow.tsx b/examples/crm/src/companies/CompanyShow.tsx
@@ -29,7 +29,7 @@ import {
     useRecordContext,
     useShowContext,
 } from 'react-admin';
-import { Link as RouterLink } from 'react-router-dom';
+import { Link as RouterLink, useLocation } from 'react-router-dom';
 
 import { ActivityLog } from '../activity/ActivityLog';
 import { Avatar } from '../contacts/Avatar';
@@ -190,7 +190,9 @@ const TabPanel = (props: TabPanelProps) => {
 };
 
 const ContactsIterator = () => {
+    const location = useLocation();
     const { data: contacts, error, isPending } = useListContext<Contact>();
+
     if (isPending || error) return null;
 
     const now = Date.now();
@@ -202,6 +204,7 @@ const ContactsIterator = () => {
                         button
                         component={RouterLink}
                         to={`/contacts/${contact.id}/show`}
+                        state={{ from: location.pathname }}
                     >
                         <ListItemAvatar>
                             <Avatar />

diff --git a/examples/crm/src/contacts/ContactAside.tsx b/examples/crm/src/contacts/ContactAside.tsx
@@ -4,6 +4,7 @@ import PhoneIcon from '@mui/icons-material/Phone';
 import { Box, Divider, Stack, SvgIcon, Typography } from '@mui/material';
 import {
     DateField,
+    DeleteButton,
     EditButton,
     EmailField,
     FunctionField,
@@ -21,8 +22,10 @@ import { TagsListEdit } from './TagsListEdit';
 
 import { useConfigurationContext } from '../root/ConfigurationContext';
 import { Contact, Sale } from '../types';
+import { useLocation } from 'react-router';
 
 export const ContactAside = ({ link = 'edit' }: { link?: 'edit' | 'show' }) => {
+    const location = useLocation();
     const { contactGender } = useConfigurationContext();
     const record = useRecordContext<Contact>();
     if (!record) return null;
@@ -174,7 +177,7 @@ export const ContactAside = ({ link = 'edit' }: { link?: 'edit' | 'show' }) => {
                 <Divider />
                 <TagsListEdit />
             </Box>
-            <Box>
+            <Box mb={3}>
                 <Typography variant="subtitle2">Tasks</Typography>
                 <Divider />
                 <ReferenceManyField
@@ -186,6 +189,7 @@ export const ContactAside = ({ link = 'edit' }: { link?: 'edit' | 'show' }) => {
                 </ReferenceManyField>
                 <AddTask />
             </Box>
+            <DeleteButton redirect={location.state?.from || undefined} />
         </Box>
     );
 };
diff --git a/examples/crm/src/contacts/ContactEdit.tsx b/examples/crm/src/contacts/ContactEdit.tsx
@@ -1,5 +1,11 @@
 import * as React from 'react';
-import { EditBase, Form, Toolbar, useEditContext } from 'react-admin';
+import {
+    EditBase,
+    Form,
+    SaveButton,
+    Toolbar,
+    useEditContext,
+} from 'react-admin';
 import { Card, CardContent, Box } from '@mui/material';
 
 import { ContactInputs } from './ContactInputs';
@@ -23,7 +29,9 @@ const ContactEditContent = () => {
                         <CardContent>
                             <ContactInputs />
                         </CardContent>
-                        <Toolbar />
+                        <Toolbar>
+                            <SaveButton />
+                        </Toolbar>
                     </Card>
                 </Form>
             </Box>