Fix delete share download options permission check in sidebar (#2935)
This commit is contained in:
committed by
GitHub
parent
1b271ab467
commit
02ed6a6e8b
@@ -340,20 +340,20 @@ const ListObjects = () => {
|
||||
putObjectPermScopes
|
||||
);
|
||||
|
||||
const canDownload = hasPermission(bucketName, [
|
||||
IAM_SCOPES.S3_GET_OBJECT,
|
||||
IAM_SCOPES.S3_GET_ACTIONS,
|
||||
]);
|
||||
const canDelete = hasPermission(bucketName, [IAM_SCOPES.S3_DELETE_OBJECT]);
|
||||
const canDownload = hasPermission(
|
||||
[pathAsResourceInPolicy, ...sessionGrantWildCards],
|
||||
[IAM_SCOPES.S3_GET_OBJECT, IAM_SCOPES.S3_GET_ACTIONS]
|
||||
);
|
||||
const canDelete = hasPermission(
|
||||
[pathAsResourceInPolicy, ...sessionGrantWildCards],
|
||||
[IAM_SCOPES.S3_DELETE_OBJECT]
|
||||
);
|
||||
const canUpload =
|
||||
hasPermission(
|
||||
[pathAsResourceInPolicy, ...sessionGrantWildCards],
|
||||
putObjectPermScopes
|
||||
) || anonymousMode;
|
||||
|
||||
const displayDeleteObject = hasPermission(bucketName, [
|
||||
IAM_SCOPES.S3_DELETE_OBJECT,
|
||||
]);
|
||||
const canSetAnonymousAccess = hasPermission(bucketName, [
|
||||
IAM_SCOPES.S3_GET_BUCKET_POLICY,
|
||||
IAM_SCOPES.S3_PUT_BUCKET_POLICY,
|
||||
@@ -393,22 +393,22 @@ const ListObjects = () => {
|
||||
if (selectedObjects.length === 1) {
|
||||
const objectName = selectedObjects[0];
|
||||
|
||||
if (extensionPreview(objectName) !== "none") {
|
||||
if (extensionPreview(objectName) !== "none" && canDownload) {
|
||||
setCanPreviewFile(true);
|
||||
} else {
|
||||
setCanPreviewFile(false);
|
||||
}
|
||||
|
||||
if (objectName.endsWith("/")) {
|
||||
setCanShareFile(false);
|
||||
} else {
|
||||
if (objectName.endsWith("/") || canDownload) {
|
||||
setCanShareFile(true);
|
||||
} else {
|
||||
setCanShareFile(false);
|
||||
}
|
||||
} else {
|
||||
setCanShareFile(false);
|
||||
setCanPreviewFile(false);
|
||||
}
|
||||
}, [selectedObjects]);
|
||||
}, [selectedObjects, canDownload]);
|
||||
|
||||
useEffect(() => {
|
||||
if (!quota && !anonymousMode) {
|
||||
@@ -931,8 +931,7 @@ const ListObjects = () => {
|
||||
},
|
||||
label: "Delete",
|
||||
icon: <DeleteIcon />,
|
||||
disabled:
|
||||
!canDelete || selectedObjects.length === 0 || !displayDeleteObject,
|
||||
disabled: !canDelete || selectedObjects.length === 0,
|
||||
tooltip: canDelete
|
||||
? "Delete Selected Files"
|
||||
: permissionTooltipHelper(
|
||||
|
||||
Reference in New Issue
Block a user