Skip to content

Commit e25814e

Browse files
fix: cascade graphql locales through relationships (#6166)
1 parent 27ea117 commit e25814e

File tree

13 files changed

+1377
-204
lines changed

13 files changed

+1377
-204
lines changed

.vscode/launch.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,6 +58,13 @@
5858
"PAYLOAD_PUBLIC_CLOUD_STORAGE_ADAPTER": "s3"
5959
}
6060
},
61+
{
62+
"command": "node --no-deprecation test/dev.js collections-graphql",
63+
"cwd": "${workspaceFolder}",
64+
"name": "Run Dev GraphQL",
65+
"request": "launch",
66+
"type": "node-terminal"
67+
},
6168
{
6269
"command": "node --no-deprecation test/dev.js fields",
6370
"cwd": "${workspaceFolder}",

packages/graphql/src/resolvers/collections/count.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ export default function countResolver(collection: Collection): Resolver {
2828
req = isolateObjectProperty(req, 'fallbackLocale')
2929
req.locale = args.locale || locale
3030
req.fallbackLocale = fallbackLocale
31+
context.req = req
3132

3233
const options = {
3334
collection,

packages/graphql/src/resolvers/collections/delete.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ export default function getDeleteResolver<TSlug extends keyof GeneratedTypes['co
2929
req = isolateObjectProperty(req, 'fallbackLocale')
3030
req.locale = args.locale || locale
3131
req.fallbackLocale = args.fallbackLocale || fallbackLocale
32+
context.req = req
3233

3334
const options = {
3435
id: args.id,

packages/graphql/src/resolvers/collections/duplicate.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ export default function duplicateResolver<T extends keyof GeneratedTypes['collec
2929
const fallbackLocale = req.fallbackLocale
3030
req.locale = args.locale || locale
3131
req.fallbackLocale = args.fallbackLocale || fallbackLocale
32+
context.req = req
3233

3334
const options = {
3435
id: args.id,

packages/graphql/src/resolvers/collections/find.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ export default function findResolver(collection: Collection): Resolver {
3434
req = isolateObjectProperty(req, 'fallbackLocale')
3535
req.locale = args.locale || locale
3636
req.fallbackLocale = args.fallbackLocale || fallbackLocale
37+
context.req = req
3738

3839
const options = {
3940
collection,

packages/graphql/src/resolvers/collections/findByID.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ export default function findByIDResolver<T extends keyof GeneratedTypes['collect
3131
req = isolateObjectProperty(req, 'fallbackLocale')
3232
req.locale = args.locale || locale
3333
req.fallbackLocale = args.fallbackLocale || fallbackLocale
34+
context.req = req
3435

3536
const options = {
3637
id: args.id,

packages/graphql/src/resolvers/collections/findVersionByID.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ export default function findVersionByIDResolver(collection: Collection): Resolve
2929
req = isolateObjectProperty(req, 'fallbackLocale')
3030
req.locale = args.locale || locale
3131
req.fallbackLocale = args.fallbackLocale || fallbackLocale
32+
context.req = req
3233

3334
const options = {
3435
id: args.id,

packages/graphql/src/resolvers/collections/findVersions.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ export default function findVersionsResolver(collection: Collection): Resolver {
3131
req = isolateObjectProperty(req, 'fallbackLocale')
3232
req.locale = args.locale || locale
3333
req.fallbackLocale = args.fallbackLocale || fallbackLocale
34+
context.req = req
3435

3536
const options = {
3637
collection,

packages/graphql/src/resolvers/collections/update.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ export default function updateResolver<TSlug extends keyof GeneratedTypes['colle
3232
req = isolateObjectProperty(req, 'fallbackLocale')
3333
req.locale = args.locale || locale
3434
req.fallbackLocale = args.fallbackLocale || fallbackLocale
35+
context.req = req
3536

3637
const options = {
3738
id: args.id,

test/collections-graphql/config.ts

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,10 @@ export const pointSlug = 'point'
3636
export const errorOnHookSlug = 'error-on-hooks'
3737

3838
export default buildConfigWithDefaults({
39+
localization: {
40+
defaultLocale: 'en',
41+
locales: ['en', 'es'],
42+
},
3943
collections: [
4044
{
4145
access: openAccess,
@@ -333,6 +337,22 @@ export default buildConfigWithDefaults({
333337
],
334338
slug: 'content-type',
335339
},
340+
{
341+
slug: 'cyclical-relationship',
342+
access: openAccess,
343+
fields: [
344+
{
345+
name: 'title',
346+
type: 'text',
347+
localized: true,
348+
},
349+
{
350+
name: 'relationToSelf',
351+
type: 'relationship',
352+
relationTo: 'cyclical-relationship',
353+
},
354+
],
355+
},
336356
],
337357
graphQL: {
338358
queries: (GraphQL) => {

0 commit comments

Comments
 (0)