feat(snooze): Disable snooze on AJAX cron

Signed-off-by: Johannes Merkel <mail@johannesgge.de>
nextcloud · Aug 16, 2023 · 28044e8 · 28044e8
1 parent 5c8d239
commit 28044e8
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 4 deletions.
diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
@@ -236,12 +236,16 @@ public function index(): TemplateResponse {
 			);
 		}
 
-		// Disable scheduled send in frontend if ajax cron is used because it is unreliable
+		// Disable snooze and scheduled send in frontend if ajax cron is used because it is unreliable
 		$cronMode = $this->config->getAppValue('core', 'backgroundjobs_mode', 'ajax');
 		$this->initialStateService->provideInitialState(
 			'disable-scheduled-send',
 			$cronMode === 'ajax',
 		);
+		$this->initialStateService->provideInitialState(
+			'disable-snooze',
+			$cronMode === 'ajax',
+		);
 
 		$this->initialStateService->provideInitialState(
 			'allow-new-accounts',

diff --git a/src/components/Envelope.vue b/src/components/Envelope.vue
@@ -165,7 +165,7 @@
 					</template>
 					{{ t('mail', 'Edit tags') }}
 				</ActionButton>
-				<ActionButton
+				<ActionButton v-if="!isSnoozeDisabled"
 					:close-after-click="false"
 					@click="showSnoozeOptions">
 					<template #icon>
@@ -384,6 +384,7 @@ import NcActionInput from '@nextcloud/vue/dist/Components/NcActionInput'
 import CalendarClock from 'vue-material-design-icons/CalendarClock'
 import AlarmIcon from 'vue-material-design-icons/Alarm'
 import moment from '@nextcloud/moment'
+import { mapGetters } from 'vuex'
 
 export default {
 	name: 'Envelope',
@@ -475,6 +476,9 @@ export default {
 		}
 	},
 	computed: {
+		...mapGetters([
+			'isSnoozeDisabled',
+		]),
 		messageLongDate() {
 			return messageDateTime(new Date(this.data.dateInt))
 		},

diff --git a/src/components/MenuEnvelope.vue b/src/components/MenuEnvelope.vue
@@ -91,7 +91,8 @@
 				</template>
 				{{ t('mail', 'Move message') }}
 			</ActionButton>
-			<ActionButton :close-after-click="false"
+			<ActionButton v-if="!isSnoozeDisabled"
+				:close-after-click="false"
 				@click="snoozeActionsOpen = true">
 				<template #icon>
 					<AlarmIcon :title="t('mail', 'Snooze')"
@@ -293,6 +294,7 @@ import NcActionInput from '@nextcloud/vue/dist/Components/NcActionInput'
 import AlarmIcon from 'vue-material-design-icons/Alarm'
 import logger from '../logger'
 import moment from '@nextcloud/moment'
+import { mapGetters } from 'vuex'
 
 export default {
 	name: 'MenuEnvelope',
@@ -374,6 +376,9 @@ export default {
 		}
 	},
 	computed: {
+		...mapGetters([
+			'isSnoozeDisabled',
+		]),
 		account() {
 			const accountId = this.envelope.accountId ?? this.mailbox.accountId
 			return this.$store.getters.getAccount(accountId)

diff --git a/src/main.js b/src/main.js
@@ -105,6 +105,7 @@ const accounts = loadState('mail', 'accounts', [])
 const tags = loadState('mail', 'tags', [])
 const outboxMessages = loadState('mail', 'outbox-messages')
 const disableScheduledSend = loadState('mail', 'disable-scheduled-send')
+const disableSnooze = loadState('mail', 'disable-snooze')
 const googleOauthUrl = loadState('mail', 'google-oauth-url', null)
 const microsoftOauthUrl = loadState('mail', 'microsoft-oauth-url', null)
 
@@ -128,6 +129,7 @@ tags.forEach(tag => store.commit('addTag', { tag }))
 outboxMessages.forEach(message => store.commit('outbox/addMessage', { message }))
 
 store.commit('setScheduledSendingDisabled', disableScheduledSend)
+store.commit('setSnoozeDisabled', disableSnooze)
 store.commit('setGoogleOauthUrl', googleOauthUrl)
 store.commit('setMicrosoftOauthUrl', microsoftOauthUrl)
 

diff --git a/src/store/getters.js b/src/store/getters.js
@@ -115,6 +115,7 @@ export const getters = {
 		return state.tagList.map(tagId => state.tags[tagId])
 	},
 	isScheduledSendingDisabled: (state) => state.isScheduledSendingDisabled,
+	isSnoozeDisabled: (state) => state.isSnoozeDisabled,
 	googleOauthUrl: (state) => state.googleOauthUrl,
 	microsoftOauthUrl: (state) => state.microsoftOauthUrl,
 	getActiveSieveScript: (state) => (accountId) => state.sieveScript[accountId],

diff --git a/src/store/index.js b/src/store/index.js
@@ -100,6 +100,7 @@ export default new Store({
 				tags: {},
 				tagList: [],
 				isScheduledSendingDisabled: false,
+				isSnoozeDisabled: false,
 				currentUserPrincipal: undefined,
 				googleOauthUrl: null,
 				sieveScript: {},

diff --git a/src/store/mutations.js b/src/store/mutations.js
@@ -460,6 +460,9 @@ export default {
 	setScheduledSendingDisabled(state, value) {
 		state.isScheduledSendingDisabled = value
 	},
+	setSnoozeDisabled(state, value) {
+		state.isSnoozeDisabled = value
+	},
 	setActiveSieveScript(state, { accountId, scriptData }) {
 		Vue.set(state.sieveScript, accountId, scriptData)
 	},

diff --git a/tests/Unit/Controller/PageControllerTest.php b/tests/Unit/Controller/PageControllerTest.php
@@ -275,7 +275,7 @@ public function testIndex(): void {
 			->method('getLoginCredentials')
 			->willReturn($loginCredentials);
 
-		$this->initialState->expects($this->exactly(13))
+		$this->initialState->expects($this->exactly(14))
 			->method('provideInitialState')
 			->withConsecutive(
 				['debug', true],
@@ -288,6 +288,7 @@ public function testIndex(): void {
 				['prefill_email', 'jane@doe.cz'],
 				['outbox-messages', []],
 				['disable-scheduled-send', false],
+				['disable-snooze', false],
 				['allow-new-accounts', true],
 				['enabled_thread_summary', false],
 				['smime-certificates', []],