Skip to content

Commit c59afa8

Browse files
committed
fix to show or hide show deleted objects option based on versioning status
1 parent fb5193d commit c59afa8

File tree

2 files changed

+18
-6
lines changed

2 files changed

+18
-6
lines changed

portal-ui/src/screens/Console/Buckets/BucketDetails/BrowserHandler.tsx

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,16 @@ const BrowserHandler = () => {
293293
[bucketName, rewindEnabled, showDeleted, dispatch, onMessageCallBack]
294294
);
295295

296+
useEffect(() => {
297+
// when a bucket param changes, (i.e /browser/:bucketName), re-init e.g with KBar
298+
if (bucketName) {
299+
dispatch(resetMessages());
300+
dispatch(setLoadingRecords(true));
301+
dispatch(setLoadingObjects(true));
302+
initWSRequest("", new Date());
303+
}
304+
}, [bucketName, dispatch, initWSRequest]);
305+
296306
useEffect(() => {
297307
return () => {
298308
const request: WebsocketRequest = {
@@ -333,7 +343,7 @@ const BrowserHandler = () => {
333343
)
334344
);
335345
}
336-
}, [internalPaths, rewindDate, rewindEnabled, dispatch]);
346+
}, [bucketName, internalPaths, rewindDate, rewindEnabled, dispatch]);
337347

338348
// Direct file access effect / prefix
339349
useEffect(() => {

portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjects.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,7 @@ import {
142142

143143
import FilterObjectsSB from "../../../../ObjectBrowser/FilterObjectsSB";
144144
import AddAccessRule from "../../../BucketDetails/AddAccessRule";
145+
import { isVersionedMode } from "../../../../../../utils/validationFunctions";
145146

146147
const DeleteMultipleObjects = withSuspense(
147148
React.lazy(() => import("./DeleteMultipleObjects"))
@@ -257,7 +258,7 @@ const ListObjects = () => {
257258
(state: AppState) => state.objectBrowser.simplePath
258259
);
259260

260-
const isVersioned = useSelector(
261+
const versioningConfig = useSelector(
261262
(state: AppState) => state.objectBrowser.versionInfo
262263
);
263264
const lockingEnabled = useSelector(
@@ -298,6 +299,7 @@ const ListObjects = () => {
298299
const [canPreviewFile, setCanPreviewFile] = useState<boolean>(false);
299300
const [quota, setQuota] = useState<BucketQuota | null>(null);
300301

302+
const isVersioningApplied = isVersionedMode(versioningConfig.status);
301303
const bucketName = params.bucketName || "";
302304

303305
const pathSegment = location.pathname.split(`/browser/${bucketName}/`);
@@ -925,7 +927,7 @@ const ListObjects = () => {
925927
selectedBucket={bucketName}
926928
selectedObjects={selectedObjects}
927929
closeDeleteModalAndRefresh={closeDeleteMultipleModalAndRefresh}
928-
versioning={isVersioned}
930+
versioning={versioningConfig}
929931
/>
930932
)}
931933
{rewindSelect && (
@@ -1056,7 +1058,7 @@ const ListObjects = () => {
10561058
setRewindSelect(true);
10571059
}}
10581060
disabled={
1059-
!isVersioned ||
1061+
!isVersioningApplied ||
10601062
!hasPermission(bucketName, [
10611063
IAM_SCOPES.S3_GET_OBJECT,
10621064
IAM_SCOPES.S3_GET_ACTIONS,
@@ -1163,7 +1165,7 @@ const ListObjects = () => {
11631165
bucketName={bucketName}
11641166
internalPaths={pageTitle}
11651167
additionalOptions={
1166-
!isVersioned || rewindEnabled ? null : (
1168+
!isVersioningApplied || rewindEnabled ? null : (
11671169
<div>
11681170
<CheckboxWrapper
11691171
name={"deleted_objects"}
@@ -1214,7 +1216,7 @@ const ListObjects = () => {
12141216
internalPaths={selectedInternalPaths}
12151217
bucketName={bucketName}
12161218
onClosePanel={onClosePanel}
1217-
versioningInfo={isVersioned}
1219+
versioningInfo={versioningConfig}
12181220
locking={lockingEnabled}
12191221
/>
12201222
)}

0 commit comments

Comments
 (0)