From 4de0d580c988dc9d9f839ee272d7b8a723a9a18c Mon Sep 17 00:00:00 2001
From: Joe Rouse <45216035+Joe-Rouse@users.noreply.github.com>
Date: Mon, 29 Jan 2024 10:38:29 +0000
Subject: [PATCH 01/11] feat(bbt-123): add basic switcher UI

---
 src/editor/components/ThemerComponent.js | 64 ++++++++++++++++++++----
 1 file changed, 54 insertions(+), 10 deletions(-)

diff --git a/src/editor/components/ThemerComponent.js b/src/editor/components/ThemerComponent.js
index 8ae68bb..e2a3bc7 100644
--- a/src/editor/components/ThemerComponent.js
+++ b/src/editor/components/ThemerComponent.js
@@ -4,6 +4,7 @@ import {
 	Spinner,
 	MenuGroup,
 	MenuItem,
+	SelectControl,
 	__experimentalNavigatorProvider as NavigatorProvider,
 } from '@wordpress/components';
 import { useSelect, dispatch } from '@wordpress/data';
@@ -37,6 +38,8 @@ const ThemerComponent = () => {
 	const [ previewExampleIsActive, setPreviewExampleIsActive ] = useState();
 	const [ schema, setSchema ] = useState( {} );
 	const [ validThemeJson, setValidThemeJson ] = useState();
+	const [ globalStylesId, setGlobalStylesId ] = useState( 0 );
+	const [ styleVariations, setStyleVariations ] = useState( [] );
 
 	const setUserConfig = ( config ) => {
 		dispatch( 'core' ).editEntityRecord(
@@ -47,33 +50,38 @@ const ThemerComponent = () => {
 		);
 	};
 
-	const { globalStylesId, baseConfig, userConfig, savedUserConfig } =
-		useSelect( ( select ) => {
+	const { baseConfig, userConfig, savedUserConfig } = useSelect(
+		( select ) => {
+			if ( ! globalStylesId ) {
+				return {
+					baseConfig: {},
+					userConfig: {},
+					savedUserConfig: {},
+				};
+			}
+
 			const {
-				__experimentalGetCurrentGlobalStylesId,
 				__experimentalGetCurrentThemeBaseGlobalStyles,
 				getEditedEntityRecord,
 				getEntityRecord,
 			} = select( 'core' );
 
-			const currentGlobalStylesId =
-				__experimentalGetCurrentGlobalStylesId();
-
 			return {
-				globalStylesId: currentGlobalStylesId, // eslint-disable no-underscore-dangle -- require underscore dangle for experimental functions
 				baseConfig: __experimentalGetCurrentThemeBaseGlobalStyles(), // eslint-disable no-underscore-dangle -- require underscore dangle for experimental functions
 				userConfig: getEditedEntityRecord(
 					'root',
 					'globalStyles',
-					currentGlobalStylesId
+					globalStylesId
 				),
 				savedUserConfig: getEntityRecord(
 					'root',
 					'globalStyles',
-					currentGlobalStylesId
+					globalStylesId
 				),
 			};
-		} );
+		},
+		[ globalStylesId ]
+	);
 
 	/**
 	 * Returns merged base and user configs
@@ -118,6 +126,18 @@ const ThemerComponent = () => {
 		setValidThemeJson( res );
 	};
 
+	const getStyleVariations = async () => {
+		const styleVariationsRes = await apiFetch( {
+			path: '/themer/v1/theme-style-variation-posts',
+			method: 'GET',
+		} );
+		setStyleVariations( styleVariationsRes );
+		const activeVariation = styleVariationsRes.find(
+			( variation ) => variation.post_status === 'publish'
+		);
+		setGlobalStylesId( activeVariation.ID );
+	};
+
 	/**
 	 * Resets preview blocks to default template
 	 */
@@ -137,6 +157,10 @@ const ThemerComponent = () => {
 		validateThemeJson();
 	}, [] );
 
+	useEffect( () => {
+		getStyleVariations();
+	}, [] );
+
 	/**
 	 * Alert user if they try to leave Themer without saving.
 	 */
@@ -196,6 +220,19 @@ const ThemerComponent = () => {
 		);
 	}
 
+	const selectOptions = [
+		{
+			disabled: true,
+			label: __( 'Select a style variation', 'themer' ),
+			value: '',
+		},
+		,
+		...styleVariations.map( ( variation ) => ( {
+			label: variation.post_name,
+			value: variation.ID,
+		} ) ),
+	];
+
 	return (
 		<>
 			<EditorContext.Provider
@@ -225,6 +262,13 @@ const ThemerComponent = () => {
 					{ validThemeJson === true && (
 						<>
 							<div className="themer-topbar">
+								<SelectControl
+									options={ selectOptions }
+									value={ globalStylesId }
+									onChange={ ( value ) =>
+										setGlobalStylesId( value )
+									}
+								/>
 								<Button
 									isSecondary
 									onClick={ () => reset() }

From 1fbb8a799d1d47fc804f5312061f9139d79583e3 Mon Sep 17 00:00:00 2001
From: Joe Rouse <45216035+Joe-Rouse@users.noreply.github.com>
Date: Mon, 29 Jan 2024 10:47:01 +0000
Subject: [PATCH 02/11] feat(bbt-123): only set id if active variation is found

---
 src/editor/components/ThemerComponent.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/editor/components/ThemerComponent.js b/src/editor/components/ThemerComponent.js
index e2a3bc7..88c4457 100644
--- a/src/editor/components/ThemerComponent.js
+++ b/src/editor/components/ThemerComponent.js
@@ -132,9 +132,13 @@ const ThemerComponent = () => {
 			method: 'GET',
 		} );
 		setStyleVariations( styleVariationsRes );
-		const activeVariation = styleVariationsRes.find(
+
+		const activeVariation = styleVariationsRes?.find(
 			( variation ) => variation.post_status === 'publish'
 		);
+		if ( ! activeVariation ) {
+			return;
+		}
 		setGlobalStylesId( activeVariation.ID );
 	};
 

From cdf54168186fcacb653b5d60d2df854465d939bf Mon Sep 17 00:00:00 2001
From: Joe Rouse <45216035+Joe-Rouse@users.noreply.github.com>
Date: Mon, 29 Jan 2024 13:11:51 +0000
Subject: [PATCH 03/11] feat(bbt-123): add functionality for activating a style
 variation

---
 inc/class-rest-api.php                   | 43 +++++++++++++++++++-----
 src/editor/components/ThemerComponent.js | 40 ++++++++++++++++++++--
 2 files changed, 73 insertions(+), 10 deletions(-)

diff --git a/inc/class-rest-api.php b/inc/class-rest-api.php
index 428e677..90cbb4a 100644
--- a/inc/class-rest-api.php
+++ b/inc/class-rest-api.php
@@ -64,10 +64,10 @@ public function register_routes() {
 
 		register_rest_route(
 			'themer/v1',
-			'/theme-style-variation-posts',
+			'/theme-style-variations',
 			array(
-				'methods'             => 'GET',
-				'callback'            => array( $this, 'get_all_theme_style_variation_posts' ),
+				'methods'             => 'GET,POST',
+				'callback'            => array( $this, 'handle_theme_style_variations' ),
 				'permission_callback' => function () {
 					return true;
 				},
@@ -145,13 +145,16 @@ public function get_theme_json(): WP_REST_Response|WP_Error {
 	}
 
 	/**
-	 * Returns all 'wp_global_styles' posts linked to the current theme.
+	 * GET request returns all of the `wp_global_styles` posts for the current theme.
+	 * POST request publishes the post with the supplied ID and sets all other posts to draft.
 	 *
+	 * @param WP_REST_Request $request - The request object.
 	 * @return WP_REST_Response|WP_Error
 	 */
-	public function get_all_theme_style_variation_posts(): WP_REST_Response|WP_Error {
-		$theme = get_stylesheet();
-		$posts = get_posts(
+	public function handle_theme_style_variations( $request ): WP_REST_Response|WP_Error {
+		$method = $request->get_method();
+		$theme  = get_stylesheet();
+		$posts  = get_posts(
 			array(
 				'post_type'              => 'wp_global_styles',
 				'post_status'            => array( 'publish', 'draft' ),
@@ -176,6 +179,30 @@ public function get_all_theme_style_variation_posts(): WP_REST_Response|WP_Error
 			return new WP_Error( 'no_theme_styles', __( 'Unable to locate existing styles for the theme', 'themer' ) );
 		}
 
-		return rest_ensure_response( $posts );
+		if ( 'GET' === $method ) {
+			return rest_ensure_response( $posts );
+		}
+
+		if ( 'POST' === $method ) {
+			$json_body        = $request->get_json_params();
+			$global_styles_id = $json_body['globalStylesId'];
+
+			foreach ( $posts as $post ) {
+				$post_status = 'draft';
+				if ( $post->ID === $global_styles_id ) {
+					$post_status = 'publish';
+				}
+				wp_update_post(
+					array(
+						'ID'          => $post->ID,
+						'post_status' => $post_status,
+					)
+				);
+			}
+
+			return rest_ensure_response( new WP_REST_Response( array( 'message' => 'Active theme style variation updated.' ), 200 ) );
+		}
+
+		return rest_ensure_response( new WP_REST_Response( array( 'error' => 'Unsupported request method.' ), 405 ) );
 	}
 }
diff --git a/src/editor/components/ThemerComponent.js b/src/editor/components/ThemerComponent.js
index 88c4457..4529aed 100644
--- a/src/editor/components/ThemerComponent.js
+++ b/src/editor/components/ThemerComponent.js
@@ -40,6 +40,7 @@ const ThemerComponent = () => {
 	const [ validThemeJson, setValidThemeJson ] = useState();
 	const [ globalStylesId, setGlobalStylesId ] = useState( 0 );
 	const [ styleVariations, setStyleVariations ] = useState( [] );
+	const [ publishedStylesId, setPublishedStylesId ] = useState( 0 );
 
 	const setUserConfig = ( config ) => {
 		dispatch( 'core' ).editEntityRecord(
@@ -126,9 +127,14 @@ const ThemerComponent = () => {
 		setValidThemeJson( res );
 	};
 
+	/**
+	 * Retrieve all style variations for the theme and store the global style ID in state.
+	 *
+	 * @return {void}
+	 */
 	const getStyleVariations = async () => {
 		const styleVariationsRes = await apiFetch( {
-			path: '/themer/v1/theme-style-variation-posts',
+			path: '/themer/v1/theme-style-variations',
 			method: 'GET',
 		} );
 		setStyleVariations( styleVariationsRes );
@@ -139,6 +145,7 @@ const ThemerComponent = () => {
 		if ( ! activeVariation ) {
 			return;
 		}
+		setPublishedStylesId( activeVariation.ID );
 		setGlobalStylesId( activeVariation.ID );
 	};
 
@@ -207,6 +214,25 @@ const ThemerComponent = () => {
 		);
 	};
 
+	/**
+	 * Sets the active style variation for the theme.
+	 */
+	const activate = async () => {
+		try {
+			await apiFetch( {
+				path: '/themer/v1/theme-style-variations',
+				method: 'POST',
+				data: {
+					globalStylesId,
+				},
+			} );
+			setPublishedStylesId( globalStylesId );
+		} catch ( err ) {
+			// eslint-disable-next-line no-console
+			console.log( err );
+		}
+	};
+
 	const clearAllCustomisations = () => {
 		dispatch( 'core' ).editEntityRecord(
 			'root',
@@ -270,7 +296,9 @@ const ThemerComponent = () => {
 									options={ selectOptions }
 									value={ globalStylesId }
 									onChange={ ( value ) =>
-										setGlobalStylesId( value )
+										setGlobalStylesId(
+											parseInt( value, 10 )
+										)
 									}
 								/>
 								<Button
@@ -285,6 +313,14 @@ const ThemerComponent = () => {
 									text="Save"
 									disabled={ ! hasUnsavedChanges }
 								/>
+								<Button
+									isPrimary
+									onClick={ activate }
+									text={ __( 'Activate', 'themer' ) }
+									disabled={
+										publishedStylesId === globalStylesId
+									}
+								/>
 								<MoreMenuDropdown>
 									{ () => (
 										<MenuGroup

From e82ca9e2038902ae40fede2706e92d13ae94767f Mon Sep 17 00:00:00 2001
From: Joe Rouse <45216035+Joe-Rouse@users.noreply.github.com>
Date: Mon, 29 Jan 2024 13:19:59 +0000
Subject: [PATCH 04/11] feat(bbt-123): check post exists before activating

---
 inc/class-rest-api.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/inc/class-rest-api.php b/inc/class-rest-api.php
index 90cbb4a..3d3a273 100644
--- a/inc/class-rest-api.php
+++ b/inc/class-rest-api.php
@@ -186,6 +186,10 @@ public function handle_theme_style_variations( $request ): WP_REST_Response|WP_E
 		if ( 'POST' === $method ) {
 			$json_body        = $request->get_json_params();
 			$global_styles_id = $json_body['globalStylesId'];
+			$post_ids         = array_column( $posts, 'ID' );
+			if ( ! $global_styles_id || ! in_array( $global_styles_id, $post_ids, true ) ) {
+				return new WP_Error( 'invalid_global_styles_id', __( 'Invalid global styles ID', 'themer' ) );
+			}
 
 			foreach ( $posts as $post ) {
 				$post_status = 'draft';
@@ -200,9 +204,9 @@ public function handle_theme_style_variations( $request ): WP_REST_Response|WP_E
 				);
 			}
 
-			return rest_ensure_response( new WP_REST_Response( array( 'message' => 'Active theme style variation updated.' ), 200 ) );
+			return rest_ensure_response( new WP_REST_Response( array( 'message' => __( 'Active theme style variation updated.', 'themer' ) ), 200 ) );
 		}
 
-		return rest_ensure_response( new WP_REST_Response( array( 'error' => 'Unsupported request method.' ), 405 ) );
+		return rest_ensure_response( new WP_REST_Response( array( 'error' => __( 'Unsupported request method.', 'themer' ) ), 405 ) );
 	}
 }

From d6e4c15276829b61915cb037f6f5d478ad4600b1 Mon Sep 17 00:00:00 2001
From: Joe Rouse <45216035+Joe-Rouse@users.noreply.github.com>
Date: Mon, 29 Jan 2024 14:49:37 +0000
Subject: [PATCH 05/11] feat(bbt-123): add valid permission callback to
 endpoint

---
 inc/class-rest-api.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/class-rest-api.php b/inc/class-rest-api.php
index 3d3a273..1d27345 100644
--- a/inc/class-rest-api.php
+++ b/inc/class-rest-api.php
@@ -69,7 +69,7 @@ public function register_routes() {
 				'methods'             => 'GET,POST',
 				'callback'            => array( $this, 'handle_theme_style_variations' ),
 				'permission_callback' => function () {
-					return true;
+					return current_user_can( 'edit_theme_options' );
 				},
 			)
 		);

From ee09c092156277ce8502a192ff94c961eca8cb06 Mon Sep 17 00:00:00 2001
From: Joe Rouse <45216035+Joe-Rouse@users.noreply.github.com>
Date: Wed, 31 Jan 2024 16:46:04 +0000
Subject: [PATCH 06/11] refactor(bbt-123): only call wp_update_post on posts
 that require it

---
 inc/class-rest-api.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/inc/class-rest-api.php b/inc/class-rest-api.php
index cba20ae..7cac1db 100644
--- a/inc/class-rest-api.php
+++ b/inc/class-rest-api.php
@@ -191,7 +191,12 @@ public function handle_theme_style_variations( $request ): WP_REST_Response|WP_E
 				return new WP_Error( 'invalid_global_styles_id', __( 'Invalid global styles ID', 'themer' ) );
 			}
 
+			// Set the currently selected variation to draft and publish the new one.
 			foreach ( $posts as $post ) {
+				if ( 'publish' !== $post->post_status && $post->ID !== $global_styles_id ) {
+					continue;
+				}
+
 				$post_status = 'draft';
 				if ( $post->ID === $global_styles_id ) {
 					$post_status = 'publish';

From 4e28c79a7d972ec2705d1a0cb1dbd0c66eb03b20 Mon Sep 17 00:00:00 2001
From: Joe Rouse <45216035+Joe-Rouse@users.noreply.github.com>
Date: Wed, 31 Jan 2024 17:18:20 +0000
Subject: [PATCH 07/11] refactor(bbt-123): split endpoint callback up into
 separate functions also created new util function for getting the theme
 styles posts

---
 inc/class-rest-api.php | 101 +++++++++++++++++++++--------------------
 inc/utils.php          |  31 +++++++++++++
 2 files changed, 82 insertions(+), 50 deletions(-)

diff --git a/inc/class-rest-api.php b/inc/class-rest-api.php
index 7cac1db..ff9230d 100644
--- a/inc/class-rest-api.php
+++ b/inc/class-rest-api.php
@@ -144,6 +144,55 @@ public function get_theme_json(): WP_REST_Response|WP_Error {
 		return rest_ensure_response( $theme_json_flattened );
 	}
 
+	/**
+	 * Returns an array of all of the `wp_global_styles` posts linked to the active theme. If none exist, returns an error.
+	 *
+	 * @return WP_REST_Response|WP_Error
+	 */
+	public function get_theme_style_variations(): WP_REST_Response|WP_Error {
+		$posts = get_theme_style_variation_posts();
+
+		if ( empty( $posts ) ) {
+			return new WP_Error( 'no_theme_styles', __( 'Unable to locate existing styles for the theme', 'themer' ) );
+		}
+
+		return rest_ensure_response( $posts );
+	}
+
+	/**
+	 * Sets a new 'active' style variation by ensuring it is the only one linked to the current theme that is published.
+	 *
+	 * @param int $global_styles_id - The ID of the style variation to be published.
+	 * @return WP_REST_Response|WP_Error
+	 */
+	public function set_new_active_style_variation( int $global_styles_id ): WP_REST_Response|WP_Error {
+		if ( ! $global_styles_id || ! get_post_status( $global_styles_id ) ) {
+			return new WP_Error( 'invalid_global_styles_id', __( 'Invalid global styles ID', 'themer' ) );
+		}
+
+		$posts = get_theme_style_variation_posts();
+
+		// Set the currently selected variation to draft and publish the new one.
+		foreach ( $posts as $post ) {
+			if ( 'publish' !== $post->post_status && $post->ID !== $global_styles_id ) {
+				continue;
+			}
+
+			$post_status = 'draft';
+			if ( $post->ID === $global_styles_id ) {
+				$post_status = 'publish';
+			}
+			wp_update_post(
+				array(
+					'ID'          => $post->ID,
+					'post_status' => $post_status,
+				)
+			);
+		}
+
+		return rest_ensure_response( new WP_REST_Response( array( 'message' => __( 'Active theme style variation updated.', 'themer' ) ), 200 ) );
+	}
+
 	/**
 	 * GET request returns all of the `wp_global_styles` posts for the current theme.
 	 * POST request publishes the post with the supplied ID and sets all other posts to draft.
@@ -153,63 +202,15 @@ public function get_theme_json(): WP_REST_Response|WP_Error {
 	 */
 	public function handle_theme_style_variations( $request ): WP_REST_Response|WP_Error {
 		$method = $request->get_method();
-		$theme  = get_stylesheet();
-		$posts  = get_posts(
-			array(
-				'post_type'              => 'wp_global_styles',
-				'post_status'            => array( 'publish', 'draft' ),
-				'orderby'                => 'date',
-				'order'                  => 'desc',
-				'numberposts'            => -1,
-				'ignore_sticky_posts'    => true,
-				'no_found_rows'          => true,
-				'update_post_meta_cache' => false,
-				'update_post_term_cache' => false,
-				'tax_query'              => array( // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_tax_query -- This could be a slow query, but it's necessary.
-					array(
-						'taxonomy' => 'wp_theme',
-						'field'    => 'name',
-						'terms'    => $theme,
-					),
-				),
-			)
-		);
-
-		if ( empty( $posts ) ) {
-			return new WP_Error( 'no_theme_styles', __( 'Unable to locate existing styles for the theme', 'themer' ) );
-		}
 
 		if ( 'GET' === $method ) {
-			return rest_ensure_response( $posts );
+			return $this->get_theme_style_variations();
 		}
 
 		if ( 'POST' === $method ) {
 			$json_body        = $request->get_json_params();
 			$global_styles_id = $json_body['globalStylesId'];
-			$post_ids         = array_column( $posts, 'ID' );
-			if ( ! $global_styles_id || ! in_array( $global_styles_id, $post_ids, true ) ) {
-				return new WP_Error( 'invalid_global_styles_id', __( 'Invalid global styles ID', 'themer' ) );
-			}
-
-			// Set the currently selected variation to draft and publish the new one.
-			foreach ( $posts as $post ) {
-				if ( 'publish' !== $post->post_status && $post->ID !== $global_styles_id ) {
-					continue;
-				}
-
-				$post_status = 'draft';
-				if ( $post->ID === $global_styles_id ) {
-					$post_status = 'publish';
-				}
-				wp_update_post(
-					array(
-						'ID'          => $post->ID,
-						'post_status' => $post_status,
-					)
-				);
-			}
-
-			return rest_ensure_response( new WP_REST_Response( array( 'message' => __( 'Active theme style variation updated.', 'themer' ) ), 200 ) );
+			return $this->set_new_active_style_variation( $global_styles_id );
 		}
 
 		return rest_ensure_response( new WP_REST_Response( array( 'error' => __( 'Unsupported request method.', 'themer' ) ), 405 ) );
diff --git a/inc/utils.php b/inc/utils.php
index 3f64a71..b7804ea 100644
--- a/inc/utils.php
+++ b/inc/utils.php
@@ -4,3 +4,34 @@
  *
  * @package themer
  */
+
+namespace Big_Bite\themer;
+
+/**
+ * Retrieves all of the `wp_global_styles` posts linked to the active theme.
+ *
+ * @return Array<WP_Post>
+ */
+function get_theme_style_variation_posts() {
+	$stylesheet = get_stylesheet();
+	return get_posts(
+		array(
+			'post_type'              => 'wp_global_styles',
+			'post_status'            => array( 'publish', 'draft' ),
+			'orderby'                => 'date',
+			'order'                  => 'desc',
+			'numberposts'            => -1,
+			'ignore_sticky_posts'    => true,
+			'no_found_rows'          => true,
+			'update_post_meta_cache' => false,
+			'update_post_term_cache' => false,
+			'tax_query'              => array( // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_tax_query -- This could be a slow query, but it's necessary.
+			array(
+		'taxonomy' => 'wp_theme',
+		'field'    => 'name',
+		'terms'    => $stylesheet,
+			),
+			),
+		)
+	);
+}

From 9e229b3186b60cb915b9a972614a89bcbcb202fb Mon Sep 17 00:00:00 2001
From: Joe Rouse <45216035+Joe-Rouse@users.noreply.github.com>
Date: Wed, 31 Jan 2024 17:22:00 +0000
Subject: [PATCH 08/11] docs(bbt-123): re-phrase comment on loop that updates
 post statuses

---
 inc/class-rest-api.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/inc/class-rest-api.php b/inc/class-rest-api.php
index ff9230d..fa7bd4a 100644
--- a/inc/class-rest-api.php
+++ b/inc/class-rest-api.php
@@ -172,7 +172,7 @@ public function set_new_active_style_variation( int $global_styles_id ): WP_REST
 
 		$posts = get_theme_style_variation_posts();
 
-		// Set the currently selected variation to draft and publish the new one.
+		// Sets the currently selected style variation to draft and publishes the newly selected one.
 		foreach ( $posts as $post ) {
 			if ( 'publish' !== $post->post_status && $post->ID !== $global_styles_id ) {
 				continue;

From 527c579942d45cde3c552b7c038efc7849e0db1c Mon Sep 17 00:00:00 2001
From: Joe Rouse <45216035+Joe-Rouse@users.noreply.github.com>
Date: Wed, 31 Jan 2024 17:31:03 +0000
Subject: [PATCH 09/11] style(bbt-123): improve arguments formatting

---
 inc/utils.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/inc/utils.php b/inc/utils.php
index b7804ea..32460b6 100644
--- a/inc/utils.php
+++ b/inc/utils.php
@@ -25,12 +25,13 @@ function get_theme_style_variation_posts() {
 			'no_found_rows'          => true,
 			'update_post_meta_cache' => false,
 			'update_post_term_cache' => false,
-			'tax_query'              => array( // phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_tax_query -- This could be a slow query, but it's necessary.
-			array(
-		'taxonomy' => 'wp_theme',
-		'field'    => 'name',
-		'terms'    => $stylesheet,
-			),
+			// phpcs:ignore WordPress.DB.SlowDBQuery.slow_db_query_tax_query -- This could be a slow query, but it's necessary.
+			'tax_query'              => array(
+				array(
+					'taxonomy' => 'wp_theme',
+					'field'    => 'name',
+					'terms'    => $stylesheet,
+				),
 			),
 		)
 	);

From 5bfd3fd31373abcf4d94516fc04337d4d902b29f Mon Sep 17 00:00:00 2001
From: Joe Rouse <45216035+Joe-Rouse@users.noreply.github.com>
Date: Thu, 1 Feb 2024 09:20:11 +0000
Subject: [PATCH 10/11] refactor(bbt-123): change internally used methods
 visibility to private

---
 inc/class-rest-api.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/class-rest-api.php b/inc/class-rest-api.php
index fa7bd4a..751da69 100644
--- a/inc/class-rest-api.php
+++ b/inc/class-rest-api.php
@@ -149,7 +149,7 @@ public function get_theme_json(): WP_REST_Response|WP_Error {
 	 *
 	 * @return WP_REST_Response|WP_Error
 	 */
-	public function get_theme_style_variations(): WP_REST_Response|WP_Error {
+	private function get_theme_style_variations(): WP_REST_Response|WP_Error {
 		$posts = get_theme_style_variation_posts();
 
 		if ( empty( $posts ) ) {
@@ -165,7 +165,7 @@ public function get_theme_style_variations(): WP_REST_Response|WP_Error {
 	 * @param int $global_styles_id - The ID of the style variation to be published.
 	 * @return WP_REST_Response|WP_Error
 	 */
-	public function set_new_active_style_variation( int $global_styles_id ): WP_REST_Response|WP_Error {
+	private function set_new_active_style_variation( int $global_styles_id ): WP_REST_Response|WP_Error {
 		if ( ! $global_styles_id || ! get_post_status( $global_styles_id ) ) {
 			return new WP_Error( 'invalid_global_styles_id', __( 'Invalid global styles ID', 'themer' ) );
 		}

From 5a8cc8489d3ac9475349231fa854b4168bb4ec6b Mon Sep 17 00:00:00 2001
From: Joe Rouse <45216035+Joe-Rouse@users.noreply.github.com>
Date: Thu, 1 Feb 2024 11:32:20 +0000
Subject: [PATCH 11/11] refactor(bbt-123): add arg validation for
 globalStylesId

---
 inc/class-rest-api.php | 25 +++++++++++++++++++++----
 1 file changed, 21 insertions(+), 4 deletions(-)

diff --git a/inc/class-rest-api.php b/inc/class-rest-api.php
index 751da69..a4b1f39 100644
--- a/inc/class-rest-api.php
+++ b/inc/class-rest-api.php
@@ -71,6 +71,27 @@ public function register_routes() {
 				'permission_callback' => function () {
 					return current_user_can( 'edit_theme_options' );
 				},
+				'args'                => array(
+					'globalStylesId' => array(
+						'validate_callback' => function( $param, $request ) {
+							if ( $request->get_method() === 'GET' ) {
+								return true;
+							}
+
+							$post = get_post( $param );
+							if ( ! $post ) {
+								return false;
+							}
+
+							$stylesheet = get_stylesheet();
+							if ( 'wp_global_styles' !== $post->post_type || ! has_term( $stylesheet, 'wp_theme', $post ) ) {
+								return false;
+							}
+
+							return true;
+						},
+					),
+				),
 			)
 		);
 	}
@@ -166,10 +187,6 @@ private function get_theme_style_variations(): WP_REST_Response|WP_Error {
 	 * @return WP_REST_Response|WP_Error
 	 */
 	private function set_new_active_style_variation( int $global_styles_id ): WP_REST_Response|WP_Error {
-		if ( ! $global_styles_id || ! get_post_status( $global_styles_id ) ) {
-			return new WP_Error( 'invalid_global_styles_id', __( 'Invalid global styles ID', 'themer' ) );
-		}
-
 		$posts = get_theme_style_variation_posts();
 
 		// Sets the currently selected style variation to draft and publishes the newly selected one.