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

v7.2 release candidate #1159

Merged
merged 97 commits into from
Dec 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
c0bf333
Issue #1080. Can display warning the first time that Enable Node Colo…
ceciliazaragoza Apr 23, 2024
8a15ec1
Set new version number for post-7.1.1 work.
dondi Oct 2, 2024
f021ac9
now display node coloring warning each time there is a PPI network an…
ceciliazaragoza Oct 9, 2024
5dac137
Merge branch 'master' into beta
dondi Oct 9, 2024
129cd9d
New version because of Zenodo bump.
dondi Oct 9, 2024
a709872
Remove testing schema that I forgot to delete
ntran18 Oct 10, 2024
295e5cd
#1106 Allowing query all the genes even if it's not in grn network table
ntran18 Oct 10, 2024
e2872a7
#1080. Can toggle between enabling and disabling node coloring for PP…
ceciliazaragoza Oct 16, 2024
41043c9
#1080. Now node coloring sidebar not disabled when load PPI as first …
ceciliazaragoza Oct 16, 2024
5b4c2c9
#1080. removing unecessary comments and console.logs, changed warning…
ceciliazaragoza Oct 16, 2024
cdd3d21
Merge pull request #1123 from dondi/maika-1106
dondi Oct 16, 2024
56d436f
Merge pull request #1124 from dondi/maika-1106-2
dondi Oct 16, 2024
bbde941
Merge pull request #1125 from dondi/cecilia-1080
dondi Oct 16, 2024
c26ac54
Version bump.
dondi Oct 16, 2024
a307f9a
#1118 github action
akaiap Oct 16, 2024
63f81ed
#1102 Adding tests and errors message for uploading mixed type relati…
ntran18 Oct 17, 2024
cad8830
#1055 Make the node coloring menu for top bar and side bar to be cons…
ntran18 Oct 17, 2024
7dfb20a
#1080 now sidebar options display again when node coloring enabled
ceciliazaragoza Oct 23, 2024
042610c
added ppiNodeColorWarningDisplayed to grnState, so now only display w…
ceciliazaragoza Oct 23, 2024
1959360
Merge pull request #1127 from dondi/maika-1102
dondi Oct 23, 2024
b327f0f
Merge pull request #1128 from dondi/maika-1055
dondi Oct 23, 2024
8fe280f
Version bump.
dondi Oct 23, 2024
20c1e32
#1080. Now nodes display white instead of gray color thanks to fix fr…
ceciliazaragoza Oct 23, 2024
9027c80
merged beta into cecilia-1080
ceciliazaragoza Oct 23, 2024
e2519d7
Issue #1080. added === 0 so use triple equals sign
ceciliazaragoza Oct 23, 2024
38f4953
adding console.log and removing comments to understand errors in console
ceciliazaragoza Oct 24, 2024
aec65aa
#1130. removed call to tic() in restrictGraphToViewport since graph r…
ceciliazaragoza Oct 24, 2024
f3d6b36
#1130. added BOUNDARY_MARGIN to constants, but now receiving error ab…
ceciliazaragoza Oct 24, 2024
04f8927
Merge branch 'cecilia-1130' into cecilia-1080
ceciliazaragoza Oct 24, 2024
59b77ee
#1068 Allow node coloring for PPI by matching the gene name
ntran18 Oct 24, 2024
284439a
#1059 Cloning the svgElement to prevent changes to the current displa…
ntran18 Oct 25, 2024
5bb4cf7
#1098 Fixing issue where file selector appears twice after importing …
ntran18 Oct 25, 2024
575fa73
no longer receiving issue about length when load Barreto, need to mak…
ceciliazaragoza Oct 25, 2024
793dea1
#1080. removing console.logs
ceciliazaragoza Oct 25, 2024
ac88f29
#1080. fixing lint errors and can enable and disable nav and sidebar …
ceciliazaragoza Oct 27, 2024
39181a9
#1080. display warning when PPI mode enabled, but for some reason PPI…
ceciliazaragoza Oct 27, 2024
533b879
Issue #1080. was accidentally assigning grnState.mode to NETWORK_PPI_…
ceciliazaragoza Oct 27, 2024
77189f3
#1080. Can now enable and disable node coloring with PPIs where navba…
ceciliazaragoza Oct 30, 2024
38a69a8
Sync package-lock.json with package.json
akaiap Oct 30, 2024
22c1a76
Merge pull request #1129 from dondi/cecilia-1080
dondi Oct 30, 2024
4976c3e
Merge pull request #1132 from dondi/maika-1059
dondi Oct 30, 2024
3908985
system dependencies needed by the 'canvas' package
akaiap Oct 30, 2024
1b6dbc2
#1078 style fix
ntran18 Oct 30, 2024
616362a
#1098 reverse back the changes to when upload class is changed, trigg…
ntran18 Oct 30, 2024
019589e
#1197 Modify alpha value on optimization_parameters from 0.002 to 0.02
ntran18 Oct 30, 2024
fe4b7e9
fixing syntax error
akaiap Oct 31, 2024
aa2d6e2
Merge pull request #1136 from dondi/maika-1107
dondi Nov 4, 2024
dca83bc
#1068 improve the code quality
ntran18 Nov 4, 2024
5f1ab4e
Merge branch 'beta' into maika-1068
ntran18 Nov 4, 2024
57b0a58
#1108 When export, making network and network_weights sheets to be id…
ntran18 Nov 4, 2024
9b24710
Merge pull request #1133 from dondi/maika-1098
dondi Nov 4, 2024
f978dbb
Merge pull request #1134 from dondi/maika-1068
dondi Nov 4, 2024
4f1cda4
Merge pull request #1137 from dondi/maika-1108
dondi Nov 4, 2024
13dcde5
Version bump.
dondi Nov 4, 2024
edc33e5
#1053 Fixing p.length is unavailable error
ntran18 Nov 5, 2024
5262d02
#1093 svg image appear with white background
ntran18 Nov 5, 2024
0f0c5f3
Fixing the exportToPDF so the image doesn't too scale on width or height
ntran18 Nov 5, 2024
0bd5322
Clean code for #59
ntran18 Nov 5, 2024
fbb13df
#59 change the background color from black to white for PNG export
ntran18 Nov 6, 2024
261b703
reducing node version workflow
akaiap Nov 6, 2024
808f6c4
Modify the location of the image in pdf
ntran18 Nov 6, 2024
66e0758
#1053 improve code quality
ntran18 Nov 6, 2024
17b4280
#1093 rename variable, and switching to Object.assign for copying sty…
ntran18 Nov 6, 2024
70d90b6
Update node.js.yml
akaiap Nov 6, 2024
927a45c
Update node.js.yml
akaiap Nov 6, 2024
1cd43f3
Experimental: change “on” event for running workflow.
dondi Nov 6, 2024
9de56c9
Try eliminating branch specificity.
dondi Nov 6, 2024
b1e3afc
removing the 'xenial-security' repository and installing dependencies…
akaiap Nov 13, 2024
fba3982
downgrading node version to 18.x for compatibility with canvas package
akaiap Nov 13, 2024
0718a0d
Merge pull request #1138 from dondi/maika-1053
dondi Nov 13, 2024
4f0adaf
Merge pull request #1141 from dondi/maika-59
dondi Nov 13, 2024
061ad53
Fixing wrong capitlization in naming
ntran18 Nov 13, 2024
770e4d1
Merge pull request #1140 from dondi/maika-1093
dondi Nov 13, 2024
0f3377a
Version bump.
dondi Nov 13, 2024
ae7cb3d
Issue #1142. Now warnings list should display correctly. Added line t…
ceciliazaragoza Nov 13, 2024
cd7d8b3
Merge pull request #1135 from dondi/issue-1118-github-actions
dondi Nov 16, 2024
6016aac
Merge pull request #1143 from dondi/cecilia-1142
dondi Nov 16, 2024
0acca88
7.1.8…when GRNsight got its CI groove back.
dondi Nov 16, 2024
2cec362
Add npm lint step to GitHub Actions workflow
akaiap Nov 20, 2024
c8c22bb
#1144 Adding code to set node-coloring enable only when having expres…
ntran18 Nov 20, 2024
05cd4bb
#1144 fix previous commit code that didn't work, changing from workbo…
ntran18 Nov 27, 2024
eed34ff
Clean code
ntran18 Nov 27, 2024
a712c97
#1030 Remove lint changes and only change the variable name
ntran18 Nov 27, 2024
f38b8cf
Merge pull request #1154 from dondi/maika-1030
dondi Nov 27, 2024
4c5bd50
Version bump for new environment variable names.
dondi Nov 27, 2024
ebac79b
correcting trailing spaces and missing semicolon according to npm lint
akaiap Nov 29, 2024
4c847af
updated package json with the canvg package 3.0.10 and added canvas 2…
akaiap Nov 29, 2024
3015762
adding Node.js CI badge to README.md
akaiap Nov 29, 2024
e94143a
Rewrite hasExpressionData function to use -some- call
ntran18 Nov 30, 2024
079811e
Merge pull request #1149 from dondi/#1147-include-npm-lin
dondi Dec 4, 2024
6bcd6cc
Merge pull request #1155 from dondi/#1145-gain-compatibility-with-Nod…
dondi Dec 4, 2024
6512095
Merge pull request #1156 from dondi/#1146-syncing-github-actions-to-b…
dondi Dec 4, 2024
ad23102
Version bump—this one only has CI changes.
dondi Dec 4, 2024
d071741
Remove one hasExpressionData function
ntran18 Dec 4, 2024
347fca8
Merge pull request #1153 from dondi/maika-1144
dondi Dec 4, 2024
cfa3407
#1144 Remove unused import.
dondi Dec 4, 2024
afc94dd
Version bump to include #1144 fix.
dondi Dec 4, 2024
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
35 changes: 35 additions & 0 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# This workflow will do a clean installation of node dependencies, cache/restore them, build the source code and run tests across different versions of node
# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-nodejs

name: Node.js CI

on: [push]

jobs:
build:

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [18.x, 20.x, 22.x]

steps:
- uses: actions/checkout@v4
# install system dependencies needed by the 'canvas' package
- name: Install dependencies for canvas
run: |
sudo apt-get update
sudo apt-get install -y libcairo2-dev libpango1.0-dev libjpeg62 libgif-dev librsvg2-dev
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'

- run: npm ci
- run: npm run lint
- run: npm run build --if-present
- run: npm test


1 change: 1 addition & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ GRNsight
[![DOI](https://zenodo.org/badge/16195791.svg)](https://zenodo.org/badge/latestdoi/16195791)
[![Build Status](https://app.travis-ci.com/dondi/GRNsight.svg?branch=master)](https://app.travis-ci.com/dondi/GRNsight)
[![Coverage Status](https://coveralls.io/repos/github/dondi/GRNsight/badge.svg?branch=master)](https://coveralls.io/github/dondi/GRNsight?branch=master)
[![Node.js CI](https://github.com/dondi/GRNsight/actions/workflows/node.js.yml/badge.svg)](https://github.com/dondi/GRNsight/actions/workflows/node.js.yml)

http://dondi.github.io/GRNsight/

Expand Down
4 changes: 2 additions & 2 deletions database/network-database/schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,6 @@ CREATE TABLE gene_regulatory_network.network (
time_stamp TIMESTAMP WITH TIME ZONE,
source VARCHAR,
FOREIGN KEY (regulator_gene_id, taxon_id) REFERENCES gene_regulatory_network.gene(gene_id, taxon_id),
FOREIGN KEY (target_gene_id, taxon_id) REFERENCES gene_regulatory_network_testing.gene(gene_id, taxon_id),
FOREIGN KEY (time_stamp, source) REFERENCES gene_regulatory_network_testing.source(time_stamp, source)
FOREIGN KEY (target_gene_id, taxon_id) REFERENCES gene_regulatory_network.gene(gene_id, taxon_id),
FOREIGN KEY (time_stamp, source) REFERENCES gene_regulatory_network.source(time_stamp, source)
);
8 changes: 4 additions & 4 deletions database/protein-protein-database/schema.sql
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ CREATE TABLE protein_protein_interactions.protein (
molecular_weight FLOAT,
PI FLOAT,
taxon_id VARCHAR,
FOREIGN KEY (gene_systematic_name, taxon_id) REFERENCES protein_protein_interactions_testing.gene(gene_id, taxon_id)
FOREIGN KEY (gene_systematic_name, taxon_id) REFERENCES protein_protein_interactions.gene(gene_id, taxon_id)
);

CREATE TABLE protein_protein_interactions.physical_interactions (
Expand All @@ -30,8 +30,8 @@ CREATE TABLE protein_protein_interactions.physical_interactions (
experiment_name VARCHAR,
time_stamp TIMESTAMP WITH TIME ZONE,
source VARCHAR,
FOREIGN KEY (protein1) REFERENCES protein_protein_interactions_testing.protein(standard_name),
FOREIGN KEY (protein2) REFERENCES protein_protein_interactions_testing.protein(standard_name),
FOREIGN KEY (time_stamp, source) REFERENCES protein_protein_interactions_testing.source(time_stamp, source),
FOREIGN KEY (protein1) REFERENCES protein_protein_interactions.protein(standard_name),
FOREIGN KEY (protein2) REFERENCES protein_protein_interactions.protein(standard_name),
FOREIGN KEY (time_stamp, source) REFERENCES protein_protein_interactions.source(time_stamp, source),
CONSTRAINT unique_physical_interaction UNIQUE (protein1, protein2, interaction_detection_methods_identifier, experiment_name, time_stamp, source)
);
Loading
Loading