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.

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

feat: simplify destination handling #912

Merged
merged 1 commit into from
Aug 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
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
98 changes: 64 additions & 34 deletions cypress/components/UploadPicker.cy.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
// dist file might not be built when running eslint only
// eslint-disable-next-line import/no-unresolved,n/no-missing-import
import { addNewFileMenuEntry } from '@nextcloud/files'
import { Folder, Permission, addNewFileMenuEntry, Entry } from '@nextcloud/files'
import { UploadPicker } from '../../dist/index.js'
import { generateRemoteUrl } from '@nextcloud/router'

describe('UploadPicker rendering', () => {
it('Renders default UploadPicker', () => {
Expand All @@ -13,30 +14,22 @@ describe('UploadPicker rendering', () => {

describe('NewFileMenu handling', () => {
const propsData = {
context: {
basename: 'Folder',
etag: '63071eedd82fe',
fileid: '56',
filename: '/Folder',
hasPreview: false,
lastmod: 1661410576,
mime: 'httpd/unix-directory',
month: '197001',
permissions: 'CKGWDR',
showShared: false,
size: 2610077102,
timestamp: 1661410,
type: 'dir',
},
destination: new Folder({
id: 56,
owner: 'user',
source: generateRemoteUrl('dav/files/user/Folder'),
permissions: Permission.ALL,
root: '/files/user',
}),
}
const entry = {
id: 'empty-file',
displayName: 'Create empty file',
templateName: 'New file',
iconClass: 'icon-file',
if: (fileInfo) => fileInfo.permissions.includes('CK'),
if: (folder: Folder) => (folder.permissions & Permission.CREATE) !== 0,
handler() {},
}
} as Entry

before(() => {
cy.spy(entry, 'handler')
Expand Down Expand Up @@ -86,9 +79,13 @@ describe('NewFileMenu handling', () => {
cy.get('.upload-picker__menu-entry').should('not.be.visible')

cy.get('@component').then((component) => {
component.setContext(
Object.assign({}, propsData.context, { permissions: 'GR' })
)
component.setDestination(new Folder({
id: 56,
owner: 'user',
source: generateRemoteUrl('dav/files/user/Folder'),
permissions: Permission.NONE,
root: '/files/user',
}))
})
cy.get('form .action-item__menutoggle')
.as('menuButton')
Expand All @@ -100,8 +97,20 @@ describe('NewFileMenu handling', () => {

describe('UploadPicker valid uploads', () => {
beforeEach(() => {
// Make sure we reset the destination
// so other tests do not interfere
const propsData = {
destination: new Folder({
id: 56,
owner: 'user',
source: generateRemoteUrl('dav/files/user'),
permissions: Permission.ALL,
root: '/files/user',
}),
}

// Mount picker
cy.mount(UploadPicker).as('uploadPicker')
cy.mount(UploadPicker, { propsData }).as('uploadPicker')

// Check and init aliases
cy.get('form input[type="file"]').as('input').should('exist')
Expand Down Expand Up @@ -196,7 +205,13 @@ describe('UploadPicker valid uploads', () => {

describe('Destination management', () => {
const propsData = {
destination: '/',
destination: new Folder({
id: 56,
owner: 'user',
source: generateRemoteUrl('dav/files/user'),
permissions: Permission.ALL,
root: '/files/user',
}),
}

it('Upload then changes the destination', () => {
Expand Down Expand Up @@ -228,9 +243,15 @@ describe('Destination management', () => {
})

cy.get('@component').then((component) => {
component.setDestination('/Photos')
component.setDestination(new Folder({
id: 56,
owner: 'user',
source: generateRemoteUrl('dav/files/user/Photos'),
permissions: Permission.ALL,
root: '/files/user',
}))
// Wait for prop propagation
expect(component.uploadManager.destination).to.equal('/Photos')
expect(component.uploadManager.root).to.have.string('/remote.php/dav/files/user/Photos')
})

cy.get('@input').attachFile({
Expand All @@ -253,7 +274,13 @@ describe('Destination management', () => {
describe('Root management', () => {
const propsData = {
root: null,
destination: '/',
destination: new Folder({
id: 56,
owner: 'user',
source: generateRemoteUrl('dav/files/user'),
permissions: Permission.ALL,
root: '/files/user',
}),
}

it('Upload then changes the root', () => {
Expand All @@ -280,21 +307,24 @@ describe('Root management', () => {

cy.wait('@upload').then((upload) => {
expect(upload.request.url).to.have.string(
'/remote.php/dav/files/user/image.jpg'
'/remote.php/dav/files/user/image.jpg',
)
})

cy.get('@component').then((component) => {
component.setRoot('dav/photos/admin/albums')
component.setDestination('/2022 Summer Vacations')
component.setDestination(new Folder({
id: 56,
owner: 'user',
source: generateRemoteUrl('dav/photos/user/albums/2022 Summer Vacations'),
permissions: Permission.ALL,
root: '/photos/user',
}))
// Wait for prop propagation
expect(component.uploadManager.root).to.match(
/dav\/photos\/admin\/albums$/i
)
expect(component.uploadManager.root).to.have.string('/remote.php/dav/photos/user/albums/2022 Summer Vacations')
})

// Intercept single upload
cy.intercept('PUT', '/remote.php/dav/photos/admin/albums/*/*', {
cy.intercept('PUT', '/remote.php/dav/photos/user/albums/*/*', {
statusCode: 201,
}).as('upload')

Expand All @@ -309,7 +339,7 @@ describe('Root management', () => {

cy.wait('@upload').then((upload) => {
expect(upload.request.url).to.have.string(
'/remote.php/dav/photos/admin/albums/2022%20Summer%20Vacations/image.jpg'
'/remote.php/dav/photos/user/albums/2022%20Summer%20Vacations/image.jpg',
)
})
})
Expand Down
2 changes: 1 addition & 1 deletion cypress/support/component-index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<title>Components App</title>

<!-- Nextcloud customizations -->
<link href="https://gitcdn.link/cdn/nextcloud/server/master/apps/theming/css/default.css" rel="stylesheet" />
<link href="https://nextcloud.github.io/server/apps/theming/css/default.css" rel="stylesheet" />
<script type="text/javascript">
window.OC = {
webroot: '',
Expand Down
60 changes: 0 additions & 60 deletions lib/components/ActionIcon.vue

This file was deleted.

Loading
Loading