Skip to content

Commit 8cbf951

Browse files
okmttdhrokmttdhr
committed
/sites/settings/administration -> /sites/settings/site
1 parent 39582ad commit 8cbf951

File tree

8 files changed

+19
-23
lines changed

8 files changed

+19
-23
lines changed

‎client/my-sites/site-settings/index.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ export default function () {
5858
const isDuplicateViewsExperiment = true;
5959
if ( isEnabled( 'untangling/hosting-menu' ) || isDuplicateViewsExperiment ) {
6060
page( '/settings/delete-site/:site', ( context ) => {
61-
page.redirect( `/sites/settings/administration/${ context.params.site }/delete-site` );
61+
page.redirect( `/sites/settings/site/${ context.params.site }/delete-site` );
6262
} );
6363
} else {
6464
page(
@@ -91,9 +91,9 @@ export default function () {
9191
clientRender
9292
);
9393

94-
if ( isEnabled( 'untangling/hosting-menu' ) || true ) {
94+
if ( isEnabled( 'untangling/hosting-menu' ) || isDuplicateViewsExperiment ) {
9595
page( '/settings/start-over/:site', ( context ) => {
96-
page.redirect( `/sites/settings/administration/${ context.params.site }/reset-site` );
96+
page.redirect( `/sites/settings/site/${ context.params.site }/reset-site` );
9797
} );
9898
} else {
9999
page(
@@ -118,9 +118,9 @@ export default function () {
118118
clientRender
119119
);
120120

121-
if ( isEnabled( 'untangling/hosting-menu' ) || true ) {
121+
if ( isEnabled( 'untangling/hosting-menu' ) || isDuplicateViewsExperiment ) {
122122
page( '/settings/start-site-transfer/:site', ( context ) => {
123-
page.redirect( `/sites/settings/administration/${ context.params.site }/transfer-site` );
123+
page.redirect( `/sites/settings/site/${ context.params.site }/transfer-site` );
124124
} );
125125
} else {
126126
page(

‎client/sites/components/site-preview-pane/constants.ts

+4-4
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,10 @@ export const FEATURE_TO_ROUTE_MAP: { [ feature: string ]: string } = {
5959
[ TOOLS_DATABASE ]: 'sites/tools/database/:site',
6060
[ TOOLS ]: 'sites/tools/:site',
6161
[ SETTINGS_SITE ]: 'sites/settings/site/:site',
62-
[ SETTINGS_ADMINISTRATION ]: 'sites/settings/administration/:site',
63-
[ SETTINGS_ADMINISTRATION_RESET_SITE ]: 'sites/settings/administration/:site/reset-site',
64-
[ SETTINGS_ADMINISTRATION_TRANSFER_SITE ]: 'sites/settings/administration/:site/transfer-site',
65-
[ SETTINGS_ADMINISTRATION_DELETE_SITE ]: 'sites/settings/administration/:site/delete-site',
62+
[ SETTINGS_ADMINISTRATION ]: 'sites/settings/site/:site',
63+
[ SETTINGS_ADMINISTRATION_RESET_SITE ]: 'sites/settings/site/:site/reset-site',
64+
[ SETTINGS_ADMINISTRATION_TRANSFER_SITE ]: 'sites/settings/site/:site/transfer-site',
65+
[ SETTINGS_ADMINISTRATION_DELETE_SITE ]: 'sites/settings/site/:site/delete-site',
6666
[ SETTINGS_AGENCY ]: 'sites/settings/agency/:site',
6767
[ SETTINGS_CACHING ]: 'sites/settings/caching/:site',
6868
[ SETTINGS_WEB_SERVER ]: 'sites/settings/web-server/:site',

‎client/sites/settings/administration/controller.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,6 @@ export function redirectIfCantStartSiteOwnerTransfer( context: PageJSContext, ne
5454

5555
function redirectToAdministration( siteSlug: string | null ) {
5656
return isHostingMenuUntangled()
57-
? page.redirect( '/sites/settings/administration/' + siteSlug )
57+
? page.redirect( '/sites/settings/site/' + siteSlug )
5858
: page.redirect( '/settings/general/' + siteSlug );
5959
}

‎client/sites/settings/administration/tools/delete-site/index.jsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,7 @@ class DeleteSite extends Component {
170170

171171
_goBack = () => {
172172
const { siteSlug } = this.props;
173-
const source = isHostingMenuUntangled()
174-
? '/sites/settings/administration'
175-
: getSettingsSource();
173+
const source = isHostingMenuUntangled() ? '/sites/settings/site' : getSettingsSource();
176174

177175
page( `${ source }/${ siteSlug }` );
178176
};

‎client/sites/settings/administration/tools/index.jsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ class SiteTools extends Component {
6464
const changeAddressLink = `/domains/manage/${ siteSlug }?source=${ source }`;
6565

6666
const startOverLink = isUntangled
67-
? `/sites/settings/administration/${ siteSlug }/reset-site`
67+
? `/sites/settings/site/${ siteSlug }/reset-site`
6868
: `/settings/start-over/${ siteSlug }?source=${ source }`;
6969

7070
const restorePlanSoftwareTitle = translate( 'Restore plugins and themes' );
@@ -73,11 +73,11 @@ class SiteTools extends Component {
7373
);
7474

7575
const startSiteTransferLink = isUntangled
76-
? `/sites/settings/administration/${ siteSlug }/transfer-site`
76+
? `/sites/settings/site/${ siteSlug }/transfer-site`
7777
: `/settings/start-site-transfer/${ siteSlug }?source=${ source }`;
7878

7979
const deleteSiteLink = isUntangled
80-
? `/sites/settings/administration/${ siteSlug }/delete-site`
80+
? `/sites/settings/site/${ siteSlug }/delete-site`
8181
: `/settings/delete-site/${ siteSlug }?source=${ source }`;
8282

8383
const manageConnectionLink = `/settings/manage-connection/${ siteSlug }?source=${ source }`;

‎client/sites/settings/administration/tools/reset-site/index.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ function SiteResetCard( {
4949
const isUntangled = isHostingMenuUntangled();
5050

5151
const title = isUntangled ? translate( 'Reset site' ) : translate( 'Site Reset' );
52-
const source = isUntangled ? '/sites/settings/administration' : getSettingsSource();
52+
const source = isUntangled ? '/sites/settings/site' : getSettingsSource();
5353

5454
const checkStatus = async () => {
5555
if ( status?.status !== 'completed' && isAtomic ) {

‎client/sites/settings/administration/tools/transfer-site/index.tsx

+1-3
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,7 @@ const SiteOwnerTransfer = () => {
8383
if ( ! pendingDomain && newSiteOwner && ! transferSiteSuccess ) {
8484
setNewSiteOwner( null );
8585
} else {
86-
const source = isHostingMenuUntangled()
87-
? '/sites/settings/administration'
88-
: getSettingsSource();
86+
const source = isHostingMenuUntangled() ? '/sites/settings/site' : getSettingsSource();
8987
page( `${ source }/${ selectedSite.slug }` );
9088
}
9189
};

‎client/sites/settings/index.tsx

+3-3
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ export default function () {
4848
clientRender
4949
);
5050
page(
51-
'/sites/settings/administration/:site/reset-site',
51+
'/sites/settings/site/:site/reset-site',
5252
siteSelection,
5353
redirectIfCantDeleteSite,
5454
navigation,
@@ -58,7 +58,7 @@ export default function () {
5858
clientRender
5959
);
6060
page(
61-
'/sites/settings/administration/:site/transfer-site',
61+
'/sites/settings/site/:site/transfer-site',
6262
siteSelection,
6363
redirectIfCantStartSiteOwnerTransfer,
6464
navigation,
@@ -68,7 +68,7 @@ export default function () {
6868
clientRender
6969
);
7070
page(
71-
'/sites/settings/administration/:site/delete-site',
71+
'/sites/settings/site/:site/delete-site',
7272
siteSelection,
7373
redirectIfCantDeleteSite,
7474
navigation,

0 commit comments

Comments
 (0)