Merge branch '17585-Redesign-navigation-of-files-in-collections' into main

closes #17585

Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła <daniel.kutyla@contractors.roche.com>

diff --combined cypress/integration/collection.spec.js
index 2cb6281a300bb124d43d0119d2a3d52e246bd545,bf2375d0da10a0ff3e575c3d24064afe12a17c28..fb126af6a2a3577926cacb8ec659412f554aa8dd
--- 1/cypress/integration/collection.spec.js
--- 2/cypress/integration/collection.spec.js
+++ b/cypress/integration/collection.spec.js
@@@ -122,22 -122,12 +122,22 @@@ describe('Collection panel tests', func
              }).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./${subDirName} 37b51d194a7513e45b56f6524f2d51f2+3 0:3:${fileName}\n`
 -                })
 +                cy.doRequest('GET', '/arvados/v1/config', null, null)
 +                    .its('body').should((clusterConfig) => {
 +                      expect(clusterConfig.Collections, "clusterConfig").to.have.property("TrustAllContent", false);
 +                      expect(clusterConfig.Services, "clusterConfig").to.have.property("WebDAV").have.property("ExternalURL");
 +                      expect(clusterConfig.Services, "clusterConfig").to.have.property("WebDAVDownload").have.property("ExternalURL");
 +                      const inlineUrl = clusterConfig.Services.WebDAV.ExternalURL !== ""
 +                          ? clusterConfig.Services.WebDAV.ExternalURL
 +                          : clusterConfig.Services.WebDAVDownload.ExternalURL;
 +                      expect(inlineUrl).to.not.contain("*");
 +                    })
 +                    .createCollection(adminUser.token, {
 +                      name: 'Test collection',
 +                      owner_uuid: this.sharedGroup.uuid,
 +                      properties: { someKey: 'someValue' },
 +                      manifest_text: `. 37b51d194a7513e45b56f6524f2d51f2+3 0:3:${fileName}\n./${subDirName} 37b51d194a7513e45b56f6524f2d51f2+3 0:3:${fileName}\n`
 +                    })
                      .as('testCollection').then(function () {
                          // Share the group with active user.
                          cy.createLink(adminUser.token, {
@@@ -188,6 -178,7 +188,7 @@@
                          }
                          // Check that the file listing show both read & write operations
                          cy.get('[data-cy=collection-files-panel]').within(() => {
+                             cy.wait(1000);
                              cy.root().should('contain', fileName);
                              if (isWritable) {
                                  cy.get('[data-cy=upload-button]')
@@@ -199,7 -190,7 +200,7 @@@
                              .contains(fileName).rightclick({ force: true });
                          cy.get('[data-cy=context-menu]')
                              .should('contain', 'Download')
 -                            .and('contain', 'Open in new tab')
 +                            .and('not.contain', 'Open in new tab')
                              .and('contain', 'Copy to clipboard')
                              .and(`${isWritable ? '' : 'not.'}contain`, 'Rename')
                              .and(`${isWritable ? '' : 'not.'}contain`, 'Remove');
@@@ -208,7 -199,7 +209,7 @@@
                              .contains(subDirName).rightclick({ force: true });
                          cy.get('[data-cy=context-menu]')
                              .should('not.contain', 'Download')
 -                            .and('contain', 'Open in new tab')
 +                            .and('not.contain', 'Open in new tab')
                              .and('contain', 'Copy to clipboard')
                              .and(`${isWritable ? '' : 'not.'}contain`, 'Rename')
                              .and(`${isWritable ? '' : 'not.'}contain`, 'Remove');
@@@ -289,7 -280,7 +290,7 @@@
              });
      });
  
-     it('renames a file to a different directory', function () {
+     it.skip('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, {
@@@ -334,6 -325,71 +335,71 @@@
                      cy.get('[data-cy=form-submit-btn]').click();
                      cy.get('[data-cy=collection-files-panel]')
                          .should('contain', subdir) // empty dir kept
+                         .and('contain', 'bar');
+ 
+                     cy.get('[data-cy=collection-files-panel]')
+                         .contains(subdir).rightclick();
+                     cy.get('[data-cy=context-menu]')
+                         .contains('Remove')
+                         .click();
+                     cy.get('[data-cy=confirmation-dialog-ok-btn]').click();
+                 });
+             });
+     });
+ 
+     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.goToPath(`/collections/${this.testCollection.uuid}`);
+ 
+                 ['subdir', 'G%C3%BCnter\'s%20file', 'table%&?*2'].forEach((subdir) => {
+                     cy.get('[data-cy=collection-files-panel]')
+                         .contains('bar').rightclick({force: true});
+                     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);
+                     cy.wait(1000);
+                     cy.get('[data-cy=collection-files-panel]').contains(subdir).click();
+                     // Rename 'subdir/foo' to 'foo'
+                     cy.wait(1000);
+                     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}bar`);
+                         });
+                     cy.get('[data-cy=form-submit-btn]').click();
+ 
+                     cy.wait(1000);
+                     cy.get('[data-cy=collection-files-panel]')
+                         .contains('Home')
+                         .click();
+ 
+                     cy.wait(2000);
+                     cy.get('[data-cy=collection-files-panel]')
+                         .should('contain', subdir) // empty dir kept
                          .and('contain', 'bar');
  
                      cy.get('[data-cy=collection-files-panel]')