From 0d4a12b5db445cf8ad8a427ac2575a8339f1e1eb Mon Sep 17 00:00:00 2001 From: Josh Date: Mon, 19 Feb 2024 17:49:03 -0500 Subject: fix(files): Dont't warn re: full storage on either zero or unlimited quotas Fixes #43535 Fixes #43280 Replaces #43544 Signed-off-by: Josh Signed-off-by: nextcloud-command Signed-off-by: nextcloud-command --- apps/files/src/components/NavigationQuota.vue | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'apps') diff --git a/apps/files/src/components/NavigationQuota.vue b/apps/files/src/components/NavigationQuota.vue index 943d61cf0f5..8f96481232d 100644 --- a/apps/files/src/components/NavigationQuota.vue +++ b/apps/files/src/components/NavigationQuota.vue @@ -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() } }, @@ -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() } -- cgit v1.2.3