Skip to content

Commit 7a2793d

Browse files
authored
Merge pull request #448 from PagerDuty/release/0.13.0-beta.0
[Release] v0.13.0 beta.0
2 parents ad0aa3a + fd097b2 commit 7a2793d

File tree

69 files changed

+4524
-726
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+4524
-726
lines changed

.github/workflows/cd-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ jobs:
5555
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
5656
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
5757
- name: Install project dependencies (via cache)
58-
run: yarn --prefer-offline
58+
run: yarn --frozen-lockfile --prefer-offline --ignore-optional
5959
- name: Build application bundle
6060
run: yarn build
6161
- name: Deploy

.github/workflows/lint-workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,6 @@ jobs:
2121
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
2222
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
2323
- name: Install project dependencies (via cache)
24-
run: yarn --prefer-offline
24+
run: yarn --frozen-lockfile --prefer-offline --ignore-optional
2525
- name: Run ESLint
2626
run: npx eslint src --ext .js,.jsx,.ts,.tsx --exit-on-fatal-error

.github/workflows/test-workflow.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ jobs:
3131
path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
3232
key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
3333
- name: Install project dependencies (via cache)
34-
run: yarn --prefer-offline
34+
run: yarn --frozen-lockfile --prefer-offline --ignore-optional
3535

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

6161
cypress-run:
6262
needs: install
6363
runs-on: ubuntu-latest
6464
container:
65-
image: cypress/browsers:node-20.5.0-chrome-114.0.5735.133-1-ff-114.0.2-edge-114.0.1823.51-1
65+
image: cypress/browsers:node-20.14.0-chrome-125.0.6422.141-1-ff-126.0.1-edge-125.0.2535.85-1
6666
options: --user 1001
6767
strategy:
6868
fail-fast: false
@@ -102,7 +102,7 @@ jobs:
102102
# Starts web server for E2E tests - replace with your own server invocation
103103
# https://docs.cypress.io/guides/continuous-integration/introduction#Boot-your-server
104104
start: yarn start
105-
wait-on: 'http://localhost:3000' # Waits for above
105+
wait-on: 'http://127.0.0.1:3000' # Waits for above
106106
browser: chrome
107107
# Records to Cypress Cloud
108108
# https://docs.cypress.io/guides/cloud/projects#Set-up-a-project-to-record
@@ -111,6 +111,7 @@ jobs:
111111
spec: cypress/e2e/${{ matrix.e2e }}
112112
parallel: false # Don't use Cypress in-built parallelization
113113
install: true
114+
install-command: yarn --frozen-lockfile --prefer-offline --ignore-optional
114115
cache-key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
115116
env:
116117
# For recording and parallelization to work you must set your CYPRESS_RECORD_KEY

.tool-versions

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# MUST match .node-version
2-
nodejs 20.5.1
3-
yarn 1.22.19
2+
nodejs 20.14.0
3+
yarn 1.22.22

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ If you wish to maintain + deploy your own version of PagerDuty Live, we recommen
2929

3030
#### Local Development
3131

32-
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)
32+
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)
3333

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

cypress.config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ module.exports = defineConfig({
2020
config.env.PD_USER_TOKEN = process.env.VITE_PD_USER_TOKEN;
2121
return config;
2222
},
23-
baseUrl: 'http://localhost:3000/pd-live-react',
23+
baseUrl: 'http://127.0.0.1:3000/pd-live-react',
2424
specPattern: 'cypress/e2e/**/*.spec.{js,ts,jsx,tsx}',
2525
testIsolation: true,
2626
},

cypress/e2e/Search/search.spec.js

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,4 +113,12 @@ describe('Search Incidents', { failFast: { enabled: true } }, () => {
113113
cy.get('#service-filter-icon').realHover();
114114
cy.get('button[aria-label="Clear Filter"]').filter(':visible').click();
115115
});
116+
117+
it('Column filtering on Service column for `zzzzzz` returns no incidents and clear filters button', () => {
118+
cy.get('#service-filter-icon').realHover();
119+
cy.get('input[placeholder="Filter"]').filter(':visible').click().type('zzzzzz');
120+
cy.get('.empty-incidents-badge').should('be.visible');
121+
cy.get('#clear-filters-button').filter(':visible').click();
122+
waitForIncidentTable();
123+
});
116124
});

cypress/e2e/app.spec.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,4 +112,14 @@ describe('PagerDuty Live', { failFast: { enabled: true } }, () => {
112112
cy.get('iframe[title="TestExtra"]');
113113
// would need to enable cross-domain iframe javascript access to test further
114114
});
115+
116+
it('Application correctly renders the catastrophe modal', () => {
117+
cy
118+
.window()
119+
.its('store')
120+
.invoke('dispatch', { type: 'CATASTROPHE' });
121+
122+
cy.get('header').contains('Catastrophic Error');
123+
cy.get('p').contains('The application will restart');
124+
});
115125
});

package.json

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,19 @@
11
{
22
"name": "pd-live-react",
33
"homepage": "https://pagerduty.github.io/pd-live-react",
4-
"version": "0.12.2-beta.0",
4+
"version": "0.13.0-beta.0",
55
"private": true,
66
"dependencies": {
77
"@chakra-ui/icons": "^2.1.1",
88
"@chakra-ui/react": "^2.8.0",
9-
"@datadog/browser-rum": "^4.47.0",
9+
"@datadog/browser-rum": "^5.14.0",
10+
"@datadog/datadog-ci": "^2.37.0",
1011
"@emotion/react": "^11.11.1",
1112
"@emotion/styled": "^11.11.0",
1213
"@fortawesome/fontawesome-svg-core": "^6.4.2",
1314
"@fortawesome/free-brands-svg-icons": "^6.4.2",
1415
"@fortawesome/free-regular-svg-icons": "^6.5.1",
15-
"@fortawesome/free-solid-svg-icons": "^6.4.2",
16+
"@fortawesome/free-solid-svg-icons": "^6.5.2",
1617
"@fortawesome/react-fontawesome": "^0.2.0",
1718
"@pagerduty/pdjs": "^2.2.3",
1819
"@types/jest": "^29.5.12",
@@ -37,16 +38,17 @@
3738
"moment": "^2.29.4",
3839
"pretty-print-error": "^1.1.1",
3940
"react": "^18",
40-
"react-bootstrap": "^2.9.1",
41+
"react-bootstrap": "^2.10.2",
4142
"react-contextmenu": "^2.14.0",
4243
"react-datepicker": "^4.21.0",
4344
"react-dnd": "^16.0.1",
4445
"react-dnd-html5-backend": "^16.0.1",
4546
"react-dom": "^18",
47+
"react-error-boundary": "^4.0.13",
4648
"react-i18next": "^13.2.0",
47-
"react-icons": "^4.9.0",
49+
"react-icons": "^5.2.1",
4850
"react-minimal-pie-chart": "^8.4.0",
49-
"react-redux": "^8.1.2",
51+
"react-redux": "^9.1.2",
5052
"react-select": "^5.7.7",
5153
"react-table": "^7.8.0",
5254
"react-window": "^1.8.8",
@@ -61,6 +63,7 @@
6163
"scripts": {
6264
"start": "vite",
6365
"build": "npx genversion src/config/version.js --semi --es6 && vite build",
66+
"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/",
6467
"genversion": "npx genversion src/config/version.js --semi --es6",
6568
"jest": "npx jest",
6669
"cypress:open": "npx cypress open --browser chrome --e2e",
@@ -99,7 +102,7 @@
99102
"@babel/eslint-parser": "^7.22.10",
100103
"@babel/preset-env": "^7.22.10",
101104
"@babel/preset-react": "^7.22.5",
102-
"@cypress/react": "^8.0.0",
105+
"@cypress/react": "^8.0.2",
103106
"@faker-js/faker": "^8.0.2",
104107
"@testing-library/dom": "^9.3.4",
105108
"@testing-library/jest-dom": "^6.1.4",
@@ -142,12 +145,12 @@
142145
"prettier-eslint-cli": "^8.0.1",
143146
"redux-mock-store": "^1.5.4",
144147
"redux-saga-test-plan": "^4.0.6",
145-
"sass": "^1.66.1",
148+
"sass": "^1.77.5",
146149
"string.prototype.replaceall": "^1.0.6",
147-
"vite": "^4.5.2",
150+
"vite": "^4.5.3",
148151
"vite-plugin-environment": "^1.1.3",
149152
"vite-plugin-eslint": "^1.8.1",
150-
"vite-plugin-svgr": "^3.2.0",
153+
"vite-plugin-svgr": "^4.2.0",
151154
"wait-on": "^7.2.0",
152155
"yarn-audit-fix": "^10.0.5"
153156
}

0 commit comments

Comments
 (0)