[DUOS-1904] Added researcher actions to Actions component #1718

lu-c · 2022-07-28T22:02:24Z

Have you read Terra's Contributing Guide lately? If not, do that first.

Label PR with a Jira ticket number and include a link to the ticket
Label PR with a security risk modifier [no, low, medium, high]
PR describes scope of changes
Get a minimum of one thumbs worth of review, preferably two if enough team members are available
Get PO sign-off for all non-trivial UI or workflow changes
Verify all tests go green
Test this change deployed correctly and works on dev environment after deployment

Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com>

…S-1904

Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com>

…button)

Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com>

…S-1904

… now

…UOS-1904-2

lu-c · 2022-08-08T18:49:39Z

Ok, still not... perfectly tested, but I think the code should look okay! >.< And I want to try to get this PR closed out!

done?

src/pages/ResearcherConsole.js

* DUOS-setup-proxy initial setup of local proxy * DUOS-setup-proxy added status urls to proxy * DUOS-setup-proxy updated ontologyService url fetch * DUOS-setup-proxy fixed method reference in getOntologyUrl * DUOS-setup-proxy added comments, commented out notification proxy for now

… (Narrative) (#1738) * Change research purpose to Research Use Statement (Narrative) * Fix test Co-authored-by: Shae Marks <smarks.dev1@gmail.com>

JVThomas

There are issues with the functionality behind Revise, Cancel, and Delete but we can address them on subsequent tickets. For now the focus will be on the buttons themselves and they look to be rendered correctly on initialization. The only issue so far are the spacing between some of the buttons...

Just give the buttons some breathing room in between and the ticket should be good to merge into DUOS-1903

lu-c · 2022-08-09T18:06:56Z

There are issues with the functionality behind Revise, Cancel, and Delete but we can address them on subsequent tickets. For now the focus will be on the buttons themselves and they look to be rendered correctly on initialization. The only issue so far are the spacing between some of the buttons...

Just give the buttons some breathing room in between and the ticket should be good to merge into DUOS-1903

Added a 5px margin to all of the buttons!

JVThomas

Table looks good, buttons are rendering correctly on initialization and they match the expected actions for the collection based on its status. This will serve as a good base for tackling the action functionality tickets.

shaemarks

I'm currently getting this error when I try to do some actions, which makes it a little hard to test functionality, but l'm assuming it's a problem on my end rather than having to do with your code. I left some comments inline on things that may cause errors with deleting drafts, but tables and action buttons look good

.

src/pages/ResearcherConsole.js

lu-c · 2022-08-09T22:43:46Z

I'm currently getting this error when I try to do some actions, which makes it a little hard to test functionality, but l'm assuming it's a problem on my end rather than having to do with your code. I left some comments inline on things that may cause errors with deleting drafts, but tables and action buttons look good

I pushed up something that i THINK fixes this!

…ary Endpoint (#1699) * [DUOS-1903] Updated dar collection table for chair console view * [DUOS-1903] Updated unit tests * [DUOS-1903] added votel abel back * DUOS-1992[risk=no] Update search bar function to handle DARCollectionSummary on Console pages (#1715) * DUOS-1992 updated search bar filter function to handle DARCollectionSummary * DUOS-1992 updated util tests for search function * [DUOS-1904] Added uniform Actions component (#1710) * fixed merge issue * ???? Testing new actions component. * updated unit tests? * Fixed eslint * fix admin console * fix tests * Fixing unit tests * Apply suggestions from code review Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com> * added unit test for Update button (used to be combined with the vote button) * Update cypress/component/DarCollectionTable/admin_actions.spec.js Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com> * fix codacy * Fixed unit tests * Fixed unit tests? * merged with DUOS-1902, deleted unnecessary files Co-authored-by: Connor Barker <connorlbark@gmail.com> Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com> * [DIOS-1906][risk=no] modify signing official console to use new collection summaries endpoint (#1709) * Switch endpoint * Remove unused prop Co-authored-by: Shae Marks <smarks.dev1@gmail.com> * [DUOS-1904] Added researcher actions to Actions component (#1718) * update researcher console dar table + actions * naming nit * fix tests * Apply suggestions from code review Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com> * Update cypress/component/DarCollectionTable/researcher_actions.spec.js Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com> * fixed merge issue * ???? Testing new actions component. * updated unit tests? * Fixed eslint * fix name * fix admin console * fix tests * Fixing unit tests * Apply suggestions from code review Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com> * added unit test for Update button (used to be combined with the vote button) * Update cypress/component/DarCollectionTable/admin_actions.spec.js Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com> * fix codacy * Fixed unit tests * Fixed unit tests? * merged with DUOS-1902, deleted unnecessary files * Merged with 1905 * Fixing unit tests? * Fixing eslint * Fixing unit test, but dont think this will sovle the problem * Fixing unit test, but dont think this will sovle the problem * Fixing unit test, but dont think this will sovle the problem * feeling more confident now that the problem will be solved haha * Updated variable names, due to merge conflict discrepancies! * Updated variable names, due to merge conflict discrepancies! * testing cypress tests on github * Checking original researcher unit test. Getting mildly frustrated! * Converted hard coded researcher to console type * fixing? * fix test * removed unnecessary line * re-added actions (sorry connor, i deleted it) * [DUOS-1904] updated deleteDrafts to delete a draft with multiple referenceIds (previously only had one) * DUOS-setup-proxy initial setup of local proxy * [DUOS-1904] fixed eslint * DUOS-setup-proxy added status urls to proxy * DUOS-setup-proxy updated ontologyService url fetch * DUOS-setup-proxy fixed method reference in getOntologyUrl * DUOS-setup-proxy added comments, commented out notification proxy for now * [DUOS-1904] reverted referenceIds so we just delete the first one * DUOS-2011 [risk=no] Local Proxy setup for npm start (#1735) * DUOS-setup-proxy initial setup of local proxy * DUOS-setup-proxy added status urls to proxy * DUOS-setup-proxy updated ontologyService url fetch * DUOS-setup-proxy fixed method reference in getOntologyUrl * DUOS-setup-proxy added comments, commented out notification proxy for now * [DUOS-1973][risk=no]Change research purpose to Research Use Statement (Narrative) (#1738) * Change research purpose to Research Use Statement (Narrative) * Fix test Co-authored-by: Shae Marks <smarks.dev1@gmail.com> * added "breathing" margins on buttons * [DUOS-1904] Cleaning up more. * [DUOS-1904] fixed the weird bug with applyign style bug Co-authored-by: Connor Barker <connorlbark@gmail.com> Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com> Co-authored-by: JVThomas <jthomas0209@gmail.com> Co-authored-by: Justin Variath Thomas <JVThomas@users.noreply.github.com> Co-authored-by: shaemarks <81024249+shaemarks@users.noreply.github.com> Co-authored-by: Shae Marks <smarks.dev1@gmail.com> * DUOS-1997[risk=no] Updated Open and Close Collection functions for Admin and Chair Consoles (#1723) * update researcher console dar table + actions * naming nit * fix tests * Apply suggestions from code review Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com> * Update cypress/component/DarCollectionTable/researcher_actions.spec.js Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com> * fixed merge issue * ???? Testing new actions component. * updated unit tests? * Fixed eslint * fix name * fix admin console * fix tests * Fixing unit tests * Apply suggestions from code review Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com> * added unit test for Update button (used to be combined with the vote button) * Update cypress/component/DarCollectionTable/admin_actions.spec.js Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com> * fix codacy * Fixed unit tests * Fixed unit tests? * merged with DUOS-1902, deleted unnecessary files * Merged with 1905 * Fixing unit tests? * Fixing eslint * Fixing unit test, but dont think this will sovle the problem * Fixing unit test, but dont think this will sovle the problem * Fixing unit test, but dont think this will sovle the problem * feeling more confident now that the problem will be solved haha * DUOS-1997 updated open and close collection functions for Admin and Chair pages * DUOS-1997 updated integration tests for collection callback functions * Updated variable names, due to merge conflict discrepancies! * Updated variable names, due to merge conflict discrepancies! * testing cypress tests on github * Checking original researcher unit test. Getting mildly frustrated! * Converted hard coded researcher to console type * fixing? * fix test * removed unnecessary line * re-added actions (sorry connor, i deleted it) * DUOS-1997 used USER_ROLES instead of explicit string values * DUOS-1997 updated spec to use USER_ROLES instead of hard coded strings Co-authored-by: Connor Barker <connorlbark@gmail.com> Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com> Co-authored-by: clu@asymmetrik.com <clu@asymmetrik.com> * DUOS-2014[risk=no] Updated Researcher Actions functionality to account for DarCollectionSummary (#1744) * update researcher console dar table + actions * naming nit * fix tests * Apply suggestions from code review Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com> * Update cypress/component/DarCollectionTable/researcher_actions.spec.js Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com> * fixed merge issue * ???? Testing new actions component. * updated unit tests? * Fixed eslint * fix name * fix admin console * fix tests * Fixing unit tests * Apply suggestions from code review Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com> * added unit test for Update button (used to be combined with the vote button) * Update cypress/component/DarCollectionTable/admin_actions.spec.js Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com> * fix codacy * Fixed unit tests * Fixed unit tests? * merged with DUOS-1902, deleted unnecessary files * Merged with 1905 * Fixing unit tests? * Fixing eslint * Fixing unit test, but dont think this will sovle the problem * Fixing unit test, but dont think this will sovle the problem * Fixing unit test, but dont think this will sovle the problem * feeling more confident now that the problem will be solved haha * DUOS-1997 updated open and close collection functions for Admin and Chair pages * DUOS-1997 updated integration tests for collection callback functions * Updated variable names, due to merge conflict discrepancies! * Updated variable names, due to merge conflict discrepancies! * testing cypress tests on github * Checking original researcher unit test. Getting mildly frustrated! * Converted hard coded researcher to console type * fixing? * fix test * removed unnecessary line * re-added actions (sorry connor, i deleted it) * DUOS-1997 used USER_ROLES instead of explicit string values * DUOS-1997 updated spec to use USER_ROLES instead of hard coded strings * DUOS-2014 fixed missing forEach immport from lodash, updated actions to use new summary endpoint, removed formatDraft call for revise * DUOS-2014 adjusted tooltip on cancel action, removed unused function, updated url reference in summary fetch method * DUOS-2014 updated iterating function on applyHoverEffects to match non-fp forEach arguments * DUOS-2014 updated getProjectTitle helper method, updated style update on applyStyleOnEnter, updated aliases for forEach methods in utils.js * DUOS-2014 removed getProjectTitle, inlined collection name in string Co-authored-by: Connor Barker <connorlbark@gmail.com> Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com> Co-authored-by: clu@asymmetrik.com <clu@asymmetrik.com> * DUOS-1903 pr feedback Co-authored-by: Justin Variath Thomas <JVThomas@users.noreply.github.com> Co-authored-by: Connor Barker <connorlbark@gmail.com> Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com> Co-authored-by: shaemarks <81024249+shaemarks@users.noreply.github.com> Co-authored-by: Shae Marks <smarks.dev1@gmail.com> Co-authored-by: JVThomas <jthomas0209@gmail.com>

connorlbark and others added 29 commits July 25, 2022 15:40

Merge branch 'develop' into DUOS-1905

78cad95

update researcher console dar table + actions

92a91e3

naming nit

30bd225

fix tests

2b00ec3

Apply suggestions from code review

feb667d

Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com>

Update cypress/component/DarCollectionTable/researcher_actions.spec.js

6d527a7

Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com>

merged with develop

abae302

fixed merge issue

207b559

???? Testing new actions component.

738971b

updated unit tests?

049cbb0

Fixed eslint

139bd50

Merge branch 'DUOS-1903' of github.com:DataBiosphere/duos-ui into DUO…

3e57b6a

…S-1904

Merge branch 'DUOS-1903' into DUOS-1905

b4ba695

fix name

40ddc16

fix admin console

b0038ac

fix tests

608715a

Fixing unit tests

dd377b2

Apply suggestions from code review

18b85e0

Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com>

added unit test for Update button (used to be combined with the vote …

9fe3206

…button)

Update cypress/component/DarCollectionTable/admin_actions.spec.js

b69adb8

Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com>

fix codacy

df99fb2

Fixed unit tests

6138a59

Fixed unit tests?

b5d84dc

Merge branch 'DUOS-1902' of github.com:DataBiosphere/duos-ui into DUO…

fc96fd7

…S-1904

merged with DUOS-1902, deleted unnecessary files

60fea9b

Merge branch 'DUOS-1905' of github.com:DataBiosphere/duos-ui into DUO…

7e8e79c

…S-1904

Merged with 1905

3fe5316

Fixing unit tests?

aa1bbf2

Fixing eslint

e825982

lu-c changed the base branch from develop to DUOS-1904 July 28, 2022 23:06

lu-c and others added 7 commits August 4, 2022 16:32

[DUOS-1904] fixed eslint

a694791

DUOS-setup-proxy added status urls to proxy

ae0653b

DUOS-setup-proxy updated ontologyService url fetch

4b5a813

DUOS-setup-proxy fixed method reference in getOntologyUrl

2c4e1f4

DUOS-setup-proxy added comments, commented out notification proxy for…

8beb58e

… now

DUOS-setup-proxy resolved merge conflicts

a1255a2

Merge branch 'setup-proxy' of github.com:DataBiosphere/duos-ui into D…

ffdd250

…UOS-1904-2

lu-c requested a review from shaemarks August 8, 2022 18:49

shaemarks reviewed Aug 8, 2022

View reviewed changes

src/pages/ResearcherConsole.js Outdated Show resolved Hide resolved

lu-c requested a review from shaemarks August 8, 2022 22:31

lu-c and others added 4 commits August 8, 2022 18:55

[DUOS-1904] reverted referenceIds so we just delete the first one

7b01614

merged

2390e97

[DUOS-1973][risk=no]Change research purpose to Research Use Statement…

ee7805f

… (Narrative) (#1738) * Change research purpose to Research Use Statement (Narrative) * Fix test Co-authored-by: Shae Marks <smarks.dev1@gmail.com>

JVThomas requested changes Aug 9, 2022

View reviewed changes

lu-c added 2 commits August 9, 2022 14:05

merged with develop

f182a0c

added "breathing" margins on buttons

4d4df95

lu-c requested a review from JVThomas August 9, 2022 18:06

JVThomas approved these changes Aug 9, 2022

View reviewed changes

shaemarks approved these changes Aug 9, 2022

View reviewed changes

src/pages/ResearcherConsole.js Outdated Show resolved Hide resolved

src/pages/ResearcherConsole.js Show resolved Hide resolved

src/pages/ResearcherConsole.js Outdated Show resolved Hide resolved

lu-c added 2 commits August 9, 2022 18:38

[DUOS-1904] Cleaning up more.

6389199

[DUOS-1904] fixed the weird bug with applyign style bug

574b5cd

lu-c merged commit ed7a4b5 into DUOS-1903 Aug 10, 2022

lu-c deleted the DUOS-1904-2 branch August 10, 2022 02:26

JVThomas mentioned this pull request Aug 10, 2022

DUOS-2014[risk=no] Updated Researcher Actions functionality to account for DarCollectionSummary #1744

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[DUOS-1904] Added researcher actions to Actions component #1718

[DUOS-1904] Added researcher actions to Actions component #1718

lu-c commented Jul 28, 2022

lu-c commented Aug 8, 2022

JVThomas left a comment •

edited

Loading

lu-c commented Aug 9, 2022

JVThomas left a comment

shaemarks left a comment

lu-c commented Aug 9, 2022

[DUOS-1904] Added researcher actions to Actions component #1718

[DUOS-1904] Added researcher actions to Actions component #1718

Conversation

lu-c commented Jul 28, 2022

lu-c commented Aug 8, 2022

JVThomas left a comment • edited Loading

Choose a reason for hiding this comment

lu-c commented Aug 9, 2022

JVThomas left a comment

Choose a reason for hiding this comment

shaemarks left a comment

Choose a reason for hiding this comment

lu-c commented Aug 9, 2022

JVThomas left a comment •

edited

Loading