Fixes and improvements for selecting WP version #1189
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
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,27 @@ | ||
| import semver from 'semver'; | ||
|
|
||
| type Option = { label: string; value: string }; | ||
|
|
||
| export const addWpVersionToList = ( newOption: Option, options: Option[] ): Option[] => { | ||
|
Contributor
Author
There was a problem hiding this comment.
|
||
| const currentVer = semver.coerce( newOption.value ); | ||
|
|
||
| // Being extra cautious here, if the version is not valid, we add it to the end of the list. | ||
| if ( ! currentVer ) { | ||
| return [ ...options, newOption ]; | ||
| } | ||
|
|
||
| const firstOlderVersionIndex = options.findIndex( ( compareVersion ) => { | ||
| const compareVer = semver.coerce( compareVersion.value ); | ||
| return compareVer && semver.gt( currentVer, compareVer ); | ||
| } ); | ||
|
|
||
| if ( firstOlderVersionIndex === -1 ) { | ||
| return [ ...options, newOption ]; | ||
| } else { | ||
| return [ | ||
| ...options.slice( 0, firstOlderVersionIndex ), | ||
| newOption, | ||
| ...options.slice( firstOlderVersionIndex ), | ||
| ]; | ||
| } | ||
| }; | ||
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,121 @@ | ||
| import { SelectControl, Icon } from '@wordpress/components'; | ||
|
Contributor
Author
There was a problem hiding this comment. Now we have separate component which doesn't store any context, so it's already used in 2 places and can be easily reused in the future, w/o extra conditions. |
||
| import { warning } from '@wordpress/icons'; | ||
| import { useI18n } from '@wordpress/react-i18n'; | ||
| import offlineIcon from 'src/components/offline-icon'; | ||
| import { Tooltip } from 'src/components/tooltip'; | ||
| import { useOffline } from 'src/hooks/use-offline'; | ||
| import { cx } from 'src/lib/cx'; | ||
| import { isWordPressDevVersion } from 'src/lib/version-utils'; | ||
| import { isWordPressBetaVersion } from 'src/lib/wordpress-version-utils'; | ||
| import { useGetWordPressVersions } from 'src/stores/wordpress-versions-api'; | ||
| import { DEFAULT_WORDPRESS_VERSION } from 'vendor/wp-now/src/constants'; | ||
| import { addWpVersionToList } from './add-wp-version-to-list'; | ||
|
|
||
| type WPVersionSelectorProps = { | ||
| selectedValue: string; | ||
| onChange: ( version: string ) => void; | ||
| errorMessage?: string | null; | ||
| disabled?: boolean; | ||
| /** Is used if you want to add a custom option to the list, for example the current version of a site */ | ||
| extraOptions?: { label: string; value: string }[]; | ||
| /** Fallback options shown when available versions couldn't be fetched */ | ||
| fallbackOptions: { label: string; value: string }[]; | ||
| }; | ||
|
|
||
| export const WPVersionSelector = ( { | ||
| selectedValue, | ||
| onChange, | ||
| errorMessage, | ||
| disabled = false, | ||
| extraOptions, | ||
| fallbackOptions, | ||
| }: WPVersionSelectorProps ) => { | ||
| const { __ } = useI18n(); | ||
| const isOffline = useOffline(); | ||
| const offlineMessage = __( 'Changing WordPress version requires an internet connection.' ); | ||
| const { data: wpVersions = [] } = useGetWordPressVersions(); | ||
|
|
||
| let betaVersions: { label: string; value: string }[] = wpVersions.filter( | ||
| ( version ) => version.isBeta || version.isDevelopment | ||
| ); | ||
| let stableVersions: { label: string; value: string }[] = wpVersions.filter( | ||
| ( version ) => ! version.isBeta && ! version.isDevelopment && version.value !== 'latest' | ||
| ); | ||
| extraOptions?.forEach( ( extraOption ) => { | ||
| const alreadyExists = wpVersions.some( ( version ) => version.value === extraOption.value ); | ||
| if ( alreadyExists ) { | ||
| return; | ||
| } | ||
|
|
||
| if ( | ||
| isWordPressBetaVersion( extraOption.value ) || | ||
| isWordPressDevVersion( extraOption.value ) | ||
| ) { | ||
| betaVersions = addWpVersionToList( extraOption, betaVersions ); | ||
| } else { | ||
| stableVersions = addWpVersionToList( extraOption, stableVersions ); | ||
| } | ||
| } ); | ||
|
|
||
| return ( | ||
| <label className="flex flex-1 flex-col gap-1.5 leading-4"> | ||
| <span className="font-semibold flex items-center gap-2"> | ||
| { __( 'WordPress version' ) } | ||
| { selectedValue !== 'latest' && ( | ||
| <Tooltip | ||
| text={ __( 'WordPress Core automatic updates will be disabled for this site.' ) } | ||
| placement="top" | ||
| > | ||
| <Icon icon={ warning } size={ 16 } /> | ||
| </Tooltip> | ||
| ) } | ||
| </span> | ||
| <Tooltip | ||
| disabled={ ! isOffline } | ||
| icon={ offlineIcon } | ||
| text={ offlineMessage } | ||
| placement="top-start" | ||
| className="flex flex-1 flex-col" | ||
| > | ||
| <SelectControl | ||
| className={ cx( errorMessage && 'error-select-control' ) } | ||
| disabled={ disabled || isOffline } | ||
| value={ selectedValue } | ||
| onChange={ onChange } | ||
| __next40pxDefaultSize | ||
| __nextHasNoMarginBottom | ||
| > | ||
| { wpVersions.length > 0 ? ( | ||
| <> | ||
| <optgroup label={ __( 'Auto-updating' ) }> | ||
| <option key={ DEFAULT_WORDPRESS_VERSION } value={ DEFAULT_WORDPRESS_VERSION }> | ||
| { __( 'latest' ) } | ||
| </option> | ||
| </optgroup> | ||
| <optgroup label={ __( 'Beta & Nightly' ) }> | ||
| { betaVersions.map( ( { label, value } ) => ( | ||
| <option key={ value } value={ value }> | ||
| { label } | ||
| </option> | ||
| ) ) } | ||
| </optgroup> | ||
| <optgroup label={ __( 'Stable Versions' ) }> | ||
| { stableVersions.map( ( { label, value } ) => ( | ||
| <option key={ value } value={ value }> | ||
| { label } | ||
| </option> | ||
| ) ) } | ||
| </optgroup> | ||
| </> | ||
| ) : ( | ||
| fallbackOptions.map( ( { label, value } ) => ( | ||
| <option key={ value } value={ value }> | ||
| { label } | ||
| </option> | ||
| ) ) | ||
| ) } | ||
| </SelectControl> | ||
| </Tooltip> | ||
| </label> | ||
| ); | ||
| }; | ||
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.
Nice! A single component 💪