Skip to content

Commit 6a82453

Browse files
Dashboard: Moved decentralized feature functions into share util.
1 parent 6003197 commit 6a82453

File tree

15 files changed

+39
-47
lines changed

15 files changed

+39
-47
lines changed

client/dashboard/app/router.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,13 @@ import {
66
createLazyRoute,
77
} from '@tanstack/react-router';
88
import { fetchTwoStep } from '../data';
9-
import { canUpdateDefensiveMode } from '../sites/settings-defensive-mode';
10-
import { canUpdatePHPVersion } from '../sites/settings-php/utils';
11-
import { canGetPrimaryDataCenter } from '../sites/settings-primary-data-center';
12-
import { canSetStaticFile404Handling } from '../sites/settings-static-file-404';
13-
import { canUpdateWordPressVersion } from '../sites/settings-wordpress/utils';
9+
import {
10+
canUpdatePHPVersion,
11+
canUpdateDefensiveMode,
12+
canUpdateWordPressVersion,
13+
canGetPrimaryDataCenter,
14+
canSetStaticFile404Handling,
15+
} from '../utils/site-features';
1416
import NotFound from './404';
1517
import UnknownError from './500';
1618
import {

client/dashboard/sites/settings-database/index.tsx

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,11 @@ import { useState } from 'react';
1818
import { siteQuery } from '../../app/queries';
1919
import PageLayout from '../../components/page-layout';
2020
import { fetchPhpMyAdminToken } from '../../data';
21+
import { canAccessPhpMyAdmin } from '../../utils/site-features';
2122
import SettingsCallout from '../settings-callout';
2223
import SettingsPageHeader from '../settings-page-header';
2324
import calloutIllustrationUrl from './callout-illustration.svg';
2425
import ResetPasswordModal from './reset-password-modal';
25-
import type { Site } from '../../data/types';
26-
27-
export function canOpenPhpMyAdmin( site: Site ) {
28-
return site.is_wpcom_atomic;
29-
}
3026

3127
export default function SiteDatabaseSettings( { siteSlug }: { siteSlug: string } ) {
3228
const { data: site } = useQuery( siteQuery( siteSlug ) );
@@ -38,7 +34,7 @@ export default function SiteDatabaseSettings( { siteSlug }: { siteSlug: string }
3834
return null;
3935
}
4036

41-
if ( ! canOpenPhpMyAdmin( site ) ) {
37+
if ( ! canAccessPhpMyAdmin( site ) ) {
4238
return (
4339
<PageLayout
4440
size="small"

client/dashboard/sites/settings-defensive-mode/index.tsx

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,11 @@ import { useState } from 'react';
1818
import { siteQuery, siteDefensiveModeQuery, siteDefensiveModeMutation } from '../../app/queries';
1919
import Notice from '../../components/notice';
2020
import PageLayout from '../../components/page-layout';
21+
import { canUpdateDefensiveMode } from '../../utils/site-features';
2122
import SettingsPageHeader from '../settings-page-header';
22-
import type { DefensiveModeSettingsUpdate, Site } from '../../data/types';
23+
import type { DefensiveModeSettingsUpdate } from '../../data/types';
2324
import type { Field } from '@automattic/dataviews';
2425

25-
export function canUpdateDefensiveMode( site: Site ) {
26-
return site.is_wpcom_atomic;
27-
}
28-
2926
const availableTtls = [
3027
{
3128
label: __( '1 hour' ),

client/dashboard/sites/settings-defensive-mode/summary.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import { __ } from '@wordpress/i18n';
44
import { shield } from '@wordpress/icons';
55
import { siteDefensiveModeQuery } from '../../app/queries';
66
import RouterLinkSummaryButton from '../../components/router-link-summary-button';
7-
import { canUpdateDefensiveMode } from '.';
7+
import { canUpdateDefensiveMode } from '../../utils/site-features';
88
import type { Site } from '../../data/types';
99
import type { Density } from '@automattic/components/src/summary-button/types';
1010

client/dashboard/sites/settings-php/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ import { useState } from 'react';
1414
import { getPHPVersions } from 'calypso/data/php-versions';
1515
import { siteQuery, sitePHPVersionQuery, sitePHPVersionMutation } from '../../app/queries';
1616
import PageLayout from '../../components/page-layout';
17+
import { canUpdatePHPVersion } from '../../utils/site-features';
1718
import SettingsCallout from '../settings-callout';
1819
import SettingsPageHeader from '../settings-page-header';
19-
import { canUpdatePHPVersion } from './utils';
2020
import type { Field } from '@automattic/dataviews';
2121

2222
export default function PHPVersionSettings( { siteSlug }: { siteSlug: string } ) {

client/dashboard/sites/settings-php/summary.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { code } from '@wordpress/icons';
55
import { getPHPVersions } from 'calypso/data/php-versions';
66
import { sitePHPVersionQuery } from '../../app/queries';
77
import RouterLinkSummaryButton from '../../components/router-link-summary-button';
8-
import { canUpdatePHPVersion } from './utils';
8+
import { canUpdatePHPVersion } from '../../utils/site-features';
99
import type { Site } from '../../data/types';
1010
import type { Density } from '@automattic/components/src/summary-button/types';
1111

client/dashboard/sites/settings-php/utils.tsx

Lines changed: 0 additions & 5 deletions
This file was deleted.

client/dashboard/sites/settings-primary-data-center/index.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,8 @@ import { cloud } from '@wordpress/icons';
77
import { getDataCenterOptions } from 'calypso/data/data-center';
88
import { siteQuery, sitePrimaryDataCenterQuery } from '../../app/queries';
99
import PageLayout from '../../components/page-layout';
10+
import { canGetPrimaryDataCenter } from '../../utils/site-features';
1011
import SettingsPageHeader from '../settings-page-header';
11-
import type { Site } from '../../data/types';
12-
13-
export function canGetPrimaryDataCenter( site: Site ) {
14-
return site.is_wpcom_atomic;
15-
}
1612

1713
export default function PrimaryDataCenterSettings( { siteSlug }: { siteSlug: string } ) {
1814
const router = useRouter();

client/dashboard/sites/settings-primary-data-center/summary.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import { cloud } from '@wordpress/icons';
55
import { getDataCenterOptions } from 'calypso/data/data-center';
66
import { sitePrimaryDataCenterQuery } from '../../app/queries';
77
import RouterLinkSummaryButton from '../../components/router-link-summary-button';
8-
import { canGetPrimaryDataCenter } from './index';
8+
import { canGetPrimaryDataCenter } from '../../utils/site-features';
99
import type { Site } from '../../data/types';
1010
import type { Density } from '@automattic/components/src/summary-button/types';
1111

client/dashboard/sites/settings-static-file-404/index.tsx

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,11 @@ import { store as noticesStore } from '@wordpress/notices';
1313
import { useState } from 'react';
1414
import { siteQuery, siteStaticFile404Query, siteStaticFile404Mutation } from '../../app/queries';
1515
import PageLayout from '../../components/page-layout';
16+
import { canSetStaticFile404Handling } from '../../utils/site-features';
1617
import SettingsCallout from '../settings-callout';
1718
import SettingsPageHeader from '../settings-page-header';
18-
import type { Site } from '../../data/types';
1919
import type { Field } from '@automattic/dataviews';
2020

21-
export function canSetStaticFile404Handling( site: Site ) {
22-
return site.is_wpcom_atomic;
23-
}
24-
2521
const fields: Field< { setting: string } >[] = [
2622
{
2723
id: 'setting',

client/dashboard/sites/settings-wordpress/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ import {
2020
} from '../../app/queries';
2121
import Notice from '../../components/notice';
2222
import PageLayout from '../../components/page-layout';
23+
import { canUpdateWordPressVersion } from '../../utils/site-features';
2324
import { getFormattedWordPressVersion } from '../../utils/wp-version';
2425
import SettingsPageHeader from '../settings-page-header';
25-
import { canUpdateWordPressVersion } from './utils';
2626
import type { Field } from '@automattic/dataviews';
2727

2828
export default function WordPressVersionSettings( { siteSlug }: { siteSlug: string } ) {

client/dashboard/sites/settings-wordpress/summary.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ import { Icon } from '@wordpress/components';
33
import { wordpress } from '@wordpress/icons';
44
import { siteWordPressVersionQuery } from '../../app/queries';
55
import RouterLinkSummaryButton from '../../components/router-link-summary-button';
6+
import { canUpdateWordPressVersion } from '../../utils/site-features';
67
import { getFormattedWordPressVersion } from '../../utils/wp-version';
7-
import { canUpdateWordPressVersion } from './utils';
88
import type { Site } from '../../data/types';
99
import type { Density } from '@automattic/components/src/summary-button/types';
1010

client/dashboard/sites/settings-wordpress/utils.ts

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
import type { Site } from '../data/types';
2+
3+
export const canUpdatePHPVersion = ( site: Site ): boolean => site.is_wpcom_atomic;
4+
5+
export const canUpdateDefensiveMode = ( site: Site ): boolean => site.is_wpcom_atomic;
6+
7+
export const canAccessPhpMyAdmin = ( site: Site ): boolean => site.is_wpcom_atomic;
8+
9+
export const canUpdateWordPressVersion = ( site: Site ): boolean => site.is_wpcom_staging_site;
10+
11+
export const canSetStaticFile404Handling = ( site: Site ): boolean => site.is_wpcom_atomic;
12+
13+
export const canGetPrimaryDataCenter = ( site: Site ): boolean => site.is_wpcom_atomic;

client/sites/settings/v2/router.tsx

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,13 @@ import {
1818
siteWordPressVersionQuery,
1919
} from 'calypso/dashboard/app/queries';
2020
import { queryClient } from 'calypso/dashboard/app/query-client';
21-
import { canUpdateDefensiveMode } from 'calypso/dashboard/sites/settings-defensive-mode';
22-
import { canUpdatePHPVersion } from 'calypso/dashboard/sites/settings-php/utils';
23-
import { canGetPrimaryDataCenter } from 'calypso/dashboard/sites/settings-primary-data-center';
24-
import { canSetStaticFile404Handling } from 'calypso/dashboard/sites/settings-static-file-404';
25-
import { canUpdateWordPressVersion } from 'calypso/dashboard/sites/settings-wordpress/utils';
21+
import {
22+
canGetPrimaryDataCenter,
23+
canSetStaticFile404Handling,
24+
canUpdatePHPVersion,
25+
canUpdateDefensiveMode,
26+
canUpdateWordPressVersion,
27+
} from 'calypso/dashboard/utils/site-features';
2628
import Root from './root';
2729

2830
const rootRoute = createRootRoute( { component: Root } );

0 commit comments

Comments
 (0)