diff options
author | Christopher Ng <chrng8@gmail.com> | 2024-02-13 15:25:51 -0800 |
---|---|---|
committer | Christopher Ng <chrng8@gmail.com> | 2024-02-14 11:53:10 -0800 |
commit | e64b4fe6493b7d73374136d9a233ab17abf715b3 (patch) | |
tree | e96c75622c35c98c8c750c5a3c85fdf8755bdf01 /apps/files_reminders | |
parent | 66f4c677c74c0d278b789542b514f570a3bf3abc (diff) | |
download | nextcloud-server-e64b4fe6493b7d73374136d9a233ab17abf715b3.tar.gz nextcloud-server-e64b4fe6493b7d73374136d9a233ab17abf715b3.zip |
enh(files_reminders): Allow clearing reminders
Signed-off-by: Christopher Ng <chrng8@gmail.com>
Diffstat (limited to 'apps/files_reminders')
4 files changed, 90 insertions, 5 deletions
diff --git a/apps/files_reminders/src/actions/clearReminderAction.ts b/apps/files_reminders/src/actions/clearReminderAction.ts new file mode 100644 index 00000000000..6f6d792750d --- /dev/null +++ b/apps/files_reminders/src/actions/clearReminderAction.ts @@ -0,0 +1,71 @@ +/** + * @copyright 2024 Christopher Ng <chrng8@gmail.com> + * + * @author Christopher Ng <chrng8@gmail.com> + * + * @license AGPL-3.0-or-later + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +import Vue from 'vue' +import { FileAction, type Node } from '@nextcloud/files' +import { emit } from '@nextcloud/event-bus' +import { translate as t } from '@nextcloud/l10n' + +import AlarmOffSvg from '@mdi/svg/svg/alarm-off.svg?raw' + +import { clearReminder } from '../services/reminderService.ts' +import { getVerboseDateString } from '../shared/utils.ts' + +export const action = new FileAction({ + id: 'clear-reminder', + + displayName: () => t('files', 'Clear reminder'), + + title: (nodes: Node[]) => { + const node = nodes.at(0)! + const dueDate = new Date(node.attributes['reminder-due-date']) + return `${t('files', 'Clear reminder')} – ${getVerboseDateString(dueDate)}` + }, + + iconSvgInline: () => AlarmOffSvg, + + enabled: (nodes: Node[]) => { + // Only allow on a single node + if (nodes.length !== 1) { + return false + } + const node = nodes.at(0)! + const dueDate = node.attributes['reminder-due-date'] + return Boolean(dueDate) + }, + + async exec(node: Node) { + if (node.fileid) { + try { + await clearReminder(node.fileid) + Vue.set(node.attributes, 'reminder-due-date', '') + emit('files:node:updated', node) + return true + } catch (error) { + return false + } + } + return null + }, + + order: 19, +}) diff --git a/apps/files_reminders/src/actions/setReminderSuggestionActions.ts b/apps/files_reminders/src/actions/setReminderSuggestionActions.ts index eda95205182..e713f51ec7c 100644 --- a/apps/files_reminders/src/actions/setReminderSuggestionActions.ts +++ b/apps/files_reminders/src/actions/setReminderSuggestionActions.ts @@ -19,9 +19,12 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ + +import Vue from 'vue' import type { Node } from '@nextcloud/files' import { FileAction } from '@nextcloud/files' +import { emit } from '@nextcloud/event-bus' import { showError, showSuccess } from '@nextcloud/dialogs' import { translate as t } from '@nextcloud/l10n' @@ -101,7 +104,10 @@ const generateFileAction = (option: ReminderOption): FileAction|null => { // Set the reminder try { - await setReminder(node.fileid, getDateTime(option.dateTimePreset)!) + const dateTime = getDateTime(option.dateTimePreset)! + await setReminder(node.fileid, dateTime) + Vue.set(node.attributes, 'reminder-due-date', dateTime.toISOString()) + emit('files:node:updated', node) showSuccess(t('files_reminders', 'Reminder set for "{fileName}"', { fileName: node.basename })) } catch (error) { logger.error('Failed to set reminder', { error }) @@ -123,14 +129,14 @@ const generateFileAction = (option: ReminderOption): FileAction|null => { } option.dateString = getDateString(dateTime) option.verboseDateString = getVerboseDateString(dateTime) - + + // Update the date string every 30 minutes setInterval(() => { const dateTime = getDateTime(option.dateTimePreset) if (!dateTime) { return } - + // update the submenu remind options strings option.dateString = getDateString(dateTime) option.verboseDateString = getVerboseDateString(dateTime) diff --git a/apps/files_reminders/src/components/SetCustomReminderModal.vue b/apps/files_reminders/src/components/SetCustomReminderModal.vue index 4e3c5fb0fca..40895fec7a9 100644 --- a/apps/files_reminders/src/components/SetCustomReminderModal.vue +++ b/apps/files_reminders/src/components/SetCustomReminderModal.vue @@ -64,10 +64,11 @@ </template> <script lang="ts"> +import Vue from 'vue' import type { Node } from '@nextcloud/files' +import { emit } from '@nextcloud/event-bus' import { showError, showSuccess } from '@nextcloud/dialogs' import { translate as t } from '@nextcloud/l10n' -import Vue from 'vue' import NcButton from '@nextcloud/vue/dist/Components/NcButton.js' import NcDateTime from '@nextcloud/vue/dist/Components/NcDateTime.js' @@ -156,6 +157,8 @@ export default Vue.extend({ try { await setReminder(this.fileId, this.customDueDate) + Vue.set(this.node.attributes, 'reminder-due-date', this.customDueDate.toISOString()) + emit('files:node:updated', this.node) showSuccess(t('files_reminders', 'Reminder set for "{fileName}"', { fileName: this.fileName })) this.onClose() } catch (error) { diff --git a/apps/files_reminders/src/init.ts b/apps/files_reminders/src/init.ts index 59f5d23ebe3..d1642626f10 100644 --- a/apps/files_reminders/src/init.ts +++ b/apps/files_reminders/src/init.ts @@ -19,11 +19,16 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -import { registerFileAction } from '@nextcloud/files' + +import { registerDavProperty, registerFileAction } from '@nextcloud/files' import { action as menuAction } from './actions/setReminderMenuAction' +import { action as clearAction } from './actions/clearReminderAction' import { actions as suggestionActions } from './actions/setReminderSuggestionActions' import { action as customAction } from './actions/setReminderCustomAction' +registerDavProperty('nc:reminder-due-date', { nc: 'http://nextcloud.org/ns' }) + +registerFileAction(clearAction) registerFileAction(menuAction) registerFileAction(customAction) suggestionActions.forEach((action) => registerFileAction(action)) |