Skip to content

Commit

Permalink
Merge branch 'develop' into sr/dcj-741-refactor-dataset-table
Browse files Browse the repository at this point in the history
  • Loading branch information
s-rubenstein committed Oct 18, 2024
2 parents 86d09e0 + 8919802 commit 8357d4f
Show file tree
Hide file tree
Showing 13 changed files with 155 additions and 107 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners

# These owners will be the default owners for everything in the repo.
* @DataBiosphere/data-custodian-journeys
* @DataBiosphere/dsp-data-team-eng
4 changes: 2 additions & 2 deletions cypress/e2e/about.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ describe('About', function() {
cy.get('#link_about').should(
'have.attr',
'href',
'https://broad-duos.zendesk.com/hc/en-us/articles/360060400311-About-DUOS'
'https://support.terra.bio/hc/en-us/articles/28485372215579-About-DUOS'
);
});

Expand All @@ -20,7 +20,7 @@ describe('About', function() {
cy.get('#link_about').should(
'have.attr',
'href',
'https://broad-duos.zendesk.com/hc/en-us/articles/360060400311-About-DUOS'
'https://support.terra.bio/hc/en-us/articles/28485372215579-About-DUOS'
);
});
});
12 changes: 6 additions & 6 deletions cypress/e2e/home.cy.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,21 +12,21 @@ describe('Home', function() {
cy.contains('Looking for data');
cy.contains('Overview of DUOS');
cy.contains('Machine Readable Consent Guidance.');
cy.get('#zendesk-dac-link').should(
cy.get('#terra-support-dac-link').should(
'have.attr',
'href',
'https://broad-duos.zendesk.com/hc/en-us/articles/360060401131-Data-Access-Committee-User-Guide'
'https://support.terra.bio/hc/en-us/articles/28513346337179-Overview-DUOS-for-Data-Access-Committees-DACs'
);
cy.get('#zendesk-so-link').should(
cy.get('#terra-support-so-link').should(
'have.attr',
'href',
'https://broad-duos.zendesk.com/hc/en-us/articles/360060402751-Signing-Official-User-Guide'
'https://support.terra.bio/hc/en-us/articles/28512587249051-How-to-Pre-Authorize-Researchers-to-Submit-Data-Access-Requests-in-DUOS'
);

cy.get('#zendesk-researcher-link').should(
cy.get('#terra-support-researcher-link').should(
'have.attr',
'href',
'https://broad-duos.zendesk.com/hc/en-us/articles/360060402551-Researcher-User-Guide'
'https://support.terra.bio/hc/en-us/articles/28510385779099-Overview-DUOS-for-Researchers'
);
});

Expand Down
120 changes: 60 additions & 60 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"@mui/icons-material": "5.16.7",
"@mui/material": "5.16.7",
"@mui/utils": "5.16.6",
"@types/node": "22.7.4",
"@types/react-dom": "18.3.0",
"@types/node": "22.7.5",
"@types/react-dom": "18.3.1",
"ajv": "8.17.1",
"ajv-formats": "3.0.1",
"axios": "1.7.7",
Expand All @@ -21,7 +21,7 @@
"moment": "2.30.1",
"noty": "3.2.0-beta",
"oidc-client-ts": "3.1.0",
"query-string": "9.1.0",
"query-string": "9.1.1",
"react": "18.3.1",
"react-dom": "18.3.1",
"react-dropzone": "14.2.9",
Expand Down Expand Up @@ -56,8 +56,8 @@
"cypress:verify": "cypress verify"
},
"devDependencies": {
"@babel/core": "7.25.7",
"@babel/eslint-parser": "7.25.7",
"@babel/core": "7.25.8",
"@babel/eslint-parser": "7.25.8",
"@babel/eslint-plugin": "7.25.7",
"@babel/plugin-proposal-class-properties": "7.18.6",
"@babel/preset-react": "7.25.7",
Expand All @@ -75,7 +75,7 @@
"eslint": "8.56.0",
"eslint-plugin-flowtype": "8.0.3",
"eslint-plugin-react": "7.37.1",
"google-auth-library": "9.14.1",
"google-auth-library": "9.14.2",
"history": "5.3.0",
"html-webpack-plugin": "5.6.0",
"prop-types": "15.8.1",
Expand Down
Loading

0 comments on commit 8357d4f

Please sign in to comment.