Skip to content

Commit 88cd0d4

Browse files
authored
Add a "+" sign after version number and total size if there are more than 20 versions (#3569)
1 parent ffaa993 commit 88cd0d4

File tree

4 files changed

+27
-5
lines changed

4 files changed

+27
-5
lines changed

web-app/src/screens/Console/Buckets/ListBuckets/Objects/ListObjects/ObjectDetailPanel.tsx

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,8 @@ const ObjectDetailPanel = ({
114114
const [deleteOpen, setDeleteOpen] = useState<boolean>(false);
115115
const [previewOpen, setPreviewOpen] = useState<boolean>(false);
116116
const [totalVersionsSize, setTotalVersionsSize] = useState<number>(0);
117+
const [moreVersionsThanLimit, setMoreVersionsThanLimit] =
118+
useState<boolean>(false);
117119
const [longFileOpen, setLongFileOpen] = useState<boolean>(false);
118120
const [metaData, setMetaData] = useState<any | null>(null);
119121
const [loadMetadata, setLoadingMetadata] = useState<boolean>(false);
@@ -154,10 +156,14 @@ const ObjectDetailPanel = ({
154156
.listObjects(bucketName, {
155157
prefix: internalPaths,
156158
with_versions: distributedSetup,
159+
limit: 21,
157160
})
158161
.then((res) => {
159162
const result: BucketObject[] = res.data.objects || [];
160163
if (distributedSetup) {
164+
setMoreVersionsThanLimit(result.length > 20);
165+
result.splice(20);
166+
161167
setAllInfoElements(result);
162168
setVersions(result);
163169

@@ -573,8 +579,11 @@ const ObjectDetailPanel = ({
573579
<Box className={"detailContainer"}>
574580
<strong>Versions:</strong>
575581
<br />
576-
{versions.length} version{versions.length !== 1 ? "s" : ""},{" "}
582+
{versions.length}
583+
{moreVersionsThanLimit ? "+" : ""} version
584+
{versions.length !== 1 ? "s" : ""},{" "}
577585
{niceBytesInt(totalVersionsSize)}
586+
{moreVersionsThanLimit ? "+" : ""}
578587
</Box>
579588
)}
580589
{selectedVersion === "" && (

web-app/src/screens/Console/Buckets/ListBuckets/Objects/ObjectDetails/VersionsNavigator.tsx

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,8 @@ const VersionsNavigator = ({
9494
const [actualInfo, setActualInfo] = useState<BucketObject | null>(null);
9595
const [objectToShare, setObjectToShare] = useState<BucketObject | null>(null);
9696
const [versions, setVersions] = useState<BucketObject[]>([]);
97+
const [moreVersionsThanLimit, setMoreVersionsThanLimit] =
98+
useState<boolean>(false);
9799
const [restoreVersionOpen, setRestoreVersionOpen] = useState<boolean>(false);
98100
const [restoreVersion, setRestoreVersion] = useState<BucketObject | null>(
99101
null,
@@ -124,10 +126,14 @@ const VersionsNavigator = ({
124126
.listObjects(bucketName, {
125127
prefix: internalPaths,
126128
with_versions: distributedSetup,
129+
limit: 21,
127130
})
128131
.then((res) => {
129132
const result = get(res.data, "objects", []);
130133

134+
setMoreVersionsThanLimit(result.length > 20);
135+
result.splice(20);
136+
131137
// Filter the results prefixes as API can return more files than expected.
132138
const filteredPrefixes = result.filter(
133139
(item: BucketObject) => item.name === internalPaths,
@@ -423,12 +429,16 @@ const VersionsNavigator = ({
423429
<Fragment>
424430
<span className={"detailsSpacer"}>
425431
<strong>
426-
{versions.length} Version
432+
{versions.length}
433+
{moreVersionsThanLimit ? "+" : ""} Version
427434
{versions.length === 1 ? "" : "s"}&nbsp;&nbsp;&nbsp;
428435
</strong>
429436
</span>
430437
<span className={"detailsSpacer"}>
431-
<strong>{niceBytesInt(totalSpace)}</strong>
438+
<strong>
439+
{niceBytesInt(totalSpace)}
440+
{moreVersionsThanLimit ? "+" : ""}
441+
</strong>
432442
</span>
433443
</Fragment>
434444
}

web-app/src/screens/Console/Menu/MenuWrapper.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,9 @@ const MenuWrapper = () => {
5959
<MenuItem
6060
name={"Documentation"}
6161
icon={<DocumentationIcon />}
62-
path={"https://docs.min.io/community/minio-object-store/index.html?ref=con"}
62+
path={
63+
"https://docs.min.io/community/minio-object-store/index.html?ref=con"
64+
}
6365
/>
6466
<MenuItem
6567
name={"License"}

web-app/src/screens/LoginPage/Login.tsx

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,8 @@ const Login = () => {
131131
);
132132
}
133133

134-
let docsURL = "https://docs.min.io/community/minio-object-store/index.html?ref=con";
134+
let docsURL =
135+
"https://docs.min.io/community/minio-object-store/index.html?ref=con";
135136

136137
useEffect(() => {
137138
dispatch(setHelpName("login"));

0 commit comments

Comments
 (0)