Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 00:49:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 106

Fix loading of enroll secrets for Teams (#1113)

Browse source 
Trigger logic based on presence of Basic tier, rather than absence of
Core tier.

Fixes #1100
This commit is contained in:
Zach Wasserman 2021-06-16 11:57:47 -07:00 committed by GitHub
parent 0279139632
commit 774bc4ef93
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
frontend/pages/hosts/ManageHostsPage/ManageHostsPage.jsx
View file

@ -70,7 +70,7 @@ export class ManageHostsPage extends PureComponent {
canAddNewLabels: PropTypes.bool,
teams: PropTypes.arrayOf(teamInterface),
isGlobalAdmin: PropTypes.bool,
isCoreTier: PropTypes.bool,
isBasicTier: PropTypes.bool,
currentUser: userInterface,
};
@ -109,8 +109,12 @@ export class ManageHostsPage extends PureComponent {
}
componentDidUpdate(prevProps) {
const { dispatch, isCoreTier, canAddNewHosts } = this.props;
if (isCoreTier !== prevProps.isCoreTier && !isCoreTier && canAddNewHosts) {
const { dispatch, isBasicTier, canAddNewHosts } = this.props;
if (
isBasicTier !== prevProps.isBasicTier &&
isBasicTier &&
canAddNewHosts
) {
dispatch(teamActions.loadAll({}));
}
}
@ -690,7 +694,7 @@ const mapStateToProps = (state, { location, params }) => {
permissionUtils.isGlobalAdmin(currentUser) ||
permissionUtils.isGlobalMaintainer(currentUser);
const isGlobalAdmin = permissionUtils.isGlobalAdmin(currentUser);
const isCoreTier = permissionUtils.isCoreTier(config);
const isBasicTier = permissionUtils.isBasicTier(config);
const teams = memoizedGetEntity(state.entities.teams.data);
return {
@ -711,7 +715,7 @@ const mapStateToProps = (state, { location, params }) => {
canAddNewHosts,
canAddNewLabels,
isGlobalAdmin,
isCoreTier,
isBasicTier,
teams,
};
};