Skip to content

Commit

Permalink
Merge branch 'develop' into rj/dt-777-filter-participant-count
Browse files Browse the repository at this point in the history
# Conflicts:
#	cypress/component/DataSearch/dataset_search_filters.spec.js
  • Loading branch information
raejohanek committed Nov 22, 2024
2 parents d03c0bf + f196234 commit e1383f1
Show file tree
Hide file tree
Showing 13 changed files with 26 additions and 39 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/audit.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '22.11.0'
- name: install dependencies
run: npm ci
- name: npm audit
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/component-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@ jobs:
run: echo "${{ github.actor }}"
- name: Checkout
uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '22.11.0'
- name: NPM Install
run: npm ci
- name : Cypress run component tests
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/integration-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@ jobs:
run: echo "${{ github.actor }}"
- name: Checkout
uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: '22.11.0'
- name: NPM Install
run: npm ci
- name: Copy Configs
Expand Down
1 change: 1 addition & 0 deletions .npmrc
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
engine-strict=true
6 changes: 3 additions & 3 deletions DEVNOTES.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# Local Development

1. We use [node@22.6.0](https://github.com/nvm-sh/nvm#installing-and-updating):
1. We use [node@22.11.0](https://docs.volta.sh/guide/understanding):

```
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.1/install.sh | bash
nvm install 22.6.0
volta install 22.11.0
```

2. Install deps:

```
Expand Down
6 changes: 1 addition & 5 deletions cypress/component/Auth/auth.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,7 @@ describe('Auth Failure', function () {
describe('Auth Success', function () {
// Intercept configuration calls
beforeEach(() => {
cy.intercept({
method: 'GET',
url: '/config.json',
hostname: 'localhost',
}, {'env': 'ci'});
cy.initApplicationConfig();
cy.stub(OAuth2, 'getConfig').returns({
'authorityEndpoint': Cypress.config().baseUrl,
'clientId': 'clientId'
Expand Down
6 changes: 1 addition & 5 deletions cypress/component/Auth/oidcBroker.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,7 @@ describe('OidcBroker Failure', function () {
describe('OidcBroker Success', function () {
// Intercept configuration calls
beforeEach(() => {
cy.intercept({
method: 'GET',
url: '/config.json',
hostname: 'localhost',
}, {'env': 'ci'});
cy.initApplicationConfig();
cy.stub(OAuth2, 'getConfig').returns({
'authorityEndpoint': Cypress.config().baseUrl,
'clientId': 'clientId'
Expand Down
7 changes: 1 addition & 6 deletions cypress/component/DataSearch/dataset_search_page.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,8 @@ const duosUser = {
};

describe('Data Library', () => {
// Intercept configuration calls
beforeEach(() => {
cy.intercept({
method: 'GET',
url: '/config.json',
hostname: 'localhost',
}, { 'env': 'ci' });
cy.initApplicationConfig();
});

it('Renders the data library without a query', () => {
Expand Down
6 changes: 1 addition & 5 deletions cypress/component/TermsOfService/tos_acceptance.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,7 @@ const mocks = {
describe('Terms of Service Acceptance Page', function () {
// Intercept configuration calls
beforeEach(async () => {
cy.intercept({
method: 'GET',
url: '/config.json',
hostname: 'localhost',
}, {'env': 'ci'});
cy.initApplicationConfig();
cy.stub(OAuth2, 'getConfig').returns({
'authorityEndpoint': 'authorityEndpoint',
'clientId': 'clientId'
Expand Down
7 changes: 1 addition & 6 deletions cypress/component/UserProfile/user_profile.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,8 @@ const duosUser = {
};

describe('User Profile', () => {
// Intercept configuration calls
beforeEach(() => {
cy.intercept({
method: 'GET',
url: '/config.json',
hostname: 'localhost',
}, {'env': 'ci'});
cy.initApplicationConfig();
});

it('Renders the user profile page', () => {
Expand Down
7 changes: 1 addition & 6 deletions cypress/component/utils/metrics.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,8 @@ import eventList from '../../../src/libs/events';

describe('Metrics Tests', function () {

// Intercept configuration calls
beforeEach(() => {
cy.intercept({
method: 'GET',
url: '/config.json',
hostname: 'localhost',
}, {'env': 'ci'});
cy.initApplicationConfig();
});

Cypress._.each(Object.keys(eventList), (eventType) => {
Expand Down
5 changes: 4 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -92,5 +92,8 @@
"not dead",
"not ie <= 11",
"not op_mini all"
]
],
"engines": {
"node": ">=22.11.0"
}
}
5 changes: 3 additions & 2 deletions src/components/data_search/DatasetSearchTableConstants.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,15 @@ interface DatasetSearchTableTabs {

const makeHeaderStyle = (width: string | number): React.CSSProperties => ({
width,
marginRight: 5
});

const makeRowStyle = (width: string | number): React.CSSProperties => ({
width,
textOverflow: 'ellipsis',
textWrap: 'nowrap',
overflow: 'hidden',
paddingRight: 5
marginRight: 5
});

const trimNewlineCharacters = (str: string): string => str?.replace( /[\r\n]+/gm, '');
Expand Down Expand Up @@ -243,7 +244,7 @@ export const makeDatasetTableHeader = (datasets: DatasetTerm[], selected: number
duosId: '10%',
accessType: '10%',
dataType: '15%',
donorSize: '7%',
donorSize: '10%',
dataLocation: '13%',
dataUse: '10%',
exportToTerra: 100,
Expand Down

0 comments on commit e1383f1

Please sign in to comment.