1 files changed, 56 insertions, 16 deletions

diff --git a/apps/settings/src/components/Users/UserSettingsDialog.vue b/apps/settings/src/components/Users/UserSettingsDialog.vue
index 4d412146f9a..94c77d320dd 100644
--- a/apps/settings/src/components/Users/UserSettingsDialog.vue
+++ b/apps/settings/src/components/Users/UserSettingsDialog.vue
@@ -25,6 +25,11 @@
 				{{ t('settings', 'Show storage path') }}
 			</NcCheckboxRadioSwitch>
 			<NcCheckboxRadioSwitch type="switch"
+				data-test="showFirstLogin"
+				:checked.sync="showFirstLogin">
+				{{ t('settings', 'Show first login') }}
+			</NcCheckboxRadioSwitch>
+			<NcCheckboxRadioSwitch type="switch"
 				data-test="showLastLogin"
 				:checked.sync="showLastLogin">
 				{{ t('settings', 'Show last login') }}
@@ -38,6 +43,9 @@
 			</NcNoteCard>
 			<fieldset>
 				<legend>{{ t('settings', 'Group list sorting') }}</legend>
+				<NcNoteCard class="dialog__note"
+					type="info"
+					:text="t('settings', 'Sorting only applies to the currently loaded groups for performance reasons. Groups will be loaded as you navigate or search through the list.')" />
 				<NcCheckboxRadioSwitch type="radio"
 					:checked.sync="groupSorting"
 					data-test="sortGroupsByMemberCount"
@@ -70,13 +78,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>
@@ -87,14 +96,15 @@ import { formatFileSize, parseFileSize } from '@nextcloud/files'
 import { generateUrl } from '@nextcloud/router'
 
 import axios from '@nextcloud/axios'
-import NcAppSettingsDialog from '@nextcloud/vue/dist/Components/NcAppSettingsDialog.js'
-import NcAppSettingsSection from '@nextcloud/vue/dist/Components/NcAppSettingsSection.js'
-import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
-import NcNoteCard from '@nextcloud/vue/dist/Components/NcNoteCard.js'
-import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
+import NcAppSettingsDialog from '@nextcloud/vue/components/NcAppSettingsDialog'
+import NcAppSettingsSection from '@nextcloud/vue/components/NcAppSettingsSection'
+import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
+import NcNoteCard from '@nextcloud/vue/components/NcNoteCard'
+import NcSelect from '@nextcloud/vue/components/NcSelect'
 
 import { GroupSorting } from '../../constants/GroupManagement.ts'
 import { unlimitedQuota } from '../../utils/userUtils.ts'
+import logger from '../../logger.ts'
 
 export default {
 	name: 'UserSettingsDialog',
@@ -164,6 +174,15 @@ export default {
 			},
 		},
 
+		showFirstLogin: {
+			get() {
+				return this.showConfig.showFirstLogin
+			},
+			set(status) {
+				this.setShowConfig('showFirstLogin', status)
+			},
+		},
+
 		showLastLogin: {
 			get() {
 				return this.showConfig.showLastLogin
@@ -229,8 +248,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 +258,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 +289,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 }
 		},
 
 		/**
@@ -291,6 +325,12 @@ export default {
 </script>
 
 <style scoped lang="scss">
+.dialog {
+	&__note {
+		font-weight: normal;
+	}
+}
+
 fieldset {
 	font-weight: bold;
 }