diff options
| author | Ferdinand Thiessen <opensource@fthiessen.de> | 2025-01-31 13:44:33 +0100 |
|---|---|---|
| committer | Ferdinand Thiessen <opensource@fthiessen.de> | 2025-05-17 12:04:36 +0200 |
| commit | 2bb2bbcae4b627c470b111cd31cd2c3768fe7632 (patch) | |
| tree | 67a8a886695995b42848a953a25976b3920804fc | |
| parent | 395515f3464411e187be8735bf1a150606ec7ddf (diff) | |
| download | nextcloud-server-2bb2bbcae4b627c470b111cd31cd2c3768fe7632.tar.gz nextcloud-server-2bb2bbcae4b627c470b111cd31cd2c3768fe7632.zip | |
fix(files_sharing): Disable folder upload on file drop shares for now
The backend does not allow creating folders currently, so we have to
disable it for now.
Signed-off-by: Ferdinand Thiessen <opensource@fthiessen.de>
| -rw-r--r-- | apps/files/src/views/FilesList.vue | 10 | ||||
| -rw-r--r-- | apps/files_sharing/src/views/FilesViewFileDropEmptyContent.vue | 3 | ||||
| -rw-r--r-- | cypress/e2e/files_sharing/public-share/view_file-drop.cy.ts | 23 |
3 files changed, 24 insertions, 12 deletions
diff --git a/apps/files/src/views/FilesList.vue b/apps/files/src/views/FilesList.vue index 1bd3026ec07..986f9b22e2d 100644 --- a/apps/files/src/views/FilesList.vue +++ b/apps/files/src/views/FilesList.vue @@ -24,7 +24,7 @@ <!-- Uploader --> <UploadPicker v-if="canUpload && !isQuotaExceeded && currentFolder" - allow-folders + :allow-folders="canUploadFolders" class="files-list__header-upload-button" :content="getContent" :destination="currentFolder" @@ -282,6 +282,14 @@ export default defineComponent({ }, computed: { + canUploadFolders() { + // TODO: Remove this small files_sharing hack when https://github.com/nextcloud/server/issues/15921 is implmented + if (this.currentView?.id === 'public-file-drop') { + return false + } + return true + }, + /** * Get a callback function for the uploader to fetch directory contents for conflict resolution */ diff --git a/apps/files_sharing/src/views/FilesViewFileDropEmptyContent.vue b/apps/files_sharing/src/views/FilesViewFileDropEmptyContent.vue index 538927623ed..f262f5ed890 100644 --- a/apps/files_sharing/src/views/FilesViewFileDropEmptyContent.vue +++ b/apps/files_sharing/src/views/FilesViewFileDropEmptyContent.vue @@ -25,8 +25,7 @@ :name="t('files_sharing', 'Terms of service')" :message="disclaimer" /> </template> - <UploadPicker allow-folders - :content="() => []" + <UploadPicker :content="() => []" no-menu :destination="uploadDestination" multiple /> diff --git a/cypress/e2e/files_sharing/public-share/view_file-drop.cy.ts b/cypress/e2e/files_sharing/public-share/view_file-drop.cy.ts index 3a38f0c9ec7..c5231beeaca 100644 --- a/cypress/e2e/files_sharing/public-share/view_file-drop.cy.ts +++ b/cypress/e2e/files_sharing/public-share/view_file-drop.cy.ts @@ -70,7 +70,8 @@ describe('files_sharing: Public share - File drop', { testIsolation: true }, () .should('not.exist') }) - it('Can only see upload files and upload folders menu entries', () => { + // TODO: reenable folder upload with https://github.com/nextcloud/server/issues/15921 + it.skip('Can only see upload files and upload folders menu entries', () => { cy.contains(`Upload files to ${shareName}`) .should('be.visible') @@ -87,6 +88,16 @@ describe('files_sharing: Public share - File drop', { testIsolation: true }, () .findAllByRole('menuitem') .should('have.length', 2) }) + it('Can only see upload files', () => { + cy.contains(`Upload files to ${shareName}`) + .should('be.visible') + + cy.findByRole('button', { name: 'New' }) + .should('be.visible') + .click() + cy.findByRole('menu') + .should('not.exist') + }) it('Can only see dedicated upload button', () => { cy.contains(`Upload files to ${shareName}`) @@ -95,15 +106,9 @@ describe('files_sharing: Public share - File drop', { testIsolation: true }, () cy.findByRole('button', { name: 'Upload' }) .should('be.visible') .click() - // See upload actions - cy.findByRole('menuitem', { name: 'Upload files' }) - .should('be.visible') - cy.findByRole('menuitem', { name: 'Upload folders' }) - .should('be.visible') - // But no other + // But no menu cy.findByRole('menu') - .findAllByRole('menuitem') - .should('have.length', 2) + .should('not.exist') }) it('Can upload files', () => { |