don't flash error page during post load

moflo · Aug 24, 2018 · ed3071a · ed3071a
1 parent 8e29b63
commit ed3071a
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/src/views/posts/Post.js b/src/views/posts/Post.js
@@ -18,14 +18,18 @@ const Post = ({match}) => (
       filter={['slug', '==', match.params.slug]}
     >
       { ({error, isLoading, data}) => {
-        if (error || data.length === 0) {
+        if (error) {
           return <Error error={error} />
         }
 
         if (isLoading) {
           return <p>loading...</p>
         }
 
+        if (!isLoading && data.length === 0) {
+          return <Error />
+        }
+
         const post = data[0]
 
         return <div>

diff --git a/src/views/posts/PostEdit.js b/src/views/posts/PostEdit.js
@@ -16,13 +16,17 @@ const PostEdit = ({match, history}) => (
       filter={['slug', '==', match.params.slug]}
     >
       { ({error, isLoading, data}) => {
-        if (error || data.length === 0) {
+        if (error) {
           return <Error error={error} />
         }
 
         if (isLoading) {
           return <p>loading...</p>
         }
+
+        if (!isLoading && data.length === 0) {
+          return <Error />
+        }
 
         const post = data[0]
 
@@ -31,13 +35,13 @@ const PostEdit = ({match, history}) => (
             return updatePost(post.id, values)
               .then(() => history.push(`/${post.slug}`))
           }} />
-          or
+          <br />
           <button onClick={() => {
             if (window.confirm(`Are you sure you want to delete this post?`)) {
               deletePost(post)
                 .then( () => history.push(`/`))
             }
-          }}>delete post</button>
+          }}>Delete post</button>
         </div>
       }}
     </FirestoreCollection>

diff --git a/src/views/posts/Posts.js b/src/views/posts/Posts.js
@@ -27,7 +27,7 @@ const Posts = () => (
           return <p>loading...</p>
         }
 
-        if (data.length === 0) {
+        if (!isLoading && data.length === 0) {
           return <p>No posts yet!</p>
         }