Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[DOP-22032] delete transfer #48

Merged
merged 1 commit into from
Dec 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/entities/transfer/api/hooks/index.ts
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
export * from './useGetTransfer';
export * from './useDeleteTransfer';
25 changes: 25 additions & 0 deletions src/entities/transfer/api/hooks/useDeleteTransfer/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import { useMutation, UseMutationResult, useQueryClient } from '@tanstack/react-query';
import { notification } from 'antd';
import { getErrorMessage } from '@shared/config';

import { transferService } from '../../transferService';
import { TransferQueryKey } from '../../keys';
import { DeleteTransferRequest } from '../../types';

/** Hook for deleting transfer */
export const useDeleteTransfer = (data: DeleteTransferRequest): UseMutationResult => {
const queryClient = useQueryClient();

return useMutation({
mutationFn: () => transferService.deleteTransfer(data),
onSuccess: () => {
queryClient.invalidateQueries({ queryKey: [TransferQueryKey.GET_TRANSFERS] });
queryClient.removeQueries({ queryKey: [TransferQueryKey.GET_TRANSFER, data.id] });
},
onError: (error) => {
notification.error({
message: getErrorMessage(error),
});
},
});
};
6 changes: 5 additions & 1 deletion src/entities/transfer/api/transferService.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { axiosInstance } from '@shared/config';
import { PaginationResponse } from '@shared/types';

import { GetTransferRequest, GetTransfersRequest, Transfer } from './types';
import { DeleteTransferRequest, GetTransferRequest, GetTransfersRequest, Transfer } from './types';

export const transferService = {
getTransfers: (params: GetTransfersRequest): Promise<PaginationResponse<Transfer>> => {
Expand All @@ -11,4 +11,8 @@ export const transferService = {
getTransfer: ({ id }: GetTransferRequest): Promise<Transfer> => {
return axiosInstance.get(`transfers/${id}`);
},

deleteTransfer: ({ id }: DeleteTransferRequest): Promise<null> => {
return axiosInstance.delete(`transfers/${id}`);
},
};
4 changes: 4 additions & 0 deletions src/entities/transfer/api/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,3 +79,7 @@ export interface GetTransfersRequest extends PaginationRequest {
export interface GetTransferRequest {
id: number;
}

export interface DeleteTransferRequest {
id: number;
}
30 changes: 30 additions & 0 deletions src/features/transfer/DeleteTransfer/index.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import React from 'react';
import { ControlButtons } from '@shared/ui';
import { Typography } from 'antd';
import { WarningOutlined } from '@ant-design/icons';
import { useDeleteTransfer } from '@entities/transfer';

import classes from './styles.module.less';
import { DeleteTransferProps } from './types';

const { Text } = Typography;

export const DeleteTransfer = ({ transfer, onSuccess, onCancel }: DeleteTransferProps) => {
const { mutate: deleteTransfer, isPending } = useDeleteTransfer({ id: transfer.id });

const handleSubmit = () => {
deleteTransfer(null, { onSuccess });
};

return (
<div className={classes.root}>
<div className={classes.main}>
<WarningOutlined className={classes.icon} />
<Text>
Do you really want to delete transfer <b>«{transfer.name}»</b>?
</Text>
</div>
<ControlButtons isLoading={isPending} submitButtonText="Confirm" onSubmit={handleSubmit} onCancel={onCancel} />
</div>
);
};
20 changes: 20 additions & 0 deletions src/features/transfer/DeleteTransfer/styles.module.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
.root {
display: flex;
flex-direction: column;
gap: 24px;

.main {
display: flex;
align-items: flex-start;
gap: 24px;

.icon {
color: @red-6;

svg {
width: 24px;
height: 24px;
}
}
}
}
7 changes: 7 additions & 0 deletions src/features/transfer/DeleteTransfer/types.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import { Transfer } from '@entities/transfer';

export interface DeleteTransferProps {
transfer: Transfer;
onSuccess: () => void;
onCancel: () => void;
}
3 changes: 2 additions & 1 deletion src/features/transfer/TransferList/index.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,15 @@ import { TransferQueryKey, transferService } from '@entities/transfer';
import { TRANSFER_LIST_COLUMNS } from './constants';
import { TransferListProps } from './types';

export const TransferList = memo(({ group }: TransferListProps) => {
export const TransferList = memo(({ group, onDeleteRowClick }: TransferListProps) => {
return (
<ManagedTable
queryKey={[TransferQueryKey.GET_TRANSFERS, group.data.id]}
queryFunction={(params) => transferService.getTransfers({ ...params, group_id: group.data.id })}
columns={TRANSFER_LIST_COLUMNS}
isRenderUpdateRowAction={() => hasAccessByUserRole(UserRole.Developer, group.role)}
isRenderDeleteRowAction={() => hasAccessByUserRole(UserRole.Maintainer, group.role)}
onDeleteRowClick={onDeleteRowClick}
rowKey="id"
/>
);
Expand Down
2 changes: 2 additions & 0 deletions src/features/transfer/TransferList/types.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { Group } from '@entities/group';
import { Transfer } from '@entities/transfer';

export interface TransferListProps {
group: Group;
onDeleteRowClick: (transfer: Transfer) => void;
}
1 change: 1 addition & 0 deletions src/features/transfer/index.ts
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
export * from './TransferList';
export * from './TransferDetailInfo';
export * from './DeleteTransfer';
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import React from 'react';
import { DEFAULT_MODAL_DELETE_WIDTH } from '@shared/constants';
import { useModalState } from '@shared/hooks';
import { ModalWrapper } from '@shared/ui';
import { Button } from 'antd';
import { useNavigate } from 'react-router-dom';
import { DeleteTransfer } from '@features/transfer';

import { DeleteTransferButtonProps } from './types';

export const DeleteTransferButton = ({ transfer }: DeleteTransferButtonProps) => {
const navigate = useNavigate();

const { isOpened: isOpenedModal, handleOpen: handleOpenModal, handleClose: handleCloseModal } = useModalState();

const handleSuccessDeleteTransfer = () => {
navigate('/transfers');
handleCloseModal();
};

return (
<>
<Button type="primary" size="large" danger onClick={handleOpenModal}>
Delete transfer
</Button>
<ModalWrapper
title="Delete transfer"
width={DEFAULT_MODAL_DELETE_WIDTH}
open={isOpenedModal}
onCancel={handleCloseModal}
>
<DeleteTransfer transfer={transfer} onSuccess={handleSuccessDeleteTransfer} onCancel={handleCloseModal} />
</ModalWrapper>
</>
);
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { Transfer } from '@entities/transfer';

export interface DeleteTransferButtonProps {
transfer: Transfer;
}
1 change: 1 addition & 0 deletions src/widgets/transfer/TransferDetail/components/index.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export * from './DeleteTransferButton';
13 changes: 11 additions & 2 deletions src/widgets/transfer/TransferDetail/index.tsx
Original file line number Diff line number Diff line change
@@ -1,19 +1,28 @@
import React from 'react';
import { PageContentWrapper } from '@shared/ui';
import { AccessWrapper, PageContentWrapper } from '@shared/ui';
import { TransferDetailInfo } from '@features/transfer';
import { UserRole } from '@shared/types';

import { TransferDetailProps } from './types';
import { DeleteTransferButton } from './components';
import classes from './styles.module.less';

export const TransferDetail = ({ transfer, group, connectionSource, connectionTarget, queue }: TransferDetailProps) => {
return (
<PageContentWrapper>
{/* //TODO: [DOP-20065] add update and delete actions for transfer */}
<TransferDetailInfo
transfer={transfer}
group={group.data}
connectionSource={connectionSource}
connectionTarget={connectionTarget}
queue={queue}
extra={
<AccessWrapper accessRole={UserRole.Maintainer} currentRole={group.role}>
<div className={classes.actions}>
<DeleteTransferButton transfer={transfer} />
</div>
</AccessWrapper>
}
/>
</PageContentWrapper>
);
Expand Down
5 changes: 5 additions & 0 deletions src/widgets/transfer/TransferDetail/styles.module.less
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
.actions {
display: flex;
align-items: center;
gap: 16px;
}
45 changes: 41 additions & 4 deletions src/widgets/transfer/TransferListWrapper/index.tsx
Original file line number Diff line number Diff line change
@@ -1,9 +1,46 @@
import React from 'react';
import { TransferList } from '@features/transfer';
import React, { useCallback, useState } from 'react';
import { DeleteTransfer, TransferList } from '@features/transfer';
import { Transfer } from '@entities/transfer';
import { useModalState } from '@shared/hooks';
import { ModalWrapper } from '@shared/ui';
import { DEFAULT_MODAL_DELETE_WIDTH } from '@shared/constants';

import { TransferListWrapperProps } from './types';

export const TransferListWrapper = ({ group }: TransferListWrapperProps) => {
//TODO: [DOP-20065] add update and delete actions for transfer
return <TransferList group={group} />;
const [selectedTransfer, setSelectedTransfer] = useState<Transfer>();

const {
isOpened: isOpenedDeleteTransferModal,
handleOpen: handleOpenDeleteTransferModal,
handleClose: handleCloseDeleteTransferModal,
} = useModalState();

const handleDeleteUserClick = useCallback(
(transfer: Transfer) => {
setSelectedTransfer(transfer);
handleOpenDeleteTransferModal();
},
[handleOpenDeleteTransferModal],
);

return (
<>
{selectedTransfer && (
<ModalWrapper
title="Delete transfer"
width={DEFAULT_MODAL_DELETE_WIDTH}
open={isOpenedDeleteTransferModal}
onCancel={handleCloseDeleteTransferModal}
>
<DeleteTransfer
transfer={selectedTransfer}
onSuccess={handleCloseDeleteTransferModal}
onCancel={handleCloseDeleteTransferModal}
/>
</ModalWrapper>
)}
<TransferList group={group} onDeleteRowClick={handleDeleteUserClick} />;
</>
);
};
Loading