Skip to content

Commit 0ac0286

Browse files
denniskigenibacher
denniskigen
and
ibacher
authored
(chore) O3-4745: Fix failing dependency auto-update CI workflow (#141)
Co-authored-by: Ian <ian.c.bacher@gmail.com>
1 parent a960719 commit 0ac0286

File tree

11 files changed

+1691
-1144
lines changed

11 files changed

+1691
-1144
lines changed

‎jest.config.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44
module.exports = {
55
clearMocks: true,
66
transform: {
7-
'^.+\\.tsx?$': '@swc/jest',
7+
'^.+\\.m?[jt]sx?$': ['@swc/jest'],
88
},
9-
transformIgnorePatterns: ['/node_modules/(?!@openmrs)'],
9+
transformIgnorePatterns: ['/node_modules/(?!@openmrs|.+\\.pnp\\.[^\\/]+$)'],
1010
moduleNameMapper: {
1111
'\\.(s?css)$': 'identity-obj-proxy',
1212
'@openmrs/esm-framework': '@openmrs/esm-framework/mock',

‎package.json‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,11 +54,12 @@
5454
"@hookform/resolvers": "^5.0.1",
5555
"classnames": "^2.3.2",
5656
"dotenv": "^16.3.1",
57+
"lodash-es": "^4.17.21",
5758
"react-hook-form": "^7.56.1",
5859
"zod": "^3.24.3"
5960
},
6061
"devDependencies": {
61-
"@carbon/react": "1.76.0",
62+
"@carbon/react": "^1.83.0",
6263
"@openmrs/esm-framework": "next",
6364
"@openmrs/esm-patient-common-lib": "next",
6465
"@openmrs/esm-styleguide": "next",
@@ -92,6 +93,7 @@
9293
"jest-cli": "^29.4.2",
9394
"jest-environment-jsdom": "^29.4.2",
9495
"lint-staged": "^15.2.10",
96+
"lodash": "^4.17.21",
9597
"openmrs": "next",
9698
"prettier": "^2.8.4",
9799
"react": "^18.2.0",
@@ -100,8 +102,8 @@
100102
"swc-loader": "^0.2.3",
101103
"turbo": "^2.5.2",
102104
"typescript": "^4.9.5",
103-
"webpack": "^5.75.0",
104-
"webpack-cli": "^5.0.1"
105+
"webpack": "^5.99.9",
106+
"webpack-cli": "^6.0.1"
105107
},
106108
"lint-staged": {
107109
"*.{ts,tsx}": "eslint --cache --fix --max-warnings 0",

‎src/cohort-builder-admin-link.component.tsx‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,17 @@ const CohortBuilderAdminLink: React.FC = () => {
77
const { t } = useTranslation();
88
return (
99
<Layer>
10-
<ClickableTile href={`${window.spaBase}/cohort-builder`} target="_blank" rel="noopener noreferrer">
11-
<div>
12-
<div className="heading">{t('manageCohorts', 'Manage Cohorts')}</div>
13-
<div className="content">{t('cohortBuilder', 'Cohort Builder')}</div>
14-
</div>
15-
<div className="iconWrapper">
16-
<ArrowRight size={16} />
17-
</div>
18-
</ClickableTile>
10+
<a href={`${window.spaBase}/cohort-builder`} target="_blank" rel="noopener noreferrer">
11+
<ClickableTile href={`${window.spaBase}/cohort-builder`}>
12+
<div>
13+
<div className="heading">{t('manageCohorts', 'Manage Cohorts')}</div>
14+
<div className="content">{t('cohortBuilder', 'Cohort Builder')}</div>
15+
</div>
16+
<div className="iconWrapper">
17+
<ArrowRight size={16} />
18+
</div>
19+
</ClickableTile>
20+
</a>
1921
</Layer>
2022
);
2123
};

‎src/cohort-builder.component.tsx‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,7 @@ const CohortBuilder: React.FC = () => {
159159
<div className={styles.tabContainer}>
160160
<p className={styles.heading}>{t('searchCriteria', 'Search Criteria')}</p>
161161
<div className={styles.tab}>
162-
<Tabs
163-
className={classNames(styles.verticalTabs, {
164-
[styles.tabletTab]: isLayoutTablet,
165-
[styles.desktopTab]: !isLayoutTablet,
166-
})}
167-
>
162+
<Tabs>
168163
<TabList aria-label="navigation">
169164
{tabs.map((tab: TabItem, index: number) => (
170165
<Tab className={styles.tab} key={index}>

‎src/components/search-by-concepts/search-by-concepts.component.tsx‎

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -218,7 +218,7 @@ const SearchByConcepts: React.FC<SearchByProps> = ({ onSubmit }) => {
218218
min={0}
219219
size="sm"
220220
value={operatorValue}
221-
onChange={(event, { value }) => setOperatorValue(value)}
221+
onChange={(event, { value }) => setOperatorValue(Number(value))}
222222
/>
223223
</div>
224224
</div>
@@ -247,7 +247,7 @@ const SearchByConcepts: React.FC<SearchByProps> = ({ onSubmit }) => {
247247
invalidText={t('numberIsNotValid', 'Number is not valid')}
248248
min={0}
249249
value={lastMonths}
250-
onChange={(event, { value }) => setLastMonths(value)}
250+
onChange={(event, { value }) => setLastMonths(Number(value))}
251251
/>
252252
</Column>
253253
<Column>
@@ -259,7 +259,7 @@ const SearchByConcepts: React.FC<SearchByProps> = ({ onSubmit }) => {
259259
invalidText={t('numberIsNotValid', 'Number is not valid')}
260260
min={0}
261261
value={lastDays}
262-
onChange={(event, { value }) => setLastDays(value)}
262+
onChange={(event, { value }) => setLastDays(Number(value))}
263263
/>
264264
</Column>
265265
</Column>
@@ -269,10 +269,10 @@ const SearchByConcepts: React.FC<SearchByProps> = ({ onSubmit }) => {
269269
datePickerType="single"
270270
allowInput={false}
271271
onChange={(date) => setOnOrAfter(dayjs(date[0]).format())}
272+
value={onOrAfter && dayjs(onOrAfter).format('DD-MM-YYYY')}
272273
>
273274
<DatePickerInput
274275
id="startDate"
275-
value={onOrAfter && dayjs(onOrAfter).format('DD-MM-YYYY')}
276276
labelText={t('dateRange', 'Date range start date')}
277277
placeholder="DD-MM-YYYY"
278278
size="md"
@@ -284,14 +284,9 @@ const SearchByConcepts: React.FC<SearchByProps> = ({ onSubmit }) => {
284284
datePickerType="single"
285285
allowInput={false}
286286
onChange={(date) => setOnOrBefore(dayjs(date[0]).format())}
287+
value={onOrBefore && dayjs(onOrBefore).format('DD-MM-YYYY')}
287288
>
288-
<DatePickerInput
289-
id="endDate"
290-
value={onOrBefore && dayjs(onOrBefore).format('DD-MM-YYYY')}
291-
labelText={t('endDate', 'End date')}
292-
placeholder="DD-MM-YYYY"
293-
size="md"
294-
/>
289+
<DatePickerInput id="endDate" labelText={t('endDate', 'End date')} placeholder="DD-MM-YYYY" size="md" />
295290
</DatePicker>
296291
</Column>
297292
</div>

‎src/components/search-by-concepts/search-concept/search-concept.component.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import React, { type Dispatch, type SetStateAction, useState, useRef, useEffect } from 'react';
2-
import debounce from 'lodash-es/debounce';
2+
import { debounce } from 'lodash-es';
33
import { useTranslation } from 'react-i18next';
44
import { Column, InlineLoading, Search, Tile } from '@carbon/react';
55
import { type Concept } from '../../../types';

‎src/components/search-by-demographics/search-by-demographics.component.tsx‎

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ const SearchByDemographics: React.FC<SearchByProps> = ({ onSubmit }) => {
111111
invalidText={t('minAgeIsNotValid', 'The age must be greater than 0')}
112112
label={t('ageBetween', 'Age between')}
113113
min={0}
114-
onChange={(event, { value }) => setMinAge(value)}
114+
onChange={(event, { value }) => setMinAge(Number(value))}
115115
value={minAge}
116116
/>
117117
</Column>
@@ -124,7 +124,7 @@ const SearchByDemographics: React.FC<SearchByProps> = ({ onSubmit }) => {
124124
label={t('and', 'and')}
125125
max={200}
126126
min={0}
127-
onChange={(event, { value }) => setMaxAge(value)}
127+
onChange={(event, { value }) => setMaxAge(Number(value))}
128128
value={maxAge}
129129
/>
130130
</Column>
@@ -136,13 +136,13 @@ const SearchByDemographics: React.FC<SearchByProps> = ({ onSubmit }) => {
136136
datePickerType="single"
137137
allowInput={false}
138138
onChange={(date) => setBirthDayStartDate(dayjs(date[0]).format())}
139+
value={birthDayStartDate && dayjs(birthDayStartDate).format('DD-MM-YYYY')}
139140
>
140141
<DatePickerInput
141142
id="startDate"
142143
labelText={t('birthDate', 'Birth date between')}
143144
placeholder="DD-MM-YYYY"
144145
size="md"
145-
value={birthDayStartDate && dayjs(birthDayStartDate).format('DD-MM-YYYY')}
146146
/>
147147
</DatePicker>
148148
</Column>
@@ -151,14 +151,9 @@ const SearchByDemographics: React.FC<SearchByProps> = ({ onSubmit }) => {
151151
allowInput={false}
152152
datePickerType="single"
153153
onChange={(date) => setBirthDayEndDate(dayjs(date[0]).format())}
154+
value={birthDayEndDate && dayjs(birthDayEndDate).format('DD-MM-YYYY')}
154155
>
155-
<DatePickerInput
156-
id="endDate"
157-
labelText={t('and', 'and')}
158-
placeholder="DD-MM-YYYY"
159-
size="md"
160-
value={birthDayEndDate && dayjs(birthDayEndDate).format('DD-MM-YYYY')}
161-
/>
156+
<DatePickerInput id="endDate" labelText={t('and', 'and')} placeholder="DD-MM-YYYY" size="md" />
162157
</DatePicker>
163158
</Column>
164159
</div>

‎src/components/search-by-drug-orders/search-by-drug-orders.component.tsx‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,11 @@ const SearchByDrugOrder: React.FC<SearchByProps> = ({ onSubmit }) => {
9494
datePickerType="single"
9595
allowInput={false}
9696
onChange={(date) => setActiveOnOrAfter(dayjs(date[0]).format())}
97+
value={activeOnOrAfter && dayjs(activeOnOrAfter).format('DD-MM-YYYY')}
9798
>
9899
<DatePickerInput
99100
id="activeOnOrAfter"
100101
labelText={t('using', 'Using between')}
101-
value={activeOnOrAfter && dayjs(activeOnOrAfter).format('DD-MM-YYYY')}
102102
placeholder="DD-MM-YYYY"
103103
size="md"
104104
/>
@@ -109,14 +109,9 @@ const SearchByDrugOrder: React.FC<SearchByProps> = ({ onSubmit }) => {
109109
datePickerType="single"
110110
allowInput={false}
111111
onChange={(date) => setActiveOnOrBefore(dayjs(date[0]).format())}
112+
value={activeOnOrBefore && dayjs(activeOnOrBefore).format('DD-MM-YYYY')}
112113
>
113-
<DatePickerInput
114-
id="activeOnOrBefore"
115-
value={activeOnOrBefore && dayjs(activeOnOrBefore).format('DD-MM-YYYY')}
116-
labelText={t('to', 'to')}
117-
placeholder="DD-MM-YYYY"
118-
size="md"
119-
/>
114+
<DatePickerInput id="activeOnOrBefore" labelText={t('to', 'to')} placeholder="DD-MM-YYYY" size="md" />
120115
</DatePicker>
121116
</Column>
122117
</div>
@@ -126,11 +121,11 @@ const SearchByDrugOrder: React.FC<SearchByProps> = ({ onSubmit }) => {
126121
datePickerType="single"
127122
allowInput={false}
128123
onChange={(date) => setActivatedOnOrAfter(dayjs(date[0]).format())}
124+
value={activatedOnOrAfter && dayjs(activatedOnOrAfter).format('DD-MM-YYYY')}
129125
>
130126
<DatePickerInput
131127
id="activatedOnOrAfter"
132128
labelText={t('used', 'Used between')}
133-
value={activatedOnOrAfter && dayjs(activatedOnOrAfter).format('DD-MM-YYYY')}
134129
placeholder="DD-MM-YYYY"
135130
size="md"
136131
/>
@@ -141,14 +136,9 @@ const SearchByDrugOrder: React.FC<SearchByProps> = ({ onSubmit }) => {
141136
datePickerType="single"
142137
allowInput={false}
143138
onChange={(date) => setActivatedOnOrBefore(dayjs(date[0]).format())}
139+
value={activatedOnOrBefore && dayjs(activatedOnOrBefore).format('DD-MM-YYYY')}
144140
>
145-
<DatePickerInput
146-
id="activatedOnOrBefore"
147-
value={activatedOnOrBefore && dayjs(activatedOnOrBefore).format('DD-MM-YYYY')}
148-
labelText={t('and', 'and')}
149-
placeholder="DD-MM-YYYY"
150-
size="md"
151-
/>
141+
<DatePickerInput id="activatedOnOrBefore" labelText={t('and', 'and')} placeholder="DD-MM-YYYY" size="md" />
152142
</DatePicker>
153143
</Column>
154144
</div>

‎src/components/search-by-encounters/search-by-encounters.component.tsx‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ const SearchByEncounters: React.FC<SearchByProps> = ({ onSubmit }) => {
110110
min={0}
111111
size="sm"
112112
value={atLeastCount}
113-
onChange={(event, { value }) => setAtLeastCount(value)}
113+
onChange={(event, { value }) => setAtLeastCount(Number(value))}
114114
/>
115115
</div>
116116
<div className={styles.multipleInputs}>
@@ -122,7 +122,7 @@ const SearchByEncounters: React.FC<SearchByProps> = ({ onSubmit }) => {
122122
min={0}
123123
size="sm"
124124
value={atMostCount}
125-
onChange={(event, { value }) => setAtMostCount(value)}
125+
onChange={(event, { value }) => setAtMostCount(Number(value))}
126126
/>
127127
</div>
128128
</Column>
@@ -133,29 +133,19 @@ const SearchByEncounters: React.FC<SearchByProps> = ({ onSubmit }) => {
133133
datePickerType="single"
134134
allowInput={false}
135135
onChange={(date) => setOnOrAfter(dayjs(date[0]).format())}
136+
value={onOrAfter && dayjs(onOrAfter).format('DD-MM-YYYY')}
136137
>
137-
<DatePickerInput
138-
id="onOrAfter"
139-
labelText={t('from', 'From')}
140-
value={onOrAfter && dayjs(onOrAfter).format('DD-MM-YYYY')}
141-
placeholder="DD-MM-YYYY"
142-
size="md"
143-
/>
138+
<DatePickerInput id="onOrAfter" labelText={t('from', 'From')} placeholder="DD-MM-YYYY" size="md" />
144139
</DatePicker>
145140
</Column>
146141
<Column>
147142
<DatePicker
148143
datePickerType="single"
149144
allowInput={false}
150145
onChange={(date) => setOnOrBefore(dayjs(date[0]).format())}
146+
value={onOrBefore && dayjs(onOrBefore).format('DD-MM-YYYY')}
151147
>
152-
<DatePickerInput
153-
id="onOrBefore"
154-
value={onOrBefore && dayjs(onOrBefore).format('DD-MM-YYYY')}
155-
labelText={t('to', 'to')}
156-
placeholder="DD-MM-YYYY"
157-
size="md"
158-
/>
148+
<DatePickerInput id="onOrBefore" labelText={t('to', 'to')} placeholder="DD-MM-YYYY" size="md" />
159149
</DatePicker>
160150
</Column>
161151
</div>

‎src/components/search-by-enrollments/search-by-enrollments.component.tsx‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -92,11 +92,11 @@ const SearchByEnrollments: React.FC<SearchByProps> = ({ onSubmit }) => {
9292
datePickerType="single"
9393
allowInput={false}
9494
onChange={(date) => setEnrolledOnOrAfter(dayjs(date[0]).format())}
95+
value={enrolledOnOrAfter && dayjs(enrolledOnOrAfter).format('DD-MM-YYYY')}
9596
>
9697
<DatePickerInput
9798
id="enrolledOnOrAfter"
9899
labelText={t('enrolledBetween', 'Enrolled between')}
99-
value={enrolledOnOrAfter && dayjs(enrolledOnOrAfter).format('DD-MM-YYYY')}
100100
placeholder="DD-MM-YYYY"
101101
size="md"
102102
/>
@@ -107,14 +107,9 @@ const SearchByEnrollments: React.FC<SearchByProps> = ({ onSubmit }) => {
107107
datePickerType="single"
108108
allowInput={false}
109109
onChange={(date) => setEnrolledOnOrBefore(dayjs(date[0]).format())}
110+
value={enrolledOnOrBefore && dayjs(enrolledOnOrBefore).format('DD-MM-YYYY')}
110111
>
111-
<DatePickerInput
112-
id="enrolledOnOrBefore"
113-
labelText={t('and', 'and')}
114-
value={enrolledOnOrBefore && dayjs(enrolledOnOrBefore).format('DD-MM-YYYY')}
115-
placeholder="DD-MM-YYYY"
116-
size="md"
117-
/>
112+
<DatePickerInput id="enrolledOnOrBefore" labelText={t('and', 'and')} placeholder="DD-MM-YYYY" size="md" />
118113
</DatePicker>
119114
</Column>
120115
</div>
@@ -124,11 +119,11 @@ const SearchByEnrollments: React.FC<SearchByProps> = ({ onSubmit }) => {
124119
datePickerType="single"
125120
allowInput={false}
126121
onChange={(date) => setCompletedOnOrAfter(dayjs(date[0]).format())}
122+
value={completedOnOrAfter && dayjs(completedOnOrAfter).format('DD-MM-YYYY')}
127123
>
128124
<DatePickerInput
129125
id="completedOnOrAfter"
130126
labelText={t('completedBetween', 'Completed between')}
131-
value={completedOnOrAfter && dayjs(completedOnOrAfter).format('DD-MM-YYYY')}
132127
placeholder="DD-MM-YYYY"
133128
size="md"
134129
/>
@@ -139,14 +134,9 @@ const SearchByEnrollments: React.FC<SearchByProps> = ({ onSubmit }) => {
139134
datePickerType="single"
140135
allowInput={false}
141136
onChange={(date) => setCompletedOnOrBefore(dayjs(date[0]).format())}
137+
value={completedOnOrBefore && dayjs(completedOnOrBefore).format('DD-MM-YYYY')}
142138
>
143-
<DatePickerInput
144-
id="completedOnOrBefore"
145-
labelText={t('and', 'and')}
146-
value={completedOnOrBefore && dayjs(completedOnOrBefore).format('DD-MM-YYYY')}
147-
placeholder="DD-MM-YYYY"
148-
size="md"
149-
/>
139+
<DatePickerInput id="completedOnOrBefore" labelText={t('and', 'and')} placeholder="DD-MM-YYYY" size="md" />
150140
</DatePicker>
151141
</Column>
152142
</div>

0 commit comments

Comments
 (0)