Skip to content

Commit

Permalink
fix(files): Dont't warn re: full storage on either zero or unlimited …
Browse files Browse the repository at this point in the history
…quotas

Fixes #43535

Fixes #43280

Replaces #43544

Signed-off-by: Josh <josh.t.richards@gmail.com>

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>

Signed-off-by: nextcloud-command <nextcloud-command@users.noreply.github.com>
  • Loading branch information
joshtrichards authored and nextcloud-command committed Feb 20, 2024
1 parent 5a5a896 commit 9a87b9f
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 10 deletions.
18 changes: 14 additions & 4 deletions apps/files/src/components/NavigationQuota.vue
Expand Up @@ -88,8 +88,17 @@ export default {
},
mounted() {
// Warn the user if the available storage is 0 on page load
if (this.storageStats?.free <= 0) {
// If the user has a quota set, warn if the available account storage is <=0
//
// NOTE: This doesn't catch situations where actual *server*
// disk (non-quota) space is low, but those should probably
// be handled differently anyway since a regular user can't
// can't do much about them (If we did want to indicate server disk
// space matters to users, we'd probably want to use a warning
// specific to that situation anyhow. So this covers warning covers
// our primary day-to-day concern (individual account quota usage).
//
if (this.storageStats?.quota > 0 && this.storageStats?.free <= 0) {
this.showStorageFullWarning()
}
},
Expand Down Expand Up @@ -122,8 +131,9 @@ export default {
throw new Error('Invalid storage stats')
}
// Warn the user if the available storage changed from > 0 to 0
if (this.storageStats?.free > 0 && response.data.data?.free <= 0) {
// Warn the user if the available account storage changed from > 0 to 0
// (unless only because quota was intentionally set to 0 by admin in the interim)
if (this.storageStats?.free > 0 && response.data.data?.free <= 0 && response.data.data?.quota > 0) {
this.showStorageFullWarning()
}
Expand Down
4 changes: 2 additions & 2 deletions dist/core-common.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/core-common.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/files-main.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files-main.js.map

Large diffs are not rendered by default.

0 comments on commit 9a87b9f

Please sign in to comment.