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

feat: assign taxonomy to organizations [FC-0036] #760

Merged
merged 59 commits into from
Jan 12, 2024
Merged

feat: assign taxonomy to organizations [FC-0036] #760

merged 59 commits into from
Jan 12, 2024

Commits on Nov 9, 2023

  1. feat: add import taxonomy feature

    @rpenido
    rpenido committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    0c60c37 View commit details
    Browse the repository at this point in the history

  2. test: add api.test.js

    @rpenido
    rpenido committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    c273af1 View commit details
    Browse the repository at this point in the history

  3. test: add import button click test

    @rpenido
    rpenido committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    047530d View commit details
    Browse the repository at this point in the history

  4. test: add action.test.js

    @rpenido
    rpenido committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    303e7ba View commit details
    Browse the repository at this point in the history

  5. test: add more tests to action.tests.js

    @rpenido
    rpenido committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    3955e91 View commit details
    Browse the repository at this point in the history

  6. test: add more tests to action.tests.js 2

    @rpenido
    rpenido committed Nov 9, 2023
    Configuration menu
    Copy the full SHA
    8176973 View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2023

  1. Merge branch 'openedx:master' into rpenido/fal-3532-import-taxonomy

    @rpenido
    rpenido authored Nov 10, 2023
    Configuration menu
    Copy the full SHA
    4f31714 View commit details
    Browse the repository at this point in the history

  2. fix: import

    @rpenido
    rpenido committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    df441fb View commit details
    Browse the repository at this point in the history

  3. test: simplify import test 

    Co-authored-by: Jillian <jill@opencraft.com>
    @rpenido @pomegranited
    rpenido and pomegranited authored Nov 10, 2023
    Configuration menu
    Copy the full SHA
    a0e92f0 View commit details
    Browse the repository at this point in the history

  4. fix: remove undefined var

    @rpenido
    rpenido committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    dc8ed9e View commit details
    Browse the repository at this point in the history

  5. refactor: rename actions.js -> utils.js

    @rpenido
    rpenido committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    120154e View commit details
    Browse the repository at this point in the history

  6. revert: change in the jest.config

    @rpenido
    rpenido committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    318bbb7 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. Merge branch 'master' into rpenido/fal-3532-import-taxonomy

    @pomegranited
    pomegranited committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    a8c2fd5 View commit details
    Browse the repository at this point in the history

Commits on Nov 20, 2023

  1. Merge branch 'openedx:master' into rpenido/fal-3532-import-taxonomy

    @rpenido
    rpenido authored Nov 20, 2023
    Configuration menu
    Copy the full SHA
    70ac2a7 View commit details
    Browse the repository at this point in the history

  2. chore: trigger CD/CI

    @rpenido
    rpenido committed Nov 20, 2023
    Configuration menu
    Copy the full SHA
    adacf23 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into rpenido/fal-3532-import-taxonomy

    @rpenido
    rpenido authored Nov 20, 2023
    Configuration menu
    Copy the full SHA
    5983953 View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2023

  1. feat: import tags to existing taxonomy 

    * feat: import tags to existing taxonomy

* feat: add re-import menu to taxonomy detail

* test: add tests

* fix: clean debug code

Co-authored-by: Jillian <jill@opencraft.com>

---------

Co-authored-by: Jillian <jill@opencraft.com>
    @rpenido @pomegranited
    rpenido and pomegranited authored Nov 24, 2023
    Configuration menu
    Copy the full SHA
    7756c7f View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into rpenido/fal-3532-import-taxonomy

    @rpenido
    rpenido authored Nov 24, 2023
    Configuration menu
    Copy the full SHA
    4202c27 View commit details
    Browse the repository at this point in the history

Commits on Nov 30, 2023

  1. refactor: merges TaxonomyCardMenu and TaxonomyDetailMenu (#13) 

    * refactor: merges TaxonomyCardMenu and TaxonomyDetailMenu

* refactor: change menu item list
    @rpenido
    rpenido authored Nov 30, 2023
    Configuration menu
    Copy the full SHA
    6bcd924 View commit details
    Browse the repository at this point in the history

Commits on Dec 4, 2023

  1. refactor: improve menu organization

    @rpenido
    rpenido committed Dec 4, 2023
    Configuration menu
    Copy the full SHA
    f318dfc View commit details
    Browse the repository at this point in the history

Commits on Dec 9, 2023

  1. fix: types

    @rpenido
    rpenido committed Dec 9, 2023
    Configuration menu
    Copy the full SHA
    204b2b9 View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2023

  1. Merge branch 'master' into rpenido/fal-3532-import-taxonomy

    @rpenido
    rpenido committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    5e0f599 View commit details
    Browse the repository at this point in the history

  2. refactor: merging conflicts

    @rpenido
    rpenido committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    f888ecf View commit details
    Browse the repository at this point in the history

  3. refactor: change export syntax

    @rpenido
    rpenido committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    3c8da66 View commit details
    Browse the repository at this point in the history

  4. fix: eslint

    @rpenido
    rpenido committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    40479c1 View commit details
    Browse the repository at this point in the history

  5. fix: export TaxonomyDetail

    @rpenido
    rpenido committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    46e5d1b View commit details
    Browse the repository at this point in the history

  6. fix: eslint

    @rpenido
    rpenido committed Dec 12, 2023
    Configuration menu
    Copy the full SHA
    db8ba58 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2023

  1. feat: add manage-orgs modal

    @rpenido
    rpenido committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    a8b82cf View commit details
    Browse the repository at this point in the history

  2. fix: menu layout and input clear

    @rpenido
    rpenido committed Dec 13, 2023
    Configuration menu
    Copy the full SHA
    6484bdc View commit details
    Browse the repository at this point in the history

Commits on Dec 14, 2023

  1. Merge branch 'openedx:master' into rpenido/fal-3532-import-taxonomy

    @rpenido
    rpenido authored Dec 14, 2023
    Configuration menu
    Copy the full SHA
    8fe8c07 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2023

  1. fix: TaxonomyContext types

    @rpenido
    rpenido committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    1440215 View commit details
    Browse the repository at this point in the history

  2. feat: add api

    @rpenido
    rpenido committed Dec 15, 2023
    Configuration menu
    Copy the full SHA
    cd971cf View commit details
    Browse the repository at this point in the history

Commits on Dec 18, 2023

  1. refactor: move useTaxonomyDetail hooks to avoid circular dependency 

    manage-orgs -> taxonomy-detail -> taxonomy-menu -> manage-orgs
    @rpenido
    rpenido committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    7093304 View commit details
    Browse the repository at this point in the history

  2. fix: undo css change

    @rpenido
    rpenido committed Dec 18, 2023
    Configuration menu
    Copy the full SHA
    eb670ff View commit details
    Browse the repository at this point in the history

Commits on Dec 19, 2023

  1. Merge branch 'master' into rpenido/fal-3532-import-taxonomy

    @rpenido
    rpenido committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    e5b8e58 View commit details
    Browse the repository at this point in the history

  2. chore: rebasing

    @rpenido
    rpenido committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    fafcb9b View commit details
    Browse the repository at this point in the history

  3. fix: types

    @rpenido
    rpenido committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    e80194f View commit details
    Browse the repository at this point in the history

  4. fix: remove typo

    @rpenido
    rpenido committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    1e0dde3 View commit details
    Browse the repository at this point in the history

  5. fix: add confirm modal

    @rpenido
    rpenido committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    ef7cdaa View commit details
    Browse the repository at this point in the history

  6. test: add manage org menu test

    @rpenido
    rpenido committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    5da46b2 View commit details
    Browse the repository at this point in the history

  7. test: cleaning test removing useMutation mock

    @rpenido
    rpenido committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    7cae57b View commit details
    Browse the repository at this point in the history

  8. Merge branch 'rpenido/fal-3532-import-taxonomy' into rpenido/fal-3543… 

    …-assign-taxonomy-to-organizations
    @rpenido
    rpenido committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    7eb728a View commit details
    Browse the repository at this point in the history

  9. fix: merge conflicts

    @rpenido
    rpenido committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    5aed312 View commit details
    Browse the repository at this point in the history

  10. style: cleaning code and fix lint

    @rpenido
    rpenido committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    1002fc6 View commit details
    Browse the repository at this point in the history

  11. Merge branch 'rpenido/fal-3532-import-taxonomy' into rpenido/fal-3543… 

    …-assign-taxonomy-to-organizations
    @rpenido
    rpenido committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    30890b5 View commit details
    Browse the repository at this point in the history

  12. fix: disable element if is allOrg

    @rpenido
    rpenido committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    1e00d27 View commit details
    Browse the repository at this point in the history

  13. test: add tests

    @rpenido
    rpenido committed Dec 19, 2023
    Configuration menu
    Copy the full SHA
    f962b29 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2023

  1. style: add comment about modal style to allow dropdown overflow

    @rpenido
    rpenido committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    9fbe76e View commit details
    Browse the repository at this point in the history

  2. fix: add spacing

    @rpenido
    rpenido committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    aca5ce5 View commit details
    Browse the repository at this point in the history

  3. fix: dont pass null children

    @rpenido
    rpenido committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    2bf4c53 View commit details
    Browse the repository at this point in the history

  4. fix: cleaning code

    @rpenido
    rpenido committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    6054020 View commit details
    Browse the repository at this point in the history

  5. test: add tests

    @rpenido
    rpenido committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    44d2428 View commit details
    Browse the repository at this point in the history

  6. test: add more tests

    @rpenido
    rpenido committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    ca38b43 View commit details
    Browse the repository at this point in the history

  7. fix: typo

    @rpenido
    rpenido committed Dec 20, 2023
    Configuration menu
    Copy the full SHA
    5d2b314 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2024

  1. Merge branch 'master' into rpenido/fal-3543-assign-taxonomy-to-organi… 

    …zations
    @rpenido
    rpenido committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    25fb779 View commit details
    Browse the repository at this point in the history

  2. test: fix test

    @rpenido
    rpenido committed Jan 8, 2024
    Configuration menu
    Copy the full SHA
    56e6c1e View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2024

  1. fix: console warnings and disable dialog overlay

    @rpenido
    rpenido committed Jan 10, 2024
    Configuration menu
    Copy the full SHA
    bc966b4 View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2024

  1. fix: changes from review

    @rpenido
    rpenido committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    3cf5758 View commit details
    Browse the repository at this point in the history

  2. test: update tests from review

    @rpenido
    rpenido committed Jan 11, 2024
    Configuration menu
    Copy the full SHA
    aa1031e View commit details
    Browse the repository at this point in the history