Skip to content

Commit ecc2a12

Browse files
author
Shawn O'Connor
committed
Merge branch 'main' into vpodcqa
2 parents 65f3a45 + 18b7100 commit ecc2a12

File tree

103 files changed

+4013
-1987
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+4013
-1987
lines changed

‎.env.development‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
NEXT_PUBLIC_GEN3_COMMONS_NAME=vpodcqa
2-
NEXT_PUBLIC_GEN3_API=https://qa-vpodc.planx-pla.net
3-
NEXT_PUBLIC_GEN3_DOMAIN=https://localhost:3010
2+
NEXT_PUBLIC_GEN3_API=http://localhost:3000
43
NEXT_PUBLIC_DATACOMMONS="vpodc_data_commons"
4+
# uncomment and set the follow to connect the development frontend to a Gen3 commons backend. Note that the
5+
# configuration in config needs to match the backend.
6+
NEXT_PUBLIC_GEN3_API_TARGET=https://qa-vpodc.planx-pla.net

‎.env.production‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
NEXT_PUBLIC_GEN3_COMMONS_NAME=vpodcqa
22
NEXT_PUBLIC_DATACOMMONS="vpodc_data_commons"
3-
3+
# if you are using a config based deployment set these in your helm values.yaml file
4+
# Name of the commons
5+
#NEXT_PUBLIC_DATACOMMONS="commons_frontend_app"
46
# Set this for DATADOG tracking
57
NEXT_PUBLIC_DATADOG_APPLICATION_ID="25e9ac14-9635-4a8f-a0c1-519f2768c458"
68
NEXT_PUBLIC_DATADOG_CLIENT_TOKEN="pub05d4bcea8a70f1212d09ec166af53b62"

‎.env.test‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
NEXT_PUBLIC_GEN3_COMMONS_NAME=ci
2+
NEXT_PUBLIC_DATACOMMONS="ci_commons_frontend_app"

‎.github/workflows/ci.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
fetch-depth: 0
1010
- uses: actions/setup-node@v4.1.0
1111
with:
12-
node-version: 24.12.0
12+
node-version: 24.14.0
1313
- name: Install dependencies
1414
run: npm install
1515
- name: Install Playwright
@@ -27,7 +27,7 @@ jobs:
2727
- uses: actions/checkout@v2
2828
- uses: actions/setup-node@v4.1.0
2929
with:
30-
node-version: 24.12.0
30+
node-version: 24.14.0
3131
- name: Get Version
3232
run: npm -v
3333
- name: Install modules

‎.github/workflows/ci_image_build_push.yaml‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
name: Build Image and Push to Quay for CI
2+
3+
on: push
4+
5+
jobs:
6+
compute_tag:
7+
if: ${{ !github.event.repository.fork }}
8+
name: Compute tag name
9+
runs-on: ubuntu-latest
10+
outputs:
11+
OVERRIDE_TAG_NAME: ${{ steps.set_tag.outputs.OVERRIDE_TAG_NAME }}
12+
13+
steps:
14+
- name: Compute OVERRIDE_TAG_NAME
15+
id: set_tag
16+
run: |
17+
CLEAN_BRANCH=$(echo "$GITHUB_REF_NAME" | tr '/' '_')
18+
OVERRIDE_TAG_NAME="${CLEAN_BRANCH}_test"
19+
20+
# Set output so the job can pass it to another workflow
21+
echo "OVERRIDE_TAG_NAME=$OVERRIDE_TAG_NAME" >> "$GITHUB_OUTPUT"
22+
echo "Computed OVERRIDE_TAG_NAME: $OVERRIDE_TAG_NAME"
23+
ci:
24+
if: ${{ !github.event.repository.fork }}
25+
name: Build Image and Push to Quay for CI
26+
needs: compute_tag
27+
uses: uc-cdis/.github/.github/workflows/image_build_push_native.yaml@master
28+
with:
29+
USE_QUAY_ONLY: true
30+
DOCKERFILE_LOCATION: "Dockerfile.test"
31+
OVERRIDE_TAG_NAME: ${{ needs.compute_tag.outputs.OVERRIDE_TAG_NAME }}
32+
secrets:
33+
ECR_AWS_ACCESS_KEY_ID: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
34+
ECR_AWS_SECRET_ACCESS_KEY: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}
35+
QUAY_USERNAME: ${{ secrets.QUAY_USERNAME }}
36+
QUAY_ROBOT_TOKEN: ${{ secrets.QUAY_ROBOT_TOKEN }}

‎.github/workflows/dependabot.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: "npm"
4+
directory: "/"
5+
schedule:
6+
interval: "daily"
7+
ignore:
8+
- dependency-name: "*"
9+
allow:
10+
- dependency-name: "@gen3/frontend"

‎.github/workflows/image_build_push.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ jobs:
1414
uses: uc-cdis/.github/.github/workflows/image_build_push_native.yaml@master
1515
with:
1616
USE_QUAY_ONLY: true
17+
DOCKERFILE_LOCATION: "Dockerfile.production"
18+
OVERRIDE_TAG_NAME: ${{ needs.compute_tag.outputs.OVERRIDE_TAG_NAME }}
1719
secrets:
1820
ECR_AWS_ACCESS_KEY_ID: ${{ secrets.ECR_AWS_ACCESS_KEY_ID }}
1921
ECR_AWS_SECRET_ACCESS_KEY: ${{ secrets.ECR_AWS_SECRET_ACCESS_KEY }}

‎.github/workflows/integration_tests.yaml‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Integration Tests
2+
3+
on: pull_request
4+
5+
jobs:
6+
integration_tests:
7+
if: ${{ !github.event.repository.fork }}
8+
name: Integration tests
9+
uses: uc-cdis/.github/.github/workflows/integration_tests.yaml@master
10+
with:
11+
CI_ENV: gen3ff
12+
SERVICE_TO_TEST: frontend
13+
secrets:
14+
CI_TEST_ORCID_USERID: ${{ secrets.CI_TEST_ORCID_USERID }}
15+
CI_TEST_ORCID_PASSWORD: ${{ secrets.CI_TEST_ORCID_PASSWORD }}
16+
CI_TEST_RAS_EMAIL: ${{ secrets.CI_TEST_RAS_EMAIL }}
17+
CI_TEST_RAS_PASSWORD: ${{ secrets.CI_TEST_RAS_PASSWORD }}
18+
CI_TEST_RAS_2_EMAIL: ${{ secrets.CI_TEST_RAS_2_EMAIL }}
19+
CI_TEST_RAS_2_PASSWORD: ${{ secrets.CI_TEST_RAS_2_PASSWORD }}
20+
CI_SLACK_BOT_TOKEN: ${{ secrets.CI_SLACK_BOT_TOKEN }}
21+
CI_SLACK_CHANNEL_ID: ${{ secrets.CI_SLACK_CHANNEL_ID }}
22+
EKS_CLUSTER_NAME: ${{ secrets.EKS_CLUSTER_NAME }}

‎.github/workflows/update_dependencies.yaml‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Update package dependencies
2+
3+
on:
4+
pull_request:
5+
types: [opened, synchronize]
6+
paths:
7+
- 'package.json'
8+
- 'package-lock.json'
9+
10+
jobs:
11+
update-package-dependencies:
12+
runs-on: ubuntu-latest
13+
if: github.event.pull_request.title contains 'bump @gen3/frontend'
14+
steps:
15+
- uses: actions/checkout@v6
16+
- name: Set up Node
17+
uses: actions/setup-node@v6
18+
with:
19+
node-version: '24.14.0'
20+
- name: Install Dependencies
21+
run: npm install
22+
- name: Update @gen3/core and @gen3/toolsff
23+
run: |
24+
npm install @gen3/core@latest @gen3/toolsff@latest
25+
git config user.name "github-actions[bot]"
26+
git config user.email "github-actions[bot]@users.noreply.github.com"
27+
git commit -am "Update @gen3/core and @gen3/toolsff"
28+
git push

‎.nvmrc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v24.12.0
1+
v24.14.0

0 commit comments

Comments
 (0)