yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-26 14:44:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'releases/v4' of https://github.com/strapi/strapi into filter-cm-fix

Browse Source
This commit is contained in:
ronronscelestes 2021-11-03 16:54:05 +01:00
commit 533b339dd1
3 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
examples/getstarted/src/middlewares/test-middleware.js
View File

@ -1,3 +1,14 @@
module.exports = () => {
return (ctx, next) => next();
'use strict';
/**
* `test-middleware` middleware.
*/
module.exports = (config, { strapi }) => {
// Add your own logic here.
return async (ctx, next) => {
strapi.log.info('In test-middleware middleware.');
await next();
};
};

12
packages/core/admin/admin/src/pages/SettingsPage/pages/Roles/ListPage/components/RoleRow/index.js
View File

@ -3,9 +3,9 @@ import PropTypes from 'prop-types';
import { Box } from '@strapi/design-system/Box';
import { Flex } from '@strapi/design-system/Flex';
import { Td, Tr } from '@strapi/design-system/Table';
import { Text } from '@strapi/design-system/Text';
import { Text, EllipsisText } from '@strapi/design-system/Text';
import { IconButton } from '@strapi/design-system/IconButton';
import { stopPropagation, onRowClick } from '@strapi/helper-plugin';
import { stopPropagation, onRowClick, pxToRem } from '@strapi/helper-plugin';
import { useIntl } from 'react-intl';
const RoleRow = ({ id, name, description, usersCount, icons }) => {
@ -26,11 +26,11 @@ const RoleRow = ({ id, name, description, usersCount, icons }) => {
fn: icons[1].onClick,
})}
>
<Td>
<Text textColor="neutral800">{name}</Text>
<Td maxWidth={pxToRem(130)}>
<EllipsisText textColor="neutral800">{name}</EllipsisText>
</Td>
<Td>
<Text textColor="neutral800">{description}</Text>
<Td maxWidth={pxToRem(250)}>
<EllipsisText textColor="neutral800">{description}</EllipsisText>
</Td>
<Td>
<Text textColor="neutral800">{usersCountText}</Text>

2
packages/generators/generators/lib/templates/middleware.js.hbs
View File

@ -4,7 +4,7 @@
* `{{ name }}` middleware.
*/
module.exports = async (config, { strapi }) => {
module.exports = (config, { strapi }) => {
// Add your own logic here.
return async (ctx, next) => {
strapi.log.info('In {{ name }} middleware.');