diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjects.tsx b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjects.tsx
index 5886ce786..03fdb2e4d 100644
--- a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjects.tsx
+++ b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ListObjects.tsx
@@ -129,7 +129,7 @@ const styles = (theme: Theme) =>
browsePaper: {
height: "calc(100vh - 210px)",
"&.actionsPanelOpen": {
- height: "100%",
+ minHeight: "100%",
},
},
"@global": {
@@ -1043,6 +1043,17 @@ const ListObjects = ({
uploadPath = uploadPath.concat(currentPath);
}
+ const onClosePanel = (forceRefresh: boolean) => {
+ setDetailsOpen(false);
+ setSelectedInternalPaths(null);
+ setSelectedObjects([]);
+ setVersionsModeEnabled(false);
+
+ if(forceRefresh) {
+ setLoading(true);
+ }
+ };
+
const tableActions: ItemActions[] = [
{
type: "view",
@@ -1309,10 +1320,7 @@ const ListObjects = ({
{
- setDetailsOpen(false);
- setSelectedInternalPaths(null);
- setSelectedObjects([]);
- setVersionsModeEnabled(false);
+ onClosePanel(false);
}}
>
{selectedObjects.length > 0 && (
@@ -1325,6 +1333,7 @@ const ListObjects = ({
)}
diff --git a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ObjectDetailPanel.tsx b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ObjectDetailPanel.tsx
index 53f171193..b02de775a 100644
--- a/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ObjectDetailPanel.tsx
+++ b/portal-ui/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ObjectDetailPanel.tsx
@@ -60,7 +60,6 @@ import {
VersionsIcon,
} from "../../../../../../icons";
import { ShareIcon, DownloadIcon, DeleteIcon } from "../../../../../../icons";
-import history from "../../../../../../history";
import api from "../../../../../../common/api";
import ShareFile from "../ObjectDetails/ShareFile";
import SetRetention from "../ObjectDetails/SetRetention";
@@ -147,6 +146,7 @@ interface IObjectDetailPanelProps {
distributedSetup: boolean;
versionsMode: boolean;
selectedVersion: string;
+ onClosePanel: (hardRefresh: boolean) => void;
setErrorSnackMessage: typeof setErrorSnackMessage;
setSnackBarMessage: typeof setSnackBarMessage;
setNewObject: typeof setNewObject;
@@ -178,6 +178,7 @@ const ObjectDetailPanel = ({
completeObject,
versionsMode,
selectedVersion,
+ onClosePanel,
setVersionsModeEnabled,
}: IObjectDetailPanelProps) => {
const [loadObjectData, setLoadObjectData] = useState(true);
@@ -328,16 +329,11 @@ const ObjectDetailPanel = ({
);
};
- const closeDeleteModal = (redirectBack: boolean) => {
+ const closeDeleteModal = (closeAndReload: boolean) => {
setDeleteOpen(false);
- if (redirectBack) {
- const newPath = allPathData.join("/");
- history.push(
- `/buckets/${bucketName}/browse${
- newPath === "" ? "" : `/${encodeFileName(newPath)}`
- }`
- );
+ if (closeAndReload) {
+ onClosePanel(true);
}
};
@@ -454,35 +450,6 @@ const ObjectDetailPanel = ({
},
];
- /*
- *
- *
- *
- {selectedVersion === "" ? (
- {
- setTagModalOpen(true);
- }}
- />
- }
- />
- ) : (
-
- Tags:
-
-
-
- )}
-
- *
- * */
const calculateLastModifyTime = (lastModified: string) => {
const currentTime = new Date();
const modifiedTime = new Date(lastModified);