From e64b4fe6493b7d73374136d9a233ab17abf715b3 Mon Sep 17 00:00:00 2001 From: Christopher Ng Date: Tue, 13 Feb 2024 15:25:51 -0800 Subject: [PATCH] enh(files_reminders): Allow clearing reminders Signed-off-by: Christopher Ng --- .../src/actions/clearReminderAction.ts | 71 +++++++++++++++++++ .../actions/setReminderSuggestionActions.ts | 12 +++- .../src/components/SetCustomReminderModal.vue | 5 +- apps/files_reminders/src/init.ts | 7 +- 4 files changed, 90 insertions(+), 5 deletions(-) create mode 100644 apps/files_reminders/src/actions/clearReminderAction.ts 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 + * + * @author Christopher Ng + * + * @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 . + * + */ + +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 . * */ + +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 @@