Merge pull request #2506 from cisagov/2229-users-page-organizations-e…

…xports-broken

Fix Export Users Functionality and Organizations Column on Users Page

backend/src/api/users.ts

@@ -76,9 +76,13 @@ class UserSearch {
   async getResults(event): Promise<[User[], number]> {
     const pageSize = this.pageSize || 25;
     const sort = this.sort === 'name' ? 'user.fullName' : 'user.' + this.sort;
-    const qs = User.createQueryBuilder('user').orderBy(sort, this.order);
-    const results = await qs.getManyAndCount();
-    return results;
+    const qs = User.createQueryBuilder('user')
+      .leftJoinAndSelect('user.roles', 'roles') // Include the roles relation
+      .leftJoinAndSelect('roles.organization', 'organization') // Include the organization relation
+      .orderBy(sort, this.order);
+    const result = await qs.getMany();
+    const count = await qs.getCount();
+    return [result, count];
   }
 }
 

frontend/src/pages/Users/Users.tsx

@@ -10,10 +10,9 @@ import {
   ModalRef
 } from '@trussworks/react-uswds';
 import { ModalToggleButton } from 'components';
-import { Organization, Query } from 'types';
 import { Table, ImportExport } from 'components';
 import { Column, SortingRule } from 'react-table';
-import { User } from 'types';
+import { Organization, Query, User } from 'types';
 import { FaTimes } from 'react-icons/fa';
 import { useAuthContext } from 'context';
 // @ts-ignore:next-line