From ceee600379cbeda4b1afda0c4d0748e1adca7e59 Mon Sep 17 00:00:00 2001 From: vykes-mac Date: Thu, 20 Jun 2024 18:01:04 -0500 Subject: [PATCH] query teams inside sites dashboard and disable other row items --- .../sections/sites/sites-dashboard/index.tsx | 4 ++-- .../toggle-activate-monitoring/index.tsx | 4 ++-- .../site-status-content/site-boost-column/index.tsx | 8 +++++--- .../agency-dashboard/sites-overview/site-table/index.tsx | 2 -- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/client/a8c-for-agencies/sections/sites/sites-dashboard/index.tsx b/client/a8c-for-agencies/sections/sites/sites-dashboard/index.tsx index 1af02fc107b8df..e7f5c556b22d9e 100644 --- a/client/a8c-for-agencies/sections/sites/sites-dashboard/index.tsx +++ b/client/a8c-for-agencies/sections/sites/sites-dashboard/index.tsx @@ -23,6 +23,7 @@ import LayoutTop from 'calypso/a8c-for-agencies/components/layout/top'; import MobileSidebarNavigation from 'calypso/a8c-for-agencies/components/sidebar/mobile-sidebar-navigation'; import useNoActiveSite from 'calypso/a8c-for-agencies/hooks/use-no-active-site'; import JetpackSitesDataViews from 'calypso/a8c-for-agencies/sections/sites/features/jetpack/jetpack-sites-dataviews'; +import QueryReaderTeams from 'calypso/components/data/query-reader-teams'; import useFetchDashboardSites from 'calypso/data/agency-dashboard/use-fetch-dashboard-sites'; import useFetchMonitorVerifiedContacts from 'calypso/data/agency-dashboard/use-fetch-monitor-verified-contacts'; import DashboardDataContext from 'calypso/jetpack-cloud/sections/agency-dashboard/sites-overview/dashboard-data-context'; @@ -46,7 +47,6 @@ import { updateSitesDashboardUrl } from './update-sites-dashboard-url'; import './style.scss'; import './sites-dataviews-style.scss'; - export default function SitesDashboard() { const jetpackSiteDisconnected = useSelector( checkIfJetpackSiteGotDisconnected ); const dispatch = useDispatch(); @@ -246,7 +246,7 @@ export default function SitesDashboard() { { tourId && } - + ); diff --git a/client/jetpack-cloud/sections/agency-dashboard/sites-overview/site-status-content/site-boost-column/index.tsx b/client/jetpack-cloud/sections/agency-dashboard/sites-overview/site-status-content/site-boost-column/index.tsx index dc468f2a995651..ec93efcc64b558 100644 --- a/client/jetpack-cloud/sections/agency-dashboard/sites-overview/site-status-content/site-boost-column/index.tsx +++ b/client/jetpack-cloud/sections/agency-dashboard/sites-overview/site-status-content/site-boost-column/index.tsx @@ -42,6 +42,8 @@ export default function SiteBoostColumn( { site, siteError }: Props ) { recordEvent( 'boost_column_get_score_click' ); }; + const isSiteMigrationInProgress = site.sticker.includes( 'migration-in-progress' ); + const noBoostHrefOption = site.is_atomic ? jetpackHref : addBoostHref; if ( overallScore && ! hasBoost ) { return ( @@ -57,7 +59,7 @@ export default function SiteBoostColumn( { site, siteError }: Props ) { } href={ siteError ? '' : noBoostHrefOption } target="_blank" - disabled={ siteError || site.sticker.includes( 'migration-in-progress' ) } + disabled={ siteError || isSiteMigrationInProgress } onClick={ () => recordEvent( 'boost_column_score_click', { score: overallScore, @@ -122,7 +124,7 @@ export default function SiteBoostColumn( { site, siteError }: Props ) { <> { translate( 'Add' ) } diff --git a/client/jetpack-cloud/sections/agency-dashboard/sites-overview/site-table/index.tsx b/client/jetpack-cloud/sections/agency-dashboard/sites-overview/site-table/index.tsx index dbfb850a79c366..5dd9a99a7b7af5 100644 --- a/client/jetpack-cloud/sections/agency-dashboard/sites-overview/site-table/index.tsx +++ b/client/jetpack-cloud/sections/agency-dashboard/sites-overview/site-table/index.tsx @@ -1,7 +1,6 @@ import { Icon, starFilled, info } from '@wordpress/icons'; import clsx from 'clsx'; import { useContext, useState, forwardRef, Ref } from 'react'; -import QueryReaderTeams from 'calypso/components/data/query-reader-teams'; import AddNewSiteTourStep2 from 'calypso/jetpack-cloud/sections/onboarding-tours/add-new-site-tour-step-2'; import TextPlaceholder from 'calypso/jetpack-cloud/sections/partner-portal/text-placeholder'; import './style.scss'; @@ -43,7 +42,6 @@ const SiteTable = ( { isLoading, columns, items }: Props, ref: Ref< HTMLTableEle return ( <> -