Skip to content

Commit d2c32ca

Browse files
committed
fix: make deleteConfirmModal work
1 parent eedefe2 commit d2c32ca

File tree

2 files changed

+15
-26
lines changed

2 files changed

+15
-26
lines changed

packages/core/admin/screens/List/components/DeleteConfirmModal/index.tsx

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,22 @@ import {
1010
import { WarningCircle } from '@strapi/icons';
1111

1212
type Props = {
13-
isOpen: boolean;
14-
onClose: () => void;
1513
onSubmit: () => void;
14+
children: React.ReactNode;
1615
};
1716

1817
const DeleteConfirmModal = (props: Props) => {
1918
const {
20-
isOpen,
21-
onClose,
2219
onSubmit,
20+
children,
2321
} = props;
2422

2523
const { formatMessage } = useIntl();
2624

27-
if (!isOpen) return null;
28-
2925
return (
3026
<Dialog.Root>
3127
<Dialog.Trigger>
32-
<div>test</div>
28+
{children}
3329
</Dialog.Trigger>
3430
<Dialog.Content>
3531
<Dialog.Header>
@@ -53,9 +49,6 @@ const DeleteConfirmModal = (props: Props) => {
5349
<Dialog.Footer>
5450
<Dialog.Cancel>
5551
<Button
56-
onClick={() => {
57-
onClose();
58-
}}
5952
variant="tertiary"
6053
>
6154
{formatMessage({
@@ -67,7 +60,6 @@ const DeleteConfirmModal = (props: Props) => {
6760
<Button
6861
variant="secondary"
6962
onClick={() => {
70-
onClose();
7163
onSubmit();
7264
}}
7365
>

packages/core/admin/screens/List/components/TableRow/index.tsx

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -32,9 +32,8 @@ const TableRow: FC<Props> = ({
3232
onDelete,
3333
}) => {
3434
const { toggleNotification } = useNotification();
35-
const { get } = getFetchClient();
35+
const { get, post } = getFetchClient();
3636
const { formatMessage } = useIntl();
37-
const [openDeleteModal, setOpenDeleteModal] = useState(false);
3837
const navigate = useNavigate();
3938

4039
const handleClick = (path: string) => {
@@ -46,7 +45,7 @@ const TableRow: FC<Props> = ({
4645
};
4746

4847
const handleDelete = (id: number) => {
49-
get(`/webtools/url-alias/delete/${id}`)
48+
post(`/webtools/url-alias/delete/${id}`)
5049
.then(() => {
5150
if (onDelete) onDelete();
5251
toggleNotification({ type: 'success', message: formatMessage({ id: 'webtools.settings.success.url_alias.delete' }) });
@@ -93,20 +92,18 @@ const TableRow: FC<Props> = ({
9392
>
9493
<Pencil />
9594
</IconButton>
96-
<IconButton
97-
onClick={() => setOpenDeleteModal(true)}
98-
label={formatMessage(
99-
{ id: 'webtools.settings.page.list.table.actions.delete', defaultMessage: 'Delete {target}' },
100-
{ target: `${row.url_path}` },
101-
)}
102-
>
103-
<Trash />
104-
</IconButton>
10595
<DeleteConfirmModal
106-
isOpen={openDeleteModal}
107-
onClose={() => setOpenDeleteModal(false)}
10896
onSubmit={() => handleDelete(row.id)}
109-
/>
97+
>
98+
<IconButton
99+
label={formatMessage(
100+
{ id: 'webtools.settings.page.list.table.actions.delete', defaultMessage: 'Delete {target}' },
101+
{ target: `${row.url_path}` },
102+
)}
103+
>
104+
<Trash />
105+
</IconButton>
106+
</DeleteConfirmModal>
110107
</Flex>
111108
</Td>
112109
</Tr>

0 commit comments

Comments
 (0)