Merge pull request #3293 from jasonbahl/fix/2982-mediaDetails-file

jasonbahl · web-flow · commit eb824fd8b670 · 2025-02-07T11:42:30.000-07:00
fix: correct the resolver for the MediaDetails.file field to return the file name
diff --git a/src/Type/ObjectType/MediaDetails.php b/src/Type/ObjectType/MediaDetails.php
@@ -26,6 +26,9 @@ public static function register_type() {
 					'file'   => [
 						'type'        => 'String',
 						'description' => __( 'The filename of the mediaItem', 'wp-graphql' ),
+						'resolve'     => static function ( $media_details ) {
+							return ! empty( $media_details['file'] ) ? basename( $media_details['file'] ) : null;
+						},
 					],
 					'sizes'  => [
 						'type'        => [
diff --git a/tests/wpunit/MediaItemMutationsTest.php b/tests/wpunit/MediaItemMutationsTest.php
@@ -494,7 +494,7 @@ public function testCreateMediaItemAttachToParentAsAdmin() {
 					'mediaType'     => 'image',
 					'sourceUrl'     => $attachment_url,
 					'mediaDetails'  => [
-						'file'   => $attachment_details['file'],
+						'file'   => basename( $attachment_details['file'] ),
 						'height' => $attachment_details['height'],
 						'meta'   => [
 							'aperture'         => 0.0,
@@ -682,7 +682,7 @@ public function testCreateMediaItemDefaultValues() {
 					'parent'       => null,
 					'sourceUrl'    => $attachment_url,
 					'mediaDetails' => [
-						'file'   => $attachment_details['file'],
+						'file'   => basename( $attachment_details['file'] ),
 						'height' => $attachment_details['height'],
 						'meta'   => [
 							'aperture'         => 0.0,
@@ -761,7 +761,7 @@ public function testCreateMediaItemMutation() {
 					'mediaType'     => 'image',
 					'sourceUrl'     => $attachment_url,
 					'mediaDetails'  => [
-						'file'   => $attachment_details['file'],
+						'file'   => basename( $attachment_details['file'] ),
 						'height' => $attachment_details['height'],
 						'meta'   => [
 							'aperture'         => 0.0,
diff --git a/tests/wpunit/MediaItemQueriesTest.php b/tests/wpunit/MediaItemQueriesTest.php
@@ -762,4 +762,44 @@ public function testGetSourceUrlBySize() {
 
 		wp_delete_attachment( $attachment_id, true );
 	}
+
+	/**
+	 * Test that MediaDetails.file returns just the filename without the path
+	 */
+	public function testMediaDetailsFile() {
+		// Upload a test image
+		$filename = ( WPGRAPHQL_PLUGIN_DIR . 'tests/_data/images/test.png' );
+		$attachment_id = $this->factory()->attachment->create_upload_object( $filename );
+
+		$query = '
+		query GetMediaDetailsFile($id: ID!) {
+			mediaItem(id: $id, idType: DATABASE_ID) {
+				mediaDetails {
+					file
+				}
+			}
+		}
+		';
+
+		$variables = [
+			'id' => $attachment_id,
+		];
+
+		$actual = $this->graphql( compact( 'query', 'variables' ) );
+		
+		$this->assertArrayNotHasKey( 'errors', $actual );
+		
+		// Get the metadata to verify filename
+		$metadata = wp_get_attachment_metadata( $attachment_id );
+		$this->assertNotEmpty( $metadata['file'], 'Attachment metadata file should not be empty' );
+		
+		// Test that MediaDetails.file returns just the filename
+		$this->assertEquals( 
+			basename( $metadata['file'] ),
+			$actual['data']['mediaItem']['mediaDetails']['file'],
+			'MediaDetails.file should return just the filename without the path'
+		);
+
+		wp_delete_attachment( $attachment_id, true );
+	}
 }
