Skip to content

Commit

Permalink
Merge from develop w/conflicts resolved
Browse files Browse the repository at this point in the history
  • Loading branch information
sychan committed Jun 13, 2018
2 parents f380dd1 + 3c43394 commit 72d46bb
Show file tree
Hide file tree
Showing 38 changed files with 3,444 additions and 953 deletions.
4 changes: 3 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,9 @@ install.log
.projectKnowledge
nbproject
static/dist
my_narrative_env/
my_narrative_venv/
narrative_venv/
new_narrative_env_2/

# From https://github.com/github/gitignore/blob/master/Python.gitignore

Expand Down
4 changes: 3 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
sudo: false
dist: trusty
sudo: required
language: python
python:
- "2.7"
services:
- docker
addons:
firefox: "latest"
chrome: stable
apt:
packages:
- oracle-java8-installer
Expand Down
11 changes: 11 additions & 0 deletions RELEASE_NOTES.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,17 @@ The Narrative Interface allows users to craft KBase Narratives using a combinati

This is built on the Jupyter Notebook v5.4.1 (more notes will follow).

### Version 3.8.0
- Generalized updates to support viewing the new version of the genome data type.
- SCT-500 - Fix DomainAnnotation viewer widget.
- SCT-380 - Updates to the RNA-Seq Volcano plot viewer.
- KBASE-1916 - Fix data type descriptions in the Example tab of the data slideout.
- SCT-923 - Improve Mycocosm public data search.
- SCT-930 - Add a "show report" button to objects in the data panel.
- Reformat and generalize the job logs for both the App Cell and standalone job log viewer widget.
- Migrate unit tests to use HeadlessChrome and (optionally) Firefox.
- Refactor Public Data in the Data Slideout to make use of the new KBase Search API.

### Version 3.7.2
- SCT-908 - Fix formatting issues with heatmaps.
- SCT-875 - Accept poorly formatted input data into the RNA-Seq data heatmap viewers.
Expand Down
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "kbase-narrative",
"version": "3.7.2",
"version": "3.8.0",
"homepage": "https://kbase.us",
"dependencies": {
"bluebird": "3.4.7",
Expand Down
3 changes: 2 additions & 1 deletion kbase-extension/static/kbase/config/feature-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,6 @@
"jgiPublicStaging": true,
"advanced": false,
"developer": false,
"lazyWidgetRender": true
"lazyWidgetRender": true,
"batchAppMode": false
}
12 changes: 11 additions & 1 deletion kbase-extension/static/kbase/css/appCell.css
Original file line number Diff line number Diff line change
Expand Up @@ -351,6 +351,17 @@ warning: orange
*/

.btn.batch-active {
box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.125);
-webkit-box-shadow: inset 0 3px 7px rgba(0, 0, 0, 0.125);
background-color: #EEE;
border-color: #adadad;
}

.btn.batch-active:hover {
background-color: #CCC;
}

.btn.kb-app-cell-btn {
color: rgb(33, 150, 243);
background-color: #FFF;
Expand Down Expand Up @@ -378,7 +389,6 @@ warning: orange
background-color: rgb(33, 150, 243);
}


/* Hovering over an active cell is different, it tries to make the tab look
disassociated but using a gray background so it doesnt look like an inactive
tab */
Expand Down
4 changes: 4 additions & 0 deletions kbase-extension/static/kbase/css/batchMode.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
.batch-mode-col{
padding: 5px 10px;
overflow: auto;
}
2 changes: 0 additions & 2 deletions kbase-extension/static/kbase/css/kbaseNarrative.css
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,6 @@
#kb-narr-name {
font-family: Oxygen;
font-weight: bold;
font-style: italic;
font-size: 130%;
padding-bottom: 7px;
white-space: nowrap;
Expand Down Expand Up @@ -3177,7 +3176,6 @@ button.kb-data-obj {
#kb-loading-blocker p {
text-align: center;
font-size: 24px;
font-family: Oxygen helvetica neue;
font-weight: bold;
}

Expand Down
22 changes: 22 additions & 0 deletions kbase-extension/static/kbase/js/common/pythonInterop.js
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,27 @@ define([], function () {
return '\n' + indent + args.join(',\n' + indent) + '\n';
}

function buildBatchAppRunner(cellId, runId, app, params) {
var paramSetName = 'batch_params',
pythonifiedParams = pythonifyValue(params, { autoIndent: true }),
positionalArgs = [
pythonifyValue(app.id),
paramSetName
],
namedArgs = objectToNamedArgs({
tag: app.tag,
version: app.version,
cell_id: cellId,
run_id: runId
});
positionalArgs = positionalArgs.concat(namedArgs);
return [
paramSetName + ' = ' + pythonifiedParams,
'from biokbase.narrative.jobs.appmanager import AppManager',
'AppManager().run_app_batch(' + buildNiceArgsList(positionalArgs) + ')'
].join('\n');
}

function buildAppRunner(cellId, runId, app, params) {
var positionalArgs = [
pythonifyValue(app.id),
Expand Down Expand Up @@ -217,6 +238,7 @@ define([], function () {
objectToNamedArgs: objectToNamedArgs,
pythonifyValue: pythonifyValue,
buildAppRunner: buildAppRunner,
buildBatchAppRunner: buildBatchAppRunner,
buildEditorRunner: buildEditorRunner,
buildViewRunner: buildViewRunner,
buildAdvancedViewRunner: buildAdvancedViewRunner,
Expand Down
Loading

0 comments on commit 72d46bb

Please sign in to comment.