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.

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

SCT-3097 - fix clustering viewer pop ups, timeouts, tab crash with large clusters #2385

Open
wants to merge 73 commits into
base: develop
Choose a base branch
from
Open
Changes from 1 commit
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 Apr 21, 2021
3b09924
Merge pull request #2289 from kbase/develop
briehl May 18, 2021
80766a3
remove console logging
eapearson Jul 15, 2021
fe61c0a
minor code cleanup
eapearson Jul 15, 2021
d91670d
fix tab removal behavior; remove commented out code
eapearson Jul 15, 2021
98394da
disable focus outline for close button; it just looks weird given its…
eapearson Jul 15, 2021
d1a9a56
improve layout; use "-" for missing name or function (rather than emp…
eapearson Jul 15, 2021
271ba29
improve layout spacing; disable explore cluster for > 200 genes; hand…
eapearson Jul 15, 2021
2231a2b
don't convert stats to fixed decimal strings, that is already handled…
eapearson Jul 15, 2021
8efb24f
disabled explore cluster button aligned with non-disabled.
eapearson Jul 15, 2021
d65549e
prettification
eapearson Jul 15, 2021
7f67f84
ignore _temp dir
eapearson Jul 15, 2021
1cf849f
fix order of ops in init
eapearson Jul 15, 2021
ef17db7
fix typo in getSubmatrixParams; add improved error handling based on …
eapearson Jul 23, 2021
f1cffbc
use get_objects2 rather than deprecated ws methods; use upas.cluster…
eapearson Jul 23, 2021
6b8ca67
add roles for testing; other minor improvements.
eapearson Jul 23, 2021
2001bf9
remove unused variable
eapearson Jul 23, 2021
a995a83
remove unused variable (set twice.)
eapearson Jul 23, 2021
a26f7d2
remove unused featureValueClient property and dependency
eapearson Jul 23, 2021
ad15040
Add testing of pairwise clusters widget, with test data; refactor to …
eapearson Jul 25, 2021
b2e6be2
Merge remote-tracking branch 'origin/develop' into SCT-3097_clusterin…
eapearson Jul 25, 2021
1c4edc9
add release note
eapearson Jul 25, 2021
cefcd5d
remove commented out code, use actual uuid.
eapearson Jul 26, 2021
f56e850
hoist more hardcoded values into constants to clarify code;
eapearson Jul 26, 2021
2ca0bd6
remove nonfunctional testing code
eapearson Jul 26, 2021
adc05a2
remove unused modules references
eapearson Jul 26, 2021
c42680d
fix spacing
eapearson Jul 26, 2021
e9abb88
fix for code quality tool, removes unnecessary variables
eapearson Jul 26, 2021
0b1614e
fix typo, remove unnecessary lines, commented out code
eapearson Jul 26, 2021
dd75ed7
simplify code, refactor for loop.
eapearson Jul 26, 2021
30b6e9f
remove unnecessary comments, commented out code.
eapearson Jul 26, 2021
a55be38
make code quality tool happy by removing shadowed variables
eapearson Jul 26, 2021
456ff4a
remove default for duration
eapearson Jul 26, 2021
c749f0f
refactor a repeated pattern into a function
eapearson Jul 26, 2021
bf6c0ba
rename variables to avoid triggering warning in cq tools
eapearson Jul 26, 2021
7dc2136
center message
eapearson Jul 26, 2021
cd7edd8
remove button disabling with > 200 genes
eapearson Jul 26, 2021
d0a1843
fix data table not displaying table controls (sort, pagination, info)
eapearson Jul 26, 2021
c14cf4f
fix hide/show of selected features table
eapearson Jul 26, 2021
f88ecb9
adjust test for button
eapearson Jul 26, 2021
f151891
Merge pull request #2425 from kbase/develop
briehl Aug 20, 2021
3e39acd
Merge remote-tracking branch 'origin/develop' into SCT-3097_clusterin…
eapearson Aug 20, 2021
0201fec
restore sample service to config
eapearson Aug 20, 2021
6d3adaa
restore CHROME_BIN to karma unit testing config
eapearson Aug 20, 2021
3e7e66f
Fix loading message (probably merge error)
eapearson Aug 20, 2021
4f9f757
minor updates to integratin-test doc
eapearson Aug 20, 2021
f6e2e46
add "whenShown" callback; useful for doing rendering fixup (e.g. data…
eapearson Aug 20, 2021
4d34618
move some styles into stylesheet; fix some table styling issues
eapearson Aug 20, 2021
eddc302
Merge remote-tracking branch 'origin/develop' into SCT-3097_clusterin…
eapearson Sep 29, 2021
bb3d0e2
remove todo comment and unused argument
eapearson Sep 30, 2021
f841f4b
tabs 4 -> 2 and other formatting fixes
eapearson Sep 30, 2021
0bf6036
remove unused args
eapearson Sep 30, 2021
2bc384f
replace regex constructor with regex literals
eapearson Sep 30, 2021
c3cb5e4
fix css for styleelint, add stylelint dependency, stylelint settings
eapearson Sep 30, 2021
52de0e2
Merge pull request #2538 from kbase/develop
briehl Oct 28, 2021
41162f6
Merge remote-tracking branch 'origin/master' into SCT-3097_clustering…
eapearson Nov 22, 2021
1d13e8f
Merge remote-tracking branch 'origin/develop' into SCT-3097_clusterin…
eapearson Nov 22, 2021
39610a3
Merge remote-tracking branch 'origin/develop' into SCT-3097_clusterin…
eapearson Mar 9, 2022
3f17586
Merge remote-tracking branch 'origin/develop' into SCT-3097_clusterin…
eapearson May 24, 2022
d976bfe
Add !important to force full width table; some change in datatables c…
eapearson May 24, 2022
90d49f4
fix usage caught by DeepScan (which actually pointed to the wrong pro…
eapearson May 24, 2022
e829eef
remove unnecessary import of jquery into test (sonarcloud) [SCT-3097]
eapearson May 24, 2022
4bd485a
move direct styles into stylesheet [SCT-3097]
eapearson May 24, 2022
6208aa3
improve styling [SCT-3097]
eapearson May 25, 2022
f66d4fc
add support for component demos [SCT-3097]
eapearson May 25, 2022
3b99f35
fix default type for alert [SCT-3097]
eapearson May 25, 2022
426221a
move css stylesheet to scss [SCT-3097]
eapearson May 25, 2022
d3a6aac
move stylesheet to scss [SCT-3097]
eapearson May 25, 2022
c8917e4
replace more inline styles with scss [SCT-3097]
eapearson May 25, 2022
2d96cdb
fix tabbing for codacy [SCT-3097]
eapearson May 25, 2022
5367b26
format with "remark", as per codacy [SCT-3097]
eapearson May 25, 2022
6c03a4c
more markdown formatting tweaks, how silly [SCT-3097]
eapearson May 25, 2022
a0a0166
last markdown tweak, yuck [SCT-3097]
eapearson May 25, 2022
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
Prev Previous commit
Next Next commit
move direct styles into stylesheet [SCT-3097]
eapearson committed May 24, 2022
commit 4bd485a476ddcf3ba9363b803c23f624625106f7
16 changes: 16 additions & 0 deletions kbase-extension/static/kbase/js/widgets/common/JSONView.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@

.JSONObject > tbody > .Property > .Key {
color: rgba(150, 150, 150, 1);
}

.JSONObject th {
text-align: left;
}

.JSONArray > tbody > .Element > .Index {
color: rgba(150, 150, 150, 1);
}

.JSONArray th {
text-align: left;
}
40 changes: 27 additions & 13 deletions kbase-extension/static/kbase/js/widgets/common/JSONView.js
Original file line number Diff line number Diff line change
@@ -1,28 +1,42 @@
define(['jquery', 'widgets/common/RenderIn'], ($, RenderIn) => {
define([
'jquery',
'widgets/common/RenderIn',

// for effect
'css!./JSONView.css',
], ($, RenderIn) => {
'use strict';

const { $TextIn } = RenderIn;

function $RenderJSONArray(data) {
const $rows = data.map((value, index) => {
return $('<tr>').append(
$('<th>').css('color', 'rgba(150, 150, 150, 1)').text(String(index)),
$('<td>').addClass('fa fa-arrow-right'),
$('<td>').html($JSONView(value))
);
return $('<tr>')
.addClass('Element')
.append(
$('<th>').addClass('Index').text(String(index)),
$('<td>').addClass('fa fa-arrow-right'),
$('<td>').html($JSONView(value))
);
});
return $('<table>').addClass('table table-striped').html($('<tbody>').append($rows));
return $('<table>')
.addClass('table table-striped JSONArray')
.html($('<tbody>').append($rows));
}

function $RenderJSONObject(data) {
const $rows = Object.entries(data).map(([key, value]) => {
return $('<tr>').append(
$('<th>').css('color', 'rgba(150, 150, 150, 1)').text(key),
$('<td>').addClass('fa fa-arrow-right'),
$('<td>').html($JSONView(value))
);
return $('<tr>')
.addClass('Property')
.append(
$('<th>').addClass('Key').text(key),
$('<td>').addClass('fa fa-arrow-right'),
$('<td>').html($JSONView(value))
);
});
return $('<table>').addClass('table table-striped').html($('<tbody>').append($rows));
return $('<table>')
.addClass('table table-striped JSONObject')
.html($('<tbody>').append($rows));
}

function $RenderNonJSON(data) {