From bc25e23f205071e706e61adb06936a050c90e63d Mon Sep 17 00:00:00 2001 From: Jacob Shandling <61553566+jacobshandling@users.noreply.github.com> Date: Thu, 20 Jul 2023 11:42:01 -0700 Subject: [PATCH] UI - Remove select boxes from inherited QueriesTable (#12875) ## Addresses #12636 Screenshot 2023-07-20 at 11 23 18 AM - [x] Manual QA for all new/changed functionality Co-authored-by: Jacob Shandling --- .../components/QueriesTable/QueriesTable.tsx | 4 ++-- .../components/QueriesTable/QueriesTableConfig.tsx | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/pages/queries/ManageQueriesPage/components/QueriesTable/QueriesTable.tsx b/frontend/pages/queries/ManageQueriesPage/components/QueriesTable/QueriesTable.tsx index 13b24a84da..d016fd53eb 100644 --- a/frontend/pages/queries/ManageQueriesPage/components/QueriesTable/QueriesTable.tsx +++ b/frontend/pages/queries/ManageQueriesPage/components/QueriesTable/QueriesTable.tsx @@ -237,8 +237,8 @@ const QueriesTable = ({ }; const tableHeaders = useMemo( - () => currentUser && generateTableHeaders({ currentUser }), - [currentUser] + () => currentUser && generateTableHeaders({ currentUser, isInherited }), + [currentUser, isInherited] ); const searchable = diff --git a/frontend/pages/queries/ManageQueriesPage/components/QueriesTable/QueriesTableConfig.tsx b/frontend/pages/queries/ManageQueriesPage/components/QueriesTable/QueriesTableConfig.tsx index 823b0ceb5c..c8c7742615 100644 --- a/frontend/pages/queries/ManageQueriesPage/components/QueriesTable/QueriesTableConfig.tsx +++ b/frontend/pages/queries/ManageQueriesPage/components/QueriesTable/QueriesTableConfig.tsx @@ -97,12 +97,14 @@ interface IDataColumn { interface IGenerateTableHeaders { currentUser: IUser; + isInherited?: boolean; } // NOTE: cellProps come from react-table // more info here https://react-table.tanstack.com/docs/api/useTable#cell-properties const generateTableHeaders = ({ currentUser, + isInherited = false, }: IGenerateTableHeaders): IDataColumn[] => { const isOnlyObserver = permissionsUtils.isOnlyObserver(currentUser); const isAnyTeamMaintainerOrTeamAdmin = permissionsUtils.isAnyTeamMaintainerOrTeamAdmin( @@ -257,7 +259,7 @@ const generateTableHeaders = ({ ), }, ]; - if (!isOnlyObserver) { + if (!isOnlyObserver && !isInherited) { tableHeaders.splice(0, 0, { id: "selection", Header: (cellProps: IHeaderProps): JSX.Element => {