Skip to content

Commit 4cadaf7

Browse files
authored
Cleaned up Tooltips and HelpTips on AddBucket screen (#3154)
1 parent 7484861 commit 4cadaf7

File tree

1 file changed

+24
-9
lines changed
  • portal-ui/src/screens/Console/Buckets/ListBuckets/AddBucket

1 file changed

+24
-9
lines changed

portal-ui/src/screens/Console/Buckets/ListBuckets/AddBucket/AddBucket.tsx

Lines changed: 24 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -339,9 +339,7 @@ const AddBucket = () => {
339339
}
340340
tooltip={
341341
versioningAllowed
342-
? lockingEnabled && versioningEnabled
343-
? "You must disable Locking before Versioning can be disabled"
344-
: ""
342+
? ""
345343
: permissionTooltipHelper(
346344
[
347345
IAM_SCOPES.S3_PUT_BUCKET_VERSIONING,
@@ -352,12 +350,19 @@ const AddBucket = () => {
352350
}
353351
helpTip={
354352
<Fragment>
353+
{lockingEnabled && versioningEnabled && (
354+
<strong>
355+
{" "}
356+
You must disable Object Locking before Versioning can
357+
be disabled <br />
358+
</strong>
359+
)}
355360
MinIO supports keeping multiple{" "}
356361
<a
357362
href="https://min.io/docs/minio/kubernetes/upstream/administration/object-management/object-versioning.html#minio-bucket-versioning"
358363
target="blank"
359364
>
360-
versions
365+
versions
361366
</a>{" "}
362367
of an object in a single bucket.
363368
<br />
@@ -399,6 +404,7 @@ const AddBucket = () => {
399404
from versioning if Object Locking is not enabled.
400405
<br />
401406
MinIO requires versioning to support replication.
407+
<br />
402408
Objects in excluded prefixes do not replicate to any
403409
peer site or remote site.
404410
</Fragment>
@@ -440,11 +446,7 @@ const AddBucket = () => {
440446
label={"Object Locking"}
441447
tooltip={
442448
lockingAllowed
443-
? `${
444-
versioningEnabled
445-
? "Exclude Folders & Exclude Prefixes options will not be available if this option is enabled."
446-
: ""
447-
}`
449+
? ``
448450
: permissionTooltipHelper(
449451
[
450452
IAM_SCOPES.S3_PUT_BUCKET_VERSIONING,
@@ -456,6 +458,13 @@ const AddBucket = () => {
456458
}
457459
helpTip={
458460
<Fragment>
461+
{retentionEnabled && (
462+
<strong>
463+
{" "}
464+
You must disable Retention before Object Locking can
465+
be disabled <br />
466+
</strong>
467+
)}
459468
You can only enable{" "}
460469
<a
461470
href="https://min.io/docs/minio/macos/administration/object-management.html#object-retention"
@@ -464,6 +473,12 @@ const AddBucket = () => {
464473
Object Locking
465474
</a>{" "}
466475
when first creating a bucket.
476+
<br />
477+
<br />
478+
<a href="https://min.io/docs/minio/windows/administration/object-management/object-versioning.html#exclude-folders-from-versioning">
479+
Exclude folders and prefixes
480+
</a>{" "}
481+
options will not be available if this option is enabled.
467482
</Fragment>
468483
}
469484
helpTipPlacement="right"

0 commit comments

Comments
 (0)