Skip to content

Commit 497f73d

Browse files
committed
Only show limit warnings when necessary and relevant
1 parent b78aa18 commit 497f73d

File tree

2 files changed

+10
-10
lines changed

2 files changed

+10
-10
lines changed

resources/scripts/components/server/backups/BackupContainer.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,11 +37,6 @@ export default () => {
3737
return (
3838
<PageContentBlock>
3939
<FlashMessageRender byKey={'backups'} className={'mb-4'}/>
40-
{featureLimits.backups !== 0 &&
41-
<p className="text-center text-md text-neutral-400">
42-
You are currently using {backups.length} of {featureLimits.backups} backups.
43-
</p>
44-
}
4540
{!backups.length ?
4641
<p className="text-center text-sm text-neutral-400">
4742
There are no backups stored for this server.
@@ -61,6 +56,11 @@ export default () => {
6156
</p>
6257
}
6358
<Can action={'backup.create'}>
59+
{(featureLimits.backups > 0 && backups.length > 0) &&
60+
<p className="text-center text-xs text-neutral-400 mt-2">
61+
{backups.length} of {featureLimits.backups} backups have been created for this server.
62+
</p>
63+
}
6464
{featureLimits.backups > 0 && featureLimits.backups !== backups.length &&
6565
<div className={'mt-6 flex justify-end'}>
6666
<CreateBackupButton/>

resources/scripts/components/server/databases/DatabasesContainer.tsx

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,6 @@ export default () => {
3636
return (
3737
<PageContentBlock>
3838
<FlashMessageRender byKey={'databases'} className={'mb-4'}/>
39-
{featureLimits.databases !== 0 &&
40-
<p className="text-center text-md text-neutral-400">
41-
You are currently using {databases.length} of {featureLimits.databases} databases.
42-
</p>
43-
}
4439
{(!databases.length && loading) ?
4540
<Spinner size={'large'} centered={true}/>
4641
:
@@ -64,6 +59,11 @@ export default () => {
6459
</p>
6560
}
6661
<Can action={'database.create'}>
62+
{(featureLimits.databases > 0 && databases.length > 0) &&
63+
<p className="text-center text-xs text-neutral-400 mt-2">
64+
{databases.length} of {featureLimits.databases} databases have been allocated to this server.
65+
</p>
66+
}
6767
{featureLimits.databases > 0 && featureLimits.databases !== databases.length &&
6868
<div className={'mt-6 flex justify-end'}>
6969
<CreateDatabaseButton/>

0 commit comments

Comments
 (0)