fix: orgs and roles filter fixed to send correct values to API

Author: jesusbalderramawgu

src/authz-module/components/TableControlBar/OrgFilter.tsx

@@ -17,7 +17,7 @@ const OrgFilter = ({
   } = useOrgs(searchValue);
   const filterChoices = useMemo(() => orgsData?.results?.map((org) => ({
     displayName: org.name,
-    value: org.id,
+    value: org.shortName,
   })) || [], [orgsData]);
 
   const handleSearchChange = (value: string) => {

src/authz-module/components/TableControlBar/RolesFilter.tsx

@@ -13,36 +13,36 @@ const RolesFilter = ({
   // TODO: use a constant
   const filterChoices = useMemo(() => [
     {
-      groupName: 'Global', groupIcon: Language, displayName: 'Super Admin', value: 'Super Admin',
+      groupName: 'Global', groupIcon: Language, displayName: 'Super Admin', value: 'super_admin',
     },
     {
-      groupName: 'Global', groupIcon: Language, displayName: 'Global Staff', value: 'Global Staff',
+      groupName: 'Global', groupIcon: Language, displayName: 'Global Staff', value: 'global_staff',
     },
 
     {
-      groupName: 'Course', groupIcon: School, displayName: 'Course Admin', value: 'Course Admin',
+      groupName: 'Course', groupIcon: School, displayName: 'Course Admin', value: 'course_admin',
     },
     {
-      groupName: 'Course', groupIcon: School, displayName: 'Course Staff', value: 'Course Staff',
+      groupName: 'Course', groupIcon: School, displayName: 'Course Staff', value: 'course_staff',
     },
     {
-      groupName: 'Course', groupIcon: School, displayName: 'Course Editor', value: 'Course Editor',
+      groupName: 'Course', groupIcon: School, displayName: 'Course Editor', value: 'course_editor',
     },
     {
-      groupName: 'Course', groupIcon: School, displayName: 'Course Auditor', value: 'Course Auditor',
+      groupName: 'Course', groupIcon: School, displayName: 'Course Auditor', value: 'course_auditor',
     },
 
     {
-      groupName: 'Library', groupIcon: LibraryBooks, displayName: 'Library Admin', value: 'Library Admin',
+      groupName: 'Library', groupIcon: LibraryBooks, displayName: 'Library Admin', value: 'library_admin',
     },
     {
-      groupName: 'Library', groupIcon: LibraryBooks, displayName: 'Library Author', value: 'Library Author',
+      groupName: 'Library', groupIcon: LibraryBooks, displayName: 'Library Author', value: 'library_author',
     },
     {
-      groupName: 'Library', groupIcon: LibraryBooks, displayName: 'Library Collaborator', value: 'Library Collaborator',
+      groupName: 'Library', groupIcon: LibraryBooks, displayName: 'Library Collaborator', value: 'library_collaborator',
     },
     {
-      groupName: 'Library', groupIcon: LibraryBooks, displayName: 'Library User', value: 'Library User',
+      groupName: 'Library', groupIcon: LibraryBooks, displayName: 'Library User', value: 'library_user',
     },
   ], []);
   return (

src/authz-module/data/api.ts

@@ -143,6 +143,9 @@ export const getUserAssignedRoles = async (username: string, querySettings: Quer
   if (querySettings.roles) {
     url.searchParams.set('roles', querySettings.roles);
   }
+  if (querySettings.organizations) {
+    url.searchParams.set('orgs', querySettings.organizations);
+  }
   if (querySettings.search) {
     url.searchParams.set('search', querySettings.search);
   }

src/types.ts

@@ -51,19 +51,16 @@ export type PermissionMetadata = {
 
 export type UserRole = {
   role: string;
-<<<<<<< HEAD
   org: string;
   scope: string;
   permissionCount: number;
-=======
   organization: string;
-  scope: string;
->>>>>>> ef7bf9b (feat: roles table for audit user page)
 };
 
 export type Org = {
   id: string;
   name: string;
+  shortName: string;
 };
 
 export type Scope = {