Modified view-agency component & css for updated interface #326

deveshchatuphale7 · 2020-10-17T15:39:37Z

Related Issue

Fixes #212

Checklist:

I have read the contributor's guide.
I linked an issue in the previous section
I have commented on the linked issue
I was assigned the linked issue (not required)
I have tested the change to the best of my ability against the sandbox or a local build.

Optional items:

My change adds new text and requires a change to translations.
My change requires a change to the documentation.
I have submitted a PR to the documentation repo.
I was not able to test... (explain below, e.g. you did not have permissions to test a specific feature)
This change depends O-FISH Realm repository changes (explain below)

Optional: Add any explanations here
Modified view-agency component as well as css file to incorporate design requirements
Optional: Add any relevant screenshots here

getting rid of errant ]

…7/o-fish-web into pr/326

Sheeri · 2020-10-20T02:04:53Z

src/components/agencies/view-agency/view-agency.component.js

-              </Fragment>
-            )}
+                </Fragment>
+              )}
          </div>
          <NavLink to={EDIT_AGENCIES_PAGE.replace(":id", agency._id)}>


This line is giving me an error when I run npm start locally on this branch:

Failed to compile.

./src/components/agencies/view-agency/view-agency.component.js
Line 109:58: 'agency' is not defined no-undef

Sheeri

I cannot get this to build....see inline comment.

Sheeri

Hi, it still won't build - you can see that on this PR page:

and if you click through to "Details" you can see:

./src/components/agencies/view-agency/view-agency.component.js
Line 257:41: 'agencyInfo' is not defined no-undef

…7/o-fish-web into agency-officers

Sheeri

Hi @deveshchatuphale7 - Can you see the "checks" section of #326 ? I can't review the code until it builds and gets a green checkmark there. It looks like you fixed the first issue, but now there's another issue.

deveshchatuphale7 · 2020-10-23T15:40:29Z

Hi @deveshchatuphale7 - Can you see the "checks" section of #326 ? I can't review the code until it builds and gets a green checkmark there. It looks like you fixed the first issue, but now there's another issue.

Thanks for informing. Hopefully my latest commit will fix the issue. But I am curious why I was not getting any issue while generating build locally

Sheeri · 2020-10-23T18:08:10Z

Hi there! The build on the website builds the current code with your changes. You probably did not do a "git pull" before your testing and PR submission, so you had older code - the files you didn't change. Github tests the current code plus your changes because there could be issues and it wants to find them first.

Sheeri

Hi! It built, but I'm not seeing the problem resolved.

I logged in as an Agency Administrator, then went to the Agencies page. Then clicked on my agency, and here's the page I got:

It still shows 0 officers, when there should at least be 1 officer (me!).

I did this against the sandbox; is that what you used?

deveshchatuphale7 · 2020-10-23T19:01:01Z

Hi! It built, but I'm not seeing the problem resolved.

I logged in as an Agency Administrator, then went to the Agencies page. Then clicked on my agency, and here's the page I got:

It still shows 0 officers, when there should at least be 1 officer (me!).

I did this against the sandbox; is that what you used?

Yes, Actually also for my login I got officers array with key officers under agencyAdditionalInfo object was empty. Hence dashboard is showing zero officers.

Did I miss any step here, could you point me in right direction ?

Sheeri · 2020-10-23T20:09:00Z

Ah! I see. You correctly printed out agencyAdditionalInfo.

The problem is that agencyAdditionalInfo object is wrong - how is it populated? is it looking in the wrong place for officers?

You might be able to find some clues by looking at src/components/agencies/agencies.component.js - I can see there's a function in there called getAgenciesWithOfficers, which is how that page gets a list of officers, which it then uses to display.

Sheeri

Hi @deveshchatuphale7 - this is a great start! I'm getting a count and a list of users, but it's not getting them from the right place. I added some inline comments and suggestions.

I'm also not sure if search is supposed to work? Right now it doesn't - if I type something into the search bar and hit "return" nothing happens. It's totally OK if search doesn't work, but it looks like the code intends it to be working, perhaps it is supposed to highlight a search term.

I'm happy to keep the scope of this to just the count and list of officers, and we can make a different ticket for search to work. (but then we should remove the code related to search functionality - though it's OK to keep the UI code in there - it looks great!)

src/components/agencies/view-agency/view-agency.component.js

Sheeri · 2020-10-26T14:54:39Z

src/components/agencies/view-agency/view-agency.component.js

-            loading: false,
+          });
+
+          boardingService.getBoardingsWithFacet(50,0,null,{"agency":data.name}).then((userData)=>{


If I'm reading this properly, this gets a list of officers by getting the boarding records for the agency, and finding all the distinct reportingOfficer email addresses.

But we want to see officers, even if they have not submitted any boarding records.

This should use the "searchFacetByUsers" function, which takes in a limit, offset, query, and filter, and returns an array of users (using limit and offset to only return what's needed on the page), a total count of users, and any highlighting needed.

You can see that function at https://github.com/WildAid/o-fish-realm/blob/main/WildAidDemo/functions/searchFacetByUsers/source.js

I tried using getUsers from users.service which calls searchFacetByUsers function. With agency name as filter I received empty array in response & without any filters I received list of users, In my case I received user details of me & another user I created. So what parameters would be helpful to get officer details ?

Ah, you don't need a filter, there are permissions in place to make sure you only see what you're allowed to see. (as an agency admin, you can only see users in your agency)

You say you get the user details for you and the other user you created, which sounds like you have the right link there. What additional details do you need?

Yes I think response from getUsers will suffice the requirement. but one doubt I have is, on agencies page for agency name deveshchatuphale7 respective officer name in the list is Emex Geefy.But, I didn't receive any info about that user in the response of getUsers without any filters & searchQuery.
So just wanted to know if I am receiving a correct response or I have to pass any additional filters or searchQuery ?

To debug, loop through every part of the returned user object, and print it, to see where the issue is. Perhaps there is a different field you should be using? (that's what I'd do, I don't know where the problem is here).

Sheeri

This looks fantastic!

Sheeri · 2020-10-27T16:49:26Z

Congratulations! 🎉 🙌 🎆 ㊗️

This PR is great and has been merged into the code. Thanks so much for contributing! If you'd like, you can request to work on another issue. We really appreciate your effort!

To claim your O-FISH badge, head on over to the MongoDB Community forums, login, and reply - making sure to link to this PR.

deveshchatuphale7 · 2020-10-28T07:03:05Z

Congratulations! 🎉 🙌 🎆 ㊗️

This PR is great and has been merged into the code. Thanks so much for contributing! If you'd like, you can request to work on another issue. We really appreciate your effort!

To claim your O-FISH badge, head on over to the MongoDB Community forums, login, and reply - making sure to link to this PR.

Sure!

deveshchatuphale7 and others added 2 commits October 17, 2020 21:02

Modified view-agency component & css for updated interface

80828f9

Merge branch 'main' into agency-officers

55e797d

Sheeri self-requested a review October 20, 2020 01:59

Sheeri and others added 3 commits October 19, 2020 22:00

Update view-agency.component.js

79ff6ae

Update view-agency.component.js

0bb22f8

getting rid of errant ]

Merge branch 'agency-officers' of https://github.com/deveshchatuphale…

9ca7ead

…7/o-fish-web into pr/326

Sheeri reviewed Oct 20, 2020

View reviewed changes

Sheeri requested changes Oct 20, 2020

View reviewed changes

deveshchatuphale7 added 2 commits October 20, 2020 19:14

Fixed agency not found issue

99ea402

Fixed agency not found issue

c213885

deveshchatuphale7 requested a review from Sheeri October 20, 2020 13:48

Merge branch 'main' into agency-officers

747f712

Sheeri requested changes Oct 22, 2020

View reviewed changes

deveshchatuphale7 added 2 commits October 22, 2020 23:10

Changed agencyinfo reference to agency

7445648

Merge branch 'agency-officers' of https://github.com/deveshchatuphale…

03c6e86

…7/o-fish-web into agency-officers

deveshchatuphale7 requested a review from Sheeri October 22, 2020 17:43

Sheeri requested changes Oct 22, 2020

View reviewed changes

deveshchatuphale7 added 2 commits October 23, 2020 09:57

Merge remote-tracking branch 'upstream/main' into agency-officers

f126eea

fixed parsing error in translation.json

06951b9

deveshchatuphale7 requested a review from Sheeri October 23, 2020 15:38

Sheeri requested changes Oct 23, 2020

View reviewed changes

Modified logic to populate officers

3caea11

deveshchatuphale7 requested a review from Sheeri October 25, 2020 06:26

Sheeri reviewed Oct 26, 2020

View reviewed changes

Populating officers using getusers method

3eb12d8

deveshchatuphale7 requested a review from Sheeri October 27, 2020 04:37

deveshchatuphale7 added 3 commits October 27, 2020 10:39

Merge remote-tracking branch 'upstream/main' into agency-officers

6c0324c

Removed unused var from reset password

4055723

Removed unused var from reset password

dc172e2

Sheeri approved these changes Oct 27, 2020

View reviewed changes

Sheeri merged commit f7d6d74 into WildAid:main Oct 27, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Modified view-agency component & css for updated interface #326

Modified view-agency component & css for updated interface #326

deveshchatuphale7 commented Oct 17, 2020

Sheeri Oct 20, 2020

Sheeri left a comment

Sheeri left a comment

Sheeri left a comment

deveshchatuphale7 commented Oct 23, 2020

Sheeri commented Oct 23, 2020

Sheeri left a comment

deveshchatuphale7 commented Oct 23, 2020

Sheeri commented Oct 23, 2020

Sheeri left a comment

Sheeri Oct 26, 2020

deveshchatuphale7 Oct 26, 2020

Sheeri Oct 26, 2020

deveshchatuphale7 Oct 26, 2020

Sheeri Oct 26, 2020

Sheeri left a comment

Sheeri commented Oct 27, 2020

deveshchatuphale7 commented Oct 28, 2020

Modified view-agency component & css for updated interface #326

Modified view-agency component & css for updated interface #326

Conversation

deveshchatuphale7 commented Oct 17, 2020

Related Issue

Checklist:

Sheeri Oct 20, 2020

Choose a reason for hiding this comment

Sheeri left a comment

Choose a reason for hiding this comment

Sheeri left a comment

Choose a reason for hiding this comment

Sheeri left a comment

Choose a reason for hiding this comment

deveshchatuphale7 commented Oct 23, 2020

Sheeri commented Oct 23, 2020

Sheeri left a comment

Choose a reason for hiding this comment

deveshchatuphale7 commented Oct 23, 2020

Sheeri commented Oct 23, 2020

Sheeri left a comment

Choose a reason for hiding this comment

Sheeri Oct 26, 2020

Choose a reason for hiding this comment

deveshchatuphale7 Oct 26, 2020

Choose a reason for hiding this comment

Sheeri Oct 26, 2020

Choose a reason for hiding this comment

deveshchatuphale7 Oct 26, 2020

Choose a reason for hiding this comment

Sheeri Oct 26, 2020

Choose a reason for hiding this comment

Sheeri left a comment

Choose a reason for hiding this comment

Sheeri commented Oct 27, 2020

deveshchatuphale7 commented Oct 28, 2020