Skip to content

Allow to unset file from graphql #6651

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 30, 2020
Merged

Allow to unset file from graphql #6651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 23 additions & 0 deletions spec/ParseGraphQLServer.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9522,6 +9522,29 @@ describe('ParseGraphQLServer', () => {

expect(res.status).toEqual(200);
expect(await res.text()).toEqual('My File Content');

const mutationResult = await apolloClient.mutate({
mutation: gql`
mutation UnlinkFile($id: ID!) {
updateSomeClass(
input: { id: $id, fields: { someField: { file: null } } }
) {
someClass {
someField {
name
url
}
}
}
}
`,
variables: {
id: result2.data.createSomeClass3.someClass.id,
},
});
expect(
mutationResult.data.updateSomeClass.someClass.someField
).toEqual(null);
} catch (e) {
handleError(e);
}
Expand Down
82 changes: 44 additions & 38 deletions src/GraphQL/loaders/defaultGraphQLTypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,15 @@ class TypeValidationError extends Error {
}
}

const parseStringValue = value => {
const parseStringValue = (value) => {
if (typeof value === 'string') {
return value;
}

throw new TypeValidationError(value, 'String');
};

const parseIntValue = value => {
const parseIntValue = (value) => {
if (typeof value === 'string') {
const int = Number(value);
if (Number.isInteger(int)) {
Expand All @@ -42,7 +42,7 @@ const parseIntValue = value => {
throw new TypeValidationError(value, 'Int');
};

const parseFloatValue = value => {
const parseFloatValue = (value) => {
if (typeof value === 'string') {
const float = Number(value);
if (!isNaN(float)) {
Expand All @@ -53,15 +53,15 @@ const parseFloatValue = value => {
throw new TypeValidationError(value, 'Float');
};

const parseBooleanValue = value => {
const parseBooleanValue = (value) => {
if (typeof value === 'boolean') {
return value;
}

throw new TypeValidationError(value, 'Boolean');
};

const parseValue = value => {
const parseValue = (value) => {
switch (value.kind) {
case Kind.STRING:
return parseStringValue(value.value);
Expand All @@ -86,15 +86,15 @@ const parseValue = value => {
}
};

const parseListValues = values => {
const parseListValues = (values) => {
if (Array.isArray(values)) {
return values.map(value => parseValue(value));
return values.map((value) => parseValue(value));
}

throw new TypeValidationError(values, 'List');
};

const parseObjectFields = fields => {
const parseObjectFields = (fields) => {
if (Array.isArray(fields)) {
return fields.reduce(
(object, field) => ({
Expand All @@ -112,9 +112,9 @@ const ANY = new GraphQLScalarType({
name: 'Any',
description:
'The Any scalar type is used in operations and types that involve any type of value.',
parseValue: value => value,
serialize: value => value,
parseLiteral: ast => parseValue(ast),
parseValue: (value) => value,
serialize: (value) => value,
parseLiteral: (ast) => parseValue(ast),
});

const OBJECT = new GraphQLScalarType({
Expand Down Expand Up @@ -144,7 +144,7 @@ const OBJECT = new GraphQLScalarType({
},
});

const parseDateIsoValue = value => {
const parseDateIsoValue = (value) => {
if (typeof value === 'string') {
const date = new Date(value);
if (!isNaN(date)) {
Expand All @@ -157,7 +157,7 @@ const parseDateIsoValue = value => {
throw new TypeValidationError(value, 'Date');
};

const serializeDateIso = value => {
const serializeDateIso = (value) => {
if (typeof value === 'string') {
return value;
}
Expand All @@ -168,7 +168,7 @@ const serializeDateIso = value => {
throw new TypeValidationError(value, 'Date');
};

const parseDateIsoLiteral = ast => {
const parseDateIsoLiteral = (ast) => {
if (ast.kind === Kind.STRING) {
return parseDateIsoValue(ast.value);
}
Expand Down Expand Up @@ -219,8 +219,8 @@ const DATE = new GraphQLScalarType({
iso: parseDateIsoLiteral(ast),
};
} else if (ast.kind === Kind.OBJECT) {
const __type = ast.fields.find(field => field.name.value === '__type');
const iso = ast.fields.find(field => field.name.value === 'iso');
const __type = ast.fields.find((field) => field.name.value === '__type');
const iso = ast.fields.find((field) => field.name.value === 'iso');
if (__type && __type.value && __type.value.value === 'Date' && iso) {
return {
__type: __type.value.value,
Expand Down Expand Up @@ -273,8 +273,8 @@ const BYTES = new GraphQLScalarType({
base64: ast.value,
};
} else if (ast.kind === Kind.OBJECT) {
const __type = ast.fields.find(field => field.name.value === '__type');
const base64 = ast.fields.find(field => field.name.value === 'base64');
const __type = ast.fields.find((field) => field.name.value === '__type');
const base64 = ast.fields.find((field) => field.name.value === 'base64');
if (
__type &&
__type.value &&
Expand All @@ -294,7 +294,7 @@ const BYTES = new GraphQLScalarType({
},
});

const parseFileValue = value => {
const parseFileValue = (value) => {
if (typeof value === 'string') {
return {
__type: 'File',
Expand All @@ -317,7 +317,7 @@ const FILE = new GraphQLScalarType({
description:
'The File scalar type is used in operations and types that involve files.',
parseValue: parseFileValue,
serialize: value => {
serialize: (value) => {
if (typeof value === 'string') {
return value;
} else if (
Expand All @@ -335,9 +335,9 @@ const FILE = new GraphQLScalarType({
if (ast.kind === Kind.STRING) {
return parseFileValue(ast.value);
} else if (ast.kind === Kind.OBJECT) {
const __type = ast.fields.find(field => field.name.value === '__type');
const name = ast.fields.find(field => field.name.value === 'name');
const url = ast.fields.find(field => field.name.value === 'url');
const __type = ast.fields.find((field) => field.name.value === '__type');
const name = ast.fields.find((field) => field.name.value === 'name');
const url = ast.fields.find((field) => field.name.value === 'url');
if (__type && __type.value && name && name.value) {
return parseFileValue({
__type: __type.value.value,
Expand Down Expand Up @@ -371,13 +371,19 @@ const FILE_INPUT = new GraphQLInputObjectType({
name: 'FileInput',
fields: {
file: {
description: 'A File Scalar can be an url or a FileInfo object.',
description:
'A File Scalar can be an url or a FileInfo object. If this field is set to null the file will be unlinked.',
type: FILE,
},
upload: {
description: 'Use this field if you want to create a new file.',
type: GraphQLUpload,
},
unlink: {
description:
'Use this field if you want to unlink the file (the file will not be deleted on cloud storage)',
type: GraphQLBoolean,
},
},
});

Expand Down Expand Up @@ -551,7 +557,7 @@ const ACL = new GraphQLObjectType({
type: new GraphQLList(new GraphQLNonNull(USER_ACL)),
resolve(p) {
const users = [];
Object.keys(p).forEach(rule => {
Object.keys(p).forEach((rule) => {
if (rule !== '*' && rule.indexOf('role:') !== 0) {
users.push({
userId: toGlobalId('_User', rule),
Expand All @@ -568,7 +574,7 @@ const ACL = new GraphQLObjectType({
type: new GraphQLList(new GraphQLNonNull(ROLE_ACL)),
resolve(p) {
const roles = [];
Object.keys(p).forEach(rule => {
Object.keys(p).forEach((rule) => {
if (rule.indexOf('role:') === 0) {
roles.push({
roleName: rule.replace('role:', ''),
Expand Down Expand Up @@ -839,49 +845,49 @@ const GEO_INTERSECTS_INPUT = new GraphQLInputObjectType({
},
});

const equalTo = type => ({
const equalTo = (type) => ({
description:
'This is the equalTo operator to specify a constraint to select the objects where the value of a field equals to a specified value.',
type,
});

const notEqualTo = type => ({
const notEqualTo = (type) => ({
description:
'This is the notEqualTo operator to specify a constraint to select the objects where the value of a field do not equal to a specified value.',
type,
});

const lessThan = type => ({
const lessThan = (type) => ({
description:
'This is the lessThan operator to specify a constraint to select the objects where the value of a field is less than a specified value.',
type,
});

const lessThanOrEqualTo = type => ({
const lessThanOrEqualTo = (type) => ({
description:
'This is the lessThanOrEqualTo operator to specify a constraint to select the objects where the value of a field is less than or equal to a specified value.',
type,
});

const greaterThan = type => ({
const greaterThan = (type) => ({
description:
'This is the greaterThan operator to specify a constraint to select the objects where the value of a field is greater than a specified value.',
type,
});

const greaterThanOrEqualTo = type => ({
const greaterThanOrEqualTo = (type) => ({
description:
'This is the greaterThanOrEqualTo operator to specify a constraint to select the objects where the value of a field is greater than or equal to a specified value.',
type,
});

const inOp = type => ({
const inOp = (type) => ({
description:
'This is the in operator to specify a constraint to select the objects where the value of a field equals any value in the specified array.',
type: new GraphQLList(type),
});

const notIn = type => ({
const notIn = (type) => ({
description:
'This is the notIn operator to specify a constraint to select the objects where the value of a field do not equal any value in the specified array.',
type: new GraphQLList(type),
Expand Down Expand Up @@ -1219,14 +1225,14 @@ let ARRAY_RESULT;

const loadArrayResult = (parseGraphQLSchema, parseClasses) => {
const classTypes = parseClasses
.filter(parseClass =>
.filter((parseClass) =>
parseGraphQLSchema.parseClassTypes[parseClass.className]
.classGraphQLOutputType
? true
: false
)
.map(
parseClass =>
(parseClass) =>
parseGraphQLSchema.parseClassTypes[parseClass.className]
.classGraphQLOutputType
);
Expand All @@ -1235,7 +1241,7 @@ const loadArrayResult = (parseGraphQLSchema, parseClasses) => {
description:
'Use Inline Fragment on Array to get results: https://graphql.org/learn/queries/#inline-fragments',
types: () => [ELEMENT, ...classTypes],
resolveType: value => {
resolveType: (value) => {
if (value.__type === 'Object' && value.className && value.objectId) {
if (parseGraphQLSchema.parseClassTypes[value.className]) {
return parseGraphQLSchema.parseClassTypes[value.className]
Expand All @@ -1251,7 +1257,7 @@ const loadArrayResult = (parseGraphQLSchema, parseClasses) => {
parseGraphQLSchema.graphQLTypes.push(ARRAY_RESULT);
};

const load = parseGraphQLSchema => {
const load = (parseGraphQLSchema) => {
parseGraphQLSchema.addGraphQLType(GraphQLUpload, true);
parseGraphQLSchema.addGraphQLType(ANY, true);
parseGraphQLSchema.addGraphQLType(OBJECT, true);
Expand Down
Loading