Skip to content

Commit 95f2bf2

Browse files
donaldkibetdonaldkibet
committed
Fix failing ci (openmrs#12)
1 parent 7b90fbd commit 95f2bf2

File tree

5 files changed

+14
-113
lines changed

5 files changed

+14
-113
lines changed

‎.github/workflows/ci.yml

Lines changed: 1 addition & 91 deletions
Original file line numberDiff line numberDiff line change
@@ -236,98 +236,8 @@ jobs:
236236
password: ${{ secrets.DEPLOYER_PASSWORD }}
237237
data: '{ "service":"${{ env.ESM_NAME }}","url":"https://donaldkibet.fra1.digitaloceanspaces.com/${{ env.ESM_NAME }}/${{ env.TIMESTAMP }}_${{ github.sha }}/${{ env.JS_NAME }}" }'
238238
customHeaders: '{ "Accept": "application/json", "Content-Type": "application/json" }'
239-
240239

241-
deploy_active_visits_app:
242-
runs-on: ubuntu-latest
243-
244-
env:
245-
DIR_NAME: "esm-active-visits-app"
246-
ESM_NAME: "@openmrs/esm-active-visits-app"
247-
JS_NAME: "openmrs-esm-active-visits-app.js"
248-
249-
needs: build
250-
251-
if: ${{ github.event_name == 'push' }}
252-
253-
steps:
254-
- name: Download Artifacts
255-
uses: actions/download-artifact@v2
256-
257-
- name: Compute Timestamp
258-
run: echo "TIMESTAMP=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
259-
260-
- name: Prepare Directory
261-
shell: bash
262-
run: |
263-
mkdir -p dist/${{ env.ESM_NAME }}/${{ env.TIMESTAMP }}_${{ github.sha }}
264-
mv packages/${{ env.DIR_NAME }}/dist/*.* dist/${{ env.ESM_NAME }}/${{ env.TIMESTAMP }}_${{ github.sha }}/
265-
- name: Publish to Digital Ocean
266-
uses: jakejarvis/s3-sync-action@master
267-
with:
268-
args: --acl public-read --follow-symlinks --cache-control "max-age=31536000"
269-
env:
270-
AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
271-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
272-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
273-
AWS_S3_ENDPOINT: ${{ secrets.AWS_S3_ENDPOINT }}
274-
SOURCE_DIR: "dist"
275-
- name: Update Importmap
276-
uses: fjogeleit/http-request-action@master
277-
with:
278-
url: http://${{ secrets.DEPLOYER_HOST }}/services?env=prod
279-
method: "PATCH"
280-
username: ${{ secrets.DEPLOYER_USERNAME }}
281-
password: ${{ secrets.DEPLOYER_PASSWORD }}
282-
data: '{ "service":"${{ env.ESM_NAME }}","url":"https://donaldkibet.fra1.digitaloceanspaces.com/${{ env.ESM_NAME }}/${{ env.TIMESTAMP }}_${{ github.sha }}/${{ env.JS_NAME }}" }'
283-
customHeaders: '{ "Accept": "application/json", "Content-Type": "application/json" }'
284-
285-
deploy_patient_search_app:
286-
runs-on: ubuntu-latest
287-
288-
env:
289-
DIR_NAME: "esm-patient-search-app"
290-
ESM_NAME: "@openmrs/esm-patient-search-app"
291-
JS_NAME: "openmrs-esm-patient-search-app.js"
292-
293-
needs: build
294-
295-
if: ${{ github.event_name == 'push' }}
296-
297-
steps:
298-
- name: Download Artifacts
299-
uses: actions/download-artifact@v2
300-
301-
- name: Compute Timestamp
302-
run: echo "TIMESTAMP=$(date +'%Y-%m-%d')" >> $GITHUB_ENV
303-
304-
- name: Prepare Directory
305-
shell: bash
306-
run: |
307-
mkdir -p dist/${{ env.ESM_NAME }}/${{ env.TIMESTAMP }}_${{ github.sha }}
308-
mv packages/${{ env.DIR_NAME }}/dist/*.* dist/${{ env.ESM_NAME }}/${{ env.TIMESTAMP }}_${{ github.sha }}/
309-
310-
- name: Publish to Digital Ocean
311-
uses: jakejarvis/s3-sync-action@master
312-
with:
313-
args: --acl public-read --follow-symlinks --cache-control "max-age=31536000"
314-
env:
315-
AWS_S3_BUCKET: ${{ secrets.AWS_S3_BUCKET }}
316-
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
317-
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
318-
AWS_S3_ENDPOINT: ${{ secrets.AWS_S3_ENDPOINT }}
319-
SOURCE_DIR: "dist"
320-
321-
- name: Update Importmap
322-
uses: fjogeleit/http-request-action@master
323-
with:
324-
url: http://${{ secrets.DEPLOYER_HOST }}/services?env=prod
325-
method: "PATCH"
326-
username: ${{ secrets.DEPLOYER_USERNAME }}
327-
password: ${{ secrets.DEPLOYER_PASSWORD }}
328-
data: '{ "service":"${{ env.ESM_NAME }}","url":"https://donaldkibet.fra1.digitaloceanspaces.com/${{ env.ESM_NAME }}/${{ env.TIMESTAMP }}_${{ github.sha }}/${{ env.JS_NAME }}" }'
329-
customHeaders: '{ "Accept": "application/json", "Content-Type": "application/json" }'
330-
deploy_patient_list_app:
240+
deploy_patient_list_app:
331241
runs-on: ubuntu-latest
332242

333243
env:

‎packages/esm-appointments-app/src/appointments-tabs/appointment-base-table.test.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ describe('AppointmentsBaseTable', () => {
5252
expect(screen.queryByText(/There are no scheduled appointments to display/i)).not.toBeInTheDocument();
5353
expect(screen.getByRole('table')).toBeInTheDocument();
5454

55-
const expectedColumnHeaders = [/Patient name/, /Date & Time/, /Service Type/, /Identifier/];
55+
const expectedColumnHeaders = [/Patient name/, /Date & Time/, /Service Type/];
5656
expectedColumnHeaders.forEach((header) => {
5757
expect(screen.getByRole('columnheader', { name: new RegExp(header, 'i') })).toBeInTheDocument();
5858
});

‎packages/esm-appointments-app/src/appointments-tabs/appointments-base-table.component.tsx

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ interface AppointmentsBaseTableProps {
4747
isLoading: boolean;
4848
tableHeading: string;
4949
mutate?: () => void;
50-
visits: Array<any>;
50+
visits?: Array<any>;
5151
}
5252

5353
const AppointmentsBaseTable: React.FC<AppointmentsBaseTableProps> = ({
@@ -74,10 +74,6 @@ const AppointmentsBaseTable: React.FC<AppointmentsBaseTableProps> = ({
7474
header: t('patientName', 'Patient name'),
7575
key: 'patientName',
7676
},
77-
{
78-
header: t('identifier', 'identifier'),
79-
key: 'identifier',
80-
},
8177
{
8278
header: t('dateTime', 'Date & Time'),
8379
key: 'dateTime',
@@ -115,7 +111,11 @@ const AppointmentsBaseTable: React.FC<AppointmentsBaseTableProps> = ({
115111
<div style={{ display: 'flex', alignItems: 'center' }}>
116112
{}
117113
{hasVisit(appointment.patientUuid) ? (
118-
patientQueueEntry(appointment.patientUuid)
114+
patientQueueEntry(appointment.patientUuid) ?? (
115+
<Button size="sm" kind="ghost">
116+
{t('checkIn', 'Visit active')}
117+
</Button>
118+
)
119119
) : (
120120
<AppointmentButton patientUuid={appointment.patientUuid} appointment={appointment} />
121121
)}
@@ -130,15 +130,6 @@ const AppointmentsBaseTable: React.FC<AppointmentsBaseTableProps> = ({
130130
)
131131
}
132132
/>
133-
<OverflowMenuItem
134-
itemText={t('cancelAppointment', 'Cancel appointment')}
135-
onClick={() =>
136-
launchOverlay(
137-
t('cancelAppointment', 'Cancel appointment'),
138-
<CancelAppointment appointment={appointment} />,
139-
)
140-
}
141-
/>
142133
</OverflowMenu>
143134
)}
144135
</div>

‎packages/esm-appointments-app/src/appointments-tabs/appointments-button.component.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const AppointmentButton: React.FC<AppointmentButtonProps> = ({ appointment, pati
2929
<VisitForm patientUuid={patientUuid} appointment={appointment} />,
3030
)
3131
}>
32-
{t('checkedIn', 'CheckedIn')}
32+
{t('checkIn', 'CheckIn')}
3333
</Button>
3434
)}
3535
</>

‎yarn.lock

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10160,7 +10160,7 @@ __metadata:
1016010160

1016110161
"fsevents@patch:fsevents@^2.3.2#~builtin<compat/fsevents>, fsevents@patch:fsevents@~2.3.2#~builtin<compat/fsevents>":
1016210162
version: 2.3.2
10163-
resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=df0bf1"
10163+
resolution: "fsevents@patch:fsevents@npm%3A2.3.2#~builtin<compat/fsevents>::version=2.3.2&hash=18f3a7"
1016410164
dependencies:
1016510165
node-gyp: latest
1016610166
conditions: os=darwin
@@ -17033,7 +17033,7 @@ __metadata:
1703317033

1703417034
"resolve@patch:resolve@^1.10.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.14.2#~builtin<compat/resolve>, resolve@patch:resolve@^1.19.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.20.0#~builtin<compat/resolve>, resolve@patch:resolve@^1.9.0#~builtin<compat/resolve>":
1703517035
version: 1.22.1
17036-
resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin<compat/resolve>::version=1.22.1&hash=c3c19d"
17036+
resolution: "resolve@patch:resolve@npm%3A1.22.1#~builtin<compat/resolve>::version=1.22.1&hash=07638b"
1703717037
dependencies:
1703817038
is-core-module: ^2.9.0
1703917039
path-parse: ^1.0.7
@@ -19210,17 +19210,17 @@ __metadata:
1921019210

1921119211
"typescript@patch:typescript@^4.0.3#~builtin<compat/typescript>, typescript@patch:typescript@^4.2.4#~builtin<compat/typescript>":
1921219212
version: 4.8.4
19213-
resolution: "typescript@patch:typescript@npm%3A4.8.4#~builtin<compat/typescript>::version=4.8.4&hash=0102e9"
19213+
resolution: "typescript@patch:typescript@npm%3A4.8.4#~builtin<compat/typescript>::version=4.8.4&hash=a1c5e5"
1921419214
bin:
1921519215
tsc: bin/tsc
1921619216
tsserver: bin/tsserver
19217-
checksum: 301459fc3eb3b1a38fe91bf96d98eb55da88a9cb17b4ef80b4d105d620f4d547ba776cc27b44cc2ef58b66eda23fe0a74142feb5e79a6fb99f54fc018a696afa
19217+
checksum: 563a0ef47abae6df27a9a3ab38f75fc681f633ccf1a3502b1108e252e187787893de689220f4544aaf95a371a4eb3141e4a337deb9895de5ac3c1ca76430e5f0
1921819218
languageName: node
1921919219
linkType: hard
1922019220

1922119221
"typescript@patch:typescript@~4.5.2#~builtin<compat/typescript>":
1922219222
version: 4.5.5
19223-
resolution: "typescript@patch:typescript@npm%3A4.5.5#~builtin<compat/typescript>::version=4.5.5&hash=bcec9a"
19223+
resolution: "typescript@patch:typescript@npm%3A4.5.5#~builtin<compat/typescript>::version=4.5.5&hash=a1c5e5"
1922419224
bin:
1922519225
tsc: bin/tsc
1922619226
tsserver: bin/tsserver

0 commit comments

Comments
 (0)