mirror of
https://github.com/frappe/books.git
synced 2024-11-10 07:40:55 +00:00
refactor: shift error stuff to errorHandling.js
- log errors on calling handleErrorWithDialog
This commit is contained in:
parent
f8c76603d2
commit
9e25b89765
@ -35,8 +35,9 @@ import { ipcRenderer } from 'electron';
|
||||
import config from '@/config';
|
||||
import { IPC_MESSAGES, IPC_ACTIONS } from '@/messages';
|
||||
import { connectToLocalDatabase, purgeCache } from '@/initialization';
|
||||
import { routeTo, showErrorDialog } from './utils';
|
||||
import { routeTo } from './utils';
|
||||
import fs from 'fs/promises';
|
||||
import { showErrorDialog } from './errorHandling';
|
||||
|
||||
export default {
|
||||
name: 'App',
|
||||
|
@ -33,8 +33,8 @@
|
||||
</template>
|
||||
<script>
|
||||
import FormControl from './FormControl';
|
||||
import { getErrorMessage } from '../../utils';
|
||||
import Row from '@/components/Row';
|
||||
import { getErrorMessage } from '../../errorHandling';
|
||||
|
||||
export default {
|
||||
name: 'TableRow',
|
||||
|
@ -93,7 +93,7 @@
|
||||
import frappe from 'frappe';
|
||||
import FormControl from '@/components/Controls/FormControl';
|
||||
import Button from '@/components/Button';
|
||||
import { getErrorMessage, handleErrorWithDialog } from '@/utils';
|
||||
import { handleErrorWithDialog, getErrorMessage } from '../errorHandling';
|
||||
|
||||
let TwoColumnForm = {
|
||||
name: 'TwoColumnForm',
|
||||
|
@ -1,5 +1,8 @@
|
||||
import { ipcRenderer } from 'electron';
|
||||
import frappe from 'frappejs';
|
||||
import { MandatoryError, ValidationError } from 'frappejs/common/errors';
|
||||
import { IPC_ACTIONS } from './messages';
|
||||
import { showMessageDialog } from './utils';
|
||||
|
||||
function shouldNotStore(error) {
|
||||
return [MandatoryError, ValidationError].some(
|
||||
@ -23,6 +26,41 @@ export function handleError(shouldLog, error, more = {}) {
|
||||
// Do something cool
|
||||
}
|
||||
|
||||
export function getErrorMessage(e, doc) {
|
||||
let errorMessage = e.message || _('An error occurred.');
|
||||
const { doctype, name } = doc;
|
||||
const canElaborate = doctype && name;
|
||||
if (e.type === frappe.errors.LinkValidationError && canElaborate) {
|
||||
errorMessage = _('{0} {1} is linked with existing records.', [
|
||||
doctype,
|
||||
name,
|
||||
]);
|
||||
} else if (e.type === frappe.errors.DuplicateEntryError && canElaborate) {
|
||||
errorMessage = _('{0} {1} already exists.', [doctype, name]);
|
||||
}
|
||||
return errorMessage;
|
||||
}
|
||||
|
||||
export function handleErrorWithDialog(error, doc = {}) {
|
||||
let errorMessage = getErrorMessage(error, doc);
|
||||
handleError(false, error, { errorMessage, doc });
|
||||
|
||||
showMessageDialog({ message: errorMessage });
|
||||
throw error;
|
||||
}
|
||||
|
||||
export async function showErrorDialog({ title, content }) {
|
||||
// To be used for show stopper errors
|
||||
title ??= frappe._('Error');
|
||||
content ??= frappe._(
|
||||
'Something has gone terribly wrong. Please check the console and raise an issue.'
|
||||
);
|
||||
|
||||
await ipcRenderer.invoke(IPC_ACTIONS.SHOW_ERROR, { title, content });
|
||||
}
|
||||
|
||||
// Wrapper Functions
|
||||
|
||||
export function getErrorHandled(func) {
|
||||
return async function errorHandled(...args) {
|
||||
try {
|
||||
|
@ -12,10 +12,18 @@
|
||||
<div class="flex-1" v-if="root">
|
||||
<template v-for="account in allAccounts">
|
||||
<div
|
||||
class="mt-2 px-4 py-2 cursor-pointer hover:bg-gray-100 rounded-md group"
|
||||
class="
|
||||
mt-2
|
||||
px-4
|
||||
py-2
|
||||
cursor-pointer
|
||||
hover:bg-gray-100
|
||||
rounded-md
|
||||
group
|
||||
"
|
||||
:class="[
|
||||
account.level !== 0 ? 'text-base' : 'text-lg',
|
||||
isQuickEditOpen(account) ? 'bg-gray-200' : ''
|
||||
isQuickEditOpen(account) ? 'bg-gray-200' : '',
|
||||
]"
|
||||
:key="account.name"
|
||||
@click="onClick(account)"
|
||||
@ -34,13 +42,22 @@
|
||||
class="ml-6 hidden group-hover:block"
|
||||
>
|
||||
<button
|
||||
class="text-xs text-gray-800 hover:text-gray-900 focus:outline-none"
|
||||
class="
|
||||
text-xs text-gray-800
|
||||
hover:text-gray-900
|
||||
focus:outline-none
|
||||
"
|
||||
@click.stop="addAccount(account, 'addingAccount')"
|
||||
>
|
||||
{{ t('Add Account') }}
|
||||
</button>
|
||||
<button
|
||||
class="ml-3 text-xs text-gray-800 hover:text-gray-900 focus:outline-none"
|
||||
class="
|
||||
ml-3
|
||||
text-xs text-gray-800
|
||||
hover:text-gray-900
|
||||
focus:outline-none
|
||||
"
|
||||
@click.stop="addAccount(account, 'addingGroupAccount')"
|
||||
>
|
||||
{{ t('Add Group') }}
|
||||
@ -51,7 +68,15 @@
|
||||
</div>
|
||||
<div
|
||||
v-if="account.addingAccount || account.addingGroupAccount"
|
||||
class="mt-2 px-4 py-2 cursor-pointer hover:bg-gray-100 rounded-md group"
|
||||
class="
|
||||
mt-2
|
||||
px-4
|
||||
py-2
|
||||
cursor-pointer
|
||||
hover:bg-gray-100
|
||||
rounded-md
|
||||
group
|
||||
"
|
||||
:class="[account.level !== 0 ? 'text-base' : 'text-lg']"
|
||||
:key="account.name + '-adding-account'"
|
||||
>
|
||||
@ -71,7 +96,7 @@
|
||||
:ref="account.name"
|
||||
@keydown.esc="cancelAddingAccount(account)"
|
||||
@keydown.enter="
|
||||
e =>
|
||||
(e) =>
|
||||
createNewAccount(
|
||||
e.target.value,
|
||||
account,
|
||||
@ -83,7 +108,12 @@
|
||||
/>
|
||||
<button
|
||||
v-if="!insertingAccount"
|
||||
class="ml-4 text-xs text-gray-800 hover:text-gray-900 focus:outline-none"
|
||||
class="
|
||||
ml-4
|
||||
text-xs text-gray-800
|
||||
hover:text-gray-900
|
||||
focus:outline-none
|
||||
"
|
||||
@click="cancelAddingAccount(account)"
|
||||
>
|
||||
{{ t('Cancel') }}
|
||||
@ -101,19 +131,20 @@
|
||||
import frappe from 'frappe';
|
||||
import PageHeader from '@/components/PageHeader';
|
||||
import SearchBar from '@/components/SearchBar';
|
||||
import { openQuickEdit, handleErrorWithDialog } from '@/utils';
|
||||
import { openQuickEdit } from '@/utils';
|
||||
import { handleErrorWithDialog } from '../errorHandling';
|
||||
|
||||
export default {
|
||||
components: {
|
||||
PageHeader,
|
||||
SearchBar
|
||||
SearchBar,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
root: null,
|
||||
accounts: [],
|
||||
doctype: 'Account',
|
||||
insertingAccount: false
|
||||
insertingAccount: false,
|
||||
};
|
||||
},
|
||||
mounted() {
|
||||
@ -130,7 +161,7 @@ export default {
|
||||
this.root = {
|
||||
label: await this.settings.getRootLabel(),
|
||||
balance: 0,
|
||||
currency
|
||||
currency,
|
||||
};
|
||||
this.accounts = await this.getChildren();
|
||||
},
|
||||
@ -138,7 +169,7 @@ export default {
|
||||
if (account.isGroup === 0) {
|
||||
openQuickEdit({
|
||||
doctype: 'Account',
|
||||
name: account.name
|
||||
name: account.name,
|
||||
});
|
||||
} else {
|
||||
this.toggleChildren(account);
|
||||
@ -180,7 +211,7 @@ export default {
|
||||
<path d="M7.332 11.36l4.666-3.734 2 1.6V.666A.667.667 0 0013.332 0h-12a.667.667 0 00-.667.667v14.666c0 .369.298.667.667.667h6v-4.64zm-4-7.36H11.3v1.333H3.332V4zm2.666 8H3.332v-1.333h2.666V12zM3.332 8.667V7.333h5.333v1.334H3.332z" fill="#415668"/>
|
||||
<path d="M15.332 12l-3.334-2.667L8.665 12v3.333c0 .369.298.667.667.667h2v-2h1.333v2h2a.667.667 0 00.667-.667V12z" fill="#A1ABB4"/>
|
||||
</g>
|
||||
</svg>`
|
||||
</svg>`,
|
||||
};
|
||||
|
||||
let leaf = `<svg class="w-2 h-2" viewBox="0 0 8 8" xmlns="http://www.w3.org/2000/svg">
|
||||
@ -194,7 +225,7 @@ export default {
|
||||
let icon = account.isGroup ? folder : leaf;
|
||||
|
||||
let c = {
|
||||
template: icons[account.name] || icon
|
||||
template: icons[account.name] || icon,
|
||||
};
|
||||
|
||||
return c;
|
||||
@ -203,7 +234,7 @@ export default {
|
||||
const children = await frappe.db.getAll({
|
||||
doctype: this.doctype,
|
||||
filters: {
|
||||
parentAccount: parent
|
||||
parentAccount: parent,
|
||||
},
|
||||
fields: [
|
||||
'name',
|
||||
@ -211,13 +242,13 @@ export default {
|
||||
'isGroup',
|
||||
'balance',
|
||||
'rootType',
|
||||
'accountType'
|
||||
'accountType',
|
||||
],
|
||||
orderBy: 'name',
|
||||
order: 'asc'
|
||||
order: 'asc',
|
||||
});
|
||||
|
||||
return children.map(d => {
|
||||
return children.map((d) => {
|
||||
d.expanded = 0;
|
||||
d.addingAccount = 0;
|
||||
d.addingGroupAccount = 0;
|
||||
@ -260,7 +291,7 @@ export default {
|
||||
parentAccount: name,
|
||||
rootType,
|
||||
accountType,
|
||||
isGroup
|
||||
isGroup,
|
||||
});
|
||||
await account.insert();
|
||||
|
||||
@ -275,7 +306,7 @@ export default {
|
||||
// open quick edit
|
||||
openQuickEdit({
|
||||
doctype: 'Account',
|
||||
name: account.name
|
||||
name: account.name,
|
||||
});
|
||||
// unfreeze input
|
||||
this.insertingAccount = false;
|
||||
@ -291,7 +322,7 @@ export default {
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
},
|
||||
},
|
||||
computed: {
|
||||
allAccounts() {
|
||||
@ -308,7 +339,7 @@ export default {
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
||||
|
@ -159,7 +159,7 @@ import { ipcRenderer } from 'electron';
|
||||
import { DB_CONN_FAILURE, IPC_ACTIONS } from '../messages';
|
||||
|
||||
import { createNewDatabase, connectToLocalDatabase } from '@/initialization';
|
||||
import { showErrorDialog } from '../utils';
|
||||
import { showErrorDialog } from '../errorHandling';
|
||||
|
||||
export default {
|
||||
name: 'DatabaseSelector',
|
||||
|
@ -197,12 +197,12 @@ import DropdownWithActions from '@/components/DropdownWithActions';
|
||||
import BackLink from '@/components/BackLink';
|
||||
import {
|
||||
openSettings,
|
||||
handleErrorWithDialog,
|
||||
getActionsForDocument,
|
||||
getInvoiceStatus,
|
||||
showMessageDialog,
|
||||
routeTo
|
||||
routeTo,
|
||||
} from '@/utils';
|
||||
import { handleErrorWithDialog } from '../errorHandling';
|
||||
|
||||
export default {
|
||||
name: 'InvoiceForm',
|
||||
@ -286,7 +286,7 @@ export default {
|
||||
return this.doc.insertOrUpdate().catch(this.handleError);
|
||||
},
|
||||
onSubmitClick() {
|
||||
let message =
|
||||
let message =
|
||||
this.doctype === 'SalesInvoice'
|
||||
? this.t('Are you sure you want to submit this Invoice?')
|
||||
: this.t('Are you sure you want to submit this Bill?');
|
||||
|
@ -124,11 +124,11 @@ import FormControl from '@/components/Controls/FormControl';
|
||||
import BackLink from '@/components/BackLink';
|
||||
import StatusBadge from '@/components/StatusBadge';
|
||||
import {
|
||||
handleErrorWithDialog,
|
||||
showMessageDialog,
|
||||
getActionsForDocument,
|
||||
routeTo,
|
||||
} from '@/utils';
|
||||
import { handleErrorWithDialog } from '../errorHandling';
|
||||
|
||||
export default {
|
||||
name: 'JournalEntryForm',
|
||||
|
@ -87,7 +87,6 @@ import DropdownWithActions from '@/components/DropdownWithActions';
|
||||
import {
|
||||
openQuickEdit,
|
||||
getActionsForDocument,
|
||||
handleErrorWithDialog,
|
||||
} from '@/utils';
|
||||
|
||||
export default {
|
||||
|
@ -52,7 +52,9 @@
|
||||
<TwoColumnForm :fields="fields" :doc="doc" />
|
||||
</div>
|
||||
<div class="flex justify-between px-8 mt-5 window-no-drag">
|
||||
<Button class="text-sm text-grey-900" @click="$emit('setup-canceled')">Cancel</Button>
|
||||
<Button class="text-sm text-grey-900" @click="$emit('setup-canceled')"
|
||||
>Cancel</Button
|
||||
>
|
||||
<Button
|
||||
@click="submit"
|
||||
type="primary"
|
||||
@ -75,12 +77,12 @@ import config from '@/config';
|
||||
import path from 'path';
|
||||
import fs from 'fs';
|
||||
import { purgeCache, connectToLocalDatabase } from '@/initialization';
|
||||
import { showMessageDialog } from '@/utils';
|
||||
import {
|
||||
getErrorMessage,
|
||||
handleErrorWithDialog,
|
||||
showMessageDialog,
|
||||
getErrorMessage,
|
||||
showErrorDialog,
|
||||
} from '@/utils';
|
||||
} from '../../errorHandling';
|
||||
|
||||
export default {
|
||||
name: 'SetupWizard',
|
||||
|
32
src/utils.js
32
src/utils.js
@ -6,6 +6,7 @@ import frappe from 'frappe';
|
||||
import { isPesa, t } from 'frappe/utils';
|
||||
import lodash from 'lodash';
|
||||
import Vue from 'vue';
|
||||
import { handleErrorWithDialog } from './errorHandling';
|
||||
import { IPC_ACTIONS, IPC_MESSAGES } from './messages';
|
||||
|
||||
export async function showMessageDialog({
|
||||
@ -30,16 +31,6 @@ export async function showMessageDialog({
|
||||
}
|
||||
}
|
||||
|
||||
export async function showErrorDialog({ title, content }) {
|
||||
// To be used for show stopper errors
|
||||
title = title ?? 'Error';
|
||||
content =
|
||||
content ??
|
||||
'Something has gone terribly wrong. Please check the console and raise an issue.';
|
||||
|
||||
await ipcRenderer.invoke(IPC_ACTIONS.SHOW_ERROR, { title, content });
|
||||
}
|
||||
|
||||
export function deleteDocWithPrompt(doc) {
|
||||
return new Promise((resolve) => {
|
||||
showMessageDialog({
|
||||
@ -151,27 +142,6 @@ export function openQuickEdit({ doctype, name, hideFields, defaults = {} }) {
|
||||
});
|
||||
}
|
||||
|
||||
export function getErrorMessage(e, doc) {
|
||||
let errorMessage = e.message || t('An error occurred.');
|
||||
const { doctype, name } = doc;
|
||||
const canElaborate = doctype && name;
|
||||
if (e.type === frappe.errors.LinkValidationError && canElaborate) {
|
||||
errorMessage = t('{0} {1} is linked with existing records.', [
|
||||
doctype,
|
||||
name,
|
||||
]);
|
||||
} else if (e.type === frappe.errors.DuplicateEntryError && canElaborate) {
|
||||
errorMessage = t('{0} {1} already exists.', [doctype, name]);
|
||||
}
|
||||
return errorMessage;
|
||||
}
|
||||
|
||||
export function handleErrorWithDialog(e, doc) {
|
||||
let errorMessage = getErrorMessage(e, doc);
|
||||
showMessageDialog({ message: errorMessage });
|
||||
throw e;
|
||||
}
|
||||
|
||||
export async function makePDF(html, savePath) {
|
||||
await ipcRenderer.invoke(IPC_ACTIONS.SAVE_HTML_AS_PDF, html, savePath);
|
||||
showExportInFolder(frappe.t('Save as PDF Successful'), savePath);
|
||||
|
Loading…
Reference in New Issue
Block a user