aiden
/
memos
mirror of https://github.com/usememos/memos
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: update error message handler

Browse Source
pull/161/head
Steven 3 years ago
parent a98e64cf0a
commit f06a3d171b
15 changed files with 42 additions and 27 deletions
Show Stats Download Patch File Download Diff File

6
web/src/components/ArchivedMemo.tsx
Unescape Escape View File

@ -30,7 +30,8 @@ const ArchivedMemo: React.FC<Props> = (props: Props) => {
await memoService.deleteMemoById(memo.id); await memoService.deleteMemoById(memo.id);
await memoService.fetchAllMemos(); await memoService.fetchAllMemos();
} catch (error: any) { } catch (error: any) {
toastHelper.error(error.message); console.error(error);
toastHelper.error(error.response.data.message);
} }
} else { } else {
toggleConfirmDeleteBtn(); toggleConfirmDeleteBtn();
@ -46,7 +47,8 @@ const ArchivedMemo: React.FC<Props> = (props: Props) => {
await memoService.fetchAllMemos(); await memoService.fetchAllMemos();
toastHelper.info("Restored successfully"); toastHelper.info("Restored successfully");
} catch (error: any) { } catch (error: any) {
toastHelper.error(error.message); console.error(error);
toastHelper.error(error.response.data.message);
} }
}; };

3
web/src/components/ArchivedMemoDialog.tsx
Unescape Escape View File

@ -23,7 +23,8 @@ const ArchivedMemoDialog: React.FC<Props> = (props: Props) => {
setArchivedMemos(result); setArchivedMemos(result);
}) })
.catch((error) => { .catch((error) => {
toastHelper.error("Failed to fetch archived memos: ", error); console.error(error);
toastHelper.error(error.response.data.message);
}) })
.finally(() => { .finally(() => {
loadingState.setFinish(); loadingState.setFinish();

3
web/src/components/ChangePasswordDialog.tsx
Unescape Escape View File

@ -66,7 +66,8 @@ const ChangePasswordDialog: React.FC<Props> = ({ destroy }: Props) => {
toastHelper.info("Password changed."); toastHelper.info("Password changed.");
handleCloseBtnClick(); handleCloseBtnClick();
} catch (error: any) { } catch (error: any) {
toastHelper.error(error); console.error(error);
toastHelper.error(error.response.data.message);
} }
}; };

3
web/src/components/CreateShortcutDialog.tsx
Unescape Escape View File

@ -61,7 +61,8 @@ const CreateShortcutDialog: React.FC<Props> = (props: Props) => {
}); });
} }
} catch (error: any) { } catch (error: any) {
toastHelper.error(error.message); console.error(error);
toastHelper.error(error.response.data.message);
} }
destroy(); destroy();
}; };

5
web/src/components/Memo.tsx
Unescape Escape View File

@ -103,7 +103,8 @@ const Memo: React.FC<Props> = (props: Props) => {
rowStatus: "ARCHIVED", rowStatus: "ARCHIVED",
}); });
} catch (error: any) { } catch (error: any) {
toastHelper.error(error.message); console.error(error);
toastHelper.error(error.response.data.message);
} }
if (editorStateService.getState().editMemoId === memo.id) { if (editorStateService.getState().editMemoId === memo.id) {
@ -125,7 +126,7 @@ const Memo: React.FC<Props> = (props: Props) => {
if (memoTemp) { if (memoTemp) {
showMemoCardDialog(memoTemp); showMemoCardDialog(memoTemp);
} else { } else {
toastHelper.error("MEMO Not Found"); toastHelper.error("Memo Not Found");
targetEl.classList.remove("memo-link-text"); targetEl.classList.remove("memo-link-text");
} }
} else if (targetEl.className === "tag-span") { } else if (targetEl.className === "tag-span") {

2
web/src/components/MemoCardDialog.tsx
Unescape Escape View File

@ -87,7 +87,7 @@ const MemoCardDialog: React.FC<Props> = (props: Props) => {
setLinkedMemos([]); setLinkedMemos([]);
setMemo(nextMemo); setMemo(nextMemo);
} else { } else {
toastHelper.error("MEMO Not Found"); toastHelper.error("Memo Not Found");
targetEl.classList.remove("memo-link-text"); targetEl.classList.remove("memo-link-text");
} }
} }

6
web/src/components/MemoEditor.tsx
Unescape Escape View File

@ -119,7 +119,8 @@ const MemoEditor: React.FC<Props> = () => {
const url = `/h/r/${image.id}/${image.filename}`; const url = `/h/r/${image.id}/${image.filename}`;
return url; return url;
} catch (error: any) { } catch (error: any) {
toastHelper.error("Failed to upload image\n" + JSON.stringify(error, null, 4)); console.error(error);
toastHelper.error(error.response.data.message);
} finally { } finally {
setState({ setState({
...state, ...state,
@ -155,7 +156,8 @@ const MemoEditor: React.FC<Props> = () => {
locationService.clearQuery(); locationService.clearQuery();
} }
} catch (error: any) { } catch (error: any) {
toastHelper.error(error.message); console.error(error);
toastHelper.error(error.response.data.message);
} }
setState({ setState({

5
web/src/components/MemoList.tsx
Unescape Escape View File

@ -84,8 +84,9 @@ const MemoList: React.FC<Props> = () => {
.then(() => { .then(() => {
setFetchStatus(false); setFetchStatus(false);
}) })
.catch(() => { .catch((error) => {
toastHelper.error("😭 Fetching failed, please try again later."); console.error(error);
toastHelper.error(error.response.data.message);
}); });
}, []); }, []);

3
web/src/components/MenuBtnsPopup.tsx
Unescape Escape View File

@ -42,7 +42,8 @@ const MenuBtnsPopup: React.FC<Props> = (props: Props) => {
toastHelper.info(JSON.stringify(profile, null, 4)); toastHelper.info(JSON.stringify(profile, null, 4));
}) })
.catch((error) => { .catch((error) => {
toastHelper.error("Failed to ping\n" + JSON.stringify(error, null, 4)); console.error(error);
toastHelper.error(error.response.data.message);
}); });
}; };

6
web/src/components/ResourcesDialog.tsx
Unescape Escape View File

@ -29,7 +29,8 @@ const ResourcesDialog: React.FC<Props> = (props: Props) => {
useEffect(() => { useEffect(() => {
fetchResources() fetchResources()
.catch((error) => { .catch((error) => {
toastHelper.error("Failed to fetch archived memos: ", error); console.error(error);
toastHelper.error(error.response.data.message);
}) })
.finally(() => { .finally(() => {
loadingState.setFinish(); loadingState.setFinish();
@ -67,7 +68,8 @@ const ResourcesDialog: React.FC<Props> = (props: Props) => {
try { try {
await resourceService.upload(file); await resourceService.upload(file);
} catch (error: any) { } catch (error: any) {
toastHelper.error("Failed to upload resource\n" + JSON.stringify(error, null, 4)); console.error(error);
toastHelper.error(error.response.data.message);
} finally { } finally {
setState({ setState({
...state, ...state,

3
web/src/components/Settings/MemberSection.tsx
Unescape Escape View File

@ -64,7 +64,8 @@ const PreferencesSection: React.FC<Props> = () => {
try { try {
await api.createUser(userCreate); await api.createUser(userCreate);
} catch (error: any) { } catch (error: any) {
toastHelper.error(error.message); console.error(error);
toastHelper.error(error.response.data.message);
} }
await fetchUserList(); await fetchUserList();
setState({ setState({

3
web/src/components/Settings/MyAccountSection.tsx
Unescape Escape View File

@ -46,7 +46,8 @@ const MyAccountSection: React.FC<Props> = () => {
}); });
toastHelper.info("Username changed"); toastHelper.info("Username changed");
} catch (error: any) { } catch (error: any) {
toastHelper.error(error.message); console.error(error);
toastHelper.error(error.response.data.message);
} }
}; };

8
web/src/components/ShareMemoImageDialog.tsx
Unescape Escape View File

@ -56,10 +56,10 @@ const ShareMemoImageDialog: React.FC<Props> = (props: Props) => {
destroy(); destroy();
}; };
const handleImageOnLoad = (ev: React.SyntheticEvent<HTMLImageElement>) => { const handleImageOnLoad = (event: React.SyntheticEvent<HTMLImageElement>) => {
if (ev.type === "error") { if (event.type === "error") {
toastHelper.error("😟 Image load failed"); toastHelper.error("Image load failed");
(ev.target as HTMLImageElement).remove(); (event.target as HTMLImageElement).remove();
} }
setImgAmount(imgAmount - 1); setImgAmount(imgAmount - 1);
}; };

3
web/src/components/ShortcutList.tsx
Unescape Escape View File

@ -78,7 +78,8 @@ const ShortcutContainer: React.FC<ShortcutContainerProps> = (props: ShortcutCont
try { try {
await shortcutService.deleteShortcutById(shortcut.id); await shortcutService.deleteShortcutById(shortcut.id);
} catch (error: any) { } catch (error: any) {
toastHelper.error(error.message); console.error(error);
toastHelper.error(error.response.data.message);
} }
} else { } else {
toggleConfirmDeleteBtn(); toggleConfirmDeleteBtn();

10
web/src/pages/Auth.tsx
Unescape Escape View File

@ -11,7 +11,7 @@ import "../less/auth.less";
interface Props {} interface Props {}
const validateConfig: ValidatorConfig = { const validateConfig: ValidatorConfig = {
minLength: 6, minLength: 4,
maxLength: 24, maxLength: 24,
noSpace: true, noSpace: true,
noChinese: true, noChinese: true,
@ -71,11 +71,11 @@ const Auth: React.FC<Props> = () => {
if (user) { if (user) {
locationService.replaceHistory("/"); locationService.replaceHistory("/");
} else { } else {
toastHelper.error("😟 Login failed"); toastHelper.error("Login failed");
} }
} catch (error: any) { } catch (error: any) {
console.error(error); console.error(error);
toastHelper.error("😟 " + error.message); toastHelper.error(error.response.data.message);
} }
actionBtnLoadingState.setFinish(); actionBtnLoadingState.setFinish();
}; };
@ -104,11 +104,11 @@ const Auth: React.FC<Props> = () => {
if (user) { if (user) {
locationService.replaceHistory("/"); locationService.replaceHistory("/");
} else { } else {
toastHelper.error("😟 Signup failed"); toastHelper.error("Signup failed");
} }
} catch (error: any) { } catch (error: any) {
console.error(error); console.error(error);
toastHelper.error("😟 " + error.message); toastHelper.error(error.response.data.message);
} }
actionBtnLoadingState.setFinish(); actionBtnLoadingState.setFinish();
}; };

Write Preview
Loading…
Cancel
Save