From 11ba0bafaa1c51714e0f98c7456ee62d11f73add Mon Sep 17 00:00:00 2001 From: cleverbeagle Date: Mon, 31 Jul 2017 09:39:21 -0500 Subject: [PATCH] - Fix PropTypes warning on EditDocument.js when failing to pass a doc prop. - Improve 404 handling on EditDocument.js and ViewDocument.js when no doc prop is passed. --- imports/ui/pages/EditDocument/EditDocument.js | 6 +++++- imports/ui/pages/ViewDocument/ViewDocument.js | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/imports/ui/pages/EditDocument/EditDocument.js b/imports/ui/pages/EditDocument/EditDocument.js index c67c768..cfae309 100644 --- a/imports/ui/pages/EditDocument/EditDocument.js +++ b/imports/ui/pages/EditDocument/EditDocument.js @@ -13,8 +13,12 @@ const EditDocument = ({ doc, history }) => (doc ? ( ) : ); +EditDocument.defaultProps = { + doc: null, +}; + EditDocument.propTypes = { - doc: PropTypes.object.isRequired, + doc: PropTypes.object, history: PropTypes.object.isRequired, }; diff --git a/imports/ui/pages/ViewDocument/ViewDocument.js b/imports/ui/pages/ViewDocument/ViewDocument.js index 5cef34d..6c88608 100644 --- a/imports/ui/pages/ViewDocument/ViewDocument.js +++ b/imports/ui/pages/ViewDocument/ViewDocument.js @@ -44,7 +44,7 @@ const ViewDocument = ({ loading, doc, match, history }) => ( ViewDocument.propTypes = { loading: PropTypes.bool.isRequired, - doc: PropTypes.object.isRequired, + doc: PropTypes.object, match: PropTypes.object.isRequired, history: PropTypes.object.isRequired, }; @@ -55,6 +55,6 @@ export default createContainer(({ match }) => { return { loading: !subscription.ready(), - doc: Documents.findOne(documentId) || {}, + doc: Documents.findOne(documentId), }; }, ViewDocument);