Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
149 commits
Select commit Hold shift + click to select a range
b00eb95
add base action script
briehl May 21, 2020
4b6e867
add dependency install step
briehl May 21, 2020
ed8ff0d
tweak deps
briehl May 21, 2020
4236a93
tweak deps some more, add conda
briehl May 21, 2020
5071370
add node env
briehl May 21, 2020
02cde11
reverse dep order
briehl May 21, 2020
9e19c41
coax bower into installing
briehl May 21, 2020
e047e09
js deps work, on to conda
briehl May 21, 2020
25baab6
another conda test
briehl May 21, 2020
1f46b75
try miniconda action
briehl May 21, 2020
7fd8a97
run the narrative installer
briehl May 21, 2020
ec55cd3
add make test to the runner...
briehl May 21, 2020
31de8b3
set up coveralls
briehl May 22, 2020
f5e5389
set up ruby correctly for coveralls-lcov converter
briehl May 22, 2020
9ec66a7
correct the formatting
briehl May 22, 2020
87a219d
yaml spacing
briehl May 22, 2020
2cd5d20
try with "parallel" coveralls (not really parallel, but w/e)
briehl May 22, 2020
d92d0f4
try with codecov
briehl May 22, 2020
9817615
don't use codecov secret
briehl May 22, 2020
bf34d8e
update test yaml
briehl May 22, 2020
263dfba
add build image script (first part)
briehl May 22, 2020
6894538
fix date env var
briehl May 22, 2020
b697157
maybe it's the single quotes?
briehl May 22, 2020
c3d13fe
missed a semicolon
briehl May 22, 2020
572556c
Changes plus test skeleton
eamahanna Oct 2, 2020
6ad4d87
Fix and add tests
eamahanna Oct 3, 2020
dec2b26
Fix label
eamahanna Oct 3, 2020
f21d75b
Fix karma conf
eamahanna Oct 3, 2020
abfba89
Fix codacy issues
eamahanna Oct 3, 2020
d352c96
Minor change to trigger build.
sychan Oct 5, 2020
d00df38
Test for PR action
sychan Oct 5, 2020
6b45b69
beef up tests
eamahanna Oct 5, 2020
dcce8b9
Update button colors
eamahanna Oct 5, 2020
169bee2
Merge pull request #1842 from kbase/trusstest
sychan Oct 6, 2020
c3b158a
Adds staging area text, refresh button, fixes trashcan moving around
Oct 6, 2020
259680c
Start tests
eamahanna Oct 6, 2020
0fe3019
Merge branch 'develop' into DATAUP-197-app-cell-cancel
eamahanna Oct 6, 2020
38592c4
Fix perms on script
sychan Oct 6, 2020
f094fda
Move style into css for breadcrumb
Oct 6, 2020
f7266be
remove comment
Oct 6, 2020
a248bf8
Matching font family generic default
Oct 6, 2020
9063e03
Matching font family generic default
Oct 6, 2020
c7c6fb9
Matching font family generic default
Oct 6, 2020
218e3ce
Merge pull request #1844 from kbase/trusstest
sychan Oct 6, 2020
b50aa0f
get a test appCell working
eamahanna Oct 6, 2020
e6914e8
get a test appCell working
eamahanna Oct 6, 2020
2e5efa0
ran pycharm linter
Oct 7, 2020
0541cbf
Update to see if we can get a PR image now that the latest image builds
sychan Oct 7, 2020
98c5897
Merge branch 'develop' into DATAUP-178-change-data-button-color
eamahanna Oct 7, 2020
649bd80
make codacy happy
eamahanna Oct 7, 2020
46059f3
Moves button. Comments out old section, not sure what that space was for
Oct 7, 2020
fca5adb
Fixes order of buttons
Oct 7, 2020
3cb903e
Merge pull request #1850 from kbase/DATAUP-178-change-data-button-color
eamahanna Oct 7, 2020
5ddbbf9
Add working tests
eamahanna Oct 8, 2020
5186db7
Add working tests
eamahanna Oct 8, 2020
94e5089
make folder names clickable
briehl Oct 8, 2020
c05d31d
convert some inline styles to classes
briehl Oct 8, 2020
bc8cb73
Update tests
eamahanna Oct 8, 2020
7a607f2
Cleanup comments
eamahanna Oct 8, 2020
6050bb2
revert config.json
eamahanna Oct 8, 2020
1173b53
revert karma conf
eamahanna Oct 8, 2020
70f6e7e
Merge branch 'develop' into DATAUP-197-app-cell-cancel
eamahanna Oct 8, 2020
05baf10
center icon
eamahanna Oct 8, 2020
f32c302
make codacy happy
eamahanna Oct 8, 2020
7a99536
make codacy happy
eamahanna Oct 8, 2020
83e57f7
oops
eamahanna Oct 8, 2020
2f927b1
Merge pull request #1854 from kbase/DATAUP-178-change-data-button-color
eamahanna Oct 8, 2020
47be990
add tests for clicking folders and names
briehl Oct 8, 2020
5e920b4
Merge pull request #1853 from kbase/DATAUP-197-app-cell-cancel
eamahanna Oct 8, 2020
b903878
wdio proof of concept
briehl Oct 9, 2020
f866022
add integration test readme
briehl Oct 9, 2020
7b35609
Merge branch 'truss' into trusstest
sychan Oct 9, 2020
836b6ad
NOP change to trigger rebuild
sychan Oct 9, 2020
67c45d7
Merge pull request #1845 from kbase/trusstest
sychan Oct 9, 2020
18aba51
merge conflicts
Oct 9, 2020
3c223fc
update from running black
briehl Oct 9, 2020
446bf12
Merge pull request #1843 from kbase/DATAUP-188/228
bio-boris Oct 12, 2020
7b5589e
Merge branch 'develop' into trusstest
sychan Oct 12, 2020
1544506
Merge pull request #1860 from kbase/trusstest
sychan Oct 12, 2020
af20228
Merge branch 'truss' into DATAUP-204-clickable-folders
eamahanna Oct 12, 2020
5bff3c2
Merge pull request #1851 from kbase/DATAUP-204-clickable-folders
eamahanna Oct 12, 2020
306e1d6
fix test path
eamahanna Oct 14, 2020
77d4d10
have travis build on truss branch
eamahanna Oct 14, 2020
20802b5
Merge pull request #1864 from kbase/fix-tests
eamahanna Oct 14, 2020
1ded4e5
Added margin, letter spacing, and button states
Oct 14, 2020
f7894f9
Merge branch 'truss' into dataup-188-228
Oct 14, 2020
e02f78a
Merge branch 'truss' into dataup-188-228
bio-boris Oct 14, 2020
9d03053
remove whitespace
Oct 14, 2020
9c8f56b
Merge branch 'dataup-188-228' of https://github.com/kbase/narrative i…
Oct 14, 2020
0bd8a45
move border radius to class base
Oct 14, 2020
0294cb5
Merge pull request #1865 from kbase/dataup-188-228
bio-boris Oct 14, 2020
ceb1c0b
Dataup 187 move globus upload below drag and drop (#1855)
eamahanna Oct 14, 2020
35ea951
Add data-test attribute to test order of cell buttons
Oct 15, 2020
cc0c0dd
Added voiceover labels
Oct 15, 2020
d78cc01
DATAUP-204 (#1866) fix: show zip icon in staging area
eamahanna Oct 15, 2020
60fbb6f
Merge pull request #1847 from kbase/DATAUP-202
bio-boris Oct 15, 2020
b53fe68
removing <a> reference so jquery can find the right element
leia-sefkin Oct 15, 2020
722eb05
should actually (hopefully) fix it, renaming class on <a> target so t…
leia-sefkin Oct 15, 2020
160026c
Merge pull request #1868 from kbase/DATAUP187-move-globus-bug-fix
bio-boris Oct 15, 2020
074f7ae
Move css out of `nbextensions` dir and consolidate in `kbase-extensio…
ialarmedalien Oct 15, 2020
6486a6a
Fixing css errors in kbase-extension/static/kbase/css/ files bootstra…
ialarmedalien Oct 15, 2020
6c45a0b
Merge pull request #1867 from kbase/DATAUP-246_css_to_sass-css_cleanup
ialarmedalien Oct 16, 2020
64af9cf
Revert "DATAUP-246: css to sass: css cleanup, part 1"
ialarmedalien Oct 16, 2020
a0b2820
Merge pull request #1869 from kbase/revert-1867-DATAUP-246_css_to_sas…
bio-boris Oct 16, 2020
125e272
Resize refresh button
Oct 16, 2020
01d935f
Merge pull request #1871 from kbase/dataup-188-228
ialarmedalien Oct 16, 2020
e9ee57c
DATAUP-246: whitespace changes and reformatting of css files
ialarmedalien Oct 16, 2020
f7a3fdc
Update kbaseNarrative.css
bio-boris Oct 17, 2020
c3ce86f
Merge pull request #1875 from kbase/dataup-188-228
bio-boris Oct 17, 2020
2456e40
Merge branch 'truss' into DATAUP-246_css_to_sass-whitespace
bio-boris Oct 17, 2020
0c43d4e
CSS cleanup:
ialarmedalien Oct 19, 2020
ec3c4af
Merge pull request #1872 from kbase/DATAUP-246_css_to_sass-whitespace
ialarmedalien Oct 20, 2020
0047567
Removing unneeded `html` stanza
ialarmedalien Oct 20, 2020
e4125e1
Dataup 213 clear errors from staging (#1870)
eamahanna Oct 21, 2020
caae2e1
add hover pointer
eamahanna Oct 21, 2020
a367654
Merge pull request #1881 from kbase/DATAUP-213-review-edits
bio-boris Oct 21, 2020
cc1a37d
add integration test framework stuff
briehl Oct 21, 2020
7b97c27
Merge branch 'develop' into DATAUP-233-wdio-travis
briehl Oct 21, 2020
86f459d
DATAUP-187 Review edits (#1880)
eamahanna Oct 22, 2020
2ae265e
switch config back to dev
briehl Oct 22, 2020
34c336f
Moving css files out of nbextensions/ and into the css directory, pen…
ialarmedalien Oct 22, 2020
b7b74a9
remove whitespace
briehl Oct 22, 2020
57b2cc2
Fixing css horror in editorCell.css
ialarmedalien Oct 22, 2020
b9ffff1
add secure token variable
briehl Oct 22, 2020
beef10e
Merge pull request #1879 from kbase/DATAUP-246_css_to_sass_css_clean_up
briehl Oct 22, 2020
590099d
make chrome headless with no sandbox
briehl Oct 22, 2020
4e58f9d
fix auto-refresh on completed upload
briehl Oct 22, 2020
6c4f0c4
add staging data tab tests
briehl Oct 23, 2020
0322e93
Merge pull request #1882 from kbase/DATAUP-246_css_to_sass-cell_type_css
ialarmedalien Oct 23, 2020
3a89179
var -> const
briehl Oct 23, 2020
f41024d
restore karma.conf to run all frontend tests...
briehl Oct 23, 2020
be56aab
Remove inline styles from error pages and create new css file
ialarmedalien Oct 23, 2020
e3e0897
Fixing the placement of the add new blah blah blah buttons
ialarmedalien Oct 23, 2020
3f860d0
Merge branch 'truss' into DATAUP-266-staging-refresh
briehl Oct 23, 2020
318407c
move inline styles to class
briehl Oct 23, 2020
f0490ff
rename to BEM style
briehl Oct 23, 2020
650f301
Merge pull request #1888 from kbase/DATAUP-269_fix_add_new_cell_buttons
ialarmedalien Oct 23, 2020
4edc283
let => const in errorMain.js
ialarmedalien Oct 23, 2020
742c3be
Merge pull request #1887 from kbase/DATAUP-246_css_to_css-error_pages
ialarmedalien Oct 23, 2020
a30f5aa
Merge pull request #1886 from kbase/DATAUP-266-staging-refresh
briehl Oct 23, 2020
9376388
better tweak for starting int tests
briehl Oct 26, 2020
3598714
remove build images action
briehl Oct 26, 2020
bca0491
Merge branch 'develop' into github-action
briehl Oct 26, 2020
ab05a1f
Merge branch 'truss' into DATAUP-233-wdio-travis
briehl Oct 27, 2020
5f6e78c
Merge branch 'DATAUP-233-wdio-travis' into github-action
briehl Oct 27, 2020
7f8bc25
make last staging helper test mock
briehl Oct 27, 2020
ebfa86e
Merge branch 'develop' into github-action
briehl Oct 27, 2020
478f2b7
add types/puppeteer
briehl Oct 27, 2020
6f0b5c0
change to KBASE_TEST_TOKEN in int tests
briehl Oct 27, 2020
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
58 changes: 58 additions & 0 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
# This is a basic workflow to help you get started with Actions

name: CI-testing

# Controls when the action will run. Triggers the workflow on push or pull request
# events
on:
push:
branches: [ develop, master ]
pull_request:
branches: [ develop, master ]

# A workflow run is made up of one or more jobs that can run sequentially or in parallel
jobs:
build-and-test:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- uses: goanpeca/setup-miniconda@v1
with:
miniconda-version: 'latest'
activate-environment: test-environment
python-version: 3.6.10
auto-activate-base: false
auto-update-conda: true
condarc-file: test/condarc.yml

- name: Use Node JS 10.x
uses: actions/setup-node@v1
with:
node-version: 10.x

- name: Install JS dependencies
run: |
npm ci
npm install bower
./node_modules/bower/bin/bower install

- name: Install Narrative Application
shell: bash -l {0}
run: |
bash ./scripts/install_narrative.sh
grunt minify
sed <src/config.json.templ >src/config.json "s/{{ .Env.CONFIG_ENV }}/dev/"
sed -i 's/{{ if ne .Env.CONFIG_ENV "prod" }} true {{- else }} false {{- end }}/true/' src/config.json
jupyter notebook --version

- name: Run Narrative Test Suite
shell: bash -l {0}
run: make test

- name: Send to Codecov
uses: codecov/codecov-action@v1
with:
file: |
./coverage.xml
./js-coverage/lcov/lcov.info
fail_ci_if_error: true
2 changes: 2 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ env:
- TRAVIS_NODE_VERSION="10.10.0"
- secure: "JPdkdywgQbUUixuDuATMXZHWpWImziRoGKd1tCjYd3+0lamLBlldmjhsZ+Bp7ZabKg2ExQZareGDp34cJdOwWBGb2gg0/emjy4UkWkbDH28zyoWNK1SFp6OTY8AeY/icPXKw3MBgKoXG+hemfcxhYc8rUNgUt7V2fA0JSAkCi4w="
- secure: "BrGlbfGLxZYCynh7LeIFyQeiTx4YX6fdMYK2UceVLoAFjOml9mvtJY5i4Oafc2iBDPQ0wAP/eIzZOTcddwc+12o1S0EAq3zZb5z+MOwRKjsiC+BGUXNzAGLaeJqFTC5Sn+vvqsaDGaR3jrdQ8APUL7XapuLUAkof7vqc1SPsn3I="
- secure: "YH4s6huZYW34XFlKDAg7yC8VGUjIiird3gDKOmHyhlPVoQa75tll3iqVBBxNFcj+5CfzlCU+ZZK/JTvRoLJ7+QBPrRm7eZ6+s44JaJK+eAz12AJKdEfZyp+blMQ26Y8uOz5AZQhnRsoYfbqDK3p/T8FW1MAKdvE+8nHDCdAh26k="

cache:
directories:
Expand All @@ -25,6 +26,7 @@ branches:
- develop
- master
- py3-update
- truss

before_install:
- gem install coveralls-lcov
Expand Down
16 changes: 8 additions & 8 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ build-travis-narrative:
sed -i 's/{{ if ne .Env.CONFIG_ENV "prod" }} true {{- else }} false {{- end }}/true/' src/config.json && \
jupyter notebook --version

test: test-backend test-frontend-unit test-frontend-e2e
test: test-backend test-frontend
@echo "done running backend and frontend test scripts"

# test-backend should use nose, or the like, to test our
Expand All @@ -49,20 +49,20 @@ test-backend:
sh $(BACKEND_TEST_SCRIPT)
@echo "done"

test-frontend:
TOKEN="$(token)" python test/unit/run_tests.py -u -i

# test-frontend-unit should use karma and jasmine to test
# each of the Javascript components of the Narrative.
# This is achieved through the grunt test invocation
test-frontend-unit:
@echo "running frontend unit tests"
python test/unit/run_tests.py
python test/unit/run_tests.py -u
@echo "done"

# test-frontend-e2e should use Selenium to perform an end-
# to-end test of the front end components, with a running
# Narrative system.
test-frontend-e2e:
@echo "running frontend end-to-end tests"
cd $(FRONTEND_TEST_DIR)
test-integration:
@echo "running integration tests"
TOKEN="$(token)" python test/unit/run_tests.py -i
@echo "done"

build-docs:
Expand Down
3 changes: 2 additions & 1 deletion docs/deploy_narrative.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,8 @@ The [next](https://next.kbase.us), [appdev](https://appdev.kbase.us), and [prod]

### Deploying Narrative-Refactor

The [narrative-refactor](https://narrative-refactor.kbase.us) image is built against the "truss" branch of the repo and is called narrative-truss:pr### when still in a PR state or narrative-truss:latest after merge
The [narrative-refactor](https://narrative-refactor.kbase.us) image is automatically built against the "truss" branch of the repo and is called narrative-truss:pr### when still in a PR state or narrative-truss:latest after merge. The images can be found here: https://github.com/orgs/kbase/packages


#### Create Release Image

Expand Down
37 changes: 35 additions & 2 deletions docs/testing.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ Then, simply run (from the narrative root directory) `make test`.
This calls a few subcommands, and those can be run independently for specific uses:

- `make test-frontend-unit` will run only the unit tests on the frontend (i.e. those with the Karma runner)
- `make test-integration` will run the frontend integration tests that make use of webdriver.io to simulate the browser on a locally instantiated Narrative, but running against live KBase services.
- `make test-frontend-e2e` will run only the frontend tests that make use of Selenium to simulate a browser on the real Narrative site.
- `make test-backend` will run only the backend Python tests.

Expand All @@ -67,7 +68,18 @@ This just needs the path to the token file (with pre-pended slash), such as `"/t

### Testing with Travis-CI and Coveralls

These tests are run (without credentials) automatically on a pull request to the Narrative Github repo. These are currently run through [Travis-CI](https://travis-ci.org/) and the coverage reported with [Coveralls](https://coveralls.io/). There should be nothing you need to do to make this work.
These tests are run automatically on a pull request to the Narrative Github repo. These are currently run through [Travis-CI](https://travis-ci.org/) and the coverage reported with [Coveralls](https://coveralls.io/).

Unit tests are automatically run without credentials, skipping various tests that are, really, more like integration tests.

The integration tests that run with webdriver.io do require an authentication token. This is embedded in the `.travis.yml` file as a secure environment variable - the third (and last) one. That token will expire every 90 days and will need to be replaced. A new one can be generated from the KBase CI Account page with a valid developer account. This token can then be encrypted with the following commands. Note that Ruby is required.

```
gem install travis # if not already installed
travis encrypt KBASE_TOKEN=my_generated_token
```
This will emit a string that looks like `secure: "SDFSDFSDFSDF="` Use this string to replace the out of date token. It will become available in the test environment as `KBASE_TOKEN`, which is the variable that the `wdio.conf.js` file looks for.


### Adding Your Own Tests

Expand All @@ -81,6 +93,27 @@ There are some service client Mocks available using the `mock` library. Check ou

JavaScript tests follow the common Test Spec idiom. Here, we create a new spec file for each JavaScript module. These all live under `test/unit/spec` in roughly the same subdirectory as found under `kbase-extension/static/kbase/js`. There's an example spec in `test/unit/specTemplate.js` - you can just copy this to a new module, and modify to fit your needs.

***Front End Integration***

Integration tests are done using [webdriver.io](https://webdriver.io). The test scripts are written in Javascript and all resemble the common Mocha style. These tests are all under `test/integration/spec`. It's helpful for each of these files to include the `wdioUtils.js` module in `test/integration`. For each view that requires authentication (i.e. most of them), be sure to start your test with the async `login` function provided by that module. An example spec file might look like:

```javascript
const Utils = require('../wdioUtils');

describe('Simple test runner', () => {
beforeEach(async () => await Utils.login());

it('opens a narrative', async () => {
await browser.url(Utils.makeURL('narrative/31932'));
const loadingBlocker = await $('#kb-loading-blocker');
const loadingText = await loadingBlocker.getText();
expect(loadingText).toContain('Connecting to KBase services...');
});
});
```

When running these locally, these expect that there's a valid authentication token in

### Manual Testing and Debugging

***Python***
Expand All @@ -94,7 +127,7 @@ log.info("Your Logs Go Here")

***JavaScript***

It can be useful to immediately see your changes in the narrative. For javascript changes, you will just have to reload the page. You can print messages to the console with `console.log`
It can be useful to immediately see your changes in the narrative. For javascript changes, you will just have to reload the page. You can print messages to the console with `console.log`.

To debug using the Karma Debugger complete the following steps:

Expand Down
19 changes: 7 additions & 12 deletions kbase-extension/kbase_templates/403.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@

{% block stylesheet %}
{{super()}}
<style type="text/css">
/* disable initial hide */
div#header, div#site {
display: block;
}
</style>
<link rel="stylesheet" href="{{ static_url("kbase/css/errorPage.css") }}" type="text/css" />
{% endblock %}

{% block loading_message %}
Expand All @@ -22,11 +17,11 @@

{% block site %}

<div class="error" data-code={{status_code}}>
<p style="font-weight: bold">You do not have permission to access this Narrative.</p>
<p style="font-size: 150%">You can request access from the Narrative owners using the controls below.</p>
<div id="error_container" class="access-error__container" data-code={{status_code}}>
<p class="access-error__heading">You do not have permission to access this Narrative.</p>
<p class="access-error__text">You can request access from the Narrative owners using the controls below.</p>

<div id="perm-request" class="form-group form-inline" style="margin-top: 2em">
<div id="perm-request" class="form-group form-inline access-request-form__container">
<label for="req-level">Access Level</label>
<select id="req-level" class="form-control">
<option value="r">View only</option>
Expand All @@ -35,10 +30,10 @@
</select>
<button id="req-btn" type="button" class="btn btn-sm btn-primary">Request</button>
</div>
<div id="loader" style="display: none; margin-top: 1em">
<div id="loader" class="access-request-progress__container">
<i class="fa fa-spinner fa-pulse fa-3x fa-fw"></i>
</div>
<div id="request-result" style="font-size: 125%; margin-top: 2em"></div>
<div id="request-result" class="access-request-result"></div>
</div>

{% endblock %}
Expand Down
9 changes: 2 additions & 7 deletions kbase-extension/kbase_templates/error.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,15 @@

{% block stylesheet %}
{{super()}}
<style type="text/css">
/* disable initial hide */
div#header, div#site {
display: block;
}
</style>
<link rel="stylesheet" href="{{ static_url("kbase/css/errorPage.css") }}" type="text/css" />
{% endblock %}

{% block loading_message %}
{% endblock %}

{% block site %}

<div class="error">
<div id="error_container" class="error">
{% block h1_error %}
<h1>{{status_code}} : {{status_message}}</h1>
{% endblock h1_error %}
Expand Down
13 changes: 4 additions & 9 deletions kbase-extension/kbase_templates/generic_error.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,7 @@

{% block stylesheet %}
{{super()}}
<style type="text/css">
/* disable initial hide */
div#header, div#site {
display: block;
}
</style>
<link rel="stylesheet" href="{{ static_url("kbase/css/errorPage.css") }}" type="text/css" />
{% endblock %}

{% block loading_message %}
Expand All @@ -22,15 +17,15 @@

{% block site %}

<div class="error" data-code={{status_code}}>
<div id="error_container" class="generic-error__container" data-code={{status_code}}>
{% block h1_error %}
<p style="font-weight: bold">
<p class="generic-error__heading">
An error occurred while loading this Narrative
</p>
{% endblock h1_error %}
{% block error_detail %}
{% if message %}
<p>{{message}}</p>
<p class="generic-error__text">{{message}}</p>
{% endif %}
{% endblock %}
</div>
Expand Down
12 changes: 3 additions & 9 deletions kbase-extension/kbase_templates/notebook.html
Original file line number Diff line number Diff line change
Expand Up @@ -96,17 +96,15 @@
</div>
<div id="content-column">
<span id="kb-add-code-cell"
class="kb-data-list-add-data-button fa fa-terminal fa-2x"
style="position:fixed; bottom:15px; right:75px; z-index:5"
class="fa fa-terminal fa-2x"
data-toggle="tooltip" data-placement="top" Title="Add Code Cell"></span>
<span id="kb-add-md-cell"
class="kb-data-list-add-data-button fa fa-paragraph fa-2x"
style="position:fixed; bottom:15px; right:10px; z-index:5"
class="fa fa-paragraph fa-2x"
data-toggle="tooltip" data-placement="top" Title="Add Markdown Cell"></span>

<div id="ipython-main-app">
<div id="notebook_panel">
<div id="notebook"></div>
<div id="notebook" class="notebook__container"></div>
<div id='tooltip' class='ipython_tooltip' style='display:none'></div>
<div id="kb-ws-progress"></div>
</div>
Expand Down Expand Up @@ -140,8 +138,4 @@
<!-- Because the narrative (in this version) requires that some Javascript is loaded before
running the main IPython stack, a little wrapper script had to be written. More details there. -->
<script src="{{ static_url("narrativeMain.js") }}" charset="utf-8"></script>

<!-- not used in this version, but left behind for posterity.
<script src="{{ static_url("notebook/js/main.js") }}" charset="utf-8"></script>
-->
{% endblock %}
2 changes: 1 addition & 1 deletion kbase-extension/static/errorMain.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ require([
return Login.init($('#signin-button'), true);
})
.then(function () {
let statusCode = document.getElementsByClassName('error')[0].getAttribute('data-code');
const statusCode = document.getElementById('error_container').getAttribute('data-code');
if (statusCode === '403') {
buildRequestControl();
}
Expand Down
3 changes: 3 additions & 0 deletions kbase-extension/static/kbase/css/advancedViewCell.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
.kb-advanced-view-cell .kb-panel-container[data-element=parameters-group] > div.panel-collapse > .panel-body {
padding: 0;
}
Loading