Merge branch 'release/v0.1.0' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.0

This commit is contained in:
Nikita Gopienko 2021-04-07 13:07:17 +03:00
commit 13c9e5b0b6

View File

@ -72,8 +72,14 @@ const SectionHeaderContent = (props) => {
);
const goBackAndReset = useCallback(() => {
if (!profile || !document.referrer) setFilterAndReset(filter);
else props.resetProfile();
if (!profile || !document.referrer) {
setFilterAndReset(filter);
const urlFilter = filter.toUrlParams();
return history.push(
combineUrl(AppServerConfig.proxyURL, homepage, `/filter?${urlFilter}`)
);
}
history.push(
combineUrl(
AppServerConfig.proxyURL,
@ -81,6 +87,8 @@ const SectionHeaderContent = (props) => {
`/view/${profile.userName}`
)
);
return props.resetProfile();
}, [history, props]);
const onClickBack = useCallback(() => {