@@ -142,6 +142,7 @@ import {
142
142
143
143
import FilterObjectsSB from "../../../../ObjectBrowser/FilterObjectsSB" ;
144
144
import AddAccessRule from "../../../BucketDetails/AddAccessRule" ;
145
+ import { isVersionedMode } from "../../../../../../utils/validationFunctions" ;
145
146
146
147
const DeleteMultipleObjects = withSuspense (
147
148
React . lazy ( ( ) => import ( "./DeleteMultipleObjects" ) )
@@ -257,7 +258,7 @@ const ListObjects = () => {
257
258
( state : AppState ) => state . objectBrowser . simplePath
258
259
) ;
259
260
260
- const isVersioned = useSelector (
261
+ const versioningConfig = useSelector (
261
262
( state : AppState ) => state . objectBrowser . versionInfo
262
263
) ;
263
264
const lockingEnabled = useSelector (
@@ -298,6 +299,7 @@ const ListObjects = () => {
298
299
const [ canPreviewFile , setCanPreviewFile ] = useState < boolean > ( false ) ;
299
300
const [ quota , setQuota ] = useState < BucketQuota | null > ( null ) ;
300
301
302
+ const isVersioningApplied = isVersionedMode ( versioningConfig . status ) ;
301
303
const bucketName = params . bucketName || "" ;
302
304
303
305
const pathSegment = location . pathname . split ( `/browser/${ bucketName } /` ) ;
@@ -925,7 +927,7 @@ const ListObjects = () => {
925
927
selectedBucket = { bucketName }
926
928
selectedObjects = { selectedObjects }
927
929
closeDeleteModalAndRefresh = { closeDeleteMultipleModalAndRefresh }
928
- versioning = { isVersioned }
930
+ versioning = { versioningConfig }
929
931
/>
930
932
) }
931
933
{ rewindSelect && (
@@ -1056,7 +1058,7 @@ const ListObjects = () => {
1056
1058
setRewindSelect ( true ) ;
1057
1059
} }
1058
1060
disabled = {
1059
- ! isVersioned ||
1061
+ ! isVersioningApplied ||
1060
1062
! hasPermission ( bucketName , [
1061
1063
IAM_SCOPES . S3_GET_OBJECT ,
1062
1064
IAM_SCOPES . S3_GET_ACTIONS ,
@@ -1163,7 +1165,7 @@ const ListObjects = () => {
1163
1165
bucketName = { bucketName }
1164
1166
internalPaths = { pageTitle }
1165
1167
additionalOptions = {
1166
- ! isVersioned || rewindEnabled ? null : (
1168
+ ! isVersioningApplied || rewindEnabled ? null : (
1167
1169
< div >
1168
1170
< CheckboxWrapper
1169
1171
name = { "deleted_objects" }
@@ -1214,7 +1216,7 @@ const ListObjects = () => {
1214
1216
internalPaths = { selectedInternalPaths }
1215
1217
bucketName = { bucketName }
1216
1218
onClosePanel = { onClosePanel }
1217
- versioningInfo = { isVersioned }
1219
+ versioningInfo = { versioningConfig }
1218
1220
locking = { lockingEnabled }
1219
1221
/>
1220
1222
) }
0 commit comments