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.

Sign up for GitHub

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

Jump to bottom

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

Merged
merged 55 commits into from
Aug 10, 2022
Merged

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

merged 55 commits into from
Aug 10, 2022

Commits on Jul 25, 2022

  1. Merge branch 'develop' into DUOS-1905

    @connorlbark
    connorlbark committed Jul 25, 2022
    Configuration menu
    Copy the full SHA
    78cad95 View commit details
    Browse the repository at this point in the history

Commits on Jul 26, 2022

  1. update researcher console dar table + actions

    @connorlbark
    connorlbark committed Jul 26, 2022
    Configuration menu
    Copy the full SHA
    92a91e3 View commit details
    Browse the repository at this point in the history

  2. naming nit

    @connorlbark
    connorlbark committed Jul 26, 2022
    Configuration menu
    Copy the full SHA
    30bd225 View commit details
    Browse the repository at this point in the history

  3. fix tests

    @connorlbark
    connorlbark committed Jul 26, 2022
    Configuration menu
    Copy the full SHA
    2b00ec3 View commit details
    Browse the repository at this point in the history

  4. Apply suggestions from code review 

    Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com>
    @connorlbark @rushtong
    connorlbark and rushtong authored Jul 26, 2022
    Configuration menu
    Copy the full SHA
    feb667d View commit details
    Browse the repository at this point in the history

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

    Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com>
    @connorlbark @rushtong
    connorlbark and rushtong authored Jul 26, 2022
    Configuration menu
    Copy the full SHA
    6d527a7 View commit details
    Browse the repository at this point in the history

  6. merged with develop

    @lu-c
    lu-c committed Jul 26, 2022
    Configuration menu
    Copy the full SHA
    abae302 View commit details
    Browse the repository at this point in the history

  7. fixed merge issue

    @lu-c
    lu-c committed Jul 26, 2022
    Configuration menu
    Copy the full SHA
    207b559 View commit details
    Browse the repository at this point in the history

Commits on Jul 27, 2022

  1. ???? Testing new actions component.

    @lu-c
    lu-c committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    738971b View commit details
    Browse the repository at this point in the history

  2. updated unit tests?

    @lu-c
    lu-c committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    049cbb0 View commit details
    Browse the repository at this point in the history

  3. Fixed eslint

    @lu-c
    lu-c committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    139bd50 View commit details
    Browse the repository at this point in the history

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

    …S-1904
    @lu-c
    lu-c committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    3e57b6a View commit details
    Browse the repository at this point in the history

  5. Merge branch 'DUOS-1903' into DUOS-1905

    @connorlbark
    connorlbark committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    b4ba695 View commit details
    Browse the repository at this point in the history

  6. fix name

    @connorlbark
    connorlbark committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    40ddc16 View commit details
    Browse the repository at this point in the history

  7. fix admin console

    @connorlbark
    connorlbark committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    b0038ac View commit details
    Browse the repository at this point in the history

  8. fix tests

    @connorlbark
    connorlbark committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    608715a View commit details
    Browse the repository at this point in the history

  9. Fixing unit tests

    @lu-c
    lu-c committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    dd377b2 View commit details
    Browse the repository at this point in the history

  10. Apply suggestions from code review 

    Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com>
    @connorlbark @rushtong
    connorlbark and rushtong authored Jul 27, 2022
    Configuration menu
    Copy the full SHA
    18b85e0 View commit details
    Browse the repository at this point in the history

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

    …button)
    @lu-c
    lu-c committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    9fe3206 View commit details
    Browse the repository at this point in the history

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

    Co-authored-by: Gregory Rushton <rushtong@users.noreply.github.com>
    @connorlbark @rushtong
    connorlbark and rushtong authored Jul 27, 2022
    Configuration menu
    Copy the full SHA
    b69adb8 View commit details
    Browse the repository at this point in the history

  13. fix codacy

    @connorlbark
    connorlbark committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    df99fb2 View commit details
    Browse the repository at this point in the history

  14. Fixed unit tests

    @lu-c
    lu-c committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    6138a59 View commit details
    Browse the repository at this point in the history

  15. Fixed unit tests?

    @lu-c
    lu-c committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    b5d84dc View commit details
    Browse the repository at this point in the history

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

    …S-1904
    @lu-c
    lu-c committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    fc96fd7 View commit details
    Browse the repository at this point in the history

  17. merged with DUOS-1902, deleted unnecessary files

    @lu-c
    lu-c committed Jul 27, 2022
    Configuration menu
    Copy the full SHA
    60fea9b View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2022

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

    …S-1904
    @lu-c
    lu-c committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    7e8e79c View commit details
    Browse the repository at this point in the history

  2. Merged with 1905

    @lu-c
    lu-c committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    3fe5316 View commit details
    Browse the repository at this point in the history

  3. Fixing unit tests?

    @lu-c
    lu-c committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    aa1bbf2 View commit details
    Browse the repository at this point in the history

  4. Fixing eslint

    @lu-c
    lu-c committed Jul 28, 2022
    Configuration menu
    Copy the full SHA
    e825982 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2022

  1. Fixing unit test, but dont think this will sovle the problem

    @lu-c
    lu-c committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    fb8c1e1 View commit details
    Browse the repository at this point in the history

  2. Fixing unit test, but dont think this will sovle the problem

    @lu-c
    lu-c committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    7a65a4e View commit details
    Browse the repository at this point in the history

  3. Fixing unit test, but dont think this will sovle the problem

    @lu-c
    lu-c committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    c5a571f View commit details
    Browse the repository at this point in the history

  4. feeling more confident now that the problem will be solved haha

    @lu-c
    lu-c committed Jul 29, 2022
    Configuration menu
    Copy the full SHA
    857fdb8 View commit details
    Browse the repository at this point in the history

Commits on Aug 1, 2022

  1. DUOS-1997 updated open and close collection functions for Admin and C… 

    …hair pages
    @JVThomas
    JVThomas committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    cd89dca View commit details
    Browse the repository at this point in the history

  2. DUOS-1997 updated integration tests for collection callback functions

    @JVThomas
    JVThomas committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    d022d9d View commit details
    Browse the repository at this point in the history

  3. Updated variable names, due to merge conflict discrepancies!

    @lu-c
    lu-c committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    dc2f0e7 View commit details
    Browse the repository at this point in the history

  4. Updated variable names, due to merge conflict discrepancies!

    @lu-c
    lu-c committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    e692549 View commit details
    Browse the repository at this point in the history

  5. testing cypress tests on github

    @lu-c
    lu-c committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    d222213 View commit details
    Browse the repository at this point in the history

  6. merged with DUOS-1903

    @lu-c
    lu-c committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    4cf9270 View commit details
    Browse the repository at this point in the history

  7. Checking original researcher unit test. Getting mildly frustrated!

    @lu-c
    lu-c committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    e5aa265 View commit details
    Browse the repository at this point in the history

  8. Converted hard coded researcher to console type

    @lu-c
    lu-c committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    7871bc1 View commit details
    Browse the repository at this point in the history

  9. fixing?

    @lu-c
    lu-c committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    e55aeb1 View commit details
    Browse the repository at this point in the history

  10. fix test

    @connorlbark
    connorlbark committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    0f7e151 View commit details
    Browse the repository at this point in the history

  11. removed unnecessary line

    @lu-c
    lu-c committed Aug 1, 2022
    Configuration menu
    Copy the full SHA
    635734b View commit details
    Browse the repository at this point in the history

Commits on Aug 2, 2022

  1. re-added actions (sorry connor, i deleted it)

    @lu-c
    lu-c committed Aug 2, 2022
    Configuration menu
    Copy the full SHA
    d997737 View commit details
    Browse the repository at this point in the history

Commits on Aug 3, 2022

  1. Merge branch 'DUOS-1904-2' into DUOS-1997

    @JVThomas
    JVThomas committed Aug 3, 2022
    Configuration menu
    Copy the full SHA
    fc1c330 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2022

  1. DUOS-1997 used USER_ROLES instead of explicit string values

    @JVThomas
    JVThomas committed Aug 8, 2022
    Configuration menu
    Copy the full SHA
    b96e81d View commit details
    Browse the repository at this point in the history

  2. DUOS-1997 updated spec to use USER_ROLES instead of hard coded strings

    @JVThomas
    JVThomas committed Aug 8, 2022
    Configuration menu
    Copy the full SHA
    8db6702 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2022

  1. DUOS-1997 resolved merge conflicts

    @JVThomas
    JVThomas committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    9d834bd View commit details
    Browse the repository at this point in the history

  2. DUOS-2014 fixed missing forEach immport from lodash, updated actions … 

    …to use new summary endpoint, removed formatDraft call for revise
    @JVThomas
    JVThomas committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    5eb5e35 View commit details
    Browse the repository at this point in the history

  3. DUOS-2014 adjusted tooltip on cancel action, removed unused function,… 

    … updated url reference in summary fetch method
    @JVThomas
    JVThomas committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    6108db9 View commit details
    Browse the repository at this point in the history

  4. DUOS-2014 resolved merge conflicts

    @JVThomas
    JVThomas committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    03bad5a View commit details
    Browse the repository at this point in the history

  5. DUOS-2014 updated iterating function on applyHoverEffects to match no… 

    …n-fp forEach arguments
    @JVThomas
    JVThomas committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    85008d0 View commit details
    Browse the repository at this point in the history

  6. DUOS-2014 updated getProjectTitle helper method, updated style update… 

    … on applyStyleOnEnter, updated aliases for forEach methods in utils.js
    @JVThomas
    JVThomas committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    fe13e7a View commit details
    Browse the repository at this point in the history

  7. DUOS-2014 removed getProjectTitle, inlined collection name in string

    @JVThomas
    JVThomas committed Aug 10, 2022
    Configuration menu
    Copy the full SHA
    de0ce7a View commit details
    Browse the repository at this point in the history