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.

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

feat(data-integrity): add checks-selector #348

Merged
merged 29 commits into from
Mar 16, 2022
Merged
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
172cc7d
feat(data-integrity): add checks-selector
Birkbjo Feb 25, 2022
9343cf2
fix: cleanup
Birkbjo Feb 25, 2022
18dfc25
chore(translations): update translations
Birkbjo Feb 25, 2022
48fa4b8
fix: cleanup
Birkbjo Feb 25, 2022
8f81118
fix: use Label instead of custom TransferOption
Birkbjo Feb 28, 2022
45e0d92
fix: cleanup react warnings
Birkbjo Feb 28, 2022
e23c4c1
fix: cleanup styles for transfer-option
Birkbjo Feb 28, 2022
dc5f213
refactor: cleanup
Birkbjo Mar 1, 2022
4f51dae
fix: add min-width, remove paramter-width change
Birkbjo Mar 1, 2022
a4d8d68
test: update test-fixtures, use 38
Birkbjo Mar 1, 2022
30921ad
style: run prettier
Birkbjo Mar 1, 2022
d9078b4
style: fix lint
Birkbjo Mar 1, 2022
0e04e4d
test: update more fixtures
Birkbjo Mar 1, 2022
931385d
style: run prettier on cypress
Birkbjo Mar 1, 2022
4e4e066
chore: update dhis2ApiVersion for tests
Birkbjo Mar 1, 2022
77ddb80
style: css lint
Birkbjo Mar 1, 2022
12b149f
test: fix fixtures
Birkbjo Mar 1, 2022
05fa734
chore: upgrade cypress dependencies and config
HendrikThePendric Mar 3, 2022
a699792
chore: produce new network fixtures
HendrikThePendric Mar 3, 2022
38df2b4
chore: change dhsi2 base url to localhost
HendrikThePendric Mar 3, 2022
41d5f23
feat(data-integrity): add support for report-type field
Birkbjo Mar 9, 2022
d7349fa
fix: actual add reportTypeField file
Birkbjo Mar 9, 2022
f2608ad
fix: cleanup
Birkbjo Mar 9, 2022
6915b18
fix: don't remove parameterName
Birkbjo Mar 9, 2022
559bebd
chore: update cypress dhis2ApiVersion
Birkbjo Mar 10, 2022
f41a728
fix: minor review
Birkbjo Mar 10, 2022
0671703
style: run prettier
Birkbjo Mar 10, 2022
27a80e2
fix(parameter-fields): spread parameterprops instead of new object
Birkbjo Mar 11, 2022
63105e7
fix(data-integrity): fix validation for empty checks
Birkbjo Mar 11, 2022
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
4 changes: 2 additions & 2 deletions .github/workflows/dhis2-verify-app.yml
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,8 @@ jobs:
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
CYPRESS_dhis2BaseUrl: https://debug.dhis2.org/dev
CYPRESS_dhis2ApiVersion: 37
CYPRESS_dhis2BaseUrl: http://localhost:8080
CYPRESS_dhis2ApiVersion: 38
CYPRESS_networkMode: stub

publish:
Expand Down
2 changes: 1 addition & 1 deletion cypress.env.json.example
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"dhis2BaseUrl": "https://debug.dhis2.org/dev",
"dhis2BaseUrl": "http://localhost:8080",
"dhis2Username": "USERNAME_HERE",
"dhis2Password": "PASSWORD_HERE"
}
7 changes: 6 additions & 1 deletion cypress.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,10 @@
"projectId": "sc56ms",
"testFiles": "**/*.feature",
"experimentalInteractiveRunEvents": true,
"video": false
"video": false,
"env": {
"dhis2DataTestPrefix": "dhis2-scheduler",
"networkMode": "live",
"dhis2ApiVersion": "37"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this not also be 38?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I would think so as well... Hendrik added this, but I guess the param from the command takes precedence, but will fix.

}
}

This file was deleted.

474 changes: 0 additions & 474 deletions cypress/fixtures/network/37/jobs_can_be_filtered.json

This file was deleted.

372 changes: 0 additions & 372 deletions cypress/fixtures/network/37/static_resources.json

This file was deleted.

238 changes: 0 additions & 238 deletions cypress/fixtures/network/37/system_job_actions.json

This file was deleted.

This file was deleted.

1,182 changes: 0 additions & 1,182 deletions cypress/fixtures/network/37/user_job_actions.json

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

238 changes: 0 additions & 238 deletions cypress/fixtures/network/37/users_should_be_able_to_view_jobs.json

This file was deleted.

This file was deleted.

Large diffs are not rendered by default.

271 changes: 271 additions & 0 deletions cypress/fixtures/network/38/jobs_can_be_filtered.json

Large diffs are not rendered by default.

372 changes: 372 additions & 0 deletions cypress/fixtures/network/38/static_resources.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"count": 957,
"totalResponseSize": 1034177,
"duplicates": 555,
"count": 1020,
"totalResponseSize": 475706,
"duplicates": 866,
"nonDeterministicResponses": 83,
"serverMinorVersion": 37,
"apiVersion": 38,
"fixtureFiles": [
"static_resources.json",
"users_should_be_able_to_navigate_back_to_the_job_list.json",
Expand Down
271 changes: 271 additions & 0 deletions cypress/fixtures/network/38/system_job_actions.json

Large diffs are not rendered by default.

Large diffs are not rendered by default.

339 changes: 339 additions & 0 deletions cypress/fixtures/network/38/user_job_actions.json

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

271 changes: 271 additions & 0 deletions cypress/fixtures/network/38/users_should_be_able_to_view_jobs.json

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
[
{
"path": "/api/37/systemSettings/helpPageLink",
"testName": "Users that are not authorized should be denied access -- An unauthorized user attempts to log in",
"path": "/api/38/systemSettings/helpPageLink",
"featureName": "Users that are not authorized should be denied access",
"static": false,
"count": 1,
"nonDeterministic": false,
"method": "GET",
"requestBody": "",
"requestHeaders": {
"host": "debug.dhis2.org",
"connection": "keep-alive",
"host": "localhost:8080",
"proxy-connection": "keep-alive",
"accept": "application/json",
"origin": "http://localhost:3000",
"sec-fetch-site": "cross-site",
"sec-fetch-site": "same-site",
"sec-fetch-mode": "cors"
},
"statusCode": 200,
"responseBody": "{\"helpPageLink\":\"https://dhis2.github.io/dhis2-docs/master/en/user/html/dhis2_user_manual_en.html\"}",
"responseSize": 99,
"responseHeaders": {
"server": "nginx/1.17.10",
"server": "nginx/1.21.5",
"content-type": "application/json;charset=UTF-8",
"transfer-encoding": "chunked",
"connection": "keep-alive",
Expand Down
164 changes: 159 additions & 5 deletions i18n/en.pot
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"POT-Creation-Date: 2021-11-18T16:21:37.799Z\n"
"PO-Revision-Date: 2021-11-18T16:21:37.799Z\n"
"POT-Creation-Date: 2022-03-09T14:09:44.809Z\n"
"PO-Revision-Date: 2022-03-09T14:09:44.809Z\n"

msgid "Not authorized"
msgstr "Not authorized"
Expand All @@ -30,6 +30,27 @@ msgstr "Something went wrong whilst creating your job"
msgid "CRON Expression"
msgstr "CRON Expression"

msgid "Please select checks to run."
msgstr "Please select checks to run."

msgid "Checks to run"
msgstr "Checks to run"

msgid "Run all available checks"
msgstr "Run all available checks"

msgid "Only run selected checks"
msgstr "Only run selected checks"

msgid "Severity"
msgstr "Severity"

msgid "Select checks to run."
msgstr "Select checks to run."

msgid "No options available"
msgstr "No options available"

msgid "Delay"
msgstr "Delay"

Expand All @@ -42,9 +63,6 @@ msgstr "Name"
msgid "Job type"
msgstr "Job type"

msgid "No options available"
msgstr "No options available"

msgid "Parameters"
msgstr "Parameters"

Expand Down Expand Up @@ -201,6 +219,142 @@ msgstr "Enrollment"
msgid "Validation result"
msgstr "Validation result"

msgid "Program indicators with invalid expressions"
msgstr "Program indicators with invalid expressions"

msgid "Data elements without groups"
msgstr "Data elements without groups"

msgid "Indicators with invalid numerator"
msgstr "Indicators with invalid numerator"

msgid "Program rule actions without notification"
msgstr "Program rule actions without notification"

msgid "Only one \"default\" category combo should exist"
msgstr "Only one \"default\" category combo should exist"

msgid "Data elements without data sets"
msgstr "Data elements without data sets"

msgid "Category combos being invalid"
msgstr "Category combos being invalid"

msgid "Indicators with identical formulas"
msgstr "Indicators with identical formulas"

msgid "Indicators without groups"
msgstr "Indicators without groups"

msgid "Data elements in data set not in form"
msgstr "Data elements in data set not in form"

msgid "Program rules without priority"
msgstr "Program rules without priority"

msgid "Validation rules without groups"
msgstr "Validation rules without groups"

msgid "Program indicators with invalid filters"
msgstr "Program indicators with invalid filters"

msgid "Categories with no category options"
msgstr "Categories with no category options"

msgid "Program rules without condition"
msgstr "Program rules without condition"

msgid "Program rule actions without stage"
msgstr "Program rule actions without stage"

msgid "Only one \"default\" category should exist"
msgstr "Only one \"default\" category should exist"

msgid ""
"Lists category combos that share a combination of categories with at least "
"one other category combo"
msgstr ""
"Lists category combos that share a combination of categories with at least "
"one other category combo"

msgid "Org units with cyclic references"
msgstr "Org units with cyclic references"

msgid "Program rule variables without data element"
msgstr "Program rule variables without data element"

msgid "Validation rules with invalid right side expression"
msgstr "Validation rules with invalid right side expression"

msgid "Data sets not assigned to org units"
msgstr "Data sets not assigned to org units"

msgid "Data elements violating exclusive group sets"
msgstr "Data elements violating exclusive group sets"

msgid "Org unit groups without group sets"
msgstr "Org unit groups without group sets"

msgid "Program rule variables without attribute"
msgstr "Program rule variables without attribute"

msgid "Org units violating exclusive group sets"
msgstr "Org units violating exclusive group sets"

msgid "Program rule actions without data object"
msgstr "Program rule actions without data object"

msgid "Only one \"default\" category option should exist"
msgstr "Only one \"default\" category option should exist"

msgid "Only one \"default\" category option combo should exist"
msgstr "Only one \"default\" category option combo should exist"

msgid "Org units without groups"
msgstr "Org units without groups"

msgid "Program indicators without expression"
msgstr "Program indicators without expression"

msgid "Indicators violating exclusive group sets"
msgstr "Indicators violating exclusive group sets"

msgid "Periods duplicates"
msgstr "Periods duplicates"

msgid "Data elements assigned to data sets with different period types"
msgstr "Data elements assigned to data sets with different period types"

msgid "Program rules without action"
msgstr "Program rules without action"

msgid "Org units being orphaned"
msgstr "Org units being orphaned"

msgid "Validation rules with invalid left side expression"
msgstr "Validation rules with invalid left side expression"

msgid "Indicators with invalid denominator"
msgstr "Indicators with invalid denominator"

msgid "Program rule actions without section"
msgstr "Program rule actions without section"

msgid "Warning"
msgstr "Warning"

msgid "Severe"
msgstr "Severe"

msgid "Report"
msgstr "Report"

msgid "Summary"
msgstr "Summary"

msgid "Details"
msgstr "Details"

msgid "Completed"
msgstr "Completed"

Expand Down
12 changes: 7 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
"lint:css": "stylelint './src/**/*.css' && prettier './src/**/*.css' --check",
"format": "d2-style apply && yarn format:css",
"format:css": "prettier './src/**/*.css' --write",
"cypress:capture": "start-server-and-test 'yarn start:nobrowser' http://localhost:3000 'yarn cypress run --env dhis2ApiVersion=37,networkMode=capture'",
"cypress:stub": "start-server-and-test 'yarn start:nobrowser' http://localhost:3000 'yarn cypress run --env dhis2ApiVersion=37,networkMode=stub'",
"cypress:capture": "start-server-and-test 'yarn start:nobrowser' http://localhost:3000 'yarn cypress run --env dhis2ApiVersion=38,networkMode=capture'",
"cypress:stub": "start-server-and-test 'yarn start:nobrowser' http://localhost:3000 'yarn cypress run --env dhis2ApiVersion=38,networkMode=stub'",
"cypress:live": "start-server-and-test 'yarn start:nobrowser' http://localhost:3000 'yarn cypress open --env networkMode=live'"
},
"dependencies": {
Expand All @@ -34,11 +34,13 @@
"devDependencies": {
"@dhis2/cli-app-scripts": "^8.0.1",
"@dhis2/cli-style": "^9.0.1",
"@dhis2/cli-utils-cypress": "^8.0.1",
"@dhis2/cypress-commands": "^8.0.0-alpha.8",
"@dhis2/cypress-plugins": "^8.0.0-alpha.8",
"@dhis2/cli-utils-cypress": "^9.0.2",
"@dhis2/cypress-commands": "^9.0.2",
"@dhis2/cypress-plugins": "^9.0.2",
"@testing-library/cypress": "^7.0.6",
"@testing-library/react-hooks": "^7.0.0",
"cypress": "^9.5.1",
"cypress-cucumber-preprocessor": "^4.3.1",
"enzyme": "^3.10.0",
"enzyme-adapter-react-16": "^1.15.6",
"eslint-plugin-compat": "^3.9.0",
Expand Down
Loading