Skip to content

Add a "+" sign after version number and total size if there are more than 20 versions #3569

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ const ObjectDetailPanel = ({
const [deleteOpen, setDeleteOpen] = useState<boolean>(false);
const [previewOpen, setPreviewOpen] = useState<boolean>(false);
const [totalVersionsSize, setTotalVersionsSize] = useState<number>(0);
const [moreVersionsThanLimit, setMoreVersionsThanLimit] = useState<boolean>(false);
const [longFileOpen, setLongFileOpen] = useState<boolean>(false);
const [metaData, setMetaData] = useState<any | null>(null);
const [loadMetadata, setLoadingMetadata] = useState<boolean>(false);
Expand Down Expand Up @@ -154,10 +155,15 @@ const ObjectDetailPanel = ({
.listObjects(bucketName, {
prefix: internalPaths,
with_versions: distributedSetup,
limit: 21
})
.then((res) => {
const result: BucketObject[] = res.data.objects || [];
if (distributedSetup) {

setMoreVersionsThanLimit(result.length > 20);
result.splice(20);

setAllInfoElements(result);
setVersions(result);

Expand Down Expand Up @@ -573,8 +579,8 @@ const ObjectDetailPanel = ({
<Box className={"detailContainer"}>
<strong>Versions:</strong>
<br />
{versions.length} version{versions.length !== 1 ? "s" : ""},{" "}
{niceBytesInt(totalVersionsSize)}
{versions.length}{moreVersionsThanLimit ? "+" : ""} version{versions.length !== 1 ? "s" : ""},{" "}
{niceBytesInt(totalVersionsSize)}{moreVersionsThanLimit ? "+" : ""}
</Box>
)}
{selectedVersion === "" && (
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ const VersionsNavigator = ({
const [actualInfo, setActualInfo] = useState<BucketObject | null>(null);
const [objectToShare, setObjectToShare] = useState<BucketObject | null>(null);
const [versions, setVersions] = useState<BucketObject[]>([]);
const [moreVersionsThanLimit, setMoreVersionsThanLimit] = useState<boolean>(false);
const [restoreVersionOpen, setRestoreVersionOpen] = useState<boolean>(false);
const [restoreVersion, setRestoreVersion] = useState<BucketObject | null>(
null,
Expand Down Expand Up @@ -124,10 +125,14 @@ const VersionsNavigator = ({
.listObjects(bucketName, {
prefix: internalPaths,
with_versions: distributedSetup,
limit: 21,
})
.then((res) => {
const result = get(res.data, "objects", []);

setMoreVersionsThanLimit(result.length > 20);
result.splice(20);

// Filter the results prefixes as API can return more files than expected.
const filteredPrefixes = result.filter(
(item: BucketObject) => item.name === internalPaths,
Expand Down Expand Up @@ -423,12 +428,12 @@ const VersionsNavigator = ({
<Fragment>
<span className={"detailsSpacer"}>
<strong>
{versions.length} Version
{versions.length}{moreVersionsThanLimit ? "+" : ""} Version
{versions.length === 1 ? "" : "s"}&nbsp;&nbsp;&nbsp;
</strong>
</span>
<span className={"detailsSpacer"}>
<strong>{niceBytesInt(totalSpace)}</strong>
<strong>{niceBytesInt(totalSpace)}{moreVersionsThanLimit ? "+" : ""}</strong>
</span>
</Fragment>
}
Expand Down