enhacements

Author: jorgefilipecosta

lib/compat/wordpress-7.0/class-wp-connector-registry.php

@@ -98,7 +98,7 @@ final class WP_Connector_Registry {
 		 *         Optional. Plugin data for install/activate UI.
 		 *
 		 *         @type string $file The plugin's main file path relative to the plugins
-		 *                           directory (e.g. 'akismet/akismet.php').
+		 *                           directory (e.g. 'akismet/akismet.php' or 'hello.php').
 		 *     }
 		 * }
 		 * @return array|null The registered connector data on success, null on failure.
@@ -231,8 +231,8 @@ public function register( string $id, array $args ): ?array {
 				}
 			}
 
-			if ( ! empty( $args['plugin'] ) && is_array( $args['plugin'] ) ) {
-				$connector['plugin'] = $args['plugin'];
+			if ( ! empty( $args['plugin'] ) && is_array( $args['plugin'] ) && ! empty( $args['plugin']['file'] ) ) {
+				$connector['plugin'] = array( 'file' => $args['plugin']['file'] );
 			}
 
 			$this->registered_connectors[ $id ] = $connector;

lib/experimental/connectors/default-connectors.php

@@ -529,7 +529,7 @@ function _gutenberg_get_connector_script_module_data( array $data ): array {
 			$is_activated = $is_installed && is_plugin_active( $file );
 
 			$connector_out['plugin'] = array(
-				'file'        => str_ends_with( $file, '.php' ) ? substr( $file, 0, -4 ) : $file,
+				'file'        => $file,
 				'isInstalled' => $is_installed,
 				'isActivated' => $is_activated,
 			);

routes/connectors-home/default-connectors.tsx

@@ -104,9 +104,10 @@ function ApiKeyConnector( {
 		authentication?.method === 'api_key' ? authentication : undefined;
 	const settingName = auth?.settingName ?? '';
 	const helpUrl = auth?.credentialsUrl ?? undefined;
-	const pluginSlug = plugin?.file?.includes( '/' )
-		? plugin.file.split( '/' )[ 0 ]
-		: plugin?.file;
+	const pluginFile = plugin?.file?.replace( /\.php$/, '' );
+	const pluginSlug = pluginFile?.includes( '/' )
+		? pluginFile.split( '/' )[ 0 ]
+		: pluginFile;
 
 	let helpLabel: string | undefined;
 	try {

routes/connectors-home/use-connector-plugin.ts

@@ -54,9 +54,10 @@ export function useConnectorPlugin( {
 	const [ pluginStatusOverride, setPluginStatusOverride ] =
 		useState< PluginStatus | null >( null );
 
-	const pluginSlug = pluginFileFromServer?.includes( '/' )
-		? pluginFileFromServer.split( '/' )[ 0 ]
-		: pluginFileFromServer;
+	const pluginBasename = pluginFileFromServer?.replace( /\.php$/, '' );
+	const pluginSlug = pluginBasename?.includes( '/' )
+		? pluginBasename.split( '/' )[ 0 ]
+		: pluginBasename;
 
 	const {
 		derivedPluginStatus,
@@ -94,12 +95,12 @@ export function useConnectorPlugin( {
 			const plugin = store.getEntityRecord(
 				'root',
 				'plugin',
-				pluginFileFromServer
+				pluginBasename
 			) as { plugin: string; status: string } | undefined;
 
 			const hasFinished = store.hasFinishedResolution(
 				'getEntityRecord',
-				[ 'root', 'plugin', pluginFileFromServer ]
+				[ 'root', 'plugin', pluginBasename ]
 			);
 
 			if ( ! hasFinished ) {
@@ -139,7 +140,7 @@ export function useConnectorPlugin( {
 				canInstallPlugins: canCreate,
 			};
 		},
-		[ pluginFileFromServer, settingName, isInstalled, isActivated ]
+		[ pluginBasename, settingName, isInstalled, isActivated ]
 	);
 
 	const pluginStatus = pluginStatusOverride ?? derivedPluginStatus;
@@ -202,7 +203,7 @@ export function useConnectorPlugin( {
 				'root',
 				'plugin',
 				{
-					plugin: pluginFileFromServer,
+					plugin: pluginBasename,
 					status: 'active',
 				},
 				{ throwOnError: true }