Fix wrong page context opening when flag enabled

Automattic · Jan 10, 2025 · bf0e24b · bf0e24b
1 parent 6f2e3dc
commit bf0e24b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 4 deletions.
diff --git a/client/sites/overview/components/active-domains-card.tsx b/client/sites/overview/components/active-domains-card.tsx
@@ -77,6 +77,7 @@ const ActiveDomainsCard: FC = () => {
 				isAllSitesView={ false }
 				useMobileCards={ forceMobile }
 				siteSlug={ site?.slug ?? null }
+				isHostingOverview
 				userCanSetPrimaryDomains={ userCanSetPrimaryDomains }
 				onDomainAction={ ( action, domain ) => {
 					if ( action === 'set-primary-address' && site ) {

diff --git a/packages/domains-table/src/domains-table/domains-table-row.tsx b/packages/domains-table/src/domains-table/domains-table-row.tsx
@@ -56,6 +56,7 @@ export function DomainsTableRow( { domain }: DomainsTableRowProps ) {
 		isCompact,
 		currentlySelectedDomainName,
 		selectedFeature,
+		isHostingOverview,
 	} = useDomainsTable();
 
 	const renderSiteCell = () => {
@@ -80,7 +81,13 @@ export function DomainsTableRow( { domain }: DomainsTableRowProps ) {
 		currentDomainData && getDomainTypeText( currentDomainData, __, domainInfoContext.DOMAIN_ROW );
 
 	const domainManagementLink = isManageableDomain
-		? getDomainManagementLink( domain, siteSlug, isAllSitesView, selectedFeature )
+		? getDomainManagementLink(
+				domain,
+				siteSlug,
+				isAllSitesView,
+				selectedFeature,
+				isHostingOverview
+		  )
 		: '';
 
 	const renderOwnerCell = () => {
@@ -100,7 +107,7 @@ export function DomainsTableRow( { domain }: DomainsTableRowProps ) {
 	const handleSelect = () => {
 		const isAllDomainManagementEnabled = config.isEnabled( 'calypso/all-domain-management' );
 
-		if ( isAllDomainManagementEnabled ) {
+		if ( isAllDomainManagementEnabled && ( isHostingOverview || isAllSitesView ) ) {
 			page.show( domainManagementLink );
 			return;
 		}

diff --git a/packages/domains-table/src/domains-table/domains-table.tsx b/packages/domains-table/src/domains-table/domains-table.tsx
@@ -71,6 +71,7 @@ interface BaseDomainsTableProps {
 	sidebarMode?: boolean;
 	selectedDomainName?: string;
 	selectedFeature?: string;
+	isHostingOverview?: boolean;
 }
 
 export type DomainsTableProps =
@@ -128,6 +129,7 @@ type Value = {
 	isCompact: boolean;
 	currentlySelectedDomainName?: string;
 	selectedFeature?: string;
+	isHostingOverview?: boolean;
 };
 
 export const DomainsTableStateContext = createContext< Value | undefined >( undefined );
@@ -152,6 +154,7 @@ export const useGenerateDomainsTableState = ( props: DomainsTableProps ) => {
 		sidebarMode = false,
 		selectedDomainName,
 		selectedFeature,
+		isHostingOverview = false,
 	} = props;
 
 	const [ { sortKey, sortDirection }, setSort ] = useState< {
@@ -454,6 +457,7 @@ export const useGenerateDomainsTableState = ( props: DomainsTableProps ) => {
 		isCompact,
 		currentlySelectedDomainName: selectedDomainName,
 		selectedFeature,
+		isHostingOverview,
 	};
 
 	return value;

diff --git a/packages/domains-table/src/utils/paths.ts b/packages/domains-table/src/utils/paths.ts
@@ -9,7 +9,8 @@ export function domainManagementLink(
 	{ domain, type }: Pick< ResponseDomain, 'domain' | 'type' >,
 	siteSlug: string,
 	isAllSitesView: boolean,
-	feature?: string
+	feature?: string,
+	isHostingOverview?: boolean
 ) {
 	const viewSlug = domainManagementViewSlug( type );
 
@@ -22,7 +23,7 @@ export function domainManagementLink(
 
 	const isAllDomainManagementEnabled = config.isEnabled( 'calypso/all-domain-management' );
 
-	if ( isAllDomainManagementEnabled ) {
+	if ( isAllDomainManagementEnabled && ( isHostingOverview || isAllSitesView ) ) {
 		switch ( feature ) {
 			case 'email-management':
 				return `${ domainManagementAllRoot() }/email/${ domain }/${ siteSlug }`;