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

AG-1337: Promote 3.4.0 RC to Staging #1295

Merged
merged 109 commits into from
Mar 22, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
10cdbf0
refactor median-chart to remove dc.js dependency, move styles shared …
hallieswan Jun 16, 2023
2096feb
fix lint error
hallieswan Jun 16, 2023
832c530
updates per PR and add transition on resize
hallieswan Jul 7, 2023
8129a6d
match current chart behavior which does not show meaningful expressio…
hallieswan Jul 10, 2023
58b49e0
AG-1293: Update local data scripts to import and index data into new …
JessterB Nov 6, 2023
1a46380
Create node.js.yml
sagely1 Nov 7, 2023
990bace
Merge pull request #1260 from JessterB/AG-1293
JessterB Nov 8, 2023
82b2f22
Update node.js.yml
sagely1 Nov 8, 2023
4045f9e
adding playwright testing
sagely1 Nov 29, 2023
f37dcb4
AG-1213 add AMP-PD explorer link
sagely1 Dec 4, 2023
0c20314
commenting until unblocked
sagely1 Dec 4, 2023
7c5390b
missed a few lines to comment
sagely1 Dec 4, 2023
e8d78de
AG-1213 add AMP-PD explorer link
sagely1 Dec 4, 2023
068d0dc
Merge branch 'AG-1213-add-resource-links' of https://github.com/sagel…
sagely1 Dec 4, 2023
a9d6f15
remove playwright from travis for now
sagely1 Dec 4, 2023
fc5a901
Update test to use auto-retrying assertions
sagely1 Dec 5, 2023
62bd840
Merge pull request #1265 from sagely1/AG-1213-add-resource-links
sagely1 Dec 5, 2023
286727b
adding playwright to GHA
sagely1 Nov 9, 2023
6139a8d
AG-959 Surface Ensembl release version
sagely1 Dec 7, 2023
a63c890
test
sagely1 Dec 7, 2023
6de7b82
aws arn update
sagely1 Dec 8, 2023
85db3c2
Update GHA with correct npm action
sagely1 Dec 11, 2023
a1f1e47
typo
sagely1 Dec 11, 2023
e806cc6
fixed command
sagely1 Dec 11, 2023
703e4e9
background server
sagely1 Dec 11, 2023
34b8b7a
removing if present
sagely1 Dec 11, 2023
e003574
fixed typo
sagely1 Dec 11, 2023
64e5769
running npm run dev
sagely1 Dec 11, 2023
e5b6ebd
update spinner test
sagely1 Dec 11, 2023
7923995
Update test timeout
sagely1 Dec 11, 2023
4a94563
Update timeout test
sagely1 Dec 11, 2023
a32d716
marking test as slow
sagely1 Dec 11, 2023
0bcaf02
changing timeout for playwright tests
sagely1 Dec 12, 2023
86eff0c
increasing playwright test timeout to 25 min for testing
sagely1 Dec 12, 2023
3df62f0
Delete .github/workflows/playwright.yml
sagely1 Dec 12, 2023
31f497b
test
sagely1 Dec 12, 2023
ac9d93a
Bump data-version to 64
JessterB Dec 18, 2023
ef35f56
AG-959 adding test, improving conditional html logic
sagely1 Dec 18, 2023
b0b8b6c
Bump data-version to ALD mv65
JessterB Dec 19, 2023
7ae4b60
add FIXME
sagely1 Dec 19, 2023
5dd5281
remove playwright testing temporarily
sagely1 Dec 19, 2023
75cc2d5
comment out background server
sagely1 Dec 19, 2023
22471eb
Merge pull request #1267 from sagely1/AG-959-gene-hero-surface-ensemb…
sagely1 Dec 19, 2023
5dde7c1
Bump footer display version to mv66
JessterB Dec 19, 2023
7b2685f
AG-1281 fixing obscured tooltip
sagely1 Jan 8, 2024
b45591b
Merge pull request #1274 from sagely1/AG-1281-obscured-tooltip
sagely1 Jan 10, 2024
72f37b4
Bump follow-redirects from 1.15.1 to 1.15.4
dependabot[bot] Jan 10, 2024
ee1a29e
Merge pull request #1275 from Sage-Bionetworks/dependabot/npm_and_yar…
sagely1 Jan 10, 2024
b362ddf
AG-1222 add SRM results to gene details
sagely1 Jan 16, 2024
17900e7
AG-1331 update home page copy
sagely1 Jan 18, 2024
47404f1
AG-1331 tile copy updates
sagely1 Jan 18, 2024
f4734b7
removing console output
sagely1 Jan 22, 2024
52b7db8
AG-1221 add SRM option to GCT
sagely1 Jan 22, 2024
cbed2bb
Merge pull request #1277 from sagely1/AG-1331-update-home-page-copy
sagely1 Jan 22, 2024
9baa2c1
AG-1222 DRY up code, add test for tooltip
sagely1 Jan 22, 2024
9672a3d
Merge pull request #1276 from sagely1/AG-1222-srm-results-in-gene-det…
sagely1 Jan 22, 2024
4292805
Merge branch 'develop' into AG-1221-add-srm-evidence-to-gct-proteomics
sagely1 Jan 23, 2024
1baf0ea
AG-1331 modifying title and description to use flex
sagely1 Jan 23, 2024
765a705
AG-1221 remove extraneous code
sagely1 Jan 23, 2024
a2cbf68
AG-1221 modify SRM label on popup
sagely1 Jan 24, 2024
6179e88
AG-1221 added conditional display logic to hide uniprotid in GCT for …
sagely1 Jan 24, 2024
e328483
Adjust text on home page
JessterB Jan 24, 2024
d1ea464
Merge pull request #1279 from sagely1/AG-1331-update-home-page-copy
sagely1 Jan 24, 2024
d85512d
Merge pull request #1278 from sagely1/AG-1221-add-srm-evidence-to-gct…
sagely1 Jan 24, 2024
9f89a96
Merge pull request #1269 from JessterB/AG-1305
sagely1 Jan 24, 2024
f00c8be
Merge pull request #1280 from JessterB/AG-1331-update-home-page-copy
JessterB Jan 25, 2024
0c19150
AG-1344 scaling bug fix and refactor of gene evidence box plots
sagely1 Feb 5, 2024
5dc73f5
AG-1307 flatten ensembl_info
sagely1 Feb 9, 2024
8dd4164
AG-1346 GCT bug fix for zero p-values showing wrong circle size
sagely1 Feb 12, 2024
abd039e
AG-1347 csv download missing values for zero pvalues
sagely1 Feb 12, 2024
428990c
merge develop, resolve conflicts in score-barchart.component.scss
hallieswan Feb 12, 2024
8022bb9
AG-300: update json keys
hallieswan Feb 12, 2024
c7a7594
Merge pull request #1283 from sagely1/AG-1347-csv-missing-zero-pvalues
sagely1 Feb 13, 2024
76d4ab7
Merge branch 'develop' into AG-1346-gct-does-not-display-circles-when…
sagely1 Feb 13, 2024
16bcff2
AG-1346 refactor to provide more clarity. Note: circle scaling has b…
sagely1 Feb 15, 2024
0fe5e8d
Bump ip from 1.1.8 to 1.1.9
dependabot[bot] Feb 20, 2024
4e31818
Merge pull request #1284 from Sage-Bionetworks/dependabot/npm_and_yar…
sagely1 Feb 20, 2024
ecc1ee2
Bump axios and start-server-and-test
dependabot[bot] Feb 20, 2024
6cf82ce
AG-1344 removing unnecessary logic
sagely1 Feb 23, 2024
6b482b6
Merge branch 'develop' into AG-1346-gct-does-not-display-circles-when…
sagely1 Feb 27, 2024
8c34e32
Merge pull request #1281 from sagely1/AG-1344-proteomics-plot
sagely1 Feb 27, 2024
be167d9
Merge branch 'develop' into AG-1346-gct-does-not-display-circles-when…
sagely1 Feb 27, 2024
8df5b99
AG-1346 - merging changes from AG-1347
sagely1 Feb 27, 2024
e65c06f
Merge branch 'develop' into AG-1307-flatten-ensembl-info
sagely1 Feb 27, 2024
39c38bd
Merge pull request #1282 from sagely1/AG-1346-gct-does-not-display-ci…
sagely1 Feb 27, 2024
3f5b678
Merge branch 'develop' into AG-1307-flatten-ensembl-info
sagely1 Feb 27, 2024
8ce1871
Merge pull request #1286 from sagely1/AG-1307-flatten-ensembl-info
sagely1 Feb 27, 2024
b0afa64
AG-1374 updated fonts for Sage rebranding
sagely1 Feb 28, 2024
d12eb4f
Bump sanitize-html from 2.7.1 to 2.12.1
dependabot[bot] Mar 1, 2024
9c9a639
AG-1340: Bump application and data versions in footer for 3.4.0/mv68
JessterB Mar 2, 2024
2c0e536
Merge pull request #1290 from JessterB/AG-1340
JessterB Mar 11, 2024
bf6d38c
AG-1374 cleanup: removed old font
sagely1 Mar 12, 2024
af36f93
changed letter-spacing
sagely1 Mar 12, 2024
20625b4
AG-1369 fixed handling of null ensembl_info
sagely1 Mar 12, 2024
276befb
Merge branch 'develop' into AG-1369-null-ensembl-info-values
sagely1 Mar 12, 2024
7db83d5
Merge pull request #1291 from sagely1/AG-1369-null-ensembl-info-values
sagely1 Mar 13, 2024
50a9b1f
Merge pull request #1199 from hallieswan/refactor-median-chart
sagely1 Mar 13, 2024
c2f1a7c
Bump follow-redirects from 1.15.4 to 1.15.6
dependabot[bot] Mar 16, 2024
3c77db6
updated favicon for desktop, header and footer
sagely1 Mar 18, 2024
ddefbb4
Merge branch 'develop' into AG-1374-sage-rebrand
sagely1 Mar 18, 2024
018eaa2
Merge pull request #1287 from sagely1/AG-1374-sage-rebrand
JessterB Mar 20, 2024
7b7e650
Merge pull request #1292 from Sage-Bionetworks/dependabot/npm_and_yar…
sagely1 Mar 20, 2024
ee3310a
AG-1398 fix bug with pValues not showing when value is zero
sagely1 Mar 20, 2024
9098f6a
Merge pull request #1288 from Sage-Bionetworks/dependabot/npm_and_yar…
sagely1 Mar 20, 2024
7004000
Merge pull request #1285 from Sage-Bionetworks/dependabot/npm_and_yar…
sagely1 Mar 20, 2024
05caa8d
AG-1402 possible replacement value bug when no value exists
sagely1 Mar 20, 2024
7e7231b
Merge pull request #1293 from sagely1/AG-1398-pvalue-zero
JessterB Mar 21, 2024
876efd0
Merge pull request #1294 from sagely1/AG-1402-ensembl-replacement-bug
JessterB Mar 21, 2024
347094d
Merge branch 'staging' into develop
JessterB Mar 22, 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
55 changes: 55 additions & 0 deletions .github/workflows/node.js.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# 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:
branches: [ develop, main ]
pull_request:
branches: [ develop, main ]

jobs:
build:
timeout-minutes: 60

runs-on: ubuntu-latest

strategy:
matrix:
node-version: [16.x]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
# Allow OIDC Integration (so we can assume the AWS role to deploy)
# permissions:
# id-token: write
# contents: read
steps:
- uses: actions/checkout@v3
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v3
with:
node-version: ${{ matrix.node-version }}
cache: 'npm'
- run: npm ci
- run: APP_ENV=develop npm run ci:build:develop
# Background dev server
# - run: npm run dev &
- run: npm test

# - name: Configure AWS Credentials
# uses: aws-actions/configure-aws-credentials@v4
# with:
# aws-region: "us-east-1"
# role-to-assume: "arn:aws:iam::607346494281:role/sagebase-github-oidc-agora-eb-deploy"
# role-session-name: GitHubActions-${{ github.repository_owner }}-${{ github.event.repository.name }}-${{ github.run_id }}
# role-duration-seconds: 1200
# - name: Install Playwright Browsers
# run: npx playwright install --with-deps
# - name: Run Playwright tests
# run: npx playwright test
# - uses: actions/upload-artifact@v3
# if: always()
# with:
# name: playwright-report
# path: playwright-report/
# retention-days: 30
27 changes: 0 additions & 27 deletions .github/workflows/playwright.yml

This file was deleted.

4 changes: 0 additions & 4 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,6 @@ before_script:
- echo -e "[ci-user-prod]\naws_access_key_id=${AwsTravisAccessKey_prod}\naws_secret_access_key=${AwsTravisSecretAccessKey_prod}\n" >> ~/.aws/credentials
# setup npm dependencies
- npm install
# setup playwright dependencies
- npx playwright install --with-deps
stages:
- name: test
- name: eb-deploy-develop
Expand All @@ -41,8 +39,6 @@ jobs:
script:
- npm run test
- npm run build
- npm run start &
- npx playwright test
- stage: deploy-develop
if: (NOT type IN (pull_request)) AND (branch = develop)
node_js: 16.15.0
Expand Down
Loading
Loading