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

task/FP-1190: Unified search for FP-737 #479

Merged
merged 4 commits into from
Sep 10, 2021

Conversation

rstijerina
Copy link
Member

Overview:

A single term is used to find a unique set of results against the username, lastName, and email fields in TAS.

Related Jira tickets:

Summary of Changes:

  • unified search
  • allow overriding of fetchParams in fetchUtil

Testing Steps:

  1. Search for a franklin
  2. look at requests and see they add up to 12
  3. See that there are only 11 listed in dropdown (no duplicates, a unique set)

UI Photos:

Screen Shot 2021-09-01 at 3 18 48 PM

Screen Shot 2021-09-01 at 3 21 19 PM

@rstijerina rstijerina changed the base branch from main to task/FP-737-no-ui September 1, 2021 20:21
@codecov
Copy link

codecov bot commented Sep 1, 2021

Codecov Report

Merging #479 (42786ab) into task/FP-737-no-ui (fcb02d9) will not change coverage.
The diff coverage is n/a.

Impacted file tree graph

@@                Coverage Diff                 @@
##           task/FP-737-no-ui     #479   +/-   ##
==================================================
  Coverage              64.08%   64.08%           
==================================================
  Files                    198      198           
  Lines                   7063     7063           
  Branches                 763      763           
==================================================
  Hits                    4526     4526           
  Misses                  2334     2334           
  Partials                 203      203           
Flag Coverage Δ
unittests 64.08% <ø> (ø)

Flags with carried forward coverage won't be shown. Click here to find out more.

Copy link
Member

@nathanfranklin nathanfranklin left a comment

Choose a reason for hiding this comment

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

LGTM 👍


I think we need a follow up ticket outside of FP-737 for UI tweaks for finding users here and in the Shared Workspace team. Specifically, for things like:

  • An UI element like a spinner to convey that names are being retrieved
  • An UI element that conveys better that no users were found ("No users found"). Right now, if I type "Franclim", it is unclear if it is still performing the query or that there were no results. .

@rstijerina , cool if I create an initial ticket for this and drop into next sprint's backlog?

@nathanfranklin
Copy link
Member

@rstijerina , note some unit tests are failing.

@rstijerina
Copy link
Member Author

@rstijerina , note some unit tests are failing.

I think some of those are from the target branch. Will fix in another branch

@rstijerina
Copy link
Member Author

LGTM 👍

I think we need a follow up ticket outside of FP-737 for UI tweaks for finding users here and in the Shared Workspace team. Specifically, for things like:

  • An UI element like a spinner to convey that names are being retrieved
  • An UI element that conveys better that no users were found ("No users found"). Right now, if I type "Franclim", it is unclear if it is still performing the query or that there were no results. .

@rstijerina , cool if I create an initial ticket for this and drop into next sprint's backlog?

Sounds great 👍

@rstijerina rstijerina merged commit ea0e35a into task/FP-737-no-ui Sep 10, 2021
@rstijerina rstijerina deleted the task/FP-1190--FP-737-unified-search branch September 10, 2021 18:28
rstijerina added a commit that referenced this pull request Dec 8, 2021
* Scaffolding

* stopgap

* No UI; backend ready

* Task/FP-1168: add backend unit tests for add/delete members of TAS projects (subtask of FP-737)  (#467)

* Remove unneeded change

* Fix url for user delete

* Remove logging statements and correct ApiException

Second argument of ApiException is status (i.e. status_code)

* Remove status code in ApiException as TAS returns 200

Main reason for not using TAS return code is that for errors (like
missing user), TAS still returns a 200.  Also, it isn't useful as
we handle all ApiException as 400 and don't log that status_code that
that was pass to ApiException

* Add tests

* Fix pep errors

* Remove change to response for testing purposes

* Fix use of ApiException

* Fix tests

* Improve logging message for forced allocation retrieval

* Fix logging for add/delete of users to allocation

* task/FP-737, task/FP-1180: Use Search component from Projects (#477)

* use projects search; add common component

* revert local dev change

* Task/fp 1183 complete saga redux for removing user (#474)

* Complete saga/redux for removing user

Spinner is shown while deleting and error is shown when failed

* Hide remove button for PI user

* Add unit tests

Refactor some fixture into a fixture file

* Add remove user failure saga test

* Refactor removing of user from team from reducer to saga

* Update client/src/redux/sagas/allocations.sagas.js

Co-authored-by: Sal Tijerina <r.sal.tijerina@gmail.com>

Co-authored-by: rstijerina <r.sal.tijerina@gmail.com>

* task/FP-1190: Unified search for FP-737 (#479)

* unified search

* update placeholder

* remove autocomplete package

* merge main package files

* FP/737: Polish UI and Add User Functionality (FP-1182 & FP-1198) (#514)

* Add user functionality and styling

* Text and variable name changes

Co-authored-by: rstijerina <r.sal.tijerina@gmail.com>

* Task/FP-1181: Basic unit tests for front-end components (#555)

* Fix failing tests

* Basic unit test for Allocations Management Modal

Co-authored-by: Nathan Franklin <nfranklin@tacc.utexas.edu>
Co-authored-by: rstijerina <r.sal.tijerina@gmail.com>
rstijerina added a commit that referenced this pull request Jun 15, 2022
* Task/FP-737: Manage Allocations (#480)

* Scaffolding

* stopgap

* No UI; backend ready

* Task/FP-1168: add backend unit tests for add/delete members of TAS projects (subtask of FP-737)  (#467)

* Remove unneeded change

* Fix url for user delete

* Remove logging statements and correct ApiException

Second argument of ApiException is status (i.e. status_code)

* Remove status code in ApiException as TAS returns 200

Main reason for not using TAS return code is that for errors (like
missing user), TAS still returns a 200.  Also, it isn't useful as
we handle all ApiException as 400 and don't log that status_code that
that was pass to ApiException

* Add tests

* Fix pep errors

* Remove change to response for testing purposes

* Fix use of ApiException

* Fix tests

* Improve logging message for forced allocation retrieval

* Fix logging for add/delete of users to allocation

* task/FP-737, task/FP-1180: Use Search component from Projects (#477)

* use projects search; add common component

* revert local dev change

* Task/fp 1183 complete saga redux for removing user (#474)

* Complete saga/redux for removing user

Spinner is shown while deleting and error is shown when failed

* Hide remove button for PI user

* Add unit tests

Refactor some fixture into a fixture file

* Add remove user failure saga test

* Refactor removing of user from team from reducer to saga

* Update client/src/redux/sagas/allocations.sagas.js

Co-authored-by: Sal Tijerina <r.sal.tijerina@gmail.com>

Co-authored-by: rstijerina <r.sal.tijerina@gmail.com>

* task/FP-1190: Unified search for FP-737 (#479)

* unified search

* update placeholder

* remove autocomplete package

* merge main package files

* FP/737: Polish UI and Add User Functionality (FP-1182 & FP-1198) (#514)

* Add user functionality and styling

* Text and variable name changes

Co-authored-by: rstijerina <r.sal.tijerina@gmail.com>

* Task/FP-1181: Basic unit tests for front-end components (#555)

* Fix failing tests

* Basic unit test for Allocations Management Modal

Co-authored-by: Nathan Franklin <nfranklin@tacc.utexas.edu>
Co-authored-by: rstijerina <r.sal.tijerina@gmail.com>

* Task/FP-1309 user new user search endpoint (#572)

* Add TAS searching endpoint

* Add basic unit tests

* Use new endpoint and make temp changes to searchbar

* Fix use of team members before ready

* Improve tests

* Add message to error response

Co-authored-by: Sal Tijerina <r.sal.tijerina@gmail.com>

* Add docstr

Co-authored-by: Sal Tijerina <r.sal.tijerina@gmail.com>

* Fix error

Co-authored-by: Sal Tijerina <r.sal.tijerina@gmail.com>

* Add comment to explain use of Soap and Zeep

Co-authored-by: Sal Tijerina <r.sal.tijerina@gmail.com>

Co-authored-by: Sal Tijerina <r.sal.tijerina@gmail.com>

* fix linting

* Updated UserSearchbar and AllocationsManageTeamModal to jsx components

* Task/FP-1269: Enable Manage Team modal for Project Delegates (#585)

* rename js files to jsx

* Modal switch between view and manage for pi & delegates

* fix linting

* Fixed unit tests

* Fixed linting

Co-authored-by: Sal Tijerina <r.sal.tijerina@gmail.com>
Co-authored-by: Garrett Edmonds <edmondsgarrett@gmail.com>

* Fixed unit tests

* Fixed AddUser allocations saga bug

* Added error handling for AllocationsManageTeamModal

* 737: Improve UI of user searching (#624)

* Removed searchbar placeholder text and added help text under searchbar in AllocationsManageTeamModal

* Simplified JS for text field and updated CSS to accommodate JS changes

* Fixed userSearchbar Add button bug

* task/FP-1635: 737 - Implement final Allocations UI (#636)

* Update View Team link button to secondary button

* Remove modal component from this file and export only manage team table component

* Add manage team modal render here, incorporate tab functionality, and update role column to now be a dropdown

* CSS styling for tabs in View modal

* Change 'Manage Allocations' button to read 'Request New Allocation'

* Remove errant reference to ManageTeamModal

* Fix ManageTeamTable import, remove unused prop, and conditionally render 'Manage Team' tab

* Fixed layout unit test, and moved ManageTeamModal test to AllocationsModals tests

* Changed AllocationsManageTeamModal to AllocationsManageTeamTable and adjusted all references to this component

* Fixed linting

* Fixed adding user bug, removed horizontal scroll on manage team table, replaced dropdown in manage team role column with role text, and removed errant log

* feat(fp-737): global mui tabs, simpler mui jsx (#646)

* feat(fp-1635): remove unused css (#650)

* 737: Use `_common` `<Button>` component in `<UserSearchBar>` component (#647)

* Use common button component in UserSearchBar

* fix linting

* Removed manage team table horizontal scrollability + right-side border, and fixed saga state reference.

* Fix linting

* Fixed state loadingUsernames references to correctly update when adding users to allocation

* Fixed key error for manage team table

* Removed help text at bottom of manage team tab and adjusted modal size to accommodate this

* Fixed another loadingUsernames reference in saga for failing unit test

* 737: (FP-1678) Use "secondary" Button for UserSearchBar (#657)

* fix(fp-1678): secondary button for usersearchbar

* fix(fp-1678): button above (z) input usersearchbar

* 737: Use `_common` `<Button>` component in View Team button  (#649)

* feat(fp-737): use our button for view team button

I am not sure if design knows the color change is coming...

Inquiry: https://tacc-team.slack.com/archives/G01K9ET7JM7/p1653604140397549

* fix(fp-1678): new styles vers. = more button pad.

* fix(fp-1678): use small button

* fix(fp-1678): do not let button overlap `<th>`

* fix(fp-1678): prettier:fix + related comment tweak

* fix(fp-1678): install @tacc/core-styles@0.5.2-c

1. I messed up 0.5.2 publish. After unpublish, I can't republish.
2. I messed up 0.5.2(-)b publish. After unpublish, I can't republish.
3. I published up 0.5.2-c.

I also moved v tag beyond the fix, planning I could republish as 0.5.2.

So GitHub is at 0.5.2. And NPM is at 0.5.2-c.

But there is an 0.6.x from tup-ui/…/core-styles, so 0.5.x ends.

Co-authored-by: Sal Tijerina <r.sal.tijerina@gmail.com>

* fix(fp-737): make ui closer to design (#655)

* fix(fp-737): make ui closer to design

* docs(fp-737): note why set button position static

* fix(fp-1678): manage team list wrap height change

This value makes modals height match but only at specific window height.

Setting height of modals is better but led me to change too much code.

Instead, a TACC Modal component could handle height from prop.

* fix(fp-1678): validation error

* fix(fp-1678): add space below manage team table

* fix(fp-1678): revert change to font size

Design, a while back, approved 14px font size for tables.

Reference: #401

* fix(fp-1650): `<td>` vert padding to match design

* fix(fp-1650): port classname validation error fix

Source: 38af56b

* fix(fp-1650):  npm run prettier:fix

Co-authored-by: Sal Tijerina <r.sal.tijerina@gmail.com>

* Updated loading state of manage team add button to switch to loading once addUser action is fired

Co-authored-by: Sal Tijerina <r.sal.tijerina@gmail.com>
Co-authored-by: Wesley B <62723358+wesleyboar@users.noreply.github.com>

* Increased allocations table alignment style selector specificity and fixed background styling for disabled 'remove' button in manage team modal

* Frontend error handling for add/remove operations

* Render nulls instead of empty strings in absence of user operation errors

* fix(fp-737): remove bkgd color from disabled link (#659)

* fix(fp-737): remove bkgd color from disabled link

Similar result as d60ff3e, but without overwriting CSS.

* feat(fp-737): prettier:fix

Co-authored-by: Owais Jamil <47395902+owaisj@users.noreply.github.com>
Co-authored-by: Nathan Franklin <nfranklin@tacc.utexas.edu>
Co-authored-by: Nathan Franklin <nathan.franklin@gmail.com>
Co-authored-by: Owais Jamil <ojamil@tacc.utexas.edu>
Co-authored-by: edmondsgarrett <43251554+edmondsgarrett@users.noreply.github.com>
Co-authored-by: Garrett Edmonds <edmondsgarrett@gmail.com>
Co-authored-by: Wesley B <62723358+wesleyboar@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants