+ {isPrivate ? (
+
{/* TODO: Implement v0.2
- {(this.props.strayTables || []).length > 0 ? (
+ {(strayTables || []).length > 0 ? (
) : null} */}
-
) : null}
-
(TODO: List of files)} TODO: Implement v0.2
- columns={tableListColumns}
- loading={this.props.isFetchingTables} />
-
- this.setState({tableSummaryModalVisible: false})} />
-
- this.handleAdditionSubmit(vs)}
- onCancel={() => this.handleAdditionCancel()} />
-
- this.handleTableDeletionSubmit()}
- onCancel={() => this.handleTableDeletionCancel()} />
- ;
- }
-}
+ (TODO: List of files)} TODO: Implement v0.2
+ columns={tableListColumns}
+ loading={isFetchingTables}
+ />
+
+ setTableSummaryModalVisible(false)}
+ />
+
+ setAdditionModalVisible(false)}
+ />
+
+ setDeletionModalVisible(false)}
+ />
+
+ );
+};
DatasetTables.propTypes = {
isPrivate: PropTypes.bool,
@@ -186,48 +193,6 @@ DatasetTables.propTypes = {
dataset: datasetPropTypesShape,
onTableIngest: PropTypes.func,
isFetchingTables: PropTypes.bool,
-
- chordServicesByArtifact: PropTypes.objectOf(PropTypes.shape({
- apt_dependencies: PropTypes.arrayOf(PropTypes.string),
- data_service: PropTypes.bool,
- manageable_tables: PropTypes.string,
- python_callable: PropTypes.string,
- python_module: PropTypes.string,
- repository: PropTypes.string,
- run_environment: PropTypes.objectOf(PropTypes.string),
- service_runnable: PropTypes.string,
- type: PropTypes.shape({
- artifact: PropTypes.string.isRequired,
- language: PropTypes.string,
- organization: PropTypes.string,
- }),
- wsgi: PropTypes.bool,
-
- post_stop_commands: PropTypes.arrayOf(PropTypes.string),
- post_start_commands: PropTypes.arrayOf(PropTypes.string),
- pre_install_commands: PropTypes.arrayOf(PropTypes.string),
- pre_start_commands: PropTypes.arrayOf(PropTypes.string),
- })),
- serviceInfoByArtifact: PropTypes.objectOf(serviceInfoPropTypesShape),
-
- addProjectTable: PropTypes.func,
- deleteProjectTable: PropTypes.func,
- fetchProjectsWithDatasetsAndTables: PropTypes.func,
- fetchTableSummaryIfPossible: PropTypes.func,
};
-const mapStateToProps = state => ({
- chordServicesByArtifact: state.chordServices.itemsByArtifact,
- serviceInfoByArtifact: state.services.itemsByArtifact,
-});
-
-const mapDispatchToProps = (dispatch, ownProps) => ({
- addProjectTable: (ds, s, dt, name) => dispatch(addProjectTable(ownProps.project, ds, s, dt, name)),
- deleteProjectTable: table => dispatch(deleteProjectTableIfPossible(ownProps.project, table)),
- ...bindActionCreators({
- fetchProjectsWithDatasetsAndTables,
- fetchTableSummaryIfPossible,
- }, dispatch),
-});
-
-export default connect(mapStateToProps, mapDispatchToProps)(DatasetTables);
+export default DatasetTables;
diff --git a/src/components/explorer/ExplorerDatasetSearch.js b/src/components/explorer/ExplorerDatasetSearch.js
index 67e570eac..ddfbc0a46 100644
--- a/src/components/explorer/ExplorerDatasetSearch.js
+++ b/src/components/explorer/ExplorerDatasetSearch.js
@@ -46,7 +46,7 @@ const SEARCH_RESULT_COLUMNS = [
dataIndex: "biosamples",
render: samples => <>
{samples.length} Sample{samples.length === 1 ? "" : "s"}{samples.length ? ": " : ""}
- {samples.map(b => b.id).join(", ")}
+ {samples.join(", ")}
,
sorter: (a, b) => a.biosamples.length - b.biosamples.length,
sortDirections: ["descend", "ascend", "descend"],
@@ -54,8 +54,8 @@ const SEARCH_RESULT_COLUMNS = [
{
title: "Experiments",
dataIndex: "experiments",
- render: experiments => <>{experiments.length} Experiment{experiments.length === 1 ? "" : "s"},
- sorter: (a, b) => a.experiments.length - b.experiments.length,
+ render: experiments => <>{experiments} Experiment{experiments === 1 ? "" : "s"},
+ sorter: (a, b) => a.experiments - b.experiments,
sortDirections: ["descend", "ascend", "descend"],
},
];
@@ -117,7 +117,7 @@ class ExplorerDatasetSearch extends Component {
? (this.state.currentPage * this.state.pageSize) - this.state.pageSize + 1
: 0;
- console.log("search results: " + this.props.searchResults);
+ console.log("search results: ", this.props.searchResults);
return <>
Explore Dataset {selectedDataset.title}
@@ -142,9 +142,9 @@ class ExplorerDatasetSearch extends Component {
onClick={() => this.setState({tracksModalVisible: true})}
disabled={true}>
Visualize Tracks */}
-
+ onClick={() => this.setState({summaryModalVisible: true})}>View Summary */}