Merge pull request #872 from AI4Bharat/fixuserdownload

fix members csv download
AI4Bharat · Jan 16, 2025 · 41e6ab4 · 41e6ab4
2 parents f386bcd + a498f36
commit 41e6ab4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 13 deletions.
diff --git a/src/config/tableColumns.js b/src/config/tableColumns.js
@@ -46,20 +46,8 @@ export const projectColumns = [
 
 export const usersColumns = [
   {
-    name: "name",
+    name: "first_name",
     label: "Name",
-    options: {
-      customBodyRender: (_value, tableMeta) => {
-        const { tableData: data, rowIndex } = tableMeta;
-        const selectedRow = data[rowIndex];
-
-        return (
-          <Box>
-            {selectedRow.first_name} {selectedRow.last_name}
-          </Box>
-        );
-      },
-    },
   },
   {
     name: "email",

diff --git a/src/containers/Organization/UserList.jsx b/src/containers/Organization/UserList.jsx
@@ -20,6 +20,10 @@ const UserList = ({ data }) => {
   const dispatch = useDispatch();
   const apiStatus = useSelector((state) => state.apiStatus);
 
+  data.forEach(user => {
+    user.first_name = user.first_name + " " + user.last_name;
+  });
+
   const handleReinvite = (email) => {
     let apiObj;
     apiObj = new ResendUserInviteAPI([email]);