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

Include select column in manage hosts for team admins (#2698)

Browse source
This commit is contained in:
Luke Heath 2021-10-26 23:58:44 -05:00 committed by GitHub
parent fe23fcd3ee
commit 6998bc5d8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changes/fix-2686-include-host-select Normal file
View file

@ -0,0 +1 @@
* Include select column on manage hosts table for team admins

1
frontend/context/app.tsx
View file

@ -89,6 +89,7 @@ const setPermissions = (user: IUser, config: IConfig, teamId = 0) => {
),
isAnyTeamAdmin: permissions.isAnyTeamAdmin(user),
isTeamMaintainer: permissions.isTeamMaintainer(user, teamId),
isTeamAdmin: permissions.isTeamAdmin(user, teamId),
isOnlyObserver: permissions.isOnlyObserver(user),
};
};

6
frontend/pages/hosts/ManageHostsPage/HostTableConfig.tsx
View file

@ -322,7 +322,11 @@ const generateAvailableTableHeaders = (
// In premium tier, we want to check user role to enable/disable select column
!permissionUtils.isGlobalAdmin(currentUser) &&
!permissionUtils.isGlobalMaintainer(currentUser) &&
!permissionUtils.isTeamMaintainer(currentUser, currentTeam?.id || null)
!permissionUtils.isTeamMaintainer(
currentUser,
currentTeam?.id || null
) &&
!permissionUtils.isTeamAdmin(currentUser, currentTeam?.id || null)
) {
if (currentColumn.id === "selection") {
return columns;

39
frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx
View file

@ -1,4 +1,4 @@
import React, { useState, useContext } from "react";
import React, { useState, useContext, useEffect } from "react";
import { useDispatch } from "react-redux";
import { useQuery } from "react-query";
import { InjectedRouter, Params } from "react-router/lib/Router";
@ -900,41 +900,6 @@ const ManageHostsPage = ({
}
/>
);
// if (isPremiumTier && isLoadingTeams) {
// return null;
// }
// if (!isPremiumTier) {
// return <h1>Hosts</h1>;
// }
// const teamOptions = generateTeamFilterDropdownOptions(
// teams || [],
// currentUser,
// isOnGlobalTeam as boolean
// );
// const selectedTeamId = getValidatedTeamId(
// teams || [],
// (policyId && policy?.team_id) || (currentTeam?.id as number),
// currentUser,
// isOnGlobalTeam as boolean
// );
// return (
// <div>
// <Dropdown
// value={selectedTeamId}
// placeholder={"All teams"}
// className={`${baseClass}__team-dropdown`}
// options={teamOptions}
// searchable={false}
// onChange={(newSelectedValue: number) =>
// handleChangeSelectedTeamFilter(newSelectedValue)
// }
// />
// </div>
// );
// };
const renderPoliciesFilterBlock = () => {
const buttonText = (
@ -1330,8 +1295,6 @@ const ManageHostsPage = ({
);
};
const selectedTeam = currentTeam?.id || 0;
return (
<div className="has-sidebar">
{renderForm()}