Skip to content

chore: [hca dcp] clean up unused dev/cc-ma-dev site-configs, relocate makeconfig to ma-dev (#4820) #4826

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.

Sign up for GitHub

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

Open
frano-m wants to merge 5 commits into
base: main
Choose a base branch
from
Open

chore: [hca dcp] clean up unused dev/cc-ma-dev site-configs, relocate makeconfig to ma-dev (#4820) #4826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
582bd0a
chore: [hca dcp] clean up unused dev/cc-ma-dev site-configs, relocate…
frano-m May 12, 2026
8e25ef1
chore: [hca dcp] simplify export configs, fix deploy scripts, update …
frano-m May 13, 2026
d6bf38f
chore: [hca dcp] share category_config with lungmap (#4820)
frano-m May 13, 2026
a6caf48
chore: delete unused cc-ma-pilot preview deploy script (#4820)
frano-m May 13, 2026
be87edf
fix: align ma-prod sitemap domain with browser url (#4820)
frano-m May 13, 2026
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,5 @@ To update HCA scripts in the HCA Data Explorer, navigate to the `explorer` direc
```bash
npm run get-cellxgene-projects-hca
```
This will save any updates to `explorer/site-config/hca-dcp/dev/scripts/out/cellxgene-projects.json` based on HCA links provided by CELLxGENE.
This will save any updates to `explorer/site-config/hca-dcp/ma-dev/scripts/out/cellxgene-projects.json` based on HCA links provided by CELLxGENE.

6 changes: 0 additions & 6 deletions app/config/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,8 @@ import anvilCmgCCDev from "../../site-config/anvil-cmg/cc-dev/config";
import anvilCmgDev from "../../site-config/anvil-cmg/dev/config";
import anvilCmgProd from "../../site-config/anvil-cmg/prod/config";
import anvilCmgTempdev from "../../site-config/anvil-cmg/tempdev/config";
import hcaDcpCCMaDev from "../../site-config/hca-dcp/cc-ma-dev/config";
import hcaDcpDev from "../../site-config/hca-dcp/dev/config";
import hcaDcpMaDev from "../../site-config/hca-dcp/ma-dev/config";
import hcaDcpMaProd from "../../site-config/hca-dcp/ma-prod/config";
import hcaDcpProd from "../../site-config/hca-dcp/prod/config";
import lungMapDev from "../../site-config/lungmap/dev/config";
import lungMapProd from "../../site-config/lungmap/prod/config";

Expand All @@ -21,11 +18,8 @@ const CONFIGS: { [k: string]: SiteConfig } = {
"anvil-cmg-dev": anvilCmgDev,
"anvil-cmg-prod": anvilCmgProd,
"anvil-cmg-tempdev": anvilCmgTempdev,
"hca-dcp-cc-ma-dev": hcaDcpCCMaDev,
"hca-dcp-dev": hcaDcpDev,
"hca-dcp-ma-dev": hcaDcpMaDev,
"hca-dcp-ma-prod": hcaDcpMaProd,
"hca-dcp-prod": hcaDcpProd,
"lungmap-dev": lungMapDev,
"lungmap-prod": lungMapProd,
};
Expand Down
2 changes: 1 addition & 1 deletion app/viewModelBuilders/azul/hca-dcp/common/projectMapper/projectEdits/projectEdits.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import cellxgeneProjects from "../../../../../../../site-config/hca-dcp/dev/scripts/out/cellxgene-projects.json";
import cellxgeneProjects from "../../../../../../../site-config/hca-dcp/ma-dev/scripts/out/cellxgene-projects.json";
import { baseProjectEdits, CZ_CELLXGENE } from "./constants";
import { CellxGeneProjectMapping, ProjectEdit } from "./entities";

Expand Down
32 changes: 5 additions & 27 deletions app/viewModelBuilders/azul/hca-dcp/common/viewModelBuilders.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,11 +54,7 @@ import {
HCA_DCP_CATEGORY_KEY,
HCA_DCP_CATEGORY_LABEL,
} from "../../../../../site-config/hca-dcp/category";
import {
ROUTE_BULK_DOWNLOAD,
ROUTE_EXPORT_TO_TERRA,
ROUTE_MANIFEST_DOWNLOAD,
} from "../../../../../site-config/hca-dcp/dev/export/constants";
import { EXPORT_ROUTE } from "../../../../../site-config/hca-dcp/ma-dev/export/routes";
import {
processAggregatedBooleanOrArrayValue,
processAggregatedOrArrayValue,
Expand Down Expand Up @@ -959,7 +955,7 @@ export const buildExportMethodBulkDownload = (
return {
...getExportMethodAccessibility(viewContext),
description: "Obtain a curl command for downloading the selected data.",
route: ROUTE_BULK_DOWNLOAD,
route: EXPORT_ROUTE.BULK_DOWNLOAD,
title: "Download Study Data and Metadata (Curl Command)",
trackingId: "button-request-bulk-download",
};
Expand Down Expand Up @@ -1030,7 +1026,7 @@ export const buildExportMethodManifestDownload = (
...getExportMethodAccessibility(viewContext),
description:
"Request a file manifest for the current query containing the full list of selected files and the metadata for each file.",
route: ROUTE_MANIFEST_DOWNLOAD,
route: EXPORT_ROUTE.MANIFEST_DOWNLOAD,
title: "Download a File Manifest with Metadata for the Selected Data",
trackingId: "button-request-file-manifest",
};
Expand All @@ -1050,7 +1046,7 @@ export const buildExportMethodTerra = (
...getExportMethodAccessibility(viewContext),
description:
"Terra is a biomedical research platform to analyze data using workflows, Jupyter Notebooks, RStudio, and Galaxy.",
route: ROUTE_EXPORT_TO_TERRA,
route: EXPORT_ROUTE.EXPORT_TO_TERRA,
title: "Export Study Data and Metadata to Terra Workspace",
trackingId: "button-analyze-in-terra",
};
Expand Down Expand Up @@ -1248,24 +1244,6 @@ export function getExportSelectedDataSummary(
]);
}

/**
* Build props for project BackPageHero component from the given projects response.
* @param projectsResponse - Response model return from projects API.
* @param viewContext - View context.
* @returns model to be used as props for the BackPageHero component.
*/
export const buildHero = (
projectsResponse: ProjectsResponse,
viewContext: ViewContext<ProjectsResponse>
): React.ComponentProps<typeof C.BackPageHero> => {
return {
actions: getProjectCallToAction(projectsResponse),
breadcrumbs: getProjectBreadcrumbs(projectsResponse, viewContext),
subTitle: getProjectAggregateLastModifiedDate(projectsResponse),
title: processEntityValue(projectsResponse.projects, "projectTitle"),
};
};

/**
* Build props for managed access BackPageHero component from the given projects response.
* @param projectsResponse - Response model return from projects API.
Expand Down Expand Up @@ -2164,7 +2142,7 @@ export function getProjectBreadcrumbs(
* @param projectsResponse - Response model return from projects API.
* @returns model to be used as props for the BackPageHeroActions component.
*/
function getProjectCallToAction(
export function getProjectCallToAction(
projectsResponse: ProjectsResponse
): ReactElement | null {
const isReady = isResponseReady(projectsResponse);
Expand Down
22 changes: 22 additions & 0 deletions app/viewModelBuilders/azul/lungmap/common/viewModelBuilders.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import {
HCA_DCP_CATEGORY_KEY,
HCA_DCP_CATEGORY_LABEL,
} from "../../../../../site-config/hca-dcp/category";
import { processEntityValue } from "../../../../apis/azul/common/utils";
import { ProjectsResponse } from "../../../../apis/azul/hca-dcp/common/responses";
import * as C from "../../../../components";
import * as MDX from "../../../../components/common/MDXContent/lungmap";
Expand All @@ -24,6 +25,9 @@ import {
getGeneratedMatricesGenusSpeciesColumnDef,
getGeneratedMatricesLibraryConstructionMethodColumnDef,
getGeneratedMatricesMatrixCellCountColumnDef,
getProjectAggregateLastModifiedDate,
getProjectBreadcrumbs,
getProjectCallToAction,
getProjectResponse,
} from "../../hca-dcp/common/viewModelBuilders";

Expand Down Expand Up @@ -113,6 +117,24 @@ export const buildExportToTerra = (
};
};

/**
* Build props for project BackPageHero component from the given projects response.
* @param projectsResponse - Response model return from projects API.
* @param viewContext - View context.
* @returns model to be used as props for the BackPageHero component.
*/
export const buildHero = (
projectsResponse: ProjectsResponse,
viewContext: ViewContext<ProjectsResponse>
): React.ComponentProps<typeof C.BackPageHero> => {
return {
actions: getProjectCallToAction(projectsResponse),
breadcrumbs: getProjectBreadcrumbs(projectsResponse, viewContext),
subTitle: getProjectAggregateLastModifiedDate(projectsResponse),
title: processEntityValue(projectsResponse.projects, "projectTitle"),
};
};

/**
* Build props for ManifestDownload component.
* @param _ - Unused.
Expand Down
1 change: 0 additions & 1 deletion cc-dev-deploy-all.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ scripts=(
"./cc-data-browser.lungmap.dev.clevercanary.com-deploy.sh"
"./cc-explore.anvilproject.dev.clevercanary.com-deploy.sh"
"./cc-explore.data.humancellatlas.dev.clevercanary.com-deploy.sh"
"./cc-ma-pilot.explore.data.humancellatlas.dev.clevercanary.com-deploy.sh"
)


Expand Down
2 changes: 1 addition & 1 deletion cc-explore.data.humancellatlas.dev.clevercanary.com-deploy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ n 22.12.0
npm ci

# Build
Copy link
Copy Markdown
Contributor Author

@frano-m frano-m May 13, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for catching this. Good observation, but the mismatch is pre-existing rather than a regression from this PR. On main this script invokes npm run build-dev:hca-dcp, which doesn't exist in package.json — the script was already broken. The PR repointed it to the surviving build-ma-dev:hca-dcp so it actually runs; the UCSC sitemap-domain quirk surfaces only because the script is now functional. cc @NoopDog — happy to handle in a follow-up (either a per-deploy NEXT_PUBLIC_SITEMAP_DOMAIN=... override in the .sh, or a CC-specific site-config env) if you'd like, but flagging that this isn't strictly introduced here.

npm run build-dev:hca-dcp
npm run build-ma-dev:hca-dcp

export BUCKET=s3://tha-explore.data.humancellatlas.dev/
export SRCDIR=out/
Expand Down
18 changes: 0 additions & 18 deletions cc-ma-pilot.explore.data.humancellatlas.dev.clevercanary.com-deploy.sh
View file
Open in desktop

This file was deleted.

14 changes: 5 additions & 9 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,29 +4,25 @@
"private": true,
"scripts": {
"dev:anvil-catalog": "./scripts/dev.sh anvil-catalog dev && ./scripts/set-version.sh dev && next dev",
"build-dev:anvil-catalog": "scripts/common-build.sh anvil-catalog dev && ./scripts/set-version.sh && next build && npm run postbuild",
"build-dev:anvil-catalog": "scripts/common-build.sh anvil-catalog dev && ./scripts/set-version.sh && next build && npm run postbuild",
"build-prod:anvil-catalog": "./scripts/common-build.sh anvil-catalog prod && ./scripts/set-version.sh && next build && npm run postbuild",
"dev:lungmap": "./scripts/dev.sh lungmap dev && ./scripts/set-version.sh dev && next dev",
"build-dev:lungmap": "./scripts/common-build.sh lungmap dev && ./scripts/set-version.sh && next build && npm run postbuild",
"build-prod:lungmap": "./scripts/common-build.sh lungmap prod && ./scripts/set-version.sh && next build && npm run postbuild",
"dev:anvil-cmg": "./scripts/dev.sh anvil-cmg dev && ./scripts/set-version.sh dev && next dev",
"build:anvil-cmg": "./scripts/build.sh anvil-cmg && ./scripts/set-version.sh && next build && npm run postbuild",
"build-cc-dev:anvil-cmg": "./scripts/common-build.sh anvil-cmg cc-dev && ./scripts/set-version.sh && next build && npm run postbuild",
"dev:hca-dcp": "./scripts/dev.sh hca-dcp dev && ./scripts/set-version.sh dev && next dev",
"dev:cc-ma-dev:hca-dcp": "./scripts/dev.sh hca-dcp cc-ma-dev && ./scripts/set-version.sh dev && next dev",
"build-dev:hca-dcp": "./scripts/common-build.sh hca-dcp dev && ./scripts/set-version.sh && next build && npm run postbuild",
"build-cc-ma-dev:hca-dcp": "./scripts/common-build.sh hca-dcp cc-ma-dev && ./scripts/set-version.sh && next build && npm run postbuild",
"build-ma-dev:hca-dcp": "./scripts/common-build.sh hca-dcp ma-dev && ./scripts/set-version.sh && next build && npm run postbuild",
"build-ma-prod:hca-dcp": "./scripts/common-build.sh hca-dcp ma-prod && ./scripts/set-version.sh && next build && npm run postbuild",
"build-prod:hca-dcp": "./scripts/build.sh hca-dcp prod && ./scripts/set-version.sh && next build && npm run postbuild",
"dev:hca-dcp": "./scripts/dev.sh hca-dcp ma-dev && ./scripts/set-version.sh dev && next dev",
"build-ma-dev:hca-dcp": "./scripts/common-build.sh hca-dcp ma-dev && ./scripts/set-version.sh && next build && npm run postbuild",
"build-ma-prod:hca-dcp": "./scripts/common-build.sh hca-dcp ma-prod && ./scripts/set-version.sh && next build && npm run postbuild",
"postbuild": "next-sitemap --config next-sitemap.config.mjs",
"start": "npx serve out",
"lint": "next lint --dir .",
"check-format": "prettier --check .",
"prepare": "husky",
"test": "jest --watch",
"test:e2e": "playwright test",
"get-cellxgene-projects-hca": "esrun ./site-config/hca-dcp/dev/scripts/get-cellxgene-projects.ts ",
"get-cellxgene-projects-hca": "esrun ./site-config/hca-dcp/ma-dev/scripts/get-cellxgene-projects.ts ",
"test:anvil-cmg": "playwright test -c playwright_anvil.config.ts --trace retain-on-failure",
"test:anvil-catalog": "playwright test -c playwright_anvil-catalog.config.ts --trace retain-on-failure",
"check-system-status:anvil-cmg": "esrun e2e/anvil/anvil-check-system-status.ts"
Expand Down
2 changes: 0 additions & 2 deletions site-config/hca-dcp/cc-ma-dev/.env
View file
Open in desktop

This file was deleted.

13 changes: 0 additions & 13 deletions site-config/hca-dcp/cc-ma-dev/authentication/authentication.ts
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions site-config/hca-dcp/cc-ma-dev/authentication/constants.ts
View file
Open in desktop

This file was deleted.

56 changes: 0 additions & 56 deletions site-config/hca-dcp/cc-ma-dev/config.ts
View file
Open in desktop

This file was deleted.

Loading
Loading