Fix merge conflicts

docs/extending/block-registration.md

@@ -70,7 +70,7 @@ The render query is executed when the block is rendered and fetches the data tha
 
 ### `selection_queries`: array (optional)
 
-Selection queries are used by content creators to select or curate remote data in the block editor. For example, you may wish to provide a list of products to users and allow them to select one to incled, or you may want to allow a user to search for a specific item. Selection queries are an array of objects with the following properties:
+Selection queries are used by content creators to select or curate remote data in the block editor. For example, you may wish to provide a list of products to users and allow them to select one to include in their post, or you may want to allow a user to search for a specific item. Selection queries are an array of objects with the following properties:
 
 - `display_name`: A human-friendly name for the selection query.
 - `query` (required): An instance of `QueryInterface` that fetches the data.

inc/Config/QueryRunner/QueryRunner.php

@@ -203,6 +203,11 @@ public function execute( HttpQueryInterface $query, array $input_variables ): ar
 			if ( ! array_key_exists( $key, $input_variables ) && isset( $schema['default_value'] ) ) {
 				$input_variables[ $key ] = $schema['default_value'];
 			}
+
+			// If the input variable is required and not provided, return an error.
+			if ( ! array_key_exists( $key, $input_variables ) && isset( $schema['required'] ) && $schema['required'] ) {
+				return new WP_Error( 'remote-data-blocks-missing-required-input-variable', sprintf( 'Missing required input variable: %s', $key ) );
+			}
 		}
 
 		$raw_response_data = $this->get_raw_response_data( $query, $input_variables );

inc/Editor/BlockManagement/BlockRegistration.php

@@ -4,7 +4,7 @@
 
 defined( 'ABSPATH' ) || exit();
 
-use RemoteDataBlocks\Analytics\TracksAnalytics;
+use RemoteDataBlocks\Telemetry\TracksTelemetry;
 use RemoteDataBlocks\Editor\BlockPatterns\BlockPatterns;
 use RemoteDataBlocks\Editor\DataBinding\BlockBindings;
 use RemoteDataBlocks\REST\RemoteDataController;
@@ -54,7 +54,7 @@ public static function register_container_blocks(): void {
 			wp_localize_script( $script_handle, 'REMOTE_DATA_BLOCKS', [
 				'config' => $all_remote_block_configs,
 				'rest_url' => RemoteDataController::get_url(),
-				'tracks_global_properties' => TracksAnalytics::get_global_properties(),
+				'tracks_global_properties' => TracksTelemetry::get_global_properties(),
 			] );
 		}
 	}

inc/Integrations/Airtable/AirtableIntegration.php

@@ -2,7 +2,7 @@
 
 namespace RemoteDataBlocks\Integrations\Airtable;
 
-use RemoteDataBlocks\WpdbStorage\DataSourceCrud;
+use RemoteDataBlocks\Store\DataSource\DataSourceConfigManager;
 use RemoteDataBlocks\Config\Query\HttpQuery;
 use RemoteDataBlocks\Formatting\StringFormatter;
 use RemoteDataBlocks\Snippet\Snippet;
@@ -14,17 +14,14 @@ public static function init(): void {
 	}
 
 	public static function register_blocks(): void {
-		$data_source_configs = DataSourceCrud::get_configs_by_service(
-			REMOTE_DATA_BLOCKS_AIRTABLE_SERVICE
-		);
+		$data_source_configs = DataSourceConfigManager::get_all( [
+			'service' => REMOTE_DATA_BLOCKS_AIRTABLE_SERVICE,
+			'enable_blocks' => true,
+		] );
 
 		foreach ( $data_source_configs as $config ) {
 			$data_source = AirtableDataSource::from_array( $config );
 
-			if ( false === ( $config['service_config']['enable_blocks'] ?? true ) ) {
-				continue;
-			}
-
 			self::register_blocks_for_airtable_data_source( $data_source );
 			self::register_loop_blocks_for_airtable_data_source( $data_source );
 		}

inc/Integrations/Google/Sheets/GoogleSheetsIntegration.php

@@ -2,7 +2,7 @@
 
 namespace RemoteDataBlocks\Integrations\Google\Sheets;
 
-use RemoteDataBlocks\WpdbStorage\DataSourceCrud;
+use RemoteDataBlocks\Store\DataSource\DataSourceConfigManager;
 use RemoteDataBlocks\Config\Query\HttpQuery;
 use RemoteDataBlocks\Formatting\StringFormatter;
 use RemoteDataBlocks\Snippet\Snippet;
@@ -14,17 +14,14 @@ public static function init(): void {
 	}
 
 	public static function register_blocks(): void {
-		$data_source_configs = DataSourceCrud::get_configs_by_service(
-			REMOTE_DATA_BLOCKS_GOOGLE_SHEETS_SERVICE
-		);
+		$data_source_configs = DataSourceConfigManager::get_all( [
+			'service' => REMOTE_DATA_BLOCKS_GOOGLE_SHEETS_SERVICE,
+			'enable_blocks' => true,
+		] );
 
 		foreach ( $data_source_configs as $config ) {
 			$data_source = GoogleSheetsDataSource::from_array( $config );
-
-			if ( false === ( $config['service_config']['enable_blocks'] ?? true ) ) {
-				continue;
-			}
-
+
 			self::register_blocks_for_google_sheets_data_source( $data_source );
 			self::register_loop_blocks_for_google_sheets_data_source( $data_source );
 		}