From c6e4c38de837120e54961b8069b726411c7637b0 Mon Sep 17 00:00:00 2001 From: roschaefer Date: Tue, 12 Nov 2019 19:17:52 +0100 Subject: [PATCH 1/5] build(deps): remove deprecated debug flags I deprecated the debug flags myself here: https://github.com/neo4j-graphql/neo4j-graphql-js/pull/288 You can now debug the queries run by `neo4j-graphql-js` by starting the backend like this: ```bash DEBUG=neo4j-graphql-js yarn run backend ``` --- backend/package.json | 2 +- backend/src/schema/resolvers/badges.js | 2 +- backend/src/schema/resolvers/posts.js | 6 +++--- backend/src/schema/resolvers/users.js | 2 +- backend/yarn.lock | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/backend/package.json b/backend/package.json index 699dc9972..a313bdc00 100644 --- a/backend/package.json +++ b/backend/package.json @@ -83,7 +83,7 @@ "minimatch": "^3.0.4", "mustache": "^3.1.0", "neo4j-driver": "~1.7.6", - "neo4j-graphql-js": "^2.8.0", + "neo4j-graphql-js": "^2.9.0", "neode": "^0.3.3", "node-fetch": "~2.6.0", "nodemailer": "^6.3.1", diff --git a/backend/src/schema/resolvers/badges.js b/backend/src/schema/resolvers/badges.js index 19bc24fd6..d10d6b482 100644 --- a/backend/src/schema/resolvers/badges.js +++ b/backend/src/schema/resolvers/badges.js @@ -3,7 +3,7 @@ import { neo4jgraphql } from 'neo4j-graphql-js' export default { Query: { Badge: async (object, args, context, resolveInfo) => { - return neo4jgraphql(object, args, context, resolveInfo, false) + return neo4jgraphql(object, args, context, resolveInfo) }, }, } diff --git a/backend/src/schema/resolvers/posts.js b/backend/src/schema/resolvers/posts.js index c6b36fe9d..0f2fd8e78 100644 --- a/backend/src/schema/resolvers/posts.js +++ b/backend/src/schema/resolvers/posts.js @@ -43,15 +43,15 @@ export default { Post: async (object, params, context, resolveInfo) => { params = await filterForBlockedUsers(params, context) params = await maintainPinnedPosts(params) - return neo4jgraphql(object, params, context, resolveInfo, false) + return neo4jgraphql(object, params, context, resolveInfo) }, findPosts: async (object, params, context, resolveInfo) => { params = await filterForBlockedUsers(params, context) - return neo4jgraphql(object, params, context, resolveInfo, false) + return neo4jgraphql(object, params, context, resolveInfo) }, profilePagePosts: async (object, params, context, resolveInfo) => { params = await filterForBlockedUsers(params, context) - return neo4jgraphql(object, params, context, resolveInfo, false) + return neo4jgraphql(object, params, context, resolveInfo) }, PostsEmotionsCountByEmotion: async (object, params, context, resolveInfo) => { const session = context.driver.session() diff --git a/backend/src/schema/resolvers/users.js b/backend/src/schema/resolvers/users.js index b86e134be..e93c983c0 100644 --- a/backend/src/schema/resolvers/users.js +++ b/backend/src/schema/resolvers/users.js @@ -54,7 +54,7 @@ export default { user = await user.toJson() return [user.node] } - return neo4jgraphql(object, args, context, resolveInfo, false) + return neo4jgraphql(object, args, context, resolveInfo) }, }, Mutation: { diff --git a/backend/yarn.lock b/backend/yarn.lock index 7dc7c6503..b0510c7d9 100644 --- a/backend/yarn.lock +++ b/backend/yarn.lock @@ -6070,10 +6070,10 @@ neo4j-driver@^1.7.3, neo4j-driver@^1.7.5, neo4j-driver@~1.7.6: text-encoding-utf-8 "^1.0.2" uri-js "^4.2.2" -neo4j-graphql-js@^2.8.0: - version "2.8.0" - resolved "https://registry.yarnpkg.com/neo4j-graphql-js/-/neo4j-graphql-js-2.8.0.tgz#58035b9213656e17b6ed4c6cbf4dfe1c56a8a219" - integrity sha512-nDuzmi6W/YGIIVm+GAXCr/8CLABsU/RfeLebLH32vqeKViFATMfm4eT66aOq/GwHJ0838+o20yCbIFdx5rTP/A== +neo4j-graphql-js@^2.9.0: + version "2.9.0" + resolved "https://registry.yarnpkg.com/neo4j-graphql-js/-/neo4j-graphql-js-2.9.0.tgz#b214a0546479565cb5b812fb7e602f2136d36a0d" + integrity sha512-vpOUPwx7Xwn2EZoe0i9z+AMJ4uwZeUjWDGiR4ZAR6ebNd5BaYpiC9SihYOZlS3hVXHZxADQfpGhz9dx++lZwlg== dependencies: "@babel/runtime" "^7.5.5" "@babel/runtime-corejs2" "^7.5.5" From aad6234be4bba81bdab13aa1426c85eda1ee420d Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Tue, 12 Nov 2019 21:12:57 +0100 Subject: [PATCH 2/5] Add script to debug neo4j-graphl-js @roschaefer, I needed to push a commit to trigger the build again, do you like this? --- backend/package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/backend/package.json b/backend/package.json index a313bdc00..3ea346fc3 100644 --- a/backend/package.json +++ b/backend/package.json @@ -7,6 +7,7 @@ "build": "babel src/ -d dist/ --copy-files", "start": "node dist/", "dev": "nodemon --exec babel-node src/ -e js,gql", + "debug": "DEBUG=neo4j-graphql-js yarn dev", "dev:debug": "nodemon --exec babel-node --inspect=0.0.0.0:9229 src/index.js -e js,gql", "lint": "eslint src --config .eslintrc.js", "test": "jest --forceExit --detectOpenHandles --runInBand", From 985e23c5b480a22878f033f0558805ff1d313a81 Mon Sep 17 00:00:00 2001 From: roschaefer Date: Thu, 14 Nov 2019 13:12:29 +0100 Subject: [PATCH 3/5] Remove obsolete script in package.json @mattwr18 nope, I would not create a script to debug neo4j-graphql-js. If you use environment variables, please also use `cross-env`. --- backend/package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/backend/package.json b/backend/package.json index 3ea346fc3..a313bdc00 100644 --- a/backend/package.json +++ b/backend/package.json @@ -7,7 +7,6 @@ "build": "babel src/ -d dist/ --copy-files", "start": "node dist/", "dev": "nodemon --exec babel-node src/ -e js,gql", - "debug": "DEBUG=neo4j-graphql-js yarn dev", "dev:debug": "nodemon --exec babel-node --inspect=0.0.0.0:9229 src/index.js -e js,gql", "lint": "eslint src --config .eslintrc.js", "test": "jest --forceExit --detectOpenHandles --runInBand", From 28e1ff9f551d69dc94b4eeeb1b46231d45a2c703 Mon Sep 17 00:00:00 2001 From: roschaefer Date: Thu, 14 Nov 2019 23:08:33 +0100 Subject: [PATCH 4/5] Write documentation for neo4j-graphql-js --- SUMMARY.md | 1 + backend/neo4j-graphql-js.md | 16 ++++++++++++++++ 2 files changed, 17 insertions(+) create mode 100644 backend/neo4j-graphql-js.md diff --git a/SUMMARY.md b/SUMMARY.md index 11c4b0293..f3ed9d515 100644 --- a/SUMMARY.md +++ b/SUMMARY.md @@ -6,6 +6,7 @@ * [Neo4J](neo4j/README.md) * [Backend](backend/README.md) * [GraphQL](backend/graphql.md) + * [neo4j-graphql-js](backend/neo4j-graphql-js.md) * [Webapp](webapp/README.md) * [Components](webapp/components.md) * [HTML](webapp/html.md) diff --git a/backend/neo4j-graphql-js.md b/backend/neo4j-graphql-js.md new file mode 100644 index 000000000..8e1305ee5 --- /dev/null +++ b/backend/neo4j-graphql-js.md @@ -0,0 +1,16 @@ +# neo4j-graphql.js + +We use an npm package called `neo4j-graphql-js` as a cypher query builder. This +library also generates resolvers for graphql queries, unless we implement it +ourselves. + + +## Debugging + +As you can see in their [documentation](https://github.com/neo4j-graphql/neo4j-graphql-js) +it is possible to log out the generated cypher statements. To do so, run the +backend like this: + +```sh +DEBUG=neo4j-graphql-js yarn run dev +``` From 58f48781a22238523348d493d1abce209f34fde4 Mon Sep 17 00:00:00 2001 From: mattwr18 Date: Thu, 14 Nov 2019 23:53:31 +0100 Subject: [PATCH 5/5] Fix incorrect pronoun in docs --- backend/neo4j-graphql-js.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/neo4j-graphql-js.md b/backend/neo4j-graphql-js.md index 8e1305ee5..280942acd 100644 --- a/backend/neo4j-graphql-js.md +++ b/backend/neo4j-graphql-js.md @@ -1,7 +1,7 @@ # neo4j-graphql.js We use an npm package called `neo4j-graphql-js` as a cypher query builder. This -library also generates resolvers for graphql queries, unless we implement it +library also generates resolvers for graphql queries, unless we implement them ourselves.