From: Daniel Kutyła Date: Wed, 3 Mar 2021 21:45:47 +0000 (+0100) Subject: 17436: fixed workflow cration favorites list X-Git-Tag: 2.1.2.1~11^2~2 X-Git-Url: https://git.arvados.org/arvados-workbench2.git/commitdiff_plain/aef54eeec8f2e7255e2da119a19d14879dfb7b72 17436: fixed workflow cration favorites list Arvados-DCO-1.1-Signed-off-by: Daniel Kutyła --- diff --git a/cypress/integration/favorites.spec.js b/cypress/integration/favorites.spec.js index eca35bc4..4cfb832a 100644 --- a/cypress/integration/favorites.spec.js +++ b/cypress/integration/favorites.spec.js @@ -26,34 +26,9 @@ describe('Favorites tests', function () { beforeEach(function () { cy.clearCookies() cy.clearLocalStorage() - }) - - it('checks that Public favorites does not appear under shared with me', function () { - cy.loginAs(adminUser); - cy.contains('Shared with me').click(); - cy.get('main').contains('Public favorites').should('not.exist'); - }); - - it('creates and removes a public favorite', function () { - cy.loginAs(adminUser); - cy.createGroup(adminUser.token, { - name: `my-favorite-project`, - group_class: 'project', - }).as('myFavoriteProject').then(function () { - cy.contains('Refresh').click(); - cy.get('main').contains('my-favorite-project').rightclick(); - cy.contains('Add to public favorites').click(); - cy.contains('Public Favorites').click(); - cy.get('main').contains('my-favorite-project').rightclick(); - cy.contains('Remove from public favorites').click(); - cy.get('main').contains('my-favorite-project').should('not.exist'); - cy.trashGroup(adminUser.token, this.myFavoriteProject.uuid); - }); }); - it('can copy collection to favorites', () => { - cy.loginAs(adminUser); - + const createSharedProjects = () => { cy.createGroup(adminUser.token, { name: `my-shared-writable-project ${Math.floor(Math.random() * 999999)}`, group_class: 'project', @@ -91,6 +66,35 @@ describe('Favorites tests', function () { name: `my-project ${Math.floor(Math.random() * 999999)}`, group_class: 'project', }).as('myProject1'); + }; + + it('checks that Public favorites does not appear under shared with me', function () { + cy.loginAs(adminUser); + cy.contains('Shared with me').click(); + cy.get('main').contains('Public favorites').should('not.exist'); + }); + + it('creates and removes a public favorite', function () { + cy.loginAs(adminUser); + cy.createGroup(adminUser.token, { + name: `my-favorite-project`, + group_class: 'project', + }).as('myFavoriteProject').then(function () { + cy.contains('Refresh').click(); + cy.get('main').contains('my-favorite-project').rightclick(); + cy.contains('Add to public favorites').click(); + cy.contains('Public Favorites').click(); + cy.get('main').contains('my-favorite-project').rightclick(); + cy.contains('Remove from public favorites').click(); + cy.get('main').contains('my-favorite-project').should('not.exist'); + cy.trashGroup(adminUser.token, this.myFavoriteProject.uuid); + }); + }); + + it('can copy collection to favorites', () => { + cy.loginAs(adminUser); + + createSharedProjects(); cy.createCollection(adminUser.token, { name: `Test collection ${Math.floor(Math.random() * 999999)}`, @@ -219,4 +223,53 @@ describe('Favorites tests', function () { cy.get('[data-cy=collection-files-panel]').contains('bar'); }); }); + + it.only('can view favourites in workflow', () => { + cy.loginAs(adminUser); + + createSharedProjects(); + + cy.getAll('@mySharedWritableProject', '@mySharedReadonlyProject', '@myProject1') + .then(function ([mySharedWritableProject, mySharedReadonlyProject, myProject1]) { + cy.loginAs(activeUser); + + cy.createWorkflow(adminUser.token, { + name: `TestWorkflow${Math.floor(Math.random() * 999999)}.cwl`, + definition: "{\n \"$graph\": [\n {\n \"class\": \"Workflow\",\n \"doc\": \"Reverse the lines in a document, then sort those lines.\",\n \"hints\": [\n {\n \"acrContainerImage\": \"99b0201f4cade456b4c9d343769a3b70+261\",\n \"class\": \"http://arvados.org/cwl#WorkflowRunnerResources\"\n }\n ],\n \"id\": \"#main\",\n \"inputs\": [\n {\n \"default\": null,\n \"doc\": \"The input file to be processed.\",\n \"id\": \"#main/input\",\n \"type\": \"File\"\n },\n {\n \"default\": true,\n \"doc\": \"If true, reverse (decending) sort\",\n \"id\": \"#main/reverse_sort\",\n \"type\": \"boolean\"\n }\n ],\n \"outputs\": [\n {\n \"doc\": \"The output with the lines reversed and sorted.\",\n \"id\": \"#main/output\",\n \"outputSource\": \"#main/sorted/output\",\n \"type\": \"File\"\n }\n ],\n \"steps\": [\n {\n \"id\": \"#main/rev\",\n \"in\": [\n {\n \"id\": \"#main/rev/input\",\n \"source\": \"#main/input\"\n }\n ],\n \"out\": [\n \"#main/rev/output\"\n ],\n \"run\": \"#revtool.cwl\"\n },\n {\n \"id\": \"#main/sorted\",\n \"in\": [\n {\n \"id\": \"#main/sorted/input\",\n \"source\": \"#main/rev/output\"\n },\n {\n \"id\": \"#main/sorted/reverse\",\n \"source\": \"#main/reverse_sort\"\n }\n ],\n \"out\": [\n \"#main/sorted/output\"\n ],\n \"run\": \"#sorttool.cwl\"\n }\n ]\n },\n {\n \"baseCommand\": \"rev\",\n \"class\": \"CommandLineTool\",\n \"doc\": \"Reverse each line using the `rev` command\",\n \"hints\": [\n {\n \"class\": \"ResourceRequirement\",\n \"ramMin\": 8\n }\n ],\n \"id\": \"#revtool.cwl\",\n \"inputs\": [\n {\n \"id\": \"#revtool.cwl/input\",\n \"inputBinding\": {},\n \"type\": \"File\"\n }\n ],\n \"outputs\": [\n {\n \"id\": \"#revtool.cwl/output\",\n \"outputBinding\": {\n \"glob\": \"output.txt\"\n },\n \"type\": \"File\"\n }\n ],\n \"stdout\": \"output.txt\"\n },\n {\n \"baseCommand\": \"sort\",\n \"class\": \"CommandLineTool\",\n \"doc\": \"Sort lines using the `sort` command\",\n \"hints\": [\n {\n \"class\": \"ResourceRequirement\",\n \"ramMin\": 8\n }\n ],\n \"id\": \"#sorttool.cwl\",\n \"inputs\": [\n {\n \"id\": \"#sorttool.cwl/reverse\",\n \"inputBinding\": {\n \"position\": 1,\n \"prefix\": \"-r\"\n },\n \"type\": \"boolean\"\n },\n {\n \"id\": \"#sorttool.cwl/input\",\n \"inputBinding\": {\n \"position\": 2\n },\n \"type\": \"File\"\n }\n ],\n \"outputs\": [\n {\n \"id\": \"#sorttool.cwl/output\",\n \"outputBinding\": {\n \"glob\": \"output.txt\"\n },\n \"type\": \"File\"\n }\n ],\n \"stdout\": \"output.txt\"\n }\n ],\n \"cwlVersion\": \"v1.0\"\n}", + owner_uuid: myProject1.uuid, + }) + .as('testWorkflow'); + + cy.contains('Shared with me').click(); + + cy.get('main').contains(mySharedWritableProject.name).rightclick(); + cy.get('[data-cy=context-menu]').within(() => { + cy.contains('Add to favorites').click(); + }); + + cy.get('main').contains(mySharedReadonlyProject.name).rightclick(); + cy.get('[data-cy=context-menu]').within(() => { + cy.contains('Add to favorites').click(); + }); + + cy.doSearch(`${activeUser.user.uuid}`); + + cy.get('main').contains(myProject1.name).click(); + + cy.get('[data-cy=side-panel-button]').click(); + + cy.get('#aside-menu-list').contains('Run a process').click(); + + cy.get('@testWorkflow') + .then((testWorkflow) => { + cy.get('main').contains(testWorkflow.name).click(); + cy.get('[data-cy=run-process-next-button]').click(); + cy.get('[readonly]').click(); + cy.get('[data-cy=choose-a-file-dialog]').as('chooseFileDialog'); + cy.get('[data-cy=projects-tree-favourites-tree-picker]').contains('Favorites').closest('ul').find('i').click(); + cy.get('@chooseFileDialog').find(`[data-id=${mySharedWritableProject.uuid}]`); + cy.get('@chooseFileDialog').find(`[data-id=${mySharedReadonlyProject.uuid}]`); + }); + }); + }); }); \ No newline at end of file diff --git a/src/views/run-process-panel/inputs/file-input.tsx b/src/views/run-process-panel/inputs/file-input.tsx index 66070f77..0b80050d 100644 --- a/src/views/run-process-panel/inputs/file-input.tsx +++ b/src/views/run-process-panel/inputs/file-input.tsx @@ -23,14 +23,18 @@ import { CollectionFile, CollectionFileType } from '~/models/collection-file'; export interface FileInputProps { input: FileCommandInputParameter; + options?: { showOnlyOwned: boolean, showOnlyWritable: boolean }; } -export const FileInput = ({ input }: FileInputProps) => +export const FileInput = ({ input, options }: FileInputProps) => ; const format = (value?: File) => value ? value.basename : ''; @@ -54,7 +58,9 @@ interface FileInputComponentState { } const FileInputComponent = connect()( - class FileInputComponent extends React.Component { + class FileInputComponent extends React.Component { state: FileInputComponentState = { open: false, }; @@ -119,6 +125,7 @@ const FileInputComponent = connect()( pickerId={this.props.commandInput.id} includeCollections includeFiles + options={this.props.options} toggleItemActive={this.setFile} /> diff --git a/src/views/run-process-panel/run-process-inputs-form.tsx b/src/views/run-process-panel/run-process-inputs-form.tsx index 45b97117..3a0afd34 100644 --- a/src/views/run-process-panel/run-process-inputs-form.tsx +++ b/src/views/run-process-panel/run-process-inputs-form.tsx @@ -89,7 +89,7 @@ const getInputComponent = (input: CommandInputParameter) => { return ; case isPrimitiveOfType(input, CWLType.FILE): - return ; + return ; case isPrimitiveOfType(input, CWLType.DIRECTORY): return ;