-
Notifications
You must be signed in to change notification settings - Fork 86
Add multisite warning to push dialog for WordPress.com targets #2991
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
18065dd
Add multisite warning to push dialog for WordPress.com targets
bcotrim 8877b55
Add getIsMultisite mock to sync test suite
bcotrim f3fac04
Add multisite warning to preview sites and fix sync dialog padding
bcotrim 0f71438
Merge trunk and resolve sync-dialog conflict
bcotrim File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,13 @@ | ||
| import { useCallback, useEffect, useState } from 'react'; | ||
| import { getIpcApi } from 'src/lib/get-ipc-api'; | ||
|
|
||
| export function useIsMultisite( site: SiteDetails ) { | ||
| const [ isMultisite, setIsMultisite ] = useState( false ); | ||
| const refresh = useCallback( () => { | ||
| void getIpcApi().getIsMultisite( site.id ).then( setIsMultisite ); | ||
| }, [ site.id ] ); | ||
| useEffect( () => { | ||
| refresh(); | ||
| }, [ site.running, refresh ] ); | ||
| return isMultisite; | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,12 @@ | ||
| import fs from 'fs'; | ||
| import nodePath from 'path'; | ||
|
|
||
| export function isMultisite( wordPressPath: string ): boolean { | ||
| let configContent = ''; | ||
| try { | ||
| configContent = fs.readFileSync( nodePath.join( wordPressPath, 'wp-config.php' ), 'utf8' ); | ||
| } catch ( err ) { | ||
| return false; | ||
| } | ||
| return /define\(\s*['"]MULTISITE['"]\s*,\s*true\s*\)/.test( configContent ); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| import fs from 'fs'; | ||
| import nodePath from 'path'; | ||
| import { vi } from 'vitest'; | ||
| import { isMultisite } from '../is-multisite'; | ||
|
|
||
| vi.mock( 'fs' ); | ||
|
|
||
| const mockedFs = vi.mocked( fs ); | ||
|
|
||
| describe( 'isMultisite', () => { | ||
| const wordPressPath = '/path/to/wordpress'; | ||
| const wpConfigPath = nodePath.join( wordPressPath, 'wp-config.php' ); | ||
|
|
||
| beforeEach( () => { | ||
| vi.resetAllMocks(); | ||
| } ); | ||
|
|
||
| it( 'returns true when MULTISITE is defined as true with single quotes', () => { | ||
| mockedFs.readFileSync.mockReturnValue( "define( 'MULTISITE', true );" ); | ||
| expect( isMultisite( wordPressPath ) ).toBe( true ); | ||
| expect( mockedFs.readFileSync ).toHaveBeenCalledWith( wpConfigPath, 'utf8' ); | ||
| } ); | ||
|
|
||
| it( 'returns true when MULTISITE is defined as true with double quotes', () => { | ||
| mockedFs.readFileSync.mockReturnValue( 'define( "MULTISITE", true );' ); | ||
| expect( isMultisite( wordPressPath ) ).toBe( true ); | ||
| } ); | ||
|
|
||
| it( 'returns true when MULTISITE is defined without spaces', () => { | ||
| mockedFs.readFileSync.mockReturnValue( "define('MULTISITE',true);" ); | ||
| expect( isMultisite( wordPressPath ) ).toBe( true ); | ||
| } ); | ||
|
|
||
| it( 'returns false when MULTISITE is not present', () => { | ||
| mockedFs.readFileSync.mockReturnValue( "define( 'DB_NAME', 'wordpress' );" ); | ||
| expect( isMultisite( wordPressPath ) ).toBe( false ); | ||
| } ); | ||
|
|
||
| it( 'returns false when MULTISITE is set to false', () => { | ||
| mockedFs.readFileSync.mockReturnValue( "define( 'MULTISITE', false );" ); | ||
| expect( isMultisite( wordPressPath ) ).toBe( false ); | ||
| } ); | ||
|
|
||
| it( 'returns false when wp-config.php does not exist', () => { | ||
| mockedFs.readFileSync.mockImplementation( () => { | ||
| throw new Error( 'ENOENT: no such file or directory' ); | ||
| } ); | ||
| expect( isMultisite( wordPressPath ) ).toBe( false ); | ||
| } ); | ||
|
|
||
| it( 'returns true within a full wp-config.php file', () => { | ||
| const fullConfig = `<?php | ||
| define( 'DB_NAME', 'database_name_here' ); | ||
| define( 'WP_ALLOW_MULTISITE', true ); | ||
| define( 'MULTISITE', true ); | ||
| define( 'SUBDOMAIN_INSTALL', false ); | ||
| `; | ||
| mockedFs.readFileSync.mockReturnValue( fullConfig ); | ||
| expect( isMultisite( wordPressPath ) ).toBe( true ); | ||
| } ); | ||
| } ); |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I am not sure if it is me but this is looking slightly misaligned for me by a couple of pixels:
e.g. Hide and Show seem slightly higher than the warning