Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging latest from Development #433

Merged
merged 4 commits into from
Oct 15, 2019
Merged

Merging latest from Development #433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
449cfdb
Adding sorting column in the query builder and results
ddelpiano Sep 11, 2019
26d5ec5
Merge branch 'development' of https://github.com/virtualflybrain/gepp…
ddelpiano Oct 8, 2019
5b9d8f6
added the sorting per column header based on multiple choices
ddelpiano Oct 9, 2019
1b9506a
Merge pull request #415 from VirtualFlyBrain/feature/376
Robbie1977 Oct 10, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions components/VFBMain.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ export default class VFBMain extends React.Component {
this.queryResultsColumns = require('./configuration/queryBuilderConfiguration').queryResultsColumns;
this.queryResultsControlConfig = require('./configuration/queryBuilderConfiguration').queryResultsControlConfig;
this.queryBuilderDatasourceConfig = require('./configuration/queryBuilderConfiguration').queryBuilderDatasourceConfig;
this.sorterColumns = require('./configuration/queryBuilderConfiguration').sorterColumns;

this.model = FlexLayout.Model.fromJson(modelJson)

Expand Down Expand Up @@ -1013,7 +1014,7 @@ export default class VFBMain extends React.Component {
}
if (latestSelection.getChildren().length > 0) {
// it's a wrapper object - if name is different from current selection set term info
if ((currentSelectionName != latestSelection.getName()) && (this.termInfoReference !== null) && (this.termInfoReference !== null)) {
if ((currentSelectionName != latestSelection.getName())) {
this.handlerInstanceUpdate(latestSelection[latestSelection.getId() + "_meta"]);
}
} else {
Expand Down Expand Up @@ -1219,7 +1220,8 @@ export default class VFBMain extends React.Component {
resultsColMeta={this.queryResultsColMeta}
resultsColumns={this.queryResultsColumns}
resultsControlConfig={this.queryResultsControlConfig}
datasourceConfig={this.queryBuilderDatasourceConfig} />
datasourceConfig={this.queryBuilderDatasourceConfig}
sorterColumns={this.sorterColumns} />

{this.htmlToolbarRender}
</div>
Expand Down
42 changes: 33 additions & 9 deletions components/configuration/queryBuilderConfiguration.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ var queryResultsColMeta = [
"order": 1,
"locked": false,
"visible": true,
"displayName": "ID",
"displayName": "ID"
},
{
"columnName": "name",
Expand All @@ -23,6 +23,7 @@ var queryResultsColMeta = [
"entityDelimiter": "----",
"displayName": "Name",
"cssClassName": "query-results-name-column",
"sortDirectionCycle": ['asc', 'desc', null]
},
{
"columnName": "expressed_in",
Expand All @@ -34,15 +35,17 @@ var queryResultsColMeta = [
"entityIndex": 1,
"entityDelimiter": "----",
"displayName": "Expressed_in",
"cssClassName": "query-results-expressed_in-column"
"cssClassName": "query-results-expressed_in-column",
"sortDirectionCycle": ['asc', 'desc', null]
},
{
"columnName": "description",
"order": 4,
"locked": false,
"visible": true,
"displayName": "Definition",
"cssClassName": "query-results-description-column"
"cssClassName": "query-results-description-column",
"sortDirectionCycle": ['asc', 'desc', null]
},
{
"columnName": "reference",
Expand All @@ -55,15 +58,17 @@ var queryResultsColMeta = [
"entityDelimiter": "----",
"stringDelimiter": ";",
"displayName": "Reference",
"cssClassName": "query-results-reference-column"
"cssClassName": "query-results-reference-column",
"sortDirectionCycle": ['asc', 'desc', null]
},
{
"columnName": "type",
"order": 6,
"locked": false,
"visible": true,
"displayName": "Type",
"cssClassName": "query-results-type-column"
"cssClassName": "query-results-type-column",
"sortDirectionCycle": ['asc', 'desc', null]
},
{
"columnName": "stage",
Expand All @@ -81,7 +86,8 @@ var queryResultsColMeta = [
"customComponent": QueryResultsControlsComponent,
"displayName": "Controls",
"actions": "",
"cssClassName": "query-results-controls-column"
"cssClassName": "query-results-controls-column",
"sortDirectionCycle": ['asc', 'desc', null]
},
{
"columnName": "images",
Expand All @@ -91,15 +97,17 @@ var queryResultsColMeta = [
"customComponent": SlideshowImageComponent,
"displayName": "Images",
"actions": "window.addVfbId('$entity$');",
"cssClassName": "query-results-images-column"
"cssClassName": "query-results-images-column",
"sortDirectionCycle": ['asc', 'desc', null]
},
{
"columnName": "score",
"order": 10,
"locked": false,
"visible": true,
"displayName": "Score",
"cssClassName": "query-results-score-column"
"cssClassName": "query-results-score-column",
"sortDirectionCycle": ['desc', 'asc', null]
}
];

Expand Down Expand Up @@ -267,9 +275,25 @@ var queryBuilderDatasourceConfig = {
}
};

var sorterColumns = [
{
column: "score",
order: "DESC"
},
{
column: "name",
order: "ASC"
},
{
column: "images",
order: "DESC"
},
];

module.exports = {
queryResultsColMeta,
queryResultsColumns,
queryResultsControlConfig,
queryBuilderDatasourceConfig
queryBuilderDatasourceConfig,
sorterColumns
};