diff --git a/changes/19828-hide-query-delete-checkboxes-from-observers b/changes/19828-hide-query-delete-checkboxes-from-observers new file mode 100644 index 0000000000..f4c268d27b --- /dev/null +++ b/changes/19828-hide-query-delete-checkboxes-from-observers @@ -0,0 +1 @@ +- Hide query delete checkboxes from team observers diff --git a/frontend/pages/queries/ManageQueriesPage/components/QueriesTable/QueriesTableConfig.tsx b/frontend/pages/queries/ManageQueriesPage/components/QueriesTable/QueriesTableConfig.tsx index 995ea6d7f3..ea610b32fc 100644 --- a/frontend/pages/queries/ManageQueriesPage/components/QueriesTable/QueriesTableConfig.tsx +++ b/frontend/pages/queries/ManageQueriesPage/components/QueriesTable/QueriesTableConfig.tsx @@ -115,7 +115,9 @@ const generateTableHeaders = ({ currentTeamId, omitSelectionColumn = false, }: IGenerateTableHeaders): IDataColumn[] => { - const isOnlyObserver = permissionsUtils.isOnlyObserver(currentUser); + const isCurrentTeamObserverOrGlobalObserver = currentTeamId + ? permissionsUtils.isTeamObserver(currentUser, currentTeamId) + : permissionsUtils.isOnlyObserver(currentUser); const viewingTeamScope = currentTeamId !== API_ALL_TEAMS_ID; const tableHeaders: IDataColumn[] = [ @@ -135,32 +137,33 @@ const generateTableHeaders = ({ value={ <>
{cellProps.cell.value}
- {!isOnlyObserver && cellProps.row.original.observer_can_run && ( -
- - - - - Observers can run this query. - -
- )} + {!isCurrentTeamObserverOrGlobalObserver && + cellProps.row.original.observer_can_run && ( +
+ + + + + Observers can run this query. + +
+ )} {viewingTeamScope && // inherited cellProps.row.original.team_id !== currentTeamId && ( @@ -260,7 +263,7 @@ const generateTableHeaders = ({ ), }, ]; - if (!isOnlyObserver && !omitSelectionColumn) { + if (!isCurrentTeamObserverOrGlobalObserver && !omitSelectionColumn) { tableHeaders.unshift({ id: "selection", // TODO - improve typing of IHeaderProps instead of using any