From 5c87bd74cdb7131f0b686afe2d6c33852ef2cf46 Mon Sep 17 00:00:00 2001 From: Anthony LC Date: Thu, 27 Jun 2024 17:50:23 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=8F=B7=EF=B8=8F(frontend)=20adapt=20order?= =?UTF-8?q?ing=20name?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Some ordering names changed with a prefix "user__". We adapt the ordering name in the frontend to match the backend. --- .../teams/member-management/__tests__/MemberGrid.test.tsx | 8 ++++---- .../teams/member-management/components/MemberGrid.tsx | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/frontend/apps/desk/src/features/teams/member-management/__tests__/MemberGrid.test.tsx b/src/frontend/apps/desk/src/features/teams/member-management/__tests__/MemberGrid.test.tsx index 5fa93bd..861d49e 100644 --- a/src/frontend/apps/desk/src/features/teams/member-management/__tests__/MemberGrid.test.tsx +++ b/src/frontend/apps/desk/src/features/teams/member-management/__tests__/MemberGrid.test.tsx @@ -221,10 +221,10 @@ describe('MemberGrid', () => { }); it.each([ - ['name', 'Names'], - ['email', 'Emails'], - ['role', 'Roles'], - ])('checks the sorting', async (ordering, header_name) => { + ['Names', 'user__name'], + ['Emails', 'user__email'], + ['Roles', 'role'], + ])('checks the sorting of %s', async (header_name, ordering) => { const mockedData = [ { id: '123', diff --git a/src/frontend/apps/desk/src/features/teams/member-management/components/MemberGrid.tsx b/src/frontend/apps/desk/src/features/teams/member-management/components/MemberGrid.tsx index 3f44dc1..c7db738 100644 --- a/src/frontend/apps/desk/src/features/teams/member-management/components/MemberGrid.tsx +++ b/src/frontend/apps/desk/src/features/teams/member-management/components/MemberGrid.tsx @@ -30,8 +30,8 @@ type SortModelItem = { }; const defaultOrderingMapping: Record = { - 'user.name': 'name', - 'user.email': 'email', + 'user.name': 'user__name', + 'user.email': 'user__email', localizedRole: 'role', };