+
+
{ __( 'Add Plugin', 'oneupdate' ) }
-
- { __( 'Choose how you want to add a plugin to your sites.', 'oneupdate' ) }
+
+ { __(
+ 'Choose how you want to add a plugin to your sites.',
+ 'oneupdate'
+ ) }
{
setAddPluginType( 'public' );
setShowBackButton( true );
- setGlobalNotice( { status: '', message: '' } );
+ setGlobalNotice( {
+ status: '',
+ message: '',
+ } );
} }
style={ {
cursor: 'pointer',
borderRadius: '12px',
- boxShadow: '0 2px 8px rgba(0, 0, 0, 0.1)',
+ boxShadow:
+ '0 2px 8px rgba(0, 0, 0, 0.1)',
} }
>
- { __( 'Public Plugin', 'oneupdate' ) }
- { __( 'Add a plugin from the WordPress.org repository.', 'oneupdate' ) }
+
+ { __(
+ 'Public Plugin',
+ 'oneupdate'
+ ) }
+
+
+ { __(
+ 'Add a plugin from the WordPress.org repository.',
+ 'oneupdate'
+ ) }
+
{
if ( isValidS3Credentials === false ) {
setGlobalNotice( {
status: 'error',
- message: __( 'Invalid S3 credentials. Please check your settings.', 'oneupdate' ),
+ message: __(
+ 'Invalid S3 credentials. Please check your settings.',
+ 'oneupdate'
+ ),
} );
return;
}
setAddPluginType( 'private' );
setShowBackButton( true );
- setGlobalNotice( { status: '', message: '' } );
+ setGlobalNotice( {
+ status: '',
+ message: '',
+ } );
} }
style={ {
cursor: 'pointer',
borderRadius: '12px',
- boxShadow: '0 2px 8px rgba(0, 0, 0, 0.1)',
+ boxShadow:
+ '0 2px 8px rgba(0, 0, 0, 0.1)',
} }
disabled={ isValidS3Credentials === false }
>
- { __( 'Private Plugin', 'oneupdate' ) }
- { __( 'Upload a custom plugin from your computer.', 'oneupdate' ) }
+
+ { __(
+ 'Private Plugin',
+ 'oneupdate'
+ ) }
+
+
+ { __(
+ 'Upload a custom plugin from your computer.',
+ 'oneupdate'
+ ) }
+
@@ -1049,7 +1360,10 @@ const PluginManager = () => {
setShowBackButton( true );
setGlobalNotice( { status: '', message: '' } );
} }
- style={ { marginBottom: '16px', marginTop: '16px' } }
+ style={ {
+ marginBottom: '16px',
+ marginTop: '16px',
+ } }
>
{ __( 'Back', 'oneupdate' ) }
@@ -1076,7 +1390,10 @@ const PluginManager = () => {
setShowBackButton( true );
setGlobalNotice( { status: '', message: '' } );
} }
- style={ { marginBottom: '16px', marginTop: '16px' } }
+ style={ {
+ marginBottom: '16px',
+ marginTop: '16px',
+ } }
>
{ __( 'Back', 'oneupdate' ) }
@@ -1099,11 +1416,25 @@ const PluginManager = () => {
- { loadingProgress.message || __( 'Loading plugins…', 'oneupdate' ) }
+
+ { loadingProgress.message ||
+ __( 'Loading plugins…', 'oneupdate' ) }
{ loadingProgress.total > 0 && (
-
+
{
style={ {
background: '#3858e9',
height: '100%',
- width: `${ ( loadingProgress.current / loadingProgress.total ) * 100 }%`,
+ width: `${
+ ( loadingProgress.current /
+ loadingProgress.total ) *
+ 100
+ }%`,
transition: 'width 0.3s ease',
} }
/>
-
- { loadingProgress.current } of { loadingProgress.total }
+
+ { loadingProgress.current } of{ ' ' }
+ { loadingProgress.total }
) }
@@ -1131,18 +1473,31 @@ const PluginManager = () => {
}
const totalPlugins = Object.keys( combinedPluginsBySlug ).length;
- const activePlugins = Object.values( combinedPluginsBySlug ).filter( ( p ) => p.active_sites > 0 ).length;
- const updatesAvailable = Object.values( combinedPluginsBySlug ).filter( ( p ) => p.update_available_sites > 0 ).length;
- const privatePlugins = Object.values( combinedPluginsBySlug ).filter( ( p ) => ! p.plugin_info.is_public ).length;
+ const activePlugins = Object.values( combinedPluginsBySlug ).filter(
+ ( p ) => p.active_sites > 0
+ ).length;
+ const updatesAvailable = Object.values( combinedPluginsBySlug ).filter(
+ ( p ) => p.update_available_sites > 0
+ ).length;
+ const privatePlugins = Object.values( combinedPluginsBySlug ).filter(
+ ( p ) => ! p.plugin_info.is_public
+ ).length;
return (
<>
- { globalNotice.message && actionLoading === false && (
- globalNotice.type !== 'snackbar' ? (
+ { globalNotice.message &&
+ actionLoading === false &&
+ ( globalNotice.type !== 'snackbar' ? (
setGlobalNotice( { status: '', isDismissible: false, message: '' } ) }
+ onRemove={ () =>
+ setGlobalNotice( {
+ status: '',
+ isDismissible: false,
+ message: '',
+ } )
+ }
style={ { marginBottom: '20px' } }
type={ globalNotice.type || 'default' }
>
@@ -1152,15 +1507,24 @@ const PluginManager = () => {
setGlobalNotice( { status: '', isDismissible: false, message: '' } ) }
+ onRemove={ () =>
+ setGlobalNotice( {
+ status: '',
+ isDismissible: false,
+ message: '',
+ } )
+ }
style={ { marginBottom: '20px' } }
type={ globalNotice.type || 'default' }
- className={ globalNotice?.status === 'error' ? 'oneupdate-error-notice' : 'oneupdate-success-notice' }
+ className={
+ globalNotice?.status === 'error'
+ ? 'oneupdate-error-notice'
+ : 'oneupdate-success-notice'
+ }
>
{ globalNotice.message }
- )
- ) }
+ ) ) }
{ showAddPluginModal ? (
- { __( 'Manage plugins across all your WordPress sites', 'oneupdate' ) }
+
+ { __(
+ 'Manage plugins across all your WordPress sites',
+ 'oneupdate'
+ ) }
@@ -1197,9 +1574,16 @@ const PluginManager = () => {
@@ -1220,32 +1604,62 @@ const PluginManager = () => {
<>
-
+
{ [
- { value: totalPlugins, label: 'Total Plugins', color: '#0073aa' },
- { value: activePlugins, label: 'Active', color: '#00a32a' },
- { value: updatesAvailable, label: 'Updates', color: '#dba617' },
- { value: privatePlugins, label: 'Private', color: '#826eb4' },
+ {
+ value: totalPlugins,
+ label: 'Total Plugins',
+ color: '#0073aa',
+ },
+ {
+ value: activePlugins,
+ label: 'Active',
+ color: '#00a32a',
+ },
+ {
+ value: updatesAvailable,
+ label: 'Updates',
+ color: '#dba617',
+ },
+ {
+ value: privatePlugins,
+ label: 'Private',
+ color: '#826eb4',
+ },
].map( ( stat, index ) => (
{
- e.currentTarget.style.transform = 'translateY(-2px)';
- e.currentTarget.style.boxShadow = '0 8px 25px rgba(0, 0, 0, 0.12)';
+ e.currentTarget.style.transform =
+ 'translateY(-2px)';
+ e.currentTarget.style.boxShadow =
+ '0 8px 25px rgba(0, 0, 0, 0.12)';
} }
onMouseLeave={ ( e ) => {
- e.currentTarget.style.transform = 'translateY(0)';
- e.currentTarget.style.boxShadow = '0 2px 8px rgba(0, 0, 0, 0.08)';
+ e.currentTarget.style.transform =
+ 'translateY(0)';
+ e.currentTarget.style.boxShadow =
+ '0 2px 8px rgba(0, 0, 0, 0.08)';
} }
>
-
+
{
>
{ stat.value }
-
+
{ stat.label }
@@ -1278,10 +1698,16 @@ const PluginManager = () => {
{
value={ statusFilter }
onChange={ setStatusFilter }
options={ [
- { label: __( 'All Status', 'oneupdate' ), value: 'all' },
- { label: __( 'Active', 'oneupdate' ), value: 'active' },
- { label: __( 'Inactive', 'oneupdate' ), value: 'inactive' },
+ {
+ label: __(
+ 'All Status',
+ 'oneupdate'
+ ),
+ value: 'all',
+ },
+ {
+ label: __(
+ 'Active',
+ 'oneupdate'
+ ),
+ value: 'active',
+ },
+ {
+ label: __(
+ 'Inactive',
+ 'oneupdate'
+ ),
+ value: 'inactive',
+ },
] }
disabled={ isBulkUpdateProcess }
/>
@@ -1304,9 +1748,27 @@ const PluginManager = () => {
value={ typeFilter }
onChange={ setTypeFilter }
options={ [
- { label: __( 'All Types', 'oneupdate' ), value: 'all' },
- { label: __( 'Public', 'oneupdate' ), value: 'public' },
- { label: __( 'Private', 'oneupdate' ), value: 'private' },
+ {
+ label: __(
+ 'All Types',
+ 'oneupdate'
+ ),
+ value: 'all',
+ },
+ {
+ label: __(
+ 'Public',
+ 'oneupdate'
+ ),
+ value: 'public',
+ },
+ {
+ label: __(
+ 'Private',
+ 'oneupdate'
+ ),
+ value: 'private',
+ },
] }
disabled={ isBulkUpdateProcess }
/>
@@ -1315,23 +1777,52 @@ const PluginManager = () => {
value={ updateFilter }
onChange={ setUpdateFilter }
options={ [
- { label: __( 'All Updates', 'oneupdate' ), value: 'all' },
- { label: __( 'Updates Available', 'oneupdate' ), value: 'available' },
+ {
+ label: __(
+ 'All Updates',
+ 'oneupdate'
+ ),
+ value: 'all',
+ },
+ {
+ label: __(
+ 'Updates Available',
+ 'oneupdate'
+ ),
+ value: 'available',
+ },
] }
disabled={ isBulkUpdateProcess }
/>
{ /* Site specific filter */ }
( {
- label: site.name,
- value: site.url,
- } ) ),
+ {
+ label: __(
+ 'All Sites',
+ 'oneupdate'
+ ),
+ value: 'all',
+ },
+ {
+ label: __(
+ 'Common plugins',
+ 'oneupdate'
+ ),
+ value: 'common-plugins',
+ },
+ ...allAvailableSites.map(
+ ( site ) => ( {
+ label: site.name,
+ value: site.url,
+ } )
+ ),
] }
disabled={ isBulkUpdateProcess }
/>
@@ -1341,11 +1832,19 @@ const PluginManager = () => {
{ /* Results */ }
-
+
{ sprintf(
/* translators: %1$d is the number of filtered plugins, %2$d is the total number of plugins */
__( 'Showing %1$d of %2$d plugins', 'oneupdate' ),
- filteredPlugins.length, totalPlugins,
+ filteredPlugins.length,
+ totalPlugins
) }
@@ -1353,7 +1852,8 @@ const PluginManager = () => {
{
} }
>
{ /* Plugin Header */ }
-
-
+
+
{ plugin.plugin_info.icon ? (
{
borderRadius: '10px',
} }
onError={ ( e ) => {
- e.target.style.display = 'none';
- e.target.nextSibling.style.display = 'flex';
+ e.target.style.display =
+ 'none';
+ e.target.nextSibling.style.display =
+ 'flex';
} }
/>
) : null }
@@ -1412,7 +1935,10 @@ const PluginManager = () => {
style={ {
fontSize: '24px',
color: '#6c757d',
- display: plugin.plugin_info.icon ? 'none' : 'flex',
+ display: plugin.plugin_info
+ .icon
+ ? 'none'
+ : 'flex',
alignItems: 'center',
justifyContent: 'center',
} }
@@ -1432,12 +1958,30 @@ const PluginManager = () => {
whiteSpace: 'nowrap',
} }
>
- { decodeEntities( plugin.plugin_info.name ) }
+ { decodeEntities(
+ plugin.plugin_info.name
+ ) }
-
- by { decodeEntities( plugin.plugin_info.author ) }
+
+ by{ ' ' }
+ { decodeEntities(
+ plugin.plugin_info.author
+ ) }
-
+
{
width: 'max-content',
} }
>
- Current version
+
+ Current version
+
- { plugin.plugin_info.version }
+ {
+ plugin.plugin_info
+ .version
+ }
@@ -1468,7 +2023,9 @@ const PluginManager = () => {
{
fontWeight: '500',
} }
>
- { plugin.plugin_info.is_public
- ? __( 'Public', 'oneupdate' )
- : __( 'Private', 'oneupdate' ) }
+ { plugin.plugin_info
+ .is_public
+ ? __(
+ 'Public',
+ 'oneupdate'
+ )
+ : __(
+ 'Private',
+ 'oneupdate'
+ ) }
@@ -1488,96 +2052,149 @@ const PluginManager = () => {
{ ( { onClose } ) => {
return (
<>
{ /* Change Version - only show for public plugins */ }
- { plugin.plugin_info.is_public && (
+ { plugin.plugin_info
+ .is_public && (
) }
{ /* Activate Plugin - only show if plugin is inactive on some sites */ }
- { plugin.active_sites < plugin.total_sites && (
+ { plugin.active_sites <
+ plugin.total_sites && (
) }
{ /* Deactivate Plugin - only show if plugin is active on some sites */ }
- { plugin.active_sites > 0 && (
+ { plugin.active_sites >
+ 0 && (
) }
-
{ /* Add menu item called install on sites which only shows for public plugin and sites on which current plugin is not present */ }
- { plugin.plugin_info.is_public && getAvailableSitesForAction( plugin, 'install' ).length !== 0 && (
-
- ) }
+ { plugin.plugin_info
+ .is_public &&
+ getAvailableSitesForAction(
+ plugin,
+ 'install'
+ ).length !==
+ 0 && (
+
+ ) }
@@ -1588,7 +2205,9 @@ const PluginManager = () => {
{ /* Plugin Body */ }
-
+
{
overflow: 'hidden',
} }
>
- { decodeEntities( plugin.plugin_info.description ) }
+ { decodeEntities(
+ plugin.plugin_info.description
+ ) }
@@ -1610,72 +2231,127 @@ const PluginManager = () => {
{ /* Status Badge with Tooltip */ }
{ /* Show all sites name if available */ }
- { plugin.sites && Object.keys( plugin.sites ).length > 0 && (
-
+ { plugin.sites &&
+ Object.keys( plugin.sites ).length >
+ 0 && (
- 🌐
- Installed on { Object.keys( plugin.sites ).length } site{ Object.keys( plugin.sites ).length !== 1 ? 's' : '' }
-
-
- { Object.values( plugin.sites ).map( ( site, index ) => (
-
- { site.site_name.trim() }
- { site.is_update_available && (
- ●
- ) }
-
- ) ) }
+
+ 🌐
+ Installed on{ ' ' }
+ {
+ Object.keys(
+ plugin.sites
+ ).length
+ }{ ' ' }
+ site
+ { Object.keys(
+ plugin.sites
+ ).length !== 1
+ ? 's'
+ : '' }
+
+
+ { Object.values(
+ plugin.sites
+ ).map(
+ ( site, index ) => (
+
+ { site.site_name.trim() }
+ { site.is_update_available && (
+
+ ●
+
+ ) }
+
+ )
+ ) }
+
-
- ) }
+ ) }
{ /* Update Notice */ }
{ plugin.update_available_sites > 0 && (
-
+
{
cursor: 'help',
} }
>
-
@@ -1721,220 +2407,479 @@ const PluginManager = () => {
gap: '0',
} }
>
-
+
{ __( 'No plugins found', 'oneupdate' ) }
-
+
{ __(
'No plugins found matching your filters. Try adjusting your search criteria.',
- 'oneupdate',
+ 'oneupdate'
) }
) }
{ /* Site Selection Modal */ }
- { showSiteSelectionModal && selectedPlugin && currentAction && (
- setShowSiteSelectionModal( false ) }
- style={ { maxWidth: '600px', minWidth: '600px' } }
- shouldCloseOnClickOutside={ actionLoading ? false : true }
- >
-
-
- { /* Action Description */ }
-
-
- { decodeEntities( selectedPlugin.plugin_info.name ) }
-
-
- { getActionInfo( currentAction ).description }
-
-
-
- { /* Version Selection for Change Version Action */ }
- { currentAction === 'change-version' && (
+ { showSiteSelectionModal &&
+ selectedPlugin &&
+ currentAction && (
+
+ setShowSiteSelectionModal( false )
+ }
+ style={ {
+ maxWidth: '600px',
+ minWidth: '600px',
+ } }
+ shouldCloseOnClickOutside={
+ actionLoading ? false : true
+ }
+ >
+
+
+ { /* Action Description */ }
- { getAvailableVersions( selectedPlugin ).length > 0 ? (
-
-
- { __( 'No stable versions available for this plugin.', 'oneupdate' ) }
-
-
- ) }
+
+
+ { decodeEntities(
+ selectedPlugin
+ .plugin_info.name
+ ) }
+
+
+
+ {
+ getActionInfo(
+ currentAction
+ ).description
+ }
+
- ) }
- { /* Action is install then show sites on which plugin is not present */ }
+ { /* Version Selection for Change Version Action */ }
+ { currentAction ===
+ 'change-version' && (
+
+ { getAvailableVersions(
+ selectedPlugin
+ ).length > 0 ? (
+
+
+ { __(
+ 'No stable versions available for this plugin.',
+ 'oneupdate'
+ ) }
+
+
+ ) }
+
+ ) }
- { /* Site Selection */ }
-
-
-
- { /* Action Buttons */ }
-
-
-
-
-
-
-
- ) }
+
+
+
+
+
+
+ ) }
{ /* Plugin Details Modal */ }
{ showPluginModal && selectedPlugin && (
setShowPluginModal( false ) }
style={ { maxWidth: '800px', minWidth: '800px' } }
- shouldCloseOnClickOutside={ true }
+ shouldCloseOnClickOutside
>
{ /* Plugin Header */ }
-
+
{
overflow: 'hidden',
} }
>
- { selectedPlugin.plugin_info.icon ? (
+ { selectedPlugin.plugin_info
+ .icon ? (
{
} }
/>
) : (
-
- by { decodeEntities( selectedPlugin.plugin_info.author ) }
+
+
+ by{ ' ' }
+ { decodeEntities(
+ selectedPlugin.plugin_info
+ .author
+ ) }
-
+
{
fontWeight: '500',
} }
>
- Version { selectedPlugin.plugin_info.version }
+ Version{ ' ' }
+ {
+ selectedPlugin
+ .plugin_info.version
+ }
{
fontWeight: '500',
} }
>
- { selectedPlugin.plugin_info.is_public
- ? __( 'Public Plugin', 'oneupdate' )
- : __( 'Private Plugin', 'oneupdate' ) }
+ { selectedPlugin.plugin_info
+ .is_public
+ ? __(
+ 'Public Plugin',
+ 'oneupdate'
+ )
+ : __(
+ 'Private Plugin',
+ 'oneupdate'
+ ) }
- { selectedPlugin.plugin_info.rating > 0 && (
+ { selectedPlugin.plugin_info
+ .rating > 0 && (
- ⭐ { selectedPlugin.plugin_info.rating }% ({ selectedPlugin.plugin_info.num_ratings } reviews)
+ ⭐{ ' ' }
+ {
+ selectedPlugin
+ .plugin_info
+ .rating
+ }
+ % (
+ {
+ selectedPlugin
+ .plugin_info
+ .num_ratings
+ }{ ' ' }
+ reviews)
) }
@@ -2018,7 +3027,14 @@ const PluginManager = () => {
{ /* Description */ }
-
+
{ __( 'Description', 'oneupdate' ) }
{
fontSize: '14px',
} }
dangerouslySetInnerHTML={ {
- __html: selectedPlugin.plugin_info.full_description || selectedPlugin.plugin_info.description,
+ __html:
+ selectedPlugin.plugin_info
+ .full_description ||
+ selectedPlugin.plugin_info
+ .description,
} }
/>
{ /* Plugin Details Grid */ }
-
+
-
+
{ __( 'Author', 'oneupdate' ) }
-
{ selectedPlugin.plugin_info.author }
+
+ {
+ selectedPlugin.plugin_info
+ .author
+ }
+
-
+
{ __( 'Version', 'oneupdate' ) }
-
{ selectedPlugin.plugin_info.version }
+
+ {
+ selectedPlugin.plugin_info
+ .version
+ }
+
-
+
{ __( 'Sites', 'oneupdate' ) }
-
- { selectedPlugin.active_sites }/{ selectedPlugin.total_sites } active
+
+ { selectedPlugin.active_sites }/
+ { selectedPlugin.total_sites }{ ' ' }
+ active
- { selectedPlugin.plugin_info.downloaded > 0 && (
+ { selectedPlugin.plugin_info.downloaded >
+ 0 && (
-
- { __( 'Downloads', 'oneupdate' ) }
+
+ { __(
+ 'Downloads',
+ 'oneupdate'
+ ) }
-
+
{ selectedPlugin.plugin_info.downloaded.toLocaleString() }
) }
{ selectedPlugin.plugin_info.requires && (
-
- { __( 'Requires WordPress', 'oneupdate' ) }
+
+ { __(
+ 'Requires WordPress',
+ 'oneupdate'
+ ) }
-
{ selectedPlugin.plugin_info.requires }
+
+ {
+ selectedPlugin.plugin_info
+ .requires
+ }
+
) }
{ selectedPlugin.plugin_info.tested && (
-
- { __( 'Tested up to', 'oneupdate' ) }
+
+ { __(
+ 'Tested up to',
+ 'oneupdate'
+ ) }
-
{ selectedPlugin.plugin_info.tested }
+
+ {
+ selectedPlugin.plugin_info
+ .tested
+ }
+
) }
- { selectedPlugin.plugin_info.requires_php && (
+ { selectedPlugin.plugin_info
+ .requires_php && (
-
- { __( 'Requires PHP', 'oneupdate' ) }
+
+ { __(
+ 'Requires PHP',
+ 'oneupdate'
+ ) }
-
{ selectedPlugin.plugin_info.requires_php }
+
+ {
+ selectedPlugin.plugin_info
+ .requires_php
+ }
+
) }
- { selectedPlugin.plugin_info.last_updated && (
+ { selectedPlugin.plugin_info
+ .last_updated && (
-
- { __( 'Last Updated', 'oneupdate' ) }
+
+ { __(
+ 'Last Updated',
+ 'oneupdate'
+ ) }
-
- { new Date( selectedPlugin.plugin_info.last_updated ).toLocaleDateString() }
+
+ { new Date(
+ selectedPlugin.plugin_info.last_updated
+ ).toLocaleDateString() }
) }
{ /* Tags */ }
- { selectedPlugin.plugin_info.tags && Object.keys( selectedPlugin.plugin_info.tags ).length > 0 && (
-
-
- { __( 'Tags', 'oneupdate' ) }
-
-
- { Object.keys( selectedPlugin.plugin_info.tags ).map( ( tag ) => (
-
-
- { tag }
-
-
- ) ) }
-
-
- ) }
+ { selectedPlugin.plugin_info.tags &&
+ Object.keys(
+ selectedPlugin.plugin_info.tags
+ ).length > 0 && (
+
+
+ { __( 'Tags', 'oneupdate' ) }
+
+
+ { Object.keys(
+ selectedPlugin.plugin_info
+ .tags
+ ).map( ( tag ) => (
+
+
+ { tag }
+
+
+ ) ) }
+
+
+ ) }
{ /* Plugin URI */ }
{ selectedPlugin.plugin_info.plugin_uri && (
-
+
{ __( 'Plugin URI', 'oneupdate' ) }
- { selectedPlugin.plugin_info.plugin_uri }
+ {
+ selectedPlugin.plugin_info
+ .plugin_uri
+ }
) }
@@ -2148,8 +3355,18 @@ const PluginManager = () => {
{ /* Installation Instructions */ }
{ selectedPlugin.plugin_info.installation && (
-
- { __( 'Installation', 'oneupdate' ) }
+
+ { __(
+ 'Installation',
+ 'oneupdate'
+ ) }
{
lineHeight: '1.6',
fontSize: '14px',
} }
- dangerouslySetInnerHTML={ { __html: selectedPlugin.plugin_info.installation } }
+ dangerouslySetInnerHTML={ {
+ __html: selectedPlugin
+ .plugin_info.installation,
+ } }
/>
) }
@@ -2165,7 +3385,14 @@ const PluginManager = () => {
{ /* FAQ */ }
{ selectedPlugin.plugin_info.faq && (
-
+
{ __( 'FAQ', 'oneupdate' ) }
{
lineHeight: '1.6',
fontSize: '14px',
} }
- dangerouslySetInnerHTML={ { __html: selectedPlugin.plugin_info.faq } }
+ dangerouslySetInnerHTML={ {
+ __html: selectedPlugin
+ .plugin_info.faq,
+ } }
/>
) }
@@ -2182,7 +3412,14 @@ const PluginManager = () => {
{ /* Changelog */ }
{ selectedPlugin.plugin_info.changelog && (
-
+
{ __( 'Changelog', 'oneupdate' ) }
{
borderRadius: '8px',
border: '1px solid #e9ecef',
} }
- dangerouslySetInnerHTML={ { __html: selectedPlugin.plugin_info.changelog } }
+ dangerouslySetInnerHTML={ {
+ __html: selectedPlugin
+ .plugin_info.changelog,
+ } }
/>
) }
-
+
@@ -2220,47 +3467,99 @@ const PluginManager = () => {
title={ sprintf(
/* translators: %s is the plugin name */
__( '%s - Sites', 'oneupdate' ),
- selectedPlugin.plugin_info.name,
+ selectedPlugin.plugin_info.name
) }
onRequestClose={ () => setShowSitesModal( false ) }
style={ { maxWidth: '400px', minWidth: '400px' } }
- shouldCloseOnClickOutside={ true }
+ shouldCloseOnClickOutside
>
-
- { __( 'Plugin status across all sites', 'oneupdate' ) }
+
+ { __(
+ 'Plugin status across all sites',
+ 'oneupdate'
+ ) }
-
- { Object.entries( selectedPlugin.sites ).map( ( [ url, siteInfo ] ) => (
+
+ { Object.entries(
+ selectedPlugin.sites
+ ).map( ( [ url, siteInfo ] ) => (
-
-
+
+
-
+
-
- { siteInfo.site_name || formatSiteUrl( url ) }
+
+ { siteInfo.site_name ||
+ formatSiteUrl(
+ url
+ ) }
-
- { ( url ) } • v{ siteInfo.version }
+
+ { url } • v
+ {
+ siteInfo.version
+ }
@@ -2270,14 +3569,24 @@ const PluginManager = () => {
{ siteInfo.is_active
- ? __( 'Active', 'oneupdate' )
- : __( 'Inactive', 'oneupdate' ) }
+ ? __(
+ 'Active',
+ 'oneupdate'
+ )
+ : __(
+ 'Inactive',
+ 'oneupdate'
+ ) }
{ siteInfo.is_update_available && (
@@ -2285,13 +3594,20 @@ const PluginManager = () => {
- { __( 'Update Available', 'oneupdate' ) }
+ { __(
+ 'Update Available',
+ 'oneupdate'
+ ) }
) }
@@ -2303,10 +3619,17 @@ const PluginManager = () => {
) ) }
-
+
diff --git a/assets/src/admin/pull-requests/index.js b/assets/src/admin/pull-requests/index.js
index af59f14..83a88f8 100644
--- a/assets/src/admin/pull-requests/index.js
+++ b/assets/src/admin/pull-requests/index.js
@@ -1,7 +1,12 @@
/**
* WordPress dependencies
*/
-import { useState, useEffect, useCallback, createRoot } from '@wordpress/element';
+import {
+ useState,
+ useEffect,
+ useCallback,
+ createRoot,
+} from '@wordpress/element';
import { __ } from '@wordpress/i18n';
import {
Card,
@@ -20,9 +25,13 @@ import {
} from '@wordpress/components';
import { decodeEntities } from '@wordpress/html-entities';
import { moreVertical } from '@wordpress/icons';
+/**
+ * Internal dependencies
+ */
import ViewIcon from '../../components/icons/View';
-const API_NAMESPACE = window.OneUpdatePullRequests.restUrl + '/oneupdate/v1/github';
+const API_NAMESPACE =
+ window.OneUpdatePullRequests.restUrl + '/oneupdate/v1/github';
const NONCE = window.OneUpdatePullRequests.restNonce;
const REPOS = window.OneUpdatePullRequests.repos;
@@ -40,7 +49,9 @@ const GitHubPullRequests = () => {
const [ pullRequests, setPullRequests ] = useState( [] );
const [ loading, setLoading ] = useState( false );
const [ notice, setNotice ] = useState( null );
- const [ selectedRepo, setSelectedRepo ] = useState( Object.keys( REPOS )?.[ 0 ] || '' );
+ const [ selectedRepo, setSelectedRepo ] = useState(
+ Object.keys( REPOS )?.[ 0 ] || ''
+ );
const [ statusFilter, setStatusFilter ] = useState( 'all' );
const [ searchQuery, setSearchQuery ] = useState( '[OneUpdate]' );
const [ page, setPage ] = useState( 1 );
@@ -90,19 +101,25 @@ const GitHubPullRequests = () => {
'Content-Type': 'application/json',
'X-WP-NONCE': NONCE,
},
- },
+ }
);
if ( ! response.ok ) {
if ( response?.statusText === 'Unprocessable Entity' ) {
setNotice( {
type: 'error',
- message: __( 'Please enter valid character to search pull requests.', 'oneupdate' ),
+ message: __(
+ 'Please enter valid character to search pull requests.',
+ 'oneupdate'
+ ),
} );
} else {
setNotice( {
type: 'error',
- message: __( 'Failed to fetch pull requests.', 'oneupdate' ),
+ message: __(
+ 'Failed to fetch pull requests.',
+ 'oneupdate'
+ ),
} );
}
return;
@@ -113,7 +130,9 @@ const GitHubPullRequests = () => {
if ( data.success ) {
setPullRequests( data.pull_requests || [] );
// Calculate total pages based on response (you might need to adjust based on your API)
- const totalCount = response.headers.get( 'X-WP-Total' ) || data.pull_requests.length;
+ const totalCount =
+ response.headers.get( 'X-WP-Total' ) ||
+ data.pull_requests.length;
setTotalPages( Math.ceil( totalCount / PER_PAGE ) );
setCurrentPage( data?.pagination?.current_page || 1 );
} else {
@@ -125,7 +144,9 @@ const GitHubPullRequests = () => {
} catch ( error ) {
setNotice( {
type: 'error',
- message: error.message || __( 'Error fetching pull requests.', 'oneupdate' ),
+ message:
+ error.message ||
+ __( 'Error fetching pull requests.', 'oneupdate' ),
} );
setPullRequests( [] );
} finally {
@@ -133,43 +154,48 @@ const GitHubPullRequests = () => {
}
}, [ selectedRepo, statusFilter, searchQuery, page ] );
- const fetchPRDetails = useCallback( async ( prNumber ) => {
- if ( ! selectedRepo || ! prNumber ) {
- return;
- }
-
- setDetailsLoading( true );
- try {
- const response = await fetch(
- `${ API_NAMESPACE }/pull-requests/${ selectedRepo }?pr_number=${ prNumber }&_=${ new Date().getTime() }`,
- {
- headers: {
- 'Content-Type': 'application/json',
- 'X-WP-NONCE': NONCE,
- },
- },
- );
-
- if ( ! response.ok ) {
- throw new Error( 'Failed to fetch PR details' );
+ const fetchPRDetails = useCallback(
+ async ( prNumber ) => {
+ if ( ! selectedRepo || ! prNumber ) {
+ return;
}
- const data = await response.json();
+ setDetailsLoading( true );
+ try {
+ const response = await fetch(
+ `${ API_NAMESPACE }/pull-requests/${ selectedRepo }?pr_number=${ prNumber }&_=${ new Date().getTime() }`,
+ {
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-WP-NONCE': NONCE,
+ },
+ }
+ );
+
+ if ( ! response.ok ) {
+ throw new Error( 'Failed to fetch PR details' );
+ }
- if ( data.success && data.pull_request?.[ 0 ] ) {
- setPrDetails( data.pull_request[ 0 ] );
- } else {
- throw new Error( 'Failed to fetch PR details' );
+ const data = await response.json();
+
+ if ( data.success && data.pull_request?.[ 0 ] ) {
+ setPrDetails( data.pull_request[ 0 ] );
+ } else {
+ throw new Error( 'Failed to fetch PR details' );
+ }
+ } catch ( error ) {
+ setNotice( {
+ type: 'error',
+ message:
+ error.message ||
+ __( 'Error fetching PR details.', 'oneupdate' ),
+ } );
+ } finally {
+ setDetailsLoading( false );
}
- } catch ( error ) {
- setNotice( {
- type: 'error',
- message: error.message || __( 'Error fetching PR details.', 'oneupdate' ),
- } );
- } finally {
- setDetailsLoading( false );
- }
- }, [ selectedRepo ] );
+ },
+ [ selectedRepo ]
+ );
const openDetailModal = ( pr ) => {
setSelectedPR( pr );
@@ -242,7 +268,10 @@ const GitHubPullRequests = () => {
onClose();
} }
>
- { __( 'View Details', 'oneupdate' ) }
+ { __(
+ 'View Details',
+ 'oneupdate'
+ ) }
) }
@@ -285,10 +314,21 @@ const GitHubPullRequests = () => {
{ /* Filters */ }
-
+
- { __( 'PR #', 'oneupdate' ) }
- { __( 'Title', 'oneupdate' ) }
- { __( 'Author', 'oneupdate' ) }
- { __( 'Status', 'oneupdate' ) }
- { __( 'Created at', 'oneupdate' ) }
- { __( 'Labels', 'oneupdate' ) }
- { __( 'Actions', 'oneupdate' ) }
+
+ { __( 'PR #', 'oneupdate' ) }
+
+
+ { __( 'Title', 'oneupdate' ) }
+
+
+ { __( 'Author', 'oneupdate' ) }
+
+
+ { __( 'Status', 'oneupdate' ) }
+
+
+ { __( 'Created at', 'oneupdate' ) }
+
+
+ { __( 'Labels', 'oneupdate' ) }
+
+
+ { __( 'Actions', 'oneupdate' ) }
+
{ loading && (
-
-
+
) }
{ ! loading && pullRequests.length === 0 && (
-
- { __( 'No pull requests found.', 'oneupdate' ) }
+
+ { __(
+ 'No pull requests found.',
+ 'oneupdate'
+ ) }
) }
@@ -340,7 +411,10 @@ const GitHubPullRequests = () => {
#{ pr.number }
@@ -351,11 +425,19 @@ const GitHubPullRequests = () => {
target="_blank"
rel="noopener noreferrer"
>
- { decodeEntities( pr.title ) }
+
+ { decodeEntities( pr.title ) }
+
-
+
{
{ formatDate( pr.created_at ) }
{ pr.labels.length > 0 ? (
-
- { pr.labels.slice( 0, 2 ).map( ( label ) => (
+
+ { pr.labels
+ .slice( 0, 2 )
+ .map( ( label ) => (
+
+ { label.name }
+
+ ) ) }
+ { pr.labels.length > 2 && (
- { label.name }
-
- ) ) }
- { pr.labels.length > 2 && (
-
- +{ pr.labels.length - 2 } { __( 'more', 'oneupdate' ) }
+ +
+ { pr.labels.length - 2 }{ ' ' }
+ { __(
+ 'more',
+ 'oneupdate'
+ ) }
) }
) : (
-
- { __( 'No labels', 'oneupdate' ) }
+
+ { __(
+ 'No labels',
+ 'oneupdate'
+ ) }
) }
@@ -400,29 +510,43 @@ const GitHubPullRequests = () => {
{ /* Pagination */ }
- { (
-
-
-
- { __( 'Page', 'oneupdate' ) } { page } { __( 'of', 'oneupdate' ) } { totalPages === 0 || totalPages < currentPage ? currentPage : totalPages }
-
-
-
- ) }
+
+
+
+ { __( 'Page', 'oneupdate' ) } { page }{ ' ' }
+ { __( 'of', 'oneupdate' ) }{ ' ' }
+ { totalPages === 0 || totalPages < currentPage
+ ? currentPage
+ : totalPages }
+
+
+
@@ -432,12 +556,16 @@ const GitHubPullRequests = () => {
title={ __( 'Pull Request Details', 'oneupdate' ) }
onRequestClose={ closeModals }
size="medium"
- shouldCloseOnClickOutside={ true }
+ shouldCloseOnClickOutside
>
{ /* Detailed PR Info */ }
{ detailsLoading && (
-
- { __( 'Loading PR details…', 'oneupdate' ) }
) }
@@ -445,21 +573,90 @@ const GitHubPullRequests = () => {
{ ! detailsLoading && prDetails && (
<>
-
+
- { __( 'PR Number:', 'oneupdate' ) } #{ prDetails.number }
- { __( 'Title:', 'oneupdate' ) } { decodeEntities( prDetails.title ) }
- { __( 'Author:', 'oneupdate' ) } { prDetails.user.login }
- { __( 'Status:', 'oneupdate' ) } { getPRStatusBadge( prDetails ) }
+
+
+ { __(
+ 'PR Number:',
+ 'oneupdate'
+ ) }
+ { ' ' }
+ #{ prDetails.number }
+
+
+
+ { __( 'Title:', 'oneupdate' ) }
+ { ' ' }
+ { decodeEntities(
+ prDetails.title
+ ) }
+
+
+
+ { __( 'Author:', 'oneupdate' ) }
+ { ' ' }
+ { prDetails.user.login }
+
+
+
+ { __( 'Status:', 'oneupdate' ) }
+ { ' ' }
+ { getPRStatusBadge( prDetails ) }
+
- { __( 'Created:', 'oneupdate' ) } { formatDate( prDetails.created_at ) }
- { __( 'Updated:', 'oneupdate' ) } { formatDate( prDetails.updated_at ) }
- { __( 'Branch:', 'oneupdate' ) } { prDetails.pr_branch } → { prDetails.base_branch }
- { __( 'GitHub URL:', 'oneupdate' ) }{ ' ' }
-
- { __( 'View on GitHub', 'oneupdate' ) }
+
+ { __(
+ 'Created:',
+ 'oneupdate'
+ ) }
+ { ' ' }
+ { formatDate(
+ prDetails.created_at
+ ) }
+
+
+
+ { __(
+ 'Updated:',
+ 'oneupdate'
+ ) }
+ { ' ' }
+ { formatDate(
+ prDetails.updated_at
+ ) }
+
+
+
+ { __( 'Branch:', 'oneupdate' ) }
+ { ' ' }
+ { prDetails.pr_branch } →{ ' ' }
+ { prDetails.base_branch }
+
+
+
+ { __(
+ 'GitHub URL:',
+ 'oneupdate'
+ ) }
+ { ' ' }
+
+ { __(
+ 'View on GitHub',
+ 'oneupdate'
+ ) }
@@ -468,16 +665,29 @@ const GitHubPullRequests = () => {
{ /* Labels */ }
{ prDetails.labels.length > 0 && (
- { __( 'Labels:', 'oneupdate' ) }
-
- { prDetails.labels.map( ( label ) => (
-
- { label.name }
-
- ) ) }
+
+ { __( 'Labels:', 'oneupdate' ) }
+
+
+ { prDetails.labels.map(
+ ( label ) => (
+
+ { label.name }
+
+ )
+ ) }
) }
@@ -485,7 +695,12 @@ const GitHubPullRequests = () => {
{ /* Description */ }
{ prDetails.body && (
- { __( 'Description:', 'oneupdate' ) }
+
+ { __(
+ 'Description:',
+ 'oneupdate'
+ ) }
+
{
overflow: 'auto',
} }
>
-
- { decodeEntities( prDetails.body ) }
+
+ { decodeEntities(
+ prDetails.body
+ ) }
@@ -507,14 +730,29 @@ const GitHubPullRequests = () => {
{ /* Merged By Info */ }
{ prDetails.merged_by && (
-
-
+
{ prDetails.merged_by && (
- { __( 'Merged By:', 'oneupdate' ) }
+
+ { __(
+ 'Merged By:',
+ 'oneupdate'
+ ) }
+
{
verticalAlign: 'middle',
} }
/>
- { prDetails.merged_by.login }
+
+ { prDetails.merged_by.login }
+
) }
) }
) }
-
) }
@@ -540,7 +784,11 @@ const GitHubPullRequests = () => {
isDismissible
status={ notice.type }
onRemove={ () => setNotice( null ) }
- className={ notice?.type === 'error' ? 'oneupdate-error-notice' : 'oneupdate-success-notice' }
+ className={
+ notice?.type === 'error'
+ ? 'oneupdate-error-notice'
+ : 'oneupdate-success-notice'
+ }
>
{ notice.message }
diff --git a/assets/src/admin/settings/index.tsx b/assets/src/admin/settings/index.tsx
index 6150a88..c7dd780 100644
--- a/assets/src/admin/settings/index.tsx
+++ b/assets/src/admin/settings/index.tsx
@@ -1,6 +1,9 @@
/**
* WordPress dependencies
*/
+/**
+ * External dependencies
+ */
import { createRoot } from 'react-dom/client';
/**
diff --git a/assets/src/admin/settings/page.tsx b/assets/src/admin/settings/page.tsx
index e002974..6ba3ef3 100644
--- a/assets/src/admin/settings/page.tsx
+++ b/assets/src/admin/settings/page.tsx
@@ -1,6 +1,9 @@
/**
* WordPress dependencies
*/
+/**
+ * External dependencies
+ */
import { useState, useEffect, useCallback } from 'react';
import { __ } from '@wordpress/i18n';
import { Snackbar } from '@wordpress/components';
@@ -26,7 +29,7 @@ export interface BrandSite {
name: string;
url: string;
api_key: string;
- gh_repo: string;
+ gh_repo: string;
}
export const defaultBrandSite: BrandSite = {
@@ -39,7 +42,7 @@ export const defaultBrandSite: BrandSite = {
export type EditingIndex = number | null;
const NONCE = window.OneUpdateSettings.restNonce;
-const SITE_TYPE = window.OneUpdateSettings.siteType as SiteType || '';
+const SITE_TYPE = ( window.OneUpdateSettings.siteType as SiteType ) || '';
const SHARED_SITES_ENDPOINT = '/oneupdate/v1/shared-sites';
const API_NAMESPACE = window.OneUpdateSettings.restUrl + '/oneupdate/v1';
@@ -57,16 +60,13 @@ const SettingsPage = () => {
const [ allGitHubRepos, setAllGitHubRepos ] = useState( [] );
const fetchAllAvailableGitHubRepos = useCallback( async () => {
- const response = await fetch(
- `${ API_NAMESPACE }/github-repos`,
- {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json',
- 'X-WP-NONCE': NONCE,
- },
+ const response = await fetch( `${ API_NAMESPACE }/github-repos`, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-WP-NONCE': NONCE,
},
- );
+ } );
const data = await response.json();
if ( data?.repos ) {
setAllGitHubRepos( data.repos );
@@ -82,7 +82,7 @@ const SettingsPage = () => {
}, [ SITE_TYPE ] );
useEffect( () => {
- apiFetch<{ shared_sites?: BrandSite[] }>( {
+ apiFetch< { shared_sites?: BrandSite[] } >( {
path: SHARED_SITES_ENDPOINT,
} )
.then( ( data ) => {
@@ -104,89 +104,115 @@ const SettingsPage = () => {
}
}, [ sites ] );
- const handleFormSubmit = async () : Promise< boolean > => {
- const updated : BrandSite[] = editingIndex !== null
- ? sites.map( ( item, i ) => ( i === editingIndex ? formData : item ) )
- : [ ...sites, formData ];
+ const handleFormSubmit = async (): Promise< boolean > => {
+ const updated: BrandSite[] =
+ editingIndex !== null
+ ? sites.map( ( item, i ) =>
+ i === editingIndex ? formData : item
+ )
+ : [ ...sites, formData ];
- return apiFetch<{ shared_sites?: BrandSite[] }>( {
+ return apiFetch< { shared_sites?: BrandSite[] } >( {
path: SHARED_SITES_ENDPOINT,
method: 'POST',
data: { sites_data: updated },
- } ).then( ( data ) => {
- if ( ! data?.shared_sites ) {
- throw new Error( 'No shared sites in response' );
- }
+ } )
+ .then( ( data ) => {
+ if ( ! data?.shared_sites ) {
+ throw new Error( 'No shared sites in response' );
+ }
- if ( data.shared_sites.length === 1 && sites.length === 0 ) {
- // Reloading causes the menus etc to reflect the missing sites.
- window.location.reload();
- }
+ if ( data.shared_sites.length === 1 && sites.length === 0 ) {
+ // Reloading causes the menus etc to reflect the missing sites.
+ window.location.reload();
+ }
- setSites( data.shared_sites );
+ setSites( data.shared_sites );
- setNotice( {
- type: 'success',
- message: __( 'Brand Site saved successfully.', 'oneupdate' ),
- } );
- return true;
- } ).catch( () => {
- setNotice( {
- type: 'error',
- message: __( 'Failed to update shared sites', 'oneupdate' ),
+ setNotice( {
+ type: 'success',
+ message: __(
+ 'Brand Site saved successfully.',
+ 'oneupdate'
+ ),
+ } );
+ return true;
+ } )
+ .catch( () => {
+ setNotice( {
+ type: 'error',
+ message: __( 'Failed to update shared sites', 'oneupdate' ),
+ } );
+ return false;
+ } )
+ .finally( () => {
+ setFormData( defaultBrandSite );
+ setShowModal( false );
+ setEditingIndex( null );
} );
- return false;
- } ).finally( () => {
- setFormData( defaultBrandSite );
- setShowModal( false );
- setEditingIndex( null );
- } );
};
- const handleDelete = async ( index : number|null ) : Promise => {
- const updated : BrandSite[] = sites.filter( ( _, i ) => i !== index );
+ const handleDelete = async ( index: number | null ): Promise< void > => {
+ const updated: BrandSite[] = sites.filter( ( _, i ) => i !== index );
- apiFetch<{ shared_sites?: BrandSite[] }>( {
+ apiFetch< { shared_sites?: BrandSite[] } >( {
path: SHARED_SITES_ENDPOINT,
method: 'POST',
data: { sites_data: updated },
- } ).then( ( data ) => {
- if ( ! data?.shared_sites ) {
- throw new Error( 'No shared sites in response' );
- }
- setSites( data.shared_sites );
-
- if ( data.shared_sites.length === 0 ) {
- // Reloading causes the menus etc to reflect the missing sites.
- window.location.reload();
- } else {
- document.body.classList.remove( 'oneupdate-missing-brand-sites' );
- }
- } ).catch( () => {
- throw new Error( 'Failed to update shared sites' );
- } );
+ } )
+ .then( ( data ) => {
+ if ( ! data?.shared_sites ) {
+ throw new Error( 'No shared sites in response' );
+ }
+ setSites( data.shared_sites );
+
+ if ( data.shared_sites.length === 0 ) {
+ // Reloading causes the menus etc to reflect the missing sites.
+ window.location.reload();
+ } else {
+ document.body.classList.remove(
+ 'oneupdate-missing-brand-sites'
+ );
+ }
+ } )
+ .catch( () => {
+ throw new Error( 'Failed to update shared sites' );
+ } );
};
return (
<>
- { !! notice && notice?.message?.length > 0 &&
+ { !! notice && notice?.message?.length > 0 && (
setNotice( null ) }
- className={ notice?.type === 'error' ? 'oneupdate-error-notice' : 'oneupdate-success-notice' }
+ className={
+ notice?.type === 'error'
+ ? 'oneupdate-error-notice'
+ : 'oneupdate-success-notice'
+ }
>
{ notice?.message }
- }
-
- { SITE_TYPE === 'brand-site' && (
- ,
- },
-) => {
+const GitHubRepoToken = ( {
+ setNotice,
+ fetchAllAvailableGitHubRepos,
+}: {
+ setNotice: ( notice: NoticeType ) => void;
+ fetchAllAvailableGitHubRepos: () => Promise< void >;
+} ) => {
const [ repoToken, setRepoToken ] = useState( '' );
const getRepoToken = useCallback( async () => {
- const response = await fetch(
- `${ API_NAMESPACE }/github-token`,
- {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json',
- 'X-WP-NONCE': NONCE,
- },
+ const response = await fetch( `${ API_NAMESPACE }/github-token`, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-WP-NONCE': NONCE,
},
- );
+ } );
if ( ! response.ok ) {
- console.error( 'Error fetching GitHub token:', response.statusText ); // eslint-disable-line no-console
+ console.error(
+ 'Error fetching GitHub token:',
+ response.statusText
+ );
}
const data = await response.json();
@@ -51,23 +54,23 @@ const GitHubRepoToken = (
getRepoToken();
}, [] );
- const setGitHubRepoToken = useCallback( async ( token : string ) => {
- const response = await fetch(
- `${ API_NAMESPACE }/github-token`,
- {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- 'X-WP-NONCE': NONCE,
- },
- body: JSON.stringify( { token } ),
+ const setGitHubRepoToken = useCallback( async ( token: string ) => {
+ const response = await fetch( `${ API_NAMESPACE }/github-token`, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-WP-NONCE': NONCE,
},
- );
+ body: JSON.stringify( { token } ),
+ } );
if ( response.ok === false || response.status === 400 ) {
setNotice( {
type: 'error',
- message: __( 'Please enter valid GitHub PAT token.', 'oneupdate' ),
+ message: __(
+ 'Please enter valid GitHub PAT token.',
+ 'oneupdate'
+ ),
} );
return;
}
@@ -76,7 +79,9 @@ const GitHubRepoToken = (
if ( data?.status === '400' ) {
setNotice( {
type: 'error',
- message: data?.message || __( 'Enter valid PAT token.', 'oneupdate' ),
+ message:
+ data?.message ||
+ __( 'Enter valid PAT token.', 'oneupdate' ),
} );
return;
}
@@ -93,11 +98,7 @@ const GitHubRepoToken = (
}, [] );
return (
-
+
{ __( 'GitHub Credentials', 'oneupdate' ) }
-
);
};
diff --git a/assets/src/components/PluginCard.js b/assets/src/components/PluginCard.js
index 3c7ac57..e1cf099 100644
--- a/assets/src/components/PluginCard.js
+++ b/assets/src/components/PluginCard.js
@@ -1,3 +1,6 @@
+/**
+ * WordPress dependencies
+ */
import { decodeEntities } from '@wordpress/html-entities';
import { Button, SelectControl } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
@@ -8,7 +11,13 @@ const PluginCard = ( {
onSelect,
onVersionChange,
} ) => {
- const { name, slug, version, short_description: shortDescription, versions } = plugin;
+ const {
+ name,
+ slug,
+ version,
+ short_description: shortDescription,
+ versions,
+ } = plugin;
const selectedEntry = selectedPlugin?.find( ( p ) => p.slug === slug );
const isSelected = !! selectedEntry;
@@ -27,18 +36,28 @@ const PluginCard = ( {
};
return (
-
+
-
+
{ decodeEntities( name ) }
@@ -56,14 +75,22 @@ const PluginCard = ( {
{ isSelected && (
{
+const PluginVersionSelectControl = ( {
+ versions,
+ selectedVersion,
+ onChange,
+} ) => {
const getLastFiveVersions = ( versionsObj ) => {
if ( ! versionsObj || typeof versionsObj !== 'object' ) {
return [];
}
- const versionKeys = Object.keys( versionsObj )
- .filter( ( key ) => key !== 'trunk' && ! /(alpha|beta|rc|dev|a)/i.test( key ) );
+ const versionKeys = Object.keys( versionsObj ).filter(
+ ( key ) => key !== 'trunk' && ! /(alpha|beta|rc|dev|a)/i.test( key )
+ );
const sortedVersions = versionKeys.sort( ( a, b ) => {
- const aParts = a.split( '.' ).map( ( part ) => parseInt( part, 10 ) || 0 );
- const bParts = b.split( '.' ).map( ( part ) => parseInt( part, 10 ) || 0 );
+ const aParts = a
+ .split( '.' )
+ .map( ( part ) => parseInt( part, 10 ) || 0 );
+ const bParts = b
+ .split( '.' )
+ .map( ( part ) => parseInt( part, 10 ) || 0 );
const maxLength = Math.max( aParts.length, bParts.length );
for ( let i = 0; i < maxLength; i++ ) {
diff --git a/assets/src/components/PluginGrid.js b/assets/src/components/PluginGrid.js
index 4e3f8e1..ea94bbc 100644
--- a/assets/src/components/PluginGrid.js
+++ b/assets/src/components/PluginGrid.js
@@ -1,7 +1,20 @@
+/**
+ * WordPress dependencies
+ */
import { useState, useEffect, useCallback } from '@wordpress/element';
import { __ } from '@wordpress/i18n';
-import { Button, CheckboxControl, Modal, Spinner, TextControl, Notice } from '@wordpress/components';
-
+import {
+ Button,
+ CheckboxControl,
+ Modal,
+ Spinner,
+ TextControl,
+ Notice,
+} from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
import PluginCard from './PluginCard';
const API_NAMESPACE = OneUpdatePlugins.restUrl + '/oneupdate/v1';
@@ -31,7 +44,9 @@ const PluginGrid = () => {
const response = await fetch( WORDPRESS_PLUGINS_API );
if ( ! response.ok ) {
- throw new Error( __( 'Failed to fetch plugins.', 'oneupdate' ) );
+ throw new Error(
+ __( 'Failed to fetch plugins.', 'oneupdate' )
+ );
}
const data = await response.json();
@@ -59,7 +74,7 @@ const PluginGrid = () => {
const existing = prev.find( ( p ) => p.slug === slug );
if ( existing ) {
return prev.map( ( p ) =>
- p.slug === slug ? { ...p, version } : p,
+ p.slug === slug ? { ...p, version } : p
);
}
return [ ...prev, { slug, version } ];
@@ -68,23 +83,18 @@ const PluginGrid = () => {
const handleVersionChange = ( slug, version ) => {
setSelectedPlugin( ( prev ) =>
- prev.map( ( p ) =>
- p.slug === slug ? { ...p, version } : p,
- ),
+ prev.map( ( p ) => ( p.slug === slug ? { ...p, version } : p ) )
);
};
const fetchSharedSitesData = useCallback( async () => {
- const response = await fetch(
- `${ API_NAMESPACE }/shared-sites`,
- {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json',
- 'X-ONEUPDATE-TOKEN': API_KEY,
- },
+ const response = await fetch( `${ API_NAMESPACE }/shared-sites`, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-ONEUPDATE-TOKEN': API_KEY,
},
- );
+ } );
const data = await response.json();
if ( data?.shared_sites ) {
setSharedSites( data.shared_sites );
@@ -106,29 +116,24 @@ const PluginGrid = () => {
return (
-
{ /* Notice State */ }
{ isNoticeVisible && (
-
+
{ noticeMessage.message }
) }
{ /* Search Bar */ }
-
{
}
} }
/>
-
@@ -152,7 +154,9 @@ const PluginGrid = () => {
{ loading && (
{ __( 'Loading plugins…', 'oneupdate' ) }
+
+ { __( 'Loading plugins…', 'oneupdate' ) }
+
) }
@@ -162,10 +166,7 @@ const PluginGrid = () => {
{ __( 'Unable to load plugins', 'oneupdate' ) }
{ error }
-
@@ -177,11 +178,13 @@ const PluginGrid = () => {
{ __( 'No plugins found', 'oneupdate' ) }
- { __( 'Unable to find any plugins to display.', 'oneupdate' ) }
-
@@ -204,10 +207,16 @@ const PluginGrid = () => {
@@ -241,17 +250,24 @@ const PluginGrid = () => {
- { __( 'Page', 'oneupdate' ) } { page } { __( 'of', 'oneupdate' ) } { totalPages }
+ { __( 'Page', 'oneupdate' ) } { page }{ ' ' }
+ { __( 'of', 'oneupdate' ) } { totalPages }
-
);
};
-const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, setNoticeMessage, setIsNoticeVisible, setSelectedPlugin } ) => {
+const ApplyPluginsModal = ( {
+ sharedSites,
+ selectedPlugin,
+ setShowApplyModal,
+ setNoticeMessage,
+ setIsNoticeVisible,
+ setSelectedPlugin,
+} ) => {
const [ selectedSite, setSelectedSite ] = useState( [] );
const [ selectedSiteInfo, setSelectedSiteInfo ] = useState( [] );
@@ -281,7 +303,7 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
// based on selected sites need to get all info from sharedsites for all selected sites
useEffect( () => {
const selectedSiteFullInfo = sharedSites.filter( ( site ) =>
- selectedSite.includes( site.url ),
+ selectedSite.includes( site.url )
);
setSelectedSiteInfo( selectedSiteFullInfo );
@@ -289,26 +311,26 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
const handleApplyPlugins = async () => {
try {
- const response = await fetch(
- `${ API_NAMESPACE }/apply-plugins`,
- {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- 'X-ONEUPDATE-TOKEN': API_KEY,
- },
- body: JSON.stringify( {
- sites: selectedSiteInfo,
- plugins: selectedPlugin,
- } ),
+ const response = await fetch( `${ API_NAMESPACE }/apply-plugins`, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-ONEUPDATE-TOKEN': API_KEY,
},
- );
+ body: JSON.stringify( {
+ sites: selectedSiteInfo,
+ plugins: selectedPlugin,
+ } ),
+ } );
const data = await response.json();
if ( data?.success && data?.created_prs ) {
const prUrls = data?.created_prs;
- const prUrlsArray = prUrls?.map( ( pr ) => {
- return pr?.data?.pr_url || '';
- } ).filter( ( url ) => url !== '' ) || [];
+ const prUrlsArray =
+ prUrls
+ ?.map( ( pr ) => {
+ return pr?.data?.pr_url || '';
+ } )
+ .filter( ( url ) => url !== '' ) || [];
// Join to comma separated string
const prUrlsString = prUrlsArray.join( ', ' );
@@ -316,21 +338,31 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
setIsNoticeVisible( true );
setNoticeMessage( {
type: 'success',
- message: __( 'Plugins applied successfully. Please check the PR at:', 'oneupdate' ) + ` ${ prUrlsString }`,
+ message:
+ __(
+ 'Plugins applied successfully. Please check the PR at:',
+ 'oneupdate'
+ ) + ` ${ prUrlsString }`,
} );
setSelectedPlugin( [] );
} else {
setIsNoticeVisible( true );
setNoticeMessage( {
type: 'error',
- message: __( 'Failed to apply plugins. Please try again.', 'oneupdate' ),
+ message: __(
+ 'Failed to apply plugins. Please try again.',
+ 'oneupdate'
+ ),
} );
}
} catch ( error ) {
setIsNoticeVisible( true );
setNoticeMessage( {
type: 'error',
- message: __( 'An error occurred while applying plugins.', 'oneupdate' ),
+ message: __(
+ 'An error occurred while applying plugins.',
+ 'oneupdate'
+ ),
} );
}
};
@@ -338,12 +370,14 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
return (
- { __( 'Select a site to apply the plugins', 'oneupdate' ) }
+
+ { __( 'Select a site to apply the plugins', 'oneupdate' ) }
+
{ sharedSites.length > 0 ? (
{ sharedSites.map( ( site ) => (
@@ -351,12 +385,19 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
key={ site?.url }
label={ site?.name }
checked={ selectedSite.includes( site?.url ) }
- onChange={ () => handleSiteSelection( site.url ) }
+ onChange={ () =>
+ handleSiteSelection( site.url )
+ }
/>
) ) }
) : (
- { __( 'No sites available to apply plugins.', 'oneupdate' ) }
+
+ { __(
+ 'No sites available to apply plugins.',
+ 'oneupdate'
+ ) }
+
) }
{ __( 'Add Plugin', 'oneupdate' ) }
-- { __( 'Choose how you want to add a plugin to your sites.', 'oneupdate' ) } +
+ { __( + 'Choose how you want to add a plugin to your sites.', + 'oneupdate' + ) }
{ __( 'Public Plugin', 'oneupdate' ) }
-{ __( 'Add a plugin from the WordPress.org repository.', 'oneupdate' ) }
++ { __( + 'Public Plugin', + 'oneupdate' + ) } +
++ { __( + 'Add a plugin from the WordPress.org repository.', + 'oneupdate' + ) } +
{ __( 'Private Plugin', 'oneupdate' ) }
-{ __( 'Upload a custom plugin from your computer.', 'oneupdate' ) }
++ { __( + 'Private Plugin', + 'oneupdate' + ) } +
++ { __( + 'Upload a custom plugin from your computer.', + 'oneupdate' + ) } +
- { loadingProgress.message || __( 'Loading plugins…', 'oneupdate' ) } +
+ { loadingProgress.message || + __( 'Loading plugins…', 'oneupdate' ) }
{ loadingProgress.total > 0 && ( -
+
) }
@@ -1131,18 +1473,31 @@ const PluginManager = () => {
}
const totalPlugins = Object.keys( combinedPluginsBySlug ).length;
- const activePlugins = Object.values( combinedPluginsBySlug ).filter( ( p ) => p.active_sites > 0 ).length;
- const updatesAvailable = Object.values( combinedPluginsBySlug ).filter( ( p ) => p.update_available_sites > 0 ).length;
- const privatePlugins = Object.values( combinedPluginsBySlug ).filter( ( p ) => ! p.plugin_info.is_public ).length;
+ const activePlugins = Object.values( combinedPluginsBySlug ).filter(
+ ( p ) => p.active_sites > 0
+ ).length;
+ const updatesAvailable = Object.values( combinedPluginsBySlug ).filter(
+ ( p ) => p.update_available_sites > 0
+ ).length;
+ const privatePlugins = Object.values( combinedPluginsBySlug ).filter(
+ ( p ) => ! p.plugin_info.is_public
+ ).length;
return (
<>
- { globalNotice.message && actionLoading === false && (
- globalNotice.type !== 'snackbar' ? (
+ { globalNotice.message &&
+ actionLoading === false &&
+ ( globalNotice.type !== 'snackbar' ? (
setGlobalNotice( { status: '', isDismissible: false, message: '' } ) }
+ onRemove={ () =>
+ setGlobalNotice( {
+ status: '',
+ isDismissible: false,
+ message: '',
+ } )
+ }
style={ { marginBottom: '20px' } }
type={ globalNotice.type || 'default' }
>
@@ -1152,15 +1507,24 @@ const PluginManager = () => {
setGlobalNotice( { status: '', isDismissible: false, message: '' } ) }
+ onRemove={ () =>
+ setGlobalNotice( {
+ status: '',
+ isDismissible: false,
+ message: '',
+ } )
+ }
style={ { marginBottom: '20px' } }
type={ globalNotice.type || 'default' }
- className={ globalNotice?.status === 'error' ? 'oneupdate-error-notice' : 'oneupdate-success-notice' }
+ className={
+ globalNotice?.status === 'error'
+ ? 'oneupdate-error-notice'
+ : 'oneupdate-success-notice'
+ }
>
{ globalNotice.message }
- )
- ) }
+ ) ) }
{ showAddPluginModal ? (
+
{ [
- { value: totalPlugins, label: 'Total Plugins', color: '#0073aa' },
- { value: activePlugins, label: 'Active', color: '#00a32a' },
- { value: updatesAvailable, label: 'Updates', color: '#dba617' },
- { value: privatePlugins, label: 'Private', color: '#826eb4' },
+ {
+ value: totalPlugins,
+ label: 'Total Plugins',
+ color: '#0073aa',
+ },
+ {
+ value: activePlugins,
+ label: 'Active',
+ color: '#00a32a',
+ },
+ {
+ value: updatesAvailable,
+ label: 'Updates',
+ color: '#dba617',
+ },
+ {
+ value: privatePlugins,
+ label: 'Private',
+ color: '#826eb4',
+ },
].map( ( stat, index ) => (
{
- e.currentTarget.style.transform = 'translateY(-2px)';
- e.currentTarget.style.boxShadow = '0 8px 25px rgba(0, 0, 0, 0.12)';
+ e.currentTarget.style.transform =
+ 'translateY(-2px)';
+ e.currentTarget.style.boxShadow =
+ '0 8px 25px rgba(0, 0, 0, 0.12)';
} }
onMouseLeave={ ( e ) => {
- e.currentTarget.style.transform = 'translateY(0)';
- e.currentTarget.style.boxShadow = '0 2px 8px rgba(0, 0, 0, 0.08)';
+ e.currentTarget.style.transform =
+ 'translateY(0)';
+ e.currentTarget.style.boxShadow =
+ '0 2px 8px rgba(0, 0, 0, 0.08)';
} }
>
-
+
{
style={ {
background: '#3858e9',
height: '100%',
- width: `${ ( loadingProgress.current / loadingProgress.total ) * 100 }%`,
+ width: `${
+ ( loadingProgress.current /
+ loadingProgress.total ) *
+ 100
+ }%`,
transition: 'width 0.3s ease',
} }
/>
- - { loadingProgress.current } of { loadingProgress.total } +
+ { loadingProgress.current } of{ ' ' } + { loadingProgress.total }
{
fontWeight: '600',
} }
>
- { __( 'OneUpdate - Plugin Manager', 'oneupdate' ) }
+ { __(
+ 'OneUpdate - Plugin Manager',
+ 'oneupdate'
+ ) }
-
@@ -1197,9 +1574,16 @@ const PluginManager = () => {
@@ -1220,32 +1604,62 @@ const PluginManager = () => {
<>
- - { __( 'Manage plugins across all your WordPress sites', 'oneupdate' ) } +
+ { __( + 'Manage plugins across all your WordPress sites', + 'oneupdate' + ) }
{
>
{ stat.value }
-
+
{
value={ statusFilter }
onChange={ setStatusFilter }
options={ [
- { label: __( 'All Status', 'oneupdate' ), value: 'all' },
- { label: __( 'Active', 'oneupdate' ), value: 'active' },
- { label: __( 'Inactive', 'oneupdate' ), value: 'inactive' },
+ {
+ label: __(
+ 'All Status',
+ 'oneupdate'
+ ),
+ value: 'all',
+ },
+ {
+ label: __(
+ 'Active',
+ 'oneupdate'
+ ),
+ value: 'active',
+ },
+ {
+ label: __(
+ 'Inactive',
+ 'oneupdate'
+ ),
+ value: 'inactive',
+ },
] }
disabled={ isBulkUpdateProcess }
/>
@@ -1304,9 +1748,27 @@ const PluginManager = () => {
value={ typeFilter }
onChange={ setTypeFilter }
options={ [
- { label: __( 'All Types', 'oneupdate' ), value: 'all' },
- { label: __( 'Public', 'oneupdate' ), value: 'public' },
- { label: __( 'Private', 'oneupdate' ), value: 'private' },
+ {
+ label: __(
+ 'All Types',
+ 'oneupdate'
+ ),
+ value: 'all',
+ },
+ {
+ label: __(
+ 'Public',
+ 'oneupdate'
+ ),
+ value: 'public',
+ },
+ {
+ label: __(
+ 'Private',
+ 'oneupdate'
+ ),
+ value: 'private',
+ },
] }
disabled={ isBulkUpdateProcess }
/>
@@ -1315,23 +1777,52 @@ const PluginManager = () => {
value={ updateFilter }
onChange={ setUpdateFilter }
options={ [
- { label: __( 'All Updates', 'oneupdate' ), value: 'all' },
- { label: __( 'Updates Available', 'oneupdate' ), value: 'available' },
+ {
+ label: __(
+ 'All Updates',
+ 'oneupdate'
+ ),
+ value: 'all',
+ },
+ {
+ label: __(
+ 'Updates Available',
+ 'oneupdate'
+ ),
+ value: 'available',
+ },
] }
disabled={ isBulkUpdateProcess }
/>
{ /* Site specific filter */ }
( {
- label: site.name,
- value: site.url,
- } ) ),
+ {
+ label: __(
+ 'All Sites',
+ 'oneupdate'
+ ),
+ value: 'all',
+ },
+ {
+ label: __(
+ 'Common plugins',
+ 'oneupdate'
+ ),
+ value: 'common-plugins',
+ },
+ ...allAvailableSites.map(
+ ( site ) => ( {
+ label: site.name,
+ value: site.url,
+ } )
+ ),
] }
disabled={ isBulkUpdateProcess }
/>
@@ -1341,11 +1832,19 @@ const PluginManager = () => {
{ /* Results */ }
-
{ stat.label }
@@ -1278,10 +1698,16 @@ const PluginManager = () => {
+
{ sprintf( /* translators: %1$d is the number of filtered plugins, %2$d is the total number of plugins */ __( 'Showing %1$d of %2$d plugins', 'oneupdate' ), - filteredPlugins.length, totalPlugins, + filteredPlugins.length, + totalPlugins ) }
@@ -1353,7 +1852,8 @@ const PluginManager = () => { {
} }
>
{ /* Plugin Header */ }
-
-
+
+
setShowPluginModal( false ) }
style={ { maxWidth: '800px', minWidth: '800px' } }
- shouldCloseOnClickOutside={ true }
+ shouldCloseOnClickOutside
>
{ plugin.plugin_info.icon ? (
{
borderRadius: '10px',
} }
onError={ ( e ) => {
- e.target.style.display = 'none';
- e.target.nextSibling.style.display = 'flex';
+ e.target.style.display =
+ 'none';
+ e.target.nextSibling.style.display =
+ 'flex';
} }
/>
) : null }
@@ -1412,7 +1935,10 @@ const PluginManager = () => {
style={ {
fontSize: '24px',
color: '#6c757d',
- display: plugin.plugin_info.icon ? 'none' : 'flex',
+ display: plugin.plugin_info
+ .icon
+ ? 'none'
+ : 'flex',
alignItems: 'center',
justifyContent: 'center',
} }
@@ -1432,12 +1958,30 @@ const PluginManager = () => {
whiteSpace: 'nowrap',
} }
>
- { decodeEntities( plugin.plugin_info.name ) }
+ { decodeEntities(
+ plugin.plugin_info.name
+ ) }
-
+
@@ -1468,7 +2023,9 @@ const PluginManager = () => {
{
fontWeight: '500',
} }
>
- { plugin.plugin_info.is_public
- ? __( 'Public', 'oneupdate' )
- : __( 'Private', 'oneupdate' ) }
+ { plugin.plugin_info
+ .is_public
+ ? __(
+ 'Public',
+ 'oneupdate'
+ )
+ : __(
+ 'Private',
+ 'oneupdate'
+ ) }
@@ -1488,96 +2052,149 @@ const PluginManager = () => {
{ ( { onClose } ) => {
return (
<>
{ /* Change Version - only show for public plugins */ }
- { plugin.plugin_info.is_public && (
+ { plugin.plugin_info
+ .is_public && (
) }
{ /* Activate Plugin - only show if plugin is inactive on some sites */ }
- { plugin.active_sites < plugin.total_sites && (
+ { plugin.active_sites <
+ plugin.total_sites && (
) }
{ /* Deactivate Plugin - only show if plugin is active on some sites */ }
- { plugin.active_sites > 0 && (
+ { plugin.active_sites >
+ 0 && (
) }
-
{ /* Add menu item called install on sites which only shows for public plugin and sites on which current plugin is not present */ }
- { plugin.plugin_info.is_public && getAvailableSitesForAction( plugin, 'install' ).length !== 0 && (
-
- ) }
+ { plugin.plugin_info
+ .is_public &&
+ getAvailableSitesForAction(
+ plugin,
+ 'install'
+ ).length !==
+ 0 && (
+
+ ) }
@@ -1588,7 +2205,9 @@ const PluginManager = () => {
{ /* Plugin Body */ }
- setShowSiteSelectionModal( false ) }
- style={ { maxWidth: '600px', minWidth: '600px' } }
- shouldCloseOnClickOutside={ actionLoading ? false : true }
- >
-
- ) }
+
+
+
+
+
+
+ ) }
{ /* Plugin Details Modal */ }
{ showPluginModal && selectedPlugin && (
- by { decodeEntities( plugin.plugin_info.author ) } +
+ by{ ' ' } + { decodeEntities( + plugin.plugin_info.author + ) }
- {
width: 'max-content',
} }
>
- Current version
+
+ Current version
+
- { plugin.plugin_info.version }
+ {
+ plugin.plugin_info
+ .version
+ }
+
@@ -1610,72 +2231,127 @@ const PluginManager = () => {
{ /* Status Badge with Tooltip */ }
+
@@ -1721,220 +2407,479 @@ const PluginManager = () => {
gap: '0',
} }
>
-
+
) }
{ /* Site Selection Modal */ }
- { showSiteSelectionModal && selectedPlugin && currentAction && (
- { overflow: 'hidden', } } > - { decodeEntities( plugin.plugin_info.description ) } + { decodeEntities( + plugin.plugin_info.description + ) }
{ /* Show all sites name if available */ }
- { plugin.sites && Object.keys( plugin.sites ).length > 0 && (
-
{ /* Update Notice */ }
{ plugin.update_available_sites > 0 && (
-
+ { plugin.sites &&
+ Object.keys( plugin.sites ).length >
+ 0 && (
- ) }
+ ) }
- 🌐
- Installed on { Object.keys( plugin.sites ).length } site{ Object.keys( plugin.sites ).length !== 1 ? 's' : '' }
-
-
- { Object.values( plugin.sites ).map( ( site, index ) => (
-
- { site.site_name.trim() }
- { site.is_update_available && (
- ●
- ) }
-
- ) ) }
+
-
+ 🌐
+ Installed on{ ' ' }
+ {
+ Object.keys(
+ plugin.sites
+ ).length
+ }{ ' ' }
+ site
+ { Object.keys(
+ plugin.sites
+ ).length !== 1
+ ? 's'
+ : '' }
+
+
+ { Object.values(
+ plugin.sites
+ ).map(
+ ( site, index ) => (
+
+ { site.site_name.trim() }
+ { site.is_update_available && (
+
+ ●
+
+ ) }
+
+ )
+ ) }
+
{
cursor: 'help',
} }
>
-
+
{ __( 'No plugins found', 'oneupdate' ) }
-
+
{ __( 'No plugins found matching your filters. Try adjusting your search criteria.', - 'oneupdate', + 'oneupdate' ) }
-
- { /* Action Description */ }
-
+ setShowSiteSelectionModal( false )
+ }
+ style={ {
+ maxWidth: '600px',
+ minWidth: '600px',
+ } }
+ shouldCloseOnClickOutside={
+ actionLoading ? false : true
+ }
+ >
+
-
-
-
-
-
-
-
-
- { /* Version Selection for Change Version Action */ }
- { currentAction === 'change-version' && (
+ { showSiteSelectionModal &&
+ selectedPlugin &&
+ currentAction && (
+ - { decodeEntities( selectedPlugin.plugin_info.name ) } -
-- { getActionInfo( currentAction ).description } -
-
+
+ { /* Action Description */ }
- { /* Action Buttons */ }
-
- { getAvailableVersions( selectedPlugin ).length > 0 ? (
-
-
- ) }
+
- ) }
- { /* Action is install then show sites on which plugin is not present */ }
+ { /* Version Selection for Change Version Action */ }
+ { currentAction ===
+ 'change-version' && (
+ - { __( 'No stable versions available for this plugin.', 'oneupdate' ) } -
-+ + { decodeEntities( + selectedPlugin + .plugin_info.name + ) } + +
++ { + getActionInfo( + currentAction + ).description + } +
+ { getAvailableVersions(
+ selectedPlugin
+ ).length > 0 ? (
+
+
+ ) }
+
+ ) }
- { /* Site Selection */ }
- + { __( + 'No stable versions available for this plugin.', + 'oneupdate' + ) } +
+
-
-
-
{ /* Plugin Header */ }
-
+
-
{
overflow: 'hidden',
} }
>
- { selectedPlugin.plugin_info.icon ? (
+ { selectedPlugin.plugin_info
+ .icon ? (
{
} }
/>
) : (
-
-
- by { decodeEntities( selectedPlugin.plugin_info.author ) } +
+
+
{
fontWeight: '500',
} }
>
- Version { selectedPlugin.plugin_info.version }
+ Version{ ' ' }
+ {
+ selectedPlugin
+ .plugin_info.version
+ }
{
fontWeight: '500',
} }
>
- { selectedPlugin.plugin_info.is_public
- ? __( 'Public Plugin', 'oneupdate' )
- : __( 'Private Plugin', 'oneupdate' ) }
+ { selectedPlugin.plugin_info
+ .is_public
+ ? __(
+ 'Public Plugin',
+ 'oneupdate'
+ )
+ : __(
+ 'Private Plugin',
+ 'oneupdate'
+ ) }
- { selectedPlugin.plugin_info.rating > 0 && (
+ { selectedPlugin.plugin_info
+ .rating > 0 && (
- ⭐ { selectedPlugin.plugin_info.rating }% ({ selectedPlugin.plugin_info.num_ratings } reviews)
+ ⭐{ ' ' }
+ {
+ selectedPlugin
+ .plugin_info
+ .rating
+ }
+ % (
+ {
+ selectedPlugin
+ .plugin_info
+ .num_ratings
+ }{ ' ' }
+ reviews)
) }
@@ -2018,7 +3027,14 @@ const PluginManager = () => {
{ /* Description */ }
+ by{ ' ' } + { decodeEntities( + selectedPlugin.plugin_info + .author + ) }
-
-
+
+
{ __( 'Description', 'oneupdate' ) }
{
fontSize: '14px',
} }
dangerouslySetInnerHTML={ {
- __html: selectedPlugin.plugin_info.full_description || selectedPlugin.plugin_info.description,
+ __html:
+ selectedPlugin.plugin_info
+ .full_description ||
+ selectedPlugin.plugin_info
+ .description,
} }
/>
{ /* Plugin Details Grid */ }
-
+
-
+
{ __( 'Author', 'oneupdate' ) }
-
{ selectedPlugin.plugin_info.author }
+
+ {
+ selectedPlugin.plugin_info
+ .author
+ }
+
-
+
{ __( 'Version', 'oneupdate' ) }
-
{ selectedPlugin.plugin_info.version }
+
+ {
+ selectedPlugin.plugin_info
+ .version
+ }
+
-
+
{ __( 'Sites', 'oneupdate' ) }
-
- { selectedPlugin.active_sites }/{ selectedPlugin.total_sites } active
+
+ { selectedPlugin.active_sites }/
+ { selectedPlugin.total_sites }{ ' ' }
+ active
- { selectedPlugin.plugin_info.downloaded > 0 && (
+ { selectedPlugin.plugin_info.downloaded >
+ 0 && (
-
- { __( 'Downloads', 'oneupdate' ) }
+
+ { __(
+ 'Downloads',
+ 'oneupdate'
+ ) }
-
+
{ selectedPlugin.plugin_info.downloaded.toLocaleString() }
) }
{ selectedPlugin.plugin_info.requires && (
-
- { __( 'Requires WordPress', 'oneupdate' ) }
+
+ { __(
+ 'Requires WordPress',
+ 'oneupdate'
+ ) }
-
{ selectedPlugin.plugin_info.requires }
+
+ {
+ selectedPlugin.plugin_info
+ .requires
+ }
+
) }
{ selectedPlugin.plugin_info.tested && (
-
- { __( 'Tested up to', 'oneupdate' ) }
+
+ { __(
+ 'Tested up to',
+ 'oneupdate'
+ ) }
-
{ selectedPlugin.plugin_info.tested }
+
+ {
+ selectedPlugin.plugin_info
+ .tested
+ }
+
) }
- { selectedPlugin.plugin_info.requires_php && (
+ { selectedPlugin.plugin_info
+ .requires_php && (
-
- { __( 'Requires PHP', 'oneupdate' ) }
+
+ { __(
+ 'Requires PHP',
+ 'oneupdate'
+ ) }
-
{ selectedPlugin.plugin_info.requires_php }
+
+ {
+ selectedPlugin.plugin_info
+ .requires_php
+ }
+
) }
- { selectedPlugin.plugin_info.last_updated && (
+ { selectedPlugin.plugin_info
+ .last_updated && (
-
- { __( 'Last Updated', 'oneupdate' ) }
+
+ { __(
+ 'Last Updated',
+ 'oneupdate'
+ ) }
-
- { new Date( selectedPlugin.plugin_info.last_updated ).toLocaleDateString() }
+
+ { new Date(
+ selectedPlugin.plugin_info.last_updated
+ ).toLocaleDateString() }
) }
{ /* Tags */ }
- { selectedPlugin.plugin_info.tags && Object.keys( selectedPlugin.plugin_info.tags ).length > 0 && (
-
-
- { __( 'Tags', 'oneupdate' ) }
-
-
- { Object.keys( selectedPlugin.plugin_info.tags ).map( ( tag ) => (
-
-
- { tag }
-
-
- ) ) }
-
-
- ) }
+ { selectedPlugin.plugin_info.tags &&
+ Object.keys(
+ selectedPlugin.plugin_info.tags
+ ).length > 0 && (
+
+
+ { __( 'Tags', 'oneupdate' ) }
+
+
+ { Object.keys(
+ selectedPlugin.plugin_info
+ .tags
+ ).map( ( tag ) => (
+
+
+ { tag }
+
+
+ ) ) }
+
+
+ ) }
{ /* Plugin URI */ }
{ selectedPlugin.plugin_info.plugin_uri && (
-
+
{ __( 'Plugin URI', 'oneupdate' ) }
- { selectedPlugin.plugin_info.plugin_uri }
+ {
+ selectedPlugin.plugin_info
+ .plugin_uri
+ }
) }
@@ -2148,8 +3355,18 @@ const PluginManager = () => {
{ /* Installation Instructions */ }
{ selectedPlugin.plugin_info.installation && (
-
- { __( 'Installation', 'oneupdate' ) }
+
+ { __(
+ 'Installation',
+ 'oneupdate'
+ ) }
{
lineHeight: '1.6',
fontSize: '14px',
} }
- dangerouslySetInnerHTML={ { __html: selectedPlugin.plugin_info.installation } }
+ dangerouslySetInnerHTML={ {
+ __html: selectedPlugin
+ .plugin_info.installation,
+ } }
/>
) }
@@ -2165,7 +3385,14 @@ const PluginManager = () => {
{ /* FAQ */ }
{ selectedPlugin.plugin_info.faq && (
-
+
{ __( 'FAQ', 'oneupdate' ) }
{
lineHeight: '1.6',
fontSize: '14px',
} }
- dangerouslySetInnerHTML={ { __html: selectedPlugin.plugin_info.faq } }
+ dangerouslySetInnerHTML={ {
+ __html: selectedPlugin
+ .plugin_info.faq,
+ } }
/>
) }
@@ -2182,7 +3412,14 @@ const PluginManager = () => {
{ /* Changelog */ }
{ selectedPlugin.plugin_info.changelog && (
-
+
{ __( 'Changelog', 'oneupdate' ) }
{
borderRadius: '8px',
border: '1px solid #e9ecef',
} }
- dangerouslySetInnerHTML={ { __html: selectedPlugin.plugin_info.changelog } }
+ dangerouslySetInnerHTML={ {
+ __html: selectedPlugin
+ .plugin_info.changelog,
+ } }
/>
) }
-
+
@@ -2220,47 +3467,99 @@ const PluginManager = () => {
title={ sprintf(
/* translators: %s is the plugin name */
__( '%s - Sites', 'oneupdate' ),
- selectedPlugin.plugin_info.name,
+ selectedPlugin.plugin_info.name
) }
onRequestClose={ () => setShowSitesModal( false ) }
style={ { maxWidth: '400px', minWidth: '400px' } }
- shouldCloseOnClickOutside={ true }
+ shouldCloseOnClickOutside
>
-
- { __( 'Plugin status across all sites', 'oneupdate' ) }
+
+ { __(
+ 'Plugin status across all sites',
+ 'oneupdate'
+ ) }
-
- { Object.entries( selectedPlugin.sites ).map( ( [ url, siteInfo ] ) => (
+
+ { Object.entries(
+ selectedPlugin.sites
+ ).map( ( [ url, siteInfo ] ) => (
-
-
+
+
-
+
-
- { siteInfo.site_name || formatSiteUrl( url ) }
+
+ { siteInfo.site_name ||
+ formatSiteUrl(
+ url
+ ) }
-
- { ( url ) } • v{ siteInfo.version }
+
+ { url } • v
+ {
+ siteInfo.version
+ }
@@ -2270,14 +3569,24 @@ const PluginManager = () => {
{ siteInfo.is_active
- ? __( 'Active', 'oneupdate' )
- : __( 'Inactive', 'oneupdate' ) }
+ ? __(
+ 'Active',
+ 'oneupdate'
+ )
+ : __(
+ 'Inactive',
+ 'oneupdate'
+ ) }
{ siteInfo.is_update_available && (
@@ -2285,13 +3594,20 @@ const PluginManager = () => {
- { __( 'Update Available', 'oneupdate' ) }
+ { __(
+ 'Update Available',
+ 'oneupdate'
+ ) }
) }
@@ -2303,10 +3619,17 @@ const PluginManager = () => {
) ) }
-
+
diff --git a/assets/src/admin/pull-requests/index.js b/assets/src/admin/pull-requests/index.js
index af59f14..83a88f8 100644
--- a/assets/src/admin/pull-requests/index.js
+++ b/assets/src/admin/pull-requests/index.js
@@ -1,7 +1,12 @@
/**
* WordPress dependencies
*/
-import { useState, useEffect, useCallback, createRoot } from '@wordpress/element';
+import {
+ useState,
+ useEffect,
+ useCallback,
+ createRoot,
+} from '@wordpress/element';
import { __ } from '@wordpress/i18n';
import {
Card,
@@ -20,9 +25,13 @@ import {
} from '@wordpress/components';
import { decodeEntities } from '@wordpress/html-entities';
import { moreVertical } from '@wordpress/icons';
+/**
+ * Internal dependencies
+ */
import ViewIcon from '../../components/icons/View';
-const API_NAMESPACE = window.OneUpdatePullRequests.restUrl + '/oneupdate/v1/github';
+const API_NAMESPACE =
+ window.OneUpdatePullRequests.restUrl + '/oneupdate/v1/github';
const NONCE = window.OneUpdatePullRequests.restNonce;
const REPOS = window.OneUpdatePullRequests.repos;
@@ -40,7 +49,9 @@ const GitHubPullRequests = () => {
const [ pullRequests, setPullRequests ] = useState( [] );
const [ loading, setLoading ] = useState( false );
const [ notice, setNotice ] = useState( null );
- const [ selectedRepo, setSelectedRepo ] = useState( Object.keys( REPOS )?.[ 0 ] || '' );
+ const [ selectedRepo, setSelectedRepo ] = useState(
+ Object.keys( REPOS )?.[ 0 ] || ''
+ );
const [ statusFilter, setStatusFilter ] = useState( 'all' );
const [ searchQuery, setSearchQuery ] = useState( '[OneUpdate]' );
const [ page, setPage ] = useState( 1 );
@@ -90,19 +101,25 @@ const GitHubPullRequests = () => {
'Content-Type': 'application/json',
'X-WP-NONCE': NONCE,
},
- },
+ }
);
if ( ! response.ok ) {
if ( response?.statusText === 'Unprocessable Entity' ) {
setNotice( {
type: 'error',
- message: __( 'Please enter valid character to search pull requests.', 'oneupdate' ),
+ message: __(
+ 'Please enter valid character to search pull requests.',
+ 'oneupdate'
+ ),
} );
} else {
setNotice( {
type: 'error',
- message: __( 'Failed to fetch pull requests.', 'oneupdate' ),
+ message: __(
+ 'Failed to fetch pull requests.',
+ 'oneupdate'
+ ),
} );
}
return;
@@ -113,7 +130,9 @@ const GitHubPullRequests = () => {
if ( data.success ) {
setPullRequests( data.pull_requests || [] );
// Calculate total pages based on response (you might need to adjust based on your API)
- const totalCount = response.headers.get( 'X-WP-Total' ) || data.pull_requests.length;
+ const totalCount =
+ response.headers.get( 'X-WP-Total' ) ||
+ data.pull_requests.length;
setTotalPages( Math.ceil( totalCount / PER_PAGE ) );
setCurrentPage( data?.pagination?.current_page || 1 );
} else {
@@ -125,7 +144,9 @@ const GitHubPullRequests = () => {
} catch ( error ) {
setNotice( {
type: 'error',
- message: error.message || __( 'Error fetching pull requests.', 'oneupdate' ),
+ message:
+ error.message ||
+ __( 'Error fetching pull requests.', 'oneupdate' ),
} );
setPullRequests( [] );
} finally {
@@ -133,43 +154,48 @@ const GitHubPullRequests = () => {
}
}, [ selectedRepo, statusFilter, searchQuery, page ] );
- const fetchPRDetails = useCallback( async ( prNumber ) => {
- if ( ! selectedRepo || ! prNumber ) {
- return;
- }
-
- setDetailsLoading( true );
- try {
- const response = await fetch(
- `${ API_NAMESPACE }/pull-requests/${ selectedRepo }?pr_number=${ prNumber }&_=${ new Date().getTime() }`,
- {
- headers: {
- 'Content-Type': 'application/json',
- 'X-WP-NONCE': NONCE,
- },
- },
- );
-
- if ( ! response.ok ) {
- throw new Error( 'Failed to fetch PR details' );
+ const fetchPRDetails = useCallback(
+ async ( prNumber ) => {
+ if ( ! selectedRepo || ! prNumber ) {
+ return;
}
- const data = await response.json();
+ setDetailsLoading( true );
+ try {
+ const response = await fetch(
+ `${ API_NAMESPACE }/pull-requests/${ selectedRepo }?pr_number=${ prNumber }&_=${ new Date().getTime() }`,
+ {
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-WP-NONCE': NONCE,
+ },
+ }
+ );
+
+ if ( ! response.ok ) {
+ throw new Error( 'Failed to fetch PR details' );
+ }
- if ( data.success && data.pull_request?.[ 0 ] ) {
- setPrDetails( data.pull_request[ 0 ] );
- } else {
- throw new Error( 'Failed to fetch PR details' );
+ const data = await response.json();
+
+ if ( data.success && data.pull_request?.[ 0 ] ) {
+ setPrDetails( data.pull_request[ 0 ] );
+ } else {
+ throw new Error( 'Failed to fetch PR details' );
+ }
+ } catch ( error ) {
+ setNotice( {
+ type: 'error',
+ message:
+ error.message ||
+ __( 'Error fetching PR details.', 'oneupdate' ),
+ } );
+ } finally {
+ setDetailsLoading( false );
}
- } catch ( error ) {
- setNotice( {
- type: 'error',
- message: error.message || __( 'Error fetching PR details.', 'oneupdate' ),
- } );
- } finally {
- setDetailsLoading( false );
- }
- }, [ selectedRepo ] );
+ },
+ [ selectedRepo ]
+ );
const openDetailModal = ( pr ) => {
setSelectedPR( pr );
@@ -242,7 +268,10 @@ const GitHubPullRequests = () => {
onClose();
} }
>
- { __( 'View Details', 'oneupdate' ) }
+ { __(
+ 'View Details',
+ 'oneupdate'
+ ) }
) }
@@ -285,10 +314,21 @@ const GitHubPullRequests = () => {
{ /* Filters */ }
-
+
- { __( 'PR #', 'oneupdate' ) }
- { __( 'Title', 'oneupdate' ) }
- { __( 'Author', 'oneupdate' ) }
- { __( 'Status', 'oneupdate' ) }
- { __( 'Created at', 'oneupdate' ) }
- { __( 'Labels', 'oneupdate' ) }
- { __( 'Actions', 'oneupdate' ) }
+
+ { __( 'PR #', 'oneupdate' ) }
+
+
+ { __( 'Title', 'oneupdate' ) }
+
+
+ { __( 'Author', 'oneupdate' ) }
+
+
+ { __( 'Status', 'oneupdate' ) }
+
+
+ { __( 'Created at', 'oneupdate' ) }
+
+
+ { __( 'Labels', 'oneupdate' ) }
+
+
+ { __( 'Actions', 'oneupdate' ) }
+
{ loading && (
-
-
+
) }
{ ! loading && pullRequests.length === 0 && (
-
- { __( 'No pull requests found.', 'oneupdate' ) }
+
+ { __(
+ 'No pull requests found.',
+ 'oneupdate'
+ ) }
) }
@@ -340,7 +411,10 @@ const GitHubPullRequests = () => {
#{ pr.number }
@@ -351,11 +425,19 @@ const GitHubPullRequests = () => {
target="_blank"
rel="noopener noreferrer"
>
- { decodeEntities( pr.title ) }
+
+ { decodeEntities( pr.title ) }
+
-
+
{
{ formatDate( pr.created_at ) }
{ pr.labels.length > 0 ? (
-
- { pr.labels.slice( 0, 2 ).map( ( label ) => (
+
+ { pr.labels
+ .slice( 0, 2 )
+ .map( ( label ) => (
+
+ { label.name }
+
+ ) ) }
+ { pr.labels.length > 2 && (
- { label.name }
-
- ) ) }
- { pr.labels.length > 2 && (
-
- +{ pr.labels.length - 2 } { __( 'more', 'oneupdate' ) }
+ +
+ { pr.labels.length - 2 }{ ' ' }
+ { __(
+ 'more',
+ 'oneupdate'
+ ) }
) }
) : (
-
- { __( 'No labels', 'oneupdate' ) }
+
+ { __(
+ 'No labels',
+ 'oneupdate'
+ ) }
) }
@@ -400,29 +510,43 @@ const GitHubPullRequests = () => {
{ /* Pagination */ }
- { (
-
-
-
- { __( 'Page', 'oneupdate' ) } { page } { __( 'of', 'oneupdate' ) } { totalPages === 0 || totalPages < currentPage ? currentPage : totalPages }
-
-
-
- ) }
+
+
+
+ { __( 'Page', 'oneupdate' ) } { page }{ ' ' }
+ { __( 'of', 'oneupdate' ) }{ ' ' }
+ { totalPages === 0 || totalPages < currentPage
+ ? currentPage
+ : totalPages }
+
+
+
@@ -432,12 +556,16 @@ const GitHubPullRequests = () => {
title={ __( 'Pull Request Details', 'oneupdate' ) }
onRequestClose={ closeModals }
size="medium"
- shouldCloseOnClickOutside={ true }
+ shouldCloseOnClickOutside
>
{ /* Detailed PR Info */ }
{ detailsLoading && (
-
- { __( 'Loading PR details…', 'oneupdate' ) }
) }
@@ -445,21 +573,90 @@ const GitHubPullRequests = () => {
{ ! detailsLoading && prDetails && (
<>
-
+
- { __( 'PR Number:', 'oneupdate' ) } #{ prDetails.number }
- { __( 'Title:', 'oneupdate' ) } { decodeEntities( prDetails.title ) }
- { __( 'Author:', 'oneupdate' ) } { prDetails.user.login }
- { __( 'Status:', 'oneupdate' ) } { getPRStatusBadge( prDetails ) }
+
+
+ { __(
+ 'PR Number:',
+ 'oneupdate'
+ ) }
+ { ' ' }
+ #{ prDetails.number }
+
+
+
+ { __( 'Title:', 'oneupdate' ) }
+ { ' ' }
+ { decodeEntities(
+ prDetails.title
+ ) }
+
+
+
+ { __( 'Author:', 'oneupdate' ) }
+ { ' ' }
+ { prDetails.user.login }
+
+
+
+ { __( 'Status:', 'oneupdate' ) }
+ { ' ' }
+ { getPRStatusBadge( prDetails ) }
+
- { __( 'Created:', 'oneupdate' ) } { formatDate( prDetails.created_at ) }
- { __( 'Updated:', 'oneupdate' ) } { formatDate( prDetails.updated_at ) }
- { __( 'Branch:', 'oneupdate' ) } { prDetails.pr_branch } → { prDetails.base_branch }
- { __( 'GitHub URL:', 'oneupdate' ) }{ ' ' }
-
- { __( 'View on GitHub', 'oneupdate' ) }
+
+ { __(
+ 'Created:',
+ 'oneupdate'
+ ) }
+ { ' ' }
+ { formatDate(
+ prDetails.created_at
+ ) }
+
+
+
+ { __(
+ 'Updated:',
+ 'oneupdate'
+ ) }
+ { ' ' }
+ { formatDate(
+ prDetails.updated_at
+ ) }
+
+
+
+ { __( 'Branch:', 'oneupdate' ) }
+ { ' ' }
+ { prDetails.pr_branch } →{ ' ' }
+ { prDetails.base_branch }
+
+
+
+ { __(
+ 'GitHub URL:',
+ 'oneupdate'
+ ) }
+ { ' ' }
+
+ { __(
+ 'View on GitHub',
+ 'oneupdate'
+ ) }
@@ -468,16 +665,29 @@ const GitHubPullRequests = () => {
{ /* Labels */ }
{ prDetails.labels.length > 0 && (
- { __( 'Labels:', 'oneupdate' ) }
-
- { prDetails.labels.map( ( label ) => (
-
- { label.name }
-
- ) ) }
+
+ { __( 'Labels:', 'oneupdate' ) }
+
+
+ { prDetails.labels.map(
+ ( label ) => (
+
+ { label.name }
+
+ )
+ ) }
) }
@@ -485,7 +695,12 @@ const GitHubPullRequests = () => {
{ /* Description */ }
{ prDetails.body && (
- { __( 'Description:', 'oneupdate' ) }
+
+ { __(
+ 'Description:',
+ 'oneupdate'
+ ) }
+
{
overflow: 'auto',
} }
>
-
- { decodeEntities( prDetails.body ) }
+
+ { decodeEntities(
+ prDetails.body
+ ) }
@@ -507,14 +730,29 @@ const GitHubPullRequests = () => {
{ /* Merged By Info */ }
{ prDetails.merged_by && (
-
-
+
{ prDetails.merged_by && (
- { __( 'Merged By:', 'oneupdate' ) }
+
+ { __(
+ 'Merged By:',
+ 'oneupdate'
+ ) }
+
{
verticalAlign: 'middle',
} }
/>
- { prDetails.merged_by.login }
+
+ { prDetails.merged_by.login }
+
) }
) }
) }
-
) }
@@ -540,7 +784,11 @@ const GitHubPullRequests = () => {
isDismissible
status={ notice.type }
onRemove={ () => setNotice( null ) }
- className={ notice?.type === 'error' ? 'oneupdate-error-notice' : 'oneupdate-success-notice' }
+ className={
+ notice?.type === 'error'
+ ? 'oneupdate-error-notice'
+ : 'oneupdate-success-notice'
+ }
>
{ notice.message }
diff --git a/assets/src/admin/settings/index.tsx b/assets/src/admin/settings/index.tsx
index 6150a88..c7dd780 100644
--- a/assets/src/admin/settings/index.tsx
+++ b/assets/src/admin/settings/index.tsx
@@ -1,6 +1,9 @@
/**
* WordPress dependencies
*/
+/**
+ * External dependencies
+ */
import { createRoot } from 'react-dom/client';
/**
diff --git a/assets/src/admin/settings/page.tsx b/assets/src/admin/settings/page.tsx
index e002974..6ba3ef3 100644
--- a/assets/src/admin/settings/page.tsx
+++ b/assets/src/admin/settings/page.tsx
@@ -1,6 +1,9 @@
/**
* WordPress dependencies
*/
+/**
+ * External dependencies
+ */
import { useState, useEffect, useCallback } from 'react';
import { __ } from '@wordpress/i18n';
import { Snackbar } from '@wordpress/components';
@@ -26,7 +29,7 @@ export interface BrandSite {
name: string;
url: string;
api_key: string;
- gh_repo: string;
+ gh_repo: string;
}
export const defaultBrandSite: BrandSite = {
@@ -39,7 +42,7 @@ export const defaultBrandSite: BrandSite = {
export type EditingIndex = number | null;
const NONCE = window.OneUpdateSettings.restNonce;
-const SITE_TYPE = window.OneUpdateSettings.siteType as SiteType || '';
+const SITE_TYPE = ( window.OneUpdateSettings.siteType as SiteType ) || '';
const SHARED_SITES_ENDPOINT = '/oneupdate/v1/shared-sites';
const API_NAMESPACE = window.OneUpdateSettings.restUrl + '/oneupdate/v1';
@@ -57,16 +60,13 @@ const SettingsPage = () => {
const [ allGitHubRepos, setAllGitHubRepos ] = useState( [] );
const fetchAllAvailableGitHubRepos = useCallback( async () => {
- const response = await fetch(
- `${ API_NAMESPACE }/github-repos`,
- {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json',
- 'X-WP-NONCE': NONCE,
- },
+ const response = await fetch( `${ API_NAMESPACE }/github-repos`, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-WP-NONCE': NONCE,
},
- );
+ } );
const data = await response.json();
if ( data?.repos ) {
setAllGitHubRepos( data.repos );
@@ -82,7 +82,7 @@ const SettingsPage = () => {
}, [ SITE_TYPE ] );
useEffect( () => {
- apiFetch<{ shared_sites?: BrandSite[] }>( {
+ apiFetch< { shared_sites?: BrandSite[] } >( {
path: SHARED_SITES_ENDPOINT,
} )
.then( ( data ) => {
@@ -104,89 +104,115 @@ const SettingsPage = () => {
}
}, [ sites ] );
- const handleFormSubmit = async () : Promise< boolean > => {
- const updated : BrandSite[] = editingIndex !== null
- ? sites.map( ( item, i ) => ( i === editingIndex ? formData : item ) )
- : [ ...sites, formData ];
+ const handleFormSubmit = async (): Promise< boolean > => {
+ const updated: BrandSite[] =
+ editingIndex !== null
+ ? sites.map( ( item, i ) =>
+ i === editingIndex ? formData : item
+ )
+ : [ ...sites, formData ];
- return apiFetch<{ shared_sites?: BrandSite[] }>( {
+ return apiFetch< { shared_sites?: BrandSite[] } >( {
path: SHARED_SITES_ENDPOINT,
method: 'POST',
data: { sites_data: updated },
- } ).then( ( data ) => {
- if ( ! data?.shared_sites ) {
- throw new Error( 'No shared sites in response' );
- }
+ } )
+ .then( ( data ) => {
+ if ( ! data?.shared_sites ) {
+ throw new Error( 'No shared sites in response' );
+ }
- if ( data.shared_sites.length === 1 && sites.length === 0 ) {
- // Reloading causes the menus etc to reflect the missing sites.
- window.location.reload();
- }
+ if ( data.shared_sites.length === 1 && sites.length === 0 ) {
+ // Reloading causes the menus etc to reflect the missing sites.
+ window.location.reload();
+ }
- setSites( data.shared_sites );
+ setSites( data.shared_sites );
- setNotice( {
- type: 'success',
- message: __( 'Brand Site saved successfully.', 'oneupdate' ),
- } );
- return true;
- } ).catch( () => {
- setNotice( {
- type: 'error',
- message: __( 'Failed to update shared sites', 'oneupdate' ),
+ setNotice( {
+ type: 'success',
+ message: __(
+ 'Brand Site saved successfully.',
+ 'oneupdate'
+ ),
+ } );
+ return true;
+ } )
+ .catch( () => {
+ setNotice( {
+ type: 'error',
+ message: __( 'Failed to update shared sites', 'oneupdate' ),
+ } );
+ return false;
+ } )
+ .finally( () => {
+ setFormData( defaultBrandSite );
+ setShowModal( false );
+ setEditingIndex( null );
} );
- return false;
- } ).finally( () => {
- setFormData( defaultBrandSite );
- setShowModal( false );
- setEditingIndex( null );
- } );
};
- const handleDelete = async ( index : number|null ) : Promise => {
- const updated : BrandSite[] = sites.filter( ( _, i ) => i !== index );
+ const handleDelete = async ( index: number | null ): Promise< void > => {
+ const updated: BrandSite[] = sites.filter( ( _, i ) => i !== index );
- apiFetch<{ shared_sites?: BrandSite[] }>( {
+ apiFetch< { shared_sites?: BrandSite[] } >( {
path: SHARED_SITES_ENDPOINT,
method: 'POST',
data: { sites_data: updated },
- } ).then( ( data ) => {
- if ( ! data?.shared_sites ) {
- throw new Error( 'No shared sites in response' );
- }
- setSites( data.shared_sites );
-
- if ( data.shared_sites.length === 0 ) {
- // Reloading causes the menus etc to reflect the missing sites.
- window.location.reload();
- } else {
- document.body.classList.remove( 'oneupdate-missing-brand-sites' );
- }
- } ).catch( () => {
- throw new Error( 'Failed to update shared sites' );
- } );
+ } )
+ .then( ( data ) => {
+ if ( ! data?.shared_sites ) {
+ throw new Error( 'No shared sites in response' );
+ }
+ setSites( data.shared_sites );
+
+ if ( data.shared_sites.length === 0 ) {
+ // Reloading causes the menus etc to reflect the missing sites.
+ window.location.reload();
+ } else {
+ document.body.classList.remove(
+ 'oneupdate-missing-brand-sites'
+ );
+ }
+ } )
+ .catch( () => {
+ throw new Error( 'Failed to update shared sites' );
+ } );
};
return (
<>
- { !! notice && notice?.message?.length > 0 &&
+ { !! notice && notice?.message?.length > 0 && (
setNotice( null ) }
- className={ notice?.type === 'error' ? 'oneupdate-error-notice' : 'oneupdate-success-notice' }
+ className={
+ notice?.type === 'error'
+ ? 'oneupdate-error-notice'
+ : 'oneupdate-success-notice'
+ }
>
{ notice?.message }
- }
-
- { SITE_TYPE === 'brand-site' && (
- ,
- },
-) => {
+const GitHubRepoToken = ( {
+ setNotice,
+ fetchAllAvailableGitHubRepos,
+}: {
+ setNotice: ( notice: NoticeType ) => void;
+ fetchAllAvailableGitHubRepos: () => Promise< void >;
+} ) => {
const [ repoToken, setRepoToken ] = useState( '' );
const getRepoToken = useCallback( async () => {
- const response = await fetch(
- `${ API_NAMESPACE }/github-token`,
- {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json',
- 'X-WP-NONCE': NONCE,
- },
+ const response = await fetch( `${ API_NAMESPACE }/github-token`, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-WP-NONCE': NONCE,
},
- );
+ } );
if ( ! response.ok ) {
- console.error( 'Error fetching GitHub token:', response.statusText ); // eslint-disable-line no-console
+ console.error(
+ 'Error fetching GitHub token:',
+ response.statusText
+ );
}
const data = await response.json();
@@ -51,23 +54,23 @@ const GitHubRepoToken = (
getRepoToken();
}, [] );
- const setGitHubRepoToken = useCallback( async ( token : string ) => {
- const response = await fetch(
- `${ API_NAMESPACE }/github-token`,
- {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- 'X-WP-NONCE': NONCE,
- },
- body: JSON.stringify( { token } ),
+ const setGitHubRepoToken = useCallback( async ( token: string ) => {
+ const response = await fetch( `${ API_NAMESPACE }/github-token`, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-WP-NONCE': NONCE,
},
- );
+ body: JSON.stringify( { token } ),
+ } );
if ( response.ok === false || response.status === 400 ) {
setNotice( {
type: 'error',
- message: __( 'Please enter valid GitHub PAT token.', 'oneupdate' ),
+ message: __(
+ 'Please enter valid GitHub PAT token.',
+ 'oneupdate'
+ ),
} );
return;
}
@@ -76,7 +79,9 @@ const GitHubRepoToken = (
if ( data?.status === '400' ) {
setNotice( {
type: 'error',
- message: data?.message || __( 'Enter valid PAT token.', 'oneupdate' ),
+ message:
+ data?.message ||
+ __( 'Enter valid PAT token.', 'oneupdate' ),
} );
return;
}
@@ -93,11 +98,7 @@ const GitHubRepoToken = (
}, [] );
return (
-
+
{ __( 'GitHub Credentials', 'oneupdate' ) }
-
);
};
diff --git a/assets/src/components/PluginCard.js b/assets/src/components/PluginCard.js
index 3c7ac57..e1cf099 100644
--- a/assets/src/components/PluginCard.js
+++ b/assets/src/components/PluginCard.js
@@ -1,3 +1,6 @@
+/**
+ * WordPress dependencies
+ */
import { decodeEntities } from '@wordpress/html-entities';
import { Button, SelectControl } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
@@ -8,7 +11,13 @@ const PluginCard = ( {
onSelect,
onVersionChange,
} ) => {
- const { name, slug, version, short_description: shortDescription, versions } = plugin;
+ const {
+ name,
+ slug,
+ version,
+ short_description: shortDescription,
+ versions,
+ } = plugin;
const selectedEntry = selectedPlugin?.find( ( p ) => p.slug === slug );
const isSelected = !! selectedEntry;
@@ -27,18 +36,28 @@ const PluginCard = ( {
};
return (
-
+
-
+
{ decodeEntities( name ) }
@@ -56,14 +75,22 @@ const PluginCard = ( {
{ isSelected && (
{
+const PluginVersionSelectControl = ( {
+ versions,
+ selectedVersion,
+ onChange,
+} ) => {
const getLastFiveVersions = ( versionsObj ) => {
if ( ! versionsObj || typeof versionsObj !== 'object' ) {
return [];
}
- const versionKeys = Object.keys( versionsObj )
- .filter( ( key ) => key !== 'trunk' && ! /(alpha|beta|rc|dev|a)/i.test( key ) );
+ const versionKeys = Object.keys( versionsObj ).filter(
+ ( key ) => key !== 'trunk' && ! /(alpha|beta|rc|dev|a)/i.test( key )
+ );
const sortedVersions = versionKeys.sort( ( a, b ) => {
- const aParts = a.split( '.' ).map( ( part ) => parseInt( part, 10 ) || 0 );
- const bParts = b.split( '.' ).map( ( part ) => parseInt( part, 10 ) || 0 );
+ const aParts = a
+ .split( '.' )
+ .map( ( part ) => parseInt( part, 10 ) || 0 );
+ const bParts = b
+ .split( '.' )
+ .map( ( part ) => parseInt( part, 10 ) || 0 );
const maxLength = Math.max( aParts.length, bParts.length );
for ( let i = 0; i < maxLength; i++ ) {
diff --git a/assets/src/components/PluginGrid.js b/assets/src/components/PluginGrid.js
index 4e3f8e1..ea94bbc 100644
--- a/assets/src/components/PluginGrid.js
+++ b/assets/src/components/PluginGrid.js
@@ -1,7 +1,20 @@
+/**
+ * WordPress dependencies
+ */
import { useState, useEffect, useCallback } from '@wordpress/element';
import { __ } from '@wordpress/i18n';
-import { Button, CheckboxControl, Modal, Spinner, TextControl, Notice } from '@wordpress/components';
-
+import {
+ Button,
+ CheckboxControl,
+ Modal,
+ Spinner,
+ TextControl,
+ Notice,
+} from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
import PluginCard from './PluginCard';
const API_NAMESPACE = OneUpdatePlugins.restUrl + '/oneupdate/v1';
@@ -31,7 +44,9 @@ const PluginGrid = () => {
const response = await fetch( WORDPRESS_PLUGINS_API );
if ( ! response.ok ) {
- throw new Error( __( 'Failed to fetch plugins.', 'oneupdate' ) );
+ throw new Error(
+ __( 'Failed to fetch plugins.', 'oneupdate' )
+ );
}
const data = await response.json();
@@ -59,7 +74,7 @@ const PluginGrid = () => {
const existing = prev.find( ( p ) => p.slug === slug );
if ( existing ) {
return prev.map( ( p ) =>
- p.slug === slug ? { ...p, version } : p,
+ p.slug === slug ? { ...p, version } : p
);
}
return [ ...prev, { slug, version } ];
@@ -68,23 +83,18 @@ const PluginGrid = () => {
const handleVersionChange = ( slug, version ) => {
setSelectedPlugin( ( prev ) =>
- prev.map( ( p ) =>
- p.slug === slug ? { ...p, version } : p,
- ),
+ prev.map( ( p ) => ( p.slug === slug ? { ...p, version } : p ) )
);
};
const fetchSharedSitesData = useCallback( async () => {
- const response = await fetch(
- `${ API_NAMESPACE }/shared-sites`,
- {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json',
- 'X-ONEUPDATE-TOKEN': API_KEY,
- },
+ const response = await fetch( `${ API_NAMESPACE }/shared-sites`, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-ONEUPDATE-TOKEN': API_KEY,
},
- );
+ } );
const data = await response.json();
if ( data?.shared_sites ) {
setSharedSites( data.shared_sites );
@@ -106,29 +116,24 @@ const PluginGrid = () => {
return (
-
{ /* Notice State */ }
{ isNoticeVisible && (
-
+
{ noticeMessage.message }
) }
{ /* Search Bar */ }
-
{
}
} }
/>
-
@@ -152,7 +154,9 @@ const PluginGrid = () => {
{ loading && (
{ __( 'Loading plugins…', 'oneupdate' ) }
+
+ { __( 'Loading plugins…', 'oneupdate' ) }
+
) }
@@ -162,10 +166,7 @@ const PluginGrid = () => {
{ __( 'Unable to load plugins', 'oneupdate' ) }
{ error }
-
@@ -177,11 +178,13 @@ const PluginGrid = () => {
{ __( 'No plugins found', 'oneupdate' ) }
- { __( 'Unable to find any plugins to display.', 'oneupdate' ) }
-
@@ -204,10 +207,16 @@ const PluginGrid = () => {
@@ -241,17 +250,24 @@ const PluginGrid = () => {
- { __( 'Page', 'oneupdate' ) } { page } { __( 'of', 'oneupdate' ) } { totalPages }
+ { __( 'Page', 'oneupdate' ) } { page }{ ' ' }
+ { __( 'of', 'oneupdate' ) } { totalPages }
-
);
};
-const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, setNoticeMessage, setIsNoticeVisible, setSelectedPlugin } ) => {
+const ApplyPluginsModal = ( {
+ sharedSites,
+ selectedPlugin,
+ setShowApplyModal,
+ setNoticeMessage,
+ setIsNoticeVisible,
+ setSelectedPlugin,
+} ) => {
const [ selectedSite, setSelectedSite ] = useState( [] );
const [ selectedSiteInfo, setSelectedSiteInfo ] = useState( [] );
@@ -281,7 +303,7 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
// based on selected sites need to get all info from sharedsites for all selected sites
useEffect( () => {
const selectedSiteFullInfo = sharedSites.filter( ( site ) =>
- selectedSite.includes( site.url ),
+ selectedSite.includes( site.url )
);
setSelectedSiteInfo( selectedSiteFullInfo );
@@ -289,26 +311,26 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
const handleApplyPlugins = async () => {
try {
- const response = await fetch(
- `${ API_NAMESPACE }/apply-plugins`,
- {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- 'X-ONEUPDATE-TOKEN': API_KEY,
- },
- body: JSON.stringify( {
- sites: selectedSiteInfo,
- plugins: selectedPlugin,
- } ),
+ const response = await fetch( `${ API_NAMESPACE }/apply-plugins`, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-ONEUPDATE-TOKEN': API_KEY,
},
- );
+ body: JSON.stringify( {
+ sites: selectedSiteInfo,
+ plugins: selectedPlugin,
+ } ),
+ } );
const data = await response.json();
if ( data?.success && data?.created_prs ) {
const prUrls = data?.created_prs;
- const prUrlsArray = prUrls?.map( ( pr ) => {
- return pr?.data?.pr_url || '';
- } ).filter( ( url ) => url !== '' ) || [];
+ const prUrlsArray =
+ prUrls
+ ?.map( ( pr ) => {
+ return pr?.data?.pr_url || '';
+ } )
+ .filter( ( url ) => url !== '' ) || [];
// Join to comma separated string
const prUrlsString = prUrlsArray.join( ', ' );
@@ -316,21 +338,31 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
setIsNoticeVisible( true );
setNoticeMessage( {
type: 'success',
- message: __( 'Plugins applied successfully. Please check the PR at:', 'oneupdate' ) + ` ${ prUrlsString }`,
+ message:
+ __(
+ 'Plugins applied successfully. Please check the PR at:',
+ 'oneupdate'
+ ) + ` ${ prUrlsString }`,
} );
setSelectedPlugin( [] );
} else {
setIsNoticeVisible( true );
setNoticeMessage( {
type: 'error',
- message: __( 'Failed to apply plugins. Please try again.', 'oneupdate' ),
+ message: __(
+ 'Failed to apply plugins. Please try again.',
+ 'oneupdate'
+ ),
} );
}
} catch ( error ) {
setIsNoticeVisible( true );
setNoticeMessage( {
type: 'error',
- message: __( 'An error occurred while applying plugins.', 'oneupdate' ),
+ message: __(
+ 'An error occurred while applying plugins.',
+ 'oneupdate'
+ ),
} );
}
};
@@ -338,12 +370,14 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
return (
- { __( 'Select a site to apply the plugins', 'oneupdate' ) }
+
+ { __( 'Select a site to apply the plugins', 'oneupdate' ) }
+
{ sharedSites.length > 0 ? (
{ sharedSites.map( ( site ) => (
@@ -351,12 +385,19 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
key={ site?.url }
label={ site?.name }
checked={ selectedSite.includes( site?.url ) }
- onChange={ () => handleSiteSelection( site.url ) }
+ onChange={ () =>
+ handleSiteSelection( site.url )
+ }
/>
) ) }
) : (
- { __( 'No sites available to apply plugins.', 'oneupdate' ) }
+
+ { __(
+ 'No sites available to apply plugins.',
+ 'oneupdate'
+ ) }
+
) }
-
+
+
{ __( 'Author', 'oneupdate' ) }
-
{ selectedPlugin.plugin_info.author }
++ { + selectedPlugin.plugin_info + .author + } +
-
+
+
{ __( 'Version', 'oneupdate' ) }
-
{ selectedPlugin.plugin_info.version }
++ { + selectedPlugin.plugin_info + .version + } +
-
+
- { selectedPlugin.plugin_info.downloaded > 0 && (
+ { selectedPlugin.plugin_info.downloaded >
+ 0 && (
+
{ __( 'Sites', 'oneupdate' ) }
-
- { selectedPlugin.active_sites }/{ selectedPlugin.total_sites } active +
+ { selectedPlugin.active_sites }/ + { selectedPlugin.total_sites }{ ' ' } + active
-
- { __( 'Downloads', 'oneupdate' ) }
+
) }
{ selectedPlugin.plugin_info.requires && (
- { __( 'Downloads', 'oneupdate' ) }
+
+ { __(
+ 'Downloads',
+ 'oneupdate'
+ ) }
-
+
{ selectedPlugin.plugin_info.downloaded.toLocaleString() }
-
- { __( 'Requires WordPress', 'oneupdate' ) }
+
) }
{ selectedPlugin.plugin_info.tested && (
- { __( 'Requires WordPress', 'oneupdate' ) }
+
+ { __(
+ 'Requires WordPress',
+ 'oneupdate'
+ ) }
-
{ selectedPlugin.plugin_info.requires }
++ { + selectedPlugin.plugin_info + .requires + } +
-
- { __( 'Tested up to', 'oneupdate' ) }
+
) }
- { selectedPlugin.plugin_info.requires_php && (
+ { selectedPlugin.plugin_info
+ .requires_php && (
- { __( 'Tested up to', 'oneupdate' ) }
+
+ { __(
+ 'Tested up to',
+ 'oneupdate'
+ ) }
-
{ selectedPlugin.plugin_info.tested }
++ { + selectedPlugin.plugin_info + .tested + } +
-
- { __( 'Requires PHP', 'oneupdate' ) }
+
) }
- { selectedPlugin.plugin_info.last_updated && (
+ { selectedPlugin.plugin_info
+ .last_updated && (
- { __( 'Requires PHP', 'oneupdate' ) }
+
+ { __(
+ 'Requires PHP',
+ 'oneupdate'
+ ) }
-
{ selectedPlugin.plugin_info.requires_php }
++ { + selectedPlugin.plugin_info + .requires_php + } +
-
- { __( 'Last Updated', 'oneupdate' ) }
+
) }
- { __( 'Last Updated', 'oneupdate' ) }
+
+ { __(
+ 'Last Updated',
+ 'oneupdate'
+ ) }
-
- { new Date( selectedPlugin.plugin_info.last_updated ).toLocaleDateString() } +
+ { new Date( + selectedPlugin.plugin_info.last_updated + ).toLocaleDateString() }
-
- { Object.keys( selectedPlugin.plugin_info.tags ).map( ( tag ) => (
-
-
- { tag }
-
-
- ) ) }
-
-
- ) }
+ { selectedPlugin.plugin_info.tags &&
+ Object.keys(
+ selectedPlugin.plugin_info.tags
+ ).length > 0 && (
+ - { __( 'Tags', 'oneupdate' ) } -
-
+
+ { Object.keys(
+ selectedPlugin.plugin_info
+ .tags
+ ).map( ( tag ) => (
+
+
+ { tag }
+
+
+ ) ) }
+
+
+ ) }
{ /* Plugin URI */ }
{ selectedPlugin.plugin_info.plugin_uri && (
+ { __( 'Tags', 'oneupdate' ) } +
+
-
+
) }
@@ -2148,8 +3355,18 @@ const PluginManager = () => {
{ /* Installation Instructions */ }
{ selectedPlugin.plugin_info.installation && (
+
{ __( 'Plugin URI', 'oneupdate' ) }
- { selectedPlugin.plugin_info.plugin_uri }
+ {
+ selectedPlugin.plugin_info
+ .plugin_uri
+ }
-
- { __( 'Installation', 'oneupdate' ) }
+
- { __( 'Installation', 'oneupdate' ) }
+
+ { __(
+ 'Installation',
+ 'oneupdate'
+ ) }
{
lineHeight: '1.6',
fontSize: '14px',
} }
- dangerouslySetInnerHTML={ { __html: selectedPlugin.plugin_info.installation } }
+ dangerouslySetInnerHTML={ {
+ __html: selectedPlugin
+ .plugin_info.installation,
+ } }
/>
) }
@@ -2165,7 +3385,14 @@ const PluginManager = () => {
{ /* FAQ */ }
{ selectedPlugin.plugin_info.faq && (
-
+
{ __( 'FAQ', 'oneupdate' ) }
{
lineHeight: '1.6',
fontSize: '14px',
} }
- dangerouslySetInnerHTML={ { __html: selectedPlugin.plugin_info.faq } }
+ dangerouslySetInnerHTML={ {
+ __html: selectedPlugin
+ .plugin_info.faq,
+ } }
/>
) }
@@ -2182,7 +3412,14 @@ const PluginManager = () => {
{ /* Changelog */ }
{ selectedPlugin.plugin_info.changelog && (
-
+
{ __( 'Changelog', 'oneupdate' ) }
{
borderRadius: '8px',
border: '1px solid #e9ecef',
} }
- dangerouslySetInnerHTML={ { __html: selectedPlugin.plugin_info.changelog } }
+ dangerouslySetInnerHTML={ {
+ __html: selectedPlugin
+ .plugin_info.changelog,
+ } }
/>
) }
-
+
@@ -2220,47 +3467,99 @@ const PluginManager = () => {
title={ sprintf(
/* translators: %s is the plugin name */
__( '%s - Sites', 'oneupdate' ),
- selectedPlugin.plugin_info.name,
+ selectedPlugin.plugin_info.name
) }
onRequestClose={ () => setShowSitesModal( false ) }
style={ { maxWidth: '400px', minWidth: '400px' } }
- shouldCloseOnClickOutside={ true }
+ shouldCloseOnClickOutside
>
-
- { __( 'Plugin status across all sites', 'oneupdate' ) }
+
+ { __(
+ 'Plugin status across all sites',
+ 'oneupdate'
+ ) }
-
- { Object.entries( selectedPlugin.sites ).map( ( [ url, siteInfo ] ) => (
+
+ { Object.entries(
+ selectedPlugin.sites
+ ).map( ( [ url, siteInfo ] ) => (
-
-
+
+
-
+
-
- { siteInfo.site_name || formatSiteUrl( url ) }
+
+ { siteInfo.site_name ||
+ formatSiteUrl(
+ url
+ ) }
-
- { ( url ) } • v{ siteInfo.version }
+
+ { url } • v
+ {
+ siteInfo.version
+ }
@@ -2270,14 +3569,24 @@ const PluginManager = () => {
{ siteInfo.is_active
- ? __( 'Active', 'oneupdate' )
- : __( 'Inactive', 'oneupdate' ) }
+ ? __(
+ 'Active',
+ 'oneupdate'
+ )
+ : __(
+ 'Inactive',
+ 'oneupdate'
+ ) }
{ siteInfo.is_update_available && (
@@ -2285,13 +3594,20 @@ const PluginManager = () => {
- { __( 'Update Available', 'oneupdate' ) }
+ { __(
+ 'Update Available',
+ 'oneupdate'
+ ) }
) }
@@ -2303,10 +3619,17 @@ const PluginManager = () => {
) ) }
-
+
diff --git a/assets/src/admin/pull-requests/index.js b/assets/src/admin/pull-requests/index.js
index af59f14..83a88f8 100644
--- a/assets/src/admin/pull-requests/index.js
+++ b/assets/src/admin/pull-requests/index.js
@@ -1,7 +1,12 @@
/**
* WordPress dependencies
*/
-import { useState, useEffect, useCallback, createRoot } from '@wordpress/element';
+import {
+ useState,
+ useEffect,
+ useCallback,
+ createRoot,
+} from '@wordpress/element';
import { __ } from '@wordpress/i18n';
import {
Card,
@@ -20,9 +25,13 @@ import {
} from '@wordpress/components';
import { decodeEntities } from '@wordpress/html-entities';
import { moreVertical } from '@wordpress/icons';
+/**
+ * Internal dependencies
+ */
import ViewIcon from '../../components/icons/View';
-const API_NAMESPACE = window.OneUpdatePullRequests.restUrl + '/oneupdate/v1/github';
+const API_NAMESPACE =
+ window.OneUpdatePullRequests.restUrl + '/oneupdate/v1/github';
const NONCE = window.OneUpdatePullRequests.restNonce;
const REPOS = window.OneUpdatePullRequests.repos;
@@ -40,7 +49,9 @@ const GitHubPullRequests = () => {
const [ pullRequests, setPullRequests ] = useState( [] );
const [ loading, setLoading ] = useState( false );
const [ notice, setNotice ] = useState( null );
- const [ selectedRepo, setSelectedRepo ] = useState( Object.keys( REPOS )?.[ 0 ] || '' );
+ const [ selectedRepo, setSelectedRepo ] = useState(
+ Object.keys( REPOS )?.[ 0 ] || ''
+ );
const [ statusFilter, setStatusFilter ] = useState( 'all' );
const [ searchQuery, setSearchQuery ] = useState( '[OneUpdate]' );
const [ page, setPage ] = useState( 1 );
@@ -90,19 +101,25 @@ const GitHubPullRequests = () => {
'Content-Type': 'application/json',
'X-WP-NONCE': NONCE,
},
- },
+ }
);
if ( ! response.ok ) {
if ( response?.statusText === 'Unprocessable Entity' ) {
setNotice( {
type: 'error',
- message: __( 'Please enter valid character to search pull requests.', 'oneupdate' ),
+ message: __(
+ 'Please enter valid character to search pull requests.',
+ 'oneupdate'
+ ),
} );
} else {
setNotice( {
type: 'error',
- message: __( 'Failed to fetch pull requests.', 'oneupdate' ),
+ message: __(
+ 'Failed to fetch pull requests.',
+ 'oneupdate'
+ ),
} );
}
return;
@@ -113,7 +130,9 @@ const GitHubPullRequests = () => {
if ( data.success ) {
setPullRequests( data.pull_requests || [] );
// Calculate total pages based on response (you might need to adjust based on your API)
- const totalCount = response.headers.get( 'X-WP-Total' ) || data.pull_requests.length;
+ const totalCount =
+ response.headers.get( 'X-WP-Total' ) ||
+ data.pull_requests.length;
setTotalPages( Math.ceil( totalCount / PER_PAGE ) );
setCurrentPage( data?.pagination?.current_page || 1 );
} else {
@@ -125,7 +144,9 @@ const GitHubPullRequests = () => {
} catch ( error ) {
setNotice( {
type: 'error',
- message: error.message || __( 'Error fetching pull requests.', 'oneupdate' ),
+ message:
+ error.message ||
+ __( 'Error fetching pull requests.', 'oneupdate' ),
} );
setPullRequests( [] );
} finally {
@@ -133,43 +154,48 @@ const GitHubPullRequests = () => {
}
}, [ selectedRepo, statusFilter, searchQuery, page ] );
- const fetchPRDetails = useCallback( async ( prNumber ) => {
- if ( ! selectedRepo || ! prNumber ) {
- return;
- }
-
- setDetailsLoading( true );
- try {
- const response = await fetch(
- `${ API_NAMESPACE }/pull-requests/${ selectedRepo }?pr_number=${ prNumber }&_=${ new Date().getTime() }`,
- {
- headers: {
- 'Content-Type': 'application/json',
- 'X-WP-NONCE': NONCE,
- },
- },
- );
-
- if ( ! response.ok ) {
- throw new Error( 'Failed to fetch PR details' );
+ const fetchPRDetails = useCallback(
+ async ( prNumber ) => {
+ if ( ! selectedRepo || ! prNumber ) {
+ return;
}
- const data = await response.json();
+ setDetailsLoading( true );
+ try {
+ const response = await fetch(
+ `${ API_NAMESPACE }/pull-requests/${ selectedRepo }?pr_number=${ prNumber }&_=${ new Date().getTime() }`,
+ {
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-WP-NONCE': NONCE,
+ },
+ }
+ );
+
+ if ( ! response.ok ) {
+ throw new Error( 'Failed to fetch PR details' );
+ }
- if ( data.success && data.pull_request?.[ 0 ] ) {
- setPrDetails( data.pull_request[ 0 ] );
- } else {
- throw new Error( 'Failed to fetch PR details' );
+ const data = await response.json();
+
+ if ( data.success && data.pull_request?.[ 0 ] ) {
+ setPrDetails( data.pull_request[ 0 ] );
+ } else {
+ throw new Error( 'Failed to fetch PR details' );
+ }
+ } catch ( error ) {
+ setNotice( {
+ type: 'error',
+ message:
+ error.message ||
+ __( 'Error fetching PR details.', 'oneupdate' ),
+ } );
+ } finally {
+ setDetailsLoading( false );
}
- } catch ( error ) {
- setNotice( {
- type: 'error',
- message: error.message || __( 'Error fetching PR details.', 'oneupdate' ),
- } );
- } finally {
- setDetailsLoading( false );
- }
- }, [ selectedRepo ] );
+ },
+ [ selectedRepo ]
+ );
const openDetailModal = ( pr ) => {
setSelectedPR( pr );
@@ -242,7 +268,10 @@ const GitHubPullRequests = () => {
onClose();
} }
>
- { __( 'View Details', 'oneupdate' ) }
+ { __(
+ 'View Details',
+ 'oneupdate'
+ ) }
) }
@@ -285,10 +314,21 @@ const GitHubPullRequests = () => {
{ /* Filters */ }
-
+
- { __( 'PR #', 'oneupdate' ) }
- { __( 'Title', 'oneupdate' ) }
- { __( 'Author', 'oneupdate' ) }
- { __( 'Status', 'oneupdate' ) }
- { __( 'Created at', 'oneupdate' ) }
- { __( 'Labels', 'oneupdate' ) }
- { __( 'Actions', 'oneupdate' ) }
+
+ { __( 'PR #', 'oneupdate' ) }
+
+
+ { __( 'Title', 'oneupdate' ) }
+
+
+ { __( 'Author', 'oneupdate' ) }
+
+
+ { __( 'Status', 'oneupdate' ) }
+
+
+ { __( 'Created at', 'oneupdate' ) }
+
+
+ { __( 'Labels', 'oneupdate' ) }
+
+
+ { __( 'Actions', 'oneupdate' ) }
+
{ loading && (
-
-
+
) }
{ ! loading && pullRequests.length === 0 && (
-
- { __( 'No pull requests found.', 'oneupdate' ) }
+
+ { __(
+ 'No pull requests found.',
+ 'oneupdate'
+ ) }
) }
@@ -340,7 +411,10 @@ const GitHubPullRequests = () => {
#{ pr.number }
@@ -351,11 +425,19 @@ const GitHubPullRequests = () => {
target="_blank"
rel="noopener noreferrer"
>
- { decodeEntities( pr.title ) }
+
+ { decodeEntities( pr.title ) }
+
-
+
{
{ formatDate( pr.created_at ) }
{ pr.labels.length > 0 ? (
-
- { pr.labels.slice( 0, 2 ).map( ( label ) => (
+
+ { pr.labels
+ .slice( 0, 2 )
+ .map( ( label ) => (
+
+ { label.name }
+
+ ) ) }
+ { pr.labels.length > 2 && (
- { label.name }
-
- ) ) }
- { pr.labels.length > 2 && (
-
- +{ pr.labels.length - 2 } { __( 'more', 'oneupdate' ) }
+ +
+ { pr.labels.length - 2 }{ ' ' }
+ { __(
+ 'more',
+ 'oneupdate'
+ ) }
) }
) : (
-
- { __( 'No labels', 'oneupdate' ) }
+
+ { __(
+ 'No labels',
+ 'oneupdate'
+ ) }
) }
@@ -400,29 +510,43 @@ const GitHubPullRequests = () => {
{ /* Pagination */ }
- { (
-
-
-
- { __( 'Page', 'oneupdate' ) } { page } { __( 'of', 'oneupdate' ) } { totalPages === 0 || totalPages < currentPage ? currentPage : totalPages }
-
-
-
- ) }
+
+
+
+ { __( 'Page', 'oneupdate' ) } { page }{ ' ' }
+ { __( 'of', 'oneupdate' ) }{ ' ' }
+ { totalPages === 0 || totalPages < currentPage
+ ? currentPage
+ : totalPages }
+
+
+
@@ -432,12 +556,16 @@ const GitHubPullRequests = () => {
title={ __( 'Pull Request Details', 'oneupdate' ) }
onRequestClose={ closeModals }
size="medium"
- shouldCloseOnClickOutside={ true }
+ shouldCloseOnClickOutside
>
{ /* Detailed PR Info */ }
{ detailsLoading && (
-
- { __( 'Loading PR details…', 'oneupdate' ) }
) }
@@ -445,21 +573,90 @@ const GitHubPullRequests = () => {
{ ! detailsLoading && prDetails && (
<>
-
+
- { __( 'PR Number:', 'oneupdate' ) } #{ prDetails.number }
- { __( 'Title:', 'oneupdate' ) } { decodeEntities( prDetails.title ) }
- { __( 'Author:', 'oneupdate' ) } { prDetails.user.login }
- { __( 'Status:', 'oneupdate' ) } { getPRStatusBadge( prDetails ) }
+
+
+ { __(
+ 'PR Number:',
+ 'oneupdate'
+ ) }
+ { ' ' }
+ #{ prDetails.number }
+
+
+
+ { __( 'Title:', 'oneupdate' ) }
+ { ' ' }
+ { decodeEntities(
+ prDetails.title
+ ) }
+
+
+
+ { __( 'Author:', 'oneupdate' ) }
+ { ' ' }
+ { prDetails.user.login }
+
+
+
+ { __( 'Status:', 'oneupdate' ) }
+ { ' ' }
+ { getPRStatusBadge( prDetails ) }
+
- { __( 'Created:', 'oneupdate' ) } { formatDate( prDetails.created_at ) }
- { __( 'Updated:', 'oneupdate' ) } { formatDate( prDetails.updated_at ) }
- { __( 'Branch:', 'oneupdate' ) } { prDetails.pr_branch } → { prDetails.base_branch }
- { __( 'GitHub URL:', 'oneupdate' ) }{ ' ' }
-
- { __( 'View on GitHub', 'oneupdate' ) }
+
+ { __(
+ 'Created:',
+ 'oneupdate'
+ ) }
+ { ' ' }
+ { formatDate(
+ prDetails.created_at
+ ) }
+
+
+
+ { __(
+ 'Updated:',
+ 'oneupdate'
+ ) }
+ { ' ' }
+ { formatDate(
+ prDetails.updated_at
+ ) }
+
+
+
+ { __( 'Branch:', 'oneupdate' ) }
+ { ' ' }
+ { prDetails.pr_branch } →{ ' ' }
+ { prDetails.base_branch }
+
+
+
+ { __(
+ 'GitHub URL:',
+ 'oneupdate'
+ ) }
+ { ' ' }
+
+ { __(
+ 'View on GitHub',
+ 'oneupdate'
+ ) }
@@ -468,16 +665,29 @@ const GitHubPullRequests = () => {
{ /* Labels */ }
{ prDetails.labels.length > 0 && (
- { __( 'Labels:', 'oneupdate' ) }
-
- { prDetails.labels.map( ( label ) => (
-
- { label.name }
-
- ) ) }
+
+ { __( 'Labels:', 'oneupdate' ) }
+
+
+ { prDetails.labels.map(
+ ( label ) => (
+
+ { label.name }
+
+ )
+ ) }
) }
@@ -485,7 +695,12 @@ const GitHubPullRequests = () => {
{ /* Description */ }
{ prDetails.body && (
- { __( 'Description:', 'oneupdate' ) }
+
+ { __(
+ 'Description:',
+ 'oneupdate'
+ ) }
+
{
overflow: 'auto',
} }
>
-
- { decodeEntities( prDetails.body ) }
+
+ { decodeEntities(
+ prDetails.body
+ ) }
@@ -507,14 +730,29 @@ const GitHubPullRequests = () => {
{ /* Merged By Info */ }
{ prDetails.merged_by && (
-
-
+
{ prDetails.merged_by && (
- { __( 'Merged By:', 'oneupdate' ) }
+
+ { __(
+ 'Merged By:',
+ 'oneupdate'
+ ) }
+
{
verticalAlign: 'middle',
} }
/>
- { prDetails.merged_by.login }
+
+ { prDetails.merged_by.login }
+
) }
) }
) }
-
) }
@@ -540,7 +784,11 @@ const GitHubPullRequests = () => {
isDismissible
status={ notice.type }
onRemove={ () => setNotice( null ) }
- className={ notice?.type === 'error' ? 'oneupdate-error-notice' : 'oneupdate-success-notice' }
+ className={
+ notice?.type === 'error'
+ ? 'oneupdate-error-notice'
+ : 'oneupdate-success-notice'
+ }
>
{ notice.message }
diff --git a/assets/src/admin/settings/index.tsx b/assets/src/admin/settings/index.tsx
index 6150a88..c7dd780 100644
--- a/assets/src/admin/settings/index.tsx
+++ b/assets/src/admin/settings/index.tsx
@@ -1,6 +1,9 @@
/**
* WordPress dependencies
*/
+/**
+ * External dependencies
+ */
import { createRoot } from 'react-dom/client';
/**
diff --git a/assets/src/admin/settings/page.tsx b/assets/src/admin/settings/page.tsx
index e002974..6ba3ef3 100644
--- a/assets/src/admin/settings/page.tsx
+++ b/assets/src/admin/settings/page.tsx
@@ -1,6 +1,9 @@
/**
* WordPress dependencies
*/
+/**
+ * External dependencies
+ */
import { useState, useEffect, useCallback } from 'react';
import { __ } from '@wordpress/i18n';
import { Snackbar } from '@wordpress/components';
@@ -26,7 +29,7 @@ export interface BrandSite {
name: string;
url: string;
api_key: string;
- gh_repo: string;
+ gh_repo: string;
}
export const defaultBrandSite: BrandSite = {
@@ -39,7 +42,7 @@ export const defaultBrandSite: BrandSite = {
export type EditingIndex = number | null;
const NONCE = window.OneUpdateSettings.restNonce;
-const SITE_TYPE = window.OneUpdateSettings.siteType as SiteType || '';
+const SITE_TYPE = ( window.OneUpdateSettings.siteType as SiteType ) || '';
const SHARED_SITES_ENDPOINT = '/oneupdate/v1/shared-sites';
const API_NAMESPACE = window.OneUpdateSettings.restUrl + '/oneupdate/v1';
@@ -57,16 +60,13 @@ const SettingsPage = () => {
const [ allGitHubRepos, setAllGitHubRepos ] = useState( [] );
const fetchAllAvailableGitHubRepos = useCallback( async () => {
- const response = await fetch(
- `${ API_NAMESPACE }/github-repos`,
- {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json',
- 'X-WP-NONCE': NONCE,
- },
+ const response = await fetch( `${ API_NAMESPACE }/github-repos`, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-WP-NONCE': NONCE,
},
- );
+ } );
const data = await response.json();
if ( data?.repos ) {
setAllGitHubRepos( data.repos );
@@ -82,7 +82,7 @@ const SettingsPage = () => {
}, [ SITE_TYPE ] );
useEffect( () => {
- apiFetch<{ shared_sites?: BrandSite[] }>( {
+ apiFetch< { shared_sites?: BrandSite[] } >( {
path: SHARED_SITES_ENDPOINT,
} )
.then( ( data ) => {
@@ -104,89 +104,115 @@ const SettingsPage = () => {
}
}, [ sites ] );
- const handleFormSubmit = async () : Promise< boolean > => {
- const updated : BrandSite[] = editingIndex !== null
- ? sites.map( ( item, i ) => ( i === editingIndex ? formData : item ) )
- : [ ...sites, formData ];
+ const handleFormSubmit = async (): Promise< boolean > => {
+ const updated: BrandSite[] =
+ editingIndex !== null
+ ? sites.map( ( item, i ) =>
+ i === editingIndex ? formData : item
+ )
+ : [ ...sites, formData ];
- return apiFetch<{ shared_sites?: BrandSite[] }>( {
+ return apiFetch< { shared_sites?: BrandSite[] } >( {
path: SHARED_SITES_ENDPOINT,
method: 'POST',
data: { sites_data: updated },
- } ).then( ( data ) => {
- if ( ! data?.shared_sites ) {
- throw new Error( 'No shared sites in response' );
- }
+ } )
+ .then( ( data ) => {
+ if ( ! data?.shared_sites ) {
+ throw new Error( 'No shared sites in response' );
+ }
- if ( data.shared_sites.length === 1 && sites.length === 0 ) {
- // Reloading causes the menus etc to reflect the missing sites.
- window.location.reload();
- }
+ if ( data.shared_sites.length === 1 && sites.length === 0 ) {
+ // Reloading causes the menus etc to reflect the missing sites.
+ window.location.reload();
+ }
- setSites( data.shared_sites );
+ setSites( data.shared_sites );
- setNotice( {
- type: 'success',
- message: __( 'Brand Site saved successfully.', 'oneupdate' ),
- } );
- return true;
- } ).catch( () => {
- setNotice( {
- type: 'error',
- message: __( 'Failed to update shared sites', 'oneupdate' ),
+ setNotice( {
+ type: 'success',
+ message: __(
+ 'Brand Site saved successfully.',
+ 'oneupdate'
+ ),
+ } );
+ return true;
+ } )
+ .catch( () => {
+ setNotice( {
+ type: 'error',
+ message: __( 'Failed to update shared sites', 'oneupdate' ),
+ } );
+ return false;
+ } )
+ .finally( () => {
+ setFormData( defaultBrandSite );
+ setShowModal( false );
+ setEditingIndex( null );
} );
- return false;
- } ).finally( () => {
- setFormData( defaultBrandSite );
- setShowModal( false );
- setEditingIndex( null );
- } );
};
- const handleDelete = async ( index : number|null ) : Promise => {
- const updated : BrandSite[] = sites.filter( ( _, i ) => i !== index );
+ const handleDelete = async ( index: number | null ): Promise< void > => {
+ const updated: BrandSite[] = sites.filter( ( _, i ) => i !== index );
- apiFetch<{ shared_sites?: BrandSite[] }>( {
+ apiFetch< { shared_sites?: BrandSite[] } >( {
path: SHARED_SITES_ENDPOINT,
method: 'POST',
data: { sites_data: updated },
- } ).then( ( data ) => {
- if ( ! data?.shared_sites ) {
- throw new Error( 'No shared sites in response' );
- }
- setSites( data.shared_sites );
-
- if ( data.shared_sites.length === 0 ) {
- // Reloading causes the menus etc to reflect the missing sites.
- window.location.reload();
- } else {
- document.body.classList.remove( 'oneupdate-missing-brand-sites' );
- }
- } ).catch( () => {
- throw new Error( 'Failed to update shared sites' );
- } );
+ } )
+ .then( ( data ) => {
+ if ( ! data?.shared_sites ) {
+ throw new Error( 'No shared sites in response' );
+ }
+ setSites( data.shared_sites );
+
+ if ( data.shared_sites.length === 0 ) {
+ // Reloading causes the menus etc to reflect the missing sites.
+ window.location.reload();
+ } else {
+ document.body.classList.remove(
+ 'oneupdate-missing-brand-sites'
+ );
+ }
+ } )
+ .catch( () => {
+ throw new Error( 'Failed to update shared sites' );
+ } );
};
return (
<>
- { !! notice && notice?.message?.length > 0 &&
+ { !! notice && notice?.message?.length > 0 && (
setNotice( null ) }
- className={ notice?.type === 'error' ? 'oneupdate-error-notice' : 'oneupdate-success-notice' }
+ className={
+ notice?.type === 'error'
+ ? 'oneupdate-error-notice'
+ : 'oneupdate-success-notice'
+ }
>
{ notice?.message }
- }
-
- { SITE_TYPE === 'brand-site' && (
- ,
- },
-) => {
+const GitHubRepoToken = ( {
+ setNotice,
+ fetchAllAvailableGitHubRepos,
+}: {
+ setNotice: ( notice: NoticeType ) => void;
+ fetchAllAvailableGitHubRepos: () => Promise< void >;
+} ) => {
const [ repoToken, setRepoToken ] = useState( '' );
const getRepoToken = useCallback( async () => {
- const response = await fetch(
- `${ API_NAMESPACE }/github-token`,
- {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json',
- 'X-WP-NONCE': NONCE,
- },
+ const response = await fetch( `${ API_NAMESPACE }/github-token`, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-WP-NONCE': NONCE,
},
- );
+ } );
if ( ! response.ok ) {
- console.error( 'Error fetching GitHub token:', response.statusText ); // eslint-disable-line no-console
+ console.error(
+ 'Error fetching GitHub token:',
+ response.statusText
+ );
}
const data = await response.json();
@@ -51,23 +54,23 @@ const GitHubRepoToken = (
getRepoToken();
}, [] );
- const setGitHubRepoToken = useCallback( async ( token : string ) => {
- const response = await fetch(
- `${ API_NAMESPACE }/github-token`,
- {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- 'X-WP-NONCE': NONCE,
- },
- body: JSON.stringify( { token } ),
+ const setGitHubRepoToken = useCallback( async ( token: string ) => {
+ const response = await fetch( `${ API_NAMESPACE }/github-token`, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-WP-NONCE': NONCE,
},
- );
+ body: JSON.stringify( { token } ),
+ } );
if ( response.ok === false || response.status === 400 ) {
setNotice( {
type: 'error',
- message: __( 'Please enter valid GitHub PAT token.', 'oneupdate' ),
+ message: __(
+ 'Please enter valid GitHub PAT token.',
+ 'oneupdate'
+ ),
} );
return;
}
@@ -76,7 +79,9 @@ const GitHubRepoToken = (
if ( data?.status === '400' ) {
setNotice( {
type: 'error',
- message: data?.message || __( 'Enter valid PAT token.', 'oneupdate' ),
+ message:
+ data?.message ||
+ __( 'Enter valid PAT token.', 'oneupdate' ),
} );
return;
}
@@ -93,11 +98,7 @@ const GitHubRepoToken = (
}, [] );
return (
-
+
{ __( 'GitHub Credentials', 'oneupdate' ) }
-
);
};
diff --git a/assets/src/components/PluginCard.js b/assets/src/components/PluginCard.js
index 3c7ac57..e1cf099 100644
--- a/assets/src/components/PluginCard.js
+++ b/assets/src/components/PluginCard.js
@@ -1,3 +1,6 @@
+/**
+ * WordPress dependencies
+ */
import { decodeEntities } from '@wordpress/html-entities';
import { Button, SelectControl } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
@@ -8,7 +11,13 @@ const PluginCard = ( {
onSelect,
onVersionChange,
} ) => {
- const { name, slug, version, short_description: shortDescription, versions } = plugin;
+ const {
+ name,
+ slug,
+ version,
+ short_description: shortDescription,
+ versions,
+ } = plugin;
const selectedEntry = selectedPlugin?.find( ( p ) => p.slug === slug );
const isSelected = !! selectedEntry;
@@ -27,18 +36,28 @@ const PluginCard = ( {
};
return (
-
+
-
+
{ decodeEntities( name ) }
@@ -56,14 +75,22 @@ const PluginCard = ( {
{ isSelected && (
{
+const PluginVersionSelectControl = ( {
+ versions,
+ selectedVersion,
+ onChange,
+} ) => {
const getLastFiveVersions = ( versionsObj ) => {
if ( ! versionsObj || typeof versionsObj !== 'object' ) {
return [];
}
- const versionKeys = Object.keys( versionsObj )
- .filter( ( key ) => key !== 'trunk' && ! /(alpha|beta|rc|dev|a)/i.test( key ) );
+ const versionKeys = Object.keys( versionsObj ).filter(
+ ( key ) => key !== 'trunk' && ! /(alpha|beta|rc|dev|a)/i.test( key )
+ );
const sortedVersions = versionKeys.sort( ( a, b ) => {
- const aParts = a.split( '.' ).map( ( part ) => parseInt( part, 10 ) || 0 );
- const bParts = b.split( '.' ).map( ( part ) => parseInt( part, 10 ) || 0 );
+ const aParts = a
+ .split( '.' )
+ .map( ( part ) => parseInt( part, 10 ) || 0 );
+ const bParts = b
+ .split( '.' )
+ .map( ( part ) => parseInt( part, 10 ) || 0 );
const maxLength = Math.max( aParts.length, bParts.length );
for ( let i = 0; i < maxLength; i++ ) {
diff --git a/assets/src/components/PluginGrid.js b/assets/src/components/PluginGrid.js
index 4e3f8e1..ea94bbc 100644
--- a/assets/src/components/PluginGrid.js
+++ b/assets/src/components/PluginGrid.js
@@ -1,7 +1,20 @@
+/**
+ * WordPress dependencies
+ */
import { useState, useEffect, useCallback } from '@wordpress/element';
import { __ } from '@wordpress/i18n';
-import { Button, CheckboxControl, Modal, Spinner, TextControl, Notice } from '@wordpress/components';
-
+import {
+ Button,
+ CheckboxControl,
+ Modal,
+ Spinner,
+ TextControl,
+ Notice,
+} from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
import PluginCard from './PluginCard';
const API_NAMESPACE = OneUpdatePlugins.restUrl + '/oneupdate/v1';
@@ -31,7 +44,9 @@ const PluginGrid = () => {
const response = await fetch( WORDPRESS_PLUGINS_API );
if ( ! response.ok ) {
- throw new Error( __( 'Failed to fetch plugins.', 'oneupdate' ) );
+ throw new Error(
+ __( 'Failed to fetch plugins.', 'oneupdate' )
+ );
}
const data = await response.json();
@@ -59,7 +74,7 @@ const PluginGrid = () => {
const existing = prev.find( ( p ) => p.slug === slug );
if ( existing ) {
return prev.map( ( p ) =>
- p.slug === slug ? { ...p, version } : p,
+ p.slug === slug ? { ...p, version } : p
);
}
return [ ...prev, { slug, version } ];
@@ -68,23 +83,18 @@ const PluginGrid = () => {
const handleVersionChange = ( slug, version ) => {
setSelectedPlugin( ( prev ) =>
- prev.map( ( p ) =>
- p.slug === slug ? { ...p, version } : p,
- ),
+ prev.map( ( p ) => ( p.slug === slug ? { ...p, version } : p ) )
);
};
const fetchSharedSitesData = useCallback( async () => {
- const response = await fetch(
- `${ API_NAMESPACE }/shared-sites`,
- {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json',
- 'X-ONEUPDATE-TOKEN': API_KEY,
- },
+ const response = await fetch( `${ API_NAMESPACE }/shared-sites`, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-ONEUPDATE-TOKEN': API_KEY,
},
- );
+ } );
const data = await response.json();
if ( data?.shared_sites ) {
setSharedSites( data.shared_sites );
@@ -106,29 +116,24 @@ const PluginGrid = () => {
return (
-
{ /* Notice State */ }
{ isNoticeVisible && (
-
+
{ noticeMessage.message }
) }
{ /* Search Bar */ }
-
{
}
} }
/>
-
@@ -152,7 +154,9 @@ const PluginGrid = () => {
{ loading && (
{ __( 'Loading plugins…', 'oneupdate' ) }
+
+ { __( 'Loading plugins…', 'oneupdate' ) }
+
) }
@@ -162,10 +166,7 @@ const PluginGrid = () => {
{ __( 'Unable to load plugins', 'oneupdate' ) }
{ error }
-
@@ -177,11 +178,13 @@ const PluginGrid = () => {
{ __( 'No plugins found', 'oneupdate' ) }
- { __( 'Unable to find any plugins to display.', 'oneupdate' ) }
-
@@ -204,10 +207,16 @@ const PluginGrid = () => {
@@ -241,17 +250,24 @@ const PluginGrid = () => {
- { __( 'Page', 'oneupdate' ) } { page } { __( 'of', 'oneupdate' ) } { totalPages }
+ { __( 'Page', 'oneupdate' ) } { page }{ ' ' }
+ { __( 'of', 'oneupdate' ) } { totalPages }
-
);
};
-const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, setNoticeMessage, setIsNoticeVisible, setSelectedPlugin } ) => {
+const ApplyPluginsModal = ( {
+ sharedSites,
+ selectedPlugin,
+ setShowApplyModal,
+ setNoticeMessage,
+ setIsNoticeVisible,
+ setSelectedPlugin,
+} ) => {
const [ selectedSite, setSelectedSite ] = useState( [] );
const [ selectedSiteInfo, setSelectedSiteInfo ] = useState( [] );
@@ -281,7 +303,7 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
// based on selected sites need to get all info from sharedsites for all selected sites
useEffect( () => {
const selectedSiteFullInfo = sharedSites.filter( ( site ) =>
- selectedSite.includes( site.url ),
+ selectedSite.includes( site.url )
);
setSelectedSiteInfo( selectedSiteFullInfo );
@@ -289,26 +311,26 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
const handleApplyPlugins = async () => {
try {
- const response = await fetch(
- `${ API_NAMESPACE }/apply-plugins`,
- {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- 'X-ONEUPDATE-TOKEN': API_KEY,
- },
- body: JSON.stringify( {
- sites: selectedSiteInfo,
- plugins: selectedPlugin,
- } ),
+ const response = await fetch( `${ API_NAMESPACE }/apply-plugins`, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-ONEUPDATE-TOKEN': API_KEY,
},
- );
+ body: JSON.stringify( {
+ sites: selectedSiteInfo,
+ plugins: selectedPlugin,
+ } ),
+ } );
const data = await response.json();
if ( data?.success && data?.created_prs ) {
const prUrls = data?.created_prs;
- const prUrlsArray = prUrls?.map( ( pr ) => {
- return pr?.data?.pr_url || '';
- } ).filter( ( url ) => url !== '' ) || [];
+ const prUrlsArray =
+ prUrls
+ ?.map( ( pr ) => {
+ return pr?.data?.pr_url || '';
+ } )
+ .filter( ( url ) => url !== '' ) || [];
// Join to comma separated string
const prUrlsString = prUrlsArray.join( ', ' );
@@ -316,21 +338,31 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
setIsNoticeVisible( true );
setNoticeMessage( {
type: 'success',
- message: __( 'Plugins applied successfully. Please check the PR at:', 'oneupdate' ) + ` ${ prUrlsString }`,
+ message:
+ __(
+ 'Plugins applied successfully. Please check the PR at:',
+ 'oneupdate'
+ ) + ` ${ prUrlsString }`,
} );
setSelectedPlugin( [] );
} else {
setIsNoticeVisible( true );
setNoticeMessage( {
type: 'error',
- message: __( 'Failed to apply plugins. Please try again.', 'oneupdate' ),
+ message: __(
+ 'Failed to apply plugins. Please try again.',
+ 'oneupdate'
+ ),
} );
}
} catch ( error ) {
setIsNoticeVisible( true );
setNoticeMessage( {
type: 'error',
- message: __( 'An error occurred while applying plugins.', 'oneupdate' ),
+ message: __(
+ 'An error occurred while applying plugins.',
+ 'oneupdate'
+ ),
} );
}
};
@@ -338,12 +370,14 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
return (
- { __( 'Select a site to apply the plugins', 'oneupdate' ) }
+
+ { __( 'Select a site to apply the plugins', 'oneupdate' ) }
+
{ sharedSites.length > 0 ? (
{ sharedSites.map( ( site ) => (
@@ -351,12 +385,19 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
key={ site?.url }
label={ site?.name }
checked={ selectedSite.includes( site?.url ) }
- onChange={ () => handleSiteSelection( site.url ) }
+ onChange={ () =>
+ handleSiteSelection( site.url )
+ }
/>
) ) }
) : (
- { __( 'No sites available to apply plugins.', 'oneupdate' ) }
+
+ { __(
+ 'No sites available to apply plugins.',
+ 'oneupdate'
+ ) }
+
) }
+
{ __( 'FAQ', 'oneupdate' ) }
{
lineHeight: '1.6',
fontSize: '14px',
} }
- dangerouslySetInnerHTML={ { __html: selectedPlugin.plugin_info.faq } }
+ dangerouslySetInnerHTML={ {
+ __html: selectedPlugin
+ .plugin_info.faq,
+ } }
/>
) }
@@ -2182,7 +3412,14 @@ const PluginManager = () => {
{ /* Changelog */ }
{ selectedPlugin.plugin_info.changelog && (
-
+
{ __( 'Changelog', 'oneupdate' ) }
{
borderRadius: '8px',
border: '1px solid #e9ecef',
} }
- dangerouslySetInnerHTML={ { __html: selectedPlugin.plugin_info.changelog } }
+ dangerouslySetInnerHTML={ {
+ __html: selectedPlugin
+ .plugin_info.changelog,
+ } }
/>
) }
-
+
@@ -2220,47 +3467,99 @@ const PluginManager = () => {
title={ sprintf(
/* translators: %s is the plugin name */
__( '%s - Sites', 'oneupdate' ),
- selectedPlugin.plugin_info.name,
+ selectedPlugin.plugin_info.name
) }
onRequestClose={ () => setShowSitesModal( false ) }
style={ { maxWidth: '400px', minWidth: '400px' } }
- shouldCloseOnClickOutside={ true }
+ shouldCloseOnClickOutside
>
-
- { __( 'Plugin status across all sites', 'oneupdate' ) }
+
+ { __(
+ 'Plugin status across all sites',
+ 'oneupdate'
+ ) }
-
- { Object.entries( selectedPlugin.sites ).map( ( [ url, siteInfo ] ) => (
+
+ { Object.entries(
+ selectedPlugin.sites
+ ).map( ( [ url, siteInfo ] ) => (
-
-
+
+
-
+
-
- { siteInfo.site_name || formatSiteUrl( url ) }
+
+ { siteInfo.site_name ||
+ formatSiteUrl(
+ url
+ ) }
-
- { ( url ) } • v{ siteInfo.version }
+
+ { url } • v
+ {
+ siteInfo.version
+ }
@@ -2270,14 +3569,24 @@ const PluginManager = () => {
{ siteInfo.is_active
- ? __( 'Active', 'oneupdate' )
- : __( 'Inactive', 'oneupdate' ) }
+ ? __(
+ 'Active',
+ 'oneupdate'
+ )
+ : __(
+ 'Inactive',
+ 'oneupdate'
+ ) }
{ siteInfo.is_update_available && (
@@ -2285,13 +3594,20 @@ const PluginManager = () => {
- { __( 'Update Available', 'oneupdate' ) }
+ { __(
+ 'Update Available',
+ 'oneupdate'
+ ) }
) }
@@ -2303,10 +3619,17 @@ const PluginManager = () => {
) ) }
-
+
diff --git a/assets/src/admin/pull-requests/index.js b/assets/src/admin/pull-requests/index.js
index af59f14..83a88f8 100644
--- a/assets/src/admin/pull-requests/index.js
+++ b/assets/src/admin/pull-requests/index.js
@@ -1,7 +1,12 @@
/**
* WordPress dependencies
*/
-import { useState, useEffect, useCallback, createRoot } from '@wordpress/element';
+import {
+ useState,
+ useEffect,
+ useCallback,
+ createRoot,
+} from '@wordpress/element';
import { __ } from '@wordpress/i18n';
import {
Card,
@@ -20,9 +25,13 @@ import {
} from '@wordpress/components';
import { decodeEntities } from '@wordpress/html-entities';
import { moreVertical } from '@wordpress/icons';
+/**
+ * Internal dependencies
+ */
import ViewIcon from '../../components/icons/View';
-const API_NAMESPACE = window.OneUpdatePullRequests.restUrl + '/oneupdate/v1/github';
+const API_NAMESPACE =
+ window.OneUpdatePullRequests.restUrl + '/oneupdate/v1/github';
const NONCE = window.OneUpdatePullRequests.restNonce;
const REPOS = window.OneUpdatePullRequests.repos;
@@ -40,7 +49,9 @@ const GitHubPullRequests = () => {
const [ pullRequests, setPullRequests ] = useState( [] );
const [ loading, setLoading ] = useState( false );
const [ notice, setNotice ] = useState( null );
- const [ selectedRepo, setSelectedRepo ] = useState( Object.keys( REPOS )?.[ 0 ] || '' );
+ const [ selectedRepo, setSelectedRepo ] = useState(
+ Object.keys( REPOS )?.[ 0 ] || ''
+ );
const [ statusFilter, setStatusFilter ] = useState( 'all' );
const [ searchQuery, setSearchQuery ] = useState( '[OneUpdate]' );
const [ page, setPage ] = useState( 1 );
@@ -90,19 +101,25 @@ const GitHubPullRequests = () => {
'Content-Type': 'application/json',
'X-WP-NONCE': NONCE,
},
- },
+ }
);
if ( ! response.ok ) {
if ( response?.statusText === 'Unprocessable Entity' ) {
setNotice( {
type: 'error',
- message: __( 'Please enter valid character to search pull requests.', 'oneupdate' ),
+ message: __(
+ 'Please enter valid character to search pull requests.',
+ 'oneupdate'
+ ),
} );
} else {
setNotice( {
type: 'error',
- message: __( 'Failed to fetch pull requests.', 'oneupdate' ),
+ message: __(
+ 'Failed to fetch pull requests.',
+ 'oneupdate'
+ ),
} );
}
return;
@@ -113,7 +130,9 @@ const GitHubPullRequests = () => {
if ( data.success ) {
setPullRequests( data.pull_requests || [] );
// Calculate total pages based on response (you might need to adjust based on your API)
- const totalCount = response.headers.get( 'X-WP-Total' ) || data.pull_requests.length;
+ const totalCount =
+ response.headers.get( 'X-WP-Total' ) ||
+ data.pull_requests.length;
setTotalPages( Math.ceil( totalCount / PER_PAGE ) );
setCurrentPage( data?.pagination?.current_page || 1 );
} else {
@@ -125,7 +144,9 @@ const GitHubPullRequests = () => {
} catch ( error ) {
setNotice( {
type: 'error',
- message: error.message || __( 'Error fetching pull requests.', 'oneupdate' ),
+ message:
+ error.message ||
+ __( 'Error fetching pull requests.', 'oneupdate' ),
} );
setPullRequests( [] );
} finally {
@@ -133,43 +154,48 @@ const GitHubPullRequests = () => {
}
}, [ selectedRepo, statusFilter, searchQuery, page ] );
- const fetchPRDetails = useCallback( async ( prNumber ) => {
- if ( ! selectedRepo || ! prNumber ) {
- return;
- }
-
- setDetailsLoading( true );
- try {
- const response = await fetch(
- `${ API_NAMESPACE }/pull-requests/${ selectedRepo }?pr_number=${ prNumber }&_=${ new Date().getTime() }`,
- {
- headers: {
- 'Content-Type': 'application/json',
- 'X-WP-NONCE': NONCE,
- },
- },
- );
-
- if ( ! response.ok ) {
- throw new Error( 'Failed to fetch PR details' );
+ const fetchPRDetails = useCallback(
+ async ( prNumber ) => {
+ if ( ! selectedRepo || ! prNumber ) {
+ return;
}
- const data = await response.json();
+ setDetailsLoading( true );
+ try {
+ const response = await fetch(
+ `${ API_NAMESPACE }/pull-requests/${ selectedRepo }?pr_number=${ prNumber }&_=${ new Date().getTime() }`,
+ {
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-WP-NONCE': NONCE,
+ },
+ }
+ );
+
+ if ( ! response.ok ) {
+ throw new Error( 'Failed to fetch PR details' );
+ }
- if ( data.success && data.pull_request?.[ 0 ] ) {
- setPrDetails( data.pull_request[ 0 ] );
- } else {
- throw new Error( 'Failed to fetch PR details' );
+ const data = await response.json();
+
+ if ( data.success && data.pull_request?.[ 0 ] ) {
+ setPrDetails( data.pull_request[ 0 ] );
+ } else {
+ throw new Error( 'Failed to fetch PR details' );
+ }
+ } catch ( error ) {
+ setNotice( {
+ type: 'error',
+ message:
+ error.message ||
+ __( 'Error fetching PR details.', 'oneupdate' ),
+ } );
+ } finally {
+ setDetailsLoading( false );
}
- } catch ( error ) {
- setNotice( {
- type: 'error',
- message: error.message || __( 'Error fetching PR details.', 'oneupdate' ),
- } );
- } finally {
- setDetailsLoading( false );
- }
- }, [ selectedRepo ] );
+ },
+ [ selectedRepo ]
+ );
const openDetailModal = ( pr ) => {
setSelectedPR( pr );
@@ -242,7 +268,10 @@ const GitHubPullRequests = () => {
onClose();
} }
>
- { __( 'View Details', 'oneupdate' ) }
+ { __(
+ 'View Details',
+ 'oneupdate'
+ ) }
) }
@@ -285,10 +314,21 @@ const GitHubPullRequests = () => {
{ /* Filters */ }
-
+
- { __( 'PR #', 'oneupdate' ) }
- { __( 'Title', 'oneupdate' ) }
- { __( 'Author', 'oneupdate' ) }
- { __( 'Status', 'oneupdate' ) }
- { __( 'Created at', 'oneupdate' ) }
- { __( 'Labels', 'oneupdate' ) }
- { __( 'Actions', 'oneupdate' ) }
+
+ { __( 'PR #', 'oneupdate' ) }
+
+
+ { __( 'Title', 'oneupdate' ) }
+
+
+ { __( 'Author', 'oneupdate' ) }
+
+
+ { __( 'Status', 'oneupdate' ) }
+
+
+ { __( 'Created at', 'oneupdate' ) }
+
+
+ { __( 'Labels', 'oneupdate' ) }
+
+
+ { __( 'Actions', 'oneupdate' ) }
+
{ loading && (
-
-
+
) }
{ ! loading && pullRequests.length === 0 && (
-
- { __( 'No pull requests found.', 'oneupdate' ) }
+
+ { __(
+ 'No pull requests found.',
+ 'oneupdate'
+ ) }
) }
@@ -340,7 +411,10 @@ const GitHubPullRequests = () => {
#{ pr.number }
@@ -351,11 +425,19 @@ const GitHubPullRequests = () => {
target="_blank"
rel="noopener noreferrer"
>
- { decodeEntities( pr.title ) }
+
+ { decodeEntities( pr.title ) }
+
-
+
{
{ formatDate( pr.created_at ) }
{ pr.labels.length > 0 ? (
-
- { pr.labels.slice( 0, 2 ).map( ( label ) => (
+
+ { pr.labels
+ .slice( 0, 2 )
+ .map( ( label ) => (
+
+ { label.name }
+
+ ) ) }
+ { pr.labels.length > 2 && (
- { label.name }
-
- ) ) }
- { pr.labels.length > 2 && (
-
- +{ pr.labels.length - 2 } { __( 'more', 'oneupdate' ) }
+ +
+ { pr.labels.length - 2 }{ ' ' }
+ { __(
+ 'more',
+ 'oneupdate'
+ ) }
) }
) : (
-
- { __( 'No labels', 'oneupdate' ) }
+
+ { __(
+ 'No labels',
+ 'oneupdate'
+ ) }
) }
@@ -400,29 +510,43 @@ const GitHubPullRequests = () => {
{ /* Pagination */ }
- { (
-
-
-
- { __( 'Page', 'oneupdate' ) } { page } { __( 'of', 'oneupdate' ) } { totalPages === 0 || totalPages < currentPage ? currentPage : totalPages }
-
-
-
- ) }
+
+
+
+ { __( 'Page', 'oneupdate' ) } { page }{ ' ' }
+ { __( 'of', 'oneupdate' ) }{ ' ' }
+ { totalPages === 0 || totalPages < currentPage
+ ? currentPage
+ : totalPages }
+
+
+
@@ -432,12 +556,16 @@ const GitHubPullRequests = () => {
title={ __( 'Pull Request Details', 'oneupdate' ) }
onRequestClose={ closeModals }
size="medium"
- shouldCloseOnClickOutside={ true }
+ shouldCloseOnClickOutside
>
{ /* Detailed PR Info */ }
{ detailsLoading && (
-
- { __( 'Loading PR details…', 'oneupdate' ) }
) }
@@ -445,21 +573,90 @@ const GitHubPullRequests = () => {
{ ! detailsLoading && prDetails && (
<>
-
+
- { __( 'PR Number:', 'oneupdate' ) } #{ prDetails.number }
- { __( 'Title:', 'oneupdate' ) } { decodeEntities( prDetails.title ) }
- { __( 'Author:', 'oneupdate' ) } { prDetails.user.login }
- { __( 'Status:', 'oneupdate' ) } { getPRStatusBadge( prDetails ) }
+
+
+ { __(
+ 'PR Number:',
+ 'oneupdate'
+ ) }
+ { ' ' }
+ #{ prDetails.number }
+
+
+
+ { __( 'Title:', 'oneupdate' ) }
+ { ' ' }
+ { decodeEntities(
+ prDetails.title
+ ) }
+
+
+
+ { __( 'Author:', 'oneupdate' ) }
+ { ' ' }
+ { prDetails.user.login }
+
+
+
+ { __( 'Status:', 'oneupdate' ) }
+ { ' ' }
+ { getPRStatusBadge( prDetails ) }
+
- { __( 'Created:', 'oneupdate' ) } { formatDate( prDetails.created_at ) }
- { __( 'Updated:', 'oneupdate' ) } { formatDate( prDetails.updated_at ) }
- { __( 'Branch:', 'oneupdate' ) } { prDetails.pr_branch } → { prDetails.base_branch }
- { __( 'GitHub URL:', 'oneupdate' ) }{ ' ' }
-
- { __( 'View on GitHub', 'oneupdate' ) }
+
+ { __(
+ 'Created:',
+ 'oneupdate'
+ ) }
+ { ' ' }
+ { formatDate(
+ prDetails.created_at
+ ) }
+
+
+
+ { __(
+ 'Updated:',
+ 'oneupdate'
+ ) }
+ { ' ' }
+ { formatDate(
+ prDetails.updated_at
+ ) }
+
+
+
+ { __( 'Branch:', 'oneupdate' ) }
+ { ' ' }
+ { prDetails.pr_branch } →{ ' ' }
+ { prDetails.base_branch }
+
+
+
+ { __(
+ 'GitHub URL:',
+ 'oneupdate'
+ ) }
+ { ' ' }
+
+ { __(
+ 'View on GitHub',
+ 'oneupdate'
+ ) }
@@ -468,16 +665,29 @@ const GitHubPullRequests = () => {
{ /* Labels */ }
{ prDetails.labels.length > 0 && (
- { __( 'Labels:', 'oneupdate' ) }
-
- { prDetails.labels.map( ( label ) => (
-
- { label.name }
-
- ) ) }
+
+ { __( 'Labels:', 'oneupdate' ) }
+
+
+ { prDetails.labels.map(
+ ( label ) => (
+
+ { label.name }
+
+ )
+ ) }
) }
@@ -485,7 +695,12 @@ const GitHubPullRequests = () => {
{ /* Description */ }
{ prDetails.body && (
- { __( 'Description:', 'oneupdate' ) }
+
+ { __(
+ 'Description:',
+ 'oneupdate'
+ ) }
+
{
overflow: 'auto',
} }
>
-
- { decodeEntities( prDetails.body ) }
+
+ { decodeEntities(
+ prDetails.body
+ ) }
@@ -507,14 +730,29 @@ const GitHubPullRequests = () => {
{ /* Merged By Info */ }
{ prDetails.merged_by && (
-
-
+
{ prDetails.merged_by && (
- { __( 'Merged By:', 'oneupdate' ) }
+
+ { __(
+ 'Merged By:',
+ 'oneupdate'
+ ) }
+
{
verticalAlign: 'middle',
} }
/>
- { prDetails.merged_by.login }
+
+ { prDetails.merged_by.login }
+
) }
) }
) }
-
) }
@@ -540,7 +784,11 @@ const GitHubPullRequests = () => {
isDismissible
status={ notice.type }
onRemove={ () => setNotice( null ) }
- className={ notice?.type === 'error' ? 'oneupdate-error-notice' : 'oneupdate-success-notice' }
+ className={
+ notice?.type === 'error'
+ ? 'oneupdate-error-notice'
+ : 'oneupdate-success-notice'
+ }
>
{ notice.message }
diff --git a/assets/src/admin/settings/index.tsx b/assets/src/admin/settings/index.tsx
index 6150a88..c7dd780 100644
--- a/assets/src/admin/settings/index.tsx
+++ b/assets/src/admin/settings/index.tsx
@@ -1,6 +1,9 @@
/**
* WordPress dependencies
*/
+/**
+ * External dependencies
+ */
import { createRoot } from 'react-dom/client';
/**
diff --git a/assets/src/admin/settings/page.tsx b/assets/src/admin/settings/page.tsx
index e002974..6ba3ef3 100644
--- a/assets/src/admin/settings/page.tsx
+++ b/assets/src/admin/settings/page.tsx
@@ -1,6 +1,9 @@
/**
* WordPress dependencies
*/
+/**
+ * External dependencies
+ */
import { useState, useEffect, useCallback } from 'react';
import { __ } from '@wordpress/i18n';
import { Snackbar } from '@wordpress/components';
@@ -26,7 +29,7 @@ export interface BrandSite {
name: string;
url: string;
api_key: string;
- gh_repo: string;
+ gh_repo: string;
}
export const defaultBrandSite: BrandSite = {
@@ -39,7 +42,7 @@ export const defaultBrandSite: BrandSite = {
export type EditingIndex = number | null;
const NONCE = window.OneUpdateSettings.restNonce;
-const SITE_TYPE = window.OneUpdateSettings.siteType as SiteType || '';
+const SITE_TYPE = ( window.OneUpdateSettings.siteType as SiteType ) || '';
const SHARED_SITES_ENDPOINT = '/oneupdate/v1/shared-sites';
const API_NAMESPACE = window.OneUpdateSettings.restUrl + '/oneupdate/v1';
@@ -57,16 +60,13 @@ const SettingsPage = () => {
const [ allGitHubRepos, setAllGitHubRepos ] = useState( [] );
const fetchAllAvailableGitHubRepos = useCallback( async () => {
- const response = await fetch(
- `${ API_NAMESPACE }/github-repos`,
- {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json',
- 'X-WP-NONCE': NONCE,
- },
+ const response = await fetch( `${ API_NAMESPACE }/github-repos`, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-WP-NONCE': NONCE,
},
- );
+ } );
const data = await response.json();
if ( data?.repos ) {
setAllGitHubRepos( data.repos );
@@ -82,7 +82,7 @@ const SettingsPage = () => {
}, [ SITE_TYPE ] );
useEffect( () => {
- apiFetch<{ shared_sites?: BrandSite[] }>( {
+ apiFetch< { shared_sites?: BrandSite[] } >( {
path: SHARED_SITES_ENDPOINT,
} )
.then( ( data ) => {
@@ -104,89 +104,115 @@ const SettingsPage = () => {
}
}, [ sites ] );
- const handleFormSubmit = async () : Promise< boolean > => {
- const updated : BrandSite[] = editingIndex !== null
- ? sites.map( ( item, i ) => ( i === editingIndex ? formData : item ) )
- : [ ...sites, formData ];
+ const handleFormSubmit = async (): Promise< boolean > => {
+ const updated: BrandSite[] =
+ editingIndex !== null
+ ? sites.map( ( item, i ) =>
+ i === editingIndex ? formData : item
+ )
+ : [ ...sites, formData ];
- return apiFetch<{ shared_sites?: BrandSite[] }>( {
+ return apiFetch< { shared_sites?: BrandSite[] } >( {
path: SHARED_SITES_ENDPOINT,
method: 'POST',
data: { sites_data: updated },
- } ).then( ( data ) => {
- if ( ! data?.shared_sites ) {
- throw new Error( 'No shared sites in response' );
- }
+ } )
+ .then( ( data ) => {
+ if ( ! data?.shared_sites ) {
+ throw new Error( 'No shared sites in response' );
+ }
- if ( data.shared_sites.length === 1 && sites.length === 0 ) {
- // Reloading causes the menus etc to reflect the missing sites.
- window.location.reload();
- }
+ if ( data.shared_sites.length === 1 && sites.length === 0 ) {
+ // Reloading causes the menus etc to reflect the missing sites.
+ window.location.reload();
+ }
- setSites( data.shared_sites );
+ setSites( data.shared_sites );
- setNotice( {
- type: 'success',
- message: __( 'Brand Site saved successfully.', 'oneupdate' ),
- } );
- return true;
- } ).catch( () => {
- setNotice( {
- type: 'error',
- message: __( 'Failed to update shared sites', 'oneupdate' ),
+ setNotice( {
+ type: 'success',
+ message: __(
+ 'Brand Site saved successfully.',
+ 'oneupdate'
+ ),
+ } );
+ return true;
+ } )
+ .catch( () => {
+ setNotice( {
+ type: 'error',
+ message: __( 'Failed to update shared sites', 'oneupdate' ),
+ } );
+ return false;
+ } )
+ .finally( () => {
+ setFormData( defaultBrandSite );
+ setShowModal( false );
+ setEditingIndex( null );
} );
- return false;
- } ).finally( () => {
- setFormData( defaultBrandSite );
- setShowModal( false );
- setEditingIndex( null );
- } );
};
- const handleDelete = async ( index : number|null ) : Promise => {
- const updated : BrandSite[] = sites.filter( ( _, i ) => i !== index );
+ const handleDelete = async ( index: number | null ): Promise< void > => {
+ const updated: BrandSite[] = sites.filter( ( _, i ) => i !== index );
- apiFetch<{ shared_sites?: BrandSite[] }>( {
+ apiFetch< { shared_sites?: BrandSite[] } >( {
path: SHARED_SITES_ENDPOINT,
method: 'POST',
data: { sites_data: updated },
- } ).then( ( data ) => {
- if ( ! data?.shared_sites ) {
- throw new Error( 'No shared sites in response' );
- }
- setSites( data.shared_sites );
-
- if ( data.shared_sites.length === 0 ) {
- // Reloading causes the menus etc to reflect the missing sites.
- window.location.reload();
- } else {
- document.body.classList.remove( 'oneupdate-missing-brand-sites' );
- }
- } ).catch( () => {
- throw new Error( 'Failed to update shared sites' );
- } );
+ } )
+ .then( ( data ) => {
+ if ( ! data?.shared_sites ) {
+ throw new Error( 'No shared sites in response' );
+ }
+ setSites( data.shared_sites );
+
+ if ( data.shared_sites.length === 0 ) {
+ // Reloading causes the menus etc to reflect the missing sites.
+ window.location.reload();
+ } else {
+ document.body.classList.remove(
+ 'oneupdate-missing-brand-sites'
+ );
+ }
+ } )
+ .catch( () => {
+ throw new Error( 'Failed to update shared sites' );
+ } );
};
return (
<>
- { !! notice && notice?.message?.length > 0 &&
+ { !! notice && notice?.message?.length > 0 && (
setNotice( null ) }
- className={ notice?.type === 'error' ? 'oneupdate-error-notice' : 'oneupdate-success-notice' }
+ className={
+ notice?.type === 'error'
+ ? 'oneupdate-error-notice'
+ : 'oneupdate-success-notice'
+ }
>
{ notice?.message }
- }
-
- { SITE_TYPE === 'brand-site' && (
- ,
- },
-) => {
+const GitHubRepoToken = ( {
+ setNotice,
+ fetchAllAvailableGitHubRepos,
+}: {
+ setNotice: ( notice: NoticeType ) => void;
+ fetchAllAvailableGitHubRepos: () => Promise< void >;
+} ) => {
const [ repoToken, setRepoToken ] = useState( '' );
const getRepoToken = useCallback( async () => {
- const response = await fetch(
- `${ API_NAMESPACE }/github-token`,
- {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json',
- 'X-WP-NONCE': NONCE,
- },
+ const response = await fetch( `${ API_NAMESPACE }/github-token`, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-WP-NONCE': NONCE,
},
- );
+ } );
if ( ! response.ok ) {
- console.error( 'Error fetching GitHub token:', response.statusText ); // eslint-disable-line no-console
+ console.error(
+ 'Error fetching GitHub token:',
+ response.statusText
+ );
}
const data = await response.json();
@@ -51,23 +54,23 @@ const GitHubRepoToken = (
getRepoToken();
}, [] );
- const setGitHubRepoToken = useCallback( async ( token : string ) => {
- const response = await fetch(
- `${ API_NAMESPACE }/github-token`,
- {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- 'X-WP-NONCE': NONCE,
- },
- body: JSON.stringify( { token } ),
+ const setGitHubRepoToken = useCallback( async ( token: string ) => {
+ const response = await fetch( `${ API_NAMESPACE }/github-token`, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-WP-NONCE': NONCE,
},
- );
+ body: JSON.stringify( { token } ),
+ } );
if ( response.ok === false || response.status === 400 ) {
setNotice( {
type: 'error',
- message: __( 'Please enter valid GitHub PAT token.', 'oneupdate' ),
+ message: __(
+ 'Please enter valid GitHub PAT token.',
+ 'oneupdate'
+ ),
} );
return;
}
@@ -76,7 +79,9 @@ const GitHubRepoToken = (
if ( data?.status === '400' ) {
setNotice( {
type: 'error',
- message: data?.message || __( 'Enter valid PAT token.', 'oneupdate' ),
+ message:
+ data?.message ||
+ __( 'Enter valid PAT token.', 'oneupdate' ),
} );
return;
}
@@ -93,11 +98,7 @@ const GitHubRepoToken = (
}, [] );
return (
-
+
{ __( 'GitHub Credentials', 'oneupdate' ) }
-
);
};
diff --git a/assets/src/components/PluginCard.js b/assets/src/components/PluginCard.js
index 3c7ac57..e1cf099 100644
--- a/assets/src/components/PluginCard.js
+++ b/assets/src/components/PluginCard.js
@@ -1,3 +1,6 @@
+/**
+ * WordPress dependencies
+ */
import { decodeEntities } from '@wordpress/html-entities';
import { Button, SelectControl } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
@@ -8,7 +11,13 @@ const PluginCard = ( {
onSelect,
onVersionChange,
} ) => {
- const { name, slug, version, short_description: shortDescription, versions } = plugin;
+ const {
+ name,
+ slug,
+ version,
+ short_description: shortDescription,
+ versions,
+ } = plugin;
const selectedEntry = selectedPlugin?.find( ( p ) => p.slug === slug );
const isSelected = !! selectedEntry;
@@ -27,18 +36,28 @@ const PluginCard = ( {
};
return (
-
+
-
+
{ decodeEntities( name ) }
@@ -56,14 +75,22 @@ const PluginCard = ( {
{ isSelected && (
{
+const PluginVersionSelectControl = ( {
+ versions,
+ selectedVersion,
+ onChange,
+} ) => {
const getLastFiveVersions = ( versionsObj ) => {
if ( ! versionsObj || typeof versionsObj !== 'object' ) {
return [];
}
- const versionKeys = Object.keys( versionsObj )
- .filter( ( key ) => key !== 'trunk' && ! /(alpha|beta|rc|dev|a)/i.test( key ) );
+ const versionKeys = Object.keys( versionsObj ).filter(
+ ( key ) => key !== 'trunk' && ! /(alpha|beta|rc|dev|a)/i.test( key )
+ );
const sortedVersions = versionKeys.sort( ( a, b ) => {
- const aParts = a.split( '.' ).map( ( part ) => parseInt( part, 10 ) || 0 );
- const bParts = b.split( '.' ).map( ( part ) => parseInt( part, 10 ) || 0 );
+ const aParts = a
+ .split( '.' )
+ .map( ( part ) => parseInt( part, 10 ) || 0 );
+ const bParts = b
+ .split( '.' )
+ .map( ( part ) => parseInt( part, 10 ) || 0 );
const maxLength = Math.max( aParts.length, bParts.length );
for ( let i = 0; i < maxLength; i++ ) {
diff --git a/assets/src/components/PluginGrid.js b/assets/src/components/PluginGrid.js
index 4e3f8e1..ea94bbc 100644
--- a/assets/src/components/PluginGrid.js
+++ b/assets/src/components/PluginGrid.js
@@ -1,7 +1,20 @@
+/**
+ * WordPress dependencies
+ */
import { useState, useEffect, useCallback } from '@wordpress/element';
import { __ } from '@wordpress/i18n';
-import { Button, CheckboxControl, Modal, Spinner, TextControl, Notice } from '@wordpress/components';
-
+import {
+ Button,
+ CheckboxControl,
+ Modal,
+ Spinner,
+ TextControl,
+ Notice,
+} from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
import PluginCard from './PluginCard';
const API_NAMESPACE = OneUpdatePlugins.restUrl + '/oneupdate/v1';
@@ -31,7 +44,9 @@ const PluginGrid = () => {
const response = await fetch( WORDPRESS_PLUGINS_API );
if ( ! response.ok ) {
- throw new Error( __( 'Failed to fetch plugins.', 'oneupdate' ) );
+ throw new Error(
+ __( 'Failed to fetch plugins.', 'oneupdate' )
+ );
}
const data = await response.json();
@@ -59,7 +74,7 @@ const PluginGrid = () => {
const existing = prev.find( ( p ) => p.slug === slug );
if ( existing ) {
return prev.map( ( p ) =>
- p.slug === slug ? { ...p, version } : p,
+ p.slug === slug ? { ...p, version } : p
);
}
return [ ...prev, { slug, version } ];
@@ -68,23 +83,18 @@ const PluginGrid = () => {
const handleVersionChange = ( slug, version ) => {
setSelectedPlugin( ( prev ) =>
- prev.map( ( p ) =>
- p.slug === slug ? { ...p, version } : p,
- ),
+ prev.map( ( p ) => ( p.slug === slug ? { ...p, version } : p ) )
);
};
const fetchSharedSitesData = useCallback( async () => {
- const response = await fetch(
- `${ API_NAMESPACE }/shared-sites`,
- {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json',
- 'X-ONEUPDATE-TOKEN': API_KEY,
- },
+ const response = await fetch( `${ API_NAMESPACE }/shared-sites`, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-ONEUPDATE-TOKEN': API_KEY,
},
- );
+ } );
const data = await response.json();
if ( data?.shared_sites ) {
setSharedSites( data.shared_sites );
@@ -106,29 +116,24 @@ const PluginGrid = () => {
return (
-
{ /* Notice State */ }
{ isNoticeVisible && (
-
+
{ noticeMessage.message }
) }
{ /* Search Bar */ }
-
{
}
} }
/>
-
@@ -152,7 +154,9 @@ const PluginGrid = () => {
{ loading && (
{ __( 'Loading plugins…', 'oneupdate' ) }
+
+ { __( 'Loading plugins…', 'oneupdate' ) }
+
) }
@@ -162,10 +166,7 @@ const PluginGrid = () => {
{ __( 'Unable to load plugins', 'oneupdate' ) }
{ error }
-
@@ -177,11 +178,13 @@ const PluginGrid = () => {
{ __( 'No plugins found', 'oneupdate' ) }
- { __( 'Unable to find any plugins to display.', 'oneupdate' ) }
-
@@ -204,10 +207,16 @@ const PluginGrid = () => {
@@ -241,17 +250,24 @@ const PluginGrid = () => {
- { __( 'Page', 'oneupdate' ) } { page } { __( 'of', 'oneupdate' ) } { totalPages }
+ { __( 'Page', 'oneupdate' ) } { page }{ ' ' }
+ { __( 'of', 'oneupdate' ) } { totalPages }
-
);
};
-const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, setNoticeMessage, setIsNoticeVisible, setSelectedPlugin } ) => {
+const ApplyPluginsModal = ( {
+ sharedSites,
+ selectedPlugin,
+ setShowApplyModal,
+ setNoticeMessage,
+ setIsNoticeVisible,
+ setSelectedPlugin,
+} ) => {
const [ selectedSite, setSelectedSite ] = useState( [] );
const [ selectedSiteInfo, setSelectedSiteInfo ] = useState( [] );
@@ -281,7 +303,7 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
// based on selected sites need to get all info from sharedsites for all selected sites
useEffect( () => {
const selectedSiteFullInfo = sharedSites.filter( ( site ) =>
- selectedSite.includes( site.url ),
+ selectedSite.includes( site.url )
);
setSelectedSiteInfo( selectedSiteFullInfo );
@@ -289,26 +311,26 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
const handleApplyPlugins = async () => {
try {
- const response = await fetch(
- `${ API_NAMESPACE }/apply-plugins`,
- {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- 'X-ONEUPDATE-TOKEN': API_KEY,
- },
- body: JSON.stringify( {
- sites: selectedSiteInfo,
- plugins: selectedPlugin,
- } ),
+ const response = await fetch( `${ API_NAMESPACE }/apply-plugins`, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-ONEUPDATE-TOKEN': API_KEY,
},
- );
+ body: JSON.stringify( {
+ sites: selectedSiteInfo,
+ plugins: selectedPlugin,
+ } ),
+ } );
const data = await response.json();
if ( data?.success && data?.created_prs ) {
const prUrls = data?.created_prs;
- const prUrlsArray = prUrls?.map( ( pr ) => {
- return pr?.data?.pr_url || '';
- } ).filter( ( url ) => url !== '' ) || [];
+ const prUrlsArray =
+ prUrls
+ ?.map( ( pr ) => {
+ return pr?.data?.pr_url || '';
+ } )
+ .filter( ( url ) => url !== '' ) || [];
// Join to comma separated string
const prUrlsString = prUrlsArray.join( ', ' );
@@ -316,21 +338,31 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
setIsNoticeVisible( true );
setNoticeMessage( {
type: 'success',
- message: __( 'Plugins applied successfully. Please check the PR at:', 'oneupdate' ) + ` ${ prUrlsString }`,
+ message:
+ __(
+ 'Plugins applied successfully. Please check the PR at:',
+ 'oneupdate'
+ ) + ` ${ prUrlsString }`,
} );
setSelectedPlugin( [] );
} else {
setIsNoticeVisible( true );
setNoticeMessage( {
type: 'error',
- message: __( 'Failed to apply plugins. Please try again.', 'oneupdate' ),
+ message: __(
+ 'Failed to apply plugins. Please try again.',
+ 'oneupdate'
+ ),
} );
}
} catch ( error ) {
setIsNoticeVisible( true );
setNoticeMessage( {
type: 'error',
- message: __( 'An error occurred while applying plugins.', 'oneupdate' ),
+ message: __(
+ 'An error occurred while applying plugins.',
+ 'oneupdate'
+ ),
} );
}
};
@@ -338,12 +370,14 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
return (
- { __( 'Select a site to apply the plugins', 'oneupdate' ) }
+
+ { __( 'Select a site to apply the plugins', 'oneupdate' ) }
+
{ sharedSites.length > 0 ? (
{ sharedSites.map( ( site ) => (
@@ -351,12 +385,19 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
key={ site?.url }
label={ site?.name }
checked={ selectedSite.includes( site?.url ) }
- onChange={ () => handleSiteSelection( site.url ) }
+ onChange={ () =>
+ handleSiteSelection( site.url )
+ }
/>
) ) }
) : (
- { __( 'No sites available to apply plugins.', 'oneupdate' ) }
+
+ { __(
+ 'No sites available to apply plugins.',
+ 'oneupdate'
+ ) }
+
) }
+
{ __( 'Changelog', 'oneupdate' ) }
{
borderRadius: '8px',
border: '1px solid #e9ecef',
} }
- dangerouslySetInnerHTML={ { __html: selectedPlugin.plugin_info.changelog } }
+ dangerouslySetInnerHTML={ {
+ __html: selectedPlugin
+ .plugin_info.changelog,
+ } }
/>
) }
-
+
@@ -2220,47 +3467,99 @@ const PluginManager = () => {
title={ sprintf(
/* translators: %s is the plugin name */
__( '%s - Sites', 'oneupdate' ),
- selectedPlugin.plugin_info.name,
+ selectedPlugin.plugin_info.name
) }
onRequestClose={ () => setShowSitesModal( false ) }
style={ { maxWidth: '400px', minWidth: '400px' } }
- shouldCloseOnClickOutside={ true }
+ shouldCloseOnClickOutside
>
-
- { __( 'Plugin status across all sites', 'oneupdate' ) }
+
+ { __(
+ 'Plugin status across all sites',
+ 'oneupdate'
+ ) }
-
- { Object.entries( selectedPlugin.sites ).map( ( [ url, siteInfo ] ) => (
+
+ { Object.entries(
+ selectedPlugin.sites
+ ).map( ( [ url, siteInfo ] ) => (
-
-
+
+
-
+
-
- { siteInfo.site_name || formatSiteUrl( url ) }
+
+ { siteInfo.site_name ||
+ formatSiteUrl(
+ url
+ ) }
-
- { ( url ) } • v{ siteInfo.version }
+
+ { url } • v
+ {
+ siteInfo.version
+ }
@@ -2270,14 +3569,24 @@ const PluginManager = () => {
{ siteInfo.is_active
- ? __( 'Active', 'oneupdate' )
- : __( 'Inactive', 'oneupdate' ) }
+ ? __(
+ 'Active',
+ 'oneupdate'
+ )
+ : __(
+ 'Inactive',
+ 'oneupdate'
+ ) }
{ siteInfo.is_update_available && (
@@ -2285,13 +3594,20 @@ const PluginManager = () => {
- { __( 'Update Available', 'oneupdate' ) }
+ { __(
+ 'Update Available',
+ 'oneupdate'
+ ) }
) }
@@ -2303,10 +3619,17 @@ const PluginManager = () => {
) ) }
-
+
diff --git a/assets/src/admin/pull-requests/index.js b/assets/src/admin/pull-requests/index.js
index af59f14..83a88f8 100644
--- a/assets/src/admin/pull-requests/index.js
+++ b/assets/src/admin/pull-requests/index.js
@@ -1,7 +1,12 @@
/**
* WordPress dependencies
*/
-import { useState, useEffect, useCallback, createRoot } from '@wordpress/element';
+import {
+ useState,
+ useEffect,
+ useCallback,
+ createRoot,
+} from '@wordpress/element';
import { __ } from '@wordpress/i18n';
import {
Card,
@@ -20,9 +25,13 @@ import {
} from '@wordpress/components';
import { decodeEntities } from '@wordpress/html-entities';
import { moreVertical } from '@wordpress/icons';
+/**
+ * Internal dependencies
+ */
import ViewIcon from '../../components/icons/View';
-const API_NAMESPACE = window.OneUpdatePullRequests.restUrl + '/oneupdate/v1/github';
+const API_NAMESPACE =
+ window.OneUpdatePullRequests.restUrl + '/oneupdate/v1/github';
const NONCE = window.OneUpdatePullRequests.restNonce;
const REPOS = window.OneUpdatePullRequests.repos;
@@ -40,7 +49,9 @@ const GitHubPullRequests = () => {
const [ pullRequests, setPullRequests ] = useState( [] );
const [ loading, setLoading ] = useState( false );
const [ notice, setNotice ] = useState( null );
- const [ selectedRepo, setSelectedRepo ] = useState( Object.keys( REPOS )?.[ 0 ] || '' );
+ const [ selectedRepo, setSelectedRepo ] = useState(
+ Object.keys( REPOS )?.[ 0 ] || ''
+ );
const [ statusFilter, setStatusFilter ] = useState( 'all' );
const [ searchQuery, setSearchQuery ] = useState( '[OneUpdate]' );
const [ page, setPage ] = useState( 1 );
@@ -90,19 +101,25 @@ const GitHubPullRequests = () => {
'Content-Type': 'application/json',
'X-WP-NONCE': NONCE,
},
- },
+ }
);
if ( ! response.ok ) {
if ( response?.statusText === 'Unprocessable Entity' ) {
setNotice( {
type: 'error',
- message: __( 'Please enter valid character to search pull requests.', 'oneupdate' ),
+ message: __(
+ 'Please enter valid character to search pull requests.',
+ 'oneupdate'
+ ),
} );
} else {
setNotice( {
type: 'error',
- message: __( 'Failed to fetch pull requests.', 'oneupdate' ),
+ message: __(
+ 'Failed to fetch pull requests.',
+ 'oneupdate'
+ ),
} );
}
return;
@@ -113,7 +130,9 @@ const GitHubPullRequests = () => {
if ( data.success ) {
setPullRequests( data.pull_requests || [] );
// Calculate total pages based on response (you might need to adjust based on your API)
- const totalCount = response.headers.get( 'X-WP-Total' ) || data.pull_requests.length;
+ const totalCount =
+ response.headers.get( 'X-WP-Total' ) ||
+ data.pull_requests.length;
setTotalPages( Math.ceil( totalCount / PER_PAGE ) );
setCurrentPage( data?.pagination?.current_page || 1 );
} else {
@@ -125,7 +144,9 @@ const GitHubPullRequests = () => {
} catch ( error ) {
setNotice( {
type: 'error',
- message: error.message || __( 'Error fetching pull requests.', 'oneupdate' ),
+ message:
+ error.message ||
+ __( 'Error fetching pull requests.', 'oneupdate' ),
} );
setPullRequests( [] );
} finally {
@@ -133,43 +154,48 @@ const GitHubPullRequests = () => {
}
}, [ selectedRepo, statusFilter, searchQuery, page ] );
- const fetchPRDetails = useCallback( async ( prNumber ) => {
- if ( ! selectedRepo || ! prNumber ) {
- return;
- }
-
- setDetailsLoading( true );
- try {
- const response = await fetch(
- `${ API_NAMESPACE }/pull-requests/${ selectedRepo }?pr_number=${ prNumber }&_=${ new Date().getTime() }`,
- {
- headers: {
- 'Content-Type': 'application/json',
- 'X-WP-NONCE': NONCE,
- },
- },
- );
-
- if ( ! response.ok ) {
- throw new Error( 'Failed to fetch PR details' );
+ const fetchPRDetails = useCallback(
+ async ( prNumber ) => {
+ if ( ! selectedRepo || ! prNumber ) {
+ return;
}
- const data = await response.json();
+ setDetailsLoading( true );
+ try {
+ const response = await fetch(
+ `${ API_NAMESPACE }/pull-requests/${ selectedRepo }?pr_number=${ prNumber }&_=${ new Date().getTime() }`,
+ {
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-WP-NONCE': NONCE,
+ },
+ }
+ );
+
+ if ( ! response.ok ) {
+ throw new Error( 'Failed to fetch PR details' );
+ }
- if ( data.success && data.pull_request?.[ 0 ] ) {
- setPrDetails( data.pull_request[ 0 ] );
- } else {
- throw new Error( 'Failed to fetch PR details' );
+ const data = await response.json();
+
+ if ( data.success && data.pull_request?.[ 0 ] ) {
+ setPrDetails( data.pull_request[ 0 ] );
+ } else {
+ throw new Error( 'Failed to fetch PR details' );
+ }
+ } catch ( error ) {
+ setNotice( {
+ type: 'error',
+ message:
+ error.message ||
+ __( 'Error fetching PR details.', 'oneupdate' ),
+ } );
+ } finally {
+ setDetailsLoading( false );
}
- } catch ( error ) {
- setNotice( {
- type: 'error',
- message: error.message || __( 'Error fetching PR details.', 'oneupdate' ),
- } );
- } finally {
- setDetailsLoading( false );
- }
- }, [ selectedRepo ] );
+ },
+ [ selectedRepo ]
+ );
const openDetailModal = ( pr ) => {
setSelectedPR( pr );
@@ -242,7 +268,10 @@ const GitHubPullRequests = () => {
onClose();
} }
>
- { __( 'View Details', 'oneupdate' ) }
+ { __(
+ 'View Details',
+ 'oneupdate'
+ ) }
) }
@@ -285,10 +314,21 @@ const GitHubPullRequests = () => {
{ /* Filters */ }
-
+
- { __( 'PR #', 'oneupdate' ) }
- { __( 'Title', 'oneupdate' ) }
- { __( 'Author', 'oneupdate' ) }
- { __( 'Status', 'oneupdate' ) }
- { __( 'Created at', 'oneupdate' ) }
- { __( 'Labels', 'oneupdate' ) }
- { __( 'Actions', 'oneupdate' ) }
+
+ { __( 'PR #', 'oneupdate' ) }
+
+
+ { __( 'Title', 'oneupdate' ) }
+
+
+ { __( 'Author', 'oneupdate' ) }
+
+
+ { __( 'Status', 'oneupdate' ) }
+
+
+ { __( 'Created at', 'oneupdate' ) }
+
+
+ { __( 'Labels', 'oneupdate' ) }
+
+
+ { __( 'Actions', 'oneupdate' ) }
+
{ loading && (
-
-
+
) }
{ ! loading && pullRequests.length === 0 && (
-
- { __( 'No pull requests found.', 'oneupdate' ) }
+
+ { __(
+ 'No pull requests found.',
+ 'oneupdate'
+ ) }
) }
@@ -340,7 +411,10 @@ const GitHubPullRequests = () => {
#{ pr.number }
@@ -351,11 +425,19 @@ const GitHubPullRequests = () => {
target="_blank"
rel="noopener noreferrer"
>
- { decodeEntities( pr.title ) }
+
+ { decodeEntities( pr.title ) }
+
-
+
{
{ formatDate( pr.created_at ) }
{ pr.labels.length > 0 ? (
-
- { pr.labels.slice( 0, 2 ).map( ( label ) => (
+
+ { pr.labels
+ .slice( 0, 2 )
+ .map( ( label ) => (
+
+ { label.name }
+
+ ) ) }
+ { pr.labels.length > 2 && (
- { label.name }
-
- ) ) }
- { pr.labels.length > 2 && (
-
- +{ pr.labels.length - 2 } { __( 'more', 'oneupdate' ) }
+ +
+ { pr.labels.length - 2 }{ ' ' }
+ { __(
+ 'more',
+ 'oneupdate'
+ ) }
) }
) : (
-
- { __( 'No labels', 'oneupdate' ) }
+
+ { __(
+ 'No labels',
+ 'oneupdate'
+ ) }
) }
@@ -400,29 +510,43 @@ const GitHubPullRequests = () => {
{ /* Pagination */ }
- { (
-
-
-
- { __( 'Page', 'oneupdate' ) } { page } { __( 'of', 'oneupdate' ) } { totalPages === 0 || totalPages < currentPage ? currentPage : totalPages }
-
-
-
- ) }
+
+
+
+ { __( 'Page', 'oneupdate' ) } { page }{ ' ' }
+ { __( 'of', 'oneupdate' ) }{ ' ' }
+ { totalPages === 0 || totalPages < currentPage
+ ? currentPage
+ : totalPages }
+
+
+
@@ -432,12 +556,16 @@ const GitHubPullRequests = () => {
title={ __( 'Pull Request Details', 'oneupdate' ) }
onRequestClose={ closeModals }
size="medium"
- shouldCloseOnClickOutside={ true }
+ shouldCloseOnClickOutside
>
{ /* Detailed PR Info */ }
{ detailsLoading && (
-
- { __( 'Loading PR details…', 'oneupdate' ) }
) }
@@ -445,21 +573,90 @@ const GitHubPullRequests = () => {
{ ! detailsLoading && prDetails && (
<>
-
+
- { __( 'PR Number:', 'oneupdate' ) } #{ prDetails.number }
- { __( 'Title:', 'oneupdate' ) } { decodeEntities( prDetails.title ) }
- { __( 'Author:', 'oneupdate' ) } { prDetails.user.login }
- { __( 'Status:', 'oneupdate' ) } { getPRStatusBadge( prDetails ) }
+
+
+ { __(
+ 'PR Number:',
+ 'oneupdate'
+ ) }
+ { ' ' }
+ #{ prDetails.number }
+
+
+
+ { __( 'Title:', 'oneupdate' ) }
+ { ' ' }
+ { decodeEntities(
+ prDetails.title
+ ) }
+
+
+
+ { __( 'Author:', 'oneupdate' ) }
+ { ' ' }
+ { prDetails.user.login }
+
+
+
+ { __( 'Status:', 'oneupdate' ) }
+ { ' ' }
+ { getPRStatusBadge( prDetails ) }
+
- { __( 'Created:', 'oneupdate' ) } { formatDate( prDetails.created_at ) }
- { __( 'Updated:', 'oneupdate' ) } { formatDate( prDetails.updated_at ) }
- { __( 'Branch:', 'oneupdate' ) } { prDetails.pr_branch } → { prDetails.base_branch }
- { __( 'GitHub URL:', 'oneupdate' ) }{ ' ' }
-
- { __( 'View on GitHub', 'oneupdate' ) }
+
+ { __(
+ 'Created:',
+ 'oneupdate'
+ ) }
+ { ' ' }
+ { formatDate(
+ prDetails.created_at
+ ) }
+
+
+
+ { __(
+ 'Updated:',
+ 'oneupdate'
+ ) }
+ { ' ' }
+ { formatDate(
+ prDetails.updated_at
+ ) }
+
+
+
+ { __( 'Branch:', 'oneupdate' ) }
+ { ' ' }
+ { prDetails.pr_branch } →{ ' ' }
+ { prDetails.base_branch }
+
+
+
+ { __(
+ 'GitHub URL:',
+ 'oneupdate'
+ ) }
+ { ' ' }
+
+ { __(
+ 'View on GitHub',
+ 'oneupdate'
+ ) }
@@ -468,16 +665,29 @@ const GitHubPullRequests = () => {
{ /* Labels */ }
{ prDetails.labels.length > 0 && (
- { __( 'Labels:', 'oneupdate' ) }
-
- { prDetails.labels.map( ( label ) => (
-
- { label.name }
-
- ) ) }
+
+ { __( 'Labels:', 'oneupdate' ) }
+
+
+ { prDetails.labels.map(
+ ( label ) => (
+
+ { label.name }
+
+ )
+ ) }
) }
@@ -485,7 +695,12 @@ const GitHubPullRequests = () => {
{ /* Description */ }
{ prDetails.body && (
- { __( 'Description:', 'oneupdate' ) }
+
+ { __(
+ 'Description:',
+ 'oneupdate'
+ ) }
+
{
overflow: 'auto',
} }
>
-
- { decodeEntities( prDetails.body ) }
+
+ { decodeEntities(
+ prDetails.body
+ ) }
@@ -507,14 +730,29 @@ const GitHubPullRequests = () => {
{ /* Merged By Info */ }
{ prDetails.merged_by && (
-
-
+
{ prDetails.merged_by && (
- { __( 'Merged By:', 'oneupdate' ) }
+
+ { __(
+ 'Merged By:',
+ 'oneupdate'
+ ) }
+
{
verticalAlign: 'middle',
} }
/>
- { prDetails.merged_by.login }
+
+ { prDetails.merged_by.login }
+
) }
) }
) }
-
) }
@@ -540,7 +784,11 @@ const GitHubPullRequests = () => {
isDismissible
status={ notice.type }
onRemove={ () => setNotice( null ) }
- className={ notice?.type === 'error' ? 'oneupdate-error-notice' : 'oneupdate-success-notice' }
+ className={
+ notice?.type === 'error'
+ ? 'oneupdate-error-notice'
+ : 'oneupdate-success-notice'
+ }
>
{ notice.message }
diff --git a/assets/src/admin/settings/index.tsx b/assets/src/admin/settings/index.tsx
index 6150a88..c7dd780 100644
--- a/assets/src/admin/settings/index.tsx
+++ b/assets/src/admin/settings/index.tsx
@@ -1,6 +1,9 @@
/**
* WordPress dependencies
*/
+/**
+ * External dependencies
+ */
import { createRoot } from 'react-dom/client';
/**
diff --git a/assets/src/admin/settings/page.tsx b/assets/src/admin/settings/page.tsx
index e002974..6ba3ef3 100644
--- a/assets/src/admin/settings/page.tsx
+++ b/assets/src/admin/settings/page.tsx
@@ -1,6 +1,9 @@
/**
* WordPress dependencies
*/
+/**
+ * External dependencies
+ */
import { useState, useEffect, useCallback } from 'react';
import { __ } from '@wordpress/i18n';
import { Snackbar } from '@wordpress/components';
@@ -26,7 +29,7 @@ export interface BrandSite {
name: string;
url: string;
api_key: string;
- gh_repo: string;
+ gh_repo: string;
}
export const defaultBrandSite: BrandSite = {
@@ -39,7 +42,7 @@ export const defaultBrandSite: BrandSite = {
export type EditingIndex = number | null;
const NONCE = window.OneUpdateSettings.restNonce;
-const SITE_TYPE = window.OneUpdateSettings.siteType as SiteType || '';
+const SITE_TYPE = ( window.OneUpdateSettings.siteType as SiteType ) || '';
const SHARED_SITES_ENDPOINT = '/oneupdate/v1/shared-sites';
const API_NAMESPACE = window.OneUpdateSettings.restUrl + '/oneupdate/v1';
@@ -57,16 +60,13 @@ const SettingsPage = () => {
const [ allGitHubRepos, setAllGitHubRepos ] = useState( [] );
const fetchAllAvailableGitHubRepos = useCallback( async () => {
- const response = await fetch(
- `${ API_NAMESPACE }/github-repos`,
- {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json',
- 'X-WP-NONCE': NONCE,
- },
+ const response = await fetch( `${ API_NAMESPACE }/github-repos`, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-WP-NONCE': NONCE,
},
- );
+ } );
const data = await response.json();
if ( data?.repos ) {
setAllGitHubRepos( data.repos );
@@ -82,7 +82,7 @@ const SettingsPage = () => {
}, [ SITE_TYPE ] );
useEffect( () => {
- apiFetch<{ shared_sites?: BrandSite[] }>( {
+ apiFetch< { shared_sites?: BrandSite[] } >( {
path: SHARED_SITES_ENDPOINT,
} )
.then( ( data ) => {
@@ -104,89 +104,115 @@ const SettingsPage = () => {
}
}, [ sites ] );
- const handleFormSubmit = async () : Promise< boolean > => {
- const updated : BrandSite[] = editingIndex !== null
- ? sites.map( ( item, i ) => ( i === editingIndex ? formData : item ) )
- : [ ...sites, formData ];
+ const handleFormSubmit = async (): Promise< boolean > => {
+ const updated: BrandSite[] =
+ editingIndex !== null
+ ? sites.map( ( item, i ) =>
+ i === editingIndex ? formData : item
+ )
+ : [ ...sites, formData ];
- return apiFetch<{ shared_sites?: BrandSite[] }>( {
+ return apiFetch< { shared_sites?: BrandSite[] } >( {
path: SHARED_SITES_ENDPOINT,
method: 'POST',
data: { sites_data: updated },
- } ).then( ( data ) => {
- if ( ! data?.shared_sites ) {
- throw new Error( 'No shared sites in response' );
- }
+ } )
+ .then( ( data ) => {
+ if ( ! data?.shared_sites ) {
+ throw new Error( 'No shared sites in response' );
+ }
- if ( data.shared_sites.length === 1 && sites.length === 0 ) {
- // Reloading causes the menus etc to reflect the missing sites.
- window.location.reload();
- }
+ if ( data.shared_sites.length === 1 && sites.length === 0 ) {
+ // Reloading causes the menus etc to reflect the missing sites.
+ window.location.reload();
+ }
- setSites( data.shared_sites );
+ setSites( data.shared_sites );
- setNotice( {
- type: 'success',
- message: __( 'Brand Site saved successfully.', 'oneupdate' ),
- } );
- return true;
- } ).catch( () => {
- setNotice( {
- type: 'error',
- message: __( 'Failed to update shared sites', 'oneupdate' ),
+ setNotice( {
+ type: 'success',
+ message: __(
+ 'Brand Site saved successfully.',
+ 'oneupdate'
+ ),
+ } );
+ return true;
+ } )
+ .catch( () => {
+ setNotice( {
+ type: 'error',
+ message: __( 'Failed to update shared sites', 'oneupdate' ),
+ } );
+ return false;
+ } )
+ .finally( () => {
+ setFormData( defaultBrandSite );
+ setShowModal( false );
+ setEditingIndex( null );
} );
- return false;
- } ).finally( () => {
- setFormData( defaultBrandSite );
- setShowModal( false );
- setEditingIndex( null );
- } );
};
- const handleDelete = async ( index : number|null ) : Promise => {
- const updated : BrandSite[] = sites.filter( ( _, i ) => i !== index );
+ const handleDelete = async ( index: number | null ): Promise< void > => {
+ const updated: BrandSite[] = sites.filter( ( _, i ) => i !== index );
- apiFetch<{ shared_sites?: BrandSite[] }>( {
+ apiFetch< { shared_sites?: BrandSite[] } >( {
path: SHARED_SITES_ENDPOINT,
method: 'POST',
data: { sites_data: updated },
- } ).then( ( data ) => {
- if ( ! data?.shared_sites ) {
- throw new Error( 'No shared sites in response' );
- }
- setSites( data.shared_sites );
-
- if ( data.shared_sites.length === 0 ) {
- // Reloading causes the menus etc to reflect the missing sites.
- window.location.reload();
- } else {
- document.body.classList.remove( 'oneupdate-missing-brand-sites' );
- }
- } ).catch( () => {
- throw new Error( 'Failed to update shared sites' );
- } );
+ } )
+ .then( ( data ) => {
+ if ( ! data?.shared_sites ) {
+ throw new Error( 'No shared sites in response' );
+ }
+ setSites( data.shared_sites );
+
+ if ( data.shared_sites.length === 0 ) {
+ // Reloading causes the menus etc to reflect the missing sites.
+ window.location.reload();
+ } else {
+ document.body.classList.remove(
+ 'oneupdate-missing-brand-sites'
+ );
+ }
+ } )
+ .catch( () => {
+ throw new Error( 'Failed to update shared sites' );
+ } );
};
return (
<>
- { !! notice && notice?.message?.length > 0 &&
+ { !! notice && notice?.message?.length > 0 && (
setNotice( null ) }
- className={ notice?.type === 'error' ? 'oneupdate-error-notice' : 'oneupdate-success-notice' }
+ className={
+ notice?.type === 'error'
+ ? 'oneupdate-error-notice'
+ : 'oneupdate-success-notice'
+ }
>
{ notice?.message }
- }
-
- { SITE_TYPE === 'brand-site' && (
- ,
- },
-) => {
+const GitHubRepoToken = ( {
+ setNotice,
+ fetchAllAvailableGitHubRepos,
+}: {
+ setNotice: ( notice: NoticeType ) => void;
+ fetchAllAvailableGitHubRepos: () => Promise< void >;
+} ) => {
const [ repoToken, setRepoToken ] = useState( '' );
const getRepoToken = useCallback( async () => {
- const response = await fetch(
- `${ API_NAMESPACE }/github-token`,
- {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json',
- 'X-WP-NONCE': NONCE,
- },
+ const response = await fetch( `${ API_NAMESPACE }/github-token`, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-WP-NONCE': NONCE,
},
- );
+ } );
if ( ! response.ok ) {
- console.error( 'Error fetching GitHub token:', response.statusText ); // eslint-disable-line no-console
+ console.error(
+ 'Error fetching GitHub token:',
+ response.statusText
+ );
}
const data = await response.json();
@@ -51,23 +54,23 @@ const GitHubRepoToken = (
getRepoToken();
}, [] );
- const setGitHubRepoToken = useCallback( async ( token : string ) => {
- const response = await fetch(
- `${ API_NAMESPACE }/github-token`,
- {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- 'X-WP-NONCE': NONCE,
- },
- body: JSON.stringify( { token } ),
+ const setGitHubRepoToken = useCallback( async ( token: string ) => {
+ const response = await fetch( `${ API_NAMESPACE }/github-token`, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-WP-NONCE': NONCE,
},
- );
+ body: JSON.stringify( { token } ),
+ } );
if ( response.ok === false || response.status === 400 ) {
setNotice( {
type: 'error',
- message: __( 'Please enter valid GitHub PAT token.', 'oneupdate' ),
+ message: __(
+ 'Please enter valid GitHub PAT token.',
+ 'oneupdate'
+ ),
} );
return;
}
@@ -76,7 +79,9 @@ const GitHubRepoToken = (
if ( data?.status === '400' ) {
setNotice( {
type: 'error',
- message: data?.message || __( 'Enter valid PAT token.', 'oneupdate' ),
+ message:
+ data?.message ||
+ __( 'Enter valid PAT token.', 'oneupdate' ),
} );
return;
}
@@ -93,11 +98,7 @@ const GitHubRepoToken = (
}, [] );
return (
-
+
{ __( 'GitHub Credentials', 'oneupdate' ) }
-
);
};
diff --git a/assets/src/components/PluginCard.js b/assets/src/components/PluginCard.js
index 3c7ac57..e1cf099 100644
--- a/assets/src/components/PluginCard.js
+++ b/assets/src/components/PluginCard.js
@@ -1,3 +1,6 @@
+/**
+ * WordPress dependencies
+ */
import { decodeEntities } from '@wordpress/html-entities';
import { Button, SelectControl } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
@@ -8,7 +11,13 @@ const PluginCard = ( {
onSelect,
onVersionChange,
} ) => {
- const { name, slug, version, short_description: shortDescription, versions } = plugin;
+ const {
+ name,
+ slug,
+ version,
+ short_description: shortDescription,
+ versions,
+ } = plugin;
const selectedEntry = selectedPlugin?.find( ( p ) => p.slug === slug );
const isSelected = !! selectedEntry;
@@ -27,18 +36,28 @@ const PluginCard = ( {
};
return (
-
+
-
+
{ decodeEntities( name ) }
@@ -56,14 +75,22 @@ const PluginCard = ( {
{ isSelected && (
{
+const PluginVersionSelectControl = ( {
+ versions,
+ selectedVersion,
+ onChange,
+} ) => {
const getLastFiveVersions = ( versionsObj ) => {
if ( ! versionsObj || typeof versionsObj !== 'object' ) {
return [];
}
- const versionKeys = Object.keys( versionsObj )
- .filter( ( key ) => key !== 'trunk' && ! /(alpha|beta|rc|dev|a)/i.test( key ) );
+ const versionKeys = Object.keys( versionsObj ).filter(
+ ( key ) => key !== 'trunk' && ! /(alpha|beta|rc|dev|a)/i.test( key )
+ );
const sortedVersions = versionKeys.sort( ( a, b ) => {
- const aParts = a.split( '.' ).map( ( part ) => parseInt( part, 10 ) || 0 );
- const bParts = b.split( '.' ).map( ( part ) => parseInt( part, 10 ) || 0 );
+ const aParts = a
+ .split( '.' )
+ .map( ( part ) => parseInt( part, 10 ) || 0 );
+ const bParts = b
+ .split( '.' )
+ .map( ( part ) => parseInt( part, 10 ) || 0 );
const maxLength = Math.max( aParts.length, bParts.length );
for ( let i = 0; i < maxLength; i++ ) {
diff --git a/assets/src/components/PluginGrid.js b/assets/src/components/PluginGrid.js
index 4e3f8e1..ea94bbc 100644
--- a/assets/src/components/PluginGrid.js
+++ b/assets/src/components/PluginGrid.js
@@ -1,7 +1,20 @@
+/**
+ * WordPress dependencies
+ */
import { useState, useEffect, useCallback } from '@wordpress/element';
import { __ } from '@wordpress/i18n';
-import { Button, CheckboxControl, Modal, Spinner, TextControl, Notice } from '@wordpress/components';
-
+import {
+ Button,
+ CheckboxControl,
+ Modal,
+ Spinner,
+ TextControl,
+ Notice,
+} from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
import PluginCard from './PluginCard';
const API_NAMESPACE = OneUpdatePlugins.restUrl + '/oneupdate/v1';
@@ -31,7 +44,9 @@ const PluginGrid = () => {
const response = await fetch( WORDPRESS_PLUGINS_API );
if ( ! response.ok ) {
- throw new Error( __( 'Failed to fetch plugins.', 'oneupdate' ) );
+ throw new Error(
+ __( 'Failed to fetch plugins.', 'oneupdate' )
+ );
}
const data = await response.json();
@@ -59,7 +74,7 @@ const PluginGrid = () => {
const existing = prev.find( ( p ) => p.slug === slug );
if ( existing ) {
return prev.map( ( p ) =>
- p.slug === slug ? { ...p, version } : p,
+ p.slug === slug ? { ...p, version } : p
);
}
return [ ...prev, { slug, version } ];
@@ -68,23 +83,18 @@ const PluginGrid = () => {
const handleVersionChange = ( slug, version ) => {
setSelectedPlugin( ( prev ) =>
- prev.map( ( p ) =>
- p.slug === slug ? { ...p, version } : p,
- ),
+ prev.map( ( p ) => ( p.slug === slug ? { ...p, version } : p ) )
);
};
const fetchSharedSitesData = useCallback( async () => {
- const response = await fetch(
- `${ API_NAMESPACE }/shared-sites`,
- {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json',
- 'X-ONEUPDATE-TOKEN': API_KEY,
- },
+ const response = await fetch( `${ API_NAMESPACE }/shared-sites`, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-ONEUPDATE-TOKEN': API_KEY,
},
- );
+ } );
const data = await response.json();
if ( data?.shared_sites ) {
setSharedSites( data.shared_sites );
@@ -106,29 +116,24 @@ const PluginGrid = () => {
return (
-
{ /* Notice State */ }
{ isNoticeVisible && (
-
+
{ noticeMessage.message }
) }
{ /* Search Bar */ }
-
{
}
} }
/>
-
@@ -152,7 +154,9 @@ const PluginGrid = () => {
{ loading && (
{ __( 'Loading plugins…', 'oneupdate' ) }
+
+ { __( 'Loading plugins…', 'oneupdate' ) }
+
) }
@@ -162,10 +166,7 @@ const PluginGrid = () => {
{ __( 'Unable to load plugins', 'oneupdate' ) }
{ error }
-
@@ -177,11 +178,13 @@ const PluginGrid = () => {
{ __( 'No plugins found', 'oneupdate' ) }
- { __( 'Unable to find any plugins to display.', 'oneupdate' ) }
-
@@ -204,10 +207,16 @@ const PluginGrid = () => {
@@ -241,17 +250,24 @@ const PluginGrid = () => {
- { __( 'Page', 'oneupdate' ) } { page } { __( 'of', 'oneupdate' ) } { totalPages }
+ { __( 'Page', 'oneupdate' ) } { page }{ ' ' }
+ { __( 'of', 'oneupdate' ) } { totalPages }
-
);
};
-const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, setNoticeMessage, setIsNoticeVisible, setSelectedPlugin } ) => {
+const ApplyPluginsModal = ( {
+ sharedSites,
+ selectedPlugin,
+ setShowApplyModal,
+ setNoticeMessage,
+ setIsNoticeVisible,
+ setSelectedPlugin,
+} ) => {
const [ selectedSite, setSelectedSite ] = useState( [] );
const [ selectedSiteInfo, setSelectedSiteInfo ] = useState( [] );
@@ -281,7 +303,7 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
// based on selected sites need to get all info from sharedsites for all selected sites
useEffect( () => {
const selectedSiteFullInfo = sharedSites.filter( ( site ) =>
- selectedSite.includes( site.url ),
+ selectedSite.includes( site.url )
);
setSelectedSiteInfo( selectedSiteFullInfo );
@@ -289,26 +311,26 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
const handleApplyPlugins = async () => {
try {
- const response = await fetch(
- `${ API_NAMESPACE }/apply-plugins`,
- {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- 'X-ONEUPDATE-TOKEN': API_KEY,
- },
- body: JSON.stringify( {
- sites: selectedSiteInfo,
- plugins: selectedPlugin,
- } ),
+ const response = await fetch( `${ API_NAMESPACE }/apply-plugins`, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-ONEUPDATE-TOKEN': API_KEY,
},
- );
+ body: JSON.stringify( {
+ sites: selectedSiteInfo,
+ plugins: selectedPlugin,
+ } ),
+ } );
const data = await response.json();
if ( data?.success && data?.created_prs ) {
const prUrls = data?.created_prs;
- const prUrlsArray = prUrls?.map( ( pr ) => {
- return pr?.data?.pr_url || '';
- } ).filter( ( url ) => url !== '' ) || [];
+ const prUrlsArray =
+ prUrls
+ ?.map( ( pr ) => {
+ return pr?.data?.pr_url || '';
+ } )
+ .filter( ( url ) => url !== '' ) || [];
// Join to comma separated string
const prUrlsString = prUrlsArray.join( ', ' );
@@ -316,21 +338,31 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
setIsNoticeVisible( true );
setNoticeMessage( {
type: 'success',
- message: __( 'Plugins applied successfully. Please check the PR at:', 'oneupdate' ) + ` ${ prUrlsString }`,
+ message:
+ __(
+ 'Plugins applied successfully. Please check the PR at:',
+ 'oneupdate'
+ ) + ` ${ prUrlsString }`,
} );
setSelectedPlugin( [] );
} else {
setIsNoticeVisible( true );
setNoticeMessage( {
type: 'error',
- message: __( 'Failed to apply plugins. Please try again.', 'oneupdate' ),
+ message: __(
+ 'Failed to apply plugins. Please try again.',
+ 'oneupdate'
+ ),
} );
}
} catch ( error ) {
setIsNoticeVisible( true );
setNoticeMessage( {
type: 'error',
- message: __( 'An error occurred while applying plugins.', 'oneupdate' ),
+ message: __(
+ 'An error occurred while applying plugins.',
+ 'oneupdate'
+ ),
} );
}
};
@@ -338,12 +370,14 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
return (
- { __( 'Select a site to apply the plugins', 'oneupdate' ) }
+
+ { __( 'Select a site to apply the plugins', 'oneupdate' ) }
+
{ sharedSites.length > 0 ? (
{ sharedSites.map( ( site ) => (
@@ -351,12 +385,19 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
key={ site?.url }
label={ site?.name }
checked={ selectedSite.includes( site?.url ) }
- onChange={ () => handleSiteSelection( site.url ) }
+ onChange={ () =>
+ handleSiteSelection( site.url )
+ }
/>
) ) }
) : (
- { __( 'No sites available to apply plugins.', 'oneupdate' ) }
+
+ { __(
+ 'No sites available to apply plugins.',
+ 'oneupdate'
+ ) }
+
) }
@@ -2220,47 +3467,99 @@ const PluginManager = () => {
title={ sprintf(
/* translators: %s is the plugin name */
__( '%s - Sites', 'oneupdate' ),
- selectedPlugin.plugin_info.name,
+ selectedPlugin.plugin_info.name
) }
onRequestClose={ () => setShowSitesModal( false ) }
style={ { maxWidth: '400px', minWidth: '400px' } }
- shouldCloseOnClickOutside={ true }
+ shouldCloseOnClickOutside
>
-
- { __( 'Plugin status across all sites', 'oneupdate' ) } +
+ { __( + 'Plugin status across all sites', + 'oneupdate' + ) }
-
- { Object.entries( selectedPlugin.sites ).map( ( [ url, siteInfo ] ) => (
+
+ { Object.entries(
+ selectedPlugin.sites
+ ).map( ( [ url, siteInfo ] ) => (
-
-
+
+
-
+
-
- { siteInfo.site_name || formatSiteUrl( url ) }
+
+ { siteInfo.site_name ||
+ formatSiteUrl(
+ url
+ ) }
-
- { ( url ) } • v{ siteInfo.version }
+
{ siteInfo.is_active
- ? __( 'Active', 'oneupdate' )
- : __( 'Inactive', 'oneupdate' ) }
+ ? __(
+ 'Active',
+ 'oneupdate'
+ )
+ : __(
+ 'Inactive',
+ 'oneupdate'
+ ) }
{ siteInfo.is_update_available && (
@@ -2285,13 +3594,20 @@ const PluginManager = () => {
- { __( 'Update Available', 'oneupdate' ) }
+ { __(
+ 'Update Available',
+ 'oneupdate'
+ ) }
) }
@@ -2303,10 +3619,17 @@ const PluginManager = () => {
) ) }
-
+ { url } • v
+ {
+ siteInfo.version
+ }
@@ -2270,14 +3569,24 @@ const PluginManager = () => {
+
diff --git a/assets/src/admin/pull-requests/index.js b/assets/src/admin/pull-requests/index.js
index af59f14..83a88f8 100644
--- a/assets/src/admin/pull-requests/index.js
+++ b/assets/src/admin/pull-requests/index.js
@@ -1,7 +1,12 @@
/**
* WordPress dependencies
*/
-import { useState, useEffect, useCallback, createRoot } from '@wordpress/element';
+import {
+ useState,
+ useEffect,
+ useCallback,
+ createRoot,
+} from '@wordpress/element';
import { __ } from '@wordpress/i18n';
import {
Card,
@@ -20,9 +25,13 @@ import {
} from '@wordpress/components';
import { decodeEntities } from '@wordpress/html-entities';
import { moreVertical } from '@wordpress/icons';
+/**
+ * Internal dependencies
+ */
import ViewIcon from '../../components/icons/View';
-const API_NAMESPACE = window.OneUpdatePullRequests.restUrl + '/oneupdate/v1/github';
+const API_NAMESPACE =
+ window.OneUpdatePullRequests.restUrl + '/oneupdate/v1/github';
const NONCE = window.OneUpdatePullRequests.restNonce;
const REPOS = window.OneUpdatePullRequests.repos;
@@ -40,7 +49,9 @@ const GitHubPullRequests = () => {
const [ pullRequests, setPullRequests ] = useState( [] );
const [ loading, setLoading ] = useState( false );
const [ notice, setNotice ] = useState( null );
- const [ selectedRepo, setSelectedRepo ] = useState( Object.keys( REPOS )?.[ 0 ] || '' );
+ const [ selectedRepo, setSelectedRepo ] = useState(
+ Object.keys( REPOS )?.[ 0 ] || ''
+ );
const [ statusFilter, setStatusFilter ] = useState( 'all' );
const [ searchQuery, setSearchQuery ] = useState( '[OneUpdate]' );
const [ page, setPage ] = useState( 1 );
@@ -90,19 +101,25 @@ const GitHubPullRequests = () => {
'Content-Type': 'application/json',
'X-WP-NONCE': NONCE,
},
- },
+ }
);
if ( ! response.ok ) {
if ( response?.statusText === 'Unprocessable Entity' ) {
setNotice( {
type: 'error',
- message: __( 'Please enter valid character to search pull requests.', 'oneupdate' ),
+ message: __(
+ 'Please enter valid character to search pull requests.',
+ 'oneupdate'
+ ),
} );
} else {
setNotice( {
type: 'error',
- message: __( 'Failed to fetch pull requests.', 'oneupdate' ),
+ message: __(
+ 'Failed to fetch pull requests.',
+ 'oneupdate'
+ ),
} );
}
return;
@@ -113,7 +130,9 @@ const GitHubPullRequests = () => {
if ( data.success ) {
setPullRequests( data.pull_requests || [] );
// Calculate total pages based on response (you might need to adjust based on your API)
- const totalCount = response.headers.get( 'X-WP-Total' ) || data.pull_requests.length;
+ const totalCount =
+ response.headers.get( 'X-WP-Total' ) ||
+ data.pull_requests.length;
setTotalPages( Math.ceil( totalCount / PER_PAGE ) );
setCurrentPage( data?.pagination?.current_page || 1 );
} else {
@@ -125,7 +144,9 @@ const GitHubPullRequests = () => {
} catch ( error ) {
setNotice( {
type: 'error',
- message: error.message || __( 'Error fetching pull requests.', 'oneupdate' ),
+ message:
+ error.message ||
+ __( 'Error fetching pull requests.', 'oneupdate' ),
} );
setPullRequests( [] );
} finally {
@@ -133,43 +154,48 @@ const GitHubPullRequests = () => {
}
}, [ selectedRepo, statusFilter, searchQuery, page ] );
- const fetchPRDetails = useCallback( async ( prNumber ) => {
- if ( ! selectedRepo || ! prNumber ) {
- return;
- }
-
- setDetailsLoading( true );
- try {
- const response = await fetch(
- `${ API_NAMESPACE }/pull-requests/${ selectedRepo }?pr_number=${ prNumber }&_=${ new Date().getTime() }`,
- {
- headers: {
- 'Content-Type': 'application/json',
- 'X-WP-NONCE': NONCE,
- },
- },
- );
-
- if ( ! response.ok ) {
- throw new Error( 'Failed to fetch PR details' );
+ const fetchPRDetails = useCallback(
+ async ( prNumber ) => {
+ if ( ! selectedRepo || ! prNumber ) {
+ return;
}
- const data = await response.json();
+ setDetailsLoading( true );
+ try {
+ const response = await fetch(
+ `${ API_NAMESPACE }/pull-requests/${ selectedRepo }?pr_number=${ prNumber }&_=${ new Date().getTime() }`,
+ {
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-WP-NONCE': NONCE,
+ },
+ }
+ );
+
+ if ( ! response.ok ) {
+ throw new Error( 'Failed to fetch PR details' );
+ }
- if ( data.success && data.pull_request?.[ 0 ] ) {
- setPrDetails( data.pull_request[ 0 ] );
- } else {
- throw new Error( 'Failed to fetch PR details' );
+ const data = await response.json();
+
+ if ( data.success && data.pull_request?.[ 0 ] ) {
+ setPrDetails( data.pull_request[ 0 ] );
+ } else {
+ throw new Error( 'Failed to fetch PR details' );
+ }
+ } catch ( error ) {
+ setNotice( {
+ type: 'error',
+ message:
+ error.message ||
+ __( 'Error fetching PR details.', 'oneupdate' ),
+ } );
+ } finally {
+ setDetailsLoading( false );
}
- } catch ( error ) {
- setNotice( {
- type: 'error',
- message: error.message || __( 'Error fetching PR details.', 'oneupdate' ),
- } );
- } finally {
- setDetailsLoading( false );
- }
- }, [ selectedRepo ] );
+ },
+ [ selectedRepo ]
+ );
const openDetailModal = ( pr ) => {
setSelectedPR( pr );
@@ -242,7 +268,10 @@ const GitHubPullRequests = () => {
onClose();
} }
>
- { __( 'View Details', 'oneupdate' ) }
+ { __(
+ 'View Details',
+ 'oneupdate'
+ ) }
) }
@@ -285,10 +314,21 @@ const GitHubPullRequests = () => {
{ /* Filters */ }
-
+
{ /* Pagination */ }
- { (
-
@@ -432,12 +556,16 @@ const GitHubPullRequests = () => {
title={ __( 'Pull Request Details', 'oneupdate' ) }
onRequestClose={ closeModals }
size="medium"
- shouldCloseOnClickOutside={ true }
+ shouldCloseOnClickOutside
>
{ /* Detailed PR Info */ }
{ detailsLoading && (
-
| { __( 'PR #', 'oneupdate' ) } | -{ __( 'Title', 'oneupdate' ) } | -{ __( 'Author', 'oneupdate' ) } | -{ __( 'Status', 'oneupdate' ) } | -{ __( 'Created at', 'oneupdate' ) } | -{ __( 'Labels', 'oneupdate' ) } | -{ __( 'Actions', 'oneupdate' ) } | ++ { __( 'PR #', 'oneupdate' ) } + | ++ { __( 'Title', 'oneupdate' ) } + | ++ { __( 'Author', 'oneupdate' ) } + | ++ { __( 'Status', 'oneupdate' ) } + | ++ { __( 'Created at', 'oneupdate' ) } + | ++ { __( 'Labels', 'oneupdate' ) } + | ++ { __( 'Actions', 'oneupdate' ) } + |
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
- |
+ |
||||||||||||
| - { __( 'No pull requests found.', 'oneupdate' ) } + | + { __( + 'No pull requests found.', + 'oneupdate' + ) } | ||||||||||||
| #{ pr.number } @@ -351,11 +425,19 @@ const GitHubPullRequests = () => { target="_blank" rel="noopener noreferrer" > - { decodeEntities( pr.title ) } + + { decodeEntities( pr.title ) } + |
-
+ { formatDate( pr.created_at ) } |
{ pr.labels.length > 0 ? (
- |
@@ -400,29 +510,43 @@ const GitHubPullRequests = () => {
- { pr.labels.slice( 0, 2 ).map( ( label ) => (
+
+ { pr.labels
+ .slice( 0, 2 )
+ .map( ( label ) => (
+
+ { label.name }
+
+ ) ) }
+ { pr.labels.length > 2 && (
- { label.name }
-
- ) ) }
- { pr.labels.length > 2 && (
-
- +{ pr.labels.length - 2 } { __( 'more', 'oneupdate' ) }
+ +
+ { pr.labels.length - 2 }{ ' ' }
+ { __(
+ 'more',
+ 'oneupdate'
+ ) }
) }
) : (
-
- { __( 'No labels', 'oneupdate' ) }
+
+ { __(
+ 'No labels',
+ 'oneupdate'
+ ) }
) }
| ||||||||||
-
-
- { __( 'Page', 'oneupdate' ) } { page } { __( 'of', 'oneupdate' ) } { totalPages === 0 || totalPages < currentPage ? currentPage : totalPages }
-
-
-
- ) }
+
+
+
+ { __( 'Page', 'oneupdate' ) } { page }{ ' ' }
+ { __( 'of', 'oneupdate' ) }{ ' ' }
+ { totalPages === 0 || totalPages < currentPage
+ ? currentPage
+ : totalPages }
+
+
+
-
+
) }
@@ -445,21 +573,90 @@ const GitHubPullRequests = () => {
{ ! detailsLoading && prDetails && (
<>
{ __( 'Loading PR details…', 'oneupdate' ) }
-
+
-
{ __( 'PR Number:', 'oneupdate' ) } #{ prDetails.number }
-{ __( 'Title:', 'oneupdate' ) } { decodeEntities( prDetails.title ) }
-{ __( 'Author:', 'oneupdate' ) } { prDetails.user.login }
-{ __( 'Status:', 'oneupdate' ) } { getPRStatusBadge( prDetails ) }
++ + { __( + 'PR Number:', + 'oneupdate' + ) } + { ' ' } + #{ prDetails.number } +
++ + { __( 'Title:', 'oneupdate' ) } + { ' ' } + { decodeEntities( + prDetails.title + ) } +
++ + { __( 'Author:', 'oneupdate' ) } + { ' ' } + { prDetails.user.login } +
++ + { __( 'Status:', 'oneupdate' ) } + { ' ' } + { getPRStatusBadge( prDetails ) } +
-
@@ -468,16 +665,29 @@ const GitHubPullRequests = () => {
{ /* Labels */ }
{ prDetails.labels.length > 0 && (
{ __( 'Created:', 'oneupdate' ) } { formatDate( prDetails.created_at ) }
-{ __( 'Updated:', 'oneupdate' ) } { formatDate( prDetails.updated_at ) }
-{ __( 'Branch:', 'oneupdate' ) } { prDetails.pr_branch } → { prDetails.base_branch }
- { __( 'GitHub URL:', 'oneupdate' ) }{ ' ' } - - { __( 'View on GitHub', 'oneupdate' ) } + + { __( + 'Created:', + 'oneupdate' + ) } + { ' ' } + { formatDate( + prDetails.created_at + ) } +
++ + { __( + 'Updated:', + 'oneupdate' + ) } + { ' ' } + { formatDate( + prDetails.updated_at + ) } +
++ + { __( 'Branch:', 'oneupdate' ) } + { ' ' } + { prDetails.pr_branch } →{ ' ' } + { prDetails.base_branch } +
++ + { __( + 'GitHub URL:', + 'oneupdate' + ) } + { ' ' } + + { __( + 'View on GitHub', + 'oneupdate' + ) }
- { __( 'Labels:', 'oneupdate' ) }
-
- { prDetails.labels.map( ( label ) => (
-
- { label.name }
-
- ) ) }
+
+ { __( 'Labels:', 'oneupdate' ) }
+
+
) }
@@ -485,7 +695,12 @@ const GitHubPullRequests = () => {
{ /* Description */ }
{ prDetails.body && (
+ { prDetails.labels.map(
+ ( label ) => (
+
+ { label.name }
+
+ )
+ ) }
- { __( 'Description:', 'oneupdate' ) }
+
+ { __(
+ 'Description:',
+ 'oneupdate'
+ ) }
+
@@ -507,14 +730,29 @@ const GitHubPullRequests = () => {
{ /* Merged By Info */ }
{ prDetails.merged_by && (
- {
overflow: 'auto',
} }
>
-
- { decodeEntities( prDetails.body ) }
+
+ { decodeEntities(
+ prDetails.body
+ ) }
-
+ => {
- const updated : BrandSite[] = sites.filter( ( _, i ) => i !== index );
+ const handleDelete = async ( index: number | null ): Promise< void > => {
+ const updated: BrandSite[] = sites.filter( ( _, i ) => i !== index );
- apiFetch<{ shared_sites?: BrandSite[] }>( {
+ apiFetch< { shared_sites?: BrandSite[] } >( {
path: SHARED_SITES_ENDPOINT,
method: 'POST',
data: { sites_data: updated },
- } ).then( ( data ) => {
- if ( ! data?.shared_sites ) {
- throw new Error( 'No shared sites in response' );
- }
- setSites( data.shared_sites );
-
- if ( data.shared_sites.length === 0 ) {
- // Reloading causes the menus etc to reflect the missing sites.
- window.location.reload();
- } else {
- document.body.classList.remove( 'oneupdate-missing-brand-sites' );
- }
- } ).catch( () => {
- throw new Error( 'Failed to update shared sites' );
- } );
+ } )
+ .then( ( data ) => {
+ if ( ! data?.shared_sites ) {
+ throw new Error( 'No shared sites in response' );
+ }
+ setSites( data.shared_sites );
+
+ if ( data.shared_sites.length === 0 ) {
+ // Reloading causes the menus etc to reflect the missing sites.
+ window.location.reload();
+ } else {
+ document.body.classList.remove(
+ 'oneupdate-missing-brand-sites'
+ );
+ }
+ } )
+ .catch( () => {
+ throw new Error( 'Failed to update shared sites' );
+ } );
};
return (
<>
- { !! notice && notice?.message?.length > 0 &&
+ { !! notice && notice?.message?.length > 0 && (
setNotice( null ) }
- className={ notice?.type === 'error' ? 'oneupdate-error-notice' : 'oneupdate-success-notice' }
+ className={
+ notice?.type === 'error'
+ ? 'oneupdate-error-notice'
+ : 'oneupdate-success-notice'
+ }
>
{ notice?.message }
- }
-
- { SITE_TYPE === 'brand-site' && (
- ,
- },
-) => {
+const GitHubRepoToken = ( {
+ setNotice,
+ fetchAllAvailableGitHubRepos,
+}: {
+ setNotice: ( notice: NoticeType ) => void;
+ fetchAllAvailableGitHubRepos: () => Promise< void >;
+} ) => {
const [ repoToken, setRepoToken ] = useState( '' );
const getRepoToken = useCallback( async () => {
- const response = await fetch(
- `${ API_NAMESPACE }/github-token`,
- {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json',
- 'X-WP-NONCE': NONCE,
- },
+ const response = await fetch( `${ API_NAMESPACE }/github-token`, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-WP-NONCE': NONCE,
},
- );
+ } );
if ( ! response.ok ) {
- console.error( 'Error fetching GitHub token:', response.statusText ); // eslint-disable-line no-console
+ console.error(
+ 'Error fetching GitHub token:',
+ response.statusText
+ );
}
const data = await response.json();
@@ -51,23 +54,23 @@ const GitHubRepoToken = (
getRepoToken();
}, [] );
- const setGitHubRepoToken = useCallback( async ( token : string ) => {
- const response = await fetch(
- `${ API_NAMESPACE }/github-token`,
- {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- 'X-WP-NONCE': NONCE,
- },
- body: JSON.stringify( { token } ),
+ const setGitHubRepoToken = useCallback( async ( token: string ) => {
+ const response = await fetch( `${ API_NAMESPACE }/github-token`, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-WP-NONCE': NONCE,
},
- );
+ body: JSON.stringify( { token } ),
+ } );
if ( response.ok === false || response.status === 400 ) {
setNotice( {
type: 'error',
- message: __( 'Please enter valid GitHub PAT token.', 'oneupdate' ),
+ message: __(
+ 'Please enter valid GitHub PAT token.',
+ 'oneupdate'
+ ),
} );
return;
}
@@ -76,7 +79,9 @@ const GitHubRepoToken = (
if ( data?.status === '400' ) {
setNotice( {
type: 'error',
- message: data?.message || __( 'Enter valid PAT token.', 'oneupdate' ),
+ message:
+ data?.message ||
+ __( 'Enter valid PAT token.', 'oneupdate' ),
} );
return;
}
@@ -93,11 +98,7 @@ const GitHubRepoToken = (
}, [] );
return (
-
+
-
);
};
diff --git a/assets/src/components/PluginCard.js b/assets/src/components/PluginCard.js
index 3c7ac57..e1cf099 100644
--- a/assets/src/components/PluginCard.js
+++ b/assets/src/components/PluginCard.js
@@ -1,3 +1,6 @@
+/**
+ * WordPress dependencies
+ */
import { decodeEntities } from '@wordpress/html-entities';
import { Button, SelectControl } from '@wordpress/components';
import { __ } from '@wordpress/i18n';
@@ -8,7 +11,13 @@ const PluginCard = ( {
onSelect,
onVersionChange,
} ) => {
- const { name, slug, version, short_description: shortDescription, versions } = plugin;
+ const {
+ name,
+ slug,
+ version,
+ short_description: shortDescription,
+ versions,
+ } = plugin;
const selectedEntry = selectedPlugin?.find( ( p ) => p.slug === slug );
const isSelected = !! selectedEntry;
@@ -27,18 +36,28 @@ const PluginCard = ( {
};
return (
-
{ prDetails.merged_by && (
) }
) }
-
) }
@@ -540,7 +784,11 @@ const GitHubPullRequests = () => {
isDismissible
status={ notice.type }
onRemove={ () => setNotice( null ) }
- className={ notice?.type === 'error' ? 'oneupdate-error-notice' : 'oneupdate-success-notice' }
+ className={
+ notice?.type === 'error'
+ ? 'oneupdate-error-notice'
+ : 'oneupdate-success-notice'
+ }
>
{ notice.message }
diff --git a/assets/src/admin/settings/index.tsx b/assets/src/admin/settings/index.tsx
index 6150a88..c7dd780 100644
--- a/assets/src/admin/settings/index.tsx
+++ b/assets/src/admin/settings/index.tsx
@@ -1,6 +1,9 @@
/**
* WordPress dependencies
*/
+/**
+ * External dependencies
+ */
import { createRoot } from 'react-dom/client';
/**
diff --git a/assets/src/admin/settings/page.tsx b/assets/src/admin/settings/page.tsx
index e002974..6ba3ef3 100644
--- a/assets/src/admin/settings/page.tsx
+++ b/assets/src/admin/settings/page.tsx
@@ -1,6 +1,9 @@
/**
* WordPress dependencies
*/
+/**
+ * External dependencies
+ */
import { useState, useEffect, useCallback } from 'react';
import { __ } from '@wordpress/i18n';
import { Snackbar } from '@wordpress/components';
@@ -26,7 +29,7 @@ export interface BrandSite {
name: string;
url: string;
api_key: string;
- gh_repo: string;
+ gh_repo: string;
}
export const defaultBrandSite: BrandSite = {
@@ -39,7 +42,7 @@ export const defaultBrandSite: BrandSite = {
export type EditingIndex = number | null;
const NONCE = window.OneUpdateSettings.restNonce;
-const SITE_TYPE = window.OneUpdateSettings.siteType as SiteType || '';
+const SITE_TYPE = ( window.OneUpdateSettings.siteType as SiteType ) || '';
const SHARED_SITES_ENDPOINT = '/oneupdate/v1/shared-sites';
const API_NAMESPACE = window.OneUpdateSettings.restUrl + '/oneupdate/v1';
@@ -57,16 +60,13 @@ const SettingsPage = () => {
const [ allGitHubRepos, setAllGitHubRepos ] = useState( [] );
const fetchAllAvailableGitHubRepos = useCallback( async () => {
- const response = await fetch(
- `${ API_NAMESPACE }/github-repos`,
- {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json',
- 'X-WP-NONCE': NONCE,
- },
+ const response = await fetch( `${ API_NAMESPACE }/github-repos`, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-WP-NONCE': NONCE,
},
- );
+ } );
const data = await response.json();
if ( data?.repos ) {
setAllGitHubRepos( data.repos );
@@ -82,7 +82,7 @@ const SettingsPage = () => {
}, [ SITE_TYPE ] );
useEffect( () => {
- apiFetch<{ shared_sites?: BrandSite[] }>( {
+ apiFetch< { shared_sites?: BrandSite[] } >( {
path: SHARED_SITES_ENDPOINT,
} )
.then( ( data ) => {
@@ -104,89 +104,115 @@ const SettingsPage = () => {
}
}, [ sites ] );
- const handleFormSubmit = async () : Promise< boolean > => {
- const updated : BrandSite[] = editingIndex !== null
- ? sites.map( ( item, i ) => ( i === editingIndex ? formData : item ) )
- : [ ...sites, formData ];
+ const handleFormSubmit = async (): Promise< boolean > => {
+ const updated: BrandSite[] =
+ editingIndex !== null
+ ? sites.map( ( item, i ) =>
+ i === editingIndex ? formData : item
+ )
+ : [ ...sites, formData ];
- return apiFetch<{ shared_sites?: BrandSite[] }>( {
+ return apiFetch< { shared_sites?: BrandSite[] } >( {
path: SHARED_SITES_ENDPOINT,
method: 'POST',
data: { sites_data: updated },
- } ).then( ( data ) => {
- if ( ! data?.shared_sites ) {
- throw new Error( 'No shared sites in response' );
- }
+ } )
+ .then( ( data ) => {
+ if ( ! data?.shared_sites ) {
+ throw new Error( 'No shared sites in response' );
+ }
- if ( data.shared_sites.length === 1 && sites.length === 0 ) {
- // Reloading causes the menus etc to reflect the missing sites.
- window.location.reload();
- }
+ if ( data.shared_sites.length === 1 && sites.length === 0 ) {
+ // Reloading causes the menus etc to reflect the missing sites.
+ window.location.reload();
+ }
- setSites( data.shared_sites );
+ setSites( data.shared_sites );
- setNotice( {
- type: 'success',
- message: __( 'Brand Site saved successfully.', 'oneupdate' ),
- } );
- return true;
- } ).catch( () => {
- setNotice( {
- type: 'error',
- message: __( 'Failed to update shared sites', 'oneupdate' ),
+ setNotice( {
+ type: 'success',
+ message: __(
+ 'Brand Site saved successfully.',
+ 'oneupdate'
+ ),
+ } );
+ return true;
+ } )
+ .catch( () => {
+ setNotice( {
+ type: 'error',
+ message: __( 'Failed to update shared sites', 'oneupdate' ),
+ } );
+ return false;
+ } )
+ .finally( () => {
+ setFormData( defaultBrandSite );
+ setShowModal( false );
+ setEditingIndex( null );
} );
- return false;
- } ).finally( () => {
- setFormData( defaultBrandSite );
- setShowModal( false );
- setEditingIndex( null );
- } );
};
- const handleDelete = async ( index : number|null ) : Promise
- { __( 'Merged By:', 'oneupdate' ) }
+
+ { __(
+ 'Merged By:',
+ 'oneupdate'
+ ) }
+
{
verticalAlign: 'middle',
} }
/>
- { prDetails.merged_by.login }
+
+ { prDetails.merged_by.login }
+
) }
{ __( 'GitHub Credentials', 'oneupdate' ) }
+
-
+
+
{ decodeEntities( name ) }
@@ -56,14 +75,22 @@ const PluginCard = ( {
{ isSelected && (
{
+const PluginVersionSelectControl = ( {
+ versions,
+ selectedVersion,
+ onChange,
+} ) => {
const getLastFiveVersions = ( versionsObj ) => {
if ( ! versionsObj || typeof versionsObj !== 'object' ) {
return [];
}
- const versionKeys = Object.keys( versionsObj )
- .filter( ( key ) => key !== 'trunk' && ! /(alpha|beta|rc|dev|a)/i.test( key ) );
+ const versionKeys = Object.keys( versionsObj ).filter(
+ ( key ) => key !== 'trunk' && ! /(alpha|beta|rc|dev|a)/i.test( key )
+ );
const sortedVersions = versionKeys.sort( ( a, b ) => {
- const aParts = a.split( '.' ).map( ( part ) => parseInt( part, 10 ) || 0 );
- const bParts = b.split( '.' ).map( ( part ) => parseInt( part, 10 ) || 0 );
+ const aParts = a
+ .split( '.' )
+ .map( ( part ) => parseInt( part, 10 ) || 0 );
+ const bParts = b
+ .split( '.' )
+ .map( ( part ) => parseInt( part, 10 ) || 0 );
const maxLength = Math.max( aParts.length, bParts.length );
for ( let i = 0; i < maxLength; i++ ) {
diff --git a/assets/src/components/PluginGrid.js b/assets/src/components/PluginGrid.js
index 4e3f8e1..ea94bbc 100644
--- a/assets/src/components/PluginGrid.js
+++ b/assets/src/components/PluginGrid.js
@@ -1,7 +1,20 @@
+/**
+ * WordPress dependencies
+ */
import { useState, useEffect, useCallback } from '@wordpress/element';
import { __ } from '@wordpress/i18n';
-import { Button, CheckboxControl, Modal, Spinner, TextControl, Notice } from '@wordpress/components';
-
+import {
+ Button,
+ CheckboxControl,
+ Modal,
+ Spinner,
+ TextControl,
+ Notice,
+} from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
import PluginCard from './PluginCard';
const API_NAMESPACE = OneUpdatePlugins.restUrl + '/oneupdate/v1';
@@ -31,7 +44,9 @@ const PluginGrid = () => {
const response = await fetch( WORDPRESS_PLUGINS_API );
if ( ! response.ok ) {
- throw new Error( __( 'Failed to fetch plugins.', 'oneupdate' ) );
+ throw new Error(
+ __( 'Failed to fetch plugins.', 'oneupdate' )
+ );
}
const data = await response.json();
@@ -59,7 +74,7 @@ const PluginGrid = () => {
const existing = prev.find( ( p ) => p.slug === slug );
if ( existing ) {
return prev.map( ( p ) =>
- p.slug === slug ? { ...p, version } : p,
+ p.slug === slug ? { ...p, version } : p
);
}
return [ ...prev, { slug, version } ];
@@ -68,23 +83,18 @@ const PluginGrid = () => {
const handleVersionChange = ( slug, version ) => {
setSelectedPlugin( ( prev ) =>
- prev.map( ( p ) =>
- p.slug === slug ? { ...p, version } : p,
- ),
+ prev.map( ( p ) => ( p.slug === slug ? { ...p, version } : p ) )
);
};
const fetchSharedSitesData = useCallback( async () => {
- const response = await fetch(
- `${ API_NAMESPACE }/shared-sites`,
- {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json',
- 'X-ONEUPDATE-TOKEN': API_KEY,
- },
+ const response = await fetch( `${ API_NAMESPACE }/shared-sites`, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-ONEUPDATE-TOKEN': API_KEY,
},
- );
+ } );
const data = await response.json();
if ( data?.shared_sites ) {
setSharedSites( data.shared_sites );
@@ -106,29 +116,24 @@ const PluginGrid = () => {
return (
-
{ /* Notice State */ }
{ isNoticeVisible && (
-
+
{ noticeMessage.message }
) }
{ /* Search Bar */ }
-
{
}
} }
/>
-
@@ -152,7 +154,9 @@ const PluginGrid = () => {
{ loading && (
{ __( 'Loading plugins…', 'oneupdate' ) }
+
+ { __( 'Loading plugins…', 'oneupdate' ) }
+
) }
@@ -162,10 +166,7 @@ const PluginGrid = () => {
{ __( 'Unable to load plugins', 'oneupdate' ) }
{ error }
-
@@ -177,11 +178,13 @@ const PluginGrid = () => {
{ __( 'No plugins found', 'oneupdate' ) }
- { __( 'Unable to find any plugins to display.', 'oneupdate' ) }
-
@@ -204,10 +207,16 @@ const PluginGrid = () => {
@@ -241,17 +250,24 @@ const PluginGrid = () => {
- { __( 'Page', 'oneupdate' ) } { page } { __( 'of', 'oneupdate' ) } { totalPages }
+ { __( 'Page', 'oneupdate' ) } { page }{ ' ' }
+ { __( 'of', 'oneupdate' ) } { totalPages }
-
);
};
-const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, setNoticeMessage, setIsNoticeVisible, setSelectedPlugin } ) => {
+const ApplyPluginsModal = ( {
+ sharedSites,
+ selectedPlugin,
+ setShowApplyModal,
+ setNoticeMessage,
+ setIsNoticeVisible,
+ setSelectedPlugin,
+} ) => {
const [ selectedSite, setSelectedSite ] = useState( [] );
const [ selectedSiteInfo, setSelectedSiteInfo ] = useState( [] );
@@ -281,7 +303,7 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
// based on selected sites need to get all info from sharedsites for all selected sites
useEffect( () => {
const selectedSiteFullInfo = sharedSites.filter( ( site ) =>
- selectedSite.includes( site.url ),
+ selectedSite.includes( site.url )
);
setSelectedSiteInfo( selectedSiteFullInfo );
@@ -289,26 +311,26 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
const handleApplyPlugins = async () => {
try {
- const response = await fetch(
- `${ API_NAMESPACE }/apply-plugins`,
- {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- 'X-ONEUPDATE-TOKEN': API_KEY,
- },
- body: JSON.stringify( {
- sites: selectedSiteInfo,
- plugins: selectedPlugin,
- } ),
+ const response = await fetch( `${ API_NAMESPACE }/apply-plugins`, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-ONEUPDATE-TOKEN': API_KEY,
},
- );
+ body: JSON.stringify( {
+ sites: selectedSiteInfo,
+ plugins: selectedPlugin,
+ } ),
+ } );
const data = await response.json();
if ( data?.success && data?.created_prs ) {
const prUrls = data?.created_prs;
- const prUrlsArray = prUrls?.map( ( pr ) => {
- return pr?.data?.pr_url || '';
- } ).filter( ( url ) => url !== '' ) || [];
+ const prUrlsArray =
+ prUrls
+ ?.map( ( pr ) => {
+ return pr?.data?.pr_url || '';
+ } )
+ .filter( ( url ) => url !== '' ) || [];
// Join to comma separated string
const prUrlsString = prUrlsArray.join( ', ' );
@@ -316,21 +338,31 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
setIsNoticeVisible( true );
setNoticeMessage( {
type: 'success',
- message: __( 'Plugins applied successfully. Please check the PR at:', 'oneupdate' ) + ` ${ prUrlsString }`,
+ message:
+ __(
+ 'Plugins applied successfully. Please check the PR at:',
+ 'oneupdate'
+ ) + ` ${ prUrlsString }`,
} );
setSelectedPlugin( [] );
} else {
setIsNoticeVisible( true );
setNoticeMessage( {
type: 'error',
- message: __( 'Failed to apply plugins. Please try again.', 'oneupdate' ),
+ message: __(
+ 'Failed to apply plugins. Please try again.',
+ 'oneupdate'
+ ),
} );
}
} catch ( error ) {
setIsNoticeVisible( true );
setNoticeMessage( {
type: 'error',
- message: __( 'An error occurred while applying plugins.', 'oneupdate' ),
+ message: __(
+ 'An error occurred while applying plugins.',
+ 'oneupdate'
+ ),
} );
}
};
@@ -338,12 +370,14 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
return (
- { __( 'Select a site to apply the plugins', 'oneupdate' ) }
+
+ { __( 'Select a site to apply the plugins', 'oneupdate' ) }
+
{ sharedSites.length > 0 ? (
{ sharedSites.map( ( site ) => (
@@ -351,12 +385,19 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
key={ site?.url }
label={ site?.name }
checked={ selectedSite.includes( site?.url ) }
- onChange={ () => handleSiteSelection( site.url ) }
+ onChange={ () =>
+ handleSiteSelection( site.url )
+ }
/>
) ) }
) : (
- { __( 'No sites available to apply plugins.', 'oneupdate' ) }
+
+ { __(
+ 'No sites available to apply plugins.',
+ 'oneupdate'
+ ) }
+
) }
{ isSelected && (
{
+const PluginVersionSelectControl = ( {
+ versions,
+ selectedVersion,
+ onChange,
+} ) => {
const getLastFiveVersions = ( versionsObj ) => {
if ( ! versionsObj || typeof versionsObj !== 'object' ) {
return [];
}
- const versionKeys = Object.keys( versionsObj )
- .filter( ( key ) => key !== 'trunk' && ! /(alpha|beta|rc|dev|a)/i.test( key ) );
+ const versionKeys = Object.keys( versionsObj ).filter(
+ ( key ) => key !== 'trunk' && ! /(alpha|beta|rc|dev|a)/i.test( key )
+ );
const sortedVersions = versionKeys.sort( ( a, b ) => {
- const aParts = a.split( '.' ).map( ( part ) => parseInt( part, 10 ) || 0 );
- const bParts = b.split( '.' ).map( ( part ) => parseInt( part, 10 ) || 0 );
+ const aParts = a
+ .split( '.' )
+ .map( ( part ) => parseInt( part, 10 ) || 0 );
+ const bParts = b
+ .split( '.' )
+ .map( ( part ) => parseInt( part, 10 ) || 0 );
const maxLength = Math.max( aParts.length, bParts.length );
for ( let i = 0; i < maxLength; i++ ) {
diff --git a/assets/src/components/PluginGrid.js b/assets/src/components/PluginGrid.js
index 4e3f8e1..ea94bbc 100644
--- a/assets/src/components/PluginGrid.js
+++ b/assets/src/components/PluginGrid.js
@@ -1,7 +1,20 @@
+/**
+ * WordPress dependencies
+ */
import { useState, useEffect, useCallback } from '@wordpress/element';
import { __ } from '@wordpress/i18n';
-import { Button, CheckboxControl, Modal, Spinner, TextControl, Notice } from '@wordpress/components';
-
+import {
+ Button,
+ CheckboxControl,
+ Modal,
+ Spinner,
+ TextControl,
+ Notice,
+} from '@wordpress/components';
+
+/**
+ * Internal dependencies
+ */
import PluginCard from './PluginCard';
const API_NAMESPACE = OneUpdatePlugins.restUrl + '/oneupdate/v1';
@@ -31,7 +44,9 @@ const PluginGrid = () => {
const response = await fetch( WORDPRESS_PLUGINS_API );
if ( ! response.ok ) {
- throw new Error( __( 'Failed to fetch plugins.', 'oneupdate' ) );
+ throw new Error(
+ __( 'Failed to fetch plugins.', 'oneupdate' )
+ );
}
const data = await response.json();
@@ -59,7 +74,7 @@ const PluginGrid = () => {
const existing = prev.find( ( p ) => p.slug === slug );
if ( existing ) {
return prev.map( ( p ) =>
- p.slug === slug ? { ...p, version } : p,
+ p.slug === slug ? { ...p, version } : p
);
}
return [ ...prev, { slug, version } ];
@@ -68,23 +83,18 @@ const PluginGrid = () => {
const handleVersionChange = ( slug, version ) => {
setSelectedPlugin( ( prev ) =>
- prev.map( ( p ) =>
- p.slug === slug ? { ...p, version } : p,
- ),
+ prev.map( ( p ) => ( p.slug === slug ? { ...p, version } : p ) )
);
};
const fetchSharedSitesData = useCallback( async () => {
- const response = await fetch(
- `${ API_NAMESPACE }/shared-sites`,
- {
- method: 'GET',
- headers: {
- 'Content-Type': 'application/json',
- 'X-ONEUPDATE-TOKEN': API_KEY,
- },
+ const response = await fetch( `${ API_NAMESPACE }/shared-sites`, {
+ method: 'GET',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-ONEUPDATE-TOKEN': API_KEY,
},
- );
+ } );
const data = await response.json();
if ( data?.shared_sites ) {
setSharedSites( data.shared_sites );
@@ -106,29 +116,24 @@ const PluginGrid = () => {
return (
-
{ /* Notice State */ }
{ isNoticeVisible && (
-
+
{ noticeMessage.message }
) }
{ /* Search Bar */ }
-
{
}
} }
/>
-
@@ -152,7 +154,9 @@ const PluginGrid = () => {
{ loading && (
@@ -241,17 +250,24 @@ const PluginGrid = () => {
{ __( 'Loading plugins…', 'oneupdate' ) }
++ { __( 'Loading plugins…', 'oneupdate' ) } +
{ __( 'Unable to load plugins', 'oneupdate' ) }
{ error }
-{ __( 'No plugins found', 'oneupdate' ) }
-{ __( 'Unable to find any plugins to display.', 'oneupdate' ) }
-
- { __( 'Page', 'oneupdate' ) } { page } { __( 'of', 'oneupdate' ) } { totalPages }
+ { __( 'Page', 'oneupdate' ) } { page }{ ' ' }
+ { __( 'of', 'oneupdate' ) } { totalPages }
-
);
};
-const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, setNoticeMessage, setIsNoticeVisible, setSelectedPlugin } ) => {
+const ApplyPluginsModal = ( {
+ sharedSites,
+ selectedPlugin,
+ setShowApplyModal,
+ setNoticeMessage,
+ setIsNoticeVisible,
+ setSelectedPlugin,
+} ) => {
const [ selectedSite, setSelectedSite ] = useState( [] );
const [ selectedSiteInfo, setSelectedSiteInfo ] = useState( [] );
@@ -281,7 +303,7 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
// based on selected sites need to get all info from sharedsites for all selected sites
useEffect( () => {
const selectedSiteFullInfo = sharedSites.filter( ( site ) =>
- selectedSite.includes( site.url ),
+ selectedSite.includes( site.url )
);
setSelectedSiteInfo( selectedSiteFullInfo );
@@ -289,26 +311,26 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
const handleApplyPlugins = async () => {
try {
- const response = await fetch(
- `${ API_NAMESPACE }/apply-plugins`,
- {
- method: 'POST',
- headers: {
- 'Content-Type': 'application/json',
- 'X-ONEUPDATE-TOKEN': API_KEY,
- },
- body: JSON.stringify( {
- sites: selectedSiteInfo,
- plugins: selectedPlugin,
- } ),
+ const response = await fetch( `${ API_NAMESPACE }/apply-plugins`, {
+ method: 'POST',
+ headers: {
+ 'Content-Type': 'application/json',
+ 'X-ONEUPDATE-TOKEN': API_KEY,
},
- );
+ body: JSON.stringify( {
+ sites: selectedSiteInfo,
+ plugins: selectedPlugin,
+ } ),
+ } );
const data = await response.json();
if ( data?.success && data?.created_prs ) {
const prUrls = data?.created_prs;
- const prUrlsArray = prUrls?.map( ( pr ) => {
- return pr?.data?.pr_url || '';
- } ).filter( ( url ) => url !== '' ) || [];
+ const prUrlsArray =
+ prUrls
+ ?.map( ( pr ) => {
+ return pr?.data?.pr_url || '';
+ } )
+ .filter( ( url ) => url !== '' ) || [];
// Join to comma separated string
const prUrlsString = prUrlsArray.join( ', ' );
@@ -316,21 +338,31 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
setIsNoticeVisible( true );
setNoticeMessage( {
type: 'success',
- message: __( 'Plugins applied successfully. Please check the PR at:', 'oneupdate' ) + ` ${ prUrlsString }`,
+ message:
+ __(
+ 'Plugins applied successfully. Please check the PR at:',
+ 'oneupdate'
+ ) + ` ${ prUrlsString }`,
} );
setSelectedPlugin( [] );
} else {
setIsNoticeVisible( true );
setNoticeMessage( {
type: 'error',
- message: __( 'Failed to apply plugins. Please try again.', 'oneupdate' ),
+ message: __(
+ 'Failed to apply plugins. Please try again.',
+ 'oneupdate'
+ ),
} );
}
} catch ( error ) {
setIsNoticeVisible( true );
setNoticeMessage( {
type: 'error',
- message: __( 'An error occurred while applying plugins.', 'oneupdate' ),
+ message: __(
+ 'An error occurred while applying plugins.',
+ 'oneupdate'
+ ),
} );
}
};
@@ -338,12 +370,14 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
return (
-
{ __( 'Select a site to apply the plugins', 'oneupdate' ) }
++ { __( 'Select a site to apply the plugins', 'oneupdate' ) } +
{ sharedSites.length > 0 ? (
{ sharedSites.map( ( site ) => (
@@ -351,12 +385,19 @@ const ApplyPluginsModal = ( { sharedSites, selectedPlugin, setShowApplyModal, se
key={ site?.url }
label={ site?.name }
checked={ selectedSite.includes( site?.url ) }
- onChange={ () => handleSiteSelection( site.url ) }
+ onChange={ () =>
+ handleSiteSelection( site.url )
+ }
/>
) ) }
) : (
- { __( 'No sites available to apply plugins.', 'oneupdate' ) }
++ { __( + 'No sites available to apply plugins.', + 'oneupdate' + ) } +
) }