diff --git a/auth-service/src/controllers/roleController.js b/auth-service/src/controllers/roleController.js index 394b745..452280b 100644 --- a/auth-service/src/controllers/roleController.js +++ b/auth-service/src/controllers/roleController.js @@ -11,8 +11,19 @@ export default { }, async getAll(req, res) { try { - const roles = await Role.findAll({ include: Permission }); - res.json(roles); + const { limit, offset } = req.query; + const options = { include: Permission }; + + if (limit && offset) { + options.limit = parseInt(limit); + options.offset = parseInt(offset); + } + + const roles = await Role.findAndCountAll(options); + res.json({ + rows: roles.rows, + count: roles.count + }); } catch (err) { res.status(500).json({ error: err.message }); } diff --git a/frontend/src/components/SideMenu.js b/frontend/src/components/SideMenu.js index 74f10ed..95fb4be 100644 --- a/frontend/src/components/SideMenu.js +++ b/frontend/src/components/SideMenu.js @@ -18,6 +18,7 @@ const SideMenu = ({ active, onSelect }) => {