Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

(chore) O3-4226: Bump @carbon/react to v1.71.0 #2124

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

(chore) O3-4226: Bump @carbon/react to v1.71.0 #2124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3ce7a36
(chore) Bump @carbon/react to v1.71.0
Muta-Jonathan Dec 1, 2024
6b0287c
(test) Add window.HTMLElement.prototype.scrollIntoView stub and updat…
NethmiRodrigo Dec 2, 2024
6ef8a91
resolving failing tests in the visits-table test
Muta-Jonathan Dec 9, 2024
98d2c82
revamp back to next version
Muta-Jonathan Dec 9, 2024
4b390ca
Removed screen.logTestingPlaygroundURL debugger
Muta-Jonathan Dec 9, 2024
5cf2f98
updating branch
Muta-Jonathan Dec 10, 2024
cbbfc2f
removing yarn backups
Muta-Jonathan Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/esm-form-engine-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"url": "https://github.com/openmrs/openmrs-esm-patient-chart/issues"
},
"dependencies": {
"@carbon/react": "^1.47.0",
"@carbon/react": "1.71.0",
"@openmrs/esm-form-engine-lib": "next",
"lodash-es": "^4.17.21",
"react-error-boundary": "^4.0.13"
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-generic-patient-widgets-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"dependencies": {
"@carbon/charts-react": "^1.5.2",
"@carbon/react": "^1.12.0",
"@carbon/react": "1.71.0",
"d3": "^7.6.1",
"lodash-es": "^4.17.21"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-patient-allergies-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"url": "https://github.com/openmrs/openmrs-esm-patient-chart/issues"
},
"dependencies": {
"@carbon/react": "^1.12.0",
"@carbon/react": "1.71.0",
"lodash-es": "^4.17.21"
},
"peerDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-patient-attachments-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"url": "https://github.com/openmrs/openmrs-esm-patient-chart/issues"
},
"dependencies": {
"@carbon/react": "^1.12.0",
"@carbon/react": "1.71.0",
"@openmrs/esm-patient-common-lib": "^8.2.0",
"lodash-es": "^4.17.21",
"react-grid-gallery": "^0.5.6",
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-patient-banner-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"url": "https://github.com/openmrs/openmrs-esm-patient-chart/issues"
},
"dependencies": {
"@carbon/react": "^1.12.0",
"@carbon/react": "1.71.0",
"@openmrs/esm-patient-common-lib": "^8.2.0",
"lodash-es": "^4.17.21"
},
Expand Down
7 changes: 3 additions & 4 deletions ...art-app/src/visit/visits-widget/past-visits-components/visits-table/visits-table.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,9 @@ describe('EncounterList', () => {
const searchbox = screen.getByRole('searchbox', { name: /filter table/i });
const expectedColumnHeaders = [/date & time/, /visit type/, /Form name/, /encounter type/, /provider/];
const expectedTableRows = [
/18-Jan-2022, 04:25 PM Facility Visit Admission POC Consent Form -- Options/,
/03-Aug-2021, 12:47 AM Facility Visit Visit Note -- User One Options/,
/05-Jul-2021, 10:07 AM Facility Visit Consultation Covid 19 Dennis The Doctor Options/,
/18\-jan\-2022, 04:25 pm facility visit admission poc consent form \-\- options/,
/03\-aug\-2021, 12:47 am facility visit visit note \-\- user one options/,
/05\-jul\-2021, 10:07 am facility visit consultation covid 19 dennis the doctor options/,
];

expectedColumnHeaders.forEach((header) => {
Expand All @@ -53,7 +53,6 @@ describe('EncounterList', () => {
await user.click(filterDropdown);
await user.click(screen.getByRole('option', { name: /Admission/i }));

// screen.logTestingPlaygroundURL();
expect(screen.queryByRole('cell', { name: /visit note/i })).not.toBeInTheDocument();
expect(screen.getByRole('cell', { name: /admission/i })).toBeInTheDocument();

Expand Down
2 changes: 1 addition & 1 deletion packages/esm-patient-common-lib/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
"url": "https://github.com/openmrs/openmrs-esm-patient-chart/issues"
},
"dependencies": {
"@carbon/react": "^1.12.0",
"@carbon/react": "1.71.0",
"lodash-es": "^4.17.21",
"uuid": "^8.3.2"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-patient-conditions-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"url": "https://github.com/openmrs/openmrs-esm-patient-chart/issues"
},
"dependencies": {
"@carbon/react": "^1.12.0",
"@carbon/react": "1.71.0",
"@openmrs/esm-patient-common-lib": "^8.2.0",
"lodash-es": "^4.17.21"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-patient-flags-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"url": "https://github.com/openmrs/openmrs-esm-patient-chart/issues"
},
"dependencies": {
"@carbon/react": "^1.33.1"
"@carbon/react": "1.71.0"
},
"peerDependencies": {
"@openmrs/esm-framework": "5.x",
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-patient-forms-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"url": "https://github.com/openmrs/openmrs-esm-patient-chart/issues"
},
"dependencies": {
"@carbon/react": "^1.12.0",
"@carbon/react": "1.71.0",
"@openmrs/esm-patient-common-lib": "^8.2.0",
"fuzzy": "^0.1.3",
"lodash-es": "^4.17.21"
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-patient-immunizations-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"url": "https://github.com/openmrs/openmrs-esm-patient-chart/issues"
},
"dependencies": {
"@carbon/react": "^1.12.0",
"@carbon/react": "1.71.0",
"@hookform/resolvers": "^3.3.1",
"lodash-es": "^4.17.21",
"react-hook-form": "^7.46.2",
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-patient-lists-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"url": "https://github.com/openmrs/openmrs-esm-patient-chart/issues"
},
"dependencies": {
"@carbon/react": "^1.33.1"
"@carbon/react": "1.71.0"
},
"peerDependencies": {
"@openmrs/esm-framework": "5.x",
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-patient-medications-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"url": "https://github.com/openmrs/openmrs-esm-patient-chart/issues"
},
"dependencies": {
"@carbon/react": "^1.12.0",
"@carbon/react": "1.71.0",
"@openmrs/esm-patient-common-lib": "^8.2.0",
"lodash-es": "^4.17.21"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-patient-orders-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"url": "https://github.com/openmrs/openmrs-esm-patient-chart/issues"
},
"dependencies": {
"@carbon/react": "^1.12.0",
"@carbon/react": "1.71.0",
"@openmrs/esm-patient-common-lib": "^8.2.0",
"lodash-es": "^4.17.21"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-patient-programs-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
"url": "https://github.com/openmrs/openmrs-esm-patient-chart/issues"
},
"dependencies": {
"@carbon/react": "^1.12.0",
"@carbon/react": "1.71.0",
"@openmrs/esm-patient-common-lib": "^8.2.0",
"lodash-es": "^4.17.21"
},
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-patient-tests-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
"dependencies": {
"@carbon/charts": "^1.5.2",
"@carbon/charts-react": "^1.5.2",
"@carbon/react": "^1.12.0",
"@carbon/react": "1.71.0",
"@openmrs/esm-patient-common-lib": "^8.2.0",
"d3": "^7.6.1",
"fuzzy": "^0.1.3",
Expand Down
2 changes: 1 addition & 1 deletion packages/esm-patient-vitals-app/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
},
"dependencies": {
"@carbon/charts-react": "^1.5.2",
"@carbon/react": "^1.12.0",
"@carbon/react": "1.71.0",
"@openmrs/esm-patient-common-lib": "^8.2.0",
"d3": "^7.6.1",
"lodash-es": "^4.17.21"
Expand Down
3 changes: 3 additions & 0 deletions tools/setup-tests.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@ global.spaBase = '/spa';
global.getOpenmrsSpaBase = () => '/openmrs/spa/';
global.Response = Object as any;

// https://github.com/jsdom/jsdom/issues/1695
window.HTMLElement.prototype.scrollIntoView = function () {};

Object.defineProperty(window, 'matchMedia', {
writable: true,
value: jest.fn().mockImplementation((query) => ({
Expand Down
Loading
Loading