Elgato_dark/ToolJet
1
0
Fork 0
mirror of https://github.com/ToolJet/ToolJet synced 2026-05-23 08:58:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

added conditional checks for toast error messages (#10165)

Browse source
This commit is contained in:
Rudhra Deep Biswas 2024-06-25 12:53:52 +05:30 committed by GitHub
parent 707dbcb606
commit bf32784ccc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 43 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
frontend/src/HomePage/Folders.jsx
View file

@ -138,7 +138,13 @@ export const Folders = function Folders({
handleFolderChange({});
})
.catch(({ error }) => {
toast.error(error);
let errorMessage = 'Some Error Occured';
if (error?.error) {
errorMessage = error.error;
} else if (error?.message) {
errorMessage = error.message;
}
toast.error(errorMessage);
setShowDeleteConfirmation(false);
setDeletionStatus(false);
});

34
frontend/src/HomePage/HomePage.jsx
View file

@ -239,7 +239,13 @@ class HomePageComponent extends React.Component {
};
event.target.value = null;
} catch (error) {
toast.error(error.message);
let errorMessage = 'Some Error Occured';
if (error?.error) {
errorMessage = error.error;
} else if (error?.message) {
errorMessage = error.message;
}
toast.error(errorMessage);
}
};
@ -272,7 +278,7 @@ class HomePageComponent extends React.Component {
if (error.statusCode === 409) {
return false;
}
toast.error(error?.error || 'App import failed');
toast.error(error?.error || error?.message || 'App import failed');
}
};
@ -429,7 +435,13 @@ class HomePageComponent extends React.Component {
})
.catch(({ error }) => {
this.setState({ appOperations: { ...appOperations, isAdding: false } });
toast.error(error);
let errorMessage = 'Some Error Occured';
if (error?.error) {
errorMessage = error.error;
} else if (error?.message) {
errorMessage = error.message;
}
toast.error(errorMessage);
});
};
@ -449,7 +461,13 @@ class HomePageComponent extends React.Component {
this.fetchFolders();
})
.catch(({ error }) => {
toast.error(error);
let errorMessage = 'Some Error Occured';
if (error?.error) {
errorMessage = error.error;
} else if (error?.message) {
errorMessage = error.message;
}
toast.error(errorMessage);
})
.finally(() => {
this.setState({
@ -535,7 +553,13 @@ class HomePageComponent extends React.Component {
})
.catch(({ error }) => {
this.setState({ appOperations: { ...appOperations, isAdding: false } });
toast.error(error);
let errorMessage = 'Some Error Occured';
if (error?.error) {
errorMessage = error.error;
} else if (error?.message) {
errorMessage = error.message;
}
toast.error(errorMessage);
});
};

8
frontend/src/_components/AppModal.jsx
View file

@ -90,7 +90,13 @@ export function AppModal({
closeModal();
}
} catch (error) {
toast.error(e.error, {
let errorMessage = 'Some Error Occured';
if (error?.error) {
errorMessage = error.error;
} else if (error?.message) {
errorMessage = error.message;
}
toast.error(errorMessage, {
position: 'top-center',
});
}