Skip to content

Commit f67a920

Browse files
committed
Pass siteSlug as component prop
1 parent f058dce commit f67a920

File tree

4 files changed

+6
-12
lines changed

4 files changed

+6
-12
lines changed

client/dashboard/app/router.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ const siteSettingsRoute = createRoute( {
112112
} ).lazy( () =>
113113
import( '../sites/settings' ).then( ( d ) =>
114114
createLazyRoute( 'site-settings' )( {
115-
component: d.default,
115+
component: () => <d.default siteSlug={ siteRoute.useParams().siteSlug } />,
116116
} )
117117
)
118118
);
@@ -125,7 +125,7 @@ const siteSettingsSiteVisibilityRoute = createRoute( {
125125
} ).lazy( () =>
126126
import( '../sites/settings-site-visibility' ).then( ( d ) =>
127127
createLazyRoute( 'site-settings-site-visibility' )( {
128-
component: d.default,
128+
component: () => <d.default siteSlug={ siteRoute.useParams().siteSlug } />,
129129
} )
130130
)
131131
);
@@ -138,7 +138,7 @@ const siteSettingsSubscriptionGiftingRoute = createRoute( {
138138
} ).lazy( () =>
139139
import( '../sites/settings-subscription-gifting' ).then( ( d ) =>
140140
createLazyRoute( 'site-settings-subscription-gifting' )( {
141-
component: d.default,
141+
component: () => <d.default siteSlug={ siteRoute.useParams().siteSlug } />,
142142
} )
143143
)
144144
);

client/dashboard/sites/settings-site-visibility/index.tsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,12 @@ import { useQuery, useMutation } from '@tanstack/react-query';
22
import { Card, CardBody } from '@wordpress/components';
33
import { __ } from '@wordpress/i18n';
44
import { siteQuery, siteSettingsMutation, siteSettingsQuery } from '../../app/queries';
5-
import { siteSettingsSiteVisibilityRoute } from '../../app/router';
65
import PageLayout from '../../components/page-layout';
76
import SettingsPageHeader from '../settings-page-header';
87
import { LaunchForm } from './launch-form';
98
import { PrivacyForm } from './privacy-form';
109

11-
export default function SiteVisibilitySettings() {
12-
const { siteSlug } = siteSettingsSiteVisibilityRoute.useParams();
10+
export default function SiteVisibilitySettings( { siteSlug }: { siteSlug: string } ) {
1311
const { data: siteData } = useQuery( siteQuery( siteSlug ) );
1412
const { data: settings } = useQuery( siteSettingsQuery( siteSlug ) );
1513
const mutation = useMutation( siteSettingsMutation( siteSlug ) );

client/dashboard/sites/settings-subscription-gifting/index.tsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import { notFound } from '@tanstack/react-router';
44
import { Card, CardBody, ToggleControl } from '@wordpress/components';
55
import { __ } from '@wordpress/i18n';
66
import { siteQuery, siteSettingsMutation, siteSettingsQuery } from '../../app/queries';
7-
import { siteSettingsSubscriptionGiftingRoute } from '../../app/router';
87
import PageLayout from '../../components/page-layout';
98
import SettingsPageHeader from '../settings-page-header';
109
import { hasSubscriptionGiftingFeature } from './utils';
@@ -36,8 +35,7 @@ const form = {
3635
fields,
3736
};
3837

39-
export default function SubscriptionGiftingSettings() {
40-
const { siteSlug } = siteSettingsSubscriptionGiftingRoute.useParams();
38+
export default function SubscriptionGiftingSettings( { siteSlug }: { siteSlug: string } ) {
4139
const { data: siteData } = useQuery( siteQuery( siteSlug ) );
4240
const { data } = useQuery( siteSettingsQuery( siteSlug ) );
4341
const mutation = useMutation( siteSettingsMutation( siteSlug ) );

client/dashboard/sites/settings/index.tsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,12 @@ import {
66
} from '@wordpress/components';
77
import { __ } from '@wordpress/i18n';
88
import { siteQuery, siteSettingsQuery } from '../../app/queries';
9-
import { siteRoute } from '../../app/router';
109
import { PageHeader } from '../../components/page-header';
1110
import PageLayout from '../../components/page-layout';
1211
import SiteVisibilitySettingsSummary from '../settings-site-visibility/summary';
1312
import SubscriptionGiftingSettingsSummary from '../settings-subscription-gifting/summary';
1413

15-
export default function SiteSettings() {
16-
const { siteSlug } = siteRoute.useParams();
14+
export default function SiteSettings( { siteSlug }: { siteSlug: string } ) {
1715
const { data: siteData } = useQuery( siteQuery( siteSlug ) );
1816
const { data: settings } = useQuery( siteSettingsQuery( siteSlug ) );
1917

0 commit comments

Comments
 (0)