diff --git a/client/a8c-for-agencies/sections/sites/features/jetpack/jetpack-sites-dataviews.tsx b/client/a8c-for-agencies/sections/sites/features/jetpack/jetpack-sites-dataviews.tsx index 434c58712d44b6..79d07a8b91bacd 100644 --- a/client/a8c-for-agencies/sections/sites/features/jetpack/jetpack-sites-dataviews.tsx +++ b/client/a8c-for-agencies/sections/sites/features/jetpack/jetpack-sites-dataviews.tsx @@ -22,6 +22,9 @@ import SiteActions from 'calypso/jetpack-cloud/sections/agency-dashboard/sites-o import SiteStatusContent from 'calypso/jetpack-cloud/sections/agency-dashboard/sites-overview/site-status-content'; import { JETPACK_MANAGE_ONBOARDING_TOURS_EXAMPLE_SITE } from 'calypso/jetpack-cloud/sections/onboarding-tours/constants'; import TextPlaceholder from 'calypso/jetpack-cloud/sections/partner-portal/text-placeholder'; +import { isAutomatticTeamMember } from 'calypso/reader/lib/teams'; +import { useSelector } from 'calypso/state'; +import { getReaderTeams } from 'calypso/state/teams/selectors'; import { useFetchTestConnections } from '../../hooks/use-fetch-test-connection'; import useFormattedSites from '../../hooks/use-formatted-sites'; import { AllowedTypes, Site, SiteData } from '../../types'; @@ -66,9 +69,12 @@ export const JetpackSitesDataViews = ( { [] ); + const teams = useSelector( getReaderTeams ); + const isTeamMember = isAutomatticTeamMember( teams ); + const openSitePreviewPane = useCallback( ( site: Site ) => { - if ( site.sticker.includes( 'migration-in-progress' ) ) { + if ( site.sticker.includes( 'migration-in-progress' ) && ! isTeamMember ) { return; } @@ -384,7 +390,8 @@ export const JetpackSitesDataViews = ( { onClick={ ( e: MouseEvent ) => e.stopPropagation() } onKeyDown={ ( e: KeyboardEvent ) => e.stopPropagation() } > - { ! item.site.value.sticker.includes( 'migration-in-progress' ) && ( + { ( ! item.site.value.sticker.includes( 'migration-in-progress' ) || + isTeamMember ) && ( <> { site.url } } { migrationInProgress && ( - Migration in progress + { translate( 'Migration in progress' ) } ) } 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 5dd9a99a7b7af5..dbfb850a79c366 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,6 +1,7 @@ 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'; @@ -42,6 +43,7 @@ const SiteTable = ( { isLoading, columns, items }: Props, ref: Ref< HTMLTableEle return ( <> +