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.

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

dev > release GAT-5664 #1110

Merged
merged 3 commits into from
Nov 6, 2024
Merged

dev > release GAT-5664 #1110

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ddb4cdb
GAT-5664 :: www to old
dnhdruk Nov 6, 2024
d7458c5
Merge pull request #1109 from HDRUK/features/GAT-5664
dnhdruk Nov 6, 2024
83cacc9
Merge branch 'release' into dev
dnhdruk Nov 6, 2024
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
4 changes: 2 additions & 2 deletions src/resources/dataset/__mocks__/datasets.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ export const v2DatasetsStub = [
pid: 'b67f0edd-fed2-4d68-a25f-d225759aa3b0',
id: 'dfb21b3b-7fd9-40c4-892e-810edd6dfc25',
version: '0.0.1',
identifier: 'https://web.www.healthdatagateway.org/dataset/dfb21b3b-7fd9-40c4-892e-810edd6dfc25',
identifier: 'https://web.old.healthdatagateway.org/dataset/dfb21b3b-7fd9-40c4-892e-810edd6dfc25',
revisions: {
'0.0.1': 'dfb21b3b-7fd9-40c4-892e-810edd6dfc25',
latest: 'dfb21b3b-7fd9-40c4-892e-810edd6dfc25',
Expand Down Expand Up @@ -252,7 +252,7 @@ export const v2DatasetsStub = [
pid: 'b67f0edd-fed2-4d68-a25f-d225759aa3b0',
id: 'dfb21b3b-7fd9-40c4-892e-810edd6dfc25',
version: '0.0.1',
identifier: 'https://web.www.healthdatagateway.org/dataset/dfb21b3b-7fd9-40c4-892e-810edd6dfc25',
identifier: 'https://web.old.healthdatagateway.org/dataset/dfb21b3b-7fd9-40c4-892e-810edd6dfc25',
revisions: {
'0.0.1': 'dfb21b3b-7fd9-40c4-892e-810edd6dfc25',
latest: 'dfb21b3b-7fd9-40c4-892e-810edd6dfc25',
Expand Down
2 changes: 1 addition & 1 deletion src/resources/dataset/dataset.entity.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export default class DatasetClass extends Entity {
const transformedObject = this.transformTo(transformer, { strict: false });

// Manually update identifier URL link
transformedObject.dataset.identifier = `https://web.www.healthdatagateway.org/dataset/${this.datasetid}`;
transformedObject.dataset.identifier = `https://web.old.healthdatagateway.org/dataset/${this.datasetid}`;

// Append static schema details for v2
transformedObject.dataset['@schema'] = {
Expand Down
2 changes: 1 addition & 1 deletion src/resources/project/__mocks__/projects.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@ export const projectsStub = [
"id": 7635028705590892,
"type": "project",
"name": "How can NCS healthcare data be connected with wastewater surveillance of COVID-19 in a privacy-preserving fashion to inform epidemiological models and democratise data access?",
"link": "https://web.www.healthdatagateway.org/project/7635028705590892",
"link": "https://web.old.healthdatagateway.org/project/7635028705590892",
"description": "Wastewater-based epidemiology (WBE), i.e. the monitoring of public health using samples collected from sewerage systems, offers the unique opportunity to make healthcare data widely available without compromising the privacy of individuals: by their very nature, sewerage systems aggregate the signal from thousands of people, diminishing the ability to identify any one individual. In addition to ongoing work modelling the relationship between case numbers and wastewater data, this project will deliver five additional benefits:\n* provide data on COVID-19 related hospital admissions and symptoms as a complementary signal to refine WBE modelling with higher spatiotemporal resolution than is currently available.\n* develop standards for exchanging WBE data that support automatic validation, increasing our confidence in the data.\nprovide consistent methods to aggregate healthcare data to catchment areas across England, Scotland, and Wales.\n* develop sound, privacy-preserving aggregation methods for sensitive data in the context of WBE that could help address future public health concerns, e.g. influenza outbreaks or illicit drug consumption.\n* subject to privacy due diligence, generate data products that can be shared publicly, aligning with the government’s open data strategy and allowing a broader audience to participate in WBE.\n",
"resultsInsights": "",
"activeflag": "active",
Expand Down
2 changes: 1 addition & 1 deletion src/resources/utilities/ga4gh.utils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ const _buildGa4ghVisas = async user => {
type: 'ControlledAccessGrants',
asserted: dar.dateFinalStatus.getTime(), //date DAR was approved
value: dar.pids.map(pid => {
return 'https://web.www.healthdatagateway.org/dataset/' + pid;
return 'https://web.old.healthdatagateway.org/dataset/' + pid;
}), //URL to each dataset that they have been approved for
source: 'https://www.healthdatagateway.org',
by: 'dac',
Expand Down
2 changes: 1 addition & 1 deletion src/utils/schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
"title": "Dataset identifier",
"$comment": "http://purl.org/dc/terms/identifier",
"examples": [
["226fb3f1-4471-400a-8c39-2b66d46a39b6", "https://web.www.healthdatagateway.org/dataset/226fb3f1-4471-400a-8c39-2b66d46a39b6"]
["226fb3f1-4471-400a-8c39-2b66d46a39b6", "https://web.old.healthdatagateway.org/dataset/226fb3f1-4471-400a-8c39-2b66d46a39b6"]
],
"description": "System dataset identifier",
"anyOf": [
Expand Down
Loading