From bf112da6d20b47e94de5d486d943edc66b3e727f Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Kuty=C5=82a?= Date: Tue, 23 Feb 2021 22:35:31 +0100 Subject: [PATCH] 17337: Fixed encode uri MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła --- cypress/integration/collection.spec.js | 734 +++++++++--------- src/common/webdav.ts | 2 +- .../collection-service-files-response.test.ts | 25 + .../collection-service-files-response.ts | 7 +- 4 files changed, 411 insertions(+), 357 deletions(-) create mode 100644 src/services/collection-service/collection-service-files-response.test.ts diff --git a/cypress/integration/collection.spec.js b/cypress/integration/collection.spec.js index 8db574ce..8f614591 100644 --- a/cypress/integration/collection.spec.js +++ b/cypress/integration/collection.spec.js @@ -2,68 +2,69 @@ // // SPDX-License-Identifier: AGPL-3.0 -describe('Collection panel tests', function() { +describe('Collection panel tests', function () { let activeUser; let adminUser; - before(function() { + before(function () { // Only set up common users once. These aren't set up as aliases because // aliases are cleaned up after every test. Also it doesn't make sense // to set the same users on beforeEach() over and over again, so we // separate a little from Cypress' 'Best Practices' here. cy.getUser('admin', 'Admin', 'User', true, true) - .as('adminUser').then(function() { + .as('adminUser').then(function () { adminUser = this.adminUser; } - ); + ); cy.getUser('collectionuser1', 'Collection', 'User', false, true) - .as('activeUser').then(function() { + .as('activeUser').then(function () { activeUser = this.activeUser; } - ); + ); }); - beforeEach(function() { + beforeEach(function () { cy.clearCookies(); cy.clearLocalStorage(); }); - it('uses the property editor with vocabulary terms', function() { + it('uses the property editor with vocabulary terms', function () { cy.createCollection(adminUser.token, { name: `Test collection ${Math.floor(Math.random() * 999999)}`, owner_uuid: activeUser.user.uuid, - manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"}) - .as('testCollection').then(function() { - cy.loginAs(activeUser); - cy.doSearch(`${this.testCollection.uuid}`); + manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n" + }) + .as('testCollection').then(function () { + cy.loginAs(activeUser); + cy.doSearch(`${this.testCollection.uuid}`); - // Key: Color (IDTAGCOLORS) - Value: Magenta (IDVALCOLORS3) - cy.get('[data-cy=resource-properties-form]').within(() => { - cy.get('[data-cy=property-field-key]').within(() => { - cy.get('input').type('Color'); - }); - cy.get('[data-cy=property-field-value]').within(() => { - cy.get('input').type('Magenta'); + // Key: Color (IDTAGCOLORS) - Value: Magenta (IDVALCOLORS3) + cy.get('[data-cy=resource-properties-form]').within(() => { + cy.get('[data-cy=property-field-key]').within(() => { + cy.get('input').type('Color'); + }); + cy.get('[data-cy=property-field-value]').within(() => { + cy.get('input').type('Magenta'); + }); + cy.root().submit(); }); - cy.root().submit(); - }); - // Confirm proper vocabulary labels are displayed on the UI. - cy.get('[data-cy=collection-properties-panel]') - .should('contain', 'Color') - .and('contain', 'Magenta'); - // Confirm proper vocabulary IDs were saved on the backend. - cy.doRequest('GET', `/arvados/v1/collections/${this.testCollection.uuid}`) - .its('body').as('collection') - .then(function() { - expect(this.collection.properties).to.deep.equal( - {IDTAGCOLORS: 'IDVALCOLORS3'}); + // Confirm proper vocabulary labels are displayed on the UI. + cy.get('[data-cy=collection-properties-panel]') + .should('contain', 'Color') + .and('contain', 'Magenta'); + // Confirm proper vocabulary IDs were saved on the backend. + cy.doRequest('GET', `/arvados/v1/collections/${this.testCollection.uuid}`) + .its('body').as('collection') + .then(function () { + expect(this.collection.properties).to.deep.equal( + { IDTAGCOLORS: 'IDVALCOLORS3' }); + }); }); - }); }); - it('shows collection by URL', function() { + it('shows collection by URL', function () { cy.loginAs(activeUser); - [true, false].map(function(isWritable) { + [true, false].map(function (isWritable) { // Using different file names to avoid test flakyness: the second iteration // on this loop may pass an assertion from the first iteration by looking // for the same file name. @@ -71,209 +72,155 @@ describe('Collection panel tests', function() { cy.createGroup(adminUser.token, { name: 'Shared project', group_class: 'project', - }).as('sharedGroup').then(function() { + }).as('sharedGroup').then(function () { // Creates the collection using the admin token so we can set up // a bogus manifest text without block signatures. cy.createCollection(adminUser.token, { name: 'Test collection', owner_uuid: this.sharedGroup.uuid, - properties: {someKey: 'someValue'}, - manifest_text: `. 37b51d194a7513e45b56f6524f2d51f2+3 0:3:${fileName}\n`}) - .as('testCollection').then(function() { - // Share the group with active user. - cy.createLink(adminUser.token, { - name: isWritable ? 'can_write' : 'can_read', - link_class: 'permission', - head_uuid: this.sharedGroup.uuid, - tail_uuid: activeUser.user.uuid - }) - cy.doSearch(`${this.testCollection.uuid}`); - - // Check that name & uuid are correct. - cy.get('[data-cy=collection-info-panel]') - .should('contain', this.testCollection.name) - .and('contain', this.testCollection.uuid) - .and('not.contain', 'This is an old version'); - // Check for the read-only icon - cy.get('[data-cy=read-only-icon]').should(`${isWritable ? 'not.' : ''}exist`); - // Check that both read and write operations are available on - // the 'More options' menu. - cy.get('[data-cy=collection-panel-options-btn]') - .click() - cy.get('[data-cy=context-menu]') - .should('contain', 'Add to favorites') - .and(`${isWritable ? '' : 'not.'}contain`, 'Edit collection'); - cy.get('body').click(); // Collapse the menu avoiding details panel expansion - cy.get('[data-cy=collection-properties-panel]') - .should('contain', 'someKey') - .and('contain', 'someValue') - .and('not.contain', 'anotherKey') - .and('not.contain', 'anotherValue') - if (isWritable === true) { - // Check that properties can be added. - cy.get('[data-cy=resource-properties-form]').within(() => { - cy.get('[data-cy=property-field-key]').within(() => { - cy.get('input').type('anotherKey'); - }); - cy.get('[data-cy=property-field-value]').within(() => { - cy.get('input').type('anotherValue'); - }); - cy.root().submit(); + properties: { someKey: 'someValue' }, + manifest_text: `. 37b51d194a7513e45b56f6524f2d51f2+3 0:3:${fileName}\n` + }) + .as('testCollection').then(function () { + // Share the group with active user. + cy.createLink(adminUser.token, { + name: isWritable ? 'can_write' : 'can_read', + link_class: 'permission', + head_uuid: this.sharedGroup.uuid, + tail_uuid: activeUser.user.uuid }) + cy.doSearch(`${this.testCollection.uuid}`); + + // Check that name & uuid are correct. + cy.get('[data-cy=collection-info-panel]') + .should('contain', this.testCollection.name) + .and('contain', this.testCollection.uuid) + .and('not.contain', 'This is an old version'); + // Check for the read-only icon + cy.get('[data-cy=read-only-icon]').should(`${isWritable ? 'not.' : ''}exist`); + // Check that both read and write operations are available on + // the 'More options' menu. + cy.get('[data-cy=collection-panel-options-btn]') + .click() + cy.get('[data-cy=context-menu]') + .should('contain', 'Add to favorites') + .and(`${isWritable ? '' : 'not.'}contain`, 'Edit collection'); + cy.get('body').click(); // Collapse the menu avoiding details panel expansion cy.get('[data-cy=collection-properties-panel]') - .should('contain', 'anotherKey') - .and('contain', 'anotherValue') - } else { - // Properties form shouldn't be displayed. - cy.get('[data-cy=resource-properties-form]').should('not.exist'); - } - // Check that the file listing show both read & write operations - cy.get('[data-cy=collection-files-panel]').within(() => { - cy.root().should('contain', fileName); - if (isWritable) { - cy.get('[data-cy=upload-button]') - .should(`${isWritable ? '' : 'not.'}contain`, 'Upload data'); + .should('contain', 'someKey') + .and('contain', 'someValue') + .and('not.contain', 'anotherKey') + .and('not.contain', 'anotherValue') + if (isWritable === true) { + // Check that properties can be added. + cy.get('[data-cy=resource-properties-form]').within(() => { + cy.get('[data-cy=property-field-key]').within(() => { + cy.get('input').type('anotherKey'); + }); + cy.get('[data-cy=property-field-value]').within(() => { + cy.get('input').type('anotherValue'); + }); + cy.root().submit(); + }) + cy.get('[data-cy=collection-properties-panel]') + .should('contain', 'anotherKey') + .and('contain', 'anotherValue') + } else { + // Properties form shouldn't be displayed. + cy.get('[data-cy=resource-properties-form]').should('not.exist'); } - }); - cy.get('[data-cy=collection-files-panel]') - .contains(fileName).rightclick(); - cy.get('[data-cy=context-menu]') - .should('contain', 'Download') - .and('contain', 'Open in new tab') - .and('contain', 'Copy to clipboard') - .and(`${isWritable ? '' : 'not.'}contain`, 'Rename') - .and(`${isWritable ? '' : 'not.'}contain`, 'Remove'); - cy.get('body').click(); // Collapse the menu - // Hamburger 'more options' menu button - cy.get('[data-cy=collection-files-panel-options-btn]') - .click() - cy.get('[data-cy=context-menu]') - .should('contain', 'Select all') - .click() - cy.get('[data-cy=collection-files-panel-options-btn]') - .click() - cy.get('[data-cy=context-menu]') - // .should('contain', 'Download selected') - .should(`${isWritable ? '' : 'not.'}contain`, 'Remove selected') - cy.get('body').click(); // Collapse the menu - // File item 'more options' button - cy.get('[data-cy=file-item-options-btn') - .click() - cy.get('[data-cy=context-menu]') - .should('contain', 'Download') - .and(`${isWritable ? '' : 'not.'}contain`, 'Remove'); - cy.get('body').click(); // Collapse the menu - }) + // Check that the file listing show both read & write operations + cy.get('[data-cy=collection-files-panel]').within(() => { + cy.root().should('contain', fileName); + if (isWritable) { + cy.get('[data-cy=upload-button]') + .should(`${isWritable ? '' : 'not.'}contain`, 'Upload data'); + } + }); + cy.get('[data-cy=collection-files-panel]') + .contains(fileName).rightclick(); + cy.get('[data-cy=context-menu]') + .should('contain', 'Download') + .and('contain', 'Open in new tab') + .and('contain', 'Copy to clipboard') + .and(`${isWritable ? '' : 'not.'}contain`, 'Rename') + .and(`${isWritable ? '' : 'not.'}contain`, 'Remove'); + cy.get('body').click(); // Collapse the menu + // Hamburger 'more options' menu button + cy.get('[data-cy=collection-files-panel-options-btn]') + .click() + cy.get('[data-cy=context-menu]') + .should('contain', 'Select all') + .click() + cy.get('[data-cy=collection-files-panel-options-btn]') + .click() + cy.get('[data-cy=context-menu]') + // .should('contain', 'Download selected') + .should(`${isWritable ? '' : 'not.'}contain`, 'Remove selected') + cy.get('body').click(); // Collapse the menu + // File item 'more options' button + cy.get('[data-cy=file-item-options-btn') + .click() + cy.get('[data-cy=context-menu]') + .should('contain', 'Download') + .and(`${isWritable ? '' : 'not.'}contain`, 'Remove'); + cy.get('body').click(); // Collapse the menu + }) }) }) }) - it('renames a file using valid names', function() { - // Creates the collection using the admin token so we can set up - // a bogus manifest text without block signatures. - cy.createCollection(adminUser.token, { - name: `Test collection ${Math.floor(Math.random() * 999999)}`, - owner_uuid: activeUser.user.uuid, - manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"}) - .as('testCollection').then(function() { - cy.loginAs(activeUser); - cy.doSearch(`${this.testCollection.uuid}`); - - const nameTransitions = [ - ['bar', '&'], - ['&', 'foo'], - ['foo', '&'], - ['&', 'I ❤️ ⛵️'], - ['I ❤️ ⛵️', '...'] - ]; - nameTransitions.forEach(([from, to]) => { - cy.get('[data-cy=collection-files-panel]') - .contains(`${from}`).rightclick(); - cy.get('[data-cy=context-menu]') - .contains('Rename') - .click(); - cy.get('[data-cy=form-dialog]') - .should('contain', 'Rename') - .within(() => { - cy.get('input').type(`{selectall}{backspace}${to}`); - }); - cy.get('[data-cy=form-submit-btn]').click(); - cy.get('[data-cy=collection-files-panel]') - .should('not.contain', `${from}`) - .and('contain', `${to}`); - }) - }); - }); - - it('renames a file to a different directory', function() { + it('renames a file using valid names', function () { // Creates the collection using the admin token so we can set up // a bogus manifest text without block signatures. cy.createCollection(adminUser.token, { name: `Test collection ${Math.floor(Math.random() * 999999)}`, owner_uuid: activeUser.user.uuid, - manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"}) - .as('testCollection').then(function() { - cy.loginAs(activeUser); - cy.doSearch(`${this.testCollection.uuid}`); + manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n" + }) + .as('testCollection').then(function () { + cy.loginAs(activeUser); + cy.doSearch(`${this.testCollection.uuid}`); - // Rename 'bar' to 'subdir/foo' - cy.get('[data-cy=collection-files-panel]') - .contains('bar').rightclick(); - cy.get('[data-cy=context-menu]') - .contains('Rename') - .click(); - cy.get('[data-cy=form-dialog]') - .should('contain', 'Rename') - .within(() => { - cy.get('input').type(`{selectall}{backspace}subdir/foo`); - }); - cy.get('[data-cy=form-submit-btn]').click(); - cy.get('[data-cy=collection-files-panel]') - .should('not.contain', 'bar') - .and('contain', 'subdir'); - // Look for the "arrow icon" and expand the "subdir" directory. - cy.get('[data-cy=virtual-file-tree] > div > i').click(); - // Rename 'subdir/foo' to 'baz' - cy.get('[data-cy=collection-files-panel]') - .contains('foo').rightclick(); - cy.get('[data-cy=context-menu]') - .contains('Rename') - .click(); - cy.get('[data-cy=form-dialog]') - .should('contain', 'Rename') - .within(() => { - cy.get('input') - .should('have.value', 'subdir/foo') - .type(`{selectall}{backspace}baz`); - }); - cy.get('[data-cy=form-submit-btn]').click(); - cy.get('[data-cy=collection-files-panel]') - .should('contain', 'subdir') // empty dir kept - .and('contain', 'baz'); - }); + const nameTransitions = [ + ['bar', '&'], + ['&', 'foo'], + ['foo', '&'], + ['&', 'I ❤️ ⛵️'], + ['I ❤️ ⛵️', '...'] + ]; + nameTransitions.forEach(([from, to]) => { + cy.get('[data-cy=collection-files-panel]') + .contains(`${from}`).rightclick(); + cy.get('[data-cy=context-menu]') + .contains('Rename') + .click(); + cy.get('[data-cy=form-dialog]') + .should('contain', 'Rename') + .within(() => { + cy.get('input').type(`{selectall}{backspace}${to}`); + }); + cy.get('[data-cy=form-submit-btn]').click(); + cy.get('[data-cy=collection-files-panel]') + .should('not.contain', `${from}`) + .and('contain', `${to}`); + }) + }); }); - it('tries to rename a file with illegal names', function() { + it('renames a file to a different directory', function () { // Creates the collection using the admin token so we can set up // a bogus manifest text without block signatures. cy.createCollection(adminUser.token, { name: `Test collection ${Math.floor(Math.random() * 999999)}`, owner_uuid: activeUser.user.uuid, - manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"}) - .as('testCollection').then(function() { - cy.loginAs(activeUser); - cy.doSearch(`${this.testCollection.uuid}`); + manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n" + }) + .as('testCollection').then(function () { + cy.loginAs(activeUser); + cy.doSearch(`${this.testCollection.uuid}`); - const illegalNamesFromUI = [ - ['.', "Name cannot be '.' or '..'"], - ['..', "Name cannot be '.' or '..'"], - ['', 'This field is required'], - [' ', 'Leading/trailing whitespaces not allowed'], - [' foo', 'Leading/trailing whitespaces not allowed'], - ['foo ', 'Leading/trailing whitespaces not allowed'], - ['//foo', 'Empty dir name not allowed'] - ] - illegalNamesFromUI.forEach(([name, errMsg]) => { + // Rename 'bar' to 'subdir/foo' cy.get('[data-cy=collection-files-panel]') .contains('bar').rightclick(); cy.get('[data-cy=context-menu]') @@ -282,19 +229,77 @@ describe('Collection panel tests', function() { cy.get('[data-cy=form-dialog]') .should('contain', 'Rename') .within(() => { - cy.get('input').type(`{selectall}{backspace}${name}`); + cy.get('input').type(`{selectall}{backspace}subdir/foo`); }); + cy.get('[data-cy=form-submit-btn]').click(); + cy.get('[data-cy=collection-files-panel]') + .should('not.contain', 'bar') + .and('contain', 'subdir'); + // Look for the "arrow icon" and expand the "subdir" directory. + cy.get('[data-cy=virtual-file-tree] > div > i').click(); + // Rename 'subdir/foo' to 'baz' + cy.get('[data-cy=collection-files-panel]') + .contains('foo').rightclick(); + cy.get('[data-cy=context-menu]') + .contains('Rename') + .click(); cy.get('[data-cy=form-dialog]') .should('contain', 'Rename') .within(() => { - cy.contains(`${errMsg}`); + cy.get('input') + .should('have.value', 'subdir/foo') + .type(`{selectall}{backspace}baz`); }); - cy.get('[data-cy=form-cancel-btn]').click(); - }) - }); + cy.get('[data-cy=form-submit-btn]').click(); + cy.get('[data-cy=collection-files-panel]') + .should('contain', 'subdir') // empty dir kept + .and('contain', 'baz'); + }); }); - it('can correctly display old versions', function() { + it('tries to rename a file with illegal names', function () { + // Creates the collection using the admin token so we can set up + // a bogus manifest text without block signatures. + cy.createCollection(adminUser.token, { + name: `Test collection ${Math.floor(Math.random() * 999999)}`, + owner_uuid: activeUser.user.uuid, + manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n" + }) + .as('testCollection').then(function () { + cy.loginAs(activeUser); + cy.doSearch(`${this.testCollection.uuid}`); + + const illegalNamesFromUI = [ + ['.', "Name cannot be '.' or '..'"], + ['..', "Name cannot be '.' or '..'"], + ['', 'This field is required'], + [' ', 'Leading/trailing whitespaces not allowed'], + [' foo', 'Leading/trailing whitespaces not allowed'], + ['foo ', 'Leading/trailing whitespaces not allowed'], + ['//foo', 'Empty dir name not allowed'] + ] + illegalNamesFromUI.forEach(([name, errMsg]) => { + cy.get('[data-cy=collection-files-panel]') + .contains('bar').rightclick(); + cy.get('[data-cy=context-menu]') + .contains('Rename') + .click(); + cy.get('[data-cy=form-dialog]') + .should('contain', 'Rename') + .within(() => { + cy.get('input').type(`{selectall}{backspace}${name}`); + }); + cy.get('[data-cy=form-dialog]') + .should('contain', 'Rename') + .within(() => { + cy.contains(`${errMsg}`); + }); + cy.get('[data-cy=form-cancel-btn]').click(); + }) + }); + }); + + it('can correctly display old versions', function () { const colName = `Versioned Collection ${Math.floor(Math.random() * 999999)}`; let colUuid = ''; let oldVersionUuid = ''; @@ -303,50 +308,72 @@ describe('Collection panel tests', function() { filters: `[["name", "=", "${colName}"]]`, include_old_versions: true }) - .its('body.items').as('collections') - .then(function() { - expect(this.collections).to.be.empty; - }); + .its('body.items').as('collections') + .then(function () { + expect(this.collections).to.be.empty; + }); // Creates the collection using the admin token so we can set up // a bogus manifest text without block signatures. cy.createCollection(adminUser.token, { name: colName, owner_uuid: activeUser.user.uuid, preserve_version: true, - manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n"}) - .as('originalVersion').then(function() { - // Change the file name to create a new version. - cy.updateCollection(adminUser.token, this.originalVersion.uuid, { - manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:foo\n" - }) - colUuid = this.originalVersion.uuid; - }); + manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:bar\n" + }) + .as('originalVersion').then(function () { + // Change the file name to create a new version. + cy.updateCollection(adminUser.token, this.originalVersion.uuid, { + manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:foo\n" + }) + colUuid = this.originalVersion.uuid; + }); // Confirm that there are 2 versions of the collection cy.doRequest('GET', '/arvados/v1/collections', null, { filters: `[["name", "=", "${colName}"]]`, include_old_versions: true }) - .its('body.items').as('collections') - .then(function() { - expect(this.collections).to.have.lengthOf(2); - this.collections.map(function(aCollection) { - expect(aCollection.current_version_uuid).to.equal(colUuid); - if (aCollection.uuid !== aCollection.current_version_uuid) { - oldVersionUuid = aCollection.uuid; - } + .its('body.items').as('collections') + .then(function () { + expect(this.collections).to.have.lengthOf(2); + this.collections.map(function (aCollection) { + expect(aCollection.current_version_uuid).to.equal(colUuid); + if (aCollection.uuid !== aCollection.current_version_uuid) { + oldVersionUuid = aCollection.uuid; + } + }); + // Check the old version displays as what it is. + cy.loginAs(activeUser) + cy.doSearch(`${oldVersionUuid}`); + + cy.get('[data-cy=collection-info-panel]').should('contain', 'This is an old version'); + cy.get('[data-cy=read-only-icon]').should('exist'); + cy.get('[data-cy=collection-info-panel]').should('contain', colName); + cy.get('[data-cy=collection-files-panel]').should('contain', 'bar'); }); - // Check the old version displays as what it is. - cy.loginAs(activeUser) - cy.doSearch(`${oldVersionUuid}`); + }); + + it.only('should display all filles within the collection even with the # sign within the file name', () => { + const colName = `Test Collection ${Math.floor(Math.random() * 999999)}`; - cy.get('[data-cy=collection-info-panel]').should('contain', 'This is an old version'); - cy.get('[data-cy=read-only-icon]').should('exist'); - cy.get('[data-cy=collection-info-panel]').should('contain', colName); - cy.get('[data-cy=collection-files-panel]').should('contain', 'bar'); - }); + cy.createCollection(adminUser.token, { + name: colName, + owner_uuid: activeUser.user.uuid, + preserve_version: true, + manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:#foo 0:3:bar\n" + }) + .as('collection') + .then((collection) => { + cy.loginAs(activeUser) + cy.doSearch(`${collection.uuid}`); + cy.get('[data-cy=collection-files-panel]').contains('#foo').closest('[data-cy=virtual-file-tree]').find('[type=checkbox]').click(); + cy.get('[data-cy=collection-files-panel-options-btn]').click(); + cy.get('[data-cy=context-menu]').contains('Remove selected').click(); + cy.get('[data-cy=confirmation-dialog-ok-btn]').click(); + cy.get('[data-cy=collection-files-panel]').contains('#foo').should('not.exist'); + }); }); - it('uses the collection version browser to view a previous version', function() { + it('uses the collection version browser to view a previous version', function () { const colName = `Test Collection ${Math.floor(Math.random() * 999999)}`; // Creates the collection using the admin token so we can set up @@ -355,125 +382,126 @@ describe('Collection panel tests', function() { name: colName, owner_uuid: activeUser.user.uuid, preserve_version: true, - manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:foo 0:3:bar\n"}) - .as('collection').then(function() { - // Visit collection, check basic information - cy.loginAs(activeUser) - cy.doSearch(`${this.collection.uuid}`); + manifest_text: ". 37b51d194a7513e45b56f6524f2d51f2+3 0:3:foo 0:3:bar\n" + }) + .as('collection').then(function () { + // Visit collection, check basic information + cy.loginAs(activeUser) + cy.doSearch(`${this.collection.uuid}`); - cy.get('[data-cy=collection-info-panel]').should('not.contain', 'This is an old version'); - cy.get('[data-cy=read-only-icon]').should('not.exist'); - cy.get('[data-cy=collection-version-number]').should('contain', '1'); - cy.get('[data-cy=collection-info-panel]').should('contain', colName); - cy.get('[data-cy=collection-files-panel]').should('contain', 'foo').and('contain', 'bar'); + cy.get('[data-cy=collection-info-panel]').should('not.contain', 'This is an old version'); + cy.get('[data-cy=read-only-icon]').should('not.exist'); + cy.get('[data-cy=collection-version-number]').should('contain', '1'); + cy.get('[data-cy=collection-info-panel]').should('contain', colName); + cy.get('[data-cy=collection-files-panel]').should('contain', 'foo').and('contain', 'bar'); - // Modify collection, expect version number change - cy.get('[data-cy=collection-files-panel]').contains('foo').rightclick(); - cy.get('[data-cy=context-menu]').contains('Remove').click(); - cy.get('[data-cy=confirmation-dialog]').should('contain', 'Removing file'); - cy.get('[data-cy=confirmation-dialog-ok-btn]').click(); - cy.get('[data-cy=collection-version-number]').should('contain', '2'); - cy.get('[data-cy=collection-files-panel]').should('not.contain', 'foo').and('contain', 'bar'); + // Modify collection, expect version number change + cy.get('[data-cy=collection-files-panel]').contains('foo').rightclick(); + cy.get('[data-cy=context-menu]').contains('Remove').click(); + cy.get('[data-cy=confirmation-dialog]').should('contain', 'Removing file'); + cy.get('[data-cy=confirmation-dialog-ok-btn]').click(); + cy.get('[data-cy=collection-version-number]').should('contain', '2'); + cy.get('[data-cy=collection-files-panel]').should('not.contain', 'foo').and('contain', 'bar'); - // Click on version number, check version browser. Click on past version. - cy.get('[data-cy=collection-version-browser]').should('not.exist'); - cy.get('[data-cy=collection-version-number]').contains('2').click(); - cy.get('[data-cy=collection-version-browser]') - .should('contain', 'Nr').and('contain', 'Size').and('contain', 'Date') - .within(() => { - // Version 1: 6 bytes in size - cy.get('[data-cy=collection-version-browser-select-1]') - .should('contain', '1').and('contain', '6 B'); - // Version 2: 3 bytes in size (one file removed) - cy.get('[data-cy=collection-version-browser-select-2]') - .should('contain', '2').and('contain', '3 B'); - cy.get('[data-cy=collection-version-browser-select-3]') - .should('not.exist'); - cy.get('[data-cy=collection-version-browser-select-1]') - .click(); - }); - cy.get('[data-cy=collection-info-panel]').should('contain', 'This is an old version'); - cy.get('[data-cy=read-only-icon]').should('exist'); - cy.get('[data-cy=collection-version-number]').should('contain', '1'); - cy.get('[data-cy=collection-info-panel]').should('contain', colName); - cy.get('[data-cy=collection-files-panel]') - .should('contain', 'foo').and('contain', 'bar'); + // Click on version number, check version browser. Click on past version. + cy.get('[data-cy=collection-version-browser]').should('not.exist'); + cy.get('[data-cy=collection-version-number]').contains('2').click(); + cy.get('[data-cy=collection-version-browser]') + .should('contain', 'Nr').and('contain', 'Size').and('contain', 'Date') + .within(() => { + // Version 1: 6 bytes in size + cy.get('[data-cy=collection-version-browser-select-1]') + .should('contain', '1').and('contain', '6 B'); + // Version 2: 3 bytes in size (one file removed) + cy.get('[data-cy=collection-version-browser-select-2]') + .should('contain', '2').and('contain', '3 B'); + cy.get('[data-cy=collection-version-browser-select-3]') + .should('not.exist'); + cy.get('[data-cy=collection-version-browser-select-1]') + .click(); + }); + cy.get('[data-cy=collection-info-panel]').should('contain', 'This is an old version'); + cy.get('[data-cy=read-only-icon]').should('exist'); + cy.get('[data-cy=collection-version-number]').should('contain', '1'); + cy.get('[data-cy=collection-info-panel]').should('contain', colName); + cy.get('[data-cy=collection-files-panel]') + .should('contain', 'foo').and('contain', 'bar'); - // Check that only old collection action are available on context menu - cy.get('[data-cy=collection-panel-options-btn]').click(); - cy.get('[data-cy=context-menu]') - .should('contain', 'Restore version') - .and('not.contain', 'Add to favorites'); - cy.get('body').click(); // Collapse the menu avoiding details panel expansion + // Check that only old collection action are available on context menu + cy.get('[data-cy=collection-panel-options-btn]').click(); + cy.get('[data-cy=context-menu]') + .should('contain', 'Restore version') + .and('not.contain', 'Add to favorites'); + cy.get('body').click(); // Collapse the menu avoiding details panel expansion - // Click on "head version" link, confirm that it's the latest version. - cy.get('[data-cy=collection-info-panel]').contains('head version').click(); - cy.get('[data-cy=collection-info-panel]') - .should('not.contain', 'This is an old version'); - cy.get('[data-cy=read-only-icon]').should('not.exist'); - cy.get('[data-cy=collection-version-number]').should('contain', '2'); - cy.get('[data-cy=collection-info-panel]').should('contain', colName); - cy.get('[data-cy=collection-files-panel]'). - should('not.contain', 'foo').and('contain', 'bar'); + // Click on "head version" link, confirm that it's the latest version. + cy.get('[data-cy=collection-info-panel]').contains('head version').click(); + cy.get('[data-cy=collection-info-panel]') + .should('not.contain', 'This is an old version'); + cy.get('[data-cy=read-only-icon]').should('not.exist'); + cy.get('[data-cy=collection-version-number]').should('contain', '2'); + cy.get('[data-cy=collection-info-panel]').should('contain', colName); + cy.get('[data-cy=collection-files-panel]'). + should('not.contain', 'foo').and('contain', 'bar'); - // Check that old collection action isn't available on context menu - cy.get('[data-cy=collection-panel-options-btn]').click() - cy.get('[data-cy=context-menu]').should('not.contain', 'Restore version') - cy.get('body').click(); // Collapse the menu avoiding details panel expansion + // Check that old collection action isn't available on context menu + cy.get('[data-cy=collection-panel-options-btn]').click() + cy.get('[data-cy=context-menu]').should('not.contain', 'Restore version') + cy.get('body').click(); // Collapse the menu avoiding details panel expansion - // Make another change, confirm new version. - cy.get('[data-cy=collection-panel-options-btn]').click(); - cy.get('[data-cy=context-menu]').contains('Edit collection').click(); - cy.get('[data-cy=form-dialog]') - .should('contain', 'Edit Collection') - .within(() => { - // appends some text - cy.get('input').first().type(' renamed'); - }); - cy.get('[data-cy=form-submit-btn]').click(); - cy.get('[data-cy=collection-info-panel]') - .should('not.contain', 'This is an old version'); - cy.get('[data-cy=read-only-icon]').should('not.exist'); - cy.get('[data-cy=collection-version-number]').should('contain', '3'); - cy.get('[data-cy=collection-info-panel]').should('contain', colName + ' renamed'); - cy.get('[data-cy=collection-files-panel]') - .should('not.contain', 'foo').and('contain', 'bar'); - cy.get('[data-cy=collection-version-browser-select-3]') - .should('contain', '3').and('contain', '3 B'); + // Make another change, confirm new version. + cy.get('[data-cy=collection-panel-options-btn]').click(); + cy.get('[data-cy=context-menu]').contains('Edit collection').click(); + cy.get('[data-cy=form-dialog]') + .should('contain', 'Edit Collection') + .within(() => { + // appends some text + cy.get('input').first().type(' renamed'); + }); + cy.get('[data-cy=form-submit-btn]').click(); + cy.get('[data-cy=collection-info-panel]') + .should('not.contain', 'This is an old version'); + cy.get('[data-cy=read-only-icon]').should('not.exist'); + cy.get('[data-cy=collection-version-number]').should('contain', '3'); + cy.get('[data-cy=collection-info-panel]').should('contain', colName + ' renamed'); + cy.get('[data-cy=collection-files-panel]') + .should('not.contain', 'foo').and('contain', 'bar'); + cy.get('[data-cy=collection-version-browser-select-3]') + .should('contain', '3').and('contain', '3 B'); - // Check context menus on version browser - cy.get('[data-cy=collection-version-browser-select-3]').rightclick() - cy.get('[data-cy=context-menu]') - .should('contain', 'Add to favorites') - .and('contain', 'Make a copy') - .and('contain', 'Edit collection'); - cy.get('body').click(); - // (and now an old version...) - cy.get('[data-cy=collection-version-browser-select-1]').rightclick() - cy.get('[data-cy=context-menu]') - .should('not.contain', 'Add to favorites') - .and('contain', 'Make a copy') - .and('not.contain', 'Edit collection'); - cy.get('body').click(); + // Check context menus on version browser + cy.get('[data-cy=collection-version-browser-select-3]').rightclick() + cy.get('[data-cy=context-menu]') + .should('contain', 'Add to favorites') + .and('contain', 'Make a copy') + .and('contain', 'Edit collection'); + cy.get('body').click(); + // (and now an old version...) + cy.get('[data-cy=collection-version-browser-select-1]').rightclick() + cy.get('[data-cy=context-menu]') + .should('not.contain', 'Add to favorites') + .and('contain', 'Make a copy') + .and('not.contain', 'Edit collection'); + cy.get('body').click(); - // Restore first version - cy.get('[data-cy=collection-version-browser]').within(() => { - cy.get('[data-cy=collection-version-browser-select-1]').click(); + // Restore first version + cy.get('[data-cy=collection-version-browser]').within(() => { + cy.get('[data-cy=collection-version-browser-select-1]').click(); + }); + cy.get('[data-cy=collection-panel-options-btn]').click() + cy.get('[data-cy=context-menu]').contains('Restore version').click(); + cy.get('[data-cy=confirmation-dialog]').should('contain', 'Restore version'); + cy.get('[data-cy=confirmation-dialog-ok-btn]').click(); + cy.get('[data-cy=collection-info-panel]') + .should('not.contain', 'This is an old version'); + cy.get('[data-cy=collection-version-number]').should('contain', '4'); + cy.get('[data-cy=collection-info-panel]').should('contain', colName); + cy.get('[data-cy=collection-files-panel]') + .should('contain', 'foo').and('contain', 'bar'); }); - cy.get('[data-cy=collection-panel-options-btn]').click() - cy.get('[data-cy=context-menu]').contains('Restore version').click(); - cy.get('[data-cy=confirmation-dialog]').should('contain', 'Restore version'); - cy.get('[data-cy=confirmation-dialog-ok-btn]').click(); - cy.get('[data-cy=collection-info-panel]') - .should('not.contain', 'This is an old version'); - cy.get('[data-cy=collection-version-number]').should('contain', '4'); - cy.get('[data-cy=collection-info-panel]').should('contain', colName); - cy.get('[data-cy=collection-files-panel]') - .should('contain', 'foo').and('contain', 'bar'); - }); }); - it('creates new collection on home project', function() { + it('creates new collection on home project', function () { cy.loginAs(activeUser); cy.doSearch(`${activeUser.user.uuid}`); cy.get('[data-cy=breadcrumb-first]').should('contain', 'Projects'); diff --git a/src/common/webdav.ts b/src/common/webdav.ts index c4d8acae..e896a207 100644 --- a/src/common/webdav.ts +++ b/src/common/webdav.ts @@ -75,7 +75,7 @@ export class WebDAV { r.open(config.method, `${this.defaults.baseURL ? this.defaults.baseURL+'/' - : ''}${encodeURI(config.url)}`); + : ''}${encodeURIComponent(config.url)}`); const headers = { ...this.defaults.headers, ...config.headers }; Object .keys(headers) diff --git a/src/services/collection-service/collection-service-files-response.test.ts b/src/services/collection-service/collection-service-files-response.test.ts new file mode 100644 index 00000000..06c8662b --- /dev/null +++ b/src/services/collection-service/collection-service-files-response.test.ts @@ -0,0 +1,25 @@ +// Copyright (C) The Arvados Authors. All rights reserved. +// +// SPDX-License-Identifier: AGPL-3.0 + +import { CollectionFile } from '~/models/collection-file'; +import { getFileFullPath } from './collection-service-files-response'; + +describe('collection-service-files-response', () => { + describe('getFileFullPath', () => { + it('should encode weird names', async () => { + // given + const file = { + name: '#test', + path: 'http://localhost', + } as CollectionFile; + + // when + const result = getFileFullPath(file); + + // then + expect(result).toBe('http://localhost/#test'); + }); + + }); +}); \ No newline at end of file diff --git a/src/services/collection-service/collection-service-files-response.ts b/src/services/collection-service/collection-service-files-response.ts index 5e6f7b83..c1176cd5 100644 --- a/src/services/collection-service/collection-service-files-response.ts +++ b/src/services/collection-service/collection-service-files-response.ts @@ -28,7 +28,7 @@ export const extractFilesData = (document: Document) => { const name = getTagValue(element, 'D:displayname', ''); const size = parseInt(getTagValue(element, 'D:getcontentlength', '0'), 10); const url = getTagValue(element, 'D:href', ''); - const nameSuffix = `/${name || ''}`; + const nameSuffix = `/${encodeURIComponent(name) || ''}`; const collectionUuidMatch = collectionUrlPrefix.exec(url); const collectionUuid = collectionUuidMatch ? collectionUuidMatch.pop() : ''; const directory = url @@ -53,5 +53,6 @@ export const extractFilesData = (document: Document) => { }); }; -export const getFileFullPath = ({ name, path }: CollectionFile | CollectionDirectory) => - `${path}/${name}`; +export const getFileFullPath = ({ name, path }: CollectionFile | CollectionDirectory) => { + return `${path}/${name}`; +}; \ No newline at end of file -- 2.30.2