diff --git a/.gitlab-ci.cgl-lower-env.yml b/.gitlab-ci.cgl-lower-env.yml index e955ca61d..89fb02024 100644 --- a/.gitlab-ci.cgl-lower-env.yml +++ b/.gitlab-ci.cgl-lower-env.yml @@ -61,7 +61,7 @@ build_cgl-dev: - npm run build-cgl-dev - cd .. - cd scripts - - npm run update-sitemap -- catalog=dcp32 + - npm run update-sitemap -- catalog=dcp33 only: - main build_cgl-ux-dev: diff --git a/.gitlab-ci.cgl-prod-env.yml b/.gitlab-ci.cgl-prod-env.yml index 1c682aa79..599232d2d 100644 --- a/.gitlab-ci.cgl-prod-env.yml +++ b/.gitlab-ci.cgl-prod-env.yml @@ -61,7 +61,7 @@ build_prod: - npm run build-cgl-dcp2 - cd .. - cd scripts - - npm run update-sitemap -- catalog=dcp32 + - npm run update-sitemap -- catalog=dcp33 only: - prod diff --git a/explorer/site-config/hca-dcp/dev/config.ts b/explorer/site-config/hca-dcp/dev/config.ts index 1a1f6b50d..ff7919b4f 100644 --- a/explorer/site-config/hca-dcp/dev/config.ts +++ b/explorer/site-config/hca-dcp/dev/config.ts @@ -139,7 +139,7 @@ const config: SiteConfig = { size: PAGINATION_PAGE_SIZE, }, defaultParams: { - catalog: "dcp32", + catalog: "dcp33", }, url: "https://service.azul.data.humancellatlas.org/", }, diff --git a/spa/src/app/files/catalog/catalog-display-name.model.ts b/spa/src/app/files/catalog/catalog-display-name.model.ts index e90147d68..579c67e43 100644 --- a/spa/src/app/files/catalog/catalog-display-name.model.ts +++ b/spa/src/app/files/catalog/catalog-display-name.model.ts @@ -13,5 +13,6 @@ export enum CatalogDisplayName { "dcp30" = "", "dcp31" = "", "dcp32" = "", + "dcp33" = "", "dcp2ebi" = "DCP2EBI", } diff --git a/spa/src/app/files/catalog/catalog-update-dcp32.json b/spa/src/app/files/catalog/catalog-update-dcp32.json new file mode 100644 index 000000000..a3526235a --- /dev/null +++ b/spa/src/app/files/catalog/catalog-update-dcp32.json @@ -0,0 +1,20 @@ +{ + "catalog": "DCP32", + "runDate": "2023-10-31T05:22:55.527826+00:00", + "new": [ + "dcc28fb3-7bab-48ce-bc4b-684c00e133ce", + "72ff4818-5692-4bbc-8886-e47763531023", + "421bc6cd-bbb4-4398-ac60-a32ea94f02ae", + "48f60534-ba4e-45bc-aa5b-6d3a6c45962e", + "cfece4d2-f18d-44ad-a46a-42bbcb5cb3b7", + "bfaedc29-fe84-4e72-a461-75dc8aabbd1b", + "c412be53-cf95-47c7-980c-c0a0caa2d3a0" + ], + "updated": [ + "53c53cd4-8127-4e12-bc7f-8fe1610a715c", + "0792db34-8047-4e62-802c-9177c9cd8e28", + "67a3de09-45b9-49c3-a068-ff4665daa50e", + "376a7f55-b876-4f60-9cf3-ed7bc83d5415", + "2a72a4e5-66b2-405a-bb7c-1e463e8febb0" + ] +} diff --git a/spa/src/app/files/catalog/catalog-update.json b/spa/src/app/files/catalog/catalog-update.json index a3526235a..1f9706133 100644 --- a/spa/src/app/files/catalog/catalog-update.json +++ b/spa/src/app/files/catalog/catalog-update.json @@ -1,20 +1,20 @@ { - "catalog": "DCP32", - "runDate": "2023-10-31T05:22:55.527826+00:00", + "catalog": "DCP33", + "runDate": "2023-11-28T19:38:25.762324+00:00", "new": [ - "dcc28fb3-7bab-48ce-bc4b-684c00e133ce", - "72ff4818-5692-4bbc-8886-e47763531023", - "421bc6cd-bbb4-4398-ac60-a32ea94f02ae", - "48f60534-ba4e-45bc-aa5b-6d3a6c45962e", - "cfece4d2-f18d-44ad-a46a-42bbcb5cb3b7", - "bfaedc29-fe84-4e72-a461-75dc8aabbd1b", - "c412be53-cf95-47c7-980c-c0a0caa2d3a0" + "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": [ - "53c53cd4-8127-4e12-bc7f-8fe1610a715c", - "0792db34-8047-4e62-802c-9177c9cd8e28", - "67a3de09-45b9-49c3-a068-ff4665daa50e", - "376a7f55-b876-4f60-9cf3-ed7bc83d5415", - "2a72a4e5-66b2-405a-bb7c-1e463e8febb0" + "16e99159-78bc-44aa-b479-55a5e903bf50", + "95f07e6e-6a73-4e1b-a880-c83996b3aa5c", + "4ef86852-aca0-4a91-8522-9968e0e54dbe", + "7f9766ff-bb12-4279-b340-78d140bdd7ba" ] } diff --git a/spa/src/environments/environment.dcp2.ts b/spa/src/environments/environment.dcp2.ts index 38e5d9c4c..1b0701b33 100644 --- a/spa/src/environments/environment.dcp2.ts +++ b/spa/src/environments/environment.dcp2.ts @@ -2,7 +2,7 @@ export const environment = { production: true, atlas: "hca", dataURL: "https://service.azul.data.humancellatlas.org", - defaultCatalog: "dcp32", + defaultCatalog: "dcp33", browserURL: "https://data.humancellatlas.org", googleOAuthClientId: "", portalURL: "https://data.humancellatlas.org",