From 41ff064882272c32548f0c9dc433f0572f377615 Mon Sep 17 00:00:00 2001 From: Daniel Hegeman Date: Thu, 18 Jan 2024 06:03:39 -0800 Subject: [PATCH 1/3] fix: re-add repository_dispatch and fix processing image workflow ref (#6548) --- .github/workflows/promote-staging-to-prod.yml | 2 +- .github/workflows/schema-migration.yml | 2 +- .../workflows/trigger-release-candidate-build-and-deploy.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/promote-staging-to-prod.yml b/.github/workflows/promote-staging-to-prod.yml index b7206d5b1d78d..5b61931a8d8fc 100644 --- a/.github/workflows/promote-staging-to-prod.yml +++ b/.github/workflows/promote-staging-to-prod.yml @@ -29,5 +29,5 @@ jobs: build_images_and_create_deployment: needs: merge_staging_to_prod - uses: ./.github/workflows/build-images-and-create-deployment.yml + uses: chanzuckerberg/single-cell-data-portal/.github/workflows/build-images-and-create-deployment.yml@prod secrets: inherit diff --git a/.github/workflows/schema-migration.yml b/.github/workflows/schema-migration.yml index 2fc147006ec6b..ee329bd623b74 100644 --- a/.github/workflows/schema-migration.yml +++ b/.github/workflows/schema-migration.yml @@ -19,7 +19,7 @@ on: jobs: rebuild-processing-images: - uses: ./.github/workflows/rebuild-processing-images.yml + uses: ./.github/workflows/rebuild-processing-image.yml secrets: ECR_REPO: ${{ secrets.ECR_REPO }} AWS_ROLE_TO_ASSUME: ${{ secrets.AWS_ROLE_TO_ASSUME }} diff --git a/.github/workflows/trigger-release-candidate-build-and-deploy.yml b/.github/workflows/trigger-release-candidate-build-and-deploy.yml index 87273140a1a09..ec4e6197c5e01 100644 --- a/.github/workflows/trigger-release-candidate-build-and-deploy.yml +++ b/.github/workflows/trigger-release-candidate-build-and-deploy.yml @@ -53,5 +53,5 @@ jobs: build_images_and_create_deployment: needs: deploy_to_stage_env_on_test_pass_on_main - uses: ./.github/workflows/build-images-and-create-deployment.yml + uses: chanzuckerberg/single-cell-data-portal/.github/workflows/build-images-and-create-deployment.yml@staging secrets: inherit From a42044b389116b680c13ec8c0ed109cd13406237 Mon Sep 17 00:00:00 2001 From: Nayib Gloria <55710092+nayib-jose-gloria@users.noreply.github.com> Date: Thu, 18 Jan 2024 09:40:39 -0500 Subject: [PATCH 2/3] fix: re-add repository dispatch when triggering deployment (#6549) --- .../build-images-and-create-deployment.yml | 2 ++ .github/workflows/promote-staging-to-prod.yml | 12 +++++++----- .../trigger-release-candidate-build-and-deploy.yml | 13 +++++++------ 3 files changed, 16 insertions(+), 11 deletions(-) diff --git a/.github/workflows/build-images-and-create-deployment.yml b/.github/workflows/build-images-and-create-deployment.yml index 9054076e55809..df812e5fcb937 100644 --- a/.github/workflows/build-images-and-create-deployment.yml +++ b/.github/workflows/build-images-and-create-deployment.yml @@ -5,6 +5,8 @@ on: branches: - main - prod + repository_dispatch: + types: [build-images-for-staging, build-images-for-prod] workflow_call: env: # Force using BuildKit instead of normal Docker, required so that metadata diff --git a/.github/workflows/promote-staging-to-prod.yml b/.github/workflows/promote-staging-to-prod.yml index 5b61931a8d8fc..b3443655a38aa 100644 --- a/.github/workflows/promote-staging-to-prod.yml +++ b/.github/workflows/promote-staging-to-prod.yml @@ -16,6 +16,13 @@ jobs: git config user.name "GitHub Actions" git config user.email "actions@github.com" ./scripts/promote_staging_to_prod.sh ${{ secrets.GITHUB_TOKEN }} + - name: Trigger repository_dispatch to build images for staging + if: success() + uses: peter-evans/repository-dispatch@v2 + with: + token: ${{ secrets.GITHUB_TOKEN }} + event-type: build-images-for-prod + client-payload: '{"ref": "refs/heads/prod"}' - name: Send slack notification with @sc-on-call tag if staging not merged into prod if: failure() uses: 8398a7/action-slack@v3 @@ -26,8 +33,3 @@ jobs: if_mention: "always" env: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} - - build_images_and_create_deployment: - needs: merge_staging_to_prod - uses: chanzuckerberg/single-cell-data-portal/.github/workflows/build-images-and-create-deployment.yml@prod - secrets: inherit diff --git a/.github/workflows/trigger-release-candidate-build-and-deploy.yml b/.github/workflows/trigger-release-candidate-build-and-deploy.yml index ec4e6197c5e01..3539285909464 100644 --- a/.github/workflows/trigger-release-candidate-build-and-deploy.yml +++ b/.github/workflows/trigger-release-candidate-build-and-deploy.yml @@ -40,7 +40,13 @@ jobs: git merge --verbose main -m "Merging main branch into staging branch" git push origin staging - + - name: Trigger repository_dispatch to build images for staging + if: success() + uses: peter-evans/repository-dispatch@v2 + with: + token: ${{ secrets.GITHUB_TOKEN }} + event-type: build-images-for-staging + client-payload: '{"ref": "refs/heads/staging"}' - name: Send slack notification if main not merged into staging if: failure() uses: 8398a7/action-slack@v3 @@ -50,8 +56,3 @@ jobs: mention: "here" env: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK }} - - build_images_and_create_deployment: - needs: deploy_to_stage_env_on_test_pass_on_main - uses: chanzuckerberg/single-cell-data-portal/.github/workflows/build-images-and-create-deployment.yml@staging - secrets: inherit From 4c56b4189ff1643e18e8c0ec6a98addcf0753977 Mon Sep 17 00:00:00 2001 From: Ronen Date: Thu, 18 Jan 2024 10:22:18 -0500 Subject: [PATCH 3/3] chore: add disclaimer to source data panel (#6550) --- .../components/InfoPanel/components/SourceData/constants.ts | 4 +++- .../components/InfoPanel/components/SourceData/index.tsx | 3 ++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/frontend/src/views/WheresMyGeneV2/components/InfoPanel/components/SourceData/constants.ts b/frontend/src/views/WheresMyGeneV2/components/InfoPanel/components/SourceData/constants.ts index f52e44aa8fc3f..2ff3916b9956c 100644 --- a/frontend/src/views/WheresMyGeneV2/components/InfoPanel/components/SourceData/constants.ts +++ b/frontend/src/views/WheresMyGeneV2/components/InfoPanel/components/SourceData/constants.ts @@ -1,3 +1,5 @@ export const SOURCE_DATA_INFO_TEXT = "Gene Expression is powered by primary data submitted to CZ CELLxGENE Discover. See "; -export const SOURCE_DATA = "Soure Data for Gene Expression"; +export const SOURCE_DATA = "Source Data for Gene Expression"; +export const SOURCE_DATA_DISCLAIMER = + "We regularly expand our single cell data corpus to improve results. Downloaded data and figures may differ in the future."; diff --git a/frontend/src/views/WheresMyGeneV2/components/InfoPanel/components/SourceData/index.tsx b/frontend/src/views/WheresMyGeneV2/components/InfoPanel/components/SourceData/index.tsx index aa45430a90274..0675990e625d7 100644 --- a/frontend/src/views/WheresMyGeneV2/components/InfoPanel/components/SourceData/index.tsx +++ b/frontend/src/views/WheresMyGeneV2/components/InfoPanel/components/SourceData/index.tsx @@ -14,7 +14,7 @@ import { import { DivTable, DivTableHead } from "src/views/WheresMyGeneV2/common/styles"; import { ROUTES } from "src/common/constants/routes"; import { useConnect } from "./connect"; -import { SOURCE_DATA_INFO_TEXT } from "./constants"; +import { SOURCE_DATA_DISCLAIMER, SOURCE_DATA_INFO_TEXT } from "./constants"; import { StyledTooltip, TooltipContent, @@ -39,6 +39,7 @@ export default function SourceData(): JSX.Element { . + {SOURCE_DATA_DISCLAIMER} Collection