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(admin): add user role management #4248

Draft
wants to merge 51 commits into
base: master
Choose a base branch
from
Draft

feat(admin): add user role management #4248

wants to merge 51 commits into from

Commits on Sep 23, 2024

  1. feat(admin): add user role management

    @chinook25
    chinook25 committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    63b758d View commit details
    Browse the repository at this point in the history

  2. wip: admin page tries request

    @chinook25
    chinook25 committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    092408a View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2024

  1. wip: use useFetch (not working)

    @chinook25
    chinook25 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    4509030 View commit details
    Browse the repository at this point in the history

  2. wip: now it retrieves!

    @chinook25
    chinook25 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    4a69b28 View commit details
    Browse the repository at this point in the history

  3. wip: retrieve tokens

    @chinook25
    chinook25 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    a4b5171 View commit details
    Browse the repository at this point in the history

  4. wip: add murmurs

    @chinook25
    chinook25 committed Sep 24, 2024
    Configuration menu
    Copy the full SHA
    7612f38 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2024

  1. Merge branch 'master' into feat/admin-role-management

    @chinook25
    chinook25 authored Sep 25, 2024
    Configuration menu
    Copy the full SHA
    faf3f5b View commit details
    Browse the repository at this point in the history

  2. wip: use useFetch

    @chinook25
    chinook25 committed Sep 25, 2024
    1 Configuration menu
    Copy the full SHA
    20477dc View commit details
    Browse the repository at this point in the history

Commits on Sep 26, 2024

  1. wip: pagination working

    @chinook25
    chinook25 committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    239fe1e View commit details
    Browse the repository at this point in the history

  2. wip: limit 20

    @chinook25
    chinook25 committed Sep 26, 2024
    Configuration menu
    Copy the full SHA
    3981a51 View commit details
    Browse the repository at this point in the history

Commits on Sep 27, 2024

  1. wip: correct next page

    @chinook25
    chinook25 committed Sep 27, 2024
    Configuration menu
    Copy the full SHA
    bebe5dc View commit details
    Browse the repository at this point in the history

Commits on Oct 1, 2024

  1. wip: add roles to user

    @chinook25
    chinook25 committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    f11b42d View commit details
    Browse the repository at this point in the history

  2. wip: add column to db

    @chinook25
    chinook25 committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    b57ab94 View commit details
    Browse the repository at this point in the history

  3. wip rename

    @chinook25
    chinook25 committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    9090611 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into feat/admin-role-management

    @chinook25
    chinook25 committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    7e678c9 View commit details
    Browse the repository at this point in the history

  5. now with correct query

    @chinook25
    chinook25 committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    15c32fb View commit details
    Browse the repository at this point in the history

  6. adding roles to sql

    @chinook25
    chinook25 committed Oct 1, 2024
    Configuration menu
    Copy the full SHA
    7449963 View commit details
    Browse the repository at this point in the history

  7. Merge branch 'master' into feat/admin-role-management

    @mswertz
    mswertz authored Oct 1, 2024
    Configuration menu
    Copy the full SHA
    c49169a View commit details
    Browse the repository at this point in the history

Commits on Oct 2, 2024

  1. Merge branch 'master' into feat/admin-role-management

    @chinook25
    chinook25 committed Oct 2, 2024
    Configuration menu
    Copy the full SHA
    1b428a0 View commit details
    Browse the repository at this point in the history

Commits on Oct 3, 2024

  1. Merge branch 'master' into feat/admin-role-management

    @chinook25
    chinook25 authored Oct 3, 2024
    Configuration menu
    Copy the full SHA
    cd45861 View commit details
    Browse the repository at this point in the history

Commits on Oct 4, 2024

  1. Merge branch 'master' into feat/admin-role-management

    @chinook25
    chinook25 authored Oct 4, 2024
    Configuration menu
    Copy the full SHA
    78b2e47 View commit details
    Browse the repository at this point in the history

  2. wip: trying to retrieve roles, almost there?

    @chinook25
    chinook25 committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    086705d View commit details
    Browse the repository at this point in the history

  3. wip: remove unused code

    @chinook25
    chinook25 committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    0bf018a View commit details
    Browse the repository at this point in the history

  4. chore: format

    @chinook25
    chinook25 committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    d7b20b5 View commit details
    Browse the repository at this point in the history

  5. chore: format

    @chinook25
    chinook25 committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    de1e694 View commit details
    Browse the repository at this point in the history

  6. feat: retrieving roles works

    @chinook25
    chinook25 committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    f2f245d View commit details
    Browse the repository at this point in the history

  7. chore: remove roles from user

    @chinook25
    chinook25 committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    32aabc7 View commit details
    Browse the repository at this point in the history

  8. chore: remove unused type

    @chinook25
    chinook25 committed Oct 4, 2024
    Configuration menu
    Copy the full SHA
    1163a05 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2024

  1. Merge branch 'master' into feat/admin-role-management

    @chinook25
    chinook25 authored Oct 7, 2024
    Configuration menu
    Copy the full SHA
    dddad76 View commit details
    Browse the repository at this point in the history

  2. chore: move load roles function

    @chinook25
    chinook25 committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    7bfe0eb View commit details
    Browse the repository at this point in the history

  3. feat: split result into schema and role

    @chinook25
    chinook25 committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    f94833b View commit details
    Browse the repository at this point in the history

  4. chore: minor refactor

    @chinook25
    chinook25 committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    3201621 View commit details
    Browse the repository at this point in the history

  5. fix: warnings

    @chinook25
    chinook25 committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    7da5b8b View commit details
    Browse the repository at this point in the history

  6. chore: nicer role and token display

    @chinook25
    chinook25 committed Oct 7, 2024
    Configuration menu
    Copy the full SHA
    c488c17 View commit details
    Browse the repository at this point in the history

Commits on Oct 8, 2024

  1. chore: refactor

    @chinook25
    chinook25 committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    793e626 View commit details
    Browse the repository at this point in the history

  2. feat: add delete and update functions

    @chinook25
    chinook25 committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    c059219 View commit details
    Browse the repository at this point in the history

  3. minor chagne

    @chinook25
    chinook25 committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    f7d8962 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' into feat/admin-role-management

    @chinook25
    chinook25 authored Oct 8, 2024
    Configuration menu
    Copy the full SHA
    6c71ff9 View commit details
    Browse the repository at this point in the history

  5. feat: can add users

    @chinook25
    chinook25 committed Oct 8, 2024
    Configuration menu
    Copy the full SHA
    d73c913 View commit details
    Browse the repository at this point in the history

Commits on Oct 9, 2024

  1. Merge branch 'master' into feat/admin-role-management 

    # Conflicts:
#	backend/molgenis-emx2-graphql/src/main/java/org/molgenis/emx2/graphql/GraphqlAdminFieldFactory.java
#	backend/molgenis-emx2-graphql/src/main/java/org/molgenis/emx2/graphql/GraphqlApiFactory.java
    @chinook25
    chinook25 committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    534e7df View commit details
    Browse the repository at this point in the history

  2. merge master

    @chinook25
    chinook25 committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    3380177 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' into feat/admin-role-management

    @chinook25
    chinook25 authored Oct 9, 2024
    Configuration menu
    Copy the full SHA
    30279c2 View commit details
    Browse the repository at this point in the history

  4. chore: add comments

    @chinook25
    chinook25 committed Oct 9, 2024
    Configuration menu
    Copy the full SHA
    2cc3874 View commit details
    Browse the repository at this point in the history

Commits on Oct 10, 2024

  1. feat: show enabled; wip: start with edit user modal

    @chinook25
    chinook25 committed Oct 10, 2024
    Configuration menu
    Copy the full SHA
    9dc7425 View commit details
    Browse the repository at this point in the history

Commits on Oct 14, 2024

  1. Merge branch 'master' into feat/admin-role-management 

    # Conflicts:
#	apps/ui/layouts/default.vue
#	backend/molgenis-emx2-sql/src/main/java/org/molgenis/emx2/sql/SqlDatabase.java
#	backend/molgenis-emx2/src/main/java/org/molgenis/emx2/Database.java
    @chinook25
    chinook25 committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    ae6f00b View commit details
    Browse the repository at this point in the history

  2. feat: put create user in modal

    @chinook25
    chinook25 committed Oct 14, 2024
    Configuration menu
    Copy the full SHA
    0204c24 View commit details
    Browse the repository at this point in the history

Commits on Oct 15, 2024

  1. feat:retrieve roles

    @chinook25
    chinook25 committed Oct 15, 2024
    Configuration menu
    Copy the full SHA
    27a700a View commit details
    Browse the repository at this point in the history

Commits on Oct 16, 2024

  1. chore: move functions to util file

    @chinook25
    chinook25 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    4434a7d View commit details
    Browse the repository at this point in the history

  2. feat: show tokens in modal

    @chinook25
    chinook25 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    c6bed32 View commit details
    Browse the repository at this point in the history

  3. feat: add dis-/en-able button

    @chinook25
    chinook25 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    a7820f6 View commit details
    Browse the repository at this point in the history

  4. chore: tsing

    @chinook25
    chinook25 committed Oct 16, 2024
    Configuration menu
    Copy the full SHA
    55fa5b6 View commit details
    Browse the repository at this point in the history