IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Web: Files: fixed SectionBodyContent selectors

Browse Source
This commit is contained in:
Nikita Gopienko 2020-10-07 14:00:05 +03:00
parent b265a01603
commit 74dda40b90
1 changed files with 61 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

143
products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
View File

@ -56,17 +56,13 @@ import {
getFolderIcon, getFolderIcon,
getSelectedFolderId, getSelectedFolderId,
getFolders, getFolders,
getIsAdmin,
getIsLoading, getIsLoading,
getMediaViewerId, getMediaViewerId,
getMediaViewerVisibility, getMediaViewerVisibility,
getSelectedFolderParentId, getSelectedFolderParentId,
getPathParts,
getSelected, getSelected,
getSelectedFolderTitle, getSelectedFolderTitle,
getSelectedFolderType,
getSelection, getSelection,
getSettings,
getTreeFolders, getTreeFolders,
getViewAs, getViewAs,
getViewer, getViewer,
@ -78,9 +74,14 @@ import {
getFilesList, getFilesList,
isMediaOrImage, isMediaOrImage,
getMediaViewerFormats, getMediaViewerFormats,
getIsShareFolder,
getIsCommonFolder,
getIsRecycleBinFolder,
getIsMyFolder,
getMyFolderId,
} from "../../../../../store/files/selectors"; } from "../../../../../store/files/selectors";
import { SharingPanel, OperationsPanel } from "../../../../panels"; import { SharingPanel, OperationsPanel } from "../../../../panels";
const { isAdmin } = store.auth.selectors; const { isAdmin, getSettings } = store.auth.selectors;
//import { getFilterByLocation } from "../../../../../helpers/converters"; //import { getFilterByLocation } from "../../../../../helpers/converters";
//import config from "../../../../../../package.json"; //import config from "../../../../../../package.json";
@ -705,7 +706,7 @@ class SectionBodyContent extends React.Component {
}; };
renderEmptyRootFolderContainer = () => { renderEmptyRootFolderContainer = () => {
const { currentFolderType, title, t, widthProp } = this.props; const { isMy, isShare, isCommon, isRecycleBin, title, t, widthProp } = this.props;
const subheadingText = t("SubheadingEmptyText"); const subheadingText = t("SubheadingEmptyText");
const myDescription = t("MyEmptyContainerDescription"); const myDescription = t("MyEmptyContainerDescription");
const shareDescription = t("SharedEmptyContainerDescription"); const shareDescription = t("SharedEmptyContainerDescription");
@ -768,52 +769,51 @@ class SectionBodyContent extends React.Component {
</div> </div>
); );
switch (currentFolderType) { if(isMy) {
case "My": return (
return ( <EmptyFolderContainer
<EmptyFolderContainer headerText={title}
headerText={title} subheadingText={subheadingText}
subheadingText={subheadingText} descriptionText={myDescription}
descriptionText={myDescription} imageSrc="images/empty_screen.png"
imageSrc="images/empty_screen.png" buttons={commonButtons}
buttons={commonButtons} widthProp={widthProp}
widthProp={widthProp} />
/> );
); } else if(isShare) {
case "Share": return (
return ( <EmptyFolderContainer
<EmptyFolderContainer headerText={title}
headerText={title} subheadingText={subheadingText}
subheadingText={subheadingText} descriptionText={shareDescription}
descriptionText={shareDescription} imageSrc="images/empty_screen_forme.png"
imageSrc="images/empty_screen_forme.png" widthProp={widthProp}
widthProp={widthProp} />
/> )} else if(isCommon) {
); return (
case "Common": <EmptyFolderContainer
return ( headerText={title}
<EmptyFolderContainer subheadingText={subheadingText}
headerText={title} descriptionText={commonDescription}
subheadingText={subheadingText} imageSrc="images/empty_screen_corporate.png"
descriptionText={commonDescription} buttons={commonButtons}
imageSrc="images/empty_screen_corporate.png" widthProp={widthProp}
buttons={commonButtons} />
widthProp={widthProp} );
/> } else if(isRecycleBin) {
); return (
case "Trash": <EmptyFolderContainer
return ( headerText={title}
<EmptyFolderContainer subheadingText={subheadingText}
headerText={title} descriptionText={trashDescription}
subheadingText={subheadingText} imageSrc="images/empty_screen_trash.png"
descriptionText={trashDescription} buttons={trashButtons}
imageSrc="images/empty_screen_trash.png" widthProp={widthProp}
buttons={trashButtons} />
widthProp={widthProp} );
/> }
); else {
default: return;
return;
} }
}; };
@ -1284,7 +1284,7 @@ class SectionBodyContent extends React.Component {
setIsLoading, setIsLoading,
isLoading, isLoading,
currentFolderCount, currentFolderCount,
currentFolderType, isRecycleBin,
dragging, dragging,
mediaViewerVisible, mediaViewerVisible,
currentMediaFileId, currentMediaFileId,
@ -1404,7 +1404,7 @@ class SectionBodyContent extends React.Component {
: item.fileExst : item.fileExst
? false ? false
: true; : true;
const draggable = selectedItem && currentFolderType !== "Trash"; const draggable = selectedItem && !isRecycleBin;
let value = item.fileExst let value = item.fileExst
? `file_${item.id}` ? `file_${item.id}`
: `folder_${item.id}`; : `folder_${item.id}`;
@ -1536,31 +1536,8 @@ SectionBodyContent.defaultProps = {
}; };
const mapStateToProps = (state) => { const mapStateToProps = (state) => {
const pathParts = getPathParts(state);
const treeFolders = getTreeFolders(state);
const myFolderIndex = 0;
const shareFolderIndex = 1;
const commonFolderIndex = 2;
const myDocumentsId =
treeFolders.length &&
treeFolders[myFolderIndex] &&
treeFolders[myFolderIndex].id;
const shareFolderId =
treeFolders.length &&
treeFolders[shareFolderIndex] &&
treeFolders[shareFolderIndex].id;
const commonFolderId =
treeFolders.length &&
treeFolders[commonFolderIndex] &&
treeFolders[commonFolderIndex].id;
const isShare = pathParts && pathParts[0] === shareFolderId;
const isCommon = pathParts && pathParts[0] === commonFolderId;
return { return {
currentFolderCount: getCurrentFolderCount(state), currentFolderCount: getCurrentFolderCount(state),
currentFolderType: getSelectedFolderType(state),
currentMediaFileId: getMediaViewerId(state), currentMediaFileId: getMediaViewerId(state),
dragging: getDragging(state), dragging: getDragging(state),
dragItem: getDragItem(state), dragItem: getDragItem(state),
@ -1571,22 +1548,24 @@ const mapStateToProps = (state) => {
folderId: getSelectedFolderId(state), folderId: getSelectedFolderId(state),
folders: getFolders(state), folders: getFolders(state),
isAdmin: isAdmin(state), isAdmin: isAdmin(state),
isCommon, isCommon: getIsCommonFolder(state),
isLoading: getIsLoading(state), isLoading: getIsLoading(state),
isShare, isShare: getIsShareFolder(state),
mediaViewerVisible: getMediaViewerVisibility(state), mediaViewerVisible: getMediaViewerVisibility(state),
myDocumentsId, myDocumentsId: getMyFolderId(state),
parentId: getSelectedFolderParentId(state), parentId: getSelectedFolderParentId(state),
selected: getSelected(state), selected: getSelected(state),
selectedFolderId: getSelectedFolderId(state), selectedFolderId: getSelectedFolderId(state),
selection: getSelection(state), selection: getSelection(state),
settings: getSettings(state), settings: getSettings(state),
title: getSelectedFolderTitle(state), title: getSelectedFolderTitle(state),
treeFolders, treeFolders: getTreeFolders(state),
viewAs: getViewAs(state), viewAs: getViewAs(state),
viewer: getViewer(state), viewer: getViewer(state),
filesList: getFilesList(state), filesList: getFilesList(state),
mediaFormats: getMediaViewerFormats(state) mediaFormats: getMediaViewerFormats(state),
isRecycleBin: getIsRecycleBinFolder(state),
isMy: getIsMyFolder(state),
}; };
}; };