extern/bruno
1
0
Fork 1
mirror of https://github.com/usebruno/bruno.git synced 2024-11-24 17:03:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

Improve error for workspace deletion (#39)

Browse Source 
* Move dmg-license to optionalDependencies so it can be installed on windows
* Extend toastError to accept a default error message
* Throw BrunoError when in deleteWorkspace
* Handle errors with the toastError
* Use existing parseError for getting errorMsg in toastError
This commit is contained in:
Bram Hoven 2022-10-21 20:27:42 +02:00 committed by GitHub
parent 995c6b3fd0
commit ea3a9394c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/bruno-app/src/components/Workspaces/WorkspaceConfigurer/DeleteWorkspace/index.js
View File

@ -4,6 +4,7 @@ import Modal from 'components/Modal/index';
import { deleteWorkspace } from 'providers/ReduxStore/slices/workspaces/actions';
import { useDispatch } from 'react-redux';
import toast from 'react-hot-toast';
import { toastError } from 'utils/common/error';
import StyledWrapper from './StyledWrapper';
const DeleteWorkspace = ({ onClose, workspace }) => {
@ -14,7 +15,7 @@ const DeleteWorkspace = ({ onClose, workspace }) => {
toast.success('Workspace deleted!');
onClose();
})
.catch(() => toast.error('An error occured while deleting the workspace'));
.catch(toastError);
};
return (

3
packages/bruno-app/src/providers/ReduxStore/slices/workspaces/actions.js
View File

@ -5,6 +5,7 @@ import cloneDeep from 'lodash/cloneDeep';
import { workspaceSchema } from '@usebruno/schema';
import { findCollectionInWorkspace } from 'utils/workspaces';
import { getWorkspacesFromIdb, saveWorkspaceToIdb, deleteWorkspaceInIdb } from 'utils/idb/workspaces';
import { BrunoError } from 'utils/common/error';
import {
loadWorkspaces,
addWorkspace as _addWorkspace,
@ -110,7 +111,7 @@ export const deleteWorkspace = (workspaceUid) => (dispatch, getState) => {
return new Promise((resolve, reject) => {
if (state.workspaces.activeWorkspaceUid === workspaceUid) {
throw new Error('User cannot delete current workspace');
throw new BrunoError('Cannot delete current workspace');
}
const workspace = find(state.workspaces.workspaces, (w) => w.uid === workspaceUid);

14
packages/bruno-app/src/utils/common/error.js
View File

@ -9,26 +9,28 @@ export class BrunoError extends Error {
}
}
export const parseError = (error) => {
export const parseError = (error, defaultErrorMsg = 'An error occurred') => {
if (error instanceof BrunoError) {
return error.message;
}
return error.message ? error.message : 'An error occured';
return error.message ? error.message : defaultErrorMsg;
};
export const toastError = (error) => {
export const toastError = (error, defaultErrorMsg = 'An error occurred') => {
let errorMsg = parseError(error, defaultErrorMsg);
if (error instanceof BrunoError) {
if (error.level === 'warning') {
return toast(error.message, {
return toast(errorMsg, {
icon: '⚠️',
duration: 3000
});
}
return toast.error(error.message, {
return toast.error(errorMsg, {
duration: 3000
});
}
return toast.error(error.message || 'An error occured');
return toast.error(errorMsg);
};

4
packages/bruno-electron/package.json
View File

@ -15,7 +15,6 @@
"dependencies": {
"axios": "^0.26.0",
"chokidar": "^3.5.3",
"dmg-license": "^1.0.11",
"electron-is-dev": "^2.0.0",
"electron-store": "^8.1.0",
"electron-util": "^0.17.2",
@ -26,6 +25,9 @@
"nanoid": "3.3.4",
"yup": "^0.32.11"
},
"optionalDependencies": {
"dmg-license": "^1.0.11"
},
"devDependencies": {
"electron": "^21.1.1",
"electron-builder": "23.0.2",