diff --git a/src/routes/activity.ts b/src/routes/activity.ts index b881c5a8ed..0e72d959de 100644 --- a/src/routes/activity.ts +++ b/src/routes/activity.ts @@ -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, }); }) ); diff --git a/src/routes/collections.ts b/src/routes/collections.ts index 0185e0d2ca..bc64717d1f 100644 --- a/src/routes/collections.ts +++ b/src/routes/collections.ts @@ -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 }); }) ); diff --git a/src/routes/fields.ts b/src/routes/fields.ts index 658a168d6b..a8e5530e88 100644 --- a/src/routes/fields.ts +++ b/src/routes/fields.ts @@ -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 }); }) ); diff --git a/src/routes/files.ts b/src/routes/files.ts index 38befe86a7..cfefde28ff 100644 --- a/src/routes/files.ts +++ b/src/routes/files.ts @@ -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 }); }) ); diff --git a/src/routes/folders.ts b/src/routes/folders.ts index 3283a6206a..b83f4072b9 100644 --- a/src/routes/folders.ts +++ b/src/routes/folders.ts @@ -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 }); }) ); diff --git a/src/routes/items.ts b/src/routes/items.ts index c9716e1f90..b449cb176e 100644 --- a/src/routes/items.ts +++ b/src/routes/items.ts @@ -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 }); }) ); diff --git a/src/routes/permissions.ts b/src/routes/permissions.ts index 17b6f5cf0d..51f192ddfb 100644 --- a/src/routes/permissions.ts +++ b/src/routes/permissions.ts @@ -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 }); }) ); diff --git a/src/routes/presets.ts b/src/routes/presets.ts index 78cca2dee2..3b5fe2e82e 100644 --- a/src/routes/presets.ts +++ b/src/routes/presets.ts @@ -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 }); }) ); diff --git a/src/routes/relations.ts b/src/routes/relations.ts index 2460812358..4f4c62be14 100644 --- a/src/routes/relations.ts +++ b/src/routes/relations.ts @@ -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 }); }) ); diff --git a/src/routes/revisions.ts b/src/routes/revisions.ts index 7160527e0e..e604e7f413 100644 --- a/src/routes/revisions.ts +++ b/src/routes/revisions.ts @@ -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 }); }) ); diff --git a/src/routes/roles.ts b/src/routes/roles.ts index 0f46b02614..4e8cf6d090 100644 --- a/src/routes/roles.ts +++ b/src/routes/roles.ts @@ -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 }); }) ); diff --git a/src/routes/settings.ts b/src/routes/settings.ts index 7770dfa4c1..ac312d74b4 100644 --- a/src/routes/settings.ts +++ b/src/routes/settings.ts @@ -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 }); }) ); diff --git a/src/routes/users.ts b/src/routes/users.ts index 21248f0859..32130e8e5e 100644 --- a/src/routes/users.ts +++ b/src/routes/users.ts @@ -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 }); }) ); diff --git a/src/routes/webhooks.ts b/src/routes/webhooks.ts index fd1d06e011..0d04dccac5 100644 --- a/src/routes/webhooks.ts +++ b/src/routes/webhooks.ts @@ -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 }); }) );