diff --git a/src/components/buttons/TableModalButton.jsx b/src/components/buttons/TableModalButton.jsx index 725405e7629e..3d42e4729954 100644 --- a/src/components/buttons/TableModalButton.jsx +++ b/src/components/buttons/TableModalButton.jsx @@ -5,7 +5,7 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' import { faCheckCircle } from '@fortawesome/free-solid-svg-icons' import { cellGenericFormatter } from '../tables/CellGenericFormat' -export default function TableModalButton({ data, title, className }) { +export default function TableModalButton({ data, title, className, countOnly = false, ...input }) { const handleTable = (data) => { const QueryColumns = [] const columns = Object.keys(data[0]).map((key) => { @@ -31,10 +31,8 @@ export default function TableModalButton({ data, title, className }) { const buttonClass = 'btn ' + className return ( - handleTable(data)}> - <> - {title} ({data.length}) - + handleTable(data)}> + <>{countOnly == true ? data.length : `${title} (${data.length})`} ) } diff --git a/src/views/home/Home.jsx b/src/views/home/Home.jsx index 107fda99197a..ee818bb39392 100644 --- a/src/views/home/Home.jsx +++ b/src/views/home/Home.jsx @@ -29,6 +29,7 @@ import { CellDelegatedPrivilege } from 'src/components/tables/CellDelegatedPrivi import Portals from 'src/data/portals' import { FontAwesomeIcon } from '@fortawesome/react-fontawesome' import { Link } from 'react-router-dom' +import { TableModalButton } from 'src/components/buttons' const Home = () => { const [visible, setVisible] = useState(false) @@ -54,6 +55,15 @@ const Home = () => { params: { tenantFilter: currentTenant.defaultDomainName }, }) + const GlobalAdminList = useGenericGetRequestQuery({ + path: '/api/ListGraphRequest', + params: { + tenantFilter: currentTenant.defaultDomainName, + Endpoint: "/directoryRoles(roleTemplateId='62e90394-69f5-4237-9190-012177145e10')/members", + $select: 'displayName,userPrincipalName,accountEnabled', + }, + }) + const { data: sharepoint, isLoading: isLoadingSPQuota, @@ -192,14 +202,20 @@ const Home = () => { - -
- {issuccessUserCounts && !isFetchingUserCount ? dashboard?.Gas : } -
+ {GlobalAdminList.isSuccess ? ( + <> + + + ) : ( + + )}