Skip to content

refactor(UserSettings): use NcSelect for batchtime #2539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Antreesy merged 2 commits into from
Oct 1, 2025
Merged

refactor(UserSettings): use NcSelect for batchtime #2539

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f9620f
refactor(UserSettings): use `NcSelect` for batchtime
susnux Oct 1, 2025
6100d79
chore(assets): Recompile assets
nextcloud-command Oct 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 37 additions & 17 deletions src/views/UserSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,21 +8,19 @@
<div class="notification-frequency__warning">
<strong v-if="!config.is_email_set">{{ t('notifications', 'You need to set up your email address before you can receive notification emails.') }}</strong>
</div>
<p>
<div class="notification-frequency__wrapper">
<label for="notification_reminder_batchtime" class="notification-frequency__label">
{{ t('notifications', 'Send email reminders about unhandled notifications after:') }}
</label>
<select
<NcSelect
id="notification_reminder_batchtime"
v-model="config.setting_batchtime"
name="notification_reminder_batchtime"
v-model="currentBatchTime"
class="notification-frequency__select"
@change="updateSettings()">
<option v-for="option in BATCHTIME_OPTIONS" :key="option.value" :value="option.value">
{{ option.text }}
</option>
</select>
</p>
:clearable="false"
label-outside
:options="BATCHTIME_OPTIONS"
@update:model-value="updateSettings" />
</div>

<NcCheckboxRadioSwitch
v-model="config.sound_notification"
Expand Down Expand Up @@ -68,7 +66,7 @@ import { loadState } from '@nextcloud/initial-state'
import { t } from '@nextcloud/l10n'
import { generateOcsUrl } from '@nextcloud/router'
import { UAParser } from 'ua-parser-js'
import { reactive, ref } from 'vue'
import { computed, reactive, ref } from 'vue'
import NcCheckboxRadioSwitch from '@nextcloud/vue/components/NcCheckboxRadioSwitch'
import NcSelect from '@nextcloud/vue/components/NcSelect'
import NcSettingsSection from '@nextcloud/vue/components/NcSettingsSection'
Expand All @@ -82,11 +80,11 @@ const EmailFrequency = {
EMAIL_SEND_WEEKLY: 4,
}
const BATCHTIME_OPTIONS = [
{ text: t('notifications', 'Never'), value: EmailFrequency.EMAIL_SEND_OFF },
{ text: t('notifications', '1 hour'), value: EmailFrequency.EMAIL_SEND_HOURLY },
{ text: t('notifications', '3 hours'), value: EmailFrequency.EMAIL_SEND_3HOURLY },
{ text: t('notifications', '1 day'), value: EmailFrequency.EMAIL_SEND_DAILY },
{ text: t('notifications', '1 week'), value: EmailFrequency.EMAIL_SEND_WEEKLY },
{ label: t('notifications', 'Never'), value: EmailFrequency.EMAIL_SEND_OFF },
{ label: t('notifications', '1 hour'), value: EmailFrequency.EMAIL_SEND_HOURLY },
{ label: t('notifications', '3 hours'), value: EmailFrequency.EMAIL_SEND_3HOURLY },
{ label: t('notifications', '1 day'), value: EmailFrequency.EMAIL_SEND_DAILY },
{ label: t('notifications', '1 week'), value: EmailFrequency.EMAIL_SEND_WEEKLY },
]
const EMPTY_DEVICE_OPTION = { id: null, label: t('notifications', 'None') }
const parser = new UAParser()
Expand All @@ -109,12 +107,23 @@ export default {
})
const devices = ref([])

const currentBatchTime = computed({
get() {
return BATCHTIME_OPTIONS.find(({ value }) => value === config.setting_batchtime)
},
set({ value }) {
config.setting_batchtime = value
},
})

return {
BATCHTIME_OPTIONS,

isSafari,
config,
storage,
currentBatchTime,
devices,
storage,
}
},

Expand Down Expand Up @@ -186,4 +195,15 @@ export default {
.additional-margin-top {
margin-top: 12px;
}

.notification-frequency__wrapper {
display: flex;
flex-direction: column;
gap: var(--default-grid-baseline);

.notification-frequency__select {
margin-inline-start: calc(2 * var(--default-grid-baseline));
width: fit-content;
}
}
</style>
Loading