Skip to content

Commit 233d4a5

Browse files
flaminicflaminic
committed
Merge remote-tracking branch 'origin/master' into upgrade-vite-react
2 parents 3925755 + 7feb63d commit 233d4a5

Some content is hidden

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

61 files changed

+1233
-1256
lines changed

‎CHANGELOG.md

+28
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,31 @@
1+
## [101.1.25](https://github.com/dhis2/import-export-app/compare/v101.1.24...v101.1.25) (2025-02-23)
2+
3+
4+
### Bug Fixes
5+
6+
* **translations:** sync translations from transifex (master) ([63bda71](https://github.com/dhis2/import-export-app/commit/63bda715a6aed7d920112eea8b9fe5625f06f131))
7+
8+
## [101.1.24](https://github.com/dhis2/import-export-app/compare/v101.1.23...v101.1.24) (2025-02-16)
9+
10+
11+
### Bug Fixes
12+
13+
* **translations:** sync translations from transifex (master) ([8241761](https://github.com/dhis2/import-export-app/commit/8241761563c2080314b6e1832704fecf5cf5494e))
14+
15+
## [101.1.23](https://github.com/dhis2/import-export-app/compare/v101.1.22...v101.1.23) (2025-02-10)
16+
17+
18+
### Bug Fixes
19+
20+
* add name option to id scheme selector ([55e342b](https://github.com/dhis2/import-export-app/commit/55e342b54dda2ebe1233ac40180164392cad961c))
21+
* remove attachment from export request ([d1d50a8](https://github.com/dhis2/import-export-app/commit/d1d50a8966ea4fc9277e00e80e88e3ddbc64b8f3))
22+
* remove event id scheme selector ([0d3de56](https://github.com/dhis2/import-export-app/commit/0d3de569cb9e5fd45219d45b68569b139b9fbade))
23+
* remove format query string from url ([c07ea31](https://github.com/dhis2/import-export-app/commit/c07ea316aaa5d330530a75dde3e877a81310e1b0))
24+
* remove left over ouMode in tests ([5384465](https://github.com/dhis2/import-export-app/commit/53844658d4859d35b3746c209b9f11906803b643))
25+
* remove link to doc in job summary ([c06b8f1](https://github.com/dhis2/import-export-app/commit/c06b8f166d6cdd66b6557164147106058c4e6c79))
26+
* remove links query param from export url ([919023f](https://github.com/dhis2/import-export-app/commit/919023fad51c6be1188566a3c451b7de7115972d))
27+
* rename ouMode to orgUnitMode ([b5227a6](https://github.com/dhis2/import-export-app/commit/b5227a6df2fe68ae81c246d72ff50802ec543db8))
28+
129
## [101.1.22](https://github.com/dhis2/import-export-app/compare/v101.1.21...v101.1.22) (2025-02-04)
230

331

‎cypress/integration/EndpointParamChecks/ExportEvent/index.js

+1-4
Original file line numberDiff line numberDiff line change
@@ -91,19 +91,16 @@ Then('the download request is sent with the right parameters', () => {
9191
...expected
9292
} = allExpected
9393
const extension = compression ? `.${compression}` : ''
94-
const attachment = `events.${format}${extension}`
9594

9695
/**
9796
* The Event page has some (WTF) customizations.
9897
* These are handled here:
9998
*/
10099
const updatedExpected = {
101100
...expected,
102-
links: 'false',
103101
skipPaging: 'true',
104-
ouMode: inclusion.toUpperCase(),
102+
orgUnitMode: inclusion.toUpperCase(),
105103
programStage: programStages,
106-
attachment,
107104
format,
108105
}
109106

‎cypress/integration/EndpointParamChecks/ExportTEI.feature

+2-8
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Feature: The user should be able to export tracked entity instances
66
And the more options are visible
77
And the following options are set
88
| name | value | label |
9-
| ouMode | :MANUAL: | |
9+
| orgUnitMode | :MANUAL: | |
1010
| teiTypeFilter | NONE | |
1111
| format | json | |
1212
| lastUpdatedFilter | NONE | |
@@ -15,7 +15,6 @@ Feature: The user should be able to export tracked entity instances
1515
| includeDeleted | false | |
1616
| includeAllAttributes | false | |
1717
| dataElementIdScheme | UID | Uid |
18-
| eventIdScheme | UID | Uid |
1918
| orgUnitIdScheme | UID | Uid |
2019
| idScheme | UID | Uid |
2120
And the Sierra Leone org unit has been selected
@@ -32,7 +31,7 @@ Feature: The user should be able to export tracked entity instances
3231

3332
Scenario: The user selects "Include children of selected organisation units"
3433
as organisation unit selection mode
35-
Given the "ouMode" input is set to "CAPTURE"
34+
Given the "orgUnitMode" input is set to "CAPTURE"
3635
When the export form is submitted
3736
Then the download request is sent with the right parameters
3837

@@ -56,11 +55,6 @@ Feature: The user should be able to export tracked entity instances
5655
When the export form is submitted
5756
Then the download request is sent with the right parameters
5857

59-
Scenario: The user selects a different event id scheme
60-
Given the "eventIdScheme" input is set to "Code"
61-
When the export form is submitted
62-
Then the download request is sent with the right parameters
63-
6458
Scenario: The user selects a different org unit id scheme
6559
Given the "orgUnitIdScheme" input is set to "Code"
6660
When the export form is submitted

‎cypress/integration/EndpointParamChecks/ExportTEI/index.js

+5-3
Original file line numberDiff line numberDiff line change
@@ -99,15 +99,17 @@ Then('the download request is sent with the right parameters', () => {
9999

100100
const expected = {
101101
...rest,
102-
...(rest.ouMode === ':MANUAL:'
102+
...(rest.orgUnitMode === ':MANUAL:'
103103
? { ou: orgUnit.replace(',', ';') }
104104
: {}),
105105
...(programStatus !== '' ? { programStatus } : {}),
106106
...(assignedUser
107107
? { assignedUser: assignedUser.join(';') }
108108
: {}),
109-
ouMode:
110-
rest.ouMode === ':MANUAL:' ? 'SELECTED' : rest.ouMode,
109+
orgUnitMode:
110+
rest.orgUnitMode === ':MANUAL:'
111+
? 'SELECTED'
112+
: rest.orgUnitMode,
111113
}
112114

113115
const expectedEntries = Object.entries(expected)

‎cypress/integration/EndpointParamChecks/ImportEvent.feature

-6
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ Feature: The user should be able to import events
1010
| format | json | |
1111
| dryRun | false | |
1212
| dataElementIdScheme | UID | Uid |
13-
| eventIdScheme | UID | Uid |
1413
| idScheme | UID | Uid |
1514
| orgUnitIdScheme | UID | Uid |
1615

@@ -33,11 +32,6 @@ Feature: The user should be able to import events
3332
When the import form is submitted
3433
Then the upload request is sent with the right parameters
3534

36-
Scenario: The user selects a different event id scheme
37-
Given the "eventIdScheme" input is set to "Code"
38-
When the import form is submitted
39-
Then the upload request is sent with the right parameters
40-
4135
Scenario: The user selects a different id scheme
4236
Given the "idScheme" input is set to "Code"
4337
When the import form is submitted

‎cypress/integration/EndpointParamChecks/ImportTEI.feature

-6
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ Feature: The user should be able to import tracked entity instances
2020
| skipValidation | false | |
2121
| inclusionStrategy | NON_NULL | |
2222
| dataElementIdScheme | UID | Uid |
23-
| eventIdScheme | UID | Uid |
2423
| idScheme | UID | Uid |
2524
| orgUnitIdScheme | UID | Uid |
2625

@@ -93,11 +92,6 @@ Feature: The user should be able to import tracked entity instances
9392
When the import form is submitted
9493
Then the upload request is sent with the right parameters
9594

96-
Scenario: The user selects a different event id scheme
97-
Given the "eventIdScheme" input is set to "Code"
98-
When the import form is submitted
99-
Then the upload request is sent with the right parameters
100-
10195
Scenario: The user selects a different id scheme
10296
Given the "idScheme" input is set to "Code"
10397
When the import form is submitted

‎cypress/support/form/helpers/nameToDataTest.js

-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@ export const nameToDataTest = (name) => {
1515
case 'dataElementIdScheme':
1616
return 'input-data-element-id-scheme'
1717

18-
case 'eventIdScheme':
19-
return 'input-event-id-scheme'
20-
2118
case 'orgUnitIdScheme':
2219
return 'input-org-unit-id-scheme'
2320

‎cypress/support/form/selectFormInput.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ const radioInputs = [
2929
'inclusionStrategy',
3030
'lastUpdatedFilter',
3131
'mergeMode',
32-
'ouMode',
32+
'orgUnitMode',
3333
'preheatMode',
3434
'programStatus',
3535
'sharing',
@@ -41,7 +41,6 @@ const ignoreInputs = ['dryRun', 'importMode']
4141

4242
const selectInputs = [
4343
'dataElementIdScheme',
44-
'eventIdScheme',
4544
'orgUnitIdScheme',
4645
'idScheme',
4746
'program',

‎i18n/ar.po

+29-29
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
msgid ""
88
msgstr ""
99
"Project-Id-Version: i18next-conv\n"
10-
"POT-Creation-Date: 2024-03-01T15:50:32.586Z\n"
10+
"POT-Creation-Date: 2025-02-05T10:14:36.386Z\n"
1111
"PO-Revision-Date: 2019-06-04 17:24+0000\n"
1212
"Last-Translator: Philip Larsen Donnelly, 2022\n"
1313
"Language-Team: Arabic (https://app.transifex.com/hisp-uio/teams/100509/ar/)\n"
@@ -173,9 +173,6 @@ msgstr "يجب تحديد مجموعة بيانات واحدة"
173173
msgid "End date"
174174
msgstr "تاريخ النهاية"
175175

176-
msgid "Event ID scheme"
177-
msgstr ""
178-
179176
msgid "Loading export..."
180177
msgstr "جارٍ تحميل التصدير ..."
181178

@@ -699,6 +696,15 @@ msgstr "تم تحديثه"
699696
msgid "Total"
700697
msgstr "الإجمالي"
701698

699+
msgid "Reports"
700+
msgstr ""
701+
702+
msgid "Error Code"
703+
msgstr ""
704+
705+
msgid "Tracker Type"
706+
msgstr ""
707+
702708
msgid "Indexes"
703709
msgstr ""
704710

@@ -756,7 +762,7 @@ msgstr ""
756762
msgid "Metadata import"
757763
msgstr "استيراد البيانات الوصفية"
758764

759-
msgid "TEI import"
765+
msgid "Tracked entity import"
760766
msgstr ""
761767

762768
msgid "Data export"
@@ -771,7 +777,7 @@ msgstr ""
771777
msgid "Metadata export"
772778
msgstr "تصدير البيانات الوصفية"
773779

774-
msgid "TEI export"
780+
msgid "Tracked entity export"
775781
msgstr ""
776782

777783
msgid "Job overview"
@@ -1116,19 +1122,19 @@ msgid ""
11161122
msgstr ""
11171123

11181124
msgid ""
1119-
"Export event data for programs, stages and tracked entities to JSON, CSV, or"
1120-
" DXF2 format."
1125+
"Export event data for programs, stages and tracked entities to JSON or CSV "
1126+
"format."
11211127
msgstr ""
11221128

11231129
msgid "Export events"
11241130
msgstr "تصدير أحداث"
11251131

11261132
msgid ""
1127-
"Import event data for programs, stages and tracked entities to JSON, CSV, or"
1128-
" DXF2 format."
1133+
"Import event data for programs, stages and tracked entities from JSON or CSV"
1134+
" format."
11291135
msgstr ""
11301136

1131-
msgid "Supported file types: JSON, CSV, and DXF2."
1137+
msgid "Supported file types: JSON and CSV."
11321138
msgstr ""
11331139

11341140
msgid "Organisation unit geometry import"
@@ -1156,8 +1162,8 @@ msgstr ""
11561162
msgid "Export metadata"
11571163
msgstr "تصدير بيانات وصفية"
11581164

1159-
msgid "Export tracked entity instances"
1160-
msgstr "تصدير نسخ الكيانات المتعقبة"
1165+
msgid "Export tracked entities"
1166+
msgstr ""
11611167

11621168
msgid "Import data"
11631169
msgstr "استيراد بيانات"
@@ -1174,8 +1180,8 @@ msgstr ""
11741180
msgid "Import metadata"
11751181
msgstr "استيراد بيانات وصفية"
11761182

1177-
msgid "Import tracked entity instances"
1178-
msgstr "استيراد نسخ الكيانات المتعقبة"
1183+
msgid "Import tracked entities"
1184+
msgstr ""
11791185

11801186
msgid "An overview of all import jobs started this session."
11811187
msgstr "نظرة عامة على جميع مهام الاستيراد التي بدأت في هذه الجلسة."
@@ -1195,16 +1201,13 @@ msgid ""
11951201
" CSV format."
11961202
msgstr ""
11971203

1198-
msgid "Supported file types: JSON and CSV."
1199-
msgstr ""
1200-
12011204
msgid "A class key must be selected"
12021205
msgstr "يجب تحديد class key"
12031206

1204-
msgid "Tracked entity instances export"
1207+
msgid "Tracked entities export"
12051208
msgstr ""
12061209

1207-
msgid "Export tracked entity instances in JSON, CSV, or DXF2 format."
1210+
msgid "Export tracked entities in JSON or CSV format."
12081211
msgstr ""
12091212

12101213
msgid "Program to export from"
@@ -1216,13 +1219,13 @@ msgstr ""
12161219
msgid "At least one of the 'last updated' date fields must be specified"
12171220
msgstr "يجب تحديد حقل تاريخ واحد على الأقل من حقول \"آخر تحديث\""
12181221

1219-
msgid "Tracked entity instances import"
1220-
msgstr "استيراد نسخ الكيان المتعقبة"
1222+
msgid "Tracked entities import"
1223+
msgstr ""
12211224

1222-
msgid "Import tracked entity instances using JSON or DXF2 format."
1225+
msgid "Import tracked entities using JSON format."
12231226
msgstr ""
12241227

1225-
msgid "Supported file types: JSON and DXF2."
1228+
msgid "Supported file types: JSON."
12261229
msgstr ""
12271230

12281231
msgid "Job started."
@@ -1231,9 +1234,6 @@ msgstr ""
12311234
msgid "An unknown error occurred. Please try again later"
12321235
msgstr "حدث خطأ غير معروف. الرجاء إعادة المحاولة في وقت لاحق"
12331236

1234-
msgid "Loading exported data"
1235-
msgstr "تحميل البيانات المصدرة"
1236-
12371237
msgid "Data"
12381238
msgstr "بيانات"
12391239

@@ -1249,5 +1249,5 @@ msgstr "GML"
12491249
msgid "Metadata"
12501250
msgstr "البيانات الوصفية"
12511251

1252-
msgid "TEI"
1253-
msgstr "TEI"
1252+
msgid "Tracked entity"
1253+
msgstr ""

0 commit comments

Comments
 (0)