yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-27 07:03:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix upload file info form

Browse Source 
Signed-off-by: HichamELBSI <elabbassih@gmail.com>
This commit is contained in:
HichamELBSI 2021-12-22 13:14:22 +01:00
parent e5ee7f05ac
commit d4cf3ae8ee
3 changed files with 21 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
packages/core/upload/admin/src/components/AssetCard/UploadingAssetCard.js
View File

@ -27,26 +27,18 @@ const Extension = styled.span`
text-transform: uppercase;
`;
export const UploadingAssetCard = ({
name,
extension,
assetType,
file,
onCancel,
onStatusChange,
addUploadedFiles,
}) => {
const { upload, cancel, error, progress, status } = useUpload();
export const UploadingAssetCard = ({ asset, onCancel, onStatusChange, addUploadedFiles }) => {
const { upload, cancel, error, progress, status } = useUpload(asset);
const { formatMessage } = useIntl();
let badgeContent;
if (assetType === AssetType.Image) {
if (asset.type === AssetType.Image) {
badgeContent = formatMessage({
id: getTrad('settings.section.image.label'),
defaultMessage: 'Image',
});
} else if (assetType === AssetType.Video) {
} else if (asset.type === AssetType.Video) {
badgeContent = formatMessage({
id: getTrad('settings.section.video.label'),
defaultMessage: 'Video',
@ -60,7 +52,7 @@ export const UploadingAssetCard = ({
useEffect(() => {
const uploadFile = async () => {
const files = await upload(file);
const files = await upload(asset);
if (addUploadedFiles) {
addUploadedFiles(files);
@ -77,7 +69,7 @@ export const UploadingAssetCard = ({
const handleCancel = () => {
cancel();
onCancel(file);
onCancel(asset.rawFile);
};
return (
@ -90,9 +82,9 @@ export const UploadingAssetCard = ({
</CardHeader>
<CardBody>
<CardContent>
<CardTitle as="h2">{name}</CardTitle>
<CardTitle as="h2">{asset.name}</CardTitle>
<CardSubtitle>
<Extension>{extension}</Extension>
<Extension>{asset.ext}</Extension>
</CardSubtitle>
</CardContent>
<CardBadge>{badgeContent}</CardBadge>
@ -115,10 +107,12 @@ UploadingAssetCard.defaultProps = {
UploadingAssetCard.propTypes = {
addUploadedFiles: PropTypes.func,
assetType: PropTypes.oneOf(Object.values(AssetType)).isRequired,
extension: PropTypes.string.isRequired,
name: PropTypes.string.isRequired,
file: PropTypes.instanceOf(File).isRequired,
asset: PropTypes.shape({
name: PropTypes.string,
ext: PropTypes.string,
rawFile: PropTypes.instanceOf(File),
type: PropTypes.oneOf(Object.values(AssetType)),
}).isRequired,
onCancel: PropTypes.func.isRequired,
onStatusChange: PropTypes.func.isRequired,
};

5
packages/core/upload/admin/src/components/UploadAssetDialog/PendingAssetStep/PendingAssetStep.js
View File

@ -107,11 +107,8 @@ export const PendingAssetStep = ({
<UploadingAssetCard
// Props used to store the newly uploaded files
addUploadedFiles={addUploadedFiles}
assetType={asset.type}
extension={asset.ext}
file={asset.rawFile}
asset={asset}
id={assetKey}
name={asset.name}
onCancel={onCancelUpload}
onStatusChange={status => handleStatusChange(status, asset.rawFile)}
size="S"

11
packages/core/upload/admin/src/hooks/useUpload.js
View File

@ -7,17 +7,18 @@ import pluginId from '../pluginId';
const endpoint = `/${pluginId}`;
const uploadAsset = (file, cancelToken, onProgress) => {
const uploadAsset = (asset, cancelToken, onProgress) => {
const { rawFile, caption, name, alternativeText } = asset;
const formData = new FormData();
formData.append('files', file);
formData.append('files', rawFile);
formData.append(
'fileInfo',
JSON.stringify({
alternativeText: file.name,
caption: file.name,
name: file.name,
name,
caption: caption || name,
alternativeText: alternativeText || name,
})
);