zoriya/flood
1
0
Fork 0
mirror of https://github.com/zoriya/flood.git synced 2026-05-29 18:04:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

MoveTorrentsModal, RemoveTorrentsModal: fix submission

Browse Source 
Fixes: e6181ef2c9
This commit is contained in:
Jesse Chan
2020-11-14 01:03:16 +08:00
parent 9038177630
commit 006512c013
2 changed files with 84 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/javascript/components/modals/move-torrents-modal/MoveTorrentsModal.tsx
+36 -33
View File
@@ -4,6 +4,7 @@ import {useIntl} from 'react-intl';
import FilesystemBrowserTextbox from '../../general/filesystem/FilesystemBrowserTextbox';
import {Form} from '../../../ui';
import Modal from '../Modal';
import ModalActions from '../ModalActions';
import TorrentActions from '../../../actions/TorrentActions';
import TorrentStore from '../../../stores/TorrentStore';
import UIStore from '../../../stores/UIStore';
@@ -65,42 +66,44 @@ const MoveTorrents: FC = () => {
)}
showBasePathToggle
/>
<ModalActions
actions={[
{
checked: true,
content: intl.formatMessage({
id: 'torrents.move.data.label',
}),
id: 'moveFiles',
type: 'checkbox',
},
{
checked: false,
content: intl.formatMessage({
id: 'torrents.move.check_hash.label',
}),
id: 'isCheckHash',
type: 'checkbox',
},
{
content: intl.formatMessage({
id: 'button.cancel',
}),
triggerDismiss: true,
type: 'tertiary',
},
{
content: intl.formatMessage({
id: 'torrents.move.button.set.location',
}),
isLoading: isSettingDownloadPath,
submit: true,
type: 'primary',
},
]}
/>
</Form>
</div>
}
actions={[
{
checked: true,
content: intl.formatMessage({
id: 'torrents.move.data.label',
}),
id: 'moveFiles',
type: 'checkbox',
},
{
checked: false,
content: intl.formatMessage({
id: 'torrents.move.check_hash.label',
}),
id: 'isCheckHash',
type: 'checkbox',
},
{
content: intl.formatMessage({
id: 'button.cancel',
}),
triggerDismiss: true,
type: 'tertiary',
},
{
content: intl.formatMessage({
id: 'torrents.move.button.set.location',
}),
isLoading: isSettingDownloadPath,
submit: true,
type: 'primary',
},
]}
/>
);
};
client/src/javascript/components/modals/remove-torrents-modal/RemoveTorrentsModal.tsx
+48 -42
View File
@@ -1,16 +1,18 @@
import {FC, useRef} from 'react';
import {FC, useState} from 'react';
import {FormattedMessage, useIntl} from 'react-intl';
import {Form, FormRow} from '../../../ui';
import Modal from '../Modal';
import ModalActions from '../ModalActions';
import {saveDeleteTorrentsUserPreferences} from '../../../util/userPreferences';
import SettingStore from '../../../stores/SettingStore';
import TorrentActions from '../../../actions/TorrentActions';
import TorrentStore from '../../../stores/TorrentStore';
import UIStore from '../../../stores/UIStore';
const RemoveTorrentsModal: FC = () => {
const formRef = useRef<Form>(null);
const intl = useIntl();
const [isRemoving, setIsRemoving] = useState<boolean>(false);
const {selectedTorrents} = TorrentStore;
if (selectedTorrents.length === 0) {
@@ -48,52 +50,56 @@ const RemoveTorrentsModal: FC = () => {
id: 'torrents.remove',
})}
content={
<div className="modal__content inverse">
<Form ref={formRef}>
<div className="modal__content">
<Form
className="inverse"
onSubmit={({formData}) => {
setIsRemoving(true);
const deleteData = formData.deleteData as boolean;
TorrentActions.deleteTorrents({
hashes: TorrentStore.selectedTorrents,
deleteData,
}).then(() => {
setIsRemoving(false);
saveDeleteTorrentsUserPreferences({deleteData});
UIStore.dismissModal();
});
}}>
<FormRow>
<FormattedMessage id="torrents.remove.are.you.sure" values={{count: selectedTorrents.length}} />
</FormRow>
<ModalActions
actions={[
{
checked: SettingStore.floodSettings.deleteTorrentData,
content: intl.formatMessage({
id: 'torrents.remove.delete.data',
}),
id: 'deleteData',
type: 'checkbox',
},
{
content: intl.formatMessage({
id: 'button.no',
}),
triggerDismiss: true,
type: 'tertiary',
},
{
content: intl.formatMessage({
id: 'button.yes',
}),
isLoading: isRemoving,
submit: true,
type: 'primary',
},
]}
/>
</Form>
</div>
}
actions={[
{
checked: SettingStore.floodSettings.deleteTorrentData,
content: intl.formatMessage({
id: 'torrents.remove.delete.data',
}),
id: 'deleteData',
type: 'checkbox',
},
{
clickHandler: null,
content: intl.formatMessage({
id: 'button.no',
}),
triggerDismiss: true,
type: 'tertiary',
},
{
clickHandler: () => {
let deleteData = false;
if (formRef.current != null) {
deleteData = formRef.current.getFormData().deleteData as boolean;
}
TorrentActions.deleteTorrents({
hashes: TorrentStore.selectedTorrents,
deleteData,
});
saveDeleteTorrentsUserPreferences({deleteData});
},
content: intl.formatMessage({
id: 'button.yes',
}),
triggerDismiss: true,
type: 'primary',
},
]}
/>
);
};