allow querying a single post with only slug (consistency with withDocument), usersTotal resolvers takes care about terms, update react-apollo & apollo-client

This commit is contained in:
xavcz 2017-01-27 11:08:27 +01:00
parent 591476c4f4
commit 7fc0a352aa
3 changed files with 8 additions and 6 deletions

View file

@ -8,7 +8,7 @@
"lint": "eslint --cache --ext .jsx,js packages" "lint": "eslint --cache --ext .jsx,js packages"
}, },
"dependencies": { "dependencies": {
"apollo-client": "^0.7.3", "apollo-client": "^0.8.1",
"babel-runtime": "^6.18.0", "babel-runtime": "^6.18.0",
"bcrypt": "^0.8.7", "bcrypt": "^0.8.7",
"body-parser": "^1.15.2", "body-parser": "^1.15.2",
@ -44,7 +44,7 @@
"optics-agent": "^1.0.5", "optics-agent": "^1.0.5",
"react": "^15.4.1", "react": "^15.4.1",
"react-addons-pure-render-mixin": "^15.4.1", "react-addons-pure-render-mixin": "^15.4.1",
"react-apollo": "^0.8.1", "react-apollo": "^0.9.0",
"react-bootstrap": "^0.30.7", "react-bootstrap": "^0.30.7",
"react-bootstrap-datetimepicker": "0.0.22", "react-bootstrap-datetimepicker": "0.0.22",
"react-cookie": "^0.4.6", "react-cookie": "^0.4.6",

View file

@ -30,8 +30,9 @@ const resolvers = {
name: 'postsSingle', name: 'postsSingle',
resolver(root, {documentId}, context) { resolver(root, {documentId, slug}, context) {
const post = context.Posts.findOne({_id: documentId}); const selector = documentId ? {_id: documentId} : {'slug': slug};
const post = context.Posts.findOne({selector});
return context.Users.keepViewableFields(context.currentUser, context.Posts, post); return context.Users.keepViewableFields(context.currentUser, context.Posts, post);
}, },

View file

@ -50,8 +50,9 @@ const resolvers = {
name: 'usersTotal', name: 'usersTotal',
resolver(root, args, context) { resolver(root, {terms}, context) {
return context.Users.find().count(); const {selector} = context.Users.getParameters(terms);
return context.Users.find(selector).count();
}, },
} }