Web: Files: fixed SectionHeaderContent selectors

This commit is contained in:
Nikita Gopienko 2020-10-07 14:00:46 +03:00
parent 190460a797
commit da1249cf4a

View File

@ -34,8 +34,13 @@ import {
import { SharingPanel, OperationsPanel } from "../../../../panels"; import { SharingPanel, OperationsPanel } from "../../../../panels";
import { import {
isCanBeDeleted, isCanBeDeleted,
checkFolderType, getIsRecycleBinFolder,
isCanCreate, isCanCreate,
getSelectedFolderTitle,
getFilter,
getSelectedFolderId,
getSelection,
getSelectedFolderParentId,
} from "../../../../../store/files/selectors"; } from "../../../../../store/files/selectors";
const { isAdmin } = store.auth.selectors; const { isAdmin } = store.auth.selectors;
@ -342,7 +347,7 @@ class SectionHeaderContent extends React.Component {
selection, selection,
isHeaderVisible, isHeaderVisible,
onClose, onClose,
isRecycleBinFolder, isRecycleBin,
isHeaderChecked, isHeaderChecked,
isHeaderIndeterminate, isHeaderIndeterminate,
deleteDialogVisible, deleteDialogVisible,
@ -454,7 +459,7 @@ class SectionHeaderContent extends React.Component {
}, },
]; ];
if (isRecycleBinFolder) { if (isRecycleBin) {
menuItems.push({ menuItems.push({
label: t("EmptyRecycleBin"), label: t("EmptyRecycleBin"),
onClick: this.onEmptyTrashAction, onClick: this.onEmptyTrashAction,
@ -556,7 +561,7 @@ class SectionHeaderContent extends React.Component {
{showDeleteDialog && ( {showDeleteDialog && (
<DeleteDialog <DeleteDialog
loopFilesOperations={loopFilesOperations} loopFilesOperations={loopFilesOperations}
isRecycleBinFolder={isRecycleBinFolder} isRecycleBin={isRecycleBin}
visible={showDeleteDialog} visible={showDeleteDialog}
onClose={this.onDeleteAction} onClose={this.onDeleteAction}
selection={selection} selection={selection}
@ -609,23 +614,22 @@ class SectionHeaderContent extends React.Component {
} }
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
const { selectedFolder, selection, treeFolders, filter } = state.files; const { selectedFolder } = state.files;
const { parentId, title, id } = selectedFolder; const { parentId } = selectedFolder;
const { user } = state.auth; const { user } = state.auth;
const indexOfTrash = 3;
user.rights = { icon: "AccessEditIcon", rights: "FullAccess" }; user.rights = { icon: "AccessEditIcon", rights: "FullAccess" };
return { return {
folder: parentId !== 0, folder: parentId !== 0,
isAdmin: isAdmin(state), isAdmin: isAdmin(state),
isRecycleBinFolder: checkFolderType(id, indexOfTrash, treeFolders), isRecycleBin: getIsRecycleBinFolder(state),
parentId, parentId: getSelectedFolderParentId(state),
selection, selection: getSelection(state),
title, title: getSelectedFolderTitle(state),
filter, filter: getFilter(state),
deleteDialogVisible: isCanBeDeleted(selectedFolder, user), deleteDialogVisible: isCanBeDeleted(selectedFolder, user),
currentFolderId: id, currentFolderId: getSelectedFolderId(state),
isCanCreate: isCanCreate(selectedFolder, user), isCanCreate: isCanCreate(selectedFolder, user),
}; };
}; };