Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 01:18:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 84

Manage Users Page: Fix teams header to render on refresh (#1687)

Browse source 
* Fix teams header to render on refresh
This commit is contained in:
RachelElysia 2021-08-17 19:39:24 -04:00 committed by GitHub
parent 3c9d7fd4bb
commit 93ace41f2b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
frontend/pages/admin/UserManagementPage/UserManagementPage.jsx
View file

@ -83,17 +83,13 @@ export class UserManagementPage extends Component {
userEditing: null,
usersEditing: [],
};
const { isBasicTier } = props;
// done as an instance variable as these headers will not change, so dont
// want to recalculate on re-renders.
this.tableHeaders = generateTableHeaders(this.onActionSelect, isBasicTier);
}
componentDidMount() {
const { dispatch } = this.props;
dispatch(teamActions.loadAll({}));
const { dispatch, isBasicTier } = this.props;
if (isBasicTier) {
dispatch(teamActions.loadAll({}));
}
}
onEditUser = (formData) => {
@ -544,7 +540,6 @@ export class UserManagementPage extends Component {
render() {
const {
tableHeaders,
renderCreateUserModal,
renderEditUserModal,
renderDeleteUserModal,
@ -554,7 +549,16 @@ export class UserManagementPage extends Component {
onTableQueryChange,
onActionSelect,
} = this;
const { loadingTableData, users, invites, currentUser } = this.props;
const {
loadingTableData,
users,
invites,
currentUser,
isBasicTier,
} = this.props;
const tableHeaders = generateTableHeaders(onActionSelect, isBasicTier);
let tableData = [];
if (!loadingTableData) {

2
frontend/pages/admin/UserManagementPage/UsersTableConfig.tsx
View file

@ -49,7 +49,7 @@ interface IUserTableData {
// more info here https://react-table.tanstack.com/docs/api/useTable#cell-properties
const generateTableHeaders = (
actionSelectHandler: (value: string, user: IUser | IInvite) => void,
isBasicTier = false
isBasicTier: boolean
): IDataColumn[] => {
const tableHeaders: IDataColumn[] = [
{