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

Refactoring of private room mock

Browse Source
This commit is contained in:
Vladislav Makhov 2020-10-26 16:22:47 +03:00
parent e5c5f9194d
commit 6ba6ba2e64
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -87,6 +87,7 @@ import {
getIsFavoritesFolder,
getMyFolderId,
getTooltipLabel,
getIsPrivacyFolder,
} from "../../../../../store/files/selectors";
import { SharingPanel, OperationsPanel } from "../../../../panels";
const { isAdmin, getSettings, getCurrentUser } = store.auth.selectors;
@ -143,8 +144,6 @@ const SimpleFilesRow = styled(Row)`
}
`;
const PrivateRoomDescriptionList = styled(Box)``;
class SectionBodyContent extends React.Component {
constructor(props) {
super(props);
@ -783,8 +782,8 @@ class SectionBodyContent extends React.Component {
isRecycleBin,
isFavorites,
isRecent,
isPrivacy,
title,
isEncryptionSupport,
t,
i18n
} = this.props;
@ -810,7 +809,7 @@ class SectionBodyContent extends React.Component {
{
privateRoomDescTranslations
.map(el => (
<Box displayProp="flex" alignItems="center" paddingProp="0 0 13px 0">
<Box displayProp="flex" alignItems="center" paddingProp="0 0 13px 0" key={el}>
<Box paddingProp="0 7px 0 0">
{privacyIcon}
</Box>
@ -938,7 +937,7 @@ class SectionBodyContent extends React.Component {
imageSrc="images/empty_screen_recent.png"
/>
);
} else if (isEncryptionSupport) {
} else if (isPrivacy) {
return (
<EmptyFolderContainer
headerText={privateRoomHeader}
@ -1407,6 +1406,8 @@ class SectionBodyContent extends React.Component {
isLoading,
currentFolderCount,
isRecycleBin,
isPrivacy,
isEncryptionSupport,
dragging,
mediaViewerVisible,
currentMediaFileId,
@ -1456,7 +1457,7 @@ class SectionBodyContent extends React.Component {
});
}
return !fileAction.id && currentFolderCount === 0 ? (
return (!fileAction.id && currentFolderCount === 0) || (null) ? (
parentId === 0 ? (
this.renderEmptyRootFolderContainer()
) : (
@ -1465,7 +1466,7 @@ class SectionBodyContent extends React.Component {
) : !fileAction.id && items.length === 0 ? (
firstLoad ? (
<Loaders.Rows />
) : (
) : isPrivacy && !isEncryptionSupport ? this.renderEmptyRootFolderContainer() : (
this.renderEmptyFilterContainer()
)
) : (
@ -1702,6 +1703,7 @@ const mapStateToProps = (state) => {
isRecycleBin: getIsRecycleBinFolder(state),
isRecent: getIsRecentFolder(state),
isShare: getIsShareFolder(state),
isPrivacy: getIsPrivacyFolder(state),
mediaViewerImageFormats: getMediaViewerImageFormats(state),
mediaViewerMediaFormats: getMediaViewerMediaFormats(state),
mediaViewerVisible: getMediaViewerVisibility(state),

11
products/ASC.Files/Client/src/store/files/actions.js
View File

@ -1,4 +1,4 @@
import { api, history, toastr } from "asc-web-common";
import { api, history, constants, toastr } from "asc-web-common";
import axios from "axios";
import queryString from "query-string";
import {
@ -27,6 +27,7 @@ import {
} from "./selectors";
const { files, FilesFilter } = api;
const { FolderType } = constants;
export const SET_FOLDER = "SET_FOLDER";
export const SET_FOLDERS = "SET_FOLDERS";
@ -302,15 +303,17 @@ export function setFilterUrl(filter) {
// TODO: similar to fetchFolder, remove one
export function fetchFiles(folderId, filter) {
return (dispatch) => {
return (dispatch, getState) => {
const isEncryptionSupport = getState().auth.settings.isEncryptionSupport;
const filterData = filter ? filter.clone() : FilesFilter.getDefault();
filterData.folder = folderId;
return files.getFolder(folderId, filter).then((data) => {
const isPrivacyFolder = data.current.rootFolderType === FolderType.Privacy;
filterData.treeFolders = createTreeFolders(data.pathParts, filterData);
filterData.total = data.total;
dispatch(setFilesFilter(filterData));
dispatch(setFolders(data.folders));
dispatch(setFiles(data.files));
dispatch(setFolders(isPrivacyFolder && !isEncryptionSupport ? [] : data.folders));
dispatch(setFiles(isPrivacyFolder && !isEncryptionSupport ? [] : data.files));
dispatch(setSelected("close"));
return dispatch(
setSelectedFolder({