-
Notifications
You must be signed in to change notification settings - Fork 55
SCT-3097 - fix clustering viewer pop ups, timeouts, tab crash with large clusters #2385
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.
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
Open
eapearson
wants to merge
73
commits into
develop
Choose a base branch
from
SCT-3097_clustering-app-pop-ups
base: develop
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
73 commits
Select commit
Hold shift + click to select a range
ff113f2
Merge pull request #2247 from kbase/narrative_version_debug
briehl 3b09924
Merge pull request #2289 from kbase/develop
briehl 80766a3
remove console logging
eapearson fe61c0a
minor code cleanup
eapearson d91670d
fix tab removal behavior; remove commented out code
eapearson 98394da
disable focus outline for close button; it just looks weird given its…
eapearson d1a9a56
improve layout; use "-" for missing name or function (rather than emp…
eapearson 271ba29
improve layout spacing; disable explore cluster for > 200 genes; hand…
eapearson 2231a2b
don't convert stats to fixed decimal strings, that is already handled…
eapearson 8efb24f
disabled explore cluster button aligned with non-disabled.
eapearson d65549e
prettification
eapearson 7f67f84
ignore _temp dir
eapearson 1cf849f
fix order of ops in init
eapearson ef17db7
fix typo in getSubmatrixParams; add improved error handling based on …
eapearson f1cffbc
use get_objects2 rather than deprecated ws methods; use upas.cluster…
eapearson 6b8ca67
add roles for testing; other minor improvements.
eapearson 2001bf9
remove unused variable
eapearson a995a83
remove unused variable (set twice.)
eapearson a26f7d2
remove unused featureValueClient property and dependency
eapearson ad15040
Add testing of pairwise clusters widget, with test data; refactor to …
eapearson b2e6be2
Merge remote-tracking branch 'origin/develop' into SCT-3097_clusterin…
eapearson 1c4edc9
add release note
eapearson cefcd5d
remove commented out code, use actual uuid.
eapearson f56e850
hoist more hardcoded values into constants to clarify code;
eapearson 2ca0bd6
remove nonfunctional testing code
eapearson adc05a2
remove unused modules references
eapearson c42680d
fix spacing
eapearson e9abb88
fix for code quality tool, removes unnecessary variables
eapearson 0b1614e
fix typo, remove unnecessary lines, commented out code
eapearson dd75ed7
simplify code, refactor for loop.
eapearson 30b6e9f
remove unnecessary comments, commented out code.
eapearson a55be38
make code quality tool happy by removing shadowed variables
eapearson 456ff4a
remove default for duration
eapearson c749f0f
refactor a repeated pattern into a function
eapearson bf6c0ba
rename variables to avoid triggering warning in cq tools
eapearson 7dc2136
center message
eapearson cd7edd8
remove button disabling with > 200 genes
eapearson d0a1843
fix data table not displaying table controls (sort, pagination, info)
eapearson c14cf4f
fix hide/show of selected features table
eapearson f88ecb9
adjust test for button
eapearson f151891
Merge pull request #2425 from kbase/develop
briehl 3e39acd
Merge remote-tracking branch 'origin/develop' into SCT-3097_clusterin…
eapearson 0201fec
restore sample service to config
eapearson 6d3adaa
restore CHROME_BIN to karma unit testing config
eapearson 3e7e66f
Fix loading message (probably merge error)
eapearson 4f9f757
minor updates to integratin-test doc
eapearson f6e2e46
add "whenShown" callback; useful for doing rendering fixup (e.g. data…
eapearson 4d34618
move some styles into stylesheet; fix some table styling issues
eapearson eddc302
Merge remote-tracking branch 'origin/develop' into SCT-3097_clusterin…
eapearson bb3d0e2
remove todo comment and unused argument
eapearson f841f4b
tabs 4 -> 2 and other formatting fixes
eapearson 0bf6036
remove unused args
eapearson 2bc384f
replace regex constructor with regex literals
eapearson c3cb5e4
fix css for styleelint, add stylelint dependency, stylelint settings
eapearson 52de0e2
Merge pull request #2538 from kbase/develop
briehl 41162f6
Merge remote-tracking branch 'origin/master' into SCT-3097_clustering…
eapearson 1d13e8f
Merge remote-tracking branch 'origin/develop' into SCT-3097_clusterin…
eapearson 39610a3
Merge remote-tracking branch 'origin/develop' into SCT-3097_clusterin…
eapearson 3f17586
Merge remote-tracking branch 'origin/develop' into SCT-3097_clusterin…
eapearson d976bfe
Add !important to force full width table; some change in datatables c…
eapearson 90d49f4
fix usage caught by DeepScan (which actually pointed to the wrong pro…
eapearson e829eef
remove unnecessary import of jquery into test (sonarcloud) [SCT-3097]
eapearson 4bd485a
move direct styles into stylesheet [SCT-3097]
eapearson 6208aa3
improve styling [SCT-3097]
eapearson f66d4fc
add support for component demos [SCT-3097]
eapearson 3b99f35
fix default type for alert [SCT-3097]
eapearson 426221a
move css stylesheet to scss [SCT-3097]
eapearson d3a6aac
move stylesheet to scss [SCT-3097]
eapearson c8917e4
replace more inline styles with scss [SCT-3097]
eapearson 2d96cdb
fix tabbing for codacy [SCT-3097]
eapearson 5367b26
format with "remark", as per codacy [SCT-3097]
eapearson 6c03a4c
more markdown formatting tweaks, how silly [SCT-3097]
eapearson a0a0166
last markdown tweak, yuck [SCT-3097]
eapearson File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| { | ||
| "extends": "stylelint-config-standard" | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,43 @@ | ||
| .JSONObject { | ||
| // .JSONObject tbody | ||
| tbody { | ||
| .Property { | ||
| // .JSONObject > tbody > .Property > .Key | ||
| .Key { | ||
| color: rgba(150, 150, 150, 1); | ||
| } | ||
| } | ||
| .Element { | ||
| .Index { | ||
| color: rgba(150, 150, 150, 1); | ||
| } | ||
| } | ||
| } | ||
| th { | ||
| text-align: left; | ||
| } | ||
| td { | ||
| .fa-arrow-right { | ||
| color: rgba(150, 150, 150, 1); | ||
| } | ||
| } | ||
| } | ||
|
|
||
| .JSONArray { | ||
| tbody { | ||
| .Element { | ||
| .Index { | ||
| color: rgba(150, 150, 150, 1); | ||
| } | ||
| } | ||
| } | ||
| th { | ||
| text-align: left; | ||
| } | ||
|
|
||
| td { | ||
| .fa-arrow-right { | ||
| color: rgba(150, 150, 150, 1); | ||
| } | ||
| } | ||
| } |
45 changes: 45 additions & 0 deletions
45
kbase-extension/scss/partials/_kbaseExpressionFeatureClusters.scss
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| .KBaseExpressionFeatureClusters { | ||
| table.table.ClusterFeaturesTable { | ||
| width: 100% !important; | ||
| tbody { | ||
| tr { | ||
| td { | ||
| vertical-align: middle; | ||
| } | ||
| td:nth-child(4) { | ||
| min-width: 15em; | ||
| max-width: 25em; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| table.table.ClustersTable { | ||
| width: 100% !important; | ||
| tbody { | ||
| tr { | ||
| td { | ||
| vertical-align: middle; | ||
| } | ||
| } | ||
| } | ||
| } | ||
| // Provide consistent top margin within tab panes. | ||
| .tab-content { | ||
| margin-top: 10px; | ||
| } | ||
| // For some reason, the cursor for links is unset, needs to | ||
| // be restored. | ||
| a { | ||
| cursor: pointer; | ||
| } | ||
|
|
||
| // Tweaks to the dropdown menu within the table cell. | ||
| // .KBaseExpressionFeatureClusters___ExploreClusterDropdown.dropdown-menu | ||
| &__ExploreClusterDropdown.dropdown-menu { | ||
| // !important is required to override styles set by | ||
| // Jupyter for .rendered_html. | ||
| list-style: none !important; | ||
| margin: 0 !important; | ||
| padding-left: 0 !important; | ||
| } | ||
| } |
Large diffs are not rendered by default.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| <!DOCTYPE html> | ||
| <html > | ||
| <head> | ||
| <script src="/narrative/static/components/requirejs/require.js"></script> | ||
| <script src="/narrative/static/kbase/demo/common.js"></script> | ||
| <link type="text/css" rel="stylesheet" href="/narrative/static/style/style.min.css"> | ||
| <link type="text/css" rel="stylesheet" href="/narrative/static/kbase/demo/common.css"> | ||
| <link type="text/css" rel="stylesheet" href="/narrative/static/kbase/css/all_concat.css"> | ||
| <meta charset="utf-8"> | ||
| <title>KBase Demo - AlertMessage.js</title> | ||
| </head> | ||
| <body class="Demo"> | ||
| <h1>AlertMessage Demo</h1> | ||
|
|
||
| <p><a href="./index.html">Index</a></p> | ||
|
|
||
| <h2>Default Alert</h2> | ||
|
|
||
| <p>By default, the Alert will use the "info" styling</p> | ||
|
|
||
| <div class="Example"> | ||
| <div id="alertmessage1"></div> | ||
| </div> | ||
|
|
||
| <h2>Info Alert</h2> | ||
|
|
||
| <p>Here we explicitly use the "info" message styling</p> | ||
|
|
||
| <div class="Example"> | ||
| <div id="alertmessage2"></div> | ||
| </div> | ||
|
|
||
| <h2>Warning Alert</h2> | ||
|
|
||
| <p>Here we explicitly use the "warning" message styling</p> | ||
|
|
||
| <div class="Example"> | ||
| <div id="alertmessage3"></div> | ||
| </div> | ||
|
|
||
| <h2>Danger Alert</h2> | ||
|
|
||
| <p>Here we explicitly use the "danger", or error, message styling</p> | ||
|
|
||
| <div class="Example"> | ||
| <div id="alertmessage4"></div> | ||
| </div> | ||
|
|
||
| <h2>Success Alert</h2> | ||
|
|
||
| <p>Here we explicitly use the "success" message styling</p> | ||
|
|
||
| <div class="Example"> | ||
| <div id="alertmessage5"></div> | ||
| </div> | ||
|
|
||
| <script> | ||
| require(['narrative_paths'], () => { | ||
| require(['jquery', 'widgets/common/AlertMessage'], ($, $AlertMessage) => { | ||
| $('#alertmessage1').html($AlertMessage("This is a default alert")); | ||
|
|
||
| $('#alertmessage2').html($AlertMessage("This is an info alert", {type: 'info'})); | ||
|
|
||
| $('#alertmessage3').html($AlertMessage("This is a warning alert", {type: 'warning'})); | ||
|
|
||
| $('#alertmessage4').html($AlertMessage("This is a danger alert", {type: 'danger'})); | ||
|
|
||
| $('#alertmessage5').html($AlertMessage("This is a success alert", {type: 'success'})); | ||
| }); | ||
| }); | ||
| </script> | ||
| </body> | ||
| </html> |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,3 @@ | ||
| .Example .fit-content table.table { | ||
| width: fit-content; | ||
| } |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we've already got
.stylelintrc.yamlso this shouldn't be needed