[ARVADOS-WORKBENCH2] updated: 1.2.0-697-g3265bf8
Git user
git at public.curoverse.com
Mon Oct 22 07:00:43 EDT 2018
Summary of changes:
src/store/processes/process-input-actions.ts | 2 +-
.../process-input-dialog/process-input-dialog.tsx | 33 +++++++++++++---------
2 files changed, 21 insertions(+), 14 deletions(-)
via 3265bf8c1bb91e909e03cf27254e09a189723eeb (commit)
from 14703389175ba7248997d7286ad7b5f6aaacd211 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 3265bf8c1bb91e909e03cf27254e09a189723eeb
Author: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
Date: Mon Oct 22 13:00:33 2018 +0200
input-modal-mocked-values
Feature #14129
Arvados-DCO-1.1-Signed-off-by: Pawel Kowalczyk <pawel.kowalczyk at contractors.roche.com>
diff --git a/src/store/processes/process-input-actions.ts b/src/store/processes/process-input-actions.ts
index 79e2753..83d093a 100644
--- a/src/store/processes/process-input-actions.ts
+++ b/src/store/processes/process-input-actions.ts
@@ -16,7 +16,7 @@ export const openProcessInputDialog = (processUuid: string) =>
(dispatch: Dispatch<any>, getState: () => RootState) => {
const process = getProcess(processUuid)(getState().resources);
if (process) {
- const data: ProcessInputDialogData = {};
+ const data: ProcessInputDialogData = { process };
dispatch(dialogActions.OPEN_DIALOG({ id: PROCESS_INPUT_DIALOG_NAME, data }));
}
};
\ No newline at end of file
diff --git a/src/views-components/process-input-dialog/process-input-dialog.tsx b/src/views-components/process-input-dialog/process-input-dialog.tsx
index f9cf1d0..5dbb5db 100644
--- a/src/views-components/process-input-dialog/process-input-dialog.tsx
+++ b/src/views-components/process-input-dialog/process-input-dialog.tsx
@@ -8,34 +8,41 @@ import { WithDialogProps } from '~/store/dialog/with-dialog';
import { withDialog } from "~/store/dialog/with-dialog";
import { compose } from 'redux';
import { PROCESS_INPUT_DIALOG_NAME, ProcessInputDialogData } from '~/store/processes/process-input-actions';
+import * as classnames from 'classnames';
-type CssRules = 'multipleRow' | 'singleRow';
+type CssRules = 'multipleRow' | 'singleRow' | 'cellWidth' | 'dateCellWidth';
const styles: StyleRulesCallback<CssRules> = theme => ({
multipleRow: {
display: 'flex',
alignItems: 'center',
padding: theme.spacing.unit,
- paddingLeft: 0
+ paddingLeft: 0,
+ whiteSpace: 'nowrap'
},
singleRow: {
verticalAlign: 'baseline',
paddingTop: '14px',
+ },
+ cellWidth: {
+ minWidth: '250px',
+ },
+ dateCellWidth: {
+ minWidth: '100px',
}
});
interface ProcessInputTableData {
contentAdress: string;
collectionAdressess: string[];
- projectNames: string[];
+ projectNames: any[];
modificationDate: any[];
}
const rows: ProcessInputTableData[] = [
- { contentAdress: '84a2c033bdd8f1110fb965bcdbb3f296+1123', collectionAdressess: ['CCRF-CEM_FASTQ', 'bbb', 'ccc'], projectNames: ['WES CL000004_THP-1 Test', 'cos', 'Exomeseq Pipeline Saisanis'], modificationDate: ['7:30 PM 9/3/2017', '0:00 PM 2/3/2018', '10:25 PM 12/3/2019'] },
- { contentAdress: '1cfee2c94995ff557d742df10b431e1e+4739', collectionAdressess: ['aaa', 'Copy of dbsnp_138.hg19 + tbi', 'ccc'], projectNames: ['aa', 'WES CL000004_THP-1 Test', 'ccc'], modificationDate: ['7:30 PM 9/3/2017', '10:25 PM 12/3/2019', '10:25 PM 12/3/2019'] },
- { contentAdress: '6396d955250b3cd8451ed237de3333bc+121', collectionAdressess: ['aaa', 'bbb', 'ccc'], projectNames: ['Copy of config.txt, hg19.fasta.fai, targets_100bpflank.bed', 'bbb', 'WES CL000004_THP-1 Test'], modificationDate: ['7:30 PM 9/3/2017', '0:00 PM 2/3/2018', '10:25 PM 12/3/2019'] },
- { contentAdress: '84a2c033bdd8f1110fb965bcdbb3f296+1123', collectionAdressess: ['aaa', 'bbb', 'config.txt, hg19.fasta.fai, targets_100bpflank.bed'], projectNames: ['Exomeseq Pipeline Saisanis', 'bbb', 'ccc'], modificationDate: ['7:30 PM 9/3/2017', '0:00 PM 2/3/2018', '10:25 PM 12/3/2019'] }
+ { contentAdress: '84a2c033bdd8f1110fb965bcdbb3f296+1123', collectionAdressess: ['CCRF-CEM_FASTQ', 'bbb', 'ccc'], projectNames: ['WES CL000004_THP-1 Test', 'cos', 'Exomeseq Pipeline Saisanis'], modificationDate: [null, '0:00 PM 2/3/2018', '10:25 PM 12/3/2019'] },
+ { contentAdress: '1cfee2c94995ff557d742df10b431e1e+4739', collectionAdressess: ['aaa', 'Copy of dbsnp_138.hg19 + tbi', 'ccc'], projectNames: ['aa', undefined, 'ccc'], modificationDate: ['7:30 PM 9/3/2017', '10:25 PM 12/3/2019', '10:25 PM 12/3/2019'] },
+ { contentAdress: '6396d955250b3cd8451ed237de3333bc+121', collectionAdressess: ['aaa', 'bbb', 'ccc'], projectNames: ['Copy of config.txt, hg19.fasta.fai, targets_100bpflank.bed', 'bbb', 'WES CL000004_THP-1 Test'], modificationDate: ['7:30 PM 9/3/2017', undefined, '10:25 PM 12/3/2019'] }
];
export const ProcessInputDialog = compose(
@@ -64,9 +71,9 @@ export const ProcessInputDialog = compose(
return (
<TableRow key={index}>
<TableCell className={props.classes.singleRow}>{row.contentAdress}</TableCell>
- {renderMultipleRowsInCell(row.collectionAdressess, props.classes)}
- {renderMultipleRowsInCell(row.projectNames, props.classes)}
- {renderMultipleRowsInCell(row.modificationDate, props.classes)}
+ {renderMultipleRowsInCell(row.collectionAdressess, classnames(props.classes.multipleRow, props.classes.cellWidth))}
+ {renderMultipleRowsInCell(row.projectNames, classnames(props.classes.multipleRow, props.classes.cellWidth))}
+ {renderMultipleRowsInCell(row.modificationDate, classnames(props.classes.multipleRow, props.classes.dateCellWidth))}
</TableRow>
);
})}
@@ -84,11 +91,11 @@ export const ProcessInputDialog = compose(
</Dialog>
);
-const renderMultipleRowsInCell = (data: any[], classes: any) => {
+const renderMultipleRowsInCell = (data: any[], classNames: string) => {
return <TableCell>{data.map((it, index) => {
return (
- <span key={index} className={classes.multipleRow}>
- {it}
+ <span key={index} className={classNames}>
+ {it || "-"}
</span>
);
})}
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list