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

chore: default catalog to dcp34 (#3854) #3856

Merged
merged 1 commit into from
Jan 14, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .gitlab-ci.cgl-lower-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ build_cgl-dev:
- npm run build-cgl-dev
- cd ..
- cd scripts
- npm run update-sitemap -- catalog=dcp33
- npm run update-sitemap -- catalog=dcp34
only:
- main
build_cgl-ux-dev:
Expand Down
2 changes: 1 addition & 1 deletion .gitlab-ci.cgl-prod-env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ build_prod:
- npm run build-cgl-dcp2
- cd ..
- cd scripts
- npm run update-sitemap -- catalog=dcp33
- npm run update-sitemap -- catalog=dcp34
only:
- prod

Expand Down
2 changes: 1 addition & 1 deletion explorer/site-config/hca-dcp/dev/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import { floating } from "./layout/floating";

// Template constants
const APP_TITLE = "HCA Data Explorer";
const CATALOG = "dcp33";
const CATALOG = "dcp34";
const BROWSER_URL = "https://explore.data.humancellatlas.dev.clevercanary.com";
const DATA_URL = "https://service.azul.data.humancellatlas.org";
const EXPORT_TO_TERRA_URL = "https://app.terra.bio";
Expand Down
5 changes: 3 additions & 2 deletions scripts/update-archive-previews.js
Original file line number Diff line number Diff line change
Expand Up @@ -47,18 +47,19 @@ let client;
});
} else {
hcaApiUrl =
"https://service.azul.data.humancellatlas.org/index/files?filters=%7B%22fileFormat%22%3A%7B%22is%22%3A%5B%22zip%22%2C%22zip.gz%22%2C%22tar%22%2C%22tar.gz%22%5D%7D%7D&size=500&catalog=dcp29";
"https://service.azul.data.humancellatlas.org/index/files?filters=%7B%22fileFormat%22%3A%7B%22is%22%3A%5B%22zip%22%2C%22zip.gz%22%2C%22tar%22%2C%22tar.gz%22%5D%7D%7D&size=500&catalog=dcp34";
if (env === "test") {
bucketName = "cc-archive-preview-test";
client = new S3Client({ region: "us-east-1" });
} else if (env === "prod") {
//wve-data.humancellatlas.org.archive-preview
bucketName = "archive-preview.humancellatlas.org";
client = new S3Client({
region: "us-east-1",
credentials: fromIni({
profile: "platform-hca-prod",
mfaCodeProvider: async (mfaSerial) => {
return "382491";
return "546641";
},
}),
});
Expand Down
5 changes: 1 addition & 4 deletions spa/src/app/files/catalog/catalog-display-name.model.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,7 @@ export enum CatalogDisplayName {
"dcp1" = "DCP 1.0 Data View",
"dcp2" = "DCP 2.0 Data View",
"dcp22" = "DCP 2.0 Data View",
"dcp29" = "",
"dcp30" = "",
"dcp31" = "",
"dcp32" = "",
"dcp33" = "",
"dcp34" = "",
"dcp2ebi" = "DCP2EBI",
}
20 changes: 20 additions & 0 deletions spa/src/app/files/catalog/catalog-update-dcp33.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"catalog": "DCP33",
"runDate": "2023-11-28T19:38:25.762324+00:00",
"new": [
"1ffa2223-28a6-4133-a5a4-badd00faf4bc",
"849ed38c-5917-43c4-a8f9-0782241cf10c",
"5bd01deb-01ee-4611-8efd-cf0ec5f56ac4",
"c7a7fde7-aa8c-4ef0-9424-612b7cd2cdb4",
"645b20c9-5ed0-4500-86b5-7aef770d010a",
"91674dcf-8641-40e6-978d-c1706feffba8",
"1c5eaabf-075b-4b7a-a9e6-07792c2034b3",
"cc35f94e-e93b-4dbd-a08c-702978d9046f"
],
"updated": [
"16e99159-78bc-44aa-b479-55a5e903bf50",
"95f07e6e-6a73-4e1b-a880-c83996b3aa5c",
"4ef86852-aca0-4a91-8522-9968e0e54dbe",
"7f9766ff-bb12-4279-b340-78d140bdd7ba"
]
}
57 changes: 43 additions & 14 deletions spa/src/app/files/catalog/catalog-update.json
Original file line number Diff line number Diff line change
@@ -1,20 +1,49 @@
{
"catalog": "DCP33",
"runDate": "2023-11-28T19:38:25.762324+00:00",
"catalog": "DCP34",
"runDate": "2024-01-14T22:03:51.296040+00:00",
"new": [
"1ffa2223-28a6-4133-a5a4-badd00faf4bc",
"849ed38c-5917-43c4-a8f9-0782241cf10c",
"5bd01deb-01ee-4611-8efd-cf0ec5f56ac4",
"c7a7fde7-aa8c-4ef0-9424-612b7cd2cdb4",
"645b20c9-5ed0-4500-86b5-7aef770d010a",
"91674dcf-8641-40e6-978d-c1706feffba8",
"1c5eaabf-075b-4b7a-a9e6-07792c2034b3",
"cc35f94e-e93b-4dbd-a08c-702978d9046f"
"894ae6ac-5b48-41a8-a72f-315a9b60a62e",
"da77bd06-43ae-4012-a774-e4d62797df51",
"e49e556a-da5a-442a-b45c-8691b457623e",
"6735ff73-1a04-422e-b500-730202e46f8a",
"581de139-461f-4875-b408-56453a9082c7",
"6874b7eb-3445-47ec-8773-75141430e169",
"415eb773-cadb-43d1-ab89-7d160d5cfc7d",
"08fb10df-32e5-456c-9882-e33fcd49077a",
"1dd552a5-eb4f-4b92-8088-7224bcbd0629",
"10a845f7-0361-46fa-92a3-2a36483136b1",
"cbd3d276-9f24-4af9-8381-b11f6cdbdc4b",
"85c0d6fa-f117-4d76-b01a-5d5e8f5f9188",
"925f9a4c-cac0-444a-ad2c-612656ab3a85",
"222a92d5-277b-489c-aad8-a680d1fd2b12",
"2184e63d-82d8-4ab2-839e-e93f8395f568"
],
"updated": [
"16e99159-78bc-44aa-b479-55a5e903bf50",
"95f07e6e-6a73-4e1b-a880-c83996b3aa5c",
"4ef86852-aca0-4a91-8522-9968e0e54dbe",
"7f9766ff-bb12-4279-b340-78d140bdd7ba"
"c4077b3c-5c98-4d26-a614-246d12c2e5d7",
"ef1e3497-515e-4bbe-8d4c-10161854b699",
"c0518445-3b3b-49c6-b8fc-c41daa4eacba",
"8185730f-4113-40d3-9cc3-929271784c2b",
"957261f7-2bd6-4358-a6ed-24ee080d5cfc",
"272b7602-66cd-4b02-a86b-2b7c9c51a9ea",
"849ed38c-5917-43c4-a8f9-0782241cf10c",
"8559a8ed-5d8c-4fb6-bde8-ab639cebf03c",
"34c9a62c-a610-4e31-b343-8fb7be676f8c",
"77dedd59-1376-4887-9bca-dc42b56d5b7a",
"c844538b-8854-4a95-bd01-aacbaf86d97f",
"2f676143-80c2-4bc6-b7b4-2613fe0fadf0",
"ede2e0b4-6652-464f-abbc-0b2d964a25a0",
"58028aa8-0ed2-49ca-b60f-15e2ed5989d5",
"c16a754f-5da3-46ed-8c1e-6426af2ef625",
"cfece4d2-f18d-44ad-a46a-42bbcb5cb3b7",
"65cbfea5-5c54-4255-a1d0-14549a86a5c1",
"daf9d982-7ce6-43f6-ab51-272577290606",
"c1a9a93d-d9de-4e65-9619-a9cec1052eaa",
"5b910a43-7fb5-4ea7-b9d6-43dbd1bf2776",
"bfaedc29-fe84-4e72-a461-75dc8aabbd1b",
"78b2406d-bff2-46fc-8b61-20690e602227",
"abe1a013-af7a-45ed-8c26-f3793c24a1f4",
"3cfcdff5-dee1-4a7b-a591-c09c6e850b11",
"1538d572-bcb7-426b-8d2c-84f3a7f87bb0",
"e526d91d-cf3a-44cb-80c5-fd7676b55a1d"
]
}
2 changes: 1 addition & 1 deletion spa/src/environments/environment.dcp2.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ export const environment = {
production: true,
atlas: "hca",
dataURL: "https://service.azul.data.humancellatlas.org",
defaultCatalog: "dcp33",
defaultCatalog: "dcp34",
browserURL: "https://data.humancellatlas.org",
googleOAuthClientId: "",
portalURL: "https://data.humancellatlas.org",
Expand Down
Loading