Aurelsicoko
4320614721
Merge branch 'master' of github.com:strapi/strapi into issue/2228
2018-11-20 16:31:26 +01:00
Aurelsicoko
a30c7844a9
Generate generic dataloader for manyToMany relationships
2018-11-19 16:58:16 +01:00
Kamal Bennani
511ca55461
fix 1st level deep filter
2018-11-19 00:10:48 +01:00
Kamal Bennani
85eeb4aef2
Fix wrong rebase
2018-11-18 23:57:03 +01:00
Jim LAURIE
19ec6242f9
Merge branch 'master' into feature/allow-filtering-on-a-relation-attribute
2018-11-16 17:38:27 +01:00
Aurelsicoko
e28b69092d
Use primaryKey to associate correct related entry in manyToOne association
2018-11-15 17:47:17 +01:00
Jim LAURIE
8fcf2ed8ae
3.0.0-alpha.14.5
2018-11-13 14:50:07 +01:00
Jim LAURIE
08ababab42
Fix lint
2018-11-10 11:37:02 +01:00
Jim LAURIE
5188d70d91
Merge branch 'master' into fix-graphql-many-to-many-relations
2018-11-09 12:07:52 +01:00
Jim LAURIE
163f7e6533
Fix lint
2018-11-07 16:19:31 +01:00
Nick Verwymeren
87d41103a4
merged in master
2018-11-06 13:12:26 -06:00
Nick Verwymeren
7991f06294
Merge branch 'master' into fix-graphql-many-to-many-relations
2018-11-06 13:03:07 -06:00
Jim LAURIE
b8d8f7a297
Merge branch 'master' into fix/2213
2018-11-05 17:28:56 +01:00
Jim LAURIE
b739155fdd
Merge branch 'master' into patch-1
2018-11-05 17:22:59 +01:00
cyril lopez
377da271e4
Fix lint from master
2018-11-05 11:31:36 +01:00
Jim LAURIE
e4b1d3c1d6
Merge branch 'master' into patch-2
2018-11-01 17:39:47 +01:00
Nick Verwymeren
0034ebae41
Update index.js
...
changed the glob as per @maturanomx comment
2018-11-01 10:12:46 -05:00
aissa-bouguern
cbf877074d
GraphQL many-to-many relations symmetry
...
Querying content types that share many-to-many relations do not return expected results.
Let's say we have a product content type and a category centent type. those two models share many-to-many relation, and when we are querying categories we have the expected result, Ex :
Query :
{
categories {
Name
products {
Name
}
}
}
Result :
{
"data": {
"categories": [
{
"Name": "Category 1",
"products": [
{
"Name": "Product 1"
}
]
},
{
"Name": "Category 2",
"products": [
{
"Name": "Product 1"
}
]
}
]
}
}
But when we're querying products, the categories array is empty!!
Query:
{
products {
Name
categories {
Name
}
}
}
Result:
{
"data": {
"products": [
{
"Name": "Product 1",
"categories": [ ]
}
]
}
}
categories should not be empty, it should be something like that :
...
"categories": [
{
"Name": "Category 1"
},
{
"Name": "Category 2"
}
]
....
I hope that was clear.
2018-10-29 22:36:39 +00:00
Kamal Bennani
15a41614fa
Don't populate relations in Graphql context
2018-10-28 23:42:22 +01:00
Kamal Bennani
9862705f8f
fix rebase issue
2018-10-28 23:42:21 +01:00
Kamal Bennani
2d1cf3591e
Split convertParams to multiple stage steps
2018-10-28 23:42:20 +01:00
Kamal Bennani
a84b640994
Make converQuery works also with array values
2018-10-28 23:42:20 +01:00
Kamal Bennani
382f52a2e8
Convert GraphQL params to one level-deep object
2018-10-28 23:42:19 +01:00
Nick Verwymeren
513558c8e9
Update GraphQL.js
2018-10-25 13:48:28 -05:00
Jim LAURIE
01a2442e7d
3.0.0-alpha.14.4.0
2018-10-25 17:18:26 +02:00
Jim LAURIE
379331f822
3.0.0-alpha.14.4
2018-10-25 16:41:07 +02:00
Nick Verwymeren
dc7f06194f
Allow the use of .graphql or .graphql.js
...
Previously schema files could only end in .graphql files. This caused a problem with IDE's since these files are actually javascript files. This pull request should also detect ```.graphql.js``` files while keeping backward compatibility with the ```.graphql``` extension.
2018-10-18 10:01:29 -05:00
Jim LAURIE
4ced536eaf
Remove logs Graphql
2018-10-18 14:33:08 +02:00
Ben Weller
1249909c46
re-add support for JSON graphql types
2018-10-12 13:29:18 -05:00
Jim LAURIE
87c3af3d1e
3.0.0-alpha.14.3
2018-10-08 17:14:19 +02:00
Jim LAURIE
46c9b0f966
3.0.0-alpha.14.2
2018-09-26 11:08:10 +02:00
Jim LAURIE
86dea3279f
Merge branch 'master' into fixFilePermissions
2018-09-24 20:13:31 +02:00
Alberto Maturano
154fc28a57
Normalize to standar file permissions
...
As a result of taking a look on PR #1967 I realized there is 819
executable files in this repository. It is obvious this is an error.
2018-09-24 12:33:09 -05:00
Jason Lei
9cb5b08db1
Updated package deps.
2018-09-17 16:31:45 +08:00
Jason Lei
a3bdd9b3fb
Merge branch 'master' into graphql/mutations-aggregations-decimals
2018-09-15 19:53:48 +08:00
Jim LAURIE
4d8ace2db7
3.0.0-alpha.14.1.1
2018-09-13 18:39:37 +02:00
Jim LAURIE
67112e92cd
Merge branch 'master' into graphql/mutations-aggregations-decimals
2018-09-13 15:00:02 +02:00
Jim LAURIE
f10335d717
3.0.0-alpha.14.1
2018-09-12 12:41:11 +02:00
Jason Lei
3378403954
GraphQL Mutations, Aggregations, Decimals
...
Merging Mutations and Aggregations. Fixed Mongoose Hook to use Decimals (2 decimal places) and Floats (20 decimal places).
2018-09-10 16:05:00 +08:00
Nick Verwymeren
bd840d709e
Change comparison operator for array of id's
...
When there's an array of ID's present it looks like the Content Manager uses the '=' comparison which ends up returning an empty set. I think maybe the issue lies with the Content Manager plugin in that it should be using a 'IN' comparison if it detects an array. This is a workaround that seems to fix the issue. Although I'll be honest, I don't have enough knowledge of this plugin or the system to know if this will work for all edge cases.
2018-08-28 14:30:05 -04:00
Jim LAURIE
cecef7385f
3.0.0-alpha.14
2018-08-27 16:30:16 +02:00
soupette
8003982b08
Fix conflicts
2018-08-22 14:17:09 +02:00
Jim LAURIE
4bf88f8792
Merge branch 'master' into feature/graphql-aggregation
2018-08-21 10:36:09 +02:00
Jim LAURIE
d4341797a0
Merge branch 'master' into fix-relation
2018-08-20 16:32:13 +02:00
Jim LAURIE
b4d97fb9db
3.0.0-alpha.13.1
2018-08-09 13:39:34 +02:00
Jakub Skořepa
b7edcffff8
Fix the fix
...
It turns out that in some situations it actually is only the id instead of object (nested queries).
2018-08-08 00:05:33 +02:00
Jakub Skořepa
3645cc15f4
Fix one to many relation querying in the other direction
2018-08-07 14:42:33 +02:00
Aurelsicoko
120f515e5e
Better design many-to-many and add jump link
2018-07-31 16:57:16 +02:00
Kamal Bennani
c729b8381f
send method doesn't get copied when using object.assign
2018-07-29 15:01:54 +02:00
Kamal Bennani
0514521707
Make sure that the aggregation queries are only generated for models that uses Mongoose as ORM
2018-07-29 13:24:20 +02:00