Skip to content
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

Jump to bottom

fix: Remove reminder action from trash #45227

Merged
merged 2 commits into from
May 14, 2024
Merged

fix: Remove reminder action from trash #45227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8300783
fix: Remove reminder action from trash
Pytal May 7, 2024
8138516
chore: compile assets
Pytal May 7, 2024
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
10 changes: 8 additions & 2 deletions apps/files_reminders/src/actions/setReminderCustomAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/
import { FileAction, Node } from '@nextcloud/files'

import type { Node, View } from '@nextcloud/files'

import { FileAction } from '@nextcloud/files'
import { translate as t } from '@nextcloud/l10n'
import CalendarClockSvg from '@mdi/svg/svg/calendar-clock.svg?raw'

Expand All @@ -32,7 +35,10 @@ export const action = new FileAction({
title: () => t('files_reminders', 'Set reminder at custom date & time'),
iconSvgInline: () => CalendarClockSvg,

enabled: () => true,
enabled: (_nodes: Node[], view: View) => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe future APIs should just have context objects to allow to only destructure the needed property

return view.id !== 'trashbin'
},

parent: SET_REMINDER_MENU_ID,

async exec(file: Node) {
Expand Down
7 changes: 6 additions & 1 deletion apps/files_reminders/src/actions/setReminderMenuAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,9 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

import type { Node, View } from '@nextcloud/files'

import { FileAction } from '@nextcloud/files'
import { translate as t } from '@nextcloud/l10n'
import AlarmSvg from '@mdi/svg/svg/alarm.svg?raw'
Expand All @@ -30,7 +33,9 @@ export const action = new FileAction({
displayName: () => t('files_reminders', 'Set reminder'),
iconSvgInline: () => AlarmSvg,

enabled: () => true,
enabled: (_nodes: Node[], view: View) => {
return view.id !== 'trashbin'
},

async exec() {
return null
Expand Down
10 changes: 8 additions & 2 deletions apps/files_reminders/src/actions/setReminderSuggestionActions.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
*/

import Vue from 'vue'
import type { Node } from '@nextcloud/files'
import type { Node, View } from '@nextcloud/files'

import { FileAction } from '@nextcloud/files'
import { emit } from '@nextcloud/event-bus'
Expand Down Expand Up @@ -91,7 +91,13 @@ const generateFileAction = (option: ReminderOption): FileAction|null => {
// Empty svg to hide the icon
iconSvgInline: () => '<svg></svg>',

enabled: () => Boolean(getDateTime(option.dateTimePreset)),
enabled: (_nodes: Node[], view: View) => {
if (view.id === 'trashbin') {
return false
}
return Boolean(getDateTime(option.dateTimePreset))
},

parent: SET_REMINDER_MENU_ID,

async exec(node: Node) {
Expand Down
6 changes: 3 additions & 3 deletions dist/files_reminders-init.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/files_reminders-init.js.map
View file
Open in desktop

Large diffs are not rendered by default.

Loading