Skip to content

fix(files): view-in-folder and bulk-tagging enabled conditions #49143

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
skjnldsv merged 3 commits into from
Nov 9, 2024
Merged

fix(files): view-in-folder and bulk-tagging enabled conditions #49143

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9571e34
fix(files): check that node is in user root folder for view-in-folder…
skjnldsv Nov 8, 2024
56a82fa
fix(systemtags): sanity checks for bulk tagging action
skjnldsv Nov 8, 2024
6b76c7c
chore: compile assets
skjnldsv Nov 9, 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
Next Next commit
fix(files): check that node is in user root folder for view-in-folder… 
… action

Signed-off-by: skjnldsv <[email protected]>
  • Loading branch information
@skjnldsv
skjnldsv committed Nov 9, 2024
commit 9571e34182a03abc0f7617500b2e9eae758291d2
12 changes: 12 additions & 0 deletions apps/files/src/actions/viewInFolderAction.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,18 @@ describe('View in folder action enabled tests', () => {
expect(action.enabled).toBeDefined()
expect(action.enabled!([folder], view)).toBe(false)
})

test('Disabled for files outside the user root folder', () => {
const file = new Folder({
id: 1,
source: 'https://cloud.domain.com/remote.php/dav/trashbin/admin/trash/image.jpg.d1731053878',
owner: 'admin',
permissions: Permission.READ,
})

expect(action.enabled).toBeDefined()
expect(action.enabled!([file], view)).toBe(false)
})
})

describe('View in folder action execute tests', () => {
Expand Down
5 changes: 5 additions & 0 deletions apps/files/src/actions/viewInFolderAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,11 @@ export const action = new FileAction({
return false
}

// Can only view files that are in the user root folder
if (!node.root?.startsWith('/files')) {
return false
}

if (node.permissions === Permission.NONE) {
return false
}
Expand Down