diff --git a/.github/actions/check-pr-status/package.json b/.github/actions/check-pr-status/package.json index f4461cc2a9..da66f6b0ba 100644 --- a/.github/actions/check-pr-status/package.json +++ b/.github/actions/check-pr-status/package.json @@ -1,6 +1,6 @@ { "name": "check-pr-status", - "version": "4.5.1", + "version": "4.5.2", "main": "dist/index.js", "license": "MIT", "private": true, diff --git a/examples/getstarted/package.json b/examples/getstarted/package.json index b1472a6620..3b23448c76 100644 --- a/examples/getstarted/package.json +++ b/examples/getstarted/package.json @@ -1,7 +1,7 @@ { "name": "getstarted", "private": true, - "version": "4.5.1", + "version": "4.5.2", "description": "A Strapi application.", "scripts": { "develop": "strapi develop", @@ -12,16 +12,16 @@ "strapi": "strapi" }, "dependencies": { - "@strapi/plugin-color-picker": "4.5.1", - "@strapi/plugin-documentation": "4.5.1", - "@strapi/plugin-graphql": "4.5.1", - "@strapi/plugin-i18n": "4.5.1", - "@strapi/plugin-sentry": "4.5.1", - "@strapi/plugin-users-permissions": "4.5.1", - "@strapi/provider-email-mailgun": "4.5.1", - "@strapi/provider-upload-aws-s3": "4.5.1", - "@strapi/provider-upload-cloudinary": "4.5.1", - "@strapi/strapi": "4.5.1", + "@strapi/plugin-color-picker": "4.5.2", + "@strapi/plugin-documentation": "4.5.2", + "@strapi/plugin-graphql": "4.5.2", + "@strapi/plugin-i18n": "4.5.2", + "@strapi/plugin-sentry": "4.5.2", + "@strapi/plugin-users-permissions": "4.5.2", + "@strapi/provider-email-mailgun": "4.5.2", + "@strapi/provider-upload-aws-s3": "4.5.2", + "@strapi/provider-upload-cloudinary": "4.5.2", + "@strapi/strapi": "4.5.2", "@vscode/sqlite3": "5.0.8", "better-sqlite3": "7.4.6", "lodash": "4.17.21", diff --git a/examples/kitchensink-ts/package.json b/examples/kitchensink-ts/package.json index 12cd48e212..05c51bb0be 100644 --- a/examples/kitchensink-ts/package.json +++ b/examples/kitchensink-ts/package.json @@ -1,7 +1,7 @@ { "name": "kitchensink-ts", "private": true, - "version": "4.5.1", + "version": "4.5.2", "description": "A Strapi application", "scripts": { "develop": "strapi develop", @@ -10,9 +10,9 @@ "strapi": "strapi" }, "dependencies": { - "@strapi/plugin-i18n": "4.5.1", - "@strapi/plugin-users-permissions": "4.5.1", - "@strapi/strapi": "4.5.1", + "@strapi/plugin-i18n": "4.5.2", + "@strapi/plugin-users-permissions": "4.5.2", + "@strapi/strapi": "4.5.2", "better-sqlite3": "7.4.6" }, "author": { diff --git a/examples/kitchensink/package.json b/examples/kitchensink/package.json index 095259f32f..7815cfa9d6 100644 --- a/examples/kitchensink/package.json +++ b/examples/kitchensink/package.json @@ -1,7 +1,7 @@ { "name": "kitchensink", "private": true, - "version": "4.5.1", + "version": "4.5.2", "description": "A Strapi application.", "scripts": { "develop": "strapi develop", @@ -12,10 +12,10 @@ "strapi": "strapi" }, "dependencies": { - "@strapi/provider-email-mailgun": "4.5.1", - "@strapi/provider-upload-aws-s3": "4.5.1", - "@strapi/provider-upload-cloudinary": "4.5.1", - "@strapi/strapi": "4.5.1", + "@strapi/provider-email-mailgun": "4.5.2", + "@strapi/provider-upload-aws-s3": "4.5.2", + "@strapi/provider-upload-cloudinary": "4.5.2", + "@strapi/strapi": "4.5.2", "lodash": "4.17.21", "mysql": "2.18.1", "passport-google-oauth2": "0.2.0", diff --git a/lerna.json b/lerna.json index 6c2be7927e..366718529a 100644 --- a/lerna.json +++ b/lerna.json @@ -1,5 +1,5 @@ { - "version": "4.5.1", + "version": "4.5.2", "packages": [ "packages/*", "examples/*" diff --git a/packages/admin-test-utils/package.json b/packages/admin-test-utils/package.json index 09530a2a2a..3b76de5afb 100644 --- a/packages/admin-test-utils/package.json +++ b/packages/admin-test-utils/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/admin-test-utils", - "version": "4.5.1", + "version": "4.5.2", "private": true, "description": "Test utilities for the Strapi administration panel", "license": "MIT", diff --git a/packages/cli/create-strapi-app/package.json b/packages/cli/create-strapi-app/package.json index 29e754d0cf..7a88cd201b 100644 --- a/packages/cli/create-strapi-app/package.json +++ b/packages/cli/create-strapi-app/package.json @@ -1,9 +1,9 @@ { "name": "create-strapi-app", - "version": "4.5.1", + "version": "4.5.2", "description": "Generate a new Strapi application.", "dependencies": { - "@strapi/generate-new": "4.5.1", + "@strapi/generate-new": "4.5.2", "commander": "6.1.0", "inquirer": "8.2.4" }, diff --git a/packages/cli/create-strapi-starter/package.json b/packages/cli/create-strapi-starter/package.json index a05f3fd90b..5b61057d91 100644 --- a/packages/cli/create-strapi-starter/package.json +++ b/packages/cli/create-strapi-starter/package.json @@ -1,6 +1,6 @@ { "name": "create-strapi-starter", - "version": "4.5.1", + "version": "4.5.2", "description": "Generate a new Strapi application.", "keywords": [ "create-strapi-starter", @@ -38,7 +38,7 @@ "test": "echo \"no tests yet\"" }, "dependencies": { - "@strapi/generate-new": "4.5.1", + "@strapi/generate-new": "4.5.2", "chalk": "4.1.1", "ci-info": "3.5.0", "commander": "7.1.0", diff --git a/packages/core/admin/package.json b/packages/core/admin/package.json index 712c5dbc41..c7bd3cf721 100644 --- a/packages/core/admin/package.json +++ b/packages/core/admin/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/admin", - "version": "4.5.1", + "version": "4.5.2", "description": "Strapi Admin", "repository": { "type": "git", @@ -51,13 +51,13 @@ "@fortawesome/free-solid-svg-icons": "^5.15.3", "@fortawesome/react-fontawesome": "^0.2.0", "@pmmmwh/react-refresh-webpack-plugin": "0.5.7", - "@strapi/babel-plugin-switch-ee-ce": "4.5.1", + "@strapi/babel-plugin-switch-ee-ce": "4.5.2", "@strapi/design-system": "1.3.1", - "@strapi/helper-plugin": "4.5.1", + "@strapi/helper-plugin": "4.5.2", "@strapi/icons": "1.3.1", - "@strapi/permissions": "4.5.1", - "@strapi/typescript-utils": "4.5.1", - "@strapi/utils": "4.5.1", + "@strapi/permissions": "4.5.2", + "@strapi/typescript-utils": "4.5.2", + "@strapi/utils": "4.5.2", "axios": "0.27.2", "babel-loader": "8.2.5", "babel-plugin-styled-components": "2.0.2", diff --git a/packages/core/content-manager/package.json b/packages/core/content-manager/package.json index 89f468d094..d1b301d193 100644 --- a/packages/core/content-manager/package.json +++ b/packages/core/content-manager/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-content-manager", - "version": "4.5.1", + "version": "4.5.2", "description": "A powerful UI to easily manage your data.", "repository": { "type": "git", @@ -24,7 +24,7 @@ }, "dependencies": { "@sindresorhus/slugify": "1.1.0", - "@strapi/utils": "4.5.1", + "@strapi/utils": "4.5.2", "lodash": "4.17.21" }, "engines": { diff --git a/packages/core/content-type-builder/package.json b/packages/core/content-type-builder/package.json index ab9da98f3e..ced4546e27 100644 --- a/packages/core/content-type-builder/package.json +++ b/packages/core/content-type-builder/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-content-type-builder", - "version": "4.5.1", + "version": "4.5.2", "description": "Strapi plugin to create content type", "repository": { "type": "git", @@ -28,9 +28,9 @@ }, "dependencies": { "@sindresorhus/slugify": "1.1.0", - "@strapi/generators": "4.5.1", - "@strapi/helper-plugin": "4.5.1", - "@strapi/utils": "4.5.1", + "@strapi/generators": "4.5.2", + "@strapi/helper-plugin": "4.5.2", + "@strapi/utils": "4.5.2", "fs-extra": "10.0.0", "lodash": "4.17.21", "pluralize": "^8.0.0", diff --git a/packages/core/database/package.json b/packages/core/database/package.json index 8014111cb4..69c43e64be 100644 --- a/packages/core/database/package.json +++ b/packages/core/database/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/database", - "version": "4.5.1", + "version": "4.5.2", "description": "Strapi's database layer", "homepage": "https://strapi.io", "bugs": { diff --git a/packages/core/email/package.json b/packages/core/email/package.json index 6e95b3d285..1637ee64d0 100644 --- a/packages/core/email/package.json +++ b/packages/core/email/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/plugin-email", - "version": "4.5.1", + "version": "4.5.2", "description": "Easily configure your Strapi application to send emails.", "repository": { "type": "git", @@ -26,12 +26,12 @@ "test:front:watch:ce": "cross-env IS_EE=false jest --config ./jest.config.front.js --watchAll" }, "dependencies": { - "@strapi/provider-email-sendmail": "4.5.1", - "@strapi/utils": "4.5.1", + "@strapi/provider-email-sendmail": "4.5.2", + "@strapi/utils": "4.5.2", "lodash": "4.17.21" }, "devDependencies": { - "@strapi/helper-plugin": "4.5.1", + "@strapi/helper-plugin": "4.5.2", "@testing-library/react": "12.1.4" }, "engines": { diff --git a/packages/core/helper-plugin/package.json b/packages/core/helper-plugin/package.json index 3151b5aec7..6558731a9c 100644 --- a/packages/core/helper-plugin/package.json +++ b/packages/core/helper-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/helper-plugin", - "version": "4.5.1", + "version": "4.5.2", "description": "Helper for Strapi plugins development", "repository": { "type": "git", diff --git a/packages/core/permissions/package.json b/packages/core/permissions/package.json index 54f8f14b38..9ffe09b1ad 100644 --- a/packages/core/permissions/package.json +++ b/packages/core/permissions/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/permissions", - "version": "4.5.1", + "version": "4.5.2", "description": "Strapi's permission layer.", "repository": { "type": "git", @@ -25,7 +25,7 @@ }, "dependencies": { "@casl/ability": "5.4.4", - "@strapi/utils": "4.5.1", + "@strapi/utils": "4.5.2", "lodash": "4.17.21", "sift": "16.0.0" }, diff --git a/packages/core/strapi/package.json b/packages/core/strapi/package.json index 68a50a52e2..ff1f6e2530 100644 --- a/packages/core/strapi/package.json +++ b/packages/core/strapi/package.json @@ -1,6 +1,6 @@ { "name": "@strapi/strapi", - "version": "4.5.1", + "version": "4.5.2", "description": "An open source headless CMS solution to create and manage your own API. It provides a powerful dashboard and features to make your life easier. Databases supported: MySQL, MariaDB, PostgreSQL, SQLite", "keywords": [ "strapi", @@ -80,18 +80,18 @@ "dependencies": { "@koa/cors": "3.4.3", "@koa/router": "10.1.1", - "@strapi/admin": "4.5.1", - "@strapi/database": "4.5.1", - "@strapi/generate-new": "4.5.1", - "@strapi/generators": "4.5.1", - "@strapi/logger": "4.5.1", - "@strapi/permissions": "4.5.1", - "@strapi/plugin-content-manager": "4.5.1", - "@strapi/plugin-content-type-builder": "4.5.1", - "@strapi/plugin-email": "4.5.1", - "@strapi/plugin-upload": "4.5.1", - "@strapi/typescript-utils": "4.5.1", - "@strapi/utils": "4.5.1", + "@strapi/admin": "4.5.2", + "@strapi/database": "4.5.2", + "@strapi/generate-new": "4.5.2", + "@strapi/generators": "4.5.2", + "@strapi/logger": "4.5.2", + "@strapi/permissions": "4.5.2", + "@strapi/plugin-content-manager": "4.5.2", + "@strapi/plugin-content-type-builder": "4.5.2", + "@strapi/plugin-email": "4.5.2", + "@strapi/plugin-upload": "4.5.2", + "@strapi/typescript-utils": "4.5.2", + "@strapi/utils": "4.5.2", "bcryptjs": "2.4.3", "boxen": "5.1.2", "chalk": "4.1.2", diff --git a/packages/core/upload/admin/src/components/AssetCard/AssetCardBase.js b/packages/core/upload/admin/src/components/AssetCard/AssetCardBase.js index 2b04521bbc..1ab68aaf5b 100644 --- a/packages/core/upload/admin/src/components/AssetCard/AssetCardBase.js +++ b/packages/core/upload/admin/src/components/AssetCard/AssetCardBase.js @@ -13,6 +13,7 @@ import { CardTitle, CardSubtitle, } from '@strapi/design-system/Card'; +import { Flex } from '@strapi/design-system/Flex'; import { IconButton } from '@strapi/design-system/IconButton'; import Pencil from '@strapi/icons/Pencil'; import Trash from '@strapi/icons/Trash'; @@ -116,12 +117,14 @@ export const AssetCardBase = ({ {subtitle} - - {formatMessage({ - id: getTrad(`settings.section.${variant.toLowerCase()}.label`), - defaultMessage: variant, - })} - + + + {formatMessage({ + id: getTrad(`settings.section.${variant.toLowerCase()}.label`), + defaultMessage: variant, + })} + + ); diff --git a/packages/core/upload/admin/src/components/AssetCard/UploadingAssetCard.js b/packages/core/upload/admin/src/components/AssetCard/UploadingAssetCard.js index cab6826c93..f2c54b4ec6 100644 --- a/packages/core/upload/admin/src/components/AssetCard/UploadingAssetCard.js +++ b/packages/core/upload/admin/src/components/AssetCard/UploadingAssetCard.js @@ -15,6 +15,7 @@ import { import { Typography } from '@strapi/design-system/Typography'; import { Stack } from '@strapi/design-system/Stack'; import { Box } from '@strapi/design-system/Box'; +import { Flex } from '@strapi/design-system/Flex'; import { getTrad } from '../../utils'; import { AssetType } from '../../constants'; @@ -40,7 +41,10 @@ export const UploadingAssetCard = ({ const { upload, cancel, error, progress, status } = useUpload(); const { formatMessage } = useIntl(); - let badgeContent; + let badgeContent = formatMessage({ + id: getTrad('settings.section.doc.label'), + defaultMessage: 'Doc', + }); if (asset.type === AssetType.Image) { badgeContent = formatMessage({ @@ -57,11 +61,6 @@ export const UploadingAssetCard = ({ id: getTrad('settings.section.audio.label'), defaultMessage: 'Audio', }); - } else { - badgeContent = formatMessage({ - id: getTrad('settings.section.doc.label'), - defaultMessage: 'Doc', - }); } useEffect(() => { @@ -88,7 +87,7 @@ export const UploadingAssetCard = ({ return ( - + @@ -103,7 +102,9 @@ export const UploadingAssetCard = ({ {asset.ext} - {badgeContent} + + {badgeContent} + {error ? ( diff --git a/packages/core/upload/admin/src/components/AssetCard/tests/DocAssetCard.test.js b/packages/core/upload/admin/src/components/AssetCard/tests/DocAssetCard.test.js index 45e2b12d89..a1daa0d7de 100644 --- a/packages/core/upload/admin/src/components/AssetCard/tests/DocAssetCard.test.js +++ b/packages/core/upload/admin/src/components/AssetCard/tests/DocAssetCard.test.js @@ -29,7 +29,7 @@ describe('DocAssetCard', () => { ); expect(container).toMatchInlineSnapshot(` - .c31 { + .c32 { border: 0; -webkit-clip: rect(0 0 0 0); clip: rect(0 0 0 0); @@ -75,7 +75,15 @@ describe('DocAssetCard', () => { padding-top: 4px; } - .c27 { + .c26 { + padding-top: 4px; + -webkit-box-flex: 1; + -webkit-flex-grow: 1; + -ms-flex-positive: 1; + flex-grow: 1; + } + + .c28 { background: #f6f6f9; padding: 4px; border-radius: 4px; @@ -128,7 +136,7 @@ describe('DocAssetCard', () => { flex-direction: row; } - .c28 { + .c29 { -webkit-align-items: center; -webkit-box-align: center; -ms-flex-align: center; @@ -171,7 +179,7 @@ describe('DocAssetCard', () => { color: #666687; } - .c30 { + .c31 { font-weight: 600; font-size: 0.6875rem; line-height: 1.45; @@ -366,14 +374,14 @@ describe('DocAssetCard', () => { right: 12px; } - .c26 { + .c27 { margin-left: auto; -webkit-flex-shrink: 0; -ms-flex-negative: 0; flex-shrink: 0; } - .c29 { + .c30 { margin-left: 4px; } @@ -535,23 +543,27 @@ describe('DocAssetCard', () => {
- - Doc - + + Doc + +

{ ); expect(container).toMatchInlineSnapshot(` - .c30 { + .c31 { border: 0; -webkit-clip: rect(0 0 0 0); clip: rect(0 0 0 0); @@ -73,7 +73,15 @@ describe('ImageAssetCard', () => { padding-top: 4px; } - .c26 { + .c25 { + padding-top: 4px; + -webkit-box-flex: 1; + -webkit-flex-grow: 1; + -ms-flex-positive: 1; + flex-grow: 1; + } + + .c27 { background: #f6f6f9; padding: 4px; border-radius: 4px; @@ -126,7 +134,7 @@ describe('ImageAssetCard', () => { flex-direction: row; } - .c27 { + .c28 { -webkit-align-items: center; -webkit-box-align: center; -ms-flex-align: center; @@ -202,7 +210,7 @@ describe('ImageAssetCard', () => { color: #666687; } - .c29 { + .c30 { font-weight: 600; font-size: 0.6875rem; line-height: 1.45; @@ -210,14 +218,14 @@ describe('ImageAssetCard', () => { color: #666687; } - .c25 { + .c26 { margin-left: auto; -webkit-flex-shrink: 0; -ms-flex-negative: 0; flex-shrink: 0; } - .c28 { + .c29 { margin-left: 4px; } @@ -533,23 +541,27 @@ describe('ImageAssetCard', () => {

- - Image - + + Image + +

- - Image - + + Image + +
@@ -487,7 +499,7 @@ exports[`MediaLibrary / AssetList snapshots the asset list 1`] = ` class="c8" >
mov_bbb.mp4
@@ -510,10 +522,10 @@ exports[`MediaLibrary / AssetList snapshots the asset list 1`] = `