it('automatically updates the collection UI contents without using the Refresh button', function () {
const collName = `Test Collection ${Math.floor(Math.random() * 999999)}`;
- const fileName = 'foobar'
cy.createCollection(adminUser.token, {
name: collName,
cy.getAll('@testCollection').then(function ([testCollection]) {
cy.loginAs(activeUser);
+
+ const files = [
+ "foobar",
+ "anotherFile",
+ "",
+ "finalName",
+ ];
+
cy.goToPath(`/collections/${testCollection.uuid}`);
cy.get('[data-cy=collection-files-panel]').should('contain', 'This collection is empty');
- cy.get('[data-cy=collection-files-panel]').should('not.contain', fileName);
+ cy.get('[data-cy=collection-files-panel]').should('not.contain', files[0]);
cy.get('[data-cy=collection-info-panel]').should('contain', collName);
- cy.updateCollection(adminUser.token, testCollection.uuid, {
- name: `${collName + ' updated'}`,
- manifest_text: `. 37b51d194a7513e45b56f6524f2d51f2+3 0:3:${fileName}\n`,
- }).as('updatedCollection');
- cy.getAll('@updatedCollection').then(function ([updatedCollection]) {
- expect(updatedCollection.name).to.equal(`${collName + ' updated'}`);
- cy.get('[data-cy=collection-info-panel]').should('contain', updatedCollection.name);
- cy.get('[data-cy=collection-files-panel]').should('contain', fileName);
+ files.map((fileName, i, files) => {
+ cy.updateCollection(adminUser.token, testCollection.uuid, {
+ name: `${collName + ' updated'}`,
+ manifest_text: fileName ? `. 37b51d194a7513e45b56f6524f2d51f2+3 0:3:${fileName}\n` : "",
+ }).as('updatedCollection');
+ cy.getAll('@updatedCollection').then(function ([updatedCollection]) {
+ expect(updatedCollection.name).to.equal(`${collName + ' updated'}`);
+ cy.get('[data-cy=collection-info-panel]').should('contain', updatedCollection.name);
+ fileName
+ ? cy.get('[data-cy=collection-files-panel]').should('contain', fileName)
+ : cy.get('[data-cy=collection-files-panel]').should('not.contain', files[i-1]);;
+ });
});
+
});
- })
+ });
it('makes a copy of an existing collection', function() {
const collName = `Test Collection ${Math.floor(Math.random() * 999999)}`;
cy.get('[data-cy=invite-people-field] input').type("other");
});
cy.get('[role=tooltip]').click();
+ // Add admin to the group
+ cy.get('.sharing-dialog')
+ .should('contain', 'Sharing settings')
+ .within(() => {
+ cy.get('[data-cy=invite-people-field] input').type("admin");
+ });
+ cy.get('[role=tooltip]').click();
cy.get('.sharing-dialog').contains('Save').click();
cy.get('.sharing-dialog').contains('Close').click();
.within(() => {
cy.contains('Write');
});
+
+ // Change admin to manage
+ cy.get('[data-cy=group-members-data-explorer]')
+ .contains(adminUser.user.full_name)
+ .parents('tr')
+ .within(() => {
+ cy.contains('Read')
+ .parents('td')
+ .within(() => {
+ cy.get('button').click();
+ });
+ });
+ cy.get('[data-cy=context-menu]')
+ .contains('Manage')
+ .click();
+ cy.get('[data-cy=group-members-data-explorer]')
+ .contains(adminUser.user.full_name)
+ .parents('tr')
+ .within(() => {
+ cy.contains('Manage');
+ });
});
it('can unhide and re-hide users', function() {
});
it('renames the group', function() {
+ cy.loginAs(adminUser);
// Navigate to Groups
cy.get('[data-cy=side-panel-tree]').contains('Groups').click();
});
});
+
+ it('allows copying processes', function() {
+ const crName = 'first_container_request';
+ const copiedCrName = 'copied_container_request';
+ createContainerRequest(
+ activeUser,
+ crName,
+ 'arvados/jobs',
+ ['echo', 'hello world'],
+ false, 'Committed')
+ .then(function(containerRequest) {
+ cy.loginAs(activeUser);
+ cy.goToPath(`/processes/${containerRequest.uuid}`);
+ cy.get('[data-cy=process-details]').should('contain', crName);
+
+ cy.get('[data-cy=process-details]').find('button[title="More options"]').click();
+ cy.get('ul[data-cy=context-menu]').contains("Copy and re-run process").click();
+ });
+
+ cy.get('[data-cy=form-dialog]').within(() => {
+ cy.get('input[name=name]').clear().type(copiedCrName);
+ cy.get('[data-cy=projects-tree-home-tree-picker]').click();
+ cy.get('[data-cy=form-submit-btn]').click();
+ });
+
+ cy.get('[data-cy=process-details]').should('contain', copiedCrName);
+ cy.get('[data-cy=process-details]').find('button').contains('Run');
+ });
+
+ const getFakeContainer = (fakeContainerUuid) => ({
+ href: `/containers/${fakeContainerUuid}`,
+ kind: "arvados#container",
+ etag: "ecfosljpnxfari9a8m7e4yv06",
+ uuid: fakeContainerUuid,
+ owner_uuid: "zzzzz-tpzed-000000000000000",
+ created_at: "2023-02-13T15:55:47.308915000Z",
+ modified_by_client_uuid: "zzzzz-ozdt8-q6dzdi1lcc03155",
+ modified_by_user_uuid: "zzzzz-tpzed-000000000000000",
+ modified_at: "2023-02-15T19:12:45.987086000Z",
+ command: [
+ "arvados-cwl-runner",
+ "--api=containers",
+ "--local",
+ "--project-uuid=zzzzz-j7d0g-yr18k784zplfeza",
+ "/var/lib/cwl/workflow.json#main",
+ "/var/lib/cwl/cwl.input.json",
+ ],
+ container_image: "4ad7d11381df349e464694762db14e04+303",
+ cwd: "/var/spool/cwl",
+ environment: {},
+ exit_code: null,
+ finished_at: null,
+ locked_by_uuid: null,
+ log: null,
+ output: null,
+ output_path: "/var/spool/cwl",
+ progress: null,
+ runtime_constraints: {
+ API: true,
+ cuda: {
+ device_count: 0,
+ driver_version: "",
+ hardware_capability: "",
+ },
+ keep_cache_disk: 2147483648,
+ keep_cache_ram: 0,
+ ram: 1342177280,
+ vcpus: 1,
+ },
+ runtime_status: {},
+ started_at: null,
+ auth_uuid: null,
+ scheduling_parameters: {
+ max_run_time: 0,
+ partitions: [],
+ preemptible: false,
+ },
+ runtime_user_uuid: "zzzzz-tpzed-vllbpebicy84rd5",
+ runtime_auth_scopes: ["all"],
+ lock_count: 2,
+ gateway_address: null,
+ interactive_session_started: false,
+ output_storage_classes: ["default"],
+ output_properties: {},
+ cost: 0.0,
+ subrequests_cost: 0.0,
+ });
+
+ it('shows cancel button when appropriate', function() {
+ // Ignore collection requests
+ cy.intercept({method: 'GET', url: `**/arvados/v1/collections/*`}, {
+ statusCode: 200,
+ body: {}
+ });
+
+ // Uncommitted container
+ const crUncommitted = `Test process ${Math.floor(Math.random() * 999999)}`;
+ createContainerRequest(
+ activeUser,
+ crUncommitted,
+ 'arvados/jobs',
+ ['echo', 'hello world'],
+ false, 'Uncommitted')
+ .then(function(containerRequest) {
+ // Navigate to process and verify run / cancel button
+ cy.goToPath(`/processes/${containerRequest.uuid}`);
+ cy.waitForDom();
+ cy.get('[data-cy=process-details]').should('contain', crUncommitted);
+ cy.get('[data-cy=process-run-button]').should('exist');
+ cy.get('[data-cy=process-cancel-button]').should('not.exist');
+ });
+
+ // Queued container
+ const crQueued = `Test process ${Math.floor(Math.random() * 999999)}`;
+ const fakeCrUuid = 'zzzzz-dz642-000000000000001';
+ createContainerRequest(
+ activeUser,
+ crQueued,
+ 'arvados/jobs',
+ ['echo', 'hello world'],
+ false, 'Committed')
+ .then(function(containerRequest) {
+ // Fake container uuid
+ cy.intercept({method: 'GET', url: `**/arvados/v1/container_requests/${containerRequest.uuid}`}, (req) => {
+ req.reply((res) => {
+ res.body.output_uuid = fakeCrUuid;
+ res.body.priority = 500;
+ res.body.state = "Committed";
+ });
+ });
+
+ // Fake container
+ const container = getFakeContainer(fakeCrUuid);
+ cy.intercept({method: 'GET', url: `**/arvados/v1/container/${fakeCrUuid}`}, {
+ statusCode: 200,
+ body: {...container, state: "Queued", priority: 500}
+ });
+
+ // Navigate to process and verify cancel button
+ cy.goToPath(`/processes/${containerRequest.uuid}`);
+ cy.waitForDom();
+ cy.get('[data-cy=process-details]').should('contain', crQueued);
+ cy.get('[data-cy=process-cancel-button]').contains('Cancel');
+ });
+
+ // Locked container
+ const crLocked = `Test process ${Math.floor(Math.random() * 999999)}`;
+ const fakeCrLockedUuid = 'zzzzz-dz642-000000000000002';
+ createContainerRequest(
+ activeUser,
+ crLocked,
+ 'arvados/jobs',
+ ['echo', 'hello world'],
+ false, 'Committed')
+ .then(function(containerRequest) {
+ // Fake container uuid
+ cy.intercept({method: 'GET', url: `**/arvados/v1/container_requests/${containerRequest.uuid}`}, (req) => {
+ req.reply((res) => {
+ res.body.output_uuid = fakeCrLockedUuid;
+ res.body.priority = 500;
+ res.body.state = "Committed";
+ });
+ });
+
+ // Fake container
+ const container = getFakeContainer(fakeCrLockedUuid);
+ cy.intercept({method: 'GET', url: `**/arvados/v1/container/${fakeCrLockedUuid}`}, {
+ statusCode: 200,
+ body: {...container, state: "Locked", priority: 500}
+ });
+
+ // Navigate to process and verify cancel button
+ cy.goToPath(`/processes/${containerRequest.uuid}`);
+ cy.waitForDom();
+ cy.get('[data-cy=process-details]').should('contain', crLocked);
+ cy.get('[data-cy=process-cancel-button]').contains('Cancel');
+ });
+
+ // On Hold container
+ const crOnHold = `Test process ${Math.floor(Math.random() * 999999)}`;
+ const fakeCrOnHoldUuid = 'zzzzz-dz642-000000000000003';
+ createContainerRequest(
+ activeUser,
+ crOnHold,
+ 'arvados/jobs',
+ ['echo', 'hello world'],
+ false, 'Committed')
+ .then(function(containerRequest) {
+ // Fake container uuid
+ cy.intercept({method: 'GET', url: `**/arvados/v1/container_requests/${containerRequest.uuid}`}, (req) => {
+ req.reply((res) => {
+ res.body.output_uuid = fakeCrOnHoldUuid;
+ res.body.priority = 0;
+ res.body.state = "Committed";
+ });
+ });
+
+ // Fake container
+ const container = getFakeContainer(fakeCrOnHoldUuid);
+ cy.intercept({method: 'GET', url: `**/arvados/v1/container/${fakeCrOnHoldUuid}`}, {
+ statusCode: 200,
+ body: {...container, state: "Queued", priority: 0}
+ });
+
+ // Navigate to process and verify cancel button
+ cy.goToPath(`/processes/${containerRequest.uuid}`);
+ cy.waitForDom();
+ cy.get('[data-cy=process-details]').should('contain', crOnHold);
+ cy.get('[data-cy=process-run-button]').should('exist');
+ cy.get('[data-cy=process-cancel-button]').should('not.exist');
+ });
+ });
+
});
});
});
+ it('creates a project without and with description', function() {
+ const projName = `Test project (${Math.floor(999999 * Math.random())})`;
+ cy.loginAs(activeUser);
+
+ // Create project
+ cy.get('[data-cy=side-panel-button]').click();
+ cy.get('[data-cy=side-panel-new-project]').click();
+ cy.get('[data-cy=form-dialog]')
+ .should('contain', 'New Project')
+ .within(() => {
+ cy.get('[data-cy=name-field]').within(() => {
+ cy.get('input').type(projName);
+ });
+ });
+ cy.get('[data-cy=form-submit-btn]').click();
+
+ const editProjectDescription = (name, type) => {
+ cy.get('[data-cy=side-panel-tree]').contains('Home Projects').click();
+ cy.get('[data-cy=project-panel] tbody tr').contains(name).rightclick();
+ cy.get('[data-cy=context-menu]').contains('Edit').click();
+ cy.get('[data-cy=form-dialog]').within(() => {
+ cy.get('div[contenteditable=true]')
+ .click()
+ .type(type);
+ cy.get('[data-cy=form-submit-btn]').click();
+ });
+ };
+
+ const verifyProjectDescription = (name, description) => {
+ cy.doRequest('GET', '/arvados/v1/groups', null, {
+ filters: `[["name", "=", "${name}"], ["group_class", "=", "project"]]`,
+ })
+ .its('body.items').as('projects')
+ .then(function() {
+ expect(this.projects).to.have.lengthOf(1);
+ expect(this.projects[0].description).to.equal(description);
+ });
+ };
+
+ // Edit description
+ editProjectDescription(projName, 'Test description');
+
+ // Check description is set
+ verifyProjectDescription(projName, "<p>Test description</p>");
+
+ // Clear description
+ editProjectDescription(projName, '{selectall}{backspace}');
+
+ // Check description is null
+ verifyProjectDescription(projName, null);
+
+ // Set description to contain whitespace
+ editProjectDescription(projName, '{selectall}{backspace} x');
+ editProjectDescription(projName, '{backspace}');
+
+ // Check description is null
+ verifyProjectDescription(projName, null);
+
+ });
+
it('creates new project on home project and then a subproject inside it', function() {
const createProject = function(name, parentName) {
cy.get('[data-cy=side-panel-button]').click();
));
});
-});
+ it('sorts displayed items correctly', () => {
+ cy.loginAs(activeUser);
+
+ cy.get('[data-cy=project-panel] button[title="Select columns"]').click();
+ cy.get('div[role=presentation] ul > div[role=button]').contains('Date Created').click();
+ cy.get('div[role=presentation] ul > div[role=button]').contains('Trash at').click();
+ cy.get('div[role=presentation] ul > div[role=button]').contains('Delete at').click();
+ cy.get('div[role=presentation] > div[aria-hidden=true]').click();
+
+ cy.intercept({method: 'GET', url: '**/arvados/v1/groups/*/contents*'}).as('filteredQuery');
+ [
+ {
+ name: "Name",
+ asc: "collections.name asc,container_requests.name asc,groups.name asc",
+ desc: "collections.name desc,container_requests.name desc,groups.name desc"
+ },
+ {
+ name: "Last Modified",
+ asc: "collections.modified_at asc,container_requests.modified_at asc,groups.modified_at asc",
+ desc: "collections.modified_at desc,container_requests.modified_at desc,groups.modified_at desc"
+ },
+ {
+ name: "Date Created",
+ asc: "collections.created_at asc,container_requests.created_at asc,groups.created_at asc",
+ desc: "collections.created_at desc,container_requests.created_at desc,groups.created_at desc"
+
+ },
+ {
+ name: "Trash at",
+ asc: "collections.trash_at asc,container_requests.trash_at asc,groups.trash_at asc",
+ desc: "collections.trash_at desc,container_requests.trash_at desc,groups.trash_at desc"
+
+ },
+ {
+ name: "Delete at",
+ asc: "collections.delete_at asc,container_requests.delete_at asc,groups.delete_at asc",
+ desc: "collections.delete_at desc,container_requests.delete_at desc,groups.delete_at desc"
+
+ },
+ ].forEach((test) => {
+ cy.get('[data-cy=project-panel] table thead th').contains(test.name).click();
+ cy.wait('@filteredQuery').then(interception => {
+ const searchParams = new URLSearchParams((new URL(interception.request.url).search));
+ expect(searchParams.get('order')).to.eq(test.asc);
+ });
+ cy.get('[data-cy=project-panel] table thead th').contains(test.name).click();
+ cy.wait('@filteredQuery').then(interception => {
+ const searchParams = new URLSearchParams((new URL(interception.request.url).search));
+ expect(searchParams.get('order')).to.eq(test.desc);
+ });
+ });
+
+ });
+});
//
// SPDX-License-Identifier: AGPL-3.0
-import { customEncodeURI } from "./url";
import { WebDAV } from "./webdav";
describe('WebDAV', () => {
const request = await promise;
expect(open).toHaveBeenCalledWith('PROPFIND', 'http://foo.com/foo');
expect(setRequestHeader).toHaveBeenCalledWith('Authorization', 'Basic');
+ expect(setRequestHeader).toHaveBeenCalledWith('Cache-Control', 'must-revalidate');
expect(request).toBeInstanceOf(XMLHttpRequest);
});
it('allows to modify defaults after instantiation', async () => {
const { open, load, setRequestHeader, createRequest } = mockCreateRequest();
- const webdav = new WebDAV(undefined, createRequest);
- webdav.defaults.baseURL = 'http://foo.com/';
- webdav.defaults.headers = { Authorization: 'Basic' };
+ const webdav = new WebDAV({ baseURL: 'http://foo.com/' }, createRequest);
+ webdav.setAuthorization('Basic');
const promise = webdav.propfind('foo');
load();
const request = await promise;
expect(open).toHaveBeenCalledWith('PROPFIND', 'http://foo.com/foo');
expect(setRequestHeader).toHaveBeenCalledWith('Authorization', 'Basic');
+ expect(setRequestHeader).toHaveBeenCalledWith('Cache-Control', 'must-revalidate');
expect(request).toBeInstanceOf(XMLHttpRequest);
});
it('PROPFIND', async () => {
- const { open, load, createRequest } = mockCreateRequest();
+ const { open, load, setRequestHeader, createRequest } = mockCreateRequest();
const webdav = new WebDAV(undefined, createRequest);
const promise = webdav.propfind('foo');
load();
const request = await promise;
expect(open).toHaveBeenCalledWith('PROPFIND', 'foo');
+ expect(setRequestHeader).toHaveBeenCalledWith('Cache-Control', 'must-revalidate');
expect(request).toBeInstanceOf(XMLHttpRequest);
});
it('PUT', async () => {
- const { open, send, load, progress, createRequest } = mockCreateRequest();
+ const { open, send, load, progress, setRequestHeader, createRequest } = mockCreateRequest();
const webdav = new WebDAV(undefined, createRequest);
const promise = webdav.put('foo', 'Test data');
progress();
const request = await promise;
expect(open).toHaveBeenCalledWith('PUT', 'foo');
expect(send).toHaveBeenCalledWith('Test data');
+ expect(setRequestHeader).toHaveBeenCalledWith('Cache-Control', 'must-revalidate');
expect(request).toBeInstanceOf(XMLHttpRequest);
});
it('COPY', async () => {
const { open, setRequestHeader, load, createRequest } = mockCreateRequest();
- const webdav = new WebDAV(undefined, createRequest);
- webdav.defaults.baseURL = 'http://base';
+ const webdav = new WebDAV({ baseURL: 'http://base' }, createRequest);
const promise = webdav.copy('foo', 'foo-copy');
load();
const request = await promise;
expect(open).toHaveBeenCalledWith('COPY', 'http://base/foo');
expect(setRequestHeader).toHaveBeenCalledWith('Destination', 'http://base/foo-copy');
+ expect(setRequestHeader).toHaveBeenCalledWith('Cache-Control', 'must-revalidate');
expect(request).toBeInstanceOf(XMLHttpRequest);
});
it('COPY - adds baseURL with trailing slash to Destination header', async () => {
const { open, setRequestHeader, load, createRequest } = mockCreateRequest();
- const webdav = new WebDAV(undefined, createRequest);
- webdav.defaults.baseURL = 'http://base';
+ const webdav = new WebDAV({ baseURL: 'http://base' }, createRequest);
const promise = webdav.copy('foo', 'foo-copy');
load();
const request = await promise;
expect(open).toHaveBeenCalledWith('COPY', 'http://base/foo');
expect(setRequestHeader).toHaveBeenCalledWith('Destination', 'http://base/foo-copy');
+ expect(setRequestHeader).toHaveBeenCalledWith('Cache-Control', 'must-revalidate');
expect(request).toBeInstanceOf(XMLHttpRequest);
});
it('COPY - adds baseURL without trailing slash to Destination header', async () => {
const { open, setRequestHeader, load, createRequest } = mockCreateRequest();
- const webdav = new WebDAV(undefined, createRequest);
- webdav.defaults.baseURL = 'http://base';
+ const webdav = new WebDAV({ baseURL: 'http://base' }, createRequest);
const promise = webdav.copy('foo', 'foo-copy');
load();
const request = await promise;
expect(open).toHaveBeenCalledWith('COPY', 'http://base/foo');
expect(setRequestHeader).toHaveBeenCalledWith('Destination', 'http://base/foo-copy');
+ expect(setRequestHeader).toHaveBeenCalledWith('Cache-Control', 'must-revalidate');
expect(request).toBeInstanceOf(XMLHttpRequest);
});
it('MOVE', async () => {
const { open, setRequestHeader, load, createRequest } = mockCreateRequest();
- const webdav = new WebDAV(undefined, createRequest);
- webdav.defaults.baseURL = 'http://base';
+ const webdav = new WebDAV({ baseURL: 'http://base' }, createRequest);
const promise = webdav.move('foo', 'foo-moved');
load();
const request = await promise;
expect(open).toHaveBeenCalledWith('MOVE', 'http://base/foo');
expect(setRequestHeader).toHaveBeenCalledWith('Destination', 'http://base/foo-moved');
+ expect(setRequestHeader).toHaveBeenCalledWith('Cache-Control', 'must-revalidate');
expect(request).toBeInstanceOf(XMLHttpRequest);
});
it('MOVE - adds baseURL with trailing slash to Destination header', async () => {
const { open, setRequestHeader, load, createRequest } = mockCreateRequest();
- const webdav = new WebDAV(undefined, createRequest);
- webdav.defaults.baseURL = 'http://base';
+ const webdav = new WebDAV({ baseURL: 'http://base' }, createRequest);
const promise = webdav.move('foo', 'foo-moved');
load();
const request = await promise;
expect(open).toHaveBeenCalledWith('MOVE', 'http://base/foo');
expect(setRequestHeader).toHaveBeenCalledWith('Destination', 'http://base/foo-moved');
+ expect(setRequestHeader).toHaveBeenCalledWith('Cache-Control', 'must-revalidate');
expect(request).toBeInstanceOf(XMLHttpRequest);
});
it('MOVE - adds baseURL without trailing slash to Destination header', async () => {
const { open, setRequestHeader, load, createRequest } = mockCreateRequest();
- const webdav = new WebDAV(undefined, createRequest);
- webdav.defaults.baseURL = 'http://base';
+ const webdav = new WebDAV({ baseURL: 'http://base' }, createRequest);
const promise = webdav.move('foo', 'foo-moved');
load();
const request = await promise;
expect(open).toHaveBeenCalledWith('MOVE', 'http://base/foo');
expect(setRequestHeader).toHaveBeenCalledWith('Destination', 'http://base/foo-moved');
+ expect(setRequestHeader).toHaveBeenCalledWith('Cache-Control', 'must-revalidate');
expect(request).toBeInstanceOf(XMLHttpRequest);
});
it('DELETE', async () => {
- const { open, load, createRequest } = mockCreateRequest();
+ const { open, load, setRequestHeader, createRequest } = mockCreateRequest();
const webdav = new WebDAV(undefined, createRequest);
const promise = webdav.delete('foo');
load();
const request = await promise;
expect(open).toHaveBeenCalledWith('DELETE', 'foo');
+ expect(setRequestHeader).toHaveBeenCalledWith('Cache-Control', 'must-revalidate');
expect(request).toBeInstanceOf(XMLHttpRequest);
});
});
export class WebDAV {
- defaults: WebDAVDefaults = {
+ private defaults: WebDAVDefaults = {
baseURL: '',
- headers: {},
+ headers: {
+ 'Cache-Control': 'must-revalidate'
+ },
};
constructor(config?: Partial<WebDAVDefaults>, private createRequest = () => new XMLHttpRequest()) {
if (config) {
- this.defaults = { ...this.defaults, ...config };
+ this.defaults = {
+ ...this.defaults,
+ ...config,
+ headers: {
+ ...this.defaults.headers,
+ ...config.headers
+ },
+ };
}
}
+ getBaseUrl = (): string => this.defaults.baseURL;
+ setAuthorization = (token?) => this.defaults.headers.Authorization = token;
+
propfind = (url: string, config: WebDAVRequestConfig = {}) =>
this.request({
...config, url,
Chip as MuiChip,
Popper as MuiPopper,
Paper as MuiPaper,
- FormControl, InputLabel, StyleRulesCallback, withStyles, RootRef, ListItemText, ListItem, List, FormHelperText
+ FormControl, InputLabel, StyleRulesCallback, withStyles, RootRef, ListItemText, ListItem, List, FormHelperText, Tooltip
} from '@material-ui/core';
import { PopperProps } from '@material-ui/core/Popper';
import { WithStyles } from '@material-ui/core/styles';
onDelete?: (item: Item, index: number) => void;
onSelect?: (suggestion: Suggestion) => void;
renderChipValue?: (item: Item) => string;
+ renderChipTooltip?: (item: Item) => string;
renderSuggestion?: (suggestion: Suggestion) => React.ReactNode;
}
}
return items.map(
- (item, index) =>
- <Chip
- label={this.renderChipValue(item)}
- key={index}
- onDelete={onDelete && !this.props.disabled ? (() => onDelete(item, index)) : undefined} />
+ (item, index) => {
+ const tooltip = this.props.renderChipTooltip ? this.props.renderChipTooltip(item) : '';
+ if (tooltip && tooltip.length) {
+ return <Tooltip title={tooltip}>
+ <Chip
+ label={this.renderChipValue(item)}
+ key={index}
+ onDelete={onDelete && !this.props.disabled ? (() => onDelete(item, index)) : undefined} />
+ </Tooltip>
+ } else {
+ return <Chip
+ label={this.renderChipValue(item)}
+ key={index}
+ onDelete={onDelete && !this.props.disabled ? (() => onDelete(item, index)) : undefined} />
+ }
+ }
);
}
const { classes, onItemMenuOpen, onUploadDataClick, isWritable, dispatch, collectionPanelFiles, collectionPanel } = props;
const { apiToken, config } = props.auth;
- const webdavClient = new WebDAV();
- webdavClient.defaults.baseURL = config.keepWebServiceUrl;
- webdavClient.defaults.headers = {
- Authorization: `Bearer ${apiToken}`
- };
+ const webdavClient = new WebDAV({
+ baseURL: config.keepWebServiceUrl,
+ headers: {
+ Authorization: `Bearer ${apiToken}`
+ },
+ });
const webDAVRequestConfig: WebDAVRequestConfig = {
headers: {
import { ArvadosTheme } from "common/custom-theme";
interface ColumnSelectorDataProps {
- columns: DataColumns<any>;
- onColumnToggle: (column: DataColumn<any>) => void;
+ columns: DataColumns<any, any>;
+ onColumnToggle: (column: DataColumn<any, any>) => void;
className?: string;
}
color="primary"
checked={column.selected}
className={classes.checkbox} />
- <ListItemText
+ <ListItemText
className={classes.listItemText}>
{column.name}
</ListItemText>
<MenuIcon aria-label="Select columns" />
</IconButton>
</Tooltip>;
-
-
fetchMode: DataTableFetchMode;
items: T[];
itemsAvailable: number;
- columns: DataColumns<T>;
+ columns: DataColumns<T, any>;
searchLabel?: string;
searchValue: string;
rowsPerPage: number;
}
interface DataExplorerActionProps<T> {
- onSetColumns: (columns: DataColumns<T>) => void;
+ onSetColumns: (columns: DataColumns<T, any>) => void;
onSearch: (value: string) => void;
onRowClick: (item: T) => void;
onRowDoubleClick: (item: T) => void;
- onColumnToggle: (column: DataColumn<T>) => void;
+ onColumnToggle: (column: DataColumn<T, any>) => void;
onContextMenu: (event: React.MouseEvent<HTMLElement>, item: T) => void;
- onSortToggle: (column: DataColumn<T>) => void;
- onFiltersChange: (filters: DataTableFilters, column: DataColumn<T>) => void;
+ onSortToggle: (column: DataColumn<T, any>) => void;
+ onFiltersChange: (filters: DataTableFilters, column: DataColumn<T, any>) => void;
onChangePage: (page: number) => void;
onChangeRowsPerPage: (rowsPerPage: number) => void;
onLoadMore: (page: number) => void;
</Tooltip>
</Grid>
- contextMenuColumn: DataColumn<any> = {
+ contextMenuColumn: DataColumn<any, any> = {
name: "Actions",
selected: true,
configurable: false,
import { DataTableFilters } from "../data-table-filters/data-table-filters-tree";
import { createTree } from 'models/tree';
-export interface DataColumn<T> {
+/**
+ *
+ * @template I Type of dataexplorer item reference
+ * @template R Type of resource to use to restrict values of column sort.field
+ */
+export interface DataColumn<I, R> {
key?: React.Key;
name: string;
selected: boolean;
* radio group and only one filter can be selected at a time.
*/
mutuallyExclusiveFilters?: boolean;
- sortDirection?: SortDirection;
+ sort?: {direction: SortDirection, field: keyof R};
filters: DataTableFilters;
- render: (item:
T) => React.ReactElement<any>;
+ render: (item:
I) => React.ReactElement<any>;
renderHeader?: () => React.ReactElement<any>;
}
NONE = "none"
}
-export const toggleSortDirection = <T>(column: DataColumn<T>): DataColumn<T> => {
- return column.sortDirection
- ? column.sortDirection === SortDirection.ASC
- ? { ...column, sortDirection: SortDirection.DESC }
- : { ...column, sortDirection: SortDirection.ASC }
+export const toggleSortDirection = <I, R>(column: DataColumn<I, R>): DataColumn<I, R> => {
+ return column.sort
+ ? column.sort.direction === SortDirection.ASC
+ ? { ...column, sort: {...column.sort, direction: SortDirection.DESC} }
+ : { ...column, sort: {...column.sort, direction: SortDirection.ASC} }
: column;
};
-export const resetSortDirection = <T>(column: DataColumn<T>): DataColumn<T> => {
- return column.sortDirection ? { ...column, sortDirection: SortDirection.NONE } : column;
+export const resetSortDirection = <I, R>(column: DataColumn<I, R>): DataColumn<I, R> => {
+ return column.sort ? { ...column, sort: {...column.sort, direction: SortDirection.NONE} } : column;
};
-export const createDataColumn = <T>(dataColumn: Partial<DataColumn<T>>): DataColumn<T> => ({
+export const createDataColumn = <I, R>(dataColumn: Partial<DataColumn<I, R>>): DataColumn<I, R> => ({
key: '',
name: '',
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
filters: createTree(),
render: () => React.createElement('span'),
...dataColumn,
describe("<DataTable />", () => {
it("shows only selected columns", () => {
- const columns: DataColumns<string> = [
+ const columns: DataColumns<string, string> = [
createDataColumn({
name: "Column 1",
render: () => <span />,
});
it("renders column name", () => {
- const columns: DataColumns<string> = [
+ const columns: DataColumns<string, string> = [
createDataColumn({
name: "Column 1",
render: () => <span />,
});
it("uses renderHeader instead of name prop", () => {
- const columns: DataColumns<string> = [
+ const columns: DataColumns<string, string> = [
createDataColumn({
name: "Column 1",
renderHeader: () => <span>Column Header</span>,
});
it("passes column key prop to corresponding cells", () => {
- const columns: DataColumns<string> = [
+ const columns: DataColumns<string, string> = [
createDataColumn({
name: "Column 1",
key: "column-1-key",
});
it("renders items", () => {
- const columns: DataColumns<string> = [
+ const columns: DataColumns<string, string> = [
createDataColumn({
name: "Column 1",
render: (item) => <Typography>{item}</Typography>,
});
it("passes sorting props to <TableSortLabel />", () => {
- const columns: DataColumns<string> = [
+ const columns: DataColumns<string, string> = [
createDataColumn({
name: "Column 1",
- sortDirection: SortDirection.ASC,
+ sort: {direction: SortDirection.ASC, field: "length"},
selected: true,
configurable: true,
render: (item) => <Typography>{item}</Typography>
});
it("does not display <DataTableFiltersPopover /> if there is no filters provided", () => {
- const columns: DataColumns<string> = [{
+ const columns: DataColumns<string, string> = [{
name: "Column 1",
- sortDirection: SortDirection.ASC,
selected: true,
configurable: true,
filters: [],
() => createTree<DataTableFilterItem>(),
setNode(initTreeNode({ id: 'filter', value: { name: 'filter' } }))
);
- const columns: DataColumns<string> = [{
+ const columns: DataColumns<string, string> = [{
name: "Column 1",
- sortDirection: SortDirection.ASC,
selected: true,
configurable: true,
filters: filters(),
import { SvgIconProps } from '@material-ui/core/SvgIcon';
import ArrowDownwardIcon from '@material-ui/icons/ArrowDownward';
-export type DataColumns<T> = Array<DataColumn<T>>;
+export type DataColumns<I, R> = Array<DataColumn<I, R>>;
export enum DataTableFetchMode {
PAGINATED,
INFINITE
}
-export interface DataTableDataProps<T> {
- items: T[];
- columns: DataColumns<T>;
- onRowClick: (event: React.MouseEvent<HTMLTableRowElement>, item: T) => void;
- onContextMenu: (event: React.MouseEvent<HTMLElement>, item: T) => void;
- onRowDoubleClick: (event: React.MouseEvent<HTMLTableRowElement>, item: T) => void;
- onSortToggle: (column: DataColumn<T>) => void;
- onFiltersChange: (filters: DataTableFilters, column: DataColumn<T>) => void;
- extractKey?: (item: T) => React.Key;
+export interface DataTableDataProps<I> {
+ items: I[];
+ columns: DataColumns<I, any>;
+ onRowClick: (event: React.MouseEvent<HTMLTableRowElement>, item: I) => void;
+ onContextMenu: (event: React.MouseEvent<HTMLElement>, item: I) => void;
+ onRowDoubleClick: (event: React.MouseEvent<HTMLTableRowElement>, item: I) => void;
+ onSortToggle: (column: DataColumn<I, any>) => void;
+ onFiltersChange: (filters: DataTableFilters, column: DataColumn<I, any>) => void;
+ extractKey?: (item: I) => React.Key;
working?: boolean;
defaultViewIcon?: IconType;
defaultViewMessages?: string[];
wordWrap: 'break-word',
paddingRight: '24px',
color: '#737373'
-
+
},
tableCellWorkflows: {
'&:nth-last-child(2)': {
</div>;
}
- renderNoItemsPlaceholder = (columns: DataColumns<T>) => {
+ renderNoItemsPlaceholder = (columns: DataColumns<T, any>) => {
const dirty = columns.some((column) => getTreeDirty('')(column.filters));
return <DataTableDefaultView
icon={this.props.defaultViewIcon}
filtersApplied={dirty} />;
}
- renderHeadCell = (column: DataColumn<T>, index: number) => {
- const { name, key, renderHeader, filters, sortDirection } = column;
+ renderHeadCell = (column: DataColumn<T, any>, index: number) => {
+ const { name, key, renderHeader, filters, sort } = column;
const { onSortToggle, onFiltersChange, classes } = this.props;
return <TableCell className={classes.tableCell} key={key || index}>
{renderHeader ?
filters={filters}>
{name}
</DataTableFiltersPopover>
- : sortDirection
+ : sort
? <TableSortLabel
- active={sortDirection !== SortDirection.NONE}
- direction={sortDirection !== SortDirection.NONE ? sortDirection : undefined}
+ active={sort.direction !== SortDirection.NONE}
+ direction={sort.direction !== SortDirection.NONE ? sort.direction : undefined}
IconComponent={this.ArrowIcon}
hideSortIcon
onClick={() =>
</TableRow>;
}
- mapVisibleColumns = (fn: (column: DataColumn<T>, index: number) => React.ReactElement<any>) => {
+ mapVisibleColumns = (fn: (column: DataColumn<T
, any>, index: number) => React.ReactElement<any>) => {
return this.props.columns.filter(column => column.selected).map(fn);
}
import HelpOutline from '@material-ui/icons/HelpOutline';
import History from '@material-ui/icons/History';
import Inbox from '@material-ui/icons/Inbox';
-import Memory from '@material-ui/icons/Memory';
+import Memory from '@material-ui/icons/Memory';
import MoveToInbox from '@material-ui/icons/MoveToInbox';
import Info from '@material-ui/icons/Info';
import Input from '@material-ui/icons/Input';
import RemoveCircleOutline from '@material-ui/icons/RemoveCircleOutline';
import NotInterested from '@material-ui/icons/NotInterested';
import Image from '@material-ui/icons/Image';
+import Stop from '@material-ui/icons/Stop';
// Import FontAwesome icons
import { library } from '@fortawesome/fontawesome-svg-core';
export const LogIcon: IconType = (props) => <SettingsEthernet {...props} />;
export const MailIcon: IconType = (props) => <Mail {...props} />;
export const MaximizeIcon: IconType = (props) => <FullscreenSharp {...props} />;
-export const MemoryIcon: IconType = (props) => <Memory {...props} />;
+export const MemoryIcon: IconType = (props) => <Memory {...props} />;
export const UnMaximizeIcon: IconType = (props) => <FullscreenExitSharp {...props} />;
export const MoreOptionsIcon: IconType = (props) => <MoreVert {...props} />;
export const MoveToIcon: IconType = (props) => <Input {...props} />;
export const SetupIcon: IconType = (props) => <RemoveCircleOutline {...props} />;
export const InactiveIcon: IconType = (props) => <NotInterested {...props} />;
export const ImageIcon: IconType = (props) => <Image {...props} />;
+export const StartIcon: IconType = (props) => <PlayArrow {...props} />;
+export const StopIcon: IconType = (props) => <Stop {...props} />;
onChange = (value: any) => {
this.setState({ value });
- this.props.input.onChange(value.toString('html'));
+ this.props.input.onChange(
+ !!value.getEditorState().getCurrentContent().getPlainText().trim()
+ ? value.toString('html')
+ : null
+ );
}
render() {
name: string;
outputName: string;
outputPath: string;
+ outputProperties: any;
+ outputStorageClasses: string[];
outputTtl: number;
outputUuid: string | null;
priority: number | null;
//
// SPDX-License-Identifier: AGPL-3.0
-import { Resource, ResourceKind } from 'models/resource';
+import { Resource, ResourceKind, RESOURCE_UUID_REGEX } from 'models/resource';
export type UserPrefs = {
profile?: {
return parts.join(' ');
};
+export const getUserDetailsString = (user: User) => {
+ let parts: string[] = [];
+ const userCluster = getUserClusterID(user);
+ user.username.length && parts.push(user.username);
+ user.email.length && parts.push(`<${user.email}>`);
+ userCluster && userCluster.length && parts.push(`(${userCluster})`);
+ return parts.join(' ');
+};
+
+export const getUserClusterID = (user: User): string | undefined => {
+ const match = RESOURCE_UUID_REGEX.exec(user.uuid);
+ const parts = match ? match[0].split('-') : [];
+ return parts.length === 3 ? parts[0] : undefined;
+};
+
export interface UserResource extends Resource, User {
kind: ResourceKind.USER;
defaultOwnerUuid: string;
}
extendFileURL = (file: CollectionDirectory | CollectionFile) => {
- const baseUrl = this.webdavClient.defaults.baseURL.endsWith('/')
- ? this.webdavClient.defaults.baseURL.slice(0, -1)
- : this.webdavClient.defaults.baseURL;
+ const baseUrl = this.webdavClient.getBaseUrl().endsWith('/')
+ ? this.webdavClient.getBaseUrl().slice(0, -1)
+ : this.webdavClient.getBaseUrl();
const apiToken = this.authService.getApiToken();
const encodedApiToken = apiToken ? encodeURI(apiToken) : '';
const userApiToken = `/t=${encodedApiToken}/`;
if (cancelToken) {
cfg.cancelToken = cancelToken;
}
-
+
const response = await CommonResourceService.defaultResponse(
this.serverApi.get(this.resourceType + pathUrl, cfg),
this.actions,
services.apiClient.defaults.headers.common = {
Authorization: `Bearer ${token}`
};
- services.webdavClient.defaults.headers = {
- Authorization: `Bearer ${token}`
- };
+ services.webdavClient.setAuthorization(`Bearer ${token}`);
}
export function removeAuthorizationHeader(services: ServiceRepository) {
delete services.apiClient.defaults.headers.common;
- delete services.webdavClient.defaults.headers.common;
+ services.webdavClient.setAuthorization(undefined);
}
export const createServices = (config: Config, actions: ApiActions, useApiClient?: AxiosInstance) => {
const apiClient = useApiClient || Axios.create({ headers: {} });
apiClient.defaults.baseURL = config.baseUrl;
- const webdavClient = new WebDAV();
- webdavClient.defaults.baseURL = config.keepWebServiceUrl;
+ const webdavClient = new WebDAV({
+ baseURL: config.keepWebServiceUrl
+ });
const apiClientAuthorizationService = new ApiClientAuthorizationService(apiClient, actions);
const authorizedKeysService = new AuthorizedKeysService(apiClient, actions);
//
// SPDX-License-Identifier: AGPL-3.0
-import { DataExplorerMiddlewareService, dataExplorerToListParams, getDataExplorerColumnFilters } from "store/data-explorer/data-explorer-middleware-service";
+import { DataExplorerMiddlewareService, dataExplorerToListParams, getDataExplorerColumnFilters, getOrder } from "store/data-explorer/data-explorer-middleware-service";
import { RootState } from "../store";
import { ServiceRepository } from "services/services";
import { FilterBuilder, joinFilters } from "services/api/filter-builder";
import { resourcesActions } from "store/resources/resources-actions";
import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions';
import { progressIndicatorActions } from 'store/progress-indicator/progress-indicator-actions';
-import { getDataExplorer, DataExplorer, getSortColumn } from "store/data-explorer/data-explorer-reducer";
+import { getDataExplorer, DataExplorer } from "store/data-explorer/data-explorer-reducer";
import { loadMissingProcessesInformation } from "store/project-panel/project-panel-middleware-service";
import { DataColumns } from "components/data-table/data-table";
import {
serializeOnlyProcessTypeFilters
} from "../resource-type-filters/resource-type-filters";
import { AllProcessesPanelColumnNames } from "views/all-processes-panel/all-processes-panel";
-import { OrderBuilder, OrderDirection } from "services/api/order-builder";
-import { ProcessResource } from "models/process";
-import { SortDirection } from "components/data-table/data-column";
-import { containerRequestFieldsNoMounts } from "models/container-request";
+import { containerRequestFieldsNoMounts, ContainerRequestResource } from "models/container-request";
export class AllProcessesPanelMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
const getParams = ( dataExplorer: DataExplorer ) => ({
...dataExplorerToListParams(dataExplorer),
- order: getOrder(dataExplorer),
+ order: getOrder<ContainerRequestResource>(dataExplorer),
filters: getFilters(dataExplorer)
});
const getFilters = ( dataExplorer: DataExplorer ) => {
- const columns = dataExplorer.columns as DataColumns<string>;
+ const columns = dataExplorer.columns as DataColumns<string, ContainerRequestResource>;
const statusColumnFilters = getDataExplorerColumnFilters(columns, 'Status');
const activeStatusFilter = Object.keys(statusColumnFilters).find(
filterName => statusColumnFilters[filterName].selected
);
};
-const getOrder = (dataExplorer: DataExplorer) => {
- const sortColumn = getSortColumn(dataExplorer);
- const order = new OrderBuilder<ProcessResource>();
- if (sortColumn) {
- const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
- ? OrderDirection.ASC
- : OrderDirection.DESC;
-
- const columnName = sortColumn && sortColumn.name === AllProcessesPanelColumnNames.NAME ? "name" : "createdAt";
- return order
- .addOrder(sortDirection, columnName)
- .getOrder();
- } else {
- return order.getOrder();
- }
-};
-
const allProcessesPanelDataExplorerIsNotSet = () =>
snackbarActions.OPEN_SNACKBAR({
message: 'All Processes panel is not ready.',
import { ServiceRepository } from 'services/services';
import { MiddlewareAPI, Dispatch } from 'redux';
-import { DataExplorerMiddlewareService, dataExplorerToListParams, listResultsToDataExplorerItemsMeta } from 'store/data-explorer/data-explorer-middleware-service';
+import { DataExplorerMiddlewareService, dataExplorerToListParams, getOrder, listResultsToDataExplorerItemsMeta } from 'store/data-explorer/data-explorer-middleware-service';
import { RootState } from 'store/store';
import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions';
import { DataExplorer, getDataExplorer } from 'store/data-explorer/data-explorer-reducer';
import { updateResources } from 'store/resources/resources-actions';
-import { getSortColumn } from "store/data-explorer/data-explorer-reducer";
import { apiClientAuthorizationsActions } from 'store/api-client-authorizations/api-client-authorizations-actions';
-import { OrderDirection, OrderBuilder } from 'services/api/order-builder';
import { ListResults } from 'services/common-service/common-service';
import { ApiClientAuthorization } from 'models/api-client-authorization';
-import { ApiClientAuthorizationPanelColumnNames } from 'views/api-client-authorization-panel/api-client-authorization-panel-root';
-import { SortDirection } from 'components/data-table/data-column';
export class ApiClientAuthorizationMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
export const getParams = (dataExplorer: DataExplorer) => ({
...dataExplorerToListParams(dataExplorer),
- order: getOrder(dataExplorer)
+ order: getOrder<ApiClientAuthorization>(dataExplorer)
});
-const getOrder = (dataExplorer: DataExplorer) => {
- const sortColumn = getSortColumn(dataExplorer);
- const order = new OrderBuilder<ApiClientAuthorization>();
- if (sortColumn) {
- const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
- ? OrderDirection.ASC
- : OrderDirection.DESC;
-
- const columnName = sortColumn && sortColumn.name === ApiClientAuthorizationPanelColumnNames.UUID ? "uuid" : "updatedAt";
- return order
- .addOrder(sortDirection, columnName)
- .getOrder();
- } else {
- return order.getOrder();
- }
-};
-
export const setItems = (listResults: ListResults<ApiClientAuthorization>) =>
apiClientAuthorizationsActions.SET_ITEMS({
...listResultsToDataExplorerItemsMeta(listResults),
import { ServiceRepository } from 'services/services';
import { MiddlewareAPI, Dispatch } from 'redux';
-import { DataExplorerMiddlewareService } from 'store/data-explorer/data-explorer-middleware-service';
+import { DataExplorerMiddlewareService, getOrder } from 'store/data-explorer/data-explorer-middleware-service';
import { RootState } from 'store/store';
import { getUserUuid } from "common/getuser";
import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions';
import { getDataExplorer } from 'store/data-explorer/data-explorer-reducer';
import { resourcesActions } from 'store/resources/resources-actions';
import { FilterBuilder } from 'services/api/filter-builder';
-import { SortDirection } from 'components/data-table/data-column';
-import { OrderDirection, OrderBuilder } from 'services/api/order-builder';
-import { getSortColumn } from "store/data-explorer/data-explorer-reducer";
-import { FavoritePanelColumnNames } from 'views/favorite-panel/favorite-panel';
-import { GroupContentsResource, GroupContentsResourcePrefix } from 'services/groups-service/groups-service';
import { progressIndicatorActions } from 'store/progress-indicator/progress-indicator-actions';
import { collectionsContentAddressActions } from './collections-content-address-panel-actions';
import { navigateTo } from 'store/navigation/navigation-action';
import { ResourceKind, extractUuidKind } from 'models/resource';
import { ownerNameActions } from 'store/owner-name/owner-name-actions';
import { getUserDisplayName } from 'models/user';
+import { CollectionResource } from 'models/collection';
export class CollectionsWithSameContentAddressMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
if (!dataExplorer) {
api.dispatch(collectionPanelDataExplorerIsNotSet());
} else {
- const sortColumn = getSortColumn(dataExplorer);
-
- const contentOrder = new OrderBuilder<GroupContentsResource>();
-
- if (sortColumn && sortColumn.name === FavoritePanelColumnNames.NAME) {
- const direction = sortColumn.sortDirection === SortDirection.ASC
- ? OrderDirection.ASC
- : OrderDirection.DESC;
-
- contentOrder
- .addOrder(direction, "name", GroupContentsResourcePrefix.COLLECTION);
- }
try {
api.dispatch(progressIndicatorActions.START_WORKING(this.getId()));
const userUuid = getUserUuid(api.getState());
.addEqual('portable_data_hash', contentAddress)
.addILike("name", dataExplorer.searchValue)
.getFilters(),
- includeOldVersions: true
+ includeOldVersions: true,
+ order: getOrder<CollectionResource>(dataExplorer)
});
const userUuids = response.items.map(it => {
if (extractUuidKind(it.ownerUuid) === ResourceKind.USER) {
REQUEST_ITEMS: ofType<{ id: string, criteriaChanged?: boolean }>(),
REQUEST_STATE: ofType<{ id: string, criteriaChanged?: boolean }>(),
SET_FETCH_MODE: ofType<({ id: string, fetchMode: DataTableFetchMode })>(),
- SET_COLUMNS: ofType<{ id: string, columns: DataColumns<any> }>(),
+ SET_COLUMNS: ofType<{ id: string, columns: DataColumns<any, any> }>(),
SET_FILTERS: ofType<{ id: string, columnName: string, filters: DataTableFilters }>(),
SET_ITEMS: ofType<{ id: string, items: any[], page: number, rowsPerPage: number, itemsAvailable: number }>(),
APPEND_ITEMS: ofType<{ id: string, items: any[], page: number, rowsPerPage: number, itemsAvailable: number }>(),
dataExplorerActions.REQUEST_ITEMS({ id, criteriaChanged }),
SET_FETCH_MODE: (payload: { fetchMode: DataTableFetchMode }) =>
dataExplorerActions.SET_FETCH_MODE({ ...payload, id }),
- SET_COLUMNS: (payload: { columns: DataColumns<any> }) =>
+ SET_COLUMNS: (payload: { columns: DataColumns<any, any> }) =>
dataExplorerActions.SET_COLUMNS({ ...payload, id }),
SET_FILTERS: (payload: { columnName: string, filters: DataTableFilters }) =>
dataExplorerActions.SET_FILTERS({ ...payload, id }),
import { Dispatch, MiddlewareAPI } from 'redux';
import { RootState } from '../store';
import { DataColumns } from 'components/data-table/data-table';
-import { DataExplorer } from './data-explorer-reducer';
+import { DataExplorer, getSortColumn } from './data-explorer-reducer';
import { ListResults } from 'services/common-service/common-service';
import { createTree } from 'models/tree';
import { DataTableFilters } from 'components/data-table-filters/data-table-filters-tree';
+import { OrderBuilder, OrderDirection } from 'services/api/order-builder';
+import { SortDirection } from 'components/data-table/data-column';
+import { Resource } from 'models/resource';
export abstract class DataExplorerMiddlewareService {
protected readonly id: string;
}
public getColumnFilters<T>(
- columns: DataColumns<T>,
+ columns: DataColumns<T, any>,
columnName: string
): DataTableFilters {
return getDataExplorerColumnFilters(columns, columnName);
}
export const getDataExplorerColumnFilters = <T>(
- columns: DataColumns<T>,
+ columns: DataColumns<T, any>,
columnName: string
): DataTableFilters => {
const column = columns.find((c) => c.name === columnName);
offset: dataExplorer.page * dataExplorer.rowsPerPage,
});
+export const getOrder = <T extends Resource = Resource>(dataExplorer: DataExplorer) => {
+ const sortColumn = getSortColumn<T>(dataExplorer);
+ const order = new OrderBuilder<T>();
+ if (sortColumn && sortColumn.sort) {
+ const sortDirection = sortColumn.sort.direction === SortDirection.ASC
+ ? OrderDirection.ASC
+ : OrderDirection.DESC;
+
+ return order
+ .addOrder(sortDirection, sortColumn.sort.field)
+ .getOrder();
+ } else {
+ return order.getOrder();
+ }
+};
+
export const listResultsToDataExplorerItemsMeta = <R>({
itemsAvailable,
offset,
class ServiceMock extends DataExplorerMiddlewareService {
constructor(private config: {
id: string,
- columns: DataColumns<any>,
+ columns: DataColumns<any, any>,
requestItems: (api: MiddlewareAPI) => Promise<void>
}) {
super(config.id);
describe('data-explorer-reducer', () => {
it('should set columns', () => {
- const columns: DataColumns<any> = [{
+ const columns: DataColumns<any, any> = [{
name: "Column 1",
filters: [],
render: jest.fn(),
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE
+ sort: {direction: SortDirection.NONE, field: "name"}
}];
const state = dataExplorerReducer(undefined,
dataExplorerActions.SET_COLUMNS({ id: "Data explorer", columns }));
});
it('should toggle sorting', () => {
- const columns: DataColumns<any> = [{
+ const columns: DataColumns<any, any> = [{
name: "Column 1",
filters: [],
render: jest.fn(),
selected: true,
- sortDirection: SortDirection.ASC,
+ sort: {direction: SortDirection.ASC, field: "name"},
configurable: true
}, {
name: "Column 2",
render: jest.fn(),
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "name"},
}];
const state = dataExplorerReducer({ "Data explorer": { ...initialDataExplorer, columns } },
dataExplorerActions.TOGGLE_SORT({ id: "Data explorer", columnName: "Column 2" }));
- expect(state["Data explorer"].columns[0].sortDirection).toEqual("none");
- expect(state["Data explorer"].columns[1].sortDirection).toEqual("asc");
+ expect(state["Data explorer"].columns[0].sort.direction).toEqual("none");
+ expect(state["Data explorer"].columns[1].sort.direction).toEqual("asc");
});
it('should set filters', () => {
- const columns: DataColumns<any> = [{
+ const columns: DataColumns<any, any> = [{
name: "Column 1",
filters: [],
render: jest.fn(),
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE
+ sort: {direction: SortDirection.NONE, field: "name"}
}];
const filters: DataTableFilterItem[] = [{
export interface DataExplorer {
fetchMode: DataTableFetchMode;
- columns: DataColumns<any>;
+ columns: DataColumns<any, any>;
items: any[];
itemsAvailable: number;
page: number;
return returnValue;
};
-export const getSortColumn = (dataExplorer: DataExplorer) =>
+export const getSortColumn = <R>(dataExplorer: DataExplorer): DataColumn<any, R> | undefined =>
dataExplorer.columns.find(
- (c: any) => !!c.sortDirection && c.sortDirection !== SortDirection.NONE
+ (c: DataColumn<any, R>) => !!c.sort && c.sort.direction !== SortDirection.NONE
);
const update = (
) => ({ ...state, [id]: updateFn(getDataExplorer(state, id)) });
const canUpdateColumns = (
- prevColumns: DataColumns<any>,
- nextColumns: DataColumns<any>
+ prevColumns: DataColumns<any, any>,
+ nextColumns: DataColumns<any, any>
) => {
if (prevColumns.length !== nextColumns.length) {
return true;
};
const setColumns =
- (columns: DataColumns<any>) => (dataExplorer: DataExplorer) => ({
+ (columns: DataColumns<any, any>) => (dataExplorer: DataExplorer) => ({
...dataExplorer,
columns: canUpdateColumns(dataExplorer.columns, columns)
? columns
});
const mapColumns =
- (mapFn: (column: DataColumn<any>) => DataColumn<any>) =>
+ (mapFn: (column: DataColumn<any, any>) => DataColumn<any, any>) =>
(dataExplorer: DataExplorer) => ({
...dataExplorer,
columns: dataExplorer.columns.map(mapFn),
});
-const toggleSort = (columnName: string) => (column: DataColumn<any>) =>
+const toggleSort = (columnName: string) => (column: DataColumn<any, any>) =>
column.name === columnName
? toggleSortDirection(column)
: resetSortDirection(column);
-const toggleColumn = (columnName: string) => (column: DataColumn<any>) =>
+const toggleColumn = (columnName: string) => (column: DataColumn<any, any>) =>
column.name === columnName
? { ...column, selected: !column.selected }
: column;
const setFilters =
(columnName: string, filters: DataTableFilters) =>
- (column: DataColumn<any>) =>
+ (column: DataColumn<any, any>) =>
column.name === columnName ? { ...column, filters } : column;
import { getUserUuid } from "common/getuser";
import { DataColumns } from "components/data-table/data-table";
import { ServiceRepository } from "services/services";
-import { SortDirection } from "components/data-table/data-column";
import { FilterBuilder } from "services/api/filter-builder";
import { updateFavorites } from "../favorites/favorites-actions";
import { favoritePanelActions } from "./favorite-panel-action";
import { Dispatch, MiddlewareAPI } from "redux";
-import { OrderBuilder, OrderDirection } from "services/api/order-builder";
-import { LinkResource } from "models/link";
-import { GroupContentsResource, GroupContentsResourcePrefix } from "services/groups-service/groups-service";
import { resourcesActions } from "store/resources/resources-actions";
import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions';
import { progressIndicatorActions } from 'store/progress-indicator/progress-indicator-actions';
import { getDataExplorer } from "store/data-explorer/data-explorer-reducer";
import { loadMissingProcessesInformation } from "store/project-panel/project-panel-middleware-service";
-import { getSortColumn } from "store/data-explorer/data-explorer-reducer";
import { getDataExplorerColumnFilters } from 'store/data-explorer/data-explorer-middleware-service';
import { serializeSimpleObjectTypeFilters } from '../resource-type-filters/resource-type-filters';
import { ResourceKind } from "models/resource";
import { LinkClass } from "models/link";
+import { GroupContentsResource } from "services/groups-service/groups-service";
export class FavoritePanelMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
if (!dataExplorer) {
api.dispatch(favoritesPanelDataExplorerIsNotSet());
} else {
- const columns = dataExplorer.columns as DataColumns<string>;
- const sortColumn = getSortColumn(dataExplorer);
+ const columns = dataExplorer.columns as DataColumns<string, GroupContentsResource>;
const typeFilters = serializeSimpleObjectTypeFilters(getDataExplorerColumnFilters(columns, FavoritePanelColumnNames.TYPE));
-
- const linkOrder = new OrderBuilder<LinkResource>();
- const contentOrder = new OrderBuilder<GroupContentsResource>();
-
- if (sortColumn && sortColumn.name === FavoritePanelColumnNames.NAME) {
- const direction = sortColumn.sortDirection === SortDirection.ASC
- ? OrderDirection.ASC
- : OrderDirection.DESC;
-
- linkOrder.addOrder(direction, "name");
- contentOrder
- .addOrder(direction, "name", GroupContentsResourcePrefix.COLLECTION)
- .addOrder(direction, "name", GroupContentsResourcePrefix.PROCESS)
- .addOrder(direction, "name", GroupContentsResourcePrefix.PROJECT);
- }
try {
api.dispatch(progressIndicatorActions.START_WORKING(this.getId()));
const responseLinks = await this.services.linkService.list({
import { OrderBuilder, OrderDirection } from 'services/api/order-builder';
import { GroupResource, GroupClass } from 'models/group';
import { SortDirection } from 'components/data-table/data-column';
-import { GroupsPanelColumnNames } from 'views/groups-panel/groups-panel';
import { progressIndicatorActions } from "store/progress-indicator/progress-indicator-actions";
export class GroupsPanelMiddlewareService extends DataExplorerMiddlewareService {
} else {
try {
api.dispatch(progressIndicatorActions.START_WORKING(this.getId()));
+ const sortColumn = getSortColumn<GroupResource>(dataExplorer);
const order = new OrderBuilder<GroupResource>();
- const sortColumn = getSortColumn(dataExplorer);
- if (sortColumn) {
+ if (sortColumn && sortColumn.sort) {
const direction =
- sortColumn.sortDirection === SortDirection.ASC && sortColumn.name === GroupsPanelColumnNames.GROUP
+ sortColumn.sort.direction === SortDirection.ASC
? OrderDirection.ASC
: OrderDirection.DESC;
- order.addOrder(direction, 'name');
+ order.addOrder(direction, sortColumn.sort.field);
}
const filters = new FilterBuilder()
.addEqual('group_class', GroupClass.ROLE)
import { ServiceRepository } from 'services/services';
import { MiddlewareAPI, Dispatch } from 'redux';
-import { DataExplorerMiddlewareService, dataExplorerToListParams, listResultsToDataExplorerItemsMeta } from 'store/data-explorer/data-explorer-middleware-service';
+import { DataExplorerMiddlewareService, dataExplorerToListParams, getOrder, listResultsToDataExplorerItemsMeta } from 'store/data-explorer/data-explorer-middleware-service';
import { RootState } from 'store/store';
import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions';
import { DataExplorer, getDataExplorer } from 'store/data-explorer/data-explorer-reducer';
import { updateResources } from 'store/resources/resources-actions';
-import { SortDirection } from 'components/data-table/data-column';
-import { OrderDirection, OrderBuilder } from 'services/api/order-builder';
import { ListResults } from 'services/common-service/common-service';
-import { getSortColumn } from "store/data-explorer/data-explorer-reducer";
import { LinkResource } from 'models/link';
import { linkPanelActions } from 'store/link-panel/link-panel-actions';
-import { LinkPanelColumnNames } from 'views/link-panel/link-panel-root';
export class LinkMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
export const getParams = (dataExplorer: DataExplorer) => ({
...dataExplorerToListParams(dataExplorer),
- order: getOrder(dataExplorer)
+ order: getOrder<LinkResource>(dataExplorer)
});
-const getOrder = (dataExplorer: DataExplorer) => {
- const sortColumn = getSortColumn(dataExplorer);
- const order = new OrderBuilder<LinkResource>();
- if (sortColumn) {
- const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
- ? OrderDirection.ASC
- : OrderDirection.DESC;
-
- const columnName = sortColumn && sortColumn.name === LinkPanelColumnNames.NAME ? "name" : "modifiedAt";
- return order
- .addOrder(sortDirection, columnName)
- .getOrder();
- } else {
- return order.getOrder();
- }
-};
-
export const setItems = (listResults: ListResults<LinkResource>) =>
linkPanelActions.SET_ITEMS({
...listResultsToDataExplorerItemsMeta(listResults),
--- /dev/null
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import React from 'react';
+import { configure } from 'enzyme';
+import Adapter from 'enzyme-adapter-react-16';
+import { copyProcess } from './process-copy-actions';
+import { CommonService } from 'services/common-service/common-service';
+import { snakeCase } from 'lodash';
+
+configure({ adapter: new Adapter() });
+
+describe('ProcessCopyAction', () => {
+ // let props;
+ let dispatch: any, getState: any, services: any;
+
+ let sampleFailedProcess = {
+ command: [
+ "arvados-cwl-runner",
+ "--api=containers",
+ "--local",
+ "--project-uuid=zzzzz-j7d0g-yr18k784zplfeza",
+ "/var/lib/cwl/workflow.json#main",
+ "/var/lib/cwl/cwl.input.json",
+ ],
+ container_count: 1,
+ container_count_max: 10,
+ container_image: "arvados/jobs",
+ container_uuid: "zzzzz-dz642-b9j9dtk1yikp9h0",
+ created_at: "2023-01-23T22:50:50.788284000Z",
+ cumulative_cost: 0.00120553009559028,
+ cwd: "/var/spool/cwl",
+ description: "test decsription",
+ environment: {},
+ etag: "2es6px6q7uo0yqi2i291x8gd6",
+ expires_at: null,
+ filters: null,
+ href: "/container_requests/zzzzz-xvhdp-111111111111111",
+ kind: "arvados#containerRequest",
+ log_uuid: "zzzzz-4zz18-a1gxqy9o6zyrdy8",
+ modified_at: "2023-01-24T21:13:54.772612000Z",
+ modified_by_client_uuid: "zzzzz-ozdt8-q6dzdi1lcc03155",
+ modified_by_user_uuid: "jutro-tpzed-vllbpebicy84rd5",
+ mounts: {
+ "/var/lib/cwl/cwl.input.json": {
+ capacity: 0,
+ commit: "",
+ content: {
+ input: {
+ basename: "logo.ai.no.whitespace.png",
+ class: "File",
+ location:
+ "keep:5d3238c4db721a92c98b0305a47b0485+75/logo.ai.no.whitespace.png",
+ },
+ reverse_sort: true,
+ },
+ device_type: "",
+ exclude_from_output: false,
+ git_url: "",
+ kind: "json",
+ path: "",
+ portable_data_hash: "",
+ repository_name: "",
+ uuid: "",
+ writable: false,
+ },
+ "/var/lib/cwl/workflow.json": {
+ capacity: 0,
+ commit: "",
+ content: {
+ $graph: [
+ {
+ class: "Workflow",
+ doc: "Reverse the lines in a document, then sort those lines.",
+ id: "#main",
+ inputs: [
+ {
+ default: null,
+ doc: "The input file to be processed.",
+ id: "#main/input",
+ type: "File",
+ },
+ {
+ default: true,
+ doc: "If true, reverse (decending) sort",
+ id: "#main/reverse_sort",
+ type: "boolean",
+ },
+ ],
+ outputs: [
+ {
+ doc: "The output with the lines reversed and sorted.",
+ id: "#main/output",
+ outputSource: "#main/sorted/output",
+ type: "File",
+ },
+ ],
+ steps: [
+ {
+ id: "#main/rev",
+ in: [{ id: "#main/rev/input", source: "#main/input" }],
+ out: ["#main/rev/output"],
+ run: "#revtool.cwl",
+ },
+ {
+ id: "#main/sorted",
+ in: [
+ { id: "#main/sorted/input", source: "#main/rev/output" },
+ {
+ id: "#main/sorted/reverse",
+ source: "#main/reverse_sort",
+ },
+ ],
+ out: ["#main/sorted/output"],
+ run: "#sorttool.cwl",
+ },
+ ],
+ },
+ {
+ baseCommand: "rev",
+ class: "CommandLineTool",
+ doc: "Reverse each line using the `rev` command",
+ hints: [{ class: "ResourceRequirement", ramMin: 8 }],
+ id: "#revtool.cwl",
+ inputs: [
+ { id: "#revtool.cwl/input", inputBinding: {}, type: "File" },
+ ],
+ outputs: [
+ {
+ id: "#revtool.cwl/output",
+ outputBinding: { glob: "output.txt" },
+ type: "File",
+ },
+ ],
+ stdout: "output.txt",
+ },
+ {
+ baseCommand: "sort",
+ class: "CommandLineTool",
+ doc: "Sort lines using the `sort` command",
+ hints: [{ class: "ResourceRequirement", ramMin: 8 }],
+ id: "#sorttool.cwl",
+ inputs: [
+ {
+ id: "#sorttool.cwl/reverse",
+ inputBinding: { position: 1, prefix: "-r" },
+ type: "boolean",
+ },
+ {
+ id: "#sorttool.cwl/input",
+ inputBinding: { position: 2 },
+ type: "File",
+ },
+ ],
+ outputs: [
+ {
+ id: "#sorttool.cwl/output",
+ outputBinding: { glob: "output.txt" },
+ type: "File",
+ },
+ ],
+ stdout: "output.txt",
+ },
+ ],
+ cwlVersion: "v1.0",
+ },
+ device_type: "",
+ exclude_from_output: false,
+ git_url: "",
+ kind: "json",
+ path: "",
+ portable_data_hash: "",
+ repository_name: "",
+ uuid: "",
+ writable: false,
+ },
+ "/var/spool/cwl": {
+ capacity: 0,
+ commit: "",
+ content: null,
+ device_type: "",
+ exclude_from_output: false,
+ git_url: "",
+ kind: "collection",
+ path: "",
+ portable_data_hash: "",
+ repository_name: "",
+ uuid: "",
+ writable: true,
+ },
+ stdout: {
+ capacity: 0,
+ commit: "",
+ content: null,
+ device_type: "",
+ exclude_from_output: false,
+ git_url: "",
+ kind: "file",
+ path: "/var/spool/cwl/cwl.output.json",
+ portable_data_hash: "",
+ repository_name: "",
+ uuid: "",
+ writable: false,
+ },
+ },
+ name: "Copy of: Copy of: Copy of: revsort.cwl",
+ output_name: "Output from revsort.cwl",
+ output_path: "/var/spool/cwl",
+ output_properties: { key: "val" },
+ output_storage_classes: ["default"],
+ output_ttl: 999999,
+ output_uuid: "zzzzz-4zz18-wolwlyfxmlhmgd4",
+ owner_uuid: "zzzzz-j7d0g-yr18k784zplfeza",
+ priority: 500,
+ properties: {
+ template_uuid: "zzzzz-7fd4e-7xsza0vgfe785cy",
+ workflowName: "revsort.cwl",
+ },
+ requesting_container_uuid: null,
+ runtime_constraints: {
+ API: true,
+ cuda: { device_count: 0, driver_version: "", hardware_capability: "" },
+ keep_cache_disk: 0,
+ keep_cache_ram: 0,
+ ram: 1342177280,
+ vcpus: 1,
+ },
+ runtime_token: "",
+ scheduling_parameters: {
+ max_run_time: 0,
+ partitions: [],
+ preemptible: false,
+ },
+ state: "Final",
+ use_existing: false,
+ uuid: "zzzzz-xvhdp-111111111111111",
+ };
+
+ let expectedContainerRequest = {
+ command: [
+ "arvados-cwl-runner",
+ "--api=containers",
+ "--local",
+ "--project-uuid=zzzzz-j7d0g-yr18k784zplfeza",
+ "/var/lib/cwl/workflow.json#main",
+ "/var/lib/cwl/cwl.input.json",
+ ],
+ container_count_max: 10,
+ container_image: "arvados/jobs",
+ cwd: "/var/spool/cwl",
+ description: "test decsription",
+ environment: {},
+ kind: "arvados#containerRequest",
+ mounts: {
+ "/var/lib/cwl/cwl.input.json": {
+ capacity: 0,
+ commit: "",
+ content: {
+ input: {
+ basename: "logo.ai.no.whitespace.png",
+ class: "File",
+ location:
+ "keep:5d3238c4db721a92c98b0305a47b0485+75/logo.ai.no.whitespace.png",
+ },
+ reverse_sort: true,
+ },
+ device_type: "",
+ exclude_from_output: false,
+ git_url: "",
+ kind: "json",
+ path: "",
+ portable_data_hash: "",
+ repository_name: "",
+ uuid: "",
+ writable: false,
+ },
+ "/var/lib/cwl/workflow.json": {
+ capacity: 0,
+ commit: "",
+ content: {
+ $graph: [
+ {
+ class: "Workflow",
+ doc: "Reverse the lines in a document, then sort those lines.",
+ id: "#main",
+ inputs: [
+ {
+ default: null,
+ doc: "The input file to be processed.",
+ id: "#main/input",
+ type: "File",
+ },
+ {
+ default: true,
+ doc: "If true, reverse (decending) sort",
+ id: "#main/reverse_sort",
+ type: "boolean",
+ },
+ ],
+ outputs: [
+ {
+ doc: "The output with the lines reversed and sorted.",
+ id: "#main/output",
+ outputSource: "#main/sorted/output",
+ type: "File",
+ },
+ ],
+ steps: [
+ {
+ id: "#main/rev",
+ in: [{ id: "#main/rev/input", source: "#main/input" }],
+ out: ["#main/rev/output"],
+ run: "#revtool.cwl",
+ },
+ {
+ id: "#main/sorted",
+ in: [
+ {
+ id: "#main/sorted/input",
+ source: "#main/rev/output",
+ },
+ {
+ id: "#main/sorted/reverse",
+ source: "#main/reverse_sort",
+ },
+ ],
+ out: ["#main/sorted/output"],
+ run: "#sorttool.cwl",
+ },
+ ],
+ },
+ {
+ baseCommand: "rev",
+ class: "CommandLineTool",
+ doc: "Reverse each line using the `rev` command",
+ hints: [{ class: "ResourceRequirement", ramMin: 8 }],
+ id: "#revtool.cwl",
+ inputs: [
+ {
+ id: "#revtool.cwl/input",
+ inputBinding: {},
+ type: "File",
+ },
+ ],
+ outputs: [
+ {
+ id: "#revtool.cwl/output",
+ outputBinding: { glob: "output.txt" },
+ type: "File",
+ },
+ ],
+ stdout: "output.txt",
+ },
+ {
+ baseCommand: "sort",
+ class: "CommandLineTool",
+ doc: "Sort lines using the `sort` command",
+ hints: [{ class: "ResourceRequirement", ramMin: 8 }],
+ id: "#sorttool.cwl",
+ inputs: [
+ {
+ id: "#sorttool.cwl/reverse",
+ inputBinding: { position: 1, prefix: "-r" },
+ type: "boolean",
+ },
+ {
+ id: "#sorttool.cwl/input",
+ inputBinding: { position: 2 },
+ type: "File",
+ },
+ ],
+ outputs: [
+ {
+ id: "#sorttool.cwl/output",
+ outputBinding: { glob: "output.txt" },
+ type: "File",
+ },
+ ],
+ stdout: "output.txt",
+ },
+ ],
+ cwlVersion: "v1.0",
+ },
+ device_type: "",
+ exclude_from_output: false,
+ git_url: "",
+ kind: "json",
+ path: "",
+ portable_data_hash: "",
+ repository_name: "",
+ uuid: "",
+ writable: false,
+ },
+ "/var/spool/cwl": {
+ capacity: 0,
+ commit: "",
+ content: null,
+ device_type: "",
+ exclude_from_output: false,
+ git_url: "",
+ kind: "collection",
+ path: "",
+ portable_data_hash: "",
+ repository_name: "",
+ uuid: "",
+ writable: true,
+ },
+ stdout: {
+ capacity: 0,
+ commit: "",
+ content: null,
+ device_type: "",
+ exclude_from_output: false,
+ git_url: "",
+ kind: "file",
+ path: "/var/spool/cwl/cwl.output.json",
+ portable_data_hash: "",
+ repository_name: "",
+ uuid: "",
+ writable: false,
+ },
+ },
+ name: "newname.cwl",
+ output_name: "Output from revsort.cwl",
+ output_path: "/var/spool/cwl",
+ output_properties: { key: "val" },
+ output_storage_classes: ["default"],
+ output_ttl: 999999,
+ owner_uuid: "zzzzz-j7d0g-000000000000000",
+ priority: 500,
+ properties: {
+ template_uuid: "zzzzz-7fd4e-7xsza0vgfe785cy",
+ workflowName: "revsort.cwl",
+ },
+ runtime_constraints: {
+ API: true,
+ cuda: {
+ device_count: 0,
+ driver_version: "",
+ hardware_capability: "",
+ },
+ keep_cache_disk: 0,
+ keep_cache_ram: 0,
+ ram: 1342177280,
+ vcpus: 1,
+ },
+ scheduling_parameters: {
+ max_run_time: 0,
+ partitions: [],
+ preemptible: false,
+ },
+ state: "Uncommitted",
+ use_existing: false,
+ };
+
+ beforeEach(() => {
+ dispatch = jest.fn();
+ services = {
+ containerRequestService: {
+ get: jest.fn().mockImplementation(async () => (CommonService.mapResponseKeys({data: sampleFailedProcess}))),
+ create: jest.fn().mockImplementation(async (data) => (CommonService.mapKeys(snakeCase)(data))),
+ },
+ };
+ getState = () => ({
+ auth: {},
+ });
+ });
+
+ it("should request the failed process and return a copy with the proper fields", async () => {
+ // when
+ const newprocess = await copyProcess({
+ name: "newname.cwl",
+ uuid: "zzzzz-xvhdp-111111111111111",
+ ownerUuid: "zzzzz-j7d0g-000000000000000",
+ })(dispatch, getState, services);
+
+ // then
+ expect(services.containerRequestService.get).toHaveBeenCalledWith("zzzzz-xvhdp-111111111111111");
+ expect(newprocess).toEqual(expectedContainerRequest);
+
+ });
+});
import { getProcess } from 'store/processes/process';
import {snackbarActions, SnackbarKind} from 'store/snackbar/snackbar-actions';
import { initProjectsTreePicker } from 'store/tree-picker/tree-picker-actions';
+import { ContainerRequestState } from "models/container-request";
export const PROCESS_COPY_FORM_NAME = 'processCopyFormName';
dispatch(startSubmit(PROCESS_COPY_FORM_NAME));
try {
const process = await services.containerRequestService.get(resource.uuid);
- const { kind, containerImage, outputPath, outputName, containerCountMax, command, properties, requestingContainerUuid, mounts, runtimeConstraints, schedulingParameters, environment, cwd, outputTtl, priority, expiresAt, useExisting, filters } = process;
- await services.containerRequestService.create({ command, containerImage, outputPath, ownerUuid: resource.ownerUuid, name: resource.name, kind, outputName, containerCountMax, properties, requestingContainerUuid, mounts, runtimeConstraints, schedulingParameters, environment, cwd, outputTtl, priority, expiresAt, useExisting, filters });
+ const {
+ command,
+ containerCountMax,
+ containerImage,
+ cwd,
+ description,
+ environment,
+ kind,
+ mounts,
+ outputName,
+ outputPath,
+ outputProperties,
+ outputStorageClasses,
+ outputTtl,
+ properties,
+ runtimeConstraints,
+ schedulingParameters,
+ useExisting,
+ } = process;
+ const newProcess = await services.containerRequestService.create({
+ command,
+ containerCountMax,
+ containerImage,
+ cwd,
+ description,
+ environment,
+ kind,
+ mounts,
+ name: resource.name,
+ outputName,
+ outputPath,
+ outputProperties,
+ outputStorageClasses,
+ outputTtl,
+ ownerUuid: resource.ownerUuid,
+ priority: 500,
+ properties,
+ runtimeConstraints,
+ schedulingParameters,
+ state: ContainerRequestState.UNCOMMITTED,
+ useExisting,
+ });
dispatch(dialogActions.CLOSE_DIALOG({ id: PROCESS_COPY_FORM_NAME }));
- return process;
+ return newProcess;
} catch (e) {
dispatch(dialogActions.CLOSE_DIALOG({ id: PROCESS_COPY_FORM_NAME }));
throw new Error('Could not copy the process.');
}
- };
\ No newline at end of file
+ };
}
};
+export const isProcessRunnable = ({ containerRequest }: Process): boolean => (
+ containerRequest.state === ContainerRequestState.UNCOMMITTED
+);
+
+export const isProcessResumable = ({ containerRequest, container }: Process): boolean => (
+ containerRequest.state === ContainerRequestState.COMMITTED &&
+ containerRequest.priority === 0 &&
+ // Don't show run button when container is present & running or cancelled
+ !(container && (container.state === ContainerState.RUNNING ||
+ container.state === ContainerState.CANCELLED ||
+ container.state === ContainerState.COMPLETE))
+);
+
+export const isProcessCancelable = ({ containerRequest, container }: Process): boolean => (
+ containerRequest.priority !== null &&
+ containerRequest.priority > 0 &&
+ container !== undefined &&
+ (container.state === ContainerState.QUEUED ||
+ container.state === ContainerState.LOCKED ||
+ container.state === ContainerState.RUNNING)
+);
+
const isSubprocess = (containerUuid: string) => (resource: Resource) =>
resource.kind === ResourceKind.CONTAINER_REQUEST
&& (resource as ContainerRequestResource).requestingContainerUuid === containerUuid;
import { UserResource } from "models/user";
import { CommandOutputParameter } from "cwlts/mappings/v1.0/CommandOutputParameter";
import { ContainerResource } from "models/container";
-import { ContainerRequestResource } from "models/container-request";
+import { ContainerRequestResource, ContainerRequestState } from "models/container-request";
export const loadProcess = (containerRequestUuid: string) =>
async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository): Promise<Process | undefined> => {
async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
try {
const process = await services.containerRequestService.update(uuid, { priority: 0 });
+ dispatch<any>(updateResources([process]));
+ if (process.containerUuid) {
+ const container = await services.containerService.get(process.containerUuid, false);
+ dispatch<any>(updateResources([container]));
+ }
return process;
} catch (e) {
throw new Error('Could not cancel the process.');
}
};
+export const resumeOnHoldWorkflow = (uuid: string) =>
+ async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+ try {
+ const process = await services.containerRequestService.update(uuid, { priority: 500 });
+ dispatch<any>(updateResources([process]));
+ if (process.containerUuid) {
+ const container = await services.containerService.get(process.containerUuid, false);
+ dispatch<any>(updateResources([container]));
+ }
+ return process;
+ } catch (e) {
+ throw new Error('Could not resume the process.');
+ }
+ };
+
+export const startWorkflow = (uuid: string) =>
+ async (dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
+ try {
+ const process = await services.containerRequestService.update(uuid, { state: ContainerRequestState.COMMITTED });
+ if (process) {
+ dispatch<any>(updateResources([process]));
+ dispatch(snackbarActions.OPEN_SNACKBAR({ message: 'Process started', hideDuration: 2000, kind: SnackbarKind.SUCCESS }));
+ } else {
+ dispatch<any>(snackbarActions.OPEN_SNACKBAR({ message: `Failed to start process`, kind: SnackbarKind.ERROR }));
+ }
+ } catch (e) {
+ dispatch<any>(snackbarActions.OPEN_SNACKBAR({ message: `Failed to start process`, kind: SnackbarKind.ERROR }));
+ }
+ };
+
export const reRunProcess = (processUuid: string, workflowUuid: string) =>
(dispatch: Dispatch, getState: () => RootState, services: ServiceRepository) => {
const process = getResource<any>(processUuid)(getState().resources);
});
export const getFilters = (dataExplorer: DataExplorer) => {
- const columns = dataExplorer.columns as DataColumns<string>;
+ const columns = dataExplorer.columns as DataColumns<string, ProjectResource>;
const typeFilters = serializeResourceTypeFilters(getDataExplorerColumnFilters(columns, ProjectPanelColumnNames.TYPE));
const statusColumnFilters = getDataExplorerColumnFilters(columns, 'Status');
const activeStatusFilter = Object.keys(statusColumnFilters).find(
);
};
-export const getOrder = (dataExplorer: DataExplorer) => {
- const sortColumn = getSortColumn(dataExplorer);
+const getOrder = (dataExplorer: DataExplorer) => {
+ const sortColumn = getSortColumn<ProjectResource>(dataExplorer);
const order = new OrderBuilder<ProjectResource>();
- if (sortColumn) {
- const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
+ if (sortColumn && sortColumn.sort) {
+ const sortDirection = sortColumn.sort.direction === SortDirection.ASC
? OrderDirection.ASC
: OrderDirection.DESC;
- const columnName = sortColumn && sortColumn.name === ProjectPanelColumnNames.NAME ? "name" : "createdAt";
return order
- .addOrder(sortDirection, columnName, GroupContentsResourcePrefix.COLLECTION)
- .addOrder(sortDirection, columnName, GroupContentsResourcePrefix.PROCESS)
- .addOrder(sortDirection, columnName, GroupContentsResourcePrefix.PROJECT)
+ .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.COLLECTION)
+ .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.PROCESS)
+ .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.PROJECT)
.getOrder();
} else {
return order.getOrder();
import { getDataExplorer } from 'store/data-explorer/data-explorer-reducer';
import { resourcesActions } from 'store/resources/resources-actions';
import { FilterBuilder } from 'services/api/filter-builder';
-import { SortDirection } from 'components/data-table/data-column';
-import { OrderDirection, OrderBuilder } from 'services/api/order-builder';
-import { getSortColumn } from "store/data-explorer/data-explorer-reducer";
import { FavoritePanelColumnNames } from 'views/favorite-panel/favorite-panel';
import { publicFavoritePanelActions } from 'store/public-favorites-panel/public-favorites-action';
import { DataColumns } from 'components/data-table/data-table';
import { serializeSimpleObjectTypeFilters } from '../resource-type-filters/resource-type-filters';
-import { LinkResource, LinkClass } from 'models/link';
-import { GroupContentsResource, GroupContentsResourcePrefix } from 'services/groups-service/groups-service';
+import { LinkClass } from 'models/link';
import { progressIndicatorActions } from 'store/progress-indicator/progress-indicator-actions';
import { updatePublicFavorites } from 'store/public-favorites/public-favorites-actions';
+import { GroupContentsResource } from 'services/groups-service/groups-service';
export class PublicFavoritesMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
if (!dataExplorer) {
api.dispatch(favoritesPanelDataExplorerIsNotSet());
} else {
- const columns = dataExplorer.columns as DataColumns<string>;
- const sortColumn = getSortColumn(dataExplorer);
+ const columns = dataExplorer.columns as DataColumns<string, GroupContentsResource>;
const typeFilters = serializeSimpleObjectTypeFilters(getDataExplorerColumnFilters(columns, FavoritePanelColumnNames.TYPE));
-
- const linkOrder = new OrderBuilder<LinkResource>();
- const contentOrder = new OrderBuilder<GroupContentsResource>();
-
- if (sortColumn && sortColumn.name === FavoritePanelColumnNames.NAME) {
- const direction = sortColumn.sortDirection === SortDirection.ASC
- ? OrderDirection.ASC
- : OrderDirection.DESC;
-
- linkOrder.addOrder(direction, "name");
- contentOrder
- .addOrder(direction, "name", GroupContentsResourcePrefix.COLLECTION)
- .addOrder(direction, "name", GroupContentsResourcePrefix.PROCESS)
- .addOrder(direction, "name", GroupContentsResourcePrefix.PROJECT);
- }
try {
api.dispatch(progressIndicatorActions.START_WORKING(this.getId()));
const uuidPrefix = api.getState().auth.config.uuidPrefix;
import { DataColumns } from 'components/data-table/data-table';
import { serializeResourceTypeFilters } from 'store//resource-type-filters/resource-type-filters';
import { ProjectPanelColumnNames } from 'views/project-panel/project-panel';
-import { Resource, ResourceKind } from 'models/resource';
+import { ResourceKind } from 'models/resource';
import { ContainerRequestResource } from 'models/container-request';
export class SearchResultsMiddlewareService extends DataExplorerMiddlewareService {
}
}
-const typeFilters = (columns: DataColumns<string>) => serializeResourceTypeFilters(getDataExplorerColumnFilters(columns, ProjectPanelColumnNames.TYPE));
+const typeFilters = (columns: DataColumns<string, GroupContentsResource>) => serializeResourceTypeFilters(getDataExplorerColumnFilters(columns, ProjectPanelColumnNames.TYPE));
export const getParams = (dataExplorer: DataExplorer, query: string, apiRevision: number) => ({
...dataExplorerToListParams(dataExplorer),
});
const getOrder = (dataExplorer: DataExplorer) => {
- const sortColumn = getSortColumn(dataExplorer);
+ const sortColumn = getSortColumn<GroupContentsResource>(dataExplorer);
const order = new OrderBuilder<GroupContentsResource>();
- if (sortColumn) {
- const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
+ if (sortColumn && sortColumn.sort) {
+ const sortDirection = sortColumn.sort.direction === SortDirection.ASC
? OrderDirection.ASC
: OrderDirection.DESC;
return order
- .addOrder(sortDirection, sortColumn.name as keyof Resource, GroupContentsResourcePrefix.COLLECTION)
- .addOrder(sortDirection, sortColumn.name as keyof Resource, GroupContentsResourcePrefix.PROCESS)
- .addOrder(sortDirection, sortColumn.name as keyof Resource, GroupContentsResourcePrefix.PROJECT)
+ .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.COLLECTION)
+ .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.PROCESS)
+ .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.PROJECT)
.getOrder();
} else {
return order.getOrder();
import { SortDirection } from 'components/data-table/data-column';
import { OrderBuilder, OrderDirection } from 'services/api/order-builder';
import { ProjectResource } from 'models/project';
-import { ProjectPanelColumnNames } from 'views/project-panel/project-panel';
import { getSortColumn } from "store/data-explorer/data-explorer-reducer";
import { updatePublicFavorites } from 'store/public-favorites/public-favorites-actions';
import { FilterBuilder } from 'services/api/filter-builder';
filters: getFilters(dataExplorer),
});
-export const getOrder = (dataExplorer: DataExplorer) => {
- const sortColumn = getSortColumn(dataExplorer);
+const getOrder = (dataExplorer: DataExplorer) => {
+ const sortColumn = getSortColumn<ProjectResource>(dataExplorer);
const order = new OrderBuilder<ProjectResource>();
- if (sortColumn) {
- const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
+ if (sortColumn && sortColumn.sort) {
+ const sortDirection = sortColumn.sort.direction === SortDirection.ASC
? OrderDirection.ASC
: OrderDirection.DESC;
- const columnName = sortColumn && sortColumn.name === ProjectPanelColumnNames.NAME ? "name" : "createdAt";
- if (columnName === 'name') {
- return order
- .addOrder(sortDirection, columnName, GroupContentsResourcePrefix.COLLECTION)
- .addOrder(sortDirection, columnName, GroupContentsResourcePrefix.PROCESS)
- .addOrder(sortDirection, columnName, GroupContentsResourcePrefix.PROJECT)
- .getOrder();
- } else {
- return order
- .addOrder(sortDirection, columnName)
- .getOrder();
- }
+
+ return order
+ .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.COLLECTION)
+ .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.PROCESS)
+ .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.PROJECT)
+ .getOrder();
} else {
return order.getOrder();
}
import { ServiceRepository } from 'services/services';
import { MiddlewareAPI, Dispatch } from 'redux';
import {
- DataExplorerMiddlewareService, dataExplorerToListParams, listResultsToDataExplorerItemsMeta, getDataExplorerColumnFilters
+ DataExplorerMiddlewareService, dataExplorerToListParams, listResultsToDataExplorerItemsMeta, getDataExplorerColumnFilters, getOrder
} from 'store/data-explorer/data-explorer-middleware-service';
import { RootState } from 'store/store';
import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions';
import { DataExplorer, getDataExplorer } from 'store/data-explorer/data-explorer-reducer';
import { updateResources } from 'store/resources/resources-actions';
-import { SortDirection } from 'components/data-table/data-column';
-import { OrderDirection, OrderBuilder } from 'services/api/order-builder';
import { ListResults } from 'services/common-service/common-service';
-import { getSortColumn } from "store/data-explorer/data-explorer-reducer";
import { ProcessResource } from 'models/process';
-import { SubprocessPanelColumnNames } from 'views/subprocess-panel/subprocess-panel-root';
import { FilterBuilder, joinFilters } from 'services/api/filter-builder';
import { subprocessPanelActions } from './subprocess-panel-actions';
import { DataColumns } from 'components/data-table/data-table';
try {
api.dispatch(progressIndicatorActions.START_WORKING(this.getId()));
const parentContainerRequest = await this.services.containerRequestService.get(parentContainerRequestUuid);
- const containerRequests = await this.services.containerRequestService.list(
- {
- ...getParams(dataExplorer, parentContainerRequest) ,
- select: containerRequestFieldsNoMounts
- });
-
+ if (parentContainerRequest.containerUuid) {
+ const containerRequests = await this.services.containerRequestService.list(
+ {
+ ...getParams(dataExplorer, parentContainerRequest) ,
+ select: containerRequestFieldsNoMounts
+ });
+ api.dispatch(updateResources(containerRequests.items));
+ await api.dispatch<any>(loadMissingProcessesInformation(containerRequests.items));
+ // Populate the actual user view
+ api.dispatch(setItems(containerRequests));
+ }
api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId()));
- api.dispatch(updateResources(containerRequests.items));
- await api.dispatch<any>(loadMissingProcessesInformation(containerRequests.items));
- // Populate the actual user view
- api.dispatch(setItems(containerRequests));
} catch {
api.dispatch(progressIndicatorActions.PERSIST_STOP_WORKING(this.getId()));
api.dispatch(couldNotFetchSubprocesses());
dataExplorer: DataExplorer,
parentContainerRequest: ContainerRequestResource) => ({
...dataExplorerToListParams(dataExplorer),
- order: getOrder(dataExplorer),
+ order: getOrder<ProcessResource>(dataExplorer),
filters: getFilters(dataExplorer, parentContainerRequest)
});
-const getOrder = (dataExplorer: DataExplorer) => {
- const sortColumn = getSortColumn(dataExplorer);
- const order = new OrderBuilder<ProcessResource>();
- if (sortColumn) {
- const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
- ? OrderDirection.ASC
- : OrderDirection.DESC;
-
- const columnName = sortColumn && sortColumn.name === SubprocessPanelColumnNames.NAME ? "name" : "modifiedAt";
- return order
- .addOrder(sortDirection, columnName)
- .getOrder();
- } else {
- return order.getOrder();
- }
-};
-
export const getFilters = (
dataExplorer: DataExplorer,
parentContainerRequest: ContainerRequestResource) => {
- const columns = dataExplorer.columns as DataColumns<string>;
+ const columns = dataExplorer.columns as DataColumns<string, ProcessResource>;
const statusColumnFilters = getDataExplorerColumnFilters(columns, 'Status');
const activeStatusFilter = Object.keys(statusColumnFilters).find(
filterName => statusColumnFilters[filterName].selected
import { trashPanelActions } from "./trash-panel-action";
import { Dispatch, MiddlewareAPI } from "redux";
import { OrderBuilder, OrderDirection } from "services/api/order-builder";
-import { GroupContentsResourcePrefix } from "services/groups-service/groups-service";
-import { ProjectResource } from "models/project";
+import { GroupContentsResource, GroupContentsResourcePrefix } from "services/groups-service/groups-service";
import { ProjectPanelColumnNames } from "views/project-panel/project-panel";
import { updateFavorites } from "store/favorites/favorites-actions";
import { updatePublicFavorites } from 'store/public-favorites/public-favorites-actions';
import { snackbarActions, SnackbarKind } from "store/snackbar/snackbar-actions";
import { updateResources } from "store/resources/resources-actions";
import { progressIndicatorActions } from "store/progress-indicator/progress-indicator-actions";
-import { getSortColumn } from "store/data-explorer/data-explorer-reducer";
+import { DataExplorer, getSortColumn } from "store/data-explorer/data-explorer-reducer";
import { serializeResourceTypeFilters } from 'store//resource-type-filters/resource-type-filters';
import { getDataExplorerColumnFilters } from 'store/data-explorer/data-explorer-middleware-service';
import { joinFilters } from 'services/api/filter-builder';
+import { CollectionResource } from "models/collection";
export class TrashPanelMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
async requestItems(api: MiddlewareAPI<Dispatch, RootState>) {
const dataExplorer = api.getState().dataExplorer[this.getId()];
- const columns = dataExplorer.columns as DataColumns<string>;
- const sortColumn = getSortColumn(dataExplorer);
+ const columns = dataExplorer.columns as DataColumns<string, CollectionResource>;
const typeFilters = serializeResourceTypeFilters(getDataExplorerColumnFilters(columns, ProjectPanelColumnNames.TYPE));
otherFilters,
);
- const order = new OrderBuilder<ProjectResource>();
-
- if (sortColumn) {
- const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
- ? OrderDirection.ASC
- : OrderDirection.DESC;
-
- const columnName = sortColumn && sortColumn.name === ProjectPanelColumnNames.NAME ? "name" : "createdAt";
- order
- .addOrder(sortDirection, columnName, GroupContentsResourcePrefix.COLLECTION)
- .addOrder(sortDirection, columnName, GroupContentsResourcePrefix.PROJECT);
- }
-
const userUuid = getUserUuid(api.getState());
if (!userUuid) { return; }
try {
const listResults = await this.services.groupsService
.contents(userUuid, {
...dataExplorerToListParams(dataExplorer),
- order: order.getOrder(),
+ order: getOrder(dataExplorer),
filters,
recursive: true,
includeTrash: true
}
}
+const getOrder = (dataExplorer: DataExplorer) => {
+ const sortColumn = getSortColumn<GroupContentsResource>(dataExplorer);
+ const order = new OrderBuilder<GroupContentsResource>();
+ if (sortColumn && sortColumn.sort) {
+ const sortDirection = sortColumn.sort.direction === SortDirection.ASC
+ ? OrderDirection.ASC
+ : OrderDirection.DESC;
+
+ return order
+ .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.COLLECTION)
+ .addOrder(sortDirection, sortColumn.sort.field, GroupContentsResourcePrefix.PROJECT)
+ .getOrder();
+ } else {
+ return order.getOrder();
+ }
+};
+
const couldNotFetchTrashContents = () =>
snackbarActions.OPEN_SNACKBAR({
message: 'Could not fetch trash contents.',
.getFilters()
});
-export const getOrder = (dataExplorer: DataExplorer) => {
- const sortColumn = getSortColumn(dataExplorer);
+const getOrder = (dataExplorer: DataExplorer) => {
+ const sortColumn = getSortColumn<UserResource>(dataExplorer);
const order = new OrderBuilder<UserResource>();
- if (sortColumn) {
- const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
+ if (sortColumn && sortColumn.sort) {
+ const sortDirection = sortColumn.sort.direction === SortDirection.ASC
? OrderDirection.ASC
: OrderDirection.DESC;
- switch (sortColumn.name) {
- case UserPanelColumnNames.NAME:
- order.addOrder(sortDirection, "firstName")
- .addOrder(sortDirection, "lastName");
- break;
- case UserPanelColumnNames.UUID:
- order.addOrder(sortDirection, "uuid");
- break;
- case UserPanelColumnNames.EMAIL:
- order.addOrder(sortDirection, "email");
- break;
- case UserPanelColumnNames.USERNAME:
- order.addOrder(sortDirection, "username");
- break;
+
+ if (sortColumn.name === UserPanelColumnNames.NAME) {
+ order.addOrder(sortDirection, "firstName")
+ .addOrder(sortDirection, "lastName");
+ } else {
+ order.addOrder(sortDirection, sortColumn.sort.field);
}
}
return order.getOrder();
kind: SnackbarKind.SUCCESS,
})
);
+ dispatch<any>(navigateTo(process.uuid));
} catch (e) {
dispatch(
snackbarActions.OPEN_SNACKBAR({
import { ServiceRepository } from 'services/services';
import { MiddlewareAPI, Dispatch } from 'redux';
-import { DataExplorerMiddlewareService, dataExplorerToListParams, listResultsToDataExplorerItemsMeta } from 'store/data-explorer/data-explorer-middleware-service';
+import { DataExplorerMiddlewareService, dataExplorerToListParams, getOrder, listResultsToDataExplorerItemsMeta } from 'store/data-explorer/data-explorer-middleware-service';
import { RootState } from 'store/store';
import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions';
import { DataExplorer, getDataExplorer } from 'store/data-explorer/data-explorer-reducer';
import { updateResources } from 'store/resources/resources-actions';
import { FilterBuilder } from 'services/api/filter-builder';
-import { SortDirection } from 'components/data-table/data-column';
-import { WorkflowPanelColumnNames } from 'views/workflow-panel/workflow-panel-view';
-import { OrderDirection, OrderBuilder } from 'services/api/order-builder';
import { WorkflowResource } from 'models/workflow';
import { ListResults } from 'services/common-service/common-service';
import { workflowPanelActions } from 'store/workflow-panel/workflow-panel-actions';
-import { getSortColumn } from "store/data-explorer/data-explorer-reducer";
export class WorkflowMiddlewareService extends DataExplorerMiddlewareService {
constructor(private services: ServiceRepository, id: string) {
export const getParams = (dataExplorer: DataExplorer) => ({
...dataExplorerToListParams(dataExplorer),
- order: getOrder(dataExplorer),
+ order: getOrder<WorkflowResource>(dataExplorer),
filters: getFilters(dataExplorer)
});
return filters;
};
-export const getOrder = (dataExplorer: DataExplorer) => {
- const sortColumn = getSortColumn(dataExplorer);
- const order = new OrderBuilder<WorkflowResource>();
- if (sortColumn) {
- const sortDirection = sortColumn && sortColumn.sortDirection === SortDirection.ASC
- ? OrderDirection.ASC
- : OrderDirection.DESC;
- const columnName = sortColumn && sortColumn.name === WorkflowPanelColumnNames.NAME ? "name" : "modifiedAt";
- return order
- .addOrder(sortDirection, columnName)
- .getOrder();
- } else {
- return order.getOrder();
- }
-};
-
export const setItems = (listResults: ListResults<WorkflowResource>) =>
workflowPanelActions.SET_ITEMS({
...listResultsToDataExplorerItemsMeta(listResults),
snackbarActions.OPEN_SNACKBAR({
message: 'Could not fetch workflows.',
kind: SnackbarKind.ERROR
- });
\ No newline at end of file
+ });
import { ToggleFavoriteAction } from "../actions/favorite-action";
import { toggleFavorite } from "store/favorites/favorites-actions";
import {
- RenameIcon, ShareIcon, MoveToIcon, CopyIcon, DetailsIcon,
+ RenameIcon, ShareIcon, MoveToIcon, DetailsIcon,
RemoveIcon, ReRunProcessIcon, OutputIcon,
AdvancedIcon,
OpenIcon
import { openProcessUpdateDialog } from "store/processes/process-update-actions";
import { openCopyProcessDialog } from 'store/processes/process-copy-actions';
import { openSharingDialog } from "store/sharing-dialog/sharing-dialog-actions";
-import { openRemoveProcessDialog, reRunProcess } from "store/processes/processes-actions";
+import { openRemoveProcessDialog } from "store/processes/processes-actions";
import { toggleDetailsPanel } from 'store/details-panel/details-panel-action';
-import { snackbarActions, SnackbarKind } from "store/snackbar/snackbar-actions";
import { navigateToOutput } from "store/process-panel/process-panel-actions";
import { openAdvancedTabDialog } from "store/advanced-tab/advanced-tab";
import { TogglePublicFavoriteAction } from "../actions/public-favorite-action";
dispatch<any>(openInNewTabAction(resource));
}
},
- {
- icon: CopyIcon,
- name: "Copy to project",
- execute: (dispatch, resource) => {
- dispatch<any>(openCopyProcessDialog(resource));
- }
- },
{
icon: ReRunProcessIcon,
- name: "Re-run process",
+ name: "Copy and re-run process",
execute: (dispatch, resource) => {
- if(resource.workflowUuid) {
- dispatch<any>(reRunProcess(resource.uuid, resource.workflowUuid));
- } else {
- dispatch(snackbarActions.OPEN_SNACKBAR({ message: `You can't re-run this process`, hideDuration: 2000, kind: SnackbarKind.ERROR }));
- }
+ dispatch<any>(openCopyProcessDialog(resource));
}
},
{
const mapDispatchToProps = () => {
return (dispatch: Dispatch, { id, onRowClick, onRowDoubleClick, onContextMenu }: Props) => ({
- onSetColumns: (columns: DataColumns<any>) => {
+ onSetColumns: (columns: DataColumns<any, any>) => {
dispatch(dataExplorerActions.SET_COLUMNS({ id, columns }));
},
dispatch(dataExplorerActions.SET_EXPLORER_SEARCH_VALUE({ id, searchValue }));
},
- onColumnToggle: (column: DataColumn<any>) => {
+ onColumnToggle: (column: DataColumn<any, any>) => {
dispatch(dataExplorerActions.TOGGLE_COLUMN({ id, columnName: column.name }));
},
- onSortToggle: (column: DataColumn<any>) => {
+ onSortToggle: (column: DataColumn<any, any>) => {
dispatch(dataExplorerActions.TOGGLE_SORT({ id, columnName: column.name }));
},
- onFiltersChange: (filters: DataTableFilters, column: DataColumn<any>) => {
+ onFiltersChange: (filters: DataTableFilters, column: DataColumn<any, any>) => {
dispatch(dataExplorerActions.SET_FILTERS({ id, columnName: column.name, filters }));
},
};
export const DataExplorer = connect(mapStateToProps, mapDispatchToProps)(DataExplorerComponent);
-
--- /dev/null
+// Copyright (C) The Arvados Authors. All rights reserved.
+//
+// SPDX-License-Identifier: AGPL-3.0
+
+import React from "react";
+import { memoize } from 'lodash/fp';
+import { InjectedFormProps, Field } from 'redux-form';
+import { WithDialogProps } from 'store/dialog/with-dialog';
+import { FormDialog } from 'components/form-dialog/form-dialog';
+import { ProjectTreePickerField } from 'views-components/projects-tree-picker/tree-picker-field';
+import { COPY_NAME_VALIDATION, COPY_FILE_VALIDATION } from 'validators/validators';
+import { TextField } from "components/text-field/text-field";
+import { CopyFormDialogData } from 'store/copy-dialog/copy-dialog';
+import { PickerIdProp } from 'store/tree-picker/picker-id';
+
+type ProcessRerunFormDialogProps = WithDialogProps<string> & InjectedFormProps<CopyFormDialogData>;
+
+export const DialogProcessRerun = (props: ProcessRerunFormDialogProps & PickerIdProp) =>
+ <FormDialog
+ dialogTitle='Choose location for re-run'
+ formFields={CopyDialogFields(props.pickerId)}
+ submitLabel='Copy'
+ {...props}
+ />;
+
+const CopyDialogFields = memoize((pickerId: string) =>
+ () =>
+ <>
+ <Field
+ name='name'
+ component={TextField as any}
+ validate={COPY_NAME_VALIDATION}
+ label="Enter a new name for the copy" />
+ <Field
+ name="ownerUuid"
+ component={ProjectTreePickerField}
+ validate={COPY_FILE_VALIDATION}
+ pickerId={pickerId}/>
+ </>);
import { withDialog } from "store/dialog/with-dialog";
import { reduxForm } from 'redux-form';
import { PROCESS_COPY_FORM_NAME } from 'store/processes/process-copy-actions';
-import { DialogCopy } from "views-components/dialog-copy/dialog-copy";
+import { DialogProcessRerun } from "views-components/dialog-copy/dialog-process-rerun";
import { copyProcess } from 'store/workbench/workbench-actions';
import { CopyFormDialogData } from 'store/copy-dialog/copy-dialog';
import { pickerId } from "store/tree-picker/picker-id";
}
}),
pickerId(PROCESS_COPY_FORM_NAME),
-)(DialogCopy);
\ No newline at end of file
+)(DialogProcessRerun);
export const ProjectTreePickerField = (props: WrappedFieldProps & PickerIdProp) =>
<div style={{ display: 'flex', minHeight: 0, flexDirection: 'column' }}>
- <div style={{ flexBasis: '200px', flexShrink: 1, minHeight: 0, display: 'flex', flexDirection: 'column' }}>
+ <div style={{ flexBasis: '275px', flexShrink: 1, minHeight: 0, display: 'flex', flexDirection: 'column' }}>
<ProjectsTreePicker
pickerId={props.pickerId}
toggleItemActive={handleChange(props)}
export const CollectionTreePickerField = (props: WrappedFieldProps & PickerIdProp) =>
<div style={{ display: 'flex', minHeight: 0, flexDirection: 'column' }}>
- <div style={{ flexBasis: '200px', flexShrink: 1, minHeight: 0, display: 'flex', flexDirection: 'column' }}>
+ <div style={{ flexBasis: '275px', flexShrink: 1, minHeight: 0, display: 'flex', flexDirection: 'column' }}>
<ProjectsTreePicker
pickerId={props.pickerId}
toggleItemActive={handleChange(props)}
import { ListItemText, Typography } from '@material-ui/core';
import { noop } from 'lodash/fp';
import { GroupClass, GroupResource } from 'models/group';
-import { getUserDisplayName, UserResource } from 'models/user';
+import { getUserDetailsString, getUserDisplayName, UserResource } from 'models/user';
import { Resource, ResourceKind } from 'models/resource';
import { ListResults } from 'services/common-service/common-service';
export interface Participant {
name: string;
+ tooltip: string;
uuid: string;
}
suggestions: ParticipantResource[];
}
-const getDisplayName = (item: GroupResource | UserResource) => {
+const getDisplayName = (item: GroupResource | UserResource, detailed: boolean) => {
switch (item.kind) {
case ResourceKind.USER:
- return getUserDisplayName(item, true, true);
+ return getUserDisplayName(item, detailed, detailed);
+ case ResourceKind.GROUP:
+ return item.name + `(${`(${(item as Resource).uuid})`})`;
+ default:
+ return (item as Resource).uuid;
+ }
+};
+
+const getDisplayTooltip = (item: GroupResource | UserResource) => {
+ switch (item.kind) {
+ case ResourceKind.USER:
+ return getUserDetailsString(item);
case ResourceKind.GROUP:
return item.name + `(${`(${(item as Resource).uuid})`})`;
default:
onFocus={this.props.onFocus}
onBlur={this.props.onBlur}
renderChipValue={this.renderChipValue}
+ renderChipTooltip={this.renderChipTooltip}
renderSuggestion={this.renderSuggestion}
disabled={this.props.disabled}/>
);
return name || uuid;
}
+ renderChipTooltip(item: Participant) {
+ return item.tooltip;
+ }
+
renderSuggestion(item: ParticipantResource) {
return (
<ListItemText>
- <Typography noWrap>{getDisplayName(item)}</Typography>
+ <Typography noWrap>{getDisplayName(item, true)}</Typography>
</ListItemText>
);
}
this.setState({ value: '', suggestions: [] });
onCreate({
name: '',
+ tooltip: '',
uuid: this.state.value,
});
}
const { onSelect = noop } = this.props;
this.setState({ value: '', suggestions: [] });
onSelect({
- name: getDisplayName(selection),
+ name: getDisplayName(selection, false),
+ tooltip: getDisplayTooltip(selection),
uuid,
});
}
);
// then
- expect(wrapper.text()).toContain("davs://bobby@download.example.com/by_id/zzzzz-4zz18-b1f8tbldjrm8885");
+ expect(wrapper.text()).toContain("davs://bobby@download.example.com/c=zzzzz-4zz18-b1f8tbldjrm8885");
});
it('render win/mac tab', () => {
);
// then
- expect(wrapper.text()).toContain("https://download.example.com/by_id/zzzzz-4zz18-b1f8tbldjrm8885");
+ expect(wrapper.text()).toContain("https://download.example.com/c=zzzzz-4zz18-b1f8tbldjrm8885");
});
it('render s3 tab with federated token', () => {
<key>Port</key>
<string>${(cyberDavStr.split(':')[2] || '443').split('/')[0]}</string>
<key>Username</key>
- <string>${username}</string>${isValidIpAddress(collectionsUrl.replace('https://', ``).split(':')[0])?
+ <string>${username}</string>${isValidIpAddress(collectionsUrl.replace('https://', ``).split(':')[0]) ?
`
<key>Path</key>
<string>/c=${uuid}</string>` : ''}
} else {
winDav = new URL(props.data.downloadUrl);
cyberDav = new URL(props.data.downloadUrl);
- winDav.pathname = `/by_id/${props.data.uuid}`;
- cyberDav.pathname = `/by_id/${props.data.uuid}`;
+ winDav.pathname = `/c=${props.data.uuid}`;
+ cyberDav.pathname = `/c=${props.data.uuid}`;
}
cyberDav.username = props.data.username;
</DetailsAttribute>
<p>
- Note: This curl command downloads single files.
- Append the desired filename to the end of the URL.
+ Note: This curl command downloads single files.
+ Append the desired filename to the end of the URL.
</p>
</TabPanel>
color='primary'
onClick={props.closeDialog}>
Close
- </Button>
+ </Button>
</DialogActions>
</Dialog >;
import { openProcessContextMenu } from 'store/context-menu/context-menu-actions';
import { loadDetailsPanel } from 'store/details-panel/details-panel-action';
import { navigateTo } from 'store/navigation/navigation-action';
-import { ContainerRequestState } from "models/container-request";
+import { ContainerRequestResource, ContainerRequestState } from "models/container-request";
import { RootState } from 'store/store';
import { createTree } from 'models/tree';
import { getInitialProcessStatusFilters, getInitialProcessTypeFilters } from 'store/resource-type-filters/resource-type-filters';
type: ResourceKind | ContainerRequestState;
}
-export const allProcessesPanelColumns: DataColumns<string> = [
+export const allProcessesPanelColumns: DataColumns<string, ContainerRequestResource> = [
{
name: AllProcessesPanelColumnNames.NAME,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "name"},
filters: createTree(),
render: uuid => <ResourceName uuid={uuid} />
},
name: AllProcessesPanelColumnNames.CREATED_AT,
selected: true,
configurable: true,
- sortDirection: SortDirection.DESC,
+ sort: {direction: SortDirection.DESC, field: "createdAt"},
filters: createTree(),
render: uuid => <ResourceCreatedAtDate uuid={uuid} />
},
CommonUuid, TokenApiClientId, TokenApiToken, TokenCreatedByIpAddress, TokenDefaultOwnerUuid, TokenExpiresAt,
TokenLastUsedAt, TokenLastUsedByIpAddress, TokenScopes, TokenUserId
} from 'views-components/data-explorer/renderers';
+import { ApiClientAuthorization } from 'models/api-client-authorization';
type CssRules = 'root';
USER_ID = 'User ID'
}
-export const apiClientAuthorizationPanelColumns: DataColumns<string> = [
+export const apiClientAuthorizationPanelColumns: DataColumns<string, ApiClientAuthorization> = [
{
name: ApiClientAuthorizationPanelColumnNames.UUID,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "uuid"},
filters: createTree(),
render: uuid => <CommonUuid uuid={uuid} />
},
LAST_MODIFIED = "Last modified"
}
-export const collectionContentAddressPanelColumns: DataColumns<string> = [
+export const collectionContentAddressPanelColumns: DataColumns<string, CollectionResource> = [
{
name: CollectionContentAddressPanelColumnNames.COLLECTION_WITH_THIS_ADDRESS,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "uuid"},
filters: createTree(),
render: uuid => <ResourceName uuid={uuid} />
},
name: CollectionContentAddressPanelColumnNames.LAST_MODIFIED,
selected: true,
configurable: true,
- sortDirection: SortDirection.DESC,
+ sort: {direction: SortDirection.DESC, field: "modifiedAt"},
filters: createTree(),
render: uuid => <ResourceLastModifiedDate uuid={uuid} />
}
import { DataColumns } from 'components/data-table/data-table';
import { RouteComponentProps } from 'react-router';
import { DataTableFilterItem } from 'components/data-table-filters/data-table-filters';
-import { SortDirection } from 'components/data-table/data-column';
import { ResourceKind } from 'models/resource';
import { ArvadosTheme } from 'common/custom-theme';
import { FAVORITE_PANEL_ID } from "store/favorite-panel/favorite-panel-action";
type: ResourceKind | ContainerRequestState;
}
-export const favoritePanelColumns: DataColumns<string> = [
+export const favoritePanelColumns: DataColumns<string, GroupContentsResource> = [
{
name: FavoritePanelColumnNames.NAME,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
filters: createTree(),
render: uuid => <ResourceName uuid={uuid} />
},
name: FavoritePanelColumnNames.LAST_MODIFIED,
selected: true,
configurable: true,
- sortDirection: SortDirection.DESC,
filters: createTree(),
render: uuid => <ResourceLastModifiedDate uuid={uuid} />
}
import { getUserUuid } from 'common/getuser';
import { GroupResource, isBuiltinGroup } from 'models/group';
import { ArvadosTheme } from 'common/custom-theme';
+import { PermissionResource } from 'models/permission';
type CssRules = "root" | "content";
const MEMBERS_DEFAULT_MESSAGE = 'Members list is empty.';
const PERMISSIONS_DEFAULT_MESSAGE = 'Permissions list is empty.';
-export const groupDetailsMembersPanelColumns: DataColumns<string> = [
+export const groupDetailsMembersPanelColumns: DataColumns<string, PermissionResource> = [
{
name: GroupDetailsPanelMembersColumnNames.FULL_NAME,
selected: true,
},
];
-export const groupDetailsPermissionsPanelColumns: DataColumns<string> = [
+export const groupDetailsPermissionsPanelColumns: DataColumns<string, PermissionResource> = [
{
name: GroupDetailsPanelPermissionsColumnNames.NAME,
selected: true,
MEMBERS = "Members",
}
-export const groupsPanelColumns: DataColumns<string> = [
+export const groupsPanelColumns: DataColumns<string, GroupResource> = [
{
name: GroupsPanelColumnNames.GROUP,
selected: true,
configurable: true,
- sortDirection: SortDirection.ASC,
+ sort: {direction: SortDirection.ASC, field: "name"},
filters: createTree(),
render: uuid => <ResourceName uuid={uuid} />
},
from 'views-components/data-explorer/renderers';
import { StyleRulesCallback, WithStyles, withStyles } from '@material-ui/core';
import { ArvadosTheme } from 'common/custom-theme';
+import { LinkResource } from 'models/link';
type CssRules = "root";
UUID = "UUID"
}
-export const linkPanelColumns: DataColumns<string> = [
+export const linkPanelColumns: DataColumns<string, LinkResource> = [
{
name: LinkPanelColumnNames.NAME,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "name"},
filters: createTree(),
render: uuid => <ResourceLinkName uuid={uuid} />
},
CardContent,
Tooltip,
Typography,
+ Button,
} from '@material-ui/core';
import { ArvadosTheme } from 'common/custom-theme';
-import { CloseIcon, MoreOptionsIcon, ProcessIcon } from 'components/icon/icon';
-import { Process } from 'store/processes/process';
+import { CloseIcon, MoreOptionsIcon, ProcessIcon, StartIcon, StopIcon } from 'components/icon/icon';
+import { Process, isProcessRunnable, isProcessResumable, isProcessCancelable } from 'store/processes/process';
import { MPVPanelProps } from 'components/multi-panel-view/multi-panel-view';
import { ProcessDetailsAttributes } from './process-details-attributes';
import { ProcessStatus } from 'views-components/data-explorer/renderers';
-import { ContainerState } from 'models/container';
+import classNames from 'classnames';
-type CssRules = 'card' | 'content' | 'title' | 'header' | 'cancelButton' | 'avatar' | 'iconHeader';
+type CssRules = 'card' | 'content' | 'title' | 'header' | 'cancelButton' | 'avatar' | 'iconHeader' | 'actionButton';
const styles: StyleRulesCallback<CssRules> = (theme: ArvadosTheme) => ({
card: {
paddingTop: theme.spacing.unit * 0.5,
color: theme.customs.colors.green700,
},
+ actionButton: {
+ padding: "0px 5px 0 0",
+ marginRight: "5px",
+ fontSize: '0.78rem',
+ },
cancelButton: {
- paddingRight: theme.spacing.unit * 2,
- fontSize: '14px',
color: theme.customs.colors.red900,
- "&:hover": {
- cursor: 'pointer'
- }
+ borderColor: theme.customs.colors.red900,
+ '&:hover': {
+ borderColor: theme.customs.colors.red900,
+ },
+ '& svg': {
+ fontSize: '22px',
+ },
},
});
export interface ProcessDetailsCardDataProps {
process: Process;
cancelProcess: (uuid: string) => void;
+ startProcess: (uuid: string) => void;
+ resumeOnHoldWorkflow: (uuid: string) => void;
onContextMenu: (event: React.MouseEvent<HTMLElement>) => void;
}
type ProcessDetailsCardProps = ProcessDetailsCardDataProps & WithStyles<CssRules> & MPVPanelProps;
export const ProcessDetailsCard = withStyles(styles)(
- ({ cancelProcess, onContextMenu, classes, process, doHidePanel, panelName }: ProcessDetailsCardProps) => {
+ ({ cancelProcess, startProcess, resumeOnHoldWorkflow, onContextMenu, classes, process, doHidePanel, panelName }: ProcessDetailsCardProps) => {
+ let runAction: ((uuid: string) => void) | undefined = undefined;
+ if (isProcessRunnable(process)) {
+ runAction = startProcess;
+ } else if (isProcessResumable(process)) {
+ runAction = resumeOnHoldWorkflow;
+ }
+
return <Card className={classes.card}>
<CardHeader
className={classes.header}
</Tooltip>}
action={
<div>
- {process.container && process.container.state === ContainerState.RUNNING &&
- <span className={classes.cancelButton} onClick={() => cancelProcess(process.containerRequest.uuid)}>Cancel</span>}
+ {runAction !== undefined &&
+ <Button
+ data-cy="process-run-button"
+ variant="contained"
+ size="small"
+ color="primary"
+ className={classes.actionButton}
+ onClick={() => runAction && runAction(process.containerRequest.uuid)}>
+ <StartIcon />
+ Run
+ </Button>}
+ {isProcessCancelable(process) &&
+ <Button
+ data-cy="process-cancel-button"
+ variant="outlined"
+ size="small"
+ color="primary"
+ className={classNames(classes.actionButton, classes.cancelButton)}
+ onClick={() => cancelProcess(process.containerRequest.uuid)}>
+ <StopIcon />
+ Cancel
+ </Button>}
<ProcessStatus uuid={process.containerRequest.uuid} />
<Tooltip title="More options" disableFocusListener>
<IconButton
onContextMenu: (event: React.MouseEvent<HTMLElement>, process: Process) => void;
onToggle: (status: string) => void;
cancelProcess: (uuid: string) => void;
+ startProcess: (uuid: string) => void;
+ resumeOnHoldWorkflow: (uuid: string) => void;
onLogFilterChange: (filter: FilterOption) => void;
navigateToLog: (uuid: string) => void;
onCopyToClipboard: (uuid: string) => void;
process={process}
onContextMenu={event => props.onContextMenu(event, process)}
cancelProcess={props.cancelProcess}
+ startProcess={props.startProcess}
+ resumeOnHoldWorkflow={props.resumeOnHoldWorkflow}
/>
</MPVPanelContent>
<MPVPanelContent forwardProps xs="auto" data-cy="process-cmd">
updateOutputParams,
loadNodeJson
} from 'store/process-panel/process-panel-actions';
-import { cancelRunningWorkflow } from 'store/processes/processes-actions';
+import { cancelRunningWorkflow, resumeOnHoldWorkflow, startWorkflow } from 'store/processes/processes-actions';
import { navigateToLogCollection, setProcessLogsPanelFilter } from 'store/process-logs-panel/process-logs-panel-actions';
import { snackbarActions, SnackbarKind } from 'store/snackbar/snackbar-actions';
dispatch<any>(toggleProcessPanelFilter(status));
},
cancelProcess: (uuid) => dispatch<any>(cancelRunningWorkflow(uuid)),
+ startProcess: (uuid) => dispatch<any>(startWorkflow(uuid)),
+ resumeOnHoldWorkflow: (uuid) => dispatch<any>(resumeOnHoldWorkflow(uuid)),
onLogFilterChange: (filter) => dispatch(setProcessLogsPanelFilter(filter.value)),
navigateToLog: (uuid) => dispatch<any>(navigateToLogCollection(uuid)),
loadInputs: (containerRequest) => dispatch<any>(loadInputs(containerRequest)),
import { GroupClass, GroupResource } from 'models/group';
import { CollectionResource } from 'models/collection';
import { resourceIsFrozen } from 'common/frozen-resources';
+import { ProjectResource } from 'models/project';
type CssRules = 'root' | "button";
type: ResourceKind | ContainerRequestState;
}
-export const projectPanelColumns: DataColumns<string> = [
+export const projectPanelColumns: DataColumns<string, ProjectResource> = [
{
name: ProjectPanelColumnNames.NAME,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "name"},
filters: createTree(),
render: uuid => <ResourceName uuid={uuid} />
},
name: ProjectPanelColumnNames.CREATED_AT,
selected: false,
configurable: true,
- sortDirection: SortDirection.DESC,
+ sort: {direction: SortDirection.NONE, field: "createdAt"},
filters: createTree(),
render: uuid => <ResourceCreatedAtDate uuid={uuid} />
},
name: ProjectPanelColumnNames.LAST_MODIFIED,
selected: true,
configurable: true,
- sortDirection: SortDirection.DESC,
+ sort: {direction: SortDirection.DESC, field: "modifiedAt"},
filters: createTree(),
render: uuid => <ResourceLastModifiedDate uuid={uuid} />
},
name: ProjectPanelColumnNames.TRASH_AT,
selected: false,
configurable: true,
- sortDirection: SortDirection.DESC,
+ sort: {direction: SortDirection.NONE, field: "trashAt"},
filters: createTree(),
render: uuid => <ResourceTrashDate uuid={uuid} />
},
name: ProjectPanelColumnNames.DELETE_AT,
selected: false,
configurable: true,
- sortDirection: SortDirection.DESC,
+ sort: {direction: SortDirection.NONE, field: "deleteAt"},
filters: createTree(),
render: uuid => <ResourceDeleteDate uuid={uuid} />
},
import { DataColumns } from 'components/data-table/data-table';
import { RouteComponentProps } from 'react-router';
import { DataTableFilterItem } from 'components/data-table-filters/data-table-filters';
-import { SortDirection } from 'components/data-table/data-column';
import { ResourceKind } from 'models/resource';
import { ArvadosTheme } from 'common/custom-theme';
import {
type: ResourceKind | ContainerRequestState;
}
-export const publicFavoritePanelColumns: DataColumns<string> = [
+export const publicFavoritePanelColumns: DataColumns<string, GroupContentsResource> = [
{
name: PublicFavoritePanelColumnNames.NAME,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
filters: createTree(),
render: uuid => <ResourceName uuid={uuid} />
},
name: PublicFavoritePanelColumnNames.LAST_MODIFIED,
selected: true,
configurable: true,
- sortDirection: SortDirection.DESC,
filters: createTree(),
render: uuid => <ResourceLastModifiedDate uuid={uuid} />
}
const require: any = (value?: ProjectResource) => (value === undefined);
export interface ProjectInputProps {
+ required?: boolean;
input: ProjectCommandInputParameter;
options?: { showOnlyOwned: boolean, showOnlyWritable: boolean };
}
type DialogContentCssRules = 'root' | 'pickerWrapper';
-export const ProjectInput = ({ input, options }: ProjectInputProps) =>
+export const ProjectInput = ({ required, input, options }: ProjectInputProps) =>
<Field
name={input.id}
commandInput={input}
component={ProjectInputComponent as any}
format={format}
- validate={require}
+ validate={required ? require : undefined}
{...{
options
}} />;
label="Optional description of this workflow run" />
</Grid>
<Grid item xs={12} md={6}>
- <ProjectInput input={{
+ <ProjectInput required input={{
id: "owner",
label: "Project where the workflow will run"
} as ProjectCommandInputParameter}
import { ArvadosTheme } from 'common/custom-theme';
import { getSearchSessions } from 'store/search-bar/search-bar-actions';
import { camelCase } from 'lodash';
+import { GroupContentsResource } from 'services/groups-service/groups-service';
export enum SearchResultsPanelColumnNames {
CLUSTER = "Cluster",
type: ResourceKind | ContainerRequestState;
}
-export const searchResultsPanelColumns: DataColumns<string> = [
+export const searchResultsPanelColumns: DataColumns<string, GroupContentsResource> = [
{
name: SearchResultsPanelColumnNames.CLUSTER,
selected: true,
name: SearchResultsPanelColumnNames.NAME,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "name"},
filters: createTree(),
render: (uuid: string) => <ResourceName uuid={uuid} />
},
name: SearchResultsPanelColumnNames.LAST_MODIFIED,
selected: true,
configurable: true,
- sortDirection: SortDirection.DESC,
+ sort: {direction: SortDirection.DESC, field: "modifiedAt"},
filters: createTree(),
render: uuid => <ResourceLastModifiedDate uuid={uuid} />
}
import { MPVPanelProps } from 'components/multi-panel-view/multi-panel-view';
import { StyleRulesCallback, Typography, WithStyles, withStyles } from '@material-ui/core';
import { ArvadosTheme } from 'common/custom-theme';
+import { ProcessResource } from 'models/process';
type CssRules = 'iconHeader' | 'cardHeader';
type: ResourceKind | ContainerRequestState;
}
-export const subprocessPanelColumns: DataColumns<string> = [
+export const subprocessPanelColumns: DataColumns<string, ProcessResource> = [
{
name: SubprocessPanelColumnNames.NAME,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "name"},
filters: createTree(),
render: uuid => <ResourceName uuid={uuid} />
},
name: SubprocessPanelColumnNames.CREATED_AT,
selected: true,
configurable: true,
- sortDirection: SortDirection.DESC,
+ sort: {direction: SortDirection.DESC, field: "createdAt"},
filters: createTree(),
render: uuid => <ResourceCreatedAtDate uuid={uuid} />
},
import {
getTrashPanelTypeFilters
} from 'store/resource-type-filters/resource-type-filters';
+import { CollectionResource } from 'models/collection';
type CssRules = "toolbar" | "button" | "root";
</Tooltip>
);
-export const trashPanelColumns: DataColumns<string> = [
+export const trashPanelColumns: DataColumns<string, CollectionResource> = [
{
name: TrashPanelColumnNames.NAME,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "name"},
filters: createTree(),
render: uuid => <ResourceName uuid={uuid} />
},
name: TrashPanelColumnNames.TYPE,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
filters: getTrashPanelTypeFilters(),
render: uuid => <ResourceType uuid={uuid} />,
},
name: TrashPanelColumnNames.FILE_SIZE,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "fileSizeTotal"},
filters: createTree(),
render: uuid => <ResourceFileSize uuid={uuid} />
},
name: TrashPanelColumnNames.TRASHED_DATE,
selected: true,
configurable: true,
- sortDirection: SortDirection.DESC,
+ sort: {direction: SortDirection.DESC, field: "trashAt"},
filters: createTree(),
render: uuid => <ResourceTrashDate uuid={uuid} />
},
name: TrashPanelColumnNames.TO_BE_DELETED,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "deleteAt"},
filters: createTree(),
render: uuid => <ResourceDeleteDate uuid={uuid} />
},
name: '',
selected: true,
configurable: false,
- sortDirection: SortDirection.NONE,
filters: createTree(),
render: uuid => <ResourceRestore uuid={uuid} />
}
USERNAME = "Username"
}
-export const userPanelColumns: DataColumns<string> = [
+export const userPanelColumns: DataColumns<string, UserResource> = [
{
name: UserPanelColumnNames.NAME,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "firstName"},
filters: createTree(),
render: uuid => <UserResourceFullName uuid={uuid} link={true} />
},
name: UserPanelColumnNames.UUID,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "uuid"},
filters: createTree(),
render: uuid => <ResourceUuid uuid={uuid} />
},
name: UserPanelColumnNames.EMAIL,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "email"},
filters: createTree(),
render: uuid => <ResourceEmail uuid={uuid} />
},
name: UserPanelColumnNames.USERNAME,
selected: true,
configurable: false,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "username"},
filters: createTree(),
render: uuid => <ResourceUsername uuid={uuid} />
}
import { getResource, ResourcesState } from 'store/resources/resources';
import { DefaultView } from 'components/default-view/default-view';
import { CopyToClipboardSnackbar } from 'components/copy-to-clipboard-snackbar/copy-to-clipboard-snackbar';
+import { PermissionResource } from 'models/permission';
type CssRules = 'root' | 'emptyRoot' | 'gridItem' | 'label' | 'readOnlyValue' | 'title' | 'description' | 'actions' | 'content' | 'copyIcon';
}
-export const userProfileGroupsColumns: DataColumns<string> = [
+export const userProfileGroupsColumns: DataColumns<string, PermissionResource> = [
{
name: UserProfileGroupsColumnNames.NAME,
selected: true,
// }
// };
-export const workflowPanelColumns: DataColumns<string> = [
+export const workflowPanelColumns: DataColumns<string, WorkflowResource> = [
{
name: WorkflowPanelColumnNames.NAME,
selected: true,
configurable: true,
- sortDirection: SortDirection.ASC,
+ sort: {direction: SortDirection.ASC, field: "name"},
filters: createTree(),
render: (uuid: string) => <ResourceWorkflowName uuid={uuid} />
},
name: WorkflowPanelColumnNames.LAST_MODIFIED,
selected: true,
configurable: true,
- sortDirection: SortDirection.NONE,
+ sort: {direction: SortDirection.NONE, field: "modifiedAt"},
filters: createTree(),
render: (uuid: string) => <ResourceLastModifiedDate uuid={uuid} />
},
ForwardSlashNameSubstitution: /
ManagedProperties:
original_owner_uuid: {Function: original_owner, Protected: true}
- WebDAVCache:
- TTL: 0s
Login:
TrustPrivateNetworks: true
PAM:
projects / arvados-workbench2.git / commitdiff