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

after-merge fix

Browse Source
This commit is contained in:
namushka 2024-02-16 13:40:41 +03:00
parent f39f000d01
commit 468e10fd9b
1 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
packages/client/src/pages/Home/Section/Submenu/MyDocumentsSubmenu/index.js
View File

@ -6,7 +6,13 @@ import Loaders from "@docspace/common/components/Loaders";
import FilesFilter from "@docspace/shared/api/files/filter"; import FilesFilter from "@docspace/shared/api/files/filter";
import { getObjectByLocation } from "@docspace/shared/utils/common"; import { getObjectByLocation } from "@docspace/shared/utils/common";
const MyDocumentsSubmenu = ({ setFilter, showBodyLoader }) => { const MyDocumentsSubmenu = ({
isPersonalRoom,
isRecentTab,
setFilter,
showBodyLoader,
isRoot,
}) => {
const { t } = useTranslation("Files"); const { t } = useTranslation("Files");
const submenu = [ const submenu = [
@ -27,6 +33,7 @@ const MyDocumentsSubmenu = ({ setFilter, showBodyLoader }) => {
if (e.id === "recent") { if (e.id === "recent") {
filter.folder = e.id; filter.folder = e.id;
filter.searchArea = 3; filter.searchArea = 3;
filter.sortBy = "LastOpened";
} else { } else {
filter.searchArea = null; filter.searchArea = null;
} }
@ -35,22 +42,29 @@ const MyDocumentsSubmenu = ({ setFilter, showBodyLoader }) => {
window.DocSpace.navigate(`${url}?${filter.toUrlParams()}`); window.DocSpace.navigate(`${url}?${filter.toUrlParams()}`);
}; };
const showSubmenu = (isPersonalRoom || isRecentTab) && isRoot;
const startSelect = const startSelect =
getObjectByLocation(window.DocSpace.location)?.folder === "recent" ? 1 : 0; getObjectByLocation(window.DocSpace.location)?.folder === "recent" ? 1 : 0;
if (showBodyLoader) return <Loaders.SectionSubmenuLoader />; if (showSubmenu && showBodyLoader) return <Loaders.SectionSubmenuLoader />;
return ( return showSubmenu ? (
<Submenu data={submenu} startSelect={startSelect} onSelect={onSelect} /> <Submenu data={submenu} startSelect={startSelect} onSelect={onSelect} />
); ) : null;
}; };
export default inject(({ filesStore, clientLoadingStore }) => { export default inject(
const { setFilter } = filesStore; ({ treeFoldersStore, filesStore, clientLoadingStore }) => {
const { showBodyLoader } = clientLoadingStore; const { isPersonalRoom, isRecentTab, isRoot } = treeFoldersStore;
const { setFilter } = filesStore;
const { showBodyLoader } = clientLoadingStore;
return { return {
setFilter, isPersonalRoom,
showBodyLoader, isRecentTab,
}; setFilter,
})(observer(MyDocumentsSubmenu)); showBodyLoader,
isRoot,
};
},
)(observer(MyDocumentsSubmenu));