diff --git a/changes/fix-2686-include-host-select b/changes/fix-2686-include-host-select new file mode 100644 index 0000000000..ea919e8850 --- /dev/null +++ b/changes/fix-2686-include-host-select @@ -0,0 +1 @@ +* Include select column on manage hosts table for team admins \ No newline at end of file diff --git a/frontend/context/app.tsx b/frontend/context/app.tsx index 7e0ea80324..1cb4644862 100644 --- a/frontend/context/app.tsx +++ b/frontend/context/app.tsx @@ -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), }; }; diff --git a/frontend/pages/hosts/ManageHostsPage/HostTableConfig.tsx b/frontend/pages/hosts/ManageHostsPage/HostTableConfig.tsx index efcd34a37d..0fad626777 100644 --- a/frontend/pages/hosts/ManageHostsPage/HostTableConfig.tsx +++ b/frontend/pages/hosts/ManageHostsPage/HostTableConfig.tsx @@ -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; diff --git a/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx b/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx index 8b67b10b7c..111154eadb 100644 --- a/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx +++ b/frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx @@ -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