Merge pull request #468 from ONLYOFFICE/bugfix/delete-dialog

Delete dialog bugfix
This commit is contained in:
Nikita Gopienko 2021-11-29 15:12:55 +03:00 committed by GitHub
commit 7b3a18b0c2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -114,6 +114,49 @@ class DeleteDialogComponent extends React.Component {
this.props.setDeleteDialogVisible(false);
};
moveToTrashTitle = (checkedSelections) => {
const { unsubscribe, t } = this.props;
const { filesList, foldersList } = this.state;
const itemsCount = filesList.length + foldersList.length;
const checkedSelectionCount = checkedSelections.length;
if (unsubscribe) {
return t("UnsubscribeTitle");
} else {
if (
(checkedSelectionCount < itemsCount && itemsCount > 1) ||
checkedSelectionCount > 1
) {
return t("MoveToTrashItemsTitle");
} else {
return filesList.length === 1
? t("MoveToTrashOneFileTitle")
: t("MoveToTrashOneFolderTitle");
}
}
};
moveToTrashNoteText = (checkedSelections) => {
const { filesList, foldersList } = this.state;
const { t, personal } = this.props;
const itemsCount = filesList.length + foldersList.length;
const checkedSelectionCount = checkedSelections.length;
if (
(checkedSelectionCount < itemsCount && itemsCount > 1) ||
checkedSelectionCount > 1
) {
return t("MoveToTrashItemsNote");
} else {
return filesList.length === 1
? t("MoveToTrashOneFileNote")
: personal
? ""
: t("MoveToTrashOneFolderNote");
}
};
render() {
const {
visible,
@ -123,7 +166,6 @@ class DeleteDialogComponent extends React.Component {
unsubscribe,
isPrivacyFolder,
isRecycleBinFolder,
personal,
} = this.props;
const { filesList, foldersList, selection } = this.state;
@ -132,23 +174,11 @@ class DeleteDialogComponent extends React.Component {
const title =
isPrivacyFolder || isRecycleBinFolder || checkedSelections[0]?.providerKey
? t("Common:Confirmation")
: unsubscribe
? t("UnsubscribeTitle")
: checkedSelections.length === 1 || isPrivacyFolder
? checkedSelections[0].fileExst
? t("MoveToTrashOneFileTitle")
: t("MoveToTrashOneFolderTitle")
: t("MoveToTrashItemsTitle");
: this.moveToTrashTitle(checkedSelections);
const noteText = unsubscribe
? t("UnsubscribeNote")
: checkedSelections.length === 1 || isPrivacyFolder
? checkedSelections[0].fileExst
? t("MoveToTrashOneFileNote")
: personal
? ""
: t("MoveToTrashOneFolderNote")
: t("MoveToTrashItemsNote");
: this.moveToTrashNoteText(checkedSelections);
const accessButtonLabel =
isPrivacyFolder || isRecycleBinFolder || checkedSelections[0]?.providerKey