@@ -140,6 +140,7 @@ import {
140
140
141
141
import FilterObjectsSB from "../../../../ObjectBrowser/FilterObjectsSB" ;
142
142
import AddAccessRule from "../../../BucketDetails/AddAccessRule" ;
143
+ import { isVersionedMode } from "../../../../../../utils/validationFunctions" ;
143
144
144
145
const DeleteMultipleObjects = withSuspense (
145
146
React . lazy ( ( ) => import ( "./DeleteMultipleObjects" ) )
@@ -259,7 +260,7 @@ const ListObjects = () => {
259
260
( state : AppState ) => state . objectBrowser . simplePath
260
261
) ;
261
262
262
- const isVersioned = useSelector (
263
+ const versioningConfig = useSelector (
263
264
( state : AppState ) => state . objectBrowser . versionInfo
264
265
) ;
265
266
const lockingEnabled = useSelector (
@@ -297,6 +298,7 @@ const ListObjects = () => {
297
298
const [ canPreviewFile , setCanPreviewFile ] = useState < boolean > ( false ) ;
298
299
const [ quota , setQuota ] = useState < BucketQuota | null > ( null ) ;
299
300
301
+ const isVersioningApplied = isVersionedMode ( versioningConfig . status ) ;
300
302
const bucketName = params . bucketName || "" ;
301
303
302
304
const pathSegment = location . pathname . split ( `/browser/${ bucketName } /` ) ;
@@ -890,7 +892,7 @@ const ListObjects = () => {
890
892
selectedBucket = { bucketName }
891
893
selectedObjects = { selectedObjects }
892
894
closeDeleteModalAndRefresh = { closeDeleteMultipleModalAndRefresh }
893
- versioning = { isVersioned }
895
+ versioning = { versioningConfig }
894
896
/>
895
897
) }
896
898
{ rewindSelect && (
@@ -1019,7 +1021,7 @@ const ListObjects = () => {
1019
1021
setRewindSelect ( true ) ;
1020
1022
} }
1021
1023
disabled = {
1022
- ! isVersioned ||
1024
+ ! isVersioningApplied ||
1023
1025
! hasPermission ( bucketName , [
1024
1026
IAM_SCOPES . S3_GET_OBJECT ,
1025
1027
IAM_SCOPES . S3_GET_ACTIONS ,
@@ -1130,7 +1132,7 @@ const ListObjects = () => {
1130
1132
bucketName = { bucketName }
1131
1133
internalPaths = { pageTitle }
1132
1134
additionalOptions = {
1133
- ! isVersioned || rewindEnabled ? null : (
1135
+ ! isVersioningApplied || rewindEnabled ? null : (
1134
1136
< div >
1135
1137
< CheckboxWrapper
1136
1138
name = { "deleted_objects" }
@@ -1181,7 +1183,7 @@ const ListObjects = () => {
1181
1183
internalPaths = { selectedInternalPaths }
1182
1184
bucketName = { bucketName }
1183
1185
onClosePanel = { onClosePanel }
1184
- versioningInfo = { isVersioned }
1186
+ versioningInfo = { versioningConfig }
1185
1187
locking = { lockingEnabled }
1186
1188
/>
1187
1189
) }
0 commit comments