fix(settings): Correctly parse and display default quota

In the account management settings (default settings) the quota was parsed not consistently with how we do it everywhere else. Meaning `1 KB` should be 1024 bytes not 1000 bytes. Also this fixes an issue where searching "1KB" does not yield any output because of the space in the parsed value "1 KB". Signed-off-by: Ferdinand Thiessen <[email protected]>
nextcloud · Jan 16, 2025 · 205d646 · 205d646
1 parent 568bd4f
commit 205d646
Showing 1 changed file with 28 additions and 11 deletions.
diff --git a/apps/settings/src/components/Users/UserSettingsDialog.vue b/apps/settings/src/components/Users/UserSettingsDialog.vue
@@ -70,13 +70,14 @@
 		<NcAppSettingsSection id="default-settings"
 			:name="t('settings', 'Defaults')">
 			<NcSelect v-model="defaultQuota"
+				:clearable="false"
+				:create-option="validateQuota"
+				:filter-by="filterQuotas"
 				:input-label="t('settings', 'Default quota')"
-				placement="top"
-				:taggable="true"
 				:options="quotaOptions"
-				:create-option="validateQuota"
+				placement="top"
 				:placeholder="t('settings', 'Select default quota')"
-				:clearable="false"
+				taggable
 				@option:selected="setDefaultQuota" />
 		</NcAppSettingsSection>
 	</NcAppSettingsDialog>
@@ -95,6 +96,7 @@ import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
 
 import { GroupSorting } from '../../constants/GroupManagement.ts'
 import { unlimitedQuota } from '../../utils/userUtils.ts'
+import logger from '../../logger.ts'
 
 export default {
 	name: 'UserSettingsDialog',
@@ -229,8 +231,8 @@ export default {
 						newUserSendEmail: value,
 					})
 					await axios.post(generateUrl('/settings/users/preferences/newUser.sendEmail'), { value: value ? 'yes' : 'no' })
-				} catch (e) {
-					console.error('could not update newUser.sendEmail preference: ' + e.message, e)
+				} catch (error) {
+					logger.error('Could not update newUser.sendEmail preference', { error })
 				} finally {
 					this.loadingSendMail = false
 				}
@@ -239,6 +241,22 @@ export default {
 	},
 
 	methods: {
+		/**
+		 * Check if a quota matches the current search.
+		 * This is a custom filter function to allow to map "1GB" to the label "1 GB" (ignoring whitespaces).
+		 *
+		 * @param option The quota to check
+		 * @param label The label of the quota
+		 * @param search The search string
+		 */
+		filterQuotas(option, label, search) {
+			const searchValue = search.toLocaleLowerCase().replaceAll(/\s/g, '')
+			return (label || '')
+				.toLocaleLowerCase()
+				.replaceAll(/\s/g, '')
+				.indexOf(searchValue) > -1
+		},
+
 		setShowConfig(key, status) {
 			this.$store.commit('setShowConfig', { key, value: status })
 		},
@@ -254,14 +272,13 @@ export default {
 				quota = quota?.id || quota.label
 			}
 			// only used for new presets sent through @Tag
-			const validQuota = parseFileSize(quota)
+			const validQuota = parseFileSize(quota, true)
 			if (validQuota === null) {
 				return unlimitedQuota
-			} else {
-				// unify format output
-				quota = formatFileSize(parseFileSize(quota))
-				return { id: quota, label: quota }
 			}
+			// unify format output
+			quota = formatFileSize(validQuota)
+			return { id: quota, label: quota }
 		},
 
 		/**