Skip to content

Forms: Fix plugin button activating state #45471

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 13, 2025
Merged

Forms: Fix plugin button activating state #45471

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f64c6c9
Forms: improve plugin activating state
edanzer Oct 10, 2025
27c255a
changelog
edanzer Oct 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions projects/packages/forms/changelog/fix-form-plugin-install-load-state
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: fixed

Forms: fix plugin activation state.
1 change: 1 addition & 0 deletions ...t-form/components/jetpack-integrations-modal/integration-card/integration-card-header.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ const IntegrationCardHeader = ( {
slug={ cardData.slug }
pluginFile={ cardData.pluginFile }
isInstalled={ isInstalled }
isActive={ isActive }
refreshStatus={ cardData.refreshStatus }
trackEventName={ cardData.trackEventName }
/>
Expand Down
22 changes: 17 additions & 5 deletions ...tact-form/components/jetpack-integrations-modal/integration-card/plugin-action-button.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* External dependencies
*/
import { Button, Spinner, Tooltip } from '@wordpress/components';
import { useEffect, useState } from '@wordpress/element';
import { __ } from '@wordpress/i18n';
/**
* Internal dependencies
Expand All @@ -13,6 +14,7 @@ type PluginActionButtonProps = {
slug: string;
pluginFile: string;
isInstalled: boolean;
isActive: boolean;
refreshStatus: () => void;
trackEventName: string;
};
Expand All @@ -21,6 +23,7 @@ const PluginActionButton = ( {
slug,
pluginFile,
isInstalled,
isActive,
refreshStatus,
trackEventName,
}: PluginActionButtonProps ) => {
Expand All @@ -31,13 +34,13 @@ const PluginActionButton = ( {
trackEventName
);

// Permissions from consolidated Forms config (shared across editor and dashboard)
const config = useFormsConfig();
const canUserInstallPlugins = Boolean( config?.canInstallPlugins );
const canUserActivatePlugins = Boolean( config?.canActivatePlugins );

const canPerformAction = isInstalled ? canUserActivatePlugins : canUserInstallPlugins;
const isDisabled = isInstalling || ! canPerformAction;
const [ isReconcilingStatus, setIsReconcilingStatus ] = useState( false );
const isDisabled = isInstalling || isReconcilingStatus || ! canPerformAction;

const handleAction = async ( event: MouseEvent ) => {
event.stopPropagation();
Expand All @@ -47,14 +50,23 @@ const PluginActionButton = ( {
const success = await installPlugin();

if ( success && refreshStatus ) {
setIsReconcilingStatus( true ); // Keeps button in loading state until integrations refresh.
refreshStatus();
}
};

useEffect( () => {
if ( isReconcilingStatus && isActive ) {
setIsReconcilingStatus( false ); // Removes button loading state when integratoin status is recevied and isActive.
}
}, [ isReconcilingStatus, isActive ] );

const getButtonText = () => {
return (
( isInstalling && isInstalled && __( 'Activating…', 'jetpack-forms' ) ) ||
( isInstalling && __( 'Installing…', 'jetpack-forms' ) ) ||
( ( isInstalling || isReconcilingStatus ) &&
isInstalled &&
__( 'Activating…', 'jetpack-forms' ) ) ||
( ( isInstalling || isReconcilingStatus ) && __( 'Installing…', 'jetpack-forms' ) ) ||
( isInstalled && __( 'Activate', 'jetpack-forms' ) ) ||
__( 'Install', 'jetpack-forms' )
);
Expand Down Expand Up @@ -89,7 +101,7 @@ const PluginActionButton = ( {
onClick={ handleAction }
disabled={ isDisabled }
style={ isDisabled ? { pointerEvents: 'none' } : undefined }
icon={ isInstalling ? <Spinner /> : undefined }
icon={ isInstalling || isReconcilingStatus ? <Spinner /> : undefined }
__next40pxDefaultSize
>
{ getButtonText() }
Expand Down
4 changes: 4 additions & 0 deletions projects/plugins/jetpack/changelog/fix-form-plugin-install-load-state
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
Significance: patch
Type: bugfix

Forms: fix plugin activation state.
Loading