Skip to content

Commit d75f1db

Browse files
committed
remove error logs, add guard if pluginData is not available
1 parent 8dcef44 commit d75f1db

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

src/welcome/useful-plugins.js

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,12 @@ const BUTTON_LABELS = {
3535
}
3636

3737
const PluginCard = ( { plugin } ) => {
38-
const [ status, setStatus ] = useState( usefulPlugins[ plugin.id ].status )
38+
const pluginData = usefulPlugins?.[ plugin.id ] ?? null
39+
const [ status, setStatus ] = useState( pluginData?.status ?? PLUGIN_STATUS.ACTIVATED )
40+
41+
if ( ! pluginData ) {
42+
return null
43+
}
3944
const onClickAction = () => {
4045
if ( status === PLUGIN_STATUS.ACTIVATED ||
4146
status === PLUGIN_STATUS.INSTALLING ||
@@ -59,7 +64,7 @@ const PluginCard = ( { plugin } ) => {
5964
formData.append( 'action', 'stackable_useful_plugins_activate' )
6065
formData.append( 'nonce', activateNonce )
6166
formData.append( 'slug', plugin.id )
62-
formData.append( 'full_slug', usefulPlugins[ plugin.id ].fullSlug )
67+
formData.append( 'full_slug', pluginData.fullSlug )
6368
newStatus = PLUGIN_STATUS.ACTIVATING
6469
successStatus = PLUGIN_STATUS.ACTIVATED
6570
}
@@ -74,8 +79,8 @@ const PluginCard = ( { plugin } ) => {
7479
} ).then( response => {
7580
setTimeout( () => {
7681
// Mark as succeeded if operation successful or folder already exists after install
77-
if ( response.success || response.data.errorCode === 'folder_exists' ) {
78-
usefulPlugins[ plugin.id ].status = successStatus
82+
if ( response.success || response.data?.errorCode === 'folder_exists' ) {
83+
pluginData.status = successStatus
7984
setStatus( successStatus )
8085
} else {
8186
usefulPlugins[ plugin.id ].status = prevStatus
@@ -85,14 +90,14 @@ const PluginCard = ( { plugin } ) => {
8590
} ).catch( e => {
8691
// eslint-disable-next-line no-console
8792
console.error( 'Stackable: ', e )
88-
usefulPlugins[ plugin.id ].status = prevStatus
93+
pluginData.status = prevStatus
8994
setStatus( prevStatus )
9095
} )
9196
}
9297

9398
return <div key={ plugin.id } className="s-card">
9499
<div className="s-plugin-title">
95-
<img className="s-plugin-icon" src={ usefulPlugins[ plugin.id ].icon } alt={ __( 'Plugin icon', i18n ) } />
100+
<img className="s-plugin-icon" src={ pluginData.icon } alt={ __( 'Plugin icon', i18n ) } />
96101
<h3 className="s-card-title">{ plugin.title }</h3>
97102
</div>
98103
<p>{ plugin.description }</p>

src/welcome/useful-plugins.php

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -202,12 +202,10 @@ function do_plugin_activate() {
202202
$slug = isset( $_POST['slug'] ) ? sanitize_text_field( $_POST['slug'] ) : '';
203203
$full_slug = isset( $_POST['full_slug'] ) ? sanitize_text_field( $_POST['full_slug'] ) : '';
204204
if ( ! $slug || ! $full_slug ) {
205-
error_log( 'invalid slug' );
206205
wp_send_json_error( array( 'status' => 'error', 'message' => 'Invalid slug.' ), 400 );
207206
}
208207

209208
if ( ! check_ajax_referer( 'stk_activate_useful_plugin', 'nonce', false ) ) {
210-
error_log( 'security failed' );
211209
wp_send_json_error( array( 'status' => 'error', 'message' => 'Security check failed.' ), 403 );
212210
return;
213211
}
@@ -227,7 +225,6 @@ function do_plugin_activate() {
227225
$result = activate_plugin( $full_slug, '', false, true );
228226

229227
if ( is_wp_error( $result ) ) {
230-
error_log( 'failed to activate ' . print_r( $result, true ));
231228
wp_send_json_error( array( 'status' => 'error', 'message' => 'Failed to activate plugin.' ), 500 );
232229
return;
233230
}

0 commit comments

Comments
 (0)