Skip to content

Commit

Permalink
Merge pull request #2295 from kbase/SCT-3062-search-by-lineage
Browse files Browse the repository at this point in the history
Implements SCT-3062: Search by lineage for the RefSeq data slideout tool
  • Loading branch information
briehl committed May 26, 2021
2 parents 9b438eb + 1217514 commit e38ffd5
Show file tree
Hide file tree
Showing 10 changed files with 649 additions and 537 deletions.
4 changes: 4 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,10 @@ The Narrative Interface allows users to craft KBase Narratives using a combinati

This is built on the Jupyter Notebook v6.0.2 (more notes will follow).

### Unreleased

- SCT-3602 - refseq public data tool now searches by lineage as well; for all public data tools: automatically focus the search input; fix paging bug

### Version 4.4.0
- No ticket: boatloads of code cleanup and fixes to the unit and internal testing
- PTV-1635: fix bug in data slideout tab selection
Expand Down
3 changes: 2 additions & 1 deletion docs/testing/integration-testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
- `source ./venv/bin/activate`
- build the narrative locally
- `make install`
- obtain a kbase login (or dev) CI token
- obtain a KBase login (or dev) CI token
- it must be either for the "narrativetest" account, or account which has view access to the same narratives as narrativetest (e.g. kbaseuitest).
- log into `https://ci.kbase.us`
- in the browser console issue
- `document.cookie`
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,7 @@ define([
'select2',
'bootstrap',
'css!font-awesome',
], (
Promise,
$,
html,
utils,
Data,
Events,
Runtime,
UI,
Validation,
TimeFormat,
WidgetCommon,
) => {
], (Promise, $, html, utils, Data, Events, Runtime, UI, Validation, TimeFormat, WidgetCommon) => {
'use strict';

// Constants
Expand All @@ -50,9 +38,7 @@ define([
availableValuesMap: {},
value: undefined,
};
let parent,
container,
ui;
let parent, container, ui;

// TODO: getting rid of blacklist temporarily until we work out how to state-ify everything by reference.
model.blacklistValues = []; //config.blacklist || [];
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -277,7 +277,10 @@ define([
height: this.mainListPanelHeight,
})
.on('scroll', (event) => {
if ($(event.target).scrollTop() + $(event.target).innerHeight() >= event.target.scrollHeight) {
if (
$(event.target).scrollTop() + $(event.target).innerHeight() >=
event.target.scrollHeight
) {
this.renderMore();
}
});
Expand Down Expand Up @@ -411,7 +414,7 @@ define([
}
})
.catch((error) => {
console.trace('dumping stacktrace!')
console.trace('dumping stacktrace!');
console.error('DataList: when checking for updates:', error);
if (showError) {
this.showBlockingError(
Expand Down

0 comments on commit e38ffd5

Please sign in to comment.