yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-30 19:05:53 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,648 Commits 120 Branches 499 Tags
Commit Graph

282 Commits

Author SHA1 Message Date
Alexandre Bodin
cc9d23c3ac Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-04-07 20:24:39 +02:00
Long Nguyen
77e243f841 Refactor code convert GraphQL params to ORM conditions 
Signed-off-by: Long Nguyen <olragon@gmail.com>
 2020-03-31 16:01:39 +02:00
Long Nguyen
634592fb5b fix: GraphQL Aggregation Bookshelf where condition aren't applied to groupBy 
Signed-off-by: Long Nguyen <olragon@gmail.com>
 2020-03-31 16:01:39 +02:00
Alexandre Bodin
087920fb47 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-31 11:58:31 +02:00
Convly
67187c38f2 Rename _type to type and type to nonRequiredType 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-03-30 16:45:00 +02:00
Convly
1103d96500 Rename noRequired to nonRequired 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-03-30 16:45:00 +02:00
Convly
98b5b4a029 GraphQL Aggregation: Remove required marker when checking for number types (int/float) 
Signed-off-by: Convly <jean-sebastien.herbaux@epitech.eu>
 2020-03-30 16:45:00 +02:00
Alexandre Bodin
50df7365d6 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-30 12:04:04 +02:00
Long Nguyen
77a5160d1a
Implement Graphql Aggregation Feature for Bookshelf (#5605) 
* Implement Graphql Aggregation Feature for Bookshelf

Signed-off-by: Long Nguyen <olragon@gmail.com>

* Fix no-unused-vars

Signed-off-by: Long Nguyen <olragon@gmail.com>

* Fix code to use `model.get()` instead of internal structure

Signed-off-by: Long Nguyen <olragon@gmail.com>
 2020-03-27 10:40:29 +01:00
soupette
818927f7b5 Fix conflicts 
Signed-off-by: soupette <cyril.lpz@gmail.com>
 2020-03-23 14:33:17 +01:00
Kim, Harim
40ea493b26
Fix context issue in custom GraphQL query and mutation (#5532) 
* fix context issue in custom query and mutation

Signed-off-by: harimkims <harimkims@gmail.com>

* merge only state-related context

Signed-off-by: harimkims <harimkims@gmail.com>

* roll back the code, fix the test instead

Signed-off-by: harimkims <harimkims@gmail.com>
 2020-03-20 14:24:14 +01:00
Alexandre Bodin
ed2b973b99 Merge branch 'develop' into features/media-lib 2020-03-20 11:04:10 +01:00
Jelmer Visser
7f3be5eb04 Return newObj instead of original object 
Signed-off-by: Jelmer Visser <jelmer@weflycheap.nl>
 2020-03-20 09:27:05 +01:00
Jelmer Visser
4bda9f3104 Leave custom resolvers alone when diff 
Signed-off-by: Jelmer Visser <jelmer@weflycheap.nl>
 2020-03-20 09:27:05 +01:00
Alexandre Bodin
243085dae1 Merge branch 'develop' into features/media-lib 2020-03-13 15:40:11 +01:00
Pierre Noël
1227bfeba4 add possibility to set a relation "private" 
Signed-off-by: Pierre Noël <pierre.noel@strapi.io>
 2020-03-13 12:23:11 +01:00
Alexandre Bodin
7a8c865051 Merge branch 'develop' into features/media-lib 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-03-02 15:18:08 +01:00
Alexandre Bodin
04f6050ae1 Cleanup feedbacks 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-11 17:35:09 +01:00
Alexandre Bodin
628b2e54e6 Refactor graphql plugin structure 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:40 +01:00
Alexandre Bodin
76393d860b Clean Resolver buildShadowCRUD 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:40 +01:00
Alexandre Bodin
49f0fdad8c Refactor schema definition language utils 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:40 +01:00
Alexandre Bodin
f1cbc014da Cleanup old graphql code 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:39 +01:00
Alexandre Bodin
3ce852af61 User :: in policies prefix and update documentation accordingly 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:39 +01:00
Alexandre Bodin
04476e32a6 Cleanup graphql 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:39 +01:00
Alexandre Bodin
3f5f839b4c Build mutation and resolves in shadowCrud and then only build the missing ones 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:38 +01:00
Alexandre Bodin
7e6c23d0b7 Init cleanup graphql 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:38 +01:00
Alexandre Bodin
900cec28f4 Change mutaion definition for single types 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:37 +01:00
Alexandre Bodin
0285c7bd96 Add metadatas to resolvers to know where they are created 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:37 +01:00
Alexandre Bodin
0c6d39297f Add graphql tests for single-types 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:37 +01:00
Alexandre Bodin
dbca2ef5d9 Add ctb tests for single type relation diff 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:35 +01:00
Alexandre Bodin
c02625e438 Split graphql schema generator code 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:35 +01:00
Alexandre Bodin
44b7ab6858 Add some basic testing on new functions 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:35 +01:00
Alexandre Bodin
023bda1f9e Generate single query for single type and update core api service 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:34 +01:00
Alexandre Bodin
f20f609324 Clean aggregation schema 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:10 +01:00
Alexandre Bodin
e4a028f664 More refactoring 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:10 +01:00
Alexandre Bodin
2cbaecaa4d use mergeSchemas fucntion to keep code cleaner 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:09 +01:00
Alexandre Bodin
b06e6d5c93 Refactor graphql plugin 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:38:09 +01:00
Alexandre Bodin
0b59bd61f6 Refactor policy util and error handling 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-02-10 21:37:16 +01:00
Alexandre Bodin
6c738dd7c9 Clone response too to avoid inconsistencies in muti query responses 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
 2020-01-27 23:12:15 +01:00
Alexandre Bodin
36d662fc79 Create a webhook model to perist them outside of the core_store 2019-12-23 16:38:42 +01:00
Alexandre BODIN
ae98466076
Merge pull request #4698 from strapi/dynamic-zone/graphql-model-uid 
graphql use model uid
 2019-12-11 15:27:01 +01:00
Alexandre Bodin
a503c20353 Cleanup strapi-utils 2019-12-11 10:22:47 +01:00
Alexandre Bodin
b5cceb8760 Cleanup graphql and use model uids 2019-12-10 17:24:55 +01:00
Alexandre Bodin
6f7197f87a Add Time and Date scalar to graphql plugin 2019-12-06 14:32:53 +01:00
Alexandre Bodin
29c06e10a3 Merge branch 'develop' into features/dynamic-zones 2019-12-06 12:35:35 +01:00
Alexandre Bodin
c66fe82c41 Handle time and date in mongo 2019-12-05 15:26:01 +01:00
Alexandre Bodin
7a3b64016c Hotfix mongo aggregate policy verifications 2019-11-28 18:33:02 +01:00
Alexandre Bodin
53d02ea443 Support empty dynamic zone 2019-11-28 17:34:27 +01:00
Alexandre Bodin
e4226344ee simplify code 2019-11-28 17:34:27 +01:00
Alexandre Bodin
db08e93cc7 Support dynamic zones in graphql 2019-11-28 17:34:26 +01:00