Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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): filter non batch actions in header
Signed-off-by: skjnldsv <[email protected]>
  • Loading branch information
skjnldsv authored and AndyScherzinger committed Aug 22, 2025
commit a531cfe3e1c11cbea29885c044000fd1f0cb79cd
10 changes: 9 additions & 1 deletion apps/files/src/components/FilesListTableHeaderActions.vue
Original file line number Diff line number Diff line change
Expand Up @@ -151,6 +151,10 @@ export default defineComponent({
.filter(action => !action.renderInline)
// We don't handle actions that are not visible
.filter(action => action.default !== DefaultType.HIDDEN)
// We allow top-level actions that have no execBatch method
// but children actions always need to have it
.filter(action => action.execBatch || !action.parent)
// We filter out actions that are not enabled for the current selection
.filter(action => !action.enabled || action.enabled(this.nodes, this.currentView))
.sort((a, b) => (a.order || 0) - (b.order || 0))
},
Expand Down Expand Up @@ -190,7 +194,11 @@ export default defineComponent({
})

// Generate list of all top-level actions ids
const childrenActionsIds = actions.filter(action => action.parent).map(action => action.parent) as string[]
const childrenActionsIds = actions
.filter(action => action.parent)
// Filter out all actions that are not batch actions
.filter(action => action.execBatch)
.map(action => action.parent) as string[]

const menuActions = actions
.filter(action => {
Expand Down
47 changes: 47 additions & 0 deletions cypress/e2e/files/files-actions.cy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -213,4 +213,51 @@ describe('Files: Actions', { testIsolation: true }, () => {
getSelectionActionEntry('nested-child-1').should('not.exist')
getSelectionActionEntry('nested-child-2').should('not.exist')
})

it('Do not show parent if nested action has no batch support', () => {
const parent = new FileAction({
id: 'nested-action',
displayName: () => 'Nested Action',
exec: cy.spy(),
iconSvgInline: () => '<svg></svg>',
})

const child1 = new FileAction({
id: 'nested-child-1',
displayName: () => 'Nested Child 1',
exec: cy.spy(),
iconSvgInline: () => '<svg></svg>',
parent: 'nested-action',
})

const child2 = new FileAction({
id: 'nested-child-2',
displayName: () => 'Nested Child 2',
exec: cy.spy(),
iconSvgInline: () => '<svg></svg>',
parent: 'nested-action',
})

cy.visit('/apps/files', {
// Cannot use registerFileAction here
onBeforeLoad: (win) => {
if (!win._nc_fileactions) win._nc_fileactions = []
// Cannot use registerFileAction here
win._nc_fileactions.push(parent)
win._nc_fileactions.push(child1)
win._nc_fileactions.push(child2)
},
})

selectRowForFile('image.jpg')

// Open the menu
getSelectionActionButton().click({ force: true })

// Check we have the parent action but not the children
getSelectionActionEntry('nested-action').should('not.exist')
getSelectionActionEntry('menu-back').should('not.exist')
getSelectionActionEntry('nested-child-1').should('not.exist')
getSelectionActionEntry('nested-child-2').should('not.exist')
})
})
Loading