Merge pull request #42186 from nextcloud/fix/files-quota-nav

fix(files): Partly revert 32c1aeb and show correct quota again
nextcloud · Dec 14, 2023 · 5d7b6f1 · 5d7b6f1
2 parents bac05ca + 2d5d782
commit 5d7b6f1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/apps/files/src/components/NavigationQuota.vue b/apps/files/src/components/NavigationQuota.vue
@@ -52,8 +52,8 @@ export default {
 
 	computed: {
 		storageStatsTitle() {
-			const usedQuotaByte = formatFileSize(this.storageStats?.used, false, false, true)
-			const quotaByte = formatFileSize(this.storageStats?.quota, false, false, true)
+			const usedQuotaByte = formatFileSize(this.storageStats?.used, false, false)
+			const quotaByte = formatFileSize(this.storageStats?.quota, false, false)
 
 			// If no quota set
 			if (this.storageStats?.quota < 0) {

diff --git a/apps/files/src/views/Navigation.cy.ts b/apps/files/src/views/Navigation.cy.ts
@@ -178,7 +178,7 @@ describe('Quota rendering', () => {
 
 	it('Unlimited quota', () => {
 		cy.mockInitialState('files', 'storageStats', {
-			used: 1000 * 1000 * 1000,
+			used: 1024 * 1024 * 1024,
 			quota: -1,
 		})
 
@@ -200,8 +200,8 @@ describe('Quota rendering', () => {
 
 	it('Non-reached quota', () => {
 		cy.mockInitialState('files', 'storageStats', {
-			used: 1000 * 1000 * 1000,
-			quota: 5 * 1000 * 1000 * 1000,
+			used: 1024 * 1024 * 1024,
+			quota: 5 * 1024 * 1024 * 1024,
 			relative: 20, // percent
 		})
 
@@ -224,8 +224,8 @@ describe('Quota rendering', () => {
 
 	it('Reached quota', () => {
 		cy.mockInitialState('files', 'storageStats', {
-			used: 5 * 1000 * 1000 * 1000,
-			quota: 1000 * 1000 * 1000,
+			used: 5 * 1024 * 1024 * 1024,
+			quota: 1024 * 1024 * 1024,
 			relative: 500, // percent
 		})
 

diff --git a/dist/files-main.js b/dist/files-main.js
diff --git a/dist/files-main.js.map b/dist/files-main.js.map