github/directus
1
0
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-01-29 13:18:25 -05:00
Code Issues Packages Projects Releases Wiki Activity

Make sure to return null for undefined values

Browse Source
This commit is contained in:
rijkvanzanten
2020-07-09 16:47:45 -04:00
parent 345d4363d5
commit cb16552438
14 changed files with 56 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/routes/activity.ts
View File

@@ -15,7 +15,7 @@ router.get(
asyncHandler(async (req, res) => {
const records = await ActivityService.readActivities(req.sanitizedQuery);
return res.json({
data: records,
data: records || null,
});
})
);
@@ -29,7 +29,7 @@ router.get(
const record = await ActivityService.readActivity(req.params.pk, req.sanitizedQuery);
return res.json({
data: record,
data: record || null,
});
})
);

13
src/routes/collections.ts
View File

@@ -35,7 +35,7 @@ router.post(
user: req.user,
});
res.json({ data: createdCollection });
res.json({ data: createdCollection || null });
})
);
@@ -44,8 +44,8 @@ router.get(
sanitizeQuery,
validateQuery,
asyncHandler(async (req, res) => {
const data = await CollectionsService.readAll(req.sanitizedQuery);
res.json({ data });
const collections = await CollectionsService.readAll(req.sanitizedQuery);
res.json({ data: collections || null });
})
);
@@ -58,8 +58,11 @@ router.get(
if (exists === false) throw new CollectionNotFoundException(req.params.collection);
const data = await CollectionsService.readOne(req.params.collection, req.sanitizedQuery);
res.json({ data });
const collection = await CollectionsService.readOne(
req.params.collection,
req.sanitizedQuery
);
res.json({ data: collection || null });
})
);

8
src/routes/fields.ts
View File

@@ -13,7 +13,7 @@ router.get(
'/',
asyncHandler(async (req, res) => {
const fields = await FieldsService.readAll();
return res.json({ data: fields });
return res.json({ data: fields || null });
})
);
@@ -22,7 +22,7 @@ router.get(
validateCollection,
asyncHandler(async (req, res) => {
const fields = await FieldsService.readAll(req.collection);
return res.json({ data: fields });
return res.json({ data: fields || null });
})
);
@@ -34,7 +34,7 @@ router.get(
if (exists === false) throw new FieldNotFoundException(req.collection, req.params.field);
const field = await FieldsService.readOne(req.collection, req.params.field);
return res.json({ data: field });
return res.json({ data: field || null });
})
);
@@ -67,7 +67,7 @@ router.post(
user: req.user,
});
res.json({ data: createdField });
res.json({ data: createdField || null });
})
);

8
src/routes/files.ts
View File

@@ -87,7 +87,7 @@ const multipartHandler = (operation: 'create' | 'update') =>
});
busboy.on('finish', () => {
res.status(200).json({ data: savedFiles });
res.status(200).json({ data: savedFiles || null });
});
return req.pipe(busboy);
@@ -102,7 +102,7 @@ router.get(
validateQuery,
asyncHandler(async (req, res) => {
const records = await FilesService.readFiles(req.sanitizedQuery);
return res.json({ data: records });
return res.json({ data: records || null });
})
);
@@ -113,7 +113,7 @@ router.get(
validateQuery,
asyncHandler(async (req, res) => {
const record = await FilesService.readFile(req.params.pk, req.sanitizedQuery);
return res.json({ data: record });
return res.json({ data: record || null });
})
);
@@ -134,7 +134,7 @@ router.patch(
file = await FilesService.readFile(pk, req.sanitizedQuery);
}
return res.status(200).json({ data: file });
return res.status(200).json({ data: file || null });
})
);

8
src/routes/folders.ts
View File

@@ -18,7 +18,7 @@ router.post(
});
const record = await FoldersService.readFolder(primaryKey, req.sanitizedQuery);
return res.json({ data: record });
return res.json({ data: record || null });
})
);
@@ -29,7 +29,7 @@ router.get(
validateQuery,
asyncHandler(async (req, res) => {
const records = await FoldersService.readFolders(req.sanitizedQuery);
return res.json({ data: records });
return res.json({ data: records || null });
})
);
@@ -40,7 +40,7 @@ router.get(
validateQuery,
asyncHandler(async (req, res) => {
const record = await FoldersService.readFolder(req.params.pk, req.sanitizedQuery);
return res.json({ data: record });
return res.json({ data: record || null });
})
);
@@ -56,7 +56,7 @@ router.patch(
const record = await FoldersService.readFolder(primaryKey, req.sanitizedQuery);
return res.json({ data: record });
return res.json({ data: record || null });
})
);

8
src/routes/items.ts
View File

@@ -24,7 +24,7 @@ router.post(
const item = await ItemsService.readItem(req.collection, primaryKey, req.sanitizedQuery);
res.json({ data: item });
res.json({ data: item || null });
})
);
@@ -41,7 +41,7 @@ router.get(
return res.json({
meta: meta,
data: records,
data: records || null,
});
})
);
@@ -59,7 +59,7 @@ router.get(
);
return res.json({
data: record,
data: record || null,
});
})
);
@@ -78,7 +78,7 @@ router.patch(
const item = await ItemsService.readItem(req.collection, primaryKey, req.sanitizedQuery);
return res.json({ data: item });
return res.json({ data: item || null });
})
);

8
src/routes/permissions.ts
View File

@@ -19,7 +19,7 @@ router.post(
const item = await PermissionsService.readPermission(primaryKey, req.sanitizedQuery);
return res.json({ data: item });
return res.json({ data: item || null });
})
);
@@ -30,7 +30,7 @@ router.get(
validateQuery,
asyncHandler(async (req, res) => {
const item = await PermissionsService.readPermissions(req.sanitizedQuery);
return res.json({ data: item });
return res.json({ data: item || null });
})
);
@@ -44,7 +44,7 @@ router.get(
Number(req.params.pk),
req.sanitizedQuery
);
return res.json({ data: record });
return res.json({ data: record || null });
})
);
@@ -64,7 +64,7 @@ router.patch(
const item = await PermissionsService.readPermission(primaryKey, req.sanitizedQuery);
return res.json({ data: item });
return res.json({ data: item || null });
})
);

8
src/routes/presets.ts
View File

@@ -21,7 +21,7 @@ router.post(
primaryKey,
req.sanitizedQuery
);
return res.json({ data: record });
return res.json({ data: record || null });
})
);
@@ -32,7 +32,7 @@ router.get(
validateQuery,
asyncHandler(async (req, res) => {
const records = await CollectionPresetsService.readCollectionPresets(req.sanitizedQuery);
return res.json({ data: records });
return res.json({ data: records || null });
})
);
@@ -46,7 +46,7 @@ router.get(
req.params.pk,
req.sanitizedQuery
);
return res.json({ data: record });
return res.json({ data: record || null });
})
);
@@ -70,7 +70,7 @@ router.patch(
primaryKey,
req.sanitizedQuery
);
return res.json({ data: record });
return res.json({ data: record || null });
})
);

8
src/routes/relations.ts
View File

@@ -19,7 +19,7 @@ router.post(
user: req.user,
});
const item = await RelationsService.readRelation(primaryKey, req.sanitizedQuery);
return res.json({ data: item });
return res.json({ data: item || null });
})
);
@@ -30,7 +30,7 @@ router.get(
validateQuery,
asyncHandler(async (req, res) => {
const records = await RelationsService.readRelations(req.sanitizedQuery);
return res.json({ data: records });
return res.json({ data: records || null });
})
);
@@ -41,7 +41,7 @@ router.get(
validateQuery,
asyncHandler(async (req, res) => {
const record = await RelationsService.readRelation(req.params.pk, req.sanitizedQuery);
return res.json({ data: record });
return res.json({ data: record || null });
})
);
@@ -57,7 +57,7 @@ router.patch(
user: req.user,
});
const item = await RelationsService.readRelation(primaryKey, req.sanitizedQuery);
return res.json({ data: item });
return res.json({ data: item || null });
})
);

4
src/routes/revisions.ts
View File

@@ -14,7 +14,7 @@ router.get(
validateQuery,
asyncHandler(async (req, res) => {
const records = await RevisionsService.readRevisions(req.sanitizedQuery);
return res.json({ data: records });
return res.json({ data: records || null });
})
);
@@ -25,7 +25,7 @@ router.get(
validateQuery,
asyncHandler(async (req, res) => {
const record = await RevisionsService.readRevision(req.params.pk, req.sanitizedQuery);
return res.json({ data: record });
return res.json({ data: record || null });
})
);

8
src/routes/roles.ts
View File

@@ -19,7 +19,7 @@ router.post(
user: req.user,
});
const item = await RolesService.readRole(primaryKey, req.sanitizedQuery);
return res.json({ data: item });
return res.json({ data: item || null });
})
);
@@ -30,7 +30,7 @@ router.get(
validateQuery,
asyncHandler(async (req, res) => {
const records = await RolesService.readRoles(req.sanitizedQuery);
return res.json({ data: records });
return res.json({ data: records || null });
})
);
@@ -41,7 +41,7 @@ router.get(
validateQuery,
asyncHandler(async (req, res) => {
const record = await RolesService.readRole(req.params.pk, req.sanitizedQuery);
return res.json({ data: record });
return res.json({ data: record || null });
})
);
@@ -57,7 +57,7 @@ router.patch(
user: req.user,
});
const item = await RolesService.readRole(primaryKey, req.sanitizedQuery);
return res.json({ data: item });
return res.json({ data: item || null });
})
);

4
src/routes/settings.ts
View File

@@ -14,7 +14,7 @@ router.get(
validateQuery,
asyncHandler(async (req, res) => {
const records = await SettingsService.readSettings(req.sanitizedQuery);
return res.json({ data: records });
return res.json({ data: records || null });
})
);
@@ -36,7 +36,7 @@ router.patch(
const record = await SettingsService.readSettings(req.sanitizedQuery);
return res.json({ data: record });
return res.json({ data: record || null });
})
);

12
src/routes/users.ts
View File

@@ -21,7 +21,7 @@ router.post(
user: req.user,
});
const item = await UsersService.readUser(primaryKey, req.sanitizedQuery);
return res.json({ data: item });
return res.json({ data: item || null });
})
);
@@ -32,7 +32,7 @@ router.get(
validateQuery,
asyncHandler(async (req, res) => {
const item = await UsersService.readUsers(req.sanitizedQuery);
return res.json({ data: item });
return res.json({ data: item || null });
})
);
@@ -47,7 +47,7 @@ router.get(
}
const item = await UsersService.readUser(req.user, req.sanitizedQuery);
return res.json({ data: item });
return res.json({ data: item || null });
})
);
@@ -58,7 +58,7 @@ router.get(
validateQuery,
asyncHandler(async (req, res) => {
const items = await UsersService.readUser(req.params.pk, req.sanitizedQuery);
return res.json({ data: items });
return res.json({ data: items || null });
})
);
@@ -79,7 +79,7 @@ router.patch(
});
const item = await UsersService.readUser(primaryKey, req.sanitizedQuery);
return res.json({ data: item });
return res.json({ data: item || null });
})
);
@@ -95,7 +95,7 @@ router.patch(
user: req.user,
});
const item = await UsersService.readUser(primaryKey, req.sanitizedQuery);
return res.json({ data: item });
return res.json({ data: item || null });
})
);

8
src/routes/webhooks.ts
View File

@@ -19,7 +19,7 @@ router.post(
const item = await WebhooksService.readWebhook(primaryKey, req.sanitizedQuery);
return res.json({ data: item });
return res.json({ data: item || null });
})
);
@@ -30,7 +30,7 @@ router.get(
validateQuery,
asyncHandler(async (req, res) => {
const records = await WebhooksService.readWebhooks(req.sanitizedQuery);
return res.json({ data: records });
return res.json({ data: records || null });
})
);
@@ -41,7 +41,7 @@ router.get(
validateQuery,
asyncHandler(async (req, res) => {
const record = await WebhooksService.readWebhook(req.params.pk, req.sanitizedQuery);
return res.json({ data: record });
return res.json({ data: record || null });
})
);
@@ -55,7 +55,7 @@ router.patch(
user: req.user,
});
const item = await WebhooksService.readWebhook(primaryKey, req.sanitizedQuery);
return res.json({ data: item });
return res.json({ data: item || null });
})
);