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

fix Bug 65389 - incorrect category type

Browse Source
This commit is contained in:
Vladimir Khvan 2024-01-11 20:18:13 +05:00
parent b5702ee497
commit 75f738f4fd
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/client/src/helpers/utils.js
View File

@ -138,8 +138,6 @@ export const getCategoryType = (location) => {
categoryType = CategoryType.Settings;
} else if (pathname.startsWith("/accounts/filter")) {
categoryType = CategoryType.Accounts;
} else if (pathname.startsWith("/form-gallery")) {
categoryType = CategoryType.Personal;
}
return categoryType;

11
packages/client/src/pages/FormGallery/Header.js
View File

@ -15,7 +15,7 @@ import {
import config from "PACKAGE_FILE";
import FilesFilter from "@docspace/common/api/files/filter";
import { combineUrl } from "@docspace/common/utils";
import { getCategoryUrl } from "SRC_DIR/helpers/utils";
import { getCategoryUrl, getCategoryTypeByFolderType } from "SRC_DIR/helpers/utils";
const SectionHeaderContent = ({
t,
@ -24,7 +24,6 @@ const SectionHeaderContent = ({
oformFromFolderId,
setGallerySelected,
categoryType,
setSubmitToGalleryDialogVisible,
currentCategory,
@ -34,14 +33,18 @@ const SectionHeaderContent = ({
setIsLoading,
oformsLoadError,
getFolderInfo,
}) => {
const navigate = useNavigate();
const onNavigateBack = () => {
const onNavigateBack = async () => {
setGallerySelected(null);
const filter = FilesFilter.getDefault();
filter.folder = oformFromFolderId;
const folderInfo = await getFolderInfo(oformFromFolderId);
const categoryType = getCategoryTypeByFolderType(folderInfo.rootFolderType, folderInfo.parentId);
const url = getCategoryUrl(categoryType, oformFromFolderId);
const filterParamsStr = filter.toUrlParams();
@ -117,7 +120,6 @@ export default inject(
clientLoadingStore,
}) => {
return {
categoryType: filesStore.categoryType,
getCategoryTitle: oformsStore.getCategoryTitle,
oformFromFolderId: oformsStore.oformFromFolderId,
@ -141,6 +143,7 @@ export default inject(
},
oformsLoadError: oformsStore.oformsLoadError,
getFolderInfo: filesStore.getFolderInfo,
};
}
)(withTranslation("Common")(observer(SectionHeaderContent)));