Skip to content

Chore: Remove unnecessary modals replacing to GenericModal #21853

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.

Sign up for GitHub

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

Merged
gabriellsh merged 13 commits into from
Jun 18, 2021
Merged

Chore: Remove unnecessary modals replacing to GenericModal #21853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
c13920b
replace method to api endpoint
Apr 27, 2021
98de63c
replace Generic Dialog
Apr 28, 2021
b2c541e
replace DialogWarningModal
Apr 28, 2021
27bbd94
Merge branch 'improve/use-api-prune' into develop
Apr 28, 2021
2c140bc
remove DeleteWarningModal
Apr 28, 2021
f7df251
replace DeleteChannelWarning
Apr 28, 2021
8392251
replace DeleteSuccessModal
Apr 28, 2021
eac54f3
fix warning
Apr 28, 2021
93ab014
Merge branch 'develop' into chore/modals
May 21, 2021
d71971e
fix: modal messages
May 24, 2021
8e72011
Merge branch 'develop' into chore/modals
gabriellsh May 28, 2021
17eda13
Merge branch 'develop' into chore/modals
gabriellsh Jun 18, 2021
4d6f998
fix: change new modal
Jun 18, 2021
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
29 changes: 0 additions & 29 deletions client/components/DeleteChannelWarning.js
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions client/components/DeleteFileWarning.js
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions client/components/DeleteSuccessModal.tsx
View file
Open in desktop

This file was deleted.

47 changes: 0 additions & 47 deletions client/components/DeleteWarningModal.tsx
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion client/components/GenericModal.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ const GenericModal: FC<GenericModalProps> = ({
title,
icon,
onCancel,
onClose,
onClose = onCancel,
onConfirm,
dontAskAgain,
...props
Expand Down
19 changes: 12 additions & 7 deletions client/views/admin/customEmoji/EditCustomEmoji.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { Box, Button, ButtonGroup, Margins, TextInput, Field, Icon } from '@rocket.chat/fuselage';
import React, { useCallback, useState, useMemo, useEffect, FC, ChangeEvent } from 'react';

import DeleteSuccessModal from '../../../components/DeleteSuccessModal';
import DeleteWarningModal from '../../../components/DeleteWarningModal';
import GenericModal from '../../../components/GenericModal';
import VerticalBar from '../../../components/VerticalBar';
import { useSetModal } from '../../../contexts/ModalContext';
import { useAbsoluteUrl } from '../../../contexts/ServerContext';
Expand Down Expand Up @@ -95,7 +94,9 @@ const EditCustomEmoji: FC<EditCustomEmojiProps> = ({ close, onChange, data, ...p
try {
await deleteAction();
setModal(() => (
<DeleteSuccessModal children={t('Custom_Emoji_Has_Been_Deleted')} onClose={handleClose} />
<GenericModal variant='success' onClose={handleClose} onConfirm={handleClose}>
{t('Custom_Emoji_Has_Been_Deleted')}
</GenericModal>
));
} catch (error) {
dispatchToastMessage({ type: 'error', message: error });
Expand All @@ -108,11 +109,15 @@ const EditCustomEmoji: FC<EditCustomEmojiProps> = ({ close, onChange, data, ...p
};

setModal(() => (
<DeleteWarningModal
children={t('Custom_Emoji_Delete_Warning')}
onDelete={handleDelete}
<GenericModal
variant='danger'
onConfirm={handleDelete}
onCancel={handleCancel}
/>
onClose={handleCancel}
confirmText={t('Delete')}
>
{t('Custom_Emoji_Delete_Warning')}
</GenericModal>
));
}, [close, deleteAction, dispatchToastMessage, onChange, setModal, t]);

Expand Down
18 changes: 11 additions & 7 deletions client/views/admin/customSounds/EditSound.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { Box, Button, ButtonGroup, Margins, TextInput, Field, Icon } from '@rocket.chat/fuselage';
import React, { useCallback, useState, useMemo, useEffect } from 'react';

import DeleteSuccessModal from '../../../components/DeleteSuccessModal';
import DeleteWarningModal from '../../../components/DeleteWarningModal';
import GenericModal from '../../../components/GenericModal';
import VerticalBar from '../../../components/VerticalBar';
import { useSetModal } from '../../../contexts/ModalContext';
import { useMethod } from '../../../contexts/ServerContext';
Expand Down Expand Up @@ -108,7 +107,9 @@ function EditSound({ close, onChange, data, ...props }) {
try {
await deleteCustomSound(_id);
setModal(() => (
<DeleteSuccessModal children={t('Custom_Sound_Has_Been_Deleted')} onClose={handleClose} />
<GenericModal variant='success' onClose={handleClose} onConfirm={handleClose}>
{t('Custom_Sound_Has_Been_Deleted')}
</GenericModal>
));
} catch (error) {
dispatchToastMessage({ type: 'error', message: error });
Expand All @@ -121,11 +122,14 @@ function EditSound({ close, onChange, data, ...props }) {
};

setModal(() => (
<DeleteWarningModal
children={t('Custom_Sound_Delete_Warning')}
onDelete={handleDelete}
<GenericModal
variant='danger'
onConfirm={handleDelete}
onCancel={handleCancel}
/>
confirmText={t('Delete')}
>
{t('Custom_Sound_Delete_Warning')}
</GenericModal>
));
}, [_id, close, deleteCustomSound, dispatchToastMessage, onChange, setModal, t]);

Expand Down
21 changes: 11 additions & 10 deletions client/views/admin/customUserStatus/EditCustomUserStatus.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { Button, ButtonGroup, TextInput, Field, Select, Icon } from '@rocket.chat/fuselage';
import React, { useCallback, useState, useMemo, useEffect } from 'react';

import DeleteSuccessModal from '../../../components/DeleteSuccessModal';
import DeleteWarningModal from '../../../components/DeleteWarningModal';
import GenericModal from '../../../components/GenericModal';
import VerticalBar from '../../../components/VerticalBar';
import { useSetModal } from '../../../contexts/ModalContext';
import { useMethod } from '../../../contexts/ServerContext';
Expand Down Expand Up @@ -71,10 +70,9 @@ export function EditCustomUserStatus({ close, onChange, data, ...props }) {
try {
await deleteStatus(_id);
setModal(() => (
<DeleteSuccessModal
children={t('Custom_User_Status_Has_Been_Deleted')}
onClose={handleClose}
/>
<GenericModal variant='success' onClose={handleClose} onConfirm={handleClose}>
{t('Custom_User_Status_Has_Been_Deleted')}
</GenericModal>
));
} catch (error) {
dispatchToastMessage({ type: 'error', message: error });
Expand All @@ -87,11 +85,14 @@ export function EditCustomUserStatus({ close, onChange, data, ...props }) {
};

setModal(() => (
<DeleteWarningModal
children={t('Custom_User_Status_Delete_Warning')}
onDelete={handleDelete}
<GenericModal
variant='danger'
onConfirm={handleDelete}
onCancel={handleCancel}
/>
confirmText={t('Delete')}
>
{t('Custom_User_Status_Delete_Warning')}
</GenericModal>
));
}, [_id, close, deleteStatus, dispatchToastMessage, onChange, setModal, t]);

Expand Down
11 changes: 8 additions & 3 deletions client/views/admin/emailInbox/EmailInboxForm.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import React, { useCallback, useState } from 'react';

import { isEmail } from '../../../../app/utils/client';
import AutoCompleteDepartment from '../../../components/AutoCompleteDepartment';
import DeleteWarningModal from '../../../components/DeleteWarningModal';
import GenericModal from '../../../components/GenericModal';
import Page from '../../../components/Page';
import { useSetModal } from '../../../contexts/ModalContext';
import { useRoute } from '../../../contexts/RouterContext';
Expand Down Expand Up @@ -158,9 +158,14 @@ function EmailInboxForm({ id, data }) {
};

setModal(
<DeleteWarningModal onDelete={onDeleteManager} onCancel={() => setModal()}>
<GenericModal
variant='danger'
onConfirm={onDeleteManager}
onCancel={() => setModal()}
confirmText={t('Delete')}
>
{t('You_will_not_be_able_to_recover_email_inbox')}
</DeleteWarningModal>,
</GenericModal>,
);
});

Expand Down
30 changes: 17 additions & 13 deletions client/views/admin/integrations/edit/EditIncomingWebhook.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { Field, Box, Margins, Button } from '@rocket.chat/fuselage';
import React, { useMemo, useCallback } from 'react';

import DeleteSuccessModal from '../../../../components/DeleteSuccessModal';
import DeleteWarningModal from '../../../../components/DeleteWarningModal';
import GenericModal from '../../../../components/GenericModal';
import { useSetModal } from '../../../../contexts/ModalContext';
import { useRoute } from '../../../../contexts/RouterContext';
import { useMethod } from '../../../../contexts/ServerContext';
Expand Down Expand Up @@ -44,27 +43,32 @@ function EditIncomingWebhook({ data, onChange, ...props }) {

const handleDeleteIntegration = useCallback(() => {
const closeModal = () => setModal();

const handleClose = () => {
closeModal();
router.push({});
};

const onDelete = async () => {
const result = await deleteIntegration();
if (result.success) {
setModal(
<DeleteSuccessModal
children={t('Your_entry_has_been_deleted')}
onClose={() => {
closeModal();
router.push({});
}}
/>,
<GenericModal variant='success' onClose={handleClose} onConfirm={handleClose}>
{t('Your_entry_has_been_deleted')}
</GenericModal>,
);
}
};

setModal(
<DeleteWarningModal
children={t('Integration_Delete_Warning')}
onDelete={onDelete}
<GenericModal
variant='danger'
onConfirm={onDelete}
onCancel={closeModal}
/>,
confirmText={t('Delete')}
>
{t('Integration_Delete_Warning')}
</GenericModal>,
);
}, [deleteIntegration, router, setModal, t]);

Expand Down
30 changes: 17 additions & 13 deletions client/views/admin/integrations/edit/EditOutgoingWebhook.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
import { Field, Box, Margins, Button } from '@rocket.chat/fuselage';
import React, { useMemo, useCallback } from 'react';

import DeleteSuccessModal from '../../../../components/DeleteSuccessModal';
import DeleteWarningModal from '../../../../components/DeleteWarningModal';
import GenericModal from '../../../../components/GenericModal';
import { useSetModal } from '../../../../contexts/ModalContext';
import { useRoute } from '../../../../contexts/RouterContext';
import { useMethod } from '../../../../contexts/ServerContext';
Expand Down Expand Up @@ -57,27 +56,32 @@ function EditOutgoingWebhook({ data, onChange, setSaveAction, ...props }) {

const handleDeleteIntegration = useCallback(() => {
const closeModal = () => setModal();

const handleClose = () => {
closeModal();
router.push({});
};

const onDelete = async () => {
const result = await deleteIntegration();
if (result.success) {
setModal(
<DeleteSuccessModal
children={t('Your_entry_has_been_deleted')}
onClose={() => {
closeModal();
router.push({});
}}
/>,
<GenericModal variant='success' onClose={handleClose} onConfirm={handleClose}>
{t('Your_entry_has_been_deleted')}
</GenericModal>,
);
}
};

setModal(
<DeleteWarningModal
children={t('Integration_Delete_Warning')}
onDelete={onDelete}
<GenericModal
variant='danger'
onConfirm={onDelete}
onCancel={closeModal}
/>,
confirmText={t('Delete')}
>
{t('Integration_Delete_Warning')}
</GenericModal>,
);
}, [deleteIntegration, router, setModal, t]);

Expand Down
Loading