url encode sheet name to fix invalid endpoint error (#298)

* url encode sheet name to fix invalid endpoint error * use bracket notation for defining JSON path for Google Sheets
Automattic · Jan 15, 2025 · 0cae7c9 · 0cae7c9
1 parent 85413a8
commit 0cae7c9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/inc/Integrations/Google/Sheets/GoogleSheetsIntegration.php b/inc/Integrations/Google/Sheets/GoogleSheetsIntegration.php
@@ -110,7 +110,7 @@ private static function get_query(
 
 		return HttpQuery::from_array( [
 			'data_source' => $data_source,
-			'endpoint' => $data_source->get_endpoint() . '/values/' . $sheet['name'],
+			'endpoint' => $data_source->get_endpoint() . '/values/' . rawurlencode( $sheet['name'] ),
 			'input_schema' => $input_schema,
 			'output_schema' => $output_schema,
 			'preprocess_response' => function ( mixed $response_data, array $input_variables ): array {
@@ -146,7 +146,7 @@ private static function get_list_query(
 
 		return HttpQuery::from_array( [
 			'data_source' => $data_source,
-			'endpoint' => $data_source->get_endpoint() . '/values/' . $sheet['name'],
+			'endpoint' => $data_source->get_endpoint() . '/values/' . rawurlencode( $sheet['name'] ),
 			'input_schema' => [],
 			'output_schema' => $output_schema,
 			'preprocess_response' => function ( mixed $response_data ): array {

diff --git a/src/data-sources/google-sheets/GoogleSheetsSettings.tsx b/src/data-sources/google-sheets/GoogleSheetsSettings.tsx
@@ -128,7 +128,7 @@ export const GoogleSheetsSettings = ( {
 					const outputQueryMappings: DataSourceQueryMappingValue[] = sheet.fields.map( field => ( {
 						key: field,
 						name: field,
-						path: `$.${ field }`,
+						path: `$["${ field }"]`,
 						type: 'string',
 					} ) );