Skip to content

Commit a5555d3

Browse files
authored
fix(ra-data-graphql-simple): Unify meta location in buildVariables
1 parent c301a14 commit a5555d3

File tree

2 files changed

+37
-22
lines changed

2 files changed

+37
-22
lines changed

packages/ra-data-graphql-simple/src/buildVariables.test.ts

Lines changed: 35 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ describe('buildVariables', () => {
1919
},
2020
],
2121
};
22+
2223
describe('GET_LIST', () => {
2324
it('returns correct variables', () => {
2425
const params = {
@@ -55,8 +56,8 @@ describe('buildVariables', () => {
5556

5657
it('should return correct meta', () => {
5758
const params = {
58-
filter: {},
59-
meta: { sparseFields: [] },
59+
filter: { views: 100 },
60+
meta: { sparseFields: ['field'] },
6061
};
6162

6263
expect(
@@ -67,8 +68,8 @@ describe('buildVariables', () => {
6768
{}
6869
)
6970
).toEqual({
70-
filter: {},
71-
meta: { sparseFields: [] },
71+
filter: { views: 100 },
72+
meta: { sparseFields: ['field'] },
7273
});
7374
});
7475
});
@@ -99,11 +100,11 @@ describe('buildVariables', () => {
99100
title: 'Foo',
100101
});
101102
});
103+
102104
it('should return correct meta', () => {
103105
const params = {
104-
data: {
105-
meta: { sparseFields: [] },
106-
},
106+
data: { title: 'Foo' },
107+
meta: { sparseFields: ['field'] },
107108
};
108109
const queryType = {
109110
args: [],
@@ -117,7 +118,8 @@ describe('buildVariables', () => {
117118
queryType
118119
)
119120
).toEqual({
120-
meta: { sparseFields: [] },
121+
title: 'Foo',
122+
meta: { sparseFields: ['field'] },
121123
});
122124
});
123125
});
@@ -153,9 +155,9 @@ describe('buildVariables', () => {
153155

154156
it('should return correct meta', () => {
155157
const params = {
156-
data: {
157-
meta: { sparseFields: [] },
158-
},
158+
id: 'post1',
159+
data: { title: 'Foo' },
160+
meta: { sparseFields: ['field'] },
159161
};
160162
const queryType = {
161163
args: [],
@@ -169,7 +171,9 @@ describe('buildVariables', () => {
169171
queryType
170172
)
171173
).toEqual({
172-
meta: { sparseFields: [] },
174+
id: 'post1',
175+
title: 'Foo',
176+
meta: { sparseFields: ['field'] },
173177
});
174178
});
175179
});
@@ -194,7 +198,8 @@ describe('buildVariables', () => {
194198

195199
it('should return correct meta', () => {
196200
const params = {
197-
meta: { sparseFields: [] },
201+
ids: ['tag1'],
202+
meta: { sparseFields: ['field'] },
198203
};
199204

200205
expect(
@@ -205,8 +210,10 @@ describe('buildVariables', () => {
205210
{}
206211
)
207212
).toEqual({
208-
filter: {},
209-
meta: { sparseFields: [] },
213+
filter: {
214+
ids: ['tag1'],
215+
},
216+
meta: { sparseFields: ['field'] },
210217
});
211218
});
212219
});
@@ -238,7 +245,9 @@ describe('buildVariables', () => {
238245

239246
it('should return correct meta', () => {
240247
const params = {
241-
meta: { sparseFields: [] },
248+
target: 'author_id',
249+
id: 'author1',
250+
meta: { sparseFields: ['field'] },
242251
};
243252

244253
expect(
@@ -249,8 +258,8 @@ describe('buildVariables', () => {
249258
{}
250259
)
251260
).toEqual({
252-
filter: {},
253-
meta: { sparseFields: [] },
261+
filter: { author_id: 'author1' },
262+
meta: { sparseFields: ['field'] },
254263
});
255264
});
256265
});
@@ -260,6 +269,7 @@ describe('buildVariables', () => {
260269
const params = {
261270
id: 'post1',
262271
};
272+
263273
expect(
264274
buildVariables(introspectionResult)(
265275
{ type: { name: 'Post', inputFields: [] } },
@@ -274,8 +284,10 @@ describe('buildVariables', () => {
274284

275285
it('should return correct meta', () => {
276286
const params = {
277-
meta: { sparseFields: [] },
287+
id: 'post1',
288+
meta: { sparseFields: ['field'] },
278289
};
290+
279291
expect(
280292
buildVariables(introspectionResult)(
281293
{ type: { name: 'Post', inputFields: [] } },
@@ -284,7 +296,8 @@ describe('buildVariables', () => {
284296
{}
285297
)
286298
).toEqual({
287-
meta: { sparseFields: [] },
299+
id: 'post1',
300+
meta: { sparseFields: ['field'] },
288301
});
289302
});
290303
});
@@ -294,6 +307,7 @@ describe('buildVariables', () => {
294307
const params = {
295308
ids: ['post1'],
296309
};
310+
297311
expect(
298312
buildVariables(introspectionResult)(
299313
{ type: { name: 'Post', inputFields: [] } },
@@ -315,6 +329,7 @@ describe('buildVariables', () => {
315329
title: 'New Title',
316330
},
317331
};
332+
318333
expect(
319334
buildVariables(introspectionResult)(
320335
{ type: { name: 'Post', inputFields: [] } },

packages/ra-data-graphql-simple/src/buildVariables.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,7 @@ const buildGetListVariables =
326326
const buildCreateUpdateVariables = (
327327
resource: IntrospectedResource,
328328
raFetchMethod,
329-
{ id, data }: any,
329+
{ id, data, meta }: any,
330330
queryType: IntrospectionField
331331
) =>
332332
Object.keys(data).reduce(
@@ -358,5 +358,5 @@ const buildCreateUpdateVariables = (
358358
[key]: data[key],
359359
};
360360
},
361-
{ id }
361+
{ id, meta }
362362
);

0 commit comments

Comments
 (0)