yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 16:29:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13486 from strapi/features/ML-folder-prop-types

Browse Source 
ML: Fix various prop-types errors
This commit is contained in:
Gustav Hansen 2022-06-07 14:06:10 +01:00 committed by GitHub
commit c6d7bef561
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -130,7 +130,7 @@ UploadingAssetCard.propTypes = {
rawFile: PropTypes.instanceOf(File),
type: PropTypes.oneOf(Object.values(AssetType)),
}).isRequired,
folderId: PropTypes.number,
folderId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
onCancel: PropTypes.func.isRequired,
onStatusChange: PropTypes.func.isRequired,
};

2
packages/core/upload/admin/src/components/EditAssetDialog/index.js
View File

@ -108,7 +108,7 @@ export const EditAssetDialog = ({
alternativeText: asset.alternativeText ?? undefined,
caption: asset.caption ?? undefined,
parent: {
value: activeFolderId ?? null,
value: activeFolderId ?? undefined,
label:
findRecursiveFolderByValue(folderStructure, activeFolderId)?.label ??
folderStructure[0].label,

6
packages/core/upload/admin/src/components/EditFolderDialog/EditFolderDialog.js
View File

@ -54,7 +54,9 @@ export const EditFolderDialog = ({ onClose, folder, parentFolderId }) => {
const initialFormData = !folderStructureIsLoading && {
name: folder?.name ?? undefined,
parent: {
value: parentFolderId ? parseInt(parentFolderId, 10) : folderStructure[0].value,
/* ideally we would use folderStructure[0].value, but since it is null
react complains about rendering null as field value */
value: parentFolderId ? parseInt(parentFolderId, 10) : undefined,
label: parentFolderId
? findRecursiveFolderByValue(folderStructure, parseInt(parentFolderId, 10))?.label
: folderStructure[0].label,
@ -291,5 +293,5 @@ EditFolderDialog.defaultProps = {
EditFolderDialog.propTypes = {
folder: FolderDefinition,
onClose: PropTypes.func.isRequired,
parentFolderId: PropTypes.number,
parentFolderId: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
};

4
packages/core/upload/admin/src/components/SelectTree/Option.js
View File

@ -50,12 +50,12 @@ const Option = ({ children, data, selectProps, ...props }) => {
};
Option.propTypes = {
children: PropTypes.arrayOf(PropTypes.element).isRequired,
children: PropTypes.node.isRequired,
data: PropTypes.object.isRequired,
onToggle: PropTypes.func.isRequired,
selectProps: PropTypes.shape({
maxDisplayDepth: PropTypes.number,
openValues: PropTypes.arrayOf([PropTypes.string, PropTypes.number]),
openValues: PropTypes.arrayOf(PropTypes.oneOfType([PropTypes.string, PropTypes.number])),
onOptionToggle: PropTypes.func,
}).isRequired,
};

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

@ -171,7 +171,7 @@ PendingAssetStep.defaultProps = {
PendingAssetStep.propTypes = {
addUploadedFiles: PropTypes.func,
assets: PropTypes.arrayOf(AssetDefinition).isRequired,
folderId: PropTypes.number,
folderId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
onClose: PropTypes.func.isRequired,
onEditAsset: PropTypes.func.isRequired,
onRemoveAsset: PropTypes.func.isRequired,

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

@ -133,7 +133,7 @@ UploadAssetDialog.defaultProps = {
UploadAssetDialog.propTypes = {
addUploadedFiles: PropTypes.func,
folderId: PropTypes.number,
folderId: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
initialAssetsToAdd: PropTypes.arrayOf(AssetDefinition),
onClose: PropTypes.func.isRequired,
trackedLocation: PropTypes.string,