haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-23 12:27:48 +00:00
Code Issues Releases Wiki Activity

ignore canceled error (#7864)

Browse Source 
Co-authored-by: zhouwenxuan <aries@Mac.local>
This commit is contained in:
Aries
2025-05-29 10:12:56 +08:00
committed by GitHub
parent de13ec8817
commit 23c44d1e5a
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
frontend/src/components/search/search.js
View File

@@ -8,7 +8,7 @@ import searchAPI from '../../utils/search-api';
import { gettext } from '../../utils/constants'; import { gettext } from '../../utils/constants';
import SearchResultItem from './search-result-item'; import SearchResultItem from './search-result-item';
import SearchResultLibrary from './search-result-library'; import SearchResultLibrary from './search-result-library';
import { debounce, Utils } from '../../utils/utils'; import { debounce, Utils, isCanceled } from '../../utils/utils';
import toaster from '../toast'; import toaster from '../toast';
import Loading from '../loading'; import Loading from '../loading';
import { SEARCH_MASK, SEARCH_CONTAINER } from '../../constants/zIndexes'; import { SEARCH_MASK, SEARCH_CONTAINER } from '../../constants/zIndexes';
@@ -414,8 +414,10 @@ class Search extends Component {
isLoading: false, isLoading: false,
}); });
}).catch(error => { }).catch(error => {
if (!isCanceled(error)) {
let errMessage = Utils.getErrorMsg(error); let errMessage = Utils.getErrorMsg(error);
toaster.danger(errMessage); toaster.danger(errMessage);
}
this.setState({ isLoading: false }); this.setState({ isLoading: false });
}); });
}; };

5
frontend/src/utils/utils.js
View File

@@ -1,3 +1,4 @@
import axios from 'axios';
import { mediaUrl, gettext, serviceURL, siteRoot, isPro, fileAuditEnabled, canGenerateShareLink, canGenerateUploadLink, shareLinkPasswordMinLength, username, folderPermEnabled, onlyofficeConverterExtensions, enableSeadoc, enableRepoSnapshotLabel, import { mediaUrl, gettext, serviceURL, siteRoot, isPro, fileAuditEnabled, canGenerateShareLink, canGenerateUploadLink, shareLinkPasswordMinLength, username, folderPermEnabled, onlyofficeConverterExtensions, enableSeadoc, enableRepoSnapshotLabel,
enableResetEncryptedRepoPassword, isEmailConfigured, isSystemStaff, enableResetEncryptedRepoPassword, isEmailConfigured, isSystemStaff,
enableOnlyoffice, onlyofficeEditFileExtension, enableOnlyoffice, onlyofficeEditFileExtension,
@@ -1997,3 +1998,7 @@ export const throttle = (func, delay) => {
export const getType = (value) => { export const getType = (value) => {
return Object.prototype.toString.call(value).slice(8, -1); return Object.prototype.toString.call(value).slice(8, -1);
}; };
export const isCanceled = (error) => {
return axios.isCancel(error);
};