yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-07 21:58:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

default populate files

Browse Source
This commit is contained in:
Pierre Noël 2022-05-13 17:43:09 +02:00
parent 34046abe1f
commit eb2ec33426
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/core/upload/server/controllers/admin-file.js
View File

@ -1,5 +1,6 @@
'use strict'; 'use strict';
const { merge } = require('lodash/fp');
const { getService } = require('../utils'); const { getService } = require('../utils');
const { ACTIONS, FILE_MODEL_UID } = require('../constants'); const { ACTIONS, FILE_MODEL_UID } = require('../constants');
const { findEntityAndCheckPermissions } = require('./utils/find-entity-and-check-permissions'); const { findEntityAndCheckPermissions } = require('./utils/find-entity-and-check-permissions');
@ -10,6 +11,8 @@ module.exports = {
state: { userAbility }, state: { userAbility },
} = ctx; } = ctx;
const defaultQuery = { populate: { folder: true } };
const pm = strapi.admin.services.permission.createPermissionsManager({ const pm = strapi.admin.services.permission.createPermissionsManager({
ability: userAbility, ability: userAbility,
action: ACTIONS.read, action: ACTIONS.read,
@ -20,7 +23,7 @@ module.exports = {
return ctx.forbidden(); return ctx.forbidden();
} }
const query = pm.addPermissionsQueryTo(ctx.query); const query = pm.addPermissionsQueryTo(merge(defaultQuery, ctx.query));
const { results, pagination } = await getService('upload').findPage(query); const { results, pagination } = await getService('upload').findPage(query);

7
packages/core/upload/tests/admin/file.test.e2e.js
View File

@ -54,10 +54,10 @@ describe('Upload', () => {
describe('Read', () => { describe('Read', () => {
test('GET /upload/files => Find files', async () => { test('GET /upload/files => Find files', async () => {
const getRes = await rq({ method: 'GET', url: '/upload/files' }); const res = await rq({ method: 'GET', url: '/upload/files' });
expect(getRes.statusCode).toBe(200); expect(res.statusCode).toBe(200);
expect(getRes.body).toEqual({ expect(res.body).toEqual({
results: expect.arrayContaining([ results: expect.arrayContaining([
expect.objectContaining({ expect.objectContaining({
id: expect.anything(), id: expect.anything(),
@ -71,6 +71,7 @@ describe('Upload', () => {
total: expect.any(Number), total: expect.any(Number),
}, },
}); });
res.body.results.forEach(file => expect(file.folder).toBeDefined());
}); });
}); });
}); });