f.weber/homebrewery
0
0
Fork 0
mirror of https://github.com/naturalcrit/homebrewery.git synced 2026-01-07 20:42:44 +00:00
Code Wiki Activity

fix notitle search and catch 404?

Browse Source
This commit is contained in:
Víctor Losada Hernández
2024-02-15 17:22:20 +01:00
parent fd6109099a
commit 01e3cd0296
2 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
client/homebrew/pages/archivePage/archivePage.jsx
View File

@@ -100,8 +100,8 @@ const ArchivePage = createClass({
if(update === true) { if(update === true) {
this.updateStateWithForm(); this.updateStateWithForm();
}; };
if (title !== '') {
try { try {
this.setState({ searching: true, error: null }); this.setState({ searching: true, error: null });
const title = encodeURIComponent(this.state.title); const title = encodeURIComponent(this.state.title);
@@ -117,6 +117,12 @@ const ArchivePage = createClass({
this.setState({ error: `${error.response.status}` }) this.setState({ error: `${error.response.status}` })
this.updateStateWithBrews([], 1, 1, 0); this.updateStateWithBrews([], 1, 1, 0);
} }
console.log(!this.state.brewCollection || brewCollection.length === 0);
if(!this.state.brewCollection) {
this.setState({ error: '404'});
}
}
}, },
renderNavItems : function () { renderNavItems : function () {
@@ -253,8 +259,16 @@ const ArchivePage = createClass({
); );
}; };
if(title === '') {return (<div className='foundBrews noBrews'><h3>Whenever you want, just start typing...</h3></div>);}
if(title === '') {return (<div className='foundBrews noBrews'><h3>Whenever you want, just start typing...</h3></div>);}
if (!brewCollection || brewCollection.length === 0) {
return (
<div className='foundBrews noBrews'>
<h3>No brews found</h3>
</div>
);
};
if (error) { if (error) {
console.log('render Error: ', error); console.log('render Error: ', error);
let errorMessage; let errorMessage;
@@ -277,13 +291,7 @@ const ArchivePage = createClass({
); );
}; };
if (!brewCollection || brewCollection.length === 0) {
return (
<div className='foundBrews noBrews'>
<h3>No brews found</h3>
</div>
);
};
return ( return (
<div className='foundBrews'> <div className='foundBrews'>

6
server/archive.api.js
View File

@@ -41,7 +41,7 @@ const archive = {
.maxTimeMS(5000) .maxTimeMS(5000)
.exec(); .exec();
const totalBrews = await HomebrewModel.countDocuments(titleQuery, projection); const totalBrews = await HomebrewModel.countDocuments(titleQuery, projection).maxTimeMS(5000);
const totalPages = Math.ceil(totalBrews / pageSize); const totalPages = Math.ceil(totalBrews / pageSize);
//console.log('Total brews: ', totalBrews); //console.log('Total brews: ', totalBrews);
@@ -49,10 +49,6 @@ const archive = {
return res.json({ brews, page, totalPages, totalBrews}); return res.json({ brews, page, totalPages, totalBrews});
} catch (error) { } catch (error) {
console.error(error); console.error(error);
console.log(error);
if (error.response && error.response.status === 404) {
return res.status(404).json({ errorCode: '404', message: 'Brews not found' });
}
if (error.response && error.response.status === 503) { if (error.response && error.response.status === 503) {
return res.status(503).json({ errorCode: '503', message: 'Service Unavailable' }); return res.status(503).json({ errorCode: '503', message: 'Service Unavailable' });
} else { } else {