2579 curator portal update #2723

maciej-zarzeczny · 2022-06-10T15:45:51Z

This relates to #2579 and #2589

This PR required me to refactor some major parts of the application. Also migrating from mui v4 to v5 required me to make changes to every file that used this library. The same goes for tests (after migrating to cypress v10). I also refactored some of the components from class components to function components in order to make the application more up to date. Unfortunately all those changes resulted in 140+ file changes in the PR.

I had many issues with failing tests in GH CI/CD pipeline. They all work now, however I had to remove Firefox browser from the integration tests GH action. All the tests are passing both on Chrome and Firefox locally when running Cypress but for some unknown reason fail on Firefox (only in CI). I read multiple forum threads were users experienced similar problems with Firefox running in CI in headless mode. The problems on Firefox were that it didn't "see" requests made to api/geocode/suggest?q=France, all my efforts to fix that failed. Strange thing is that requests to the same endpoint but in other tests works just fine. Finally I think that this is some kind of a bug coming from Firefox in headless mode. If you have any ideas what can cause such bugs, please let me know.

…579-curator-portal-update

codecov-commenter · 2022-06-15T09:59:13Z

Codecov Report

Merging #2723 (dc98aa6) into main (75729e6) will increase coverage by 5.74%.
The diff coverage is 50.75%.

@@            Coverage Diff             @@
##             main    #2723      +/-   ##
==========================================
+ Coverage   58.66%   64.41%   +5.74%     
==========================================
  Files         116      166      +50     
  Lines        4609     6058    +1449     
  Branches     1246     1596     +350     
==========================================
+ Hits         2704     3902    +1198     
- Misses       1905     2156     +251

Impacted Files	Coverage Δ
data-serving/data-service/src/controllers/case.ts	`82.63% <ø> (ø)`
...on/curator-service/api/src/clients/email-client.ts	`61.53% <ø> (ø)`
...cation/curator-service/api/src/controllers/auth.ts	`45.01% <0.00%> (-0.13%)`	⬇️
...ation/curator-service/api/src/controllers/cases.ts	`48.17% <0.00%> (ø)`
...ation/curator-service/api/src/controllers/users.ts	`67.92% <ø> (ø)`
verification/curator-service/api/src/model/user.ts	`66.66% <ø> (ø)`
...mponents/AcknowledgmentsPage/EnhancedTableHead.tsx	`6.66% <ø> (ø)`
.../components/AcknowledgmentsPage/helperFunctions.ts	`0.00% <0.00%> (ø)`
...ce/ui/src/components/AcknowledgmentsPage/index.tsx	`0.00% <ø> (ø)`
...ce/ui/src/components/AcknowledgmentsPage/styled.ts	`50.00% <ø> (ø)`
... and 121 more

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

…579-curator-portal-update

…ldothealth/list into 2579-curator-portal-update

jim-sheldon · 2022-09-13T15:09:59Z

verification/curator-service/ui/cypress/e2e/components/All.spec.ts

@@ -0,0 +1,14 @@
+// import './AcknowledgmentsPage.spec';


What does this file do?

Since Cypress v10 there is now way to run all tests at once locally. By uncommenting those imports and running All.spec.ts we get this functionality back. It just makes testing locally easier

jim-sheldon · 2022-09-13T15:14:10Z

Excellent work, thank you for doing all of this.
I support disabling Firefox tests. If you did not try changing the FF version, that might help.
If anything I would prefer testing using Safari, since more people use it than FF.

abhidg · 2022-09-13T16:57:08Z

Thanks @maciej-zarzeczny! Excellent work, few nits -- otherwise looks great :)

abhidg · 2022-08-31T19:41:05Z

verification/curator-service/ui/cypress.config.ts

+ execTimeout: 70000,
+ requestTimeout: 12000,
+ responseTimeout: 12000,
+ projectId: 'hx4khd',


is this registered somewhere? where do we get this/change this?

I created a project in Cypress dashboard in order to enable recording tests in the CI pipeline. I've just added you to this project, you should see the invite on your email

abhidg · 2022-08-31T19:42:41Z

verification/curator-service/ui/cypress/e2e/components/AppTest.spec.ts

- status: 200,
- response: '1.10.1',
- }).as('fetchVersion');
+ cy.intercept('GET', '/version', '1.10.1').as('fetchVersion');


this will fail once version updates -- maybe worth dropping this test? or checking for a 1. pattern, since unlikely we are going to 2. anytime soon.

By intercepting this request we are mocking the response with this string 1.10.1 so this should always return static version string

abhidg · 2022-09-13T13:39:33Z

verification/curator-service/api/src/controllers/cases.ts

@@ -149,7 +152,7 @@ export default class CasesController {
 );
 const result = await users().findOneAndUpdate(
 {
- _id: new ObjectId(user.id),
+ _id: new ObjectId(user._id),


Any reason for this change?

I believe that _id is returned from MongoDB, I just made this change to be consistent. I think I saw some typescript errors due to using id instead of _id. I will check that

abhidg · 2022-09-13T14:00:15Z

verification/curator-service/ui/src/components/FiltersDialog/FiltersDialog.test.tsx

+
+ mockedAxios.get.mockImplementation((url) => {
+ if (url === '/version') {
+ return Promise.resolve({ status: 200, data: '1.10.1' });


Will this need to be kept updated with the version? If so, might be worth using a regex match here

No, I'm mocking the /version endpoint request with a static string as a response. So this is not connected with the actual version

abhidg · 2022-09-13T14:35:51Z

verification/curator-service/ui/src/components/LinelistTable/helperFunctions.ts

+ admin2?: string,
+ admin1?: string,
+ country?: string,
+ latitude?: number | string,


shouldn't this be number?

Actually yes, thank you for catching that

abhidg · 2022-09-13T16:36:21Z

verification/curator-service/ui/src/components/landing-page/SignInForm.tsx

@@ -106,6 +107,8 @@ export default function SignInForm({
 try {
 const token =
 (await recaptchaRef.current.executeAsync()) as string;
+
+ console.log(token);


do we want to keep these around?

No, will delete

abhidg · 2022-09-13T16:44:09Z

verification/curator-service/ui/src/redux/store.ts

+ googleID: '42',
+ name: 'Alice Smith',
+ email: 'foo@bar.com',
+ roles: ['admin', 'curator'],


should the initial state have roles set?

It's only used in the tests. In most cases the user needs higher permissions in order to test admin functionalities. I just added this as the initial state not to duplicate code in the tests

OskarKocjan

Amazing work!

…579-curator-portal-update

abhidg · 2022-10-03T09:40:53Z

Thanks @maciej-zarzeczny, this was a huge task and much needed :)

Maciej Zarzeczny added 14 commits April 21, 2022 15:01

Updated Cypress and refactored tests

65fe4cb

Updated typescript, react-testing-library and material-table

7a1361b

udpated more packages, refactored Users component to function component

8dcf534

Linelist for normal users refactored

4e0d65d

Moved filters dialog state management to redux

49817a0

Moved DownloadButton to separate component

886e74d

Curator functionality in linelist table ready

70691a3

Refactored ChipInput component and updated remaining packages

6e3d092

fixed cypress tests

ba1600d

cypress tests fixed

f13a93e

fixed react testing library tests

7a153b6

Merge branch 'main' of https://github.com/globaldothealth/list into 2…

9e3eb0c

…579-curator-portal-update

Merge branch 'main' of https://github.com/globaldothealth/list into 2…

648c9f3

…579-curator-portal-update

added row menu to Users table

eef8cad

Maciej Zarzeczny added 15 commits June 15, 2022 13:02

renamed NewLinelistTable -> LinelistTable and fixed lint errors

cf26a15

Merge branch 'main' of https://github.com/globaldothealth/list into 2…

805935d

…579-curator-portal-update

fixed landing page bug

85f97e9

Merge branch 'main' of https://github.com/globaldothealth/list into 2…

f57ff7b

…579-curator-portal-update

fixed Cypress tests

3ea2225

fixed dependencies versions

b3a399b

increased requests timeouts in tests, and updated LinelistTable tests

a8712d0

enabled cypress tests recordings

d93a7c3

updated Cypress unhandled exceptions handling

67bc9eb

updated cypress tests

fc5ca10

updated datefield

0ec0418

changed DatePicker for DesktopDatePicker

a2c4efb

added timeout to cypress test

d2e56e0

Merge branch 'main' of https://github.com/globaldothealth/list into 2…

fa5b4b9

…579-curator-portal-update

fixed test

ec0bf63

Maciej Zarzeczny added 6 commits August 11, 2022 15:27

refactored DatePickers

9af451c

Merge branch 'main' of https://github.com/globaldothealth/list into 2…

d635ad1

…579-curator-portal-update

fixed conflicts and two failing tests

b8d2778

fixed bugs in CaseForm.ts

fe13230

fixed tests and disabled firefox tests from CI/CD for now

46b65de

Fixed react-testing-library tests

d24ed70

maciej-zarzeczny marked this pull request as ready for review August 26, 2022 10:55

maciej-zarzeczny requested review from abhidg, jim-sheldon and OskarKocjan August 26, 2022 11:03

Maciej Zarzeczny added 9 commits September 5, 2022 11:05

resolved merge conflicts

d610d39

fixed types bug

0146f27

Merge branch 'main' of https://github.com/globaldothealth/list into 2…

ae626f1

…579-curator-portal-update

Merge branch '2579-curator-portal-update' of https://github.com/globa…

fdc0f73

…ldothealth/list into 2579-curator-portal-update

installed React v18

ba34e7a

Fixed tests

c4763d4

updated tests

4c89667

fixed flaky tests

49e77c9

updated test

dc98aa6

jim-sheldon reviewed Sep 13, 2022

View reviewed changes

jim-sheldon approved these changes Sep 13, 2022

View reviewed changes

abhidg reviewed Sep 13, 2022

View reviewed changes

OskarKocjan approved these changes Sep 29, 2022

View reviewed changes

Maciej Zarzeczny added 2 commits October 3, 2022 11:32

CR suggestions

901efdc

Merge branch 'main' of https://github.com/globaldothealth/list into 2…

a05ada4

…579-curator-portal-update

abhidg merged commit a05ada4 into main Oct 3, 2022

abhidg deleted the 2579-curator-portal-update branch October 3, 2022 09:41

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

2579 curator portal update #2723

2579 curator portal update #2723

maciej-zarzeczny commented Jun 10, 2022 •

edited

Loading

codecov-commenter commented Jun 15, 2022 •

edited

Loading

jim-sheldon Sep 13, 2022

maciej-zarzeczny Oct 3, 2022

jim-sheldon commented Sep 13, 2022

abhidg commented Sep 13, 2022

abhidg Aug 31, 2022

maciej-zarzeczny Oct 3, 2022

abhidg Aug 31, 2022

maciej-zarzeczny Oct 3, 2022

abhidg Sep 13, 2022

maciej-zarzeczny Oct 3, 2022

abhidg Sep 13, 2022

maciej-zarzeczny Oct 3, 2022 •

edited

Loading

abhidg Sep 13, 2022

maciej-zarzeczny Oct 3, 2022

abhidg Sep 13, 2022

maciej-zarzeczny Oct 3, 2022

abhidg Sep 13, 2022

maciej-zarzeczny Oct 3, 2022

OskarKocjan left a comment

abhidg commented Oct 3, 2022

2579 curator portal update #2723

2579 curator portal update #2723

Conversation

maciej-zarzeczny commented Jun 10, 2022 • edited Loading

codecov-commenter commented Jun 15, 2022 • edited Loading

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jim-sheldon commented Sep 13, 2022

abhidg commented Sep 13, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

maciej-zarzeczny Oct 3, 2022 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

OskarKocjan left a comment

Choose a reason for hiding this comment

abhidg commented Oct 3, 2022

maciej-zarzeczny commented Jun 10, 2022 •

edited

Loading

codecov-commenter commented Jun 15, 2022 •

edited

Loading

maciej-zarzeczny Oct 3, 2022 •

edited

Loading