Merge branch 'main' into thuang-5397-next-upgrade

chanzuckerberg · Jan 18, 2024 · 68108ef · 68108ef
2 parents 0275cad + 4c56b41
commit 68108ef
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 14 deletions.
diff --git 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
@@ -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: ./.github/workflows/build-images-and-create-deployment.yml
-    secrets: inherit
diff --git 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
@@ -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: ./.github/workflows/build-images-and-create-deployment.yml
-    secrets: inherit
diff --git 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
@@ -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 {
           </a>
           .
         </InfoText>
+        <InfoText>{SOURCE_DATA_DISCLAIMER}</InfoText>
         <DivTable data-testid="source-data-list">
           <DivTableHead>
             <StyledDivTableCell>Collection</StyledDivTableCell>