Skip to content

[stable31] fix(files_reminders): Fix reminder actions being displayed on invalid nodes #51738

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

Merged
Pytal merged 2 commits into from
Mar 27, 2025
Merged

[stable31] fix(files_reminders): Fix reminder actions being displayed on invalid nodes #51738

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f0f6b0b
fix(files_reminders): Fix reminder actions being displayed on invalid…
Pytal Mar 26, 2025
3935051
chore(assets): Recompile assets
nextcloud-command Mar 26, 2025
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
Next Next commit
fix(files_reminders): Fix reminder actions being displayed on invalid… 
… nodes

Signed-off-by: Christopher Ng <[email protected]>
  • Loading branch information
@Pytal @backportbot
Pytal authored and backportbot[bot] committed Mar 26, 2025
commit f0f6b0b69d0088b38af2c8cafca98eeeebdbec90
13 changes: 11 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 @@ -18,8 +18,17 @@ export const action = new FileAction({
title: () => t('files_reminders', 'Set reminder at custom date & time'),
iconSvgInline: () => CalendarClockSvg,

enabled: (_nodes: Node[], view: View) => {
return view.id !== 'trashbin'
enabled: (nodes: Node[], view: View) => {
if (view.id === 'trashbin') {
return false
}
// 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 dueDate !== undefined
},

parent: SET_REMINDER_MENU_ID,
Expand Down
13 changes: 11 additions & 2 deletions apps/files_reminders/src/actions/setReminderMenuAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,17 @@ export const action = new FileAction({
displayName: () => t('files_reminders', 'Set reminder'),
iconSvgInline: () => AlarmSvg,

enabled: (_nodes: Node[], view: View) => {
return view.id !== 'trashbin'
enabled: (nodes: Node[], view: View) => {
if (view.id === 'trashbin') {
return false
}
// 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 dueDate !== undefined
},

async exec() {
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 @@ -74,11 +74,17 @@ const generateFileAction = (option: ReminderOption): FileAction|null => {
// Empty svg to hide the icon
iconSvgInline: () => '<svg></svg>',

enabled: (_nodes: Node[], view: View) => {
enabled: (nodes: Node[], view: View) => {
if (view.id === 'trashbin') {
return false
}
return Boolean(getDateTime(option.dateTimePreset))
// 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 dueDate !== undefined && Boolean(getDateTime(option.dateTimePreset))
},

parent: SET_REMINDER_MENU_ID,
Expand Down
Loading