Implementation of sorting of requests in Request screen #1082

chandel-aman · 2023-11-21T21:08:58Z

What kind of change does this PR introduce?

Bug

Issue Number:

Fixes #1073

Did you add tests for your changes?

Yes

Snapshots/Videos:

www_screencapture_com_2023-11-22_02_37.webm

If relevant, did you update the documentation?

Summary

Implementation of sorting functionality on Requests Screen.
Sorting of requests can be done on the basis of latest and oldest.
Added the tests for sorting.

Does this PR introduce a breaking change?

Other information

Have you read the contributing guide?

Yes

github-actions · 2023-11-21T21:09:31Z

Our Pull Request Approval Process

We have these basic policies to make the approval process smoother for our volunteer team.

Testing Your Code

Please make sure your code passes all tests. Our test code coverage system will fail if these conditions occur:

The overall code coverage drops below the target threshold of the repository
Any file in the pull request has code coverage levels below the repository threshold
Merge conflicts

The process helps maintain the overall reliability of the code base and is a prerequisite for getting your PR approved. Assigned reviewers regularly review the PR queue and tend to focus on PRs that are passing.

Reviewers

When your PR has been assigned reviewers contact them to get your code reviewed and approved via:

comments in this PR or
our slack channel

Reviewing Your Code

Your reviewer(s) will have the following roles:

arbitrators of future discussions with other contributors about the validity of your changes
point of contact for evaluating the validity of your work
person who verifies matching issues by others that should be closed.
person who gives general guidance in fixing your tests

CONTRIBUTING.md

Read our CONTRIBUTING.md file. Most importantly:

PRs with issues not assigned to you will be closed by the reviewer
Fix the first comment in the PR so that each issue listed automatically closes

Other

🎯 Please be considerate of our volunteers' time. Contacting the person who assigned the reviewers is not advised unless they ask for your input. Do not @ the person who did the assignment otherwise.
Read the CONTRIBUTING.md file make

codecov · 2023-11-21T21:21:07Z

Codecov Report

Attention: 3 lines in your changes are missing coverage. Please review.

Comparison is base (655b6b3) 92.77% compared to head (af20ff6) 94.64%.
Report is 21 commits behind head on develop.

Files	Patch %	Lines
...rgProfileFieldSettings/OrgProfileFieldSettings.tsx	90.00%	3 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff             @@
##           develop    #1082      +/-   ##
===========================================
+ Coverage    92.77%   94.64%   +1.87%     
===========================================
  Files          134      138       +4     
  Lines         3238     3324      +86     
  Branches       904      922      +18     
===========================================
+ Hits          3004     3146     +142     
+ Misses         225      171      -54     
+ Partials         9        7       -2

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

palisadoes · 2023-11-22T00:46:59Z

Thanks.

Please also get the test code coverage for the typescript files you edited up to 100%

We are trying to get back up to 95% coverage overall to ensure the reliability of our code.

src/screens/Requests/Requests.tsx

chandel-aman · 2023-11-29T21:58:13Z

@palisadoes Test coverage for Requests.tsx has been increased to 100%. Can this be merged now?

rishav-jha-mech · 2023-11-30T02:45:48Z

Good work @chandel-aman, please complete the points that I have asked in the review.

noman2002 · 2023-11-30T06:56:27Z

@rishav-jha-mech Your review is not visible. Please put a comment.

noman2002

Looks good to me.

chandel-aman · 2023-11-30T11:53:25Z

Good work @chandel-aman, please complete the points that I have asked in the review.

@rishav-jha-mech Could you please comment down the changes that needs to be done?

chandel-aman · 2023-12-01T10:59:04Z

@palisadoes @rishav-jha-mech
Could you please provide the information on what needs to be reviewed?

src/screens/Requests/Requests.tsx

rishav-jha-mech · 2023-12-02T08:02:46Z

src/screens/Requests/Requests.tsx

+                <Dropdown.Toggle
+                  variant="outline-success"
+                  data-testid="sortuser"
+                >
                  <SortIcon className={'me-1'} />
                  {t('sort')}


Here instead of Sort text you should show the selected option, and the sort button should become of variant='success' meaning sorting is active now

rishav-jha-mech · 2023-12-02T08:03:11Z

src/screens/Requests/Requests.tsx

-                  <Dropdown.Item href="#/action-3">Action 3</Dropdown.Item>
+                  <Dropdown.Item
+                    onClick={(): void => handleSorting('latest')}
+                    data-testid="latest"


Whichever option is selected should be highlighted

rishav-jha-mech · 2023-12-02T08:04:54Z

src/screens/Requests/Requests.tsx

@@ -372,6 +418,11 @@ const Requests = (): JSX.Element => {
            </Table>
          </InfiniteScroll>
        )}
+        {!isLoading && displayedUsers.length === 0 && (
+          <div className="w-100 text-center my-4">
+            <h5 className="m-0 ">{t('noRequestFound')}</h5>


Why remove this line ?

{t('noResultsFoundFor')} "{searchByName}"

If no request is found for a particular search, the above text should be displayed

rishav-jha-mech · 2023-12-02T08:09:20Z

Also @chandel-aman you may add time of the request in the table column, and it should be of humanize format, ex 1 Day ago, 4 hours ago, 1 year ago, etc.

chandel-aman · 2023-12-02T13:12:14Z

@rishav-jha-mech Thanks for your review. I'll make the changes that you've suggested.

chandel-aman · 2023-12-02T13:16:45Z

Also @chandel-aman you may add time of the request in the table column, and it should be of humanize format, ex 1 Day ago, 4 hours ago, 1 year ago, etc.

@rishav-jha-mech This is not related to this issue of sorting the requests, should I make a separate issue for this? Also, we only have date for when the user was created not date when the request was made. So do we have to display the user created date in requests?

rishav-jha-mech · 2023-12-02T13:48:50Z

@chandel-aman then that means that you are sorting on basis of user creation, so add that field in column for now, humanize the date time.

chandel-aman · 2023-12-02T13:54:58Z

@rishav-jha-mech Sure, will do that!

noman2002 · 2023-12-06T16:57:00Z

@chandel-aman Any update on this? Please get this PR merged, its been more than 2 weeks.

chandel-aman · 2023-12-06T18:20:33Z

@noman2002 I've made all the changes asked in the review. Was facing some issue in test coverage of request screen. I'm working on it; will try getting this PR merged asap.

chandel-aman · 2023-12-08T22:26:15Z

Test is 100% covered.

Added the time of the request.

Sort button is set to "success" variant when sorting is active.
Sort button highlights the type of sorting used.

We are still showing the message for user not found for when we are unable to find a searched user.

@rishav-jha-mech @noman2002
All the changes suggested have been implemented. Could you please review the changes and merge this PR.

noman2002

LGTM

aashimawadhwa · 2023-12-09T16:18:38Z

LGTM

aashimawadhwa · 2023-12-09T16:22:35Z

@palisadoes this can be merged

requests sorting

632880c

noman2002 requested review from rishav-jha-mech and aashimawadhwa November 23, 2023 10:37

noman2002 requested changes Nov 27, 2023

View reviewed changes

src/screens/Requests/Requests.tsx Outdated Show resolved Hide resolved

chandel-aman added 3 commits November 30, 2023 01:00

added missing test

f5f51a8

added missing test

a1d2fdb

increased test coverage for requests screen

ed597da

noman2002 previously approved these changes Nov 30, 2023

View reviewed changes

rishav-jha-mech reviewed Dec 2, 2023

View reviewed changes

src/screens/Requests/Requests.tsx Outdated Show resolved Hide resolved

rishav-jha-mech reviewed Dec 2, 2023

View reviewed changes

chandel-aman added 2 commits December 9, 2023 03:03

merged into develop

dcb1281

added the reviewed changes and improved tests

af20ff6

chandel-aman dismissed noman2002’s stale review via af20ff6 December 8, 2023 21:38

chandel-aman requested review from rishav-jha-mech and noman2002 December 8, 2023 22:25

noman2002 approved these changes Dec 9, 2023

View reviewed changes

aashimawadhwa approved these changes Dec 9, 2023

View reviewed changes

palisadoes merged commit 044b336 into PalisadoesFoundation:develop Dec 9, 2023
6 of 7 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implementation of sorting of requests in Request screen #1082

Implementation of sorting of requests in Request screen #1082

chandel-aman commented Nov 21, 2023 •

edited

Loading

github-actions bot commented Nov 21, 2023

codecov bot commented Nov 21, 2023 •

edited

Loading

palisadoes commented Nov 22, 2023

chandel-aman commented Nov 29, 2023

rishav-jha-mech commented Nov 30, 2023

noman2002 commented Nov 30, 2023

noman2002 left a comment

chandel-aman commented Nov 30, 2023 •

edited

Loading

chandel-aman commented Dec 1, 2023

rishav-jha-mech Dec 2, 2023

chandel-aman Dec 8, 2023

rishav-jha-mech Dec 2, 2023

chandel-aman Dec 8, 2023

rishav-jha-mech Dec 2, 2023

rishav-jha-mech commented Dec 2, 2023

chandel-aman commented Dec 2, 2023

chandel-aman commented Dec 2, 2023

rishav-jha-mech commented Dec 2, 2023

chandel-aman commented Dec 2, 2023

noman2002 commented Dec 6, 2023

chandel-aman commented Dec 6, 2023

chandel-aman commented Dec 8, 2023

noman2002 left a comment

aashimawadhwa commented Dec 9, 2023

aashimawadhwa commented Dec 9, 2023

Implementation of sorting of requests in Request screen #1082

Implementation of sorting of requests in Request screen #1082

Conversation

chandel-aman commented Nov 21, 2023 • edited Loading

github-actions bot commented Nov 21, 2023

Our Pull Request Approval Process

Testing Your Code

Reviewers

Reviewing Your Code

CONTRIBUTING.md

Other

codecov bot commented Nov 21, 2023 • edited Loading

Codecov Report

palisadoes commented Nov 22, 2023

chandel-aman commented Nov 29, 2023

rishav-jha-mech commented Nov 30, 2023

noman2002 commented Nov 30, 2023

noman2002 left a comment

Choose a reason for hiding this comment

chandel-aman commented Nov 30, 2023 • edited Loading

chandel-aman commented Dec 1, 2023

rishav-jha-mech Dec 2, 2023

Choose a reason for hiding this comment

chandel-aman Dec 8, 2023

Choose a reason for hiding this comment

rishav-jha-mech Dec 2, 2023

Choose a reason for hiding this comment

chandel-aman Dec 8, 2023

Choose a reason for hiding this comment

rishav-jha-mech Dec 2, 2023

Choose a reason for hiding this comment

rishav-jha-mech commented Dec 2, 2023

chandel-aman commented Dec 2, 2023

chandel-aman commented Dec 2, 2023

rishav-jha-mech commented Dec 2, 2023

chandel-aman commented Dec 2, 2023

noman2002 commented Dec 6, 2023

chandel-aman commented Dec 6, 2023

chandel-aman commented Dec 8, 2023

noman2002 left a comment

Choose a reason for hiding this comment

aashimawadhwa commented Dec 9, 2023

aashimawadhwa commented Dec 9, 2023

chandel-aman commented Nov 21, 2023 •

edited

Loading

codecov bot commented Nov 21, 2023 •

edited

Loading

chandel-aman commented Nov 30, 2023 •

edited

Loading