Clone
 

joe <jjohn@parts-unltd.com> in lemans-dashboard-user-manager

Merge branch 'sprint-46'

Merge branch 'sprint-45'

Merge branch 'APPDEV-8447' into sprint-45

APPDEV-8447: removing the check for aduser as per Arovinth

APPDEV-8447: removed unwanted filters from roles; added filter to remove already added roles from the dropdown;

Merge branch 'sprint-40'

Merge branch 'APPDEV-8411' into sprint-40

APPDEV-8411: moved create form to bottom of the role, permission and the user pages

Merge branch 'APPDEV-8409' into sprint-40

APPDEV-8409: making role drop down searchable in user details page

Merge branch 'sprint-35'

Merge branch 'APPDEV-8370' into sprint-35

APPDEV-8370: converting lemans-dashboard-user-manager repo to use the onFilterDropdownVisibleChange to focus on the the filter drop down while searching

    • -6
    • +1
    /components/RoleList/RoleList.helpers.tsx
Merge branch 'sprint-34'

Merge branch 'APPDEV-8361' into sprint-34

APPDEV-8359: added filter search and sorter for user modal and role modal in the Roles page

Merge branch 'APPDEV-8361' into sprint-34

APPDEV-8361: added filter search and sorter for user modal and role modal in the permissions page

APPDEV-8252: fixing permission

Merge branch 'SD-11012' into sprint-28

SD-11012: moved the add new component out of the table

    • -9
    • +5
    /components/RoleList/RoleList.helpers.tsx
    • -12
    • +7
    /components/UserList/UserList.helpers.tsx
Merge remote-tracking branch 'origin/sprint-28' into SD-11012

Merge branch 'APPDEV-8252' into sprint-28

APPDEV-8252: added role user and role permission modal windows and corresponding actions

    • -4
    • +5
    /components/RoleList/RoleList.helpers.tsx
    • -1
    • +1
    /components/RoleList/RoleList.styles.less
    • -0
    • +30
    /components/RoleList/RoleListModal/RoleListModal.types.ts
    • -0
    • +1
    /components/RoleList/RoleListModal/index.ts
APPDEV-8252: implemented role list table, inline edit fields, add new role row, actions

    • -5
    • +5
    /components/RoleList/RoleList.docs.tsx
    • -0
    • +117
    /components/RoleList/RoleList.helpers.tsx
    • -0
    • +15
    /components/RoleList/RoleList.styles.less
    • -4
    • +19
    /components/RoleList/RoleList.test.tsx
    • -3
    • +17
    /components/RoleList/RoleList.types.ts
Merge remote-tracking branch 'origin/sprint-28' into APPDEV-8252

Merge branch 'SD-10500' into sprint-28

SD-10500: permission list page with user and role modals

Merge branch 'SD-10500' into sprint-28

SD-10500: implemented assigned users and roles modal window, implemented unassign permission from role;