Skip to content

Commit

Permalink
Merge pull request #448 from PagerDuty/release/0.13.0-beta.0
Browse files Browse the repository at this point in the history
[Release] v0.13.0 beta.0
  • Loading branch information
gsreynolds authored Jun 17, 2024
2 parents ad0aa3a + fd097b2 commit 7a2793d
Show file tree
Hide file tree
Showing 69 changed files with 4,524 additions and 726 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cd-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ jobs:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
- name: Install project dependencies (via cache)
run: yarn --prefer-offline
run: yarn --frozen-lockfile --prefer-offline --ignore-optional
- name: Build application bundle
run: yarn build
- name: Deploy
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,6 @@ jobs:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
- name: Install project dependencies (via cache)
run: yarn --prefer-offline
run: yarn --frozen-lockfile --prefer-offline --ignore-optional
- name: Run ESLint
run: npx eslint src --ext .js,.jsx,.ts,.tsx --exit-on-fatal-error
9 changes: 5 additions & 4 deletions .github/workflows/test-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ jobs:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
- name: Install project dependencies (via cache)
run: yarn --prefer-offline
run: yarn --frozen-lockfile --prefer-offline --ignore-optional

jest:
needs: install
Expand All @@ -54,15 +54,15 @@ jobs:
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
- name: Install project dependencies (via cache)
run: yarn --prefer-offline
run: yarn --frozen-lockfile --prefer-offline --ignore-optional
- name: Run Jest Tests
run: yarn jest

cypress-run:
needs: install
runs-on: ubuntu-latest
container:
image: cypress/browsers:node-20.5.0-chrome-114.0.5735.133-1-ff-114.0.2-edge-114.0.1823.51-1
image: cypress/browsers:node-20.14.0-chrome-125.0.6422.141-1-ff-126.0.1-edge-125.0.2535.85-1
options: --user 1001
strategy:
fail-fast: false
Expand Down Expand Up @@ -102,7 +102,7 @@ jobs:
# Starts web server for E2E tests - replace with your own server invocation
# https://docs.cypress.io/guides/continuous-integration/introduction#Boot-your-server
start: yarn start
wait-on: 'http://localhost:3000' # Waits for above
wait-on: 'http://127.0.0.1:3000' # Waits for above
browser: chrome
# Records to Cypress Cloud
# https://docs.cypress.io/guides/cloud/projects#Set-up-a-project-to-record
Expand All @@ -111,6 +111,7 @@ jobs:
spec: cypress/e2e/${{ matrix.e2e }}
parallel: false # Don't use Cypress in-built parallelization
install: true
install-command: yarn --frozen-lockfile --prefer-offline --ignore-optional
cache-key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
env:
# For recording and parallelization to work you must set your CYPRESS_RECORD_KEY
Expand Down
4 changes: 2 additions & 2 deletions .tool-versions
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# MUST match .node-version
nodejs 20.5.1
yarn 1.22.19
nodejs 20.14.0
yarn 1.22.22
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ If you wish to maintain + deploy your own version of PagerDuty Live, we recommen

#### Local Development

1. Install [NodeJS v20.5.1](https://nodejs.org/en/blog/release/v20.5.1/) via [`asdf install`](https://github.com/asdf-vm/asdf) / [`nvm`](https://github.com/nvm-sh/nvm)
1. Install [NodeJS v20.14.0](https://nodejs.org/en/blog/release/v20.14.0/) via [`asdf install`](https://github.com/asdf-vm/asdf) / [`nvm`](https://github.com/nvm-sh/nvm)

2. `$ git clone` repo to desired destination and `$ cd pd-live-react` into directory

Expand Down
2 changes: 1 addition & 1 deletion cypress.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module.exports = defineConfig({
config.env.PD_USER_TOKEN = process.env.VITE_PD_USER_TOKEN;
return config;
},
baseUrl: 'http://localhost:3000/pd-live-react',
baseUrl: 'http://127.0.0.1:3000/pd-live-react',
specPattern: 'cypress/e2e/**/*.spec.{js,ts,jsx,tsx}',
testIsolation: true,
},
Expand Down
8 changes: 8 additions & 0 deletions cypress/e2e/Search/search.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -113,4 +113,12 @@ describe('Search Incidents', { failFast: { enabled: true } }, () => {
cy.get('#service-filter-icon').realHover();
cy.get('button[aria-label="Clear Filter"]').filter(':visible').click();
});

it('Column filtering on Service column for `zzzzzz` returns no incidents and clear filters button', () => {
cy.get('#service-filter-icon').realHover();
cy.get('input[placeholder="Filter"]').filter(':visible').click().type('zzzzzz');
cy.get('.empty-incidents-badge').should('be.visible');
cy.get('#clear-filters-button').filter(':visible').click();
waitForIncidentTable();
});
});
10 changes: 10 additions & 0 deletions cypress/e2e/app.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -112,4 +112,14 @@ describe('PagerDuty Live', { failFast: { enabled: true } }, () => {
cy.get('iframe[title="TestExtra"]');
// would need to enable cross-domain iframe javascript access to test further
});

it('Application correctly renders the catastrophe modal', () => {
cy
.window()
.its('store')
.invoke('dispatch', { type: 'CATASTROPHE' });

cy.get('header').contains('Catastrophic Error');
cy.get('p').contains('The application will restart');
});
});
23 changes: 13 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,18 +1,19 @@
{
"name": "pd-live-react",
"homepage": "https://pagerduty.github.io/pd-live-react",
"version": "0.12.2-beta.0",
"version": "0.13.0-beta.0",
"private": true,
"dependencies": {
"@chakra-ui/icons": "^2.1.1",
"@chakra-ui/react": "^2.8.0",
"@datadog/browser-rum": "^4.47.0",
"@datadog/browser-rum": "^5.14.0",
"@datadog/datadog-ci": "^2.37.0",
"@emotion/react": "^11.11.1",
"@emotion/styled": "^11.11.0",
"@fortawesome/fontawesome-svg-core": "^6.4.2",
"@fortawesome/free-brands-svg-icons": "^6.4.2",
"@fortawesome/free-regular-svg-icons": "^6.5.1",
"@fortawesome/free-solid-svg-icons": "^6.4.2",
"@fortawesome/free-solid-svg-icons": "^6.5.2",
"@fortawesome/react-fontawesome": "^0.2.0",
"@pagerduty/pdjs": "^2.2.3",
"@types/jest": "^29.5.12",
Expand All @@ -37,16 +38,17 @@
"moment": "^2.29.4",
"pretty-print-error": "^1.1.1",
"react": "^18",
"react-bootstrap": "^2.9.1",
"react-bootstrap": "^2.10.2",
"react-contextmenu": "^2.14.0",
"react-datepicker": "^4.21.0",
"react-dnd": "^16.0.1",
"react-dnd-html5-backend": "^16.0.1",
"react-dom": "^18",
"react-error-boundary": "^4.0.13",
"react-i18next": "^13.2.0",
"react-icons": "^4.9.0",
"react-icons": "^5.2.1",
"react-minimal-pie-chart": "^8.4.0",
"react-redux": "^8.1.2",
"react-redux": "^9.1.2",
"react-select": "^5.7.7",
"react-table": "^7.8.0",
"react-window": "^1.8.8",
Expand All @@ -61,6 +63,7 @@
"scripts": {
"start": "vite",
"build": "npx genversion src/config/version.js --semi --es6 && vite build",
"sourcemaps": "datadog-ci sourcemaps upload build --service=pd-live-react --release-version=$(node -e 'console.log(require(__dirname + `/package.json`).version)') --project-path=./ --minified-path-prefix=/pd-live-react/",
"genversion": "npx genversion src/config/version.js --semi --es6",
"jest": "npx jest",
"cypress:open": "npx cypress open --browser chrome --e2e",
Expand Down Expand Up @@ -99,7 +102,7 @@
"@babel/eslint-parser": "^7.22.10",
"@babel/preset-env": "^7.22.10",
"@babel/preset-react": "^7.22.5",
"@cypress/react": "^8.0.0",
"@cypress/react": "^8.0.2",
"@faker-js/faker": "^8.0.2",
"@testing-library/dom": "^9.3.4",
"@testing-library/jest-dom": "^6.1.4",
Expand Down Expand Up @@ -142,12 +145,12 @@
"prettier-eslint-cli": "^8.0.1",
"redux-mock-store": "^1.5.4",
"redux-saga-test-plan": "^4.0.6",
"sass": "^1.66.1",
"sass": "^1.77.5",
"string.prototype.replaceall": "^1.0.6",
"vite": "^4.5.2",
"vite": "^4.5.3",
"vite-plugin-environment": "^1.1.3",
"vite-plugin-eslint": "^1.8.1",
"vite-plugin-svgr": "^3.2.0",
"vite-plugin-svgr": "^4.2.0",
"wait-on": "^7.2.0",
"yarn-audit-fix": "^10.0.5"
}
Expand Down
Loading

0 comments on commit 7a2793d

Please sign in to comment.