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

fix(files_sharing): open-in-files should open a folder and not the parent #46648

Merged
merged 3 commits into from
Jul 25, 2024
Merged

fix(files_sharing): open-in-files should open a folder and not the parent #46648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
442a233
fix(files_sharing): `open-in-files` should open a folder and not the …
susnux Jul 19, 2024
4979ed0
test: Add regression test for opening shared folders
susnux Jul 25, 2024
bc216ef
chore: Compile assets
susnux Jul 25, 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
16 changes: 13 additions & 3 deletions apps/files_sharing/src/actions/openInFilesAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
*/
import type { Node } from '@nextcloud/files'

import { registerFileAction, FileAction, DefaultType } from '@nextcloud/files'
import { registerFileAction, FileAction, DefaultType, FileType } from '@nextcloud/files'
import { translate as t } from '@nextcloud/l10n'

import { sharesViewId, sharedWithYouViewId, sharedWithOthersViewId, sharingByLinksViewId } from '../views/shares'
Expand All @@ -24,10 +24,20 @@ export const action = new FileAction({
].includes(view.id),

async exec(node: Node) {
const isFolder = node.type === FileType.Folder

window.OCP.Files.Router.goToRoute(
null, // use default route
{ view: 'files', fileid: String(node.fileid) },
{ dir: node.dirname, openfile: 'true' },
{
view: 'files',
fileid: String(node.fileid),
},
{
// If this node is a folder open the folder in files
dir: isFolder ? node.path : node.dirname,
// otherwise if this is a file, we should open it
openfile: isFolder ? undefined : 'true',
},
)
return null
},
Expand Down
59 changes: 59 additions & 0 deletions cypress/e2e/files_sharing/files-shares-view.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
/*!
* SPDX-FileCopyrightText: 2024 Nextcloud GmbH and Nextcloud contributors
* SPDX-License-Identifier: AGPL-3.0-or-later
*/
import type { User } from '@nextcloud/cypress'
import { createShare } from './FilesSharingUtils.ts'
import { getRowForFile } from '../files/FilesUtils.ts'

describe('files_sharing: Files view', { testIsolation: true }, () => {
let user: User
let sharee: User

beforeEach(() => {
cy.createRandomUser().then(($user) => {
user = $user
})
cy.createRandomUser().then(($user) => {
sharee = $user
})
})

/**
* Regression test of https://github.com/nextcloud/server/issues/46108
*/
it('opens a shared folder when clicking on it', () => {
cy.mkdir(user, '/folder')
cy.uploadContent(user, new Blob([]), 'text/plain', '/folder/file')
cy.login(user)
cy.visit('/apps/files')

// share the folder
createShare('folder', sharee.userId, { read: true, download: true })
// visit the own shares
cy.visit('/apps/files/sharingout')
// see the shared folder
getRowForFile('folder').should('be.visible')
// click on the folder should open it in files
getRowForFile('folder').findByRole('button', { name: 'folder' }).click()
// See the URL has changed
cy.url().should('match', /apps\/files\/files\/.+dir=\/folder/)
// Content of the shared folder
getRowForFile('file').should('be.visible')

cy.logout()
// Now for the sharee
cy.login(sharee)

// visit shared files view
cy.visit('/apps/files/sharingin')
// see the shared folder
getRowForFile('folder').should('be.visible')
// click on the folder should open it in files
getRowForFile('folder').findByRole('button', { name: 'folder' }).click()
// See the URL has changed
cy.url().should('match', /apps\/files\/files\/.+dir=\/folder/)
// Content of the shared folder
getRowForFile('file').should('be.visible')
})
})
Loading
Loading