first try at making PostsListContainer a HoC

packages/nova-base-components/lib/posts/PostsHome.jsx

@@ -4,7 +4,7 @@ import Posts from "meteor/nova:posts";
 
 const PostsHome = (props, context) => {
   const terms = props.location && props.location.query;
-  return <Telescope.components.PostsListContainer terms={terms} component={Telescope.components.PostsList} />
+  return <Telescope.components.PostsList terms={terms}/>
 };
 
 PostsHome.displayName = "PostsHome";

packages/nova-base-components/lib/posts/PostsList.jsx

@@ -1,9 +1,12 @@
 import Telescope from 'meteor/nova:lib';
 import React from 'react';
+import { withPostsList } from 'meteor/nova:base-containers';
 
-const PostsList = ({results, currentUser, hasMore, ready, count, totalCount, loadMore, showHeader = true}) => {
+const PostsList = (props) => {
 
-  if (!!results.length) {
+  const {results, terms, hasMore, loading, count, totalCount, loadMore, showHeader = true} = props
+
+  if (results && results.length) {
     return (
       <div className="posts-list">
         {showHeader ? <Telescope.components.PostsListHeader/> : null}
@@ -13,16 +16,15 @@ const PostsList = ({results, currentUser, hasMore, ready, count, totalCount, loa
         {hasMore ? (ready ? <Telescope.components.PostsLoadMore loadMore={loadMore} count={count} totalCount={totalCount} /> : <Telescope.components.PostsLoading/>) : <Telescope.components.PostsNoMore/>}
       </div>
     )
-  // note: we're handling the "loading" case in the container now
-  // } else if (!ready) {
-  //   return (
-  //     <div className="posts-list">
-  //       {showHeader ? <Telescope.components.PostsListHeader /> : null}
-  //       <div className="posts-list-content">
-  //         <Telescope.components.PostsLoading/>
-  //       </div>
-  //     </div>
-  //   )
+  } else if (loading) {
+    return (
+      <div className="posts-list">
+        {showHeader ? <Telescope.components.PostsListHeader /> : null}
+        <div className="posts-list-content">
+          <Telescope.components.PostsLoading/>
+        </div>
+      </div>
+    )
   } else {
     return (
       <div className="posts-list">
@@ -38,4 +40,8 @@ const PostsList = ({results, currentUser, hasMore, ready, count, totalCount, loa
 
 PostsList.displayName = "PostsList";
 
-module.exports = PostsList;
+PostsList.propTypes = {
+
+};
+
+module.exports = withPostsList({})(PostsList);

packages/nova-base-containers/lib/client.js

@@ -1 +1,4 @@
 import './containers.js';
+import withPostsList from './postslist.js';
+
+export {withPostsList}

packages/nova-base-containers/lib/postslist.js

@@ -0,0 +1,63 @@
+import Telescope from 'meteor/nova:lib';
+import React, { PropTypes, Component } from 'react';
+import Posts from "meteor/nova:posts";
+
+import { graphql } from 'react-apollo';
+import gql from 'graphql-tag';
+
+export default function withPostsList(params){
+  return graphql(gql`
+    query getPostsView($terms: Terms, $offset: Int, $limit: Int) {
+      postsViewTotal(terms: $terms)
+      posts(terms: $terms, offset: $offset, limit: $limit) {
+        ${Posts.graphQLQueries.list}
+      }
+    }
+  `, {
+    options(ownProps) {
+      
+      // two ways of passing terms: via the wrapping call, or via
+      // the component calling the wrapped component
+      const finalProps = {...params, ...ownProps};
+
+      // console.log(params)
+      // console.log(ownProps)
+      // console.log(finalProps)
+
+      return {
+        variables: { 
+          terms: finalProps.terms,
+          offset: 0,
+          limit: 10
+        },
+        // pollInterval: 20000,
+      };
+    },
+    props(props) {
+
+      const {data: {loading, posts, postsViewTotal, fetchMore}} = props;
+
+      return {
+        loading,
+        results: posts,
+        totalCount: postsViewTotal,
+        count: posts && posts.length,
+        loadMore() {
+          // basically, rerun the query 'getPostsView' with a new offset
+          return fetchMore({
+            variables: { offset: posts.length },
+            updateQuery(previousResults, { fetchMoreResult }) {
+              // no more post to fetch
+              if (!fetchMoreResult.data) {
+                return previousResults;
+              }
+              // return the previous results "augmented" with more
+              return {...previousResults, posts: [...previousResults.posts, ...fetchMoreResult.data.posts]};
+            },
+          });
+        },
+        ...props.ownProps // pass on the props down to the wrapped component
+      };
+    },
+  })
+}

packages/nova-base-containers/lib/server.js

@@ -1 +1,4 @@
 import './containers.js';
+import withPostsList from './postslist.js';
+
+export {withPostsList}