diff --git a/src/config/tableColumns.js b/src/config/tableColumns.js index 919fe33a..1e6c7eb4 100644 --- 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 ( - - {selectedRow.first_name} {selectedRow.last_name} - - ); - }, - }, }, { name: "email", diff --git a/src/containers/Organization/UserList.jsx b/src/containers/Organization/UserList.jsx index e9ac9658..eb059dcd 100644 --- 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]);