Skip to content

Commit 7e7ac79

Browse files
gsreynoldsgsreynolds
authored
Merge pull request #503 from PagerDuty/release/0.14.1-beta.0
2 parents cd6d4e0 + 21d9bdc commit 7e7ac79

File tree

7 files changed

+1628
-1449
lines changed

7 files changed

+1628
-1449
lines changed

‎package.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"name": "pd-live-react",
33
"homepage": "https://pagerduty.github.io/pd-live-react",
4-
"version": "0.14.0-beta.0",
4+
"version": "0.14.1-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": "^5.14.0",
10-
"@datadog/datadog-ci": "^2.40.1",
9+
"@datadog/browser-rum": "^5.27.0",
10+
"@datadog/datadog-ci": "^2.43.0",
1111
"@emotion/react": "^11.11.1",
1212
"@emotion/styled": "^11.13.0",
1313
"@fortawesome/fontawesome-svg-core": "^6.4.2",
@@ -20,11 +20,11 @@
2020
"@types/node": "^20.10.8",
2121
"@types/react": "^18.2.55",
2222
"@types/react-dom": "^18.2.17",
23-
"axios": "^1.6.7",
24-
"bootstrap": "^4.6.2",
23+
"axios": "^1.7.4",
24+
"bootstrap": "^5.0.0",
2525
"bottleneck": "^2.19.5",
2626
"chakra-react-select": "^4.7.0",
27-
"date-fns": "^2.29.3",
27+
"date-fns": "^4.1.0",
2828
"font-awesome": "^4.7.0",
2929
"framer-motion": "^10.16.2",
3030
"fuse.js": "^7.0.0",
@@ -54,7 +54,7 @@
5454
"react-window": "^1.8.10",
5555
"redux": "^4.2.1",
5656
"redux-persist": "^6.0.0",
57-
"redux-saga": "^1.2.1",
57+
"redux-saga": "^1.3.0",
5858
"styled-components": "^6.0.4",
5959
"use-debounce": "^9.0.3",
6060
"validator": "^13.12.0",
@@ -99,8 +99,8 @@
9999
"devDependencies": {
100100
"@4tw/cypress-drag-drop": "^2.2.5",
101101
"@babel/core": "^7.22.17",
102-
"@babel/eslint-parser": "^7.22.10",
103-
"@babel/preset-env": "^7.22.10",
102+
"@babel/eslint-parser": "^7.25.1",
103+
"@babel/preset-env": "^7.25.4",
104104
"@babel/preset-react": "^7.22.5",
105105
"@cypress/react": "^8.0.2",
106106
"@faker-js/faker": "^8.0.2",
@@ -128,7 +128,7 @@
128128
"eslint-plugin-prettier": "^4.2.1",
129129
"eslint-plugin-react": "^7.33.2",
130130
"eslint-plugin-react-hooks": "^4.6.2",
131-
"eslint-plugin-react-refresh": "^0.4.3",
131+
"eslint-plugin-react-refresh": "^0.4.12",
132132
"eslint-plugin-styled-components-a11y": "^2.1.35",
133133
"genversion": "^3.1.1",
134134
"gh-pages": "^6.1.1",
@@ -147,7 +147,7 @@
147147
"redux-saga-test-plan": "^4.0.6",
148148
"sass": "^1.77.5",
149149
"string.prototype.replaceall": "^1.0.10",
150-
"vite": "^4.5.3",
150+
"vite": "^4.5.5",
151151
"vite-plugin-environment": "^1.1.3",
152152
"vite-plugin-eslint": "^1.8.1",
153153
"vite-plugin-svgr": "^4.2.0",

‎src/components/AddNoteModal/AddNoteModalComponent.jsx‎

Lines changed: 42 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,17 @@ import {
66
} from 'react-redux';
77

88
import {
9-
Modal, Form, Button,
10-
} from 'react-bootstrap';
9+
Button,
10+
FormControl,
11+
Modal,
12+
ModalOverlay,
13+
ModalContent,
14+
ModalHeader,
15+
ModalFooter,
16+
ModalBody,
17+
ModalCloseButton,
18+
Textarea,
19+
} from '@chakra-ui/react';
1120

1221
import {
1322
useTranslation,
@@ -41,36 +50,37 @@ const AddNoteModalComponent = ({
4150

4251
return (
4352
<div className="add-note-modal-ctr">
44-
<Modal show={displayAddNoteModal} onHide={toggleDisplayAddNoteModal}>
45-
<Modal.Header closeButton>
46-
<Modal.Title>{t('Add Note')}</Modal.Title>
47-
</Modal.Header>
48-
<Modal.Body>
49-
<Form>
50-
<Form.Control
51-
id="add-note-textarea"
52-
as="textarea"
53-
placeholder={t('Add Note to incident(s) here')}
54-
minLength={1}
55-
onChange={(e) => {
56-
setNote(e.target.value);
57-
}}
58-
/>
59-
</Form>
60-
</Modal.Body>
61-
<Modal.Footer>
62-
<Button
63-
id="add-note-button"
64-
variant="primary"
65-
onClick={() => addNote(selectedRows, note)}
66-
disabled={note === ''}
67-
>
68-
{t('Add Note')}
69-
</Button>
70-
<Button variant="light" onClick={toggleDisplayAddNoteModal}>
71-
{t('Cancel')}
72-
</Button>
73-
</Modal.Footer>
53+
<Modal isOpen={displayAddNoteModal} onClose={() => { toggleDisplayAddNoteModal(); }}>
54+
<ModalOverlay />
55+
<ModalContent>
56+
<ModalHeader>{t('Add Note')}</ModalHeader>
57+
<ModalCloseButton />
58+
<ModalBody>
59+
<FormControl>
60+
<Textarea
61+
id="add-note-textarea"
62+
placeholder={t('Add Note to incident(s) here')}
63+
minLength={1}
64+
onChange={(e) => {
65+
setNote(e.target.value);
66+
}}
67+
/>
68+
</FormControl>
69+
</ModalBody>
70+
<ModalFooter>
71+
<Button
72+
id="add-note-button"
73+
colorScheme="blue"
74+
onClick={() => addNote(selectedRows, note)}
75+
disabled={note === ''}
76+
>
77+
{t('Add Note')}
78+
</Button>
79+
<Button variant="light" onClick={toggleDisplayAddNoteModal}>
80+
{t('Cancel')}
81+
</Button>
82+
</ModalFooter>
83+
</ModalContent>
7484
</Modal>
7585
</div>
7686
);

‎src/components/IncidentTable/subcomponents/EmptyIncidentsComponent.jsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import {
33
Badge,
4-
} from 'react-bootstrap';
4+
} from '@chakra-ui/react';
55

66
import {
77
useTranslation,
@@ -20,7 +20,7 @@ const EmptyIncidentsComponent = ({
2020
<div className="empty-incidents">
2121
<EmptyIncidents />
2222
<h1 className="empty-incidents-badge">
23-
<Badge bg="none">{badgeMessage}</Badge>
23+
<Badge>{badgeMessage}</Badge>
2424
</h1>
2525
</div>
2626
);

‎src/components/IncidentTable/subcomponents/QueryActiveComponent.jsx‎

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import React from 'react';
22
import {
3-
Container, Row, Spinner,
4-
} from 'react-bootstrap';
3+
Container, Spinner,
4+
} from '@chakra-ui/react';
55
import {
66
useTranslation,
77
} from 'react-i18next';
@@ -11,14 +11,12 @@ const QueryActiveComponent = () => {
1111
t,
1212
} = useTranslation();
1313
return (
14-
<Container className="query-active-ctr" fluid>
14+
<Container className="query-active-ctr" centerContent>
1515
<br />
16-
<Row className="justify-content-md-center">
17-
<Spinner className="" animation="border" role="status" variant="success" />
18-
<h5 className="querying-incidents">
19-
<b>{t('Querying PagerDuty API')}</b>
20-
</h5>
21-
</Row>
16+
<Spinner />
17+
<h5 className="querying-incidents">
18+
<b>{t('Querying PagerDuty API')}</b>
19+
</h5>
2220
</Container>
2321
);
2422
};

‎src/config/column-generator.jsx‎

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,7 @@ import {
1919
} from 'pretty-print-error';
2020

2121
import {
22-
Badge,
23-
} from 'react-bootstrap';
24-
import {
25-
Box, Link, Skeleton, Tooltip,
22+
Box, Link, Skeleton, Tooltip, Badge,
2623
} from '@chakra-ui/react';
2724
import {
2825
ChevronDownIcon, ChevronUpIcon, NotAllowedIcon,
@@ -467,15 +464,15 @@ export const defaultIncidentColumns = () => [
467464
let elem;
468465
if (urgency === HIGH) {
469466
elem = (
470-
<Badge className="urgency-badge" bg="primary" text="light">
467+
<Badge className="urgency-badge" colorScheme="blue">
471468
<ChevronUpIcon />
472469
{' '}
473470
{i18next.t('High')}
474471
</Badge>
475472
);
476473
} else if (urgency === LOW) {
477474
elem = (
478-
<Badge className="urgency-badge" bg="secondary" text="dark">
475+
<Badge className="urgency-badge" colorScheme="gray">
479476
<ChevronDownIcon />
480477
{' '}
481478
{i18next.t('Low')}
@@ -684,33 +681,28 @@ export const defaultAlertsColumns = () => [
684681
return renderPlainTextAlertCell({ value, cell });
685682
}
686683
const i18nValue = i18next.t(value);
687-
let variant;
688-
let text = 'dark';
684+
let colorScheme;
689685
switch (value) {
690686
case 'critical':
691-
variant = 'dark';
692-
text = 'light';
687+
colorScheme = 'red';
693688
break;
694689
case 'error':
695-
variant = 'danger';
696-
text = 'light';
690+
colorScheme = 'orange';
697691
break;
698692
case 'warning':
699-
variant = 'warning';
693+
colorScheme = 'yellow';
700694
break;
701695
case 'info':
702-
variant = 'info';
696+
colorScheme = 'green';
703697
break;
704698
case '--':
705-
variant = null;
706-
text = null;
699+
colorScheme = null;
707700
break;
708701
default:
709-
variant = 'secondary';
710-
text = 'dark';
702+
colorScheme = 'gray';
711703
}
712704
return (
713-
<Badge className="severity-badge" bg={variant} text={text}>
705+
<Badge className="severity-badge" colorScheme={colorScheme}>
714706
{i18nValue}
715707
</Badge>
716708
);

‎src/config/version.js‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)