From 2589e3dbf55bd069277c60b61b597d3181bd1839 Mon Sep 17 00:00:00 2001 From: Christopher Ng Date: Tue, 13 Feb 2024 15:14:46 -0800 Subject: [PATCH 1/3] feat(files_reminders): Add propfind dav plugin Signed-off-by: Christopher Ng (cherry picked from commit 66f4c677c74c0d278b789542b514f570a3bf3abc) --- apps/files_reminders/appinfo/info.xml | 10 +++ .../composer/composer/autoload_classmap.php | 1 + .../composer/composer/autoload_static.php | 1 + .../lib/Dav/PropFindPlugin.php | 82 +++++++++++++++++++ 4 files changed, 94 insertions(+) create mode 100644 apps/files_reminders/lib/Dav/PropFindPlugin.php diff --git a/apps/files_reminders/appinfo/info.xml b/apps/files_reminders/appinfo/info.xml index 583244248dca9..8ebe3bf61b1be 100644 --- a/apps/files_reminders/appinfo/info.xml +++ b/apps/files_reminders/appinfo/info.xml @@ -13,6 +13,10 @@ Set file reminders. Christopher Ng FilesReminders + + + + files https://github.com/nextcloud/server/issues @@ -29,4 +33,10 @@ Set file reminders. OCA\FilesReminders\Command\ListCommand + + + + OCA\FilesReminders\Dav\PropFindPlugin + + diff --git a/apps/files_reminders/composer/composer/autoload_classmap.php b/apps/files_reminders/composer/composer/autoload_classmap.php index 7442e9da20170..7dc5063c18248 100644 --- a/apps/files_reminders/composer/composer/autoload_classmap.php +++ b/apps/files_reminders/composer/composer/autoload_classmap.php @@ -12,6 +12,7 @@ 'OCA\\FilesReminders\\BackgroundJob\\ScheduledNotifications' => $baseDir . '/../lib/BackgroundJob/ScheduledNotifications.php', 'OCA\\FilesReminders\\Command\\ListCommand' => $baseDir . '/../lib/Command/ListCommand.php', 'OCA\\FilesReminders\\Controller\\ApiController' => $baseDir . '/../lib/Controller/ApiController.php', + 'OCA\\FilesReminders\\Dav\\PropFindPlugin' => $baseDir . '/../lib/Dav/PropFindPlugin.php', 'OCA\\FilesReminders\\Db\\Reminder' => $baseDir . '/../lib/Db/Reminder.php', 'OCA\\FilesReminders\\Db\\ReminderMapper' => $baseDir . '/../lib/Db/ReminderMapper.php', 'OCA\\FilesReminders\\Exception\\NodeNotFoundException' => $baseDir . '/../lib/Exception/NodeNotFoundException.php', diff --git a/apps/files_reminders/composer/composer/autoload_static.php b/apps/files_reminders/composer/composer/autoload_static.php index a533f76931289..7c14a9da02ced 100644 --- a/apps/files_reminders/composer/composer/autoload_static.php +++ b/apps/files_reminders/composer/composer/autoload_static.php @@ -27,6 +27,7 @@ class ComposerStaticInitFilesReminders 'OCA\\FilesReminders\\BackgroundJob\\ScheduledNotifications' => __DIR__ . '/..' . '/../lib/BackgroundJob/ScheduledNotifications.php', 'OCA\\FilesReminders\\Command\\ListCommand' => __DIR__ . '/..' . '/../lib/Command/ListCommand.php', 'OCA\\FilesReminders\\Controller\\ApiController' => __DIR__ . '/..' . '/../lib/Controller/ApiController.php', + 'OCA\\FilesReminders\\Dav\\PropFindPlugin' => __DIR__ . '/..' . '/../lib/Dav/PropFindPlugin.php', 'OCA\\FilesReminders\\Db\\Reminder' => __DIR__ . '/..' . '/../lib/Db/Reminder.php', 'OCA\\FilesReminders\\Db\\ReminderMapper' => __DIR__ . '/..' . '/../lib/Db/ReminderMapper.php', 'OCA\\FilesReminders\\Exception\\NodeNotFoundException' => __DIR__ . '/..' . '/../lib/Exception/NodeNotFoundException.php', diff --git a/apps/files_reminders/lib/Dav/PropFindPlugin.php b/apps/files_reminders/lib/Dav/PropFindPlugin.php new file mode 100644 index 0000000000000..e476c1a3b1330 --- /dev/null +++ b/apps/files_reminders/lib/Dav/PropFindPlugin.php @@ -0,0 +1,82 @@ + + * + * @author Christopher Ng + * + * @license GNU AGPL version 3 or any later version + * + * 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 . + * + */ + +namespace OCA\FilesReminders\Dav; + +use DateTimeInterface; +use OCA\DAV\Connector\Sabre\Node; +use OCA\FilesReminders\Service\ReminderService; +use OCP\AppFramework\Db\DoesNotExistException; +use OCP\IUser; +use OCP\IUserSession; +use Sabre\DAV\INode; +use Sabre\DAV\PropFind; +use Sabre\DAV\Server; +use Sabre\DAV\ServerPlugin; + +class PropFindPlugin extends ServerPlugin { + + public const REMINDER_DUE_DATE_PROPERTY = '{http://nextcloud.org/ns}reminder-due-date'; + + public function __construct( + private ReminderService $reminderService, + private IUserSession $userSession, + ) { + } + + public function initialize(Server $server): void { + $server->on('propFind', [$this, 'propFind']); + } + + public function propFind(PropFind $propFind, INode $node) { + if (!in_array(static::REMINDER_DUE_DATE_PROPERTY, $propFind->getRequestedProperties())) { + return; + } + + if (!($node instanceof Node)) { + return; + } + + $propFind->handle( + static::REMINDER_DUE_DATE_PROPERTY, + function () use ($node) { + $user = $this->userSession->getUser(); + if (!($user instanceof IUser)) { + return ''; + } + + $fileId = $node->getId(); + try { + $reminder = $this->reminderService->getDueForUser($user, $fileId); + } catch (DoesNotExistException $e) { + return ''; + } + + return $reminder->getDueDate()->format(DateTimeInterface::ATOM); // ISO 8601 + }, + ); + } +} From a7fa944d55df40fcf643115565cb0bae15f4c0f7 Mon Sep 17 00:00:00 2001 From: Christopher Ng Date: Tue, 13 Feb 2024 15:25:51 -0800 Subject: [PATCH 2/3] enh(files_reminders): Allow clearing reminders Signed-off-by: Christopher Ng (cherry picked from commit e64b4fe6493b7d73374136d9a233ab17abf715b3) --- .../src/actions/clearReminderAction.ts | 71 +++++++++++++++++++ .../actions/setReminderSuggestionActions.ts | 8 ++- .../src/components/SetCustomReminderModal.vue | 5 +- apps/files_reminders/src/init.ts | 7 +- 4 files changed, 88 insertions(+), 3 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 0000000000000..6f6d792750dcf --- /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 f3d70b0efc40e..e713f51ec7cef 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 }) diff --git a/apps/files_reminders/src/components/SetCustomReminderModal.vue b/apps/files_reminders/src/components/SetCustomReminderModal.vue index 4e3c5fb0fca85..40895fec7a9bc 100644 --- a/apps/files_reminders/src/components/SetCustomReminderModal.vue +++ b/apps/files_reminders/src/components/SetCustomReminderModal.vue @@ -64,10 +64,11 @@