From 141c78b9ff849217e88bf34ef238342fd848a1a0 Mon Sep 17 00:00:00 2001
From: Jake Jackson <jake@gravitypdf.com>
Date: Wed, 21 Aug 2024 14:51:18 +1000
Subject: [PATCH] Add Preview PDF feature to Form PDF Settings

---
 src/Helper/Helper_Abstract_Options.php        |   7 +-
 src/Helper/Helper_Data.php                    |   3 +-
 src/Helper/Helper_Options_Fields.php          |  16 +-
 src/Model/Model_Form_Settings.php             |   2 +-
 src/Model/Model_PDF.php                       | 138 +++--
 .../Rest_Form_Settings.php}                   | 466 ++++++++------
 src/Rest/Rest_Pdf_Preview.php                 | 136 +++++
 src/View/html/FormSettings/add_edit.php       |  16 +-
 src/assets/js/admin/helper/spinner.js         |   6 +-
 .../common/setupDynamicTemplateFields.js      |  14 +-
 src/assets/js/react/api/preview.js            |  83 +++
 .../js/react/bootstrap/templateBootstrap.js   |   1 -
 src/assets/js/react/gfpdf-main.js             |  27 +-
 .../{addEditButton.js => actionToolbar.js}    |  28 +-
 .../utilities/PdfSettings/formSettings.js     | 145 +++++
 .../utilities/PdfSettings/previewButton.js    |  60 ++
 .../PdfSettings/unsavedChangesWarning.js      |  29 +
 src/assets/js/react/utilities/download.js     |  22 +
 src/assets/scss/Component/_submit.scss        |   2 +-
 src/assets/scss/MediaQueries/_min-782.scss    |  24 +
 src/assets/scss/Pages/_pdf-settings.scss      |  13 +-
 src/assets/scss/gfpdf-styles.scss             |   1 +
 src/bootstrap.php                             |  39 +-
 tests/e2e/advanced-checks/pdf-preview.test.js |  27 +
 .../page-model/helpers/advanced-check.js      |   2 +-
 tests/e2e/utilities/page-model/helpers/pdf.js |   9 +-
 .../page-model/tabs/general-settings.js       |   2 +-
 .../e2e/utilities/page-model/tabs/license.js  |   2 +-
 tests/phpunit/bootstrap.php                   |   8 +-
 .../{unit-tests => data}/fonts/Chewy.ttf      | Bin
 .../fonts/DejaVuSans-Bold.ttf                 | Bin
 .../{unit-tests => data}/fonts/DejaVuSans.ttf | Bin
 .../fonts/DejaVuSansCondensed.ttf             | Bin
 .../fonts/DejaVuSerifCondensed.ttf            | Bin
 .../fonts/chewy-LICENSE.txt                   |   0
 .../json/all-form-euro-product-entry.json     |   0
 .../json/all-form-fields-entries.json         |   0
 .../json/all-form-fields.json                 |   0
 .../json/form-settings-sample-input.json      |   0
 .../json/form-settings.json                   |   0
 .../json/gravityform-1-entries.json           |   0
 .../json/gravityform-1.json                   |   0
 .../json/gravityform-2.json                   |   0
 .../json/latest-posts.json                    |   0
 .../json/migration_v3_to_v4.json              |   0
 .../json/non-group-products-form-entries.json |   0
 .../json/non-group-products-form.json         |   0
 .../json/number-fields.json                   |   0
 .../json/options-settings.json                |   0
 .../json/repeater-consent-entry.json          |   0
 .../json/repeater-consent-form.json           |   0
 .../json/repeater-empty-entry.json            |   0
 .../json/repeater-empty-form.json             |   0
 .../json/shortcode-data.json                  |   0
 .../Test_Controller_Custom_Fonts.php          |  16 +-
 tests/phpunit/unit-tests/Rest/Test_Rest.php   |  86 +++
 .../Test_Rest_Form_Settings.php}              | 571 +++++++++++-------
 .../unit-tests/Rest/Test_Rest_Pdf_Preview.php | 143 +++++
 tests/phpunit/unit-tests/php/simple_config    | 106 ----
 tests/phpunit/unit-tests/test-ajax.php        |   2 +-
 tests/phpunit/unit-tests/test-api.php         |   6 +-
 tests/phpunit/unit-tests/test-form-data.php   |   4 +-
 .../phpunit/unit-tests/test-form-settings.php |   2 +-
 tests/phpunit/unit-tests/test-options-api.php |   2 +-
 tests/phpunit/unit-tests/test-shortcodes.php  |   4 +-
 .../unit-tests/test-slow-pdf-processes.php    |  18 +-
 66 files changed, 1620 insertions(+), 668 deletions(-)
 rename src/{Controller/Controller_Form_Settings_Rest_Api.php => Rest/Rest_Form_Settings.php} (71%)
 create mode 100644 src/Rest/Rest_Pdf_Preview.php
 create mode 100644 src/assets/js/react/api/preview.js
 rename src/assets/js/react/utilities/PdfSettings/{addEditButton.js => actionToolbar.js} (52%)
 create mode 100644 src/assets/js/react/utilities/PdfSettings/formSettings.js
 create mode 100644 src/assets/js/react/utilities/PdfSettings/previewButton.js
 create mode 100644 src/assets/js/react/utilities/PdfSettings/unsavedChangesWarning.js
 create mode 100644 src/assets/js/react/utilities/download.js
 create mode 100644 src/assets/scss/MediaQueries/_min-782.scss
 create mode 100644 tests/e2e/advanced-checks/pdf-preview.test.js
 rename tests/phpunit/{unit-tests => data}/fonts/Chewy.ttf (100%)
 rename tests/phpunit/{unit-tests => data}/fonts/DejaVuSans-Bold.ttf (100%)
 rename tests/phpunit/{unit-tests => data}/fonts/DejaVuSans.ttf (100%)
 rename tests/phpunit/{unit-tests => data}/fonts/DejaVuSansCondensed.ttf (100%)
 rename tests/phpunit/{unit-tests => data}/fonts/DejaVuSerifCondensed.ttf (100%)
 rename tests/phpunit/{unit-tests => data}/fonts/chewy-LICENSE.txt (100%)
 rename tests/phpunit/{unit-tests => data}/json/all-form-euro-product-entry.json (100%)
 rename tests/phpunit/{unit-tests => data}/json/all-form-fields-entries.json (100%)
 rename tests/phpunit/{unit-tests => data}/json/all-form-fields.json (100%)
 rename tests/phpunit/{unit-tests => data}/json/form-settings-sample-input.json (100%)
 rename tests/phpunit/{unit-tests => data}/json/form-settings.json (100%)
 rename tests/phpunit/{unit-tests => data}/json/gravityform-1-entries.json (100%)
 rename tests/phpunit/{unit-tests => data}/json/gravityform-1.json (100%)
 rename tests/phpunit/{unit-tests => data}/json/gravityform-2.json (100%)
 rename tests/phpunit/{unit-tests => data}/json/latest-posts.json (100%)
 rename tests/phpunit/{unit-tests => data}/json/migration_v3_to_v4.json (100%)
 rename tests/phpunit/{unit-tests => data}/json/non-group-products-form-entries.json (100%)
 rename tests/phpunit/{unit-tests => data}/json/non-group-products-form.json (100%)
 rename tests/phpunit/{unit-tests => data}/json/number-fields.json (100%)
 rename tests/phpunit/{unit-tests => data}/json/options-settings.json (100%)
 rename tests/phpunit/{unit-tests => data}/json/repeater-consent-entry.json (100%)
 rename tests/phpunit/{unit-tests => data}/json/repeater-consent-form.json (100%)
 rename tests/phpunit/{unit-tests => data}/json/repeater-empty-entry.json (100%)
 rename tests/phpunit/{unit-tests => data}/json/repeater-empty-form.json (100%)
 rename tests/phpunit/{unit-tests => data}/json/shortcode-data.json (100%)
 create mode 100644 tests/phpunit/unit-tests/Rest/Test_Rest.php
 rename tests/phpunit/unit-tests/{Controller/Test_Controller_Form_Settings_Rest_Api.php => Rest/Test_Rest_Form_Settings.php} (70%)
 create mode 100644 tests/phpunit/unit-tests/Rest/Test_Rest_Pdf_Preview.php
 delete mode 100644 tests/phpunit/unit-tests/php/simple_config

diff --git a/src/Helper/Helper_Abstract_Options.php b/src/Helper/Helper_Abstract_Options.php
index 06b5a71eb..84dad11c0 100644
--- a/src/Helper/Helper_Abstract_Options.php
+++ b/src/Helper/Helper_Abstract_Options.php
@@ -2272,7 +2272,12 @@ public function toggle_callback( $args ) {
 			<div class="gform-settings-description gform-kitchen-sink"><?php echo wp_kses_post( $args['desc'] ); ?></div>
 
 			<span class="gform-settings-input__container">
-				<input type="checkbox" id="gfpdf_settings[<?php echo esc_attr( $args['id'] ); ?>]" name="gfpdf_settings[<?php echo esc_attr( $args['id'] ); ?>]" value="Yes" <?php echo checked( $value, 'Yes', false ); ?> />
+				<input type="checkbox"
+					   id="gfpdf_settings[<?php echo esc_attr( $args['id'] ); ?>]"
+					   name="gfpdf_settings[<?php echo esc_attr( $args['id'] ); ?>]"
+					   class="gfpdf-input-toggle"
+					   value="Yes"
+					   <?php checked( $value, 'Yes' ); ?> />
 				<label class="gform-field__toggle-container" for="gfpdf_settings[<?php echo esc_attr( $args['id'] ); ?>]">
 					<?php if ( ! empty( $name ) ): ?>
 						<span class="screen-reader-text"><?php echo esc_html( $name ); ?></span>
diff --git a/src/Helper/Helper_Data.php b/src/Helper/Helper_Data.php
index 16154e69b..65531a345 100644
--- a/src/Helper/Helper_Data.php
+++ b/src/Helper/Helper_Data.php
@@ -256,8 +256,9 @@ public function get_localised_script_data( Helper_Abstract_Options $options, Hel
 
 				'searchPlaceholder'                    => esc_html__( 'Search the Gravity PDF Knowledgebase...', 'gravity-forms-pdf-extended' ),
 				'searchResultHeadingText'              => esc_html__( 'Gravity PDF Documentation', 'gravity-forms-pdf-extended' ),
-				'noResultText'                         => esc_html__( 'It doesn\'t look like there are any topics related to your issue.', 'gravity-forms-pdf-extended' ),
+				'noResultText'                         => esc_html__( "It doesn't look like there are any topics related to your issue.", 'gravity-forms-pdf-extended' ),
 				'getSearchResultError'                 => esc_html__( 'An error occurred. Please try again', 'gravity-forms-pdf-extended' ),
+				'getPreviewResultError'                => esc_html__( 'An error occurred. Please try again', 'gravity-forms-pdf-extended' ),
 
 				'requiresGravityPdfVersion'            => esc_html__( 'Requires Gravity PDF v%s', 'gravity-forms-pdf-extended' ),
 				'templateNotCompatibleWithGravityPdfVersion' => esc_html__( 'This PDF template is not compatible with your version of Gravity PDF. This template required Gravity PDF v%s.', 'gravity-forms-pdf-extended' ),
diff --git a/src/Helper/Helper_Options_Fields.php b/src/Helper/Helper_Options_Fields.php
index ede607640..0f12643c6 100644
--- a/src/Helper/Helper_Options_Fields.php
+++ b/src/Helper/Helper_Options_Fields.php
@@ -251,19 +251,8 @@ public function get_registered_fields() {
 						'required' => true,
 						'desc'     => __( 'Add a descriptive label to help you  differentiate between multiple PDF settings.', 'gravity-forms-pdf-extended' ),
 						'schema'   => [
-							'arg_options' => [
-								'validate_callback' => function( $param, $request, $key ) {
-									if ( ! empty( $param ) ) {
-										return true;
-									}
-
-									return new WP_Error(
-										'rest_invalid_param',
-										__( 'PDF name must be a non-empty string.', 'gravity-forms-pdf-extended' ),
-										[ 'status' => 400 ]
-									);
-								},
-							],
+							'default'   => __( 'PDF', 'gravity-forms-pdf-extended' ),
+							'minLength' => 1,
 						],
 					],
 
@@ -327,6 +316,7 @@ public function get_registered_fields() {
 						'schema'     => [
 							'default'     => __( 'document', 'gravity-forms-pdf-extended' ),
 							'description' => sprintf( __( 'Set the filename for the generated PDF (excluding the .pdf extension). Mergetags are supported, and invalid characters %s are automatically converted to an underscore.', 'gravity-forms-pdf-extended' ), '/ \ " * ? | : < >' ),
+							'minLength'   => 1,
 							'arg_options' => [
 								'sanitize_callback' => function( $param, $request, $key ) {
 									$param = $this->misc->remove_extension_from_string( $param, '.pdf' );
diff --git a/src/Model/Model_Form_Settings.php b/src/Model/Model_Form_Settings.php
index e8e2d842c..841f3ebc9 100644
--- a/src/Model/Model_Form_Settings.php
+++ b/src/Model/Model_Form_Settings.php
@@ -640,7 +640,7 @@ public function get_template_name_from_current_page() {
 			}
 		}
 
-		return $template;
+		return apply_filters( 'gfpdf_template_for_current_page', $template );
 	}
 
 	/**
diff --git a/src/Model/Model_PDF.php b/src/Model/Model_PDF.php
index a4be20034..8d6d87afd 100644
--- a/src/Model/Model_PDF.php
+++ b/src/Model/Model_PDF.php
@@ -270,71 +270,9 @@ public function process_pdf( $pid, $lid, $action = 'view' ) {
 			return $path_to_pdf;
 		}
 
-		/* Verify the PDF can be sent to the client */
-		if ( headers_sent( $filename, $linenumber ) ) {
-			$this->log->error(
-				'Server headers already sent',
-				[
-					'filename'   => $filename,
-					'linenumber' => $linenumber,
-				]
-			);
-
-			return new WP_Error( 'headers_sent', __( 'The PDF cannot be displayed because the server headers have already been sent.', 'gravity-forms-pdf-extended' ) );
-		}
-
-		/* Force any active buffers to close and delete its content */
-		while ( ob_get_level() > 0 ) {
-			ob_end_clean();
-		}
-
 		do_action( 'gfpdf_post_view_or_download_pdf', $path_to_pdf, $form, $entry, $settings, $action );
 
-		/* Send the PDF to the client */
-		header( 'Content-Type: application/pdf' );
-
-		/*
-		 * Set the filename, supporting the new utf-8 syntax + backwards compatibility
-		 * Refer to RFC 8187 https://www.rfc-editor.org/rfc/rfc8187.html
-		 */
-		header(
-			sprintf(
-				'Content-Disposition: %1$s; filename="%2$s"; filename*=utf-8\'\'%2$s',
-				$action === 'view' ? 'inline' : 'attachment',
-				rawurlencode( basename( $path_to_pdf ) ),
-			)
-		);
-
-		/* only add the length if the server is not using compression */
-		if ( empty( $_SERVER['HTTP_ACCEPT_ENCODING'] ) ) {
-			header( sprintf( 'Content-Length: %d', filesize( $path_to_pdf ) ) );
-		}
-
-		/* Tell client to download the file */
-		if ( $action === 'download' ) {
-			header( 'Content-Description: File Transfer' );
-			header( 'Content-Transfer-Encoding: binary' );
-		}
-
-		/* Set appropriate headers for local browser caching */
-		$last_modified_time = filemtime( $path_to_pdf );
-		$etag               = md5( $path_to_pdf ); /* the file path includes a unique hash that automatically changes when a PDF does */
-
-		header( sprintf( 'Last-Modified: %s GMT', gmdate( 'D, d M Y H:i:s', $last_modified_time ) ) );
-		header( sprintf( 'Etag: %s', $etag ) );
-		header( 'Cache-Control: no-cache, private' );
-		header( 'Pragma: no-cache' );
-		header( 'Expires: 0' );
-
-		/* Tell client they can display the PDF from the local cache if it is still current */
-		if ( ! empty( $_SERVER['HTTP_IF_NONE_MATCH'] ) && $_SERVER['HTTP_IF_NONE_MATCH'] === $etag ) {
-			header( 'HTTP/1.1 304 Not Modified' );
-			exit;
-		}
-
-		readfile( $path_to_pdf ); /* phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_read_readfile */
-
-		exit;
+		$this->send_pdf_to_browser( $path_to_pdf, $action );
 	}
 
 	/**
@@ -2658,4 +2596,78 @@ public function gp_populate_anything_hydrate_form( $form, $entry ) {
 
 		return $hydrated_form;
 	}
+
+	/**
+	 * Send a PDF file to the browser
+	 *
+	 * @param string $path_to_pdf Absolute path to PDF on disk
+	 * @param string $action Either "view" or "download"
+	 *
+	 * @since 6.12
+	 */
+	public function send_pdf_to_browser( $path_to_pdf, $action = 'view' ) {
+		/* Verify the PDF can be sent to the client */
+		if ( headers_sent( $filename, $linenumber ) ) {
+			$this->log->error(
+				'Server headers already sent',
+				[
+					'filename'   => $filename,
+					'linenumber' => $linenumber,
+				]
+			);
+
+			return new WP_Error( 'headers_sent', __( 'The PDF cannot be displayed because the server headers have already been sent.', 'gravity-forms-pdf-extended' ) );
+		}
+
+		/* Force any active buffers to close and delete its content */
+		while ( ob_get_level() > 0 ) {
+			ob_end_clean();
+		}
+
+		/* Send the PDF to the client */
+		header( 'Content-Type: application/pdf' );
+
+		/*
+		 * Set the filename, supporting the new utf-8 syntax + backwards compatibility
+		 * Refer to RFC 8187 https://www.rfc-editor.org/rfc/rfc8187.html
+		 */
+		header(
+			sprintf(
+				'Content-Disposition: %1$s; filename="%2$s"; filename*=utf-8\'\'%2$s',
+				$action === 'view' ? 'inline' : 'attachment',
+				rawurlencode( basename( $path_to_pdf ) ),
+			)
+		);
+
+		/* only add the length if the server is not using compression */
+		if ( empty( $_SERVER['HTTP_ACCEPT_ENCODING'] ) ) {
+			header( sprintf( 'Content-Length: %d', filesize( $path_to_pdf ) ) );
+		}
+
+		/* Tell client to download the file */
+		if ( $action !== 'view' ) {
+			header( 'Content-Description: File Transfer' );
+			header( 'Content-Transfer-Encoding: binary' );
+		}
+
+		/* Set appropriate headers for local browser caching */
+		$last_modified_time = filemtime( $path_to_pdf );
+		$etag               = md5( $path_to_pdf ); /* the file path includes a unique hash that automatically changes when a PDF does */
+
+		header( sprintf( 'Last-Modified: %s GMT', gmdate( 'D, d M Y H:i:s', $last_modified_time ) ) );
+		header( sprintf( 'Etag: %s', $etag ) );
+		header( 'Cache-Control: no-cache, private' );
+		header( 'Pragma: no-cache' );
+		header( 'Expires: 0' );
+
+		/* Tell client they can display the PDF from the local cache if it is still current */
+		if ( ! empty( $_SERVER['HTTP_IF_NONE_MATCH'] ) && $_SERVER['HTTP_IF_NONE_MATCH'] === $etag ) {
+			header( 'HTTP/1.1 304 Not Modified' );
+			exit;
+		}
+
+		readfile( $path_to_pdf ); /* phpcs:ignore WordPress.WP.AlternativeFunctions.file_system_read_readfile */
+
+		exit;
+	}
 }
diff --git a/src/Controller/Controller_Form_Settings_Rest_Api.php b/src/Rest/Rest_Form_Settings.php
similarity index 71%
rename from src/Controller/Controller_Form_Settings_Rest_Api.php
rename to src/Rest/Rest_Form_Settings.php
index 36cac2bc7..cb75f2f18 100644
--- a/src/Controller/Controller_Form_Settings_Rest_Api.php
+++ b/src/Rest/Rest_Form_Settings.php
@@ -1,13 +1,12 @@
 <?php
 
-namespace GFPDF\Controller;
+namespace GFPDF\Rest;
 
 use GFPDF\Helper\Helper_Data;
 use GFPDF\Helper\Helper_Form;
 use GFPDF\Helper\Helper_Misc;
 use GFPDF\Helper\Helper_Options_Fields;
 use GFPDF\Helper\Helper_Templates;
-use GFPDF\Model\Model_Form_Settings;
 use GFPDF\Statics\Kses;
 use GPDFAPI;
 use WP_Error;
@@ -30,7 +29,7 @@
 /**
  * @since 6.12
  */
-class Controller_Form_Settings_Rest_Api extends WP_REST_Controller {
+class Rest_Form_Settings extends WP_REST_Controller {
 
 	/**
 	 * @var string
@@ -45,22 +44,14 @@ class Controller_Form_Settings_Rest_Api extends WP_REST_Controller {
 	public const API_BASE = '/form';
 
 	/**
-	 * @var string The current template being processed for this request
+	 * @var string[]
 	 * @since 6.12
 	 */
-	protected $current_template = '';
-
-	/**
-	 * @var string A backup of the original PDF template for this request (if any)
-	 * @since 6.12
-	 */
-	protected $original_request_template = '';
-
-	/**
-	 * @var string A backup of the original schema for this request (if any)
-	 * @since 6.12
-	 */
-	protected $original_schema;
+	public static $endpoints = [
+		'pdf-settings'      => self::API_BASE . '/(?P<form>[\d]+)',
+		'pdf-settings-item' => self::API_BASE . '/(?P<form>[\d]+)/(?P<pdf>[a-fA-F0-9]{13})',
+		'template-schema'   => self::API_BASE . '/(?P<form>[\d]+)/schema',
+	];
 
 	/**
 	 * @var Helper_Options_Fields
@@ -107,6 +98,7 @@ public function __construct( $options, $gform, $misc, $templates ) {
 	 */
 	public function init() {
 		add_action( 'rest_api_init', [ $this, 'register_routes' ] );
+		add_filter( 'rest_pre_dispatch', [ $this, 'maybe_set_template_schema' ], 10, 3 );
 	}
 
 	/**
@@ -117,19 +109,16 @@ public function init() {
 	 */
 	public function register_routes() {
 
-		/* To make full use of schema validation, we need to correctly parse and save the template for the request */
-		$this->maybe_assign_template_for_schema();
-
 		/*
 		 * Routes to list all form PDF settings, or create a new one
 		 */
 		register_rest_route(
 			static::NAMESPACE,
-			static::API_BASE . '/(?P<form>[\d]+)',
+			static::$endpoints['pdf-settings'],
 			[
 				'args'   => [
 					'form' => [
-						'description'       => __( 'The unique identifier for the Gravity Form.', 'gravity-forms-pdf-extended' ),
+						'description'       => __( 'The unique identifier for the Gravity Forms form.', 'gravity-forms-pdf-extended' ),
 						'type'              => 'integer',
 						'required'          => true,
 						'validate_callback' => [ $this, 'check_form_is_valid' ],
@@ -140,7 +129,17 @@ public function register_routes() {
 					'methods'             => WP_REST_Server::READABLE,
 					'callback'            => [ $this, 'get_items' ],
 					'permission_callback' => [ $this, 'get_items_permissions_check' ],
-					'args'                => $this->get_collection_params(),
+					'args'                => array_merge(
+						$this->get_collection_params(),
+						[
+							'entry' => [
+								'description'       => __( 'The unique identifier for the Gravity Forms entry. Include to filter out PDFs that are not active for the entry.', 'gravity-forms-pdf-extended' ),
+								'type'              => 'integer',
+								'required'          => false,
+								'validate_callback' => [ $this, 'check_entry_is_valid' ],
+							],
+						]
+					),
 				],
 
 				[
@@ -160,11 +159,11 @@ public function register_routes() {
 		 */
 		register_rest_route(
 			static::NAMESPACE,
-			static::API_BASE . '/(?P<form>[\d]+)/(?P<pdf>[a-fA-F0-9]{13})',
+			static::$endpoints['pdf-settings-item'],
 			[
 				'args'   => [
 					'form' => [
-						'description'       => __( 'The unique identifier for the Gravity Form.', 'gravity-forms-pdf-extended' ),
+						'description'       => __( 'The unique identifier for the Gravity Forms form.', 'gravity-forms-pdf-extended' ),
 						'type'              => 'integer',
 						'required'          => true,
 						'validate_callback' => [ $this, 'check_form_is_valid' ],
@@ -184,6 +183,7 @@ public function register_routes() {
 							$pdfs = GPDFAPI::get_form_pdfs( $request->get_param( 'form' ) );
 
 							/* translators: 1: Parameter, 2: List of valid values. */
+
 							return new WP_Error( 'rest_not_in_enum', wp_sprintf( __( '%1$s is not one of %2$l.', 'default' ), $param, ! is_wp_error( $pdfs ) ? array_keys( $pdfs ) : '' ) );
 						},
 					],
@@ -215,6 +215,128 @@ public function register_routes() {
 			],
 			true
 		);
+
+		/* Get the template schema */
+		register_rest_route(
+			static::NAMESPACE,
+			static::$endpoints['template-schema'],
+			[
+				'args' => [
+					'form'     => [
+						'description'       => __( 'The unique identifier for the Gravity Forms form.', 'gravity-forms-pdf-extended' ),
+						'type'              => 'integer',
+						'required'          => true,
+						'validate_callback' => [ $this, 'check_form_is_valid' ],
+					],
+
+					'template' => [
+						'description' => __( 'A PDF template installed on the website.', 'gravity-forms-pdf-extended' ),
+						'type'        => 'string',
+						'required'    => true,
+						'enum'        => $this->misc->flatten_array( $this->templates->get_all_templates_by_group() ),
+					],
+
+					'context'  => $this->get_context_param( [ 'default' => 'edit' ] ),
+				],
+
+				[
+					'methods'             => WP_REST_Server::READABLE,
+					'callback'            => [ $this, 'get_schema_for_template' ],
+					'permission_callback' => [ $this, 'get_item_permissions_check' ],
+				],
+			],
+			true
+		);
+	}
+
+	/**
+	 * Each template has different schema. For requests to this namespace automatically set the template schema before the API call is processed
+	 *
+	 * @param mixed $results
+	 * @param WP_REST_Server $server
+	 * @param WP_REST_Request $request
+	 *
+	 * @return mixed
+	 *
+	 * @since 6.12
+	 */
+	public function maybe_set_template_schema( $results, $server, $request ) {
+		/* Look for current endpoints */
+		if ( strpos( $request->get_route(), '/' . static::get_route_basepath() ) !== 0 ) {
+			return $results;
+		}
+
+		/* Match request to handler and set the URL params (which is normally done after this hook) */
+		$path = $request->get_route();
+		foreach ( static::$endpoints as $route ) {
+			$match = preg_match( '@^/' . static::NAMESPACE . $route . '$@i', $path, $matches );
+
+			if ( ! $match ) {
+				continue;
+			}
+
+			$args = [];
+			foreach ( $matches as $param => $value ) {
+				if ( ! is_int( $param ) ) {
+					$args[ $param ] = $value;
+				}
+			}
+
+			$request->set_url_params( $args );
+
+			break;
+		}
+
+		/*
+		 * Make data available in appropriate superglobals
+		 * This allows code to register template settings which rely on knowing the form
+		 */
+		$data = [
+			'form' => (int) $request->get_param( 'form' ),
+		];
+
+		switch ( $request->get_method() ) {
+			case 'GET':
+				foreach ( $data as $key => $value ) {
+					if ( ! empty( $value ) ) {
+						$_GET[ $key ]     = $value;
+						$_REQUEST[ $key ] = $value;
+					}
+				}
+				break;
+
+			case 'POST':
+			case 'PATCH':
+			case 'PUT':
+				foreach ( $data as $key => $value ) {
+					if ( ! empty( $value ) ) {
+						$_POST[ $key ]    = $value;
+						$_REQUEST[ $key ] = $value;
+					}
+				}
+				break;
+		}
+
+		$this->schema = null;
+
+		/* If template is known reregister the schema */
+		$template = $request->get_param( 'template' );
+		if ( ! empty( $template ) ) {
+			$this->get_template_schema( sanitize_html_class( $template ) );
+		}
+
+		$this->register_routes();
+
+		return $results;
+	}
+
+	/**
+	 * @return string
+	 *
+	 * @since 6.12
+	 */
+	public static function get_route_basepath() {
+		return static::NAMESPACE . static::API_BASE;
 	}
 
 	/**
@@ -239,23 +361,35 @@ public function check_form_is_valid( $form_id ) {
 	}
 
 	/**
-	 * A helper to re-register the endpoints with a new template schema
-	 * This allows for correct validation of requests, and default values
+	 * Check if the entry is valid
 	 *
-	 * @param string $template The name of the template
-	 *
-	 * @return void
+	 * @param int $entry_id
+	 * @param WP_REST_Request $request
 	 *
-	 * @internal Only use this if manually running REST API requests `new WP_REST_Request()` with a different template each time.
-	 * External API requests automatically detect the correct template each request
+	 * @return true|WP_Error
 	 *
-	 * @since    6.12.0
+	 * @since 6.12.0
 	 */
-	public function reregister_routes( $template ) {
-		$this->set_template( $template );
-		$this->register_routes();
-	}
+	public function check_entry_is_valid( $entry_id, $request ) {
+		$entry = \GFAPI::get_entry( $entry_id );
+		if ( is_wp_error( $entry ) ) {
+			return new WP_Error(
+				'rest_invalid_param',
+				sprintf( __( 'Invalid entry ID %d provided.', 'gravity-forms-pdf-extended' ), $entry_id ),
+				[ 'status' => 400 ]
+			);
+		}
+
+		if ( (int) ( $entry['form_id'] ?? 0 ) !== (int) $request->get_param( 'form' ) ) {
+			return new WP_Error(
+				'rest_invalid_param',
+				sprintf( __( 'Entry ID %d is not associated with the current form.', 'gravity-forms-pdf-extended' ), $entry_id ),
+				[ 'status' => 400 ]
+			);
+		}
 
+		return true;
+	}
 	/**
 	 * Permissions check for getting all form PDFs
 	 *
@@ -279,24 +413,25 @@ public function get_items_permissions_check( $request ) {
 	 * @since 6.12.0
 	 */
 	public function get_items( $request ) {
-		$pdfs = \GPDFAPI::get_form_pdfs( $request->get_param( 'form' ) );
+		$entry_id = $request->get_param( 'entry' );
+		if ( ! empty( $entry_id ) ) {
+			$pdfs = \GPDFAPI::get_entry_pdfs( $entry_id );
+		} else {
+			$pdfs = \GPDFAPI::get_form_pdfs( $request->get_param( 'form' ) );
+		}
 
 		if ( is_wp_error( $pdfs ) ) {
-			return new WP_Error(
-				'rest_invalid_param',
-				__( 'Form does not exist.', 'gravity-forms-pdf-extended' ),
-				[ 'status' => 400 ]
-			);
+			$pdfs->add_data( [ 'status' => 400 ] );
+
+			return $pdfs;
 		}
 
 		$output = [];
 		foreach ( $pdfs as $pdf ) {
-			$this->set_template( $pdf['template'] );
+			$this->get_template_schema( $pdf['template'] );
 			$request->set_param( 'pdf', $pdf['id'] );
 
 			$output[] = $this->prepare_response_for_collection( $this->prepare_item_for_response( $pdf, $request ) );
-
-			$this->restore_template_to_original();
 		}
 
 		return rest_ensure_response( $output );
@@ -338,12 +473,10 @@ public function get_item( $request ) {
 			return $pdf;
 		}
 
-		$this->set_template( $pdf['template'] );
+		$this->get_template_schema( $pdf['template'] );
 
 		$response = rest_ensure_response( $this->prepare_item_for_response( $pdf, $request ) );
 
-		$this->restore_template_to_original();
-
 		return $response;
 	}
 
@@ -378,7 +511,7 @@ public function create_item_permissions_check( $request ) {
 	 * @since 6.12.0
 	 */
 	public function create_item( $request ) {
-		if ( ! empty( $request['pdf'] ) ) {
+		if ( ! empty( $request->get_param( 'pdf' ) ) ) {
 			return new WP_Error(
 				'rest_invalid_param',
 				__( 'Cannot create existing PDF.', 'gravity-forms-pdf-extended' ),
@@ -386,9 +519,9 @@ public function create_item( $request ) {
 			);
 		}
 
-		$form_id = $request['form'];
+		$form_id = $request->get_param( 'form' );
 
-		$this->set_template( $request['template'] ?? '' );
+		$this->get_template_schema( $request->get_param( 'template' ) );
 
 		$pdf_id = \GPDFAPI::add_pdf( $form_id, $this->prepare_item_for_database( $request ) );
 		if ( $pdf_id === false ) {
@@ -422,9 +555,7 @@ public function create_item( $request ) {
 		$response = rest_ensure_response( $response );
 
 		$response->set_status( 201 );
-		$response->header( 'Location', rest_url( sprintf( '%s/%s/%d/%s', static::NAMESPACE, static::API_BASE, $form_id, $pdf_id ) ) );
-
-		$this->restore_template_to_original();
+		$response->header( 'Location', rest_url( sprintf( '%s/%d/%s', static::get_route_basepath(), $form_id, $pdf_id ) ) );
 
 		return $response;
 	}
@@ -452,8 +583,8 @@ public function update_item_permissions_check( $request ) {
 	 * @since 6.12.0
 	 */
 	public function update_item( $request ) {
-		$form_id = $request['form'];
-		$pdf_id  = $request['pdf'];
+		$form_id = $request->get_param( 'form' );
+		$pdf_id  = $request->get_param( 'pdf' );
 		$pdf     = \GPDFAPI::get_pdf( $form_id, $pdf_id );
 		if ( is_wp_error( $pdf ) ) {
 			$pdf->add_data( [ 'status' => 410 ] );
@@ -463,7 +594,7 @@ public function update_item( $request ) {
 
 		$id = $pdf['id'];
 
-		$this->set_template( $pdf['template'] );
+		$this->get_template_schema( $request->get_param( 'template' ) ?? $pdf['template'] );
 
 		$database_pdf = $this->prepare_item_for_database( $request );
 
@@ -491,8 +622,6 @@ public function update_item( $request ) {
 		$response = $this->prepare_item_for_response( $pdf, $request );
 		$response = rest_ensure_response( $response );
 
-		$this->restore_template_to_original();
-
 		return $response;
 	}
 
@@ -519,7 +648,7 @@ public function delete_item_permissions_check( $request ) {
 	 * @since 6.12.0
 	 */
 	public function delete_item( $request ) {
-		$pdf = \GPDFAPI::get_pdf( $request['form'], $request['pdf'] );
+		$pdf = \GPDFAPI::get_pdf( $request->get_param( 'form' ), $request->get_param( 'pdf' ) );
 		if ( is_wp_error( $pdf ) ) {
 			$pdf->add_data( [ 'status' => 410 ] );
 
@@ -527,13 +656,11 @@ public function delete_item( $request ) {
 		}
 
 		$request->set_param( 'context', 'edit' );
-		$this->set_template( $pdf['template'] );
+		$this->get_template_schema( $pdf['template'] );
 
 		$previous = $this->prepare_item_for_response( $pdf, $request );
 
-		$this->restore_template_to_original();
-
-		$result = \GPDFAPI::delete_pdf( $request['form'], $request['pdf'] );
+		$result = \GPDFAPI::delete_pdf( $request->get_param( 'form' ), $request->get_param( 'pdf' ) );
 		if ( ! $result ) {
 			return new \WP_Error(
 				'gfpdf_form_settings_rest_cannot_delete_pdf',
@@ -639,18 +766,19 @@ public function prepare_item_for_response( $item, $request ) {
 
 		$data = $reordered;
 
-		$context = ! empty( $request['context'] ) ? $request['context'] : 'edit';
+		$context = ! empty( $request->get_param( 'context' ) ) ? $request->get_param( 'context' ) : 'edit';
 
 		$data = $this->add_additional_fields_to_object( $data, $request );
-		$data = $this->filter_response_by_context( $data, $context );
 
-		$data = apply_filters( 'gfpdf_form_settings_rest_prepared_response', $data, $request );
+		/* Get the links before the data is filtered */
+		$links = $this->prepare_links( $data, $request );
 
-		/* Wrap the data in a response object. */
+		$data     = $this->filter_response_by_context( $data, $context );
+		$data     = apply_filters( 'gfpdf_form_settings_rest_prepared_response', $data, $request );
 		$response = rest_ensure_response( $data );
 
 		if ( rest_is_field_included( '_links', $fields ) || rest_is_field_included( '_embedded', $fields ) ) {
-			$response->add_links( $this->prepare_links( $request, $data ) );
+			$response->add_links( $links );
 		}
 
 		return $response;
@@ -669,10 +797,10 @@ protected function prepare_item_for_database( $request ) {
 		$prepared_pdf = [];
 
 		/* Updating an existing PDF, save to $prepared_pdf */
-		if ( isset( $request['pdf'] ) ) {
-			$existing_pdf = \GPDFAPI::get_pdf( $request['form'], $request['pdf'] );
+		if ( $request->get_param( 'pdf' ) ) {
+			$existing_pdf = \GPDFAPI::get_pdf( $request->get_param( 'form' ), $request->get_param( 'pdf' ) );
 			if ( is_wp_error( $existing_pdf ) ) {
-				$existing_pdf->add_data( [ 'status' => '410' ] );
+				$existing_pdf->add_data( [ 'status' => 410 ] );
 
 				return $existing_pdf;
 			}
@@ -689,11 +817,11 @@ protected function prepare_item_for_database( $request ) {
 			}
 
 			/* skip over if updating a PDF and no data is being set */
-			if ( isset( $request['pdf'] ) && ! array_key_exists( $id, $request->get_params() ) ) {
+			if ( $request->get_param( 'pdf' ) && ! array_key_exists( $id, $request->get_params() ) ) {
 				continue;
 			}
 
-			$value = $request[ $id ] ?? '';
+			$value = $request->get_param( $id ) ?? '';
 
 			/* Handle arrays */
 			if ( $this->has_property_type( 'array', $property['type'] ) ) {
@@ -710,7 +838,7 @@ protected function prepare_item_for_database( $request ) {
 
 			/* Handle Toggle values */
 			if ( $this->has_property_type( 'boolean', $property['type'] ) && ( $property['format'] ?? '' ) === 'yes_no' ) {
-				$value = $value === true ? 'Yes' : '';
+				$value = $value === true ? 'Yes' : 'No';
 			}
 
 			$prepared_pdf[ $id ] = $value;
@@ -788,13 +916,13 @@ public function get_item_schema() {
 		$schema['properties'] = array_merge(
 			$schema['properties'],
 			/* General-specific fields */
-			$this->get_section_schema( $all_gravitypdf_settings['form_settings'] ?? [] ),
+			$this->get_section_schema( $all_gravitypdf_settings['form_settings'] ?? [], 'general' ),
 			/* Appearance-specific fields */
-			$this->get_section_schema( $all_gravitypdf_settings['form_settings_appearance'] ?? [] ),
+			$this->get_section_schema( $all_gravitypdf_settings['form_settings_appearance'] ?? [], 'appearance' ),
 			/* Template-specific fields */
-			$this->get_section_schema( $this->get_template_settings( $this->current_template ) ),
+			$this->get_section_schema( $all_gravitypdf_settings['form_settings_custom_appearance'] ?? [], 'template' ),
 			/* Advanced/Security fields */
-			$this->get_section_schema( $all_gravitypdf_settings['form_settings_advanced'] ?? [] ),
+			$this->get_section_schema( $all_gravitypdf_settings['form_settings_advanced'] ?? [], 'advanced' ),
 		);
 
 		$this->schema = apply_filters( 'gfpdf_form_settings_rest_schema', $schema );
@@ -803,110 +931,69 @@ public function get_item_schema() {
 	}
 
 	/**
-	 * Backup the current request's template/schema and set a new legacy template
+	 * Get Rest API schema for specific form/template
 	 *
-	 * @param string $template
+	 * @param WP_REST_Request $request
 	 *
-	 * @return void
+	 * @return WP_REST_Response
 	 *
-	 * @since 6.12.0
-	 */
-	protected function set_template( string $template ) {
-		if ( $template === $this->current_template ) {
-			return;
-		}
-
-		$this->original_request_template = $this->current_template;
-		$this->original_schema           = $this->schema;
-
-		$this->current_template = $template;
-		$this->schema           = null;
-	}
-
-	/**
-	 * Restore the original template/schema for the current request
-	 *
-	 * @return void
-	 *
-	 * @since 6.12.0
+	 * @since 6.12
 	 */
-	protected function restore_template_to_original() {
-		if ( empty( $this->original_request_template ) && empty( $this->original_schema ) ) {
-			return;
-		}
+	public function get_schema_for_template( $request ) {
+		$context  = $request->get_param( 'context' );
+		$template = $request->get_param( 'template' );
 
-		$this->current_template = $this->original_request_template;
-		$this->schema           = $this->original_schema;
-	}
+		$schema = $this->get_template_schema( $template );
 
-	/**
-	 * Set the requested template
-	 *
-	 * Generating the correct schema relies on knowing ahead of time what template (if any) is required.
-	 * The template information could come in the form of a URL parameter, posted data, or JSON, which is
-	 * why we need to create a new REST Request to correctly parse all the information.
-	 *
-	 * @return void
-	 *
-	 * @since 6.12.0
-	 */
-	protected function maybe_assign_template_for_schema() {
-		if ( ! isset( $GLOBALS['wp']->query_vars['rest_route'] ) ) {
-			return;
+		if ( empty( $context ) ) {
+			return rest_ensure_response( $schema );
 		}
 
-		$route = untrailingslashit( $GLOBALS['wp']->query_vars['rest_route'] );
-		if ( strpos( $route, sprintf( '/%s', static::NAMESPACE . static::API_BASE ) ) !== 0 ) {
-			return;
+		/* filter out properties that don't match the context */
+		foreach ( $schema['properties'] as $id => $property ) {
+			if ( empty( $property['context'] ) || ! in_array( $context, $property['context'], true ) ) {
+				unset( $schema['properties'][ $id ] );
+			}
 		}
 
-		$this->assign_template_for_schema();
+		return rest_ensure_response( $schema );
 	}
 
 	/**
-	 * Save requested PDF template for use in schema validation
+	 * Get specific template schema
 	 *
-	 * @return Controller_Form_Settings_Rest_Api
+	 * @param string $template
 	 *
-	 * @since 6.12.0
+	 * @return array
+	 *
+	 * @since 6.12
 	 */
-	protected function assign_template_for_schema() {
-		$server  = rest_get_server();
-		$request = new \WP_REST_Request( 'POST', '', [ 'template' => [ 'type' => 'string' ] ] );
-		$request->set_query_params( wp_unslash( $_GET ) ); /* phpcs:ignore WordPress.Security.NonceVerification.Recommended */
-		$request->set_body_params( wp_unslash( $_POST ) ); /* phpcs:ignore WordPress.Security.NonceVerification.Missing */
-		$request->set_headers( $server->get_headers( wp_unslash( $_SERVER ) ) );
-		$request->set_body( \WP_REST_Server::get_raw_data() );
-		$request->get_json_params();
-
-		/* Get template from request */
-		$template = $request->get_param( 'template' );
+	public function get_template_schema( $template ) {
+		$current_template = function( $item ) use ( $template ) {
+			return $template;
+		};
 
-		/* Check if template is valid */
-		$is_valid = rest_validate_value_from_schema( $template, $this->get_item_schema()['properties']['template'] );
-		if ( is_wp_error( $is_valid ) ) {
-			unset( $request );
-
-			return $this;
-		}
+		add_filter( 'gfpdf_template_for_current_page', $current_template );
 
-		$this->set_template( $template );
+		$this->schema = null;
+		$schema       = $this->get_item_schema();
 
-		unset( $request );
+		remove_filter( 'gfpdf_template_for_current_page', $current_template );
 
-		return $this;
+		return $schema;
 	}
 
 	/**
 	 * Get the schema for a specific Template PDF
 	 *
 	 * @param array $settings
+	 * @param string $group
 	 *
 	 * @return array
 	 *
 	 * @since 6.12.0
 	 */
-	protected function get_section_schema( $settings ) {
+	protected function get_section_schema( $settings, $group ) {
 		$generic_description = __( 'Content for the specific property.', 'gravity-forms-pdf-extended' );
 
 		$schema = [];
@@ -927,11 +1014,13 @@ protected function get_section_schema( $settings ) {
 				'description' => ! empty( $value['desc'] ) ? wp_strip_all_tags( $value['desc'] ) : $generic_description,
 				'type'        => 'string',
 				'default'     => $default,
-				'context'     => [ 'edit' ],
+				'context'     => [ 'edit', $group ],
 				'arg_options' => [
 					'sanitize_callback' => function( $param, $request, $key ) {
 						return is_array( $param ) ? array_map( 'sanitize_text_field', $param ) : sanitize_text_field( $param );
 					},
+
+					'validate_callback' => 'rest_validate_request_arg',
 				],
 			];
 
@@ -961,8 +1050,18 @@ protected function get_section_schema( $settings ) {
 
 				case 'radio':
 				case 'select':
-					$schema[ $id ]['enum']                             = $this->misc->flatten_array( $value['options'] ?? [] );
 					$schema[ $id ]['arg_options']['sanitize_callback'] = 'rest_sanitize_request_arg';
+
+					if ( ! empty( $value['multiple'] ) ) {
+						/* multiselect field */
+						$schema[ $id ]['type']  = 'array';
+						$schema[ $id ]['items'] = [
+							'type' => 'string',
+							'enum' => $this->misc->flatten_array( $value['options'] ?? [] ),
+						];
+					} else {
+						$schema[ $id ]['enum'] = $this->misc->flatten_array( $value['options'] ?? [] );
+					}
 					break;
 
 				case 'textarea':
@@ -1011,43 +1110,34 @@ protected function get_section_schema( $settings ) {
 	}
 
 	/**
-	 * Get the current template's settings (if any)
+	 * Add links for PDF setting
 	 *
-	 * @param string $template
+	 * @param array $data
+	 * @param WP_REST_Request $request
 	 *
-	 * @return array
+	 * @return array[]
 	 *
 	 * @since 6.12.0
 	 */
-	protected function get_template_settings( string $template ): array {
-		$config = $this->templates->get_config_class( $template );
-
-		/** @var Model_Form_Settings $model */
-		$model = \GPDFAPI::get_mvc_class( 'Model_Form_Settings' );
+	protected function prepare_links( $data, $request ) {
 
-		$settings = $model->setup_custom_appearance_settings( $config );
+		$form_id  = $data['form'] ?? $request->get_param( 'form' );
+		$pdf_id   = $data['id'] ?? $request->get_param( 'pdf' );
+		$entry_id = $data['entry'] ?? $request->get_param( 'entry' );
 
-		return $settings;
-	}
+		if ( empty( $form_id ) || empty( $pdf_id ) ) {
+			return [];
+		}
 
-	/**
-	 * @param \WP_REST_Request $request
-	 * @param array            $data
-	 *
-	 * @return array[]
-	 *
-	 * @since 6.12.0
-	 */
-	protected function prepare_links( $request, $data ) {
 		$links = [
 			'self'       => [
-				'href' => rest_url( sprintf( '%s/%d/%s', static::NAMESPACE . static::API_BASE, $data['form'], $data['id'] ) ),
+				'href' => rest_url( sprintf( '%s/%d/%s', static::get_route_basepath(), $form_id, $pdf_id ) ),
 			],
 			'admin'      => [
-				'href' => admin_url( sprintf( 'admin.php?page=gf_edit_forms&view=settings&subview=PDF&id=%d&pid=%s', $data['form'], $data['id'] ) ),
+				'href' => admin_url( sprintf( 'admin.php?page=gf_edit_forms&view=settings&subview=PDF&id=%d&pid=%s', $form_id, $pdf_id ) ),
 			],
 			'collection' => [
-				'href' => rest_url( sprintf( '%s/%d', static::NAMESPACE . static::API_BASE, $data['form'] ) ),
+				'href' => rest_url( sprintf( '%s/%d', static::get_route_basepath(), $form_id ) ),
 			],
 		];
 
@@ -1062,10 +1152,17 @@ protected function prepare_links( $request, $data ) {
 		}
 
 		$links['form'] = [
-			'href'       => rest_url( sprintf( 'gf/v2/forms/%d', $data['form'] ) ),
+			'href'       => rest_url( sprintf( 'gf/v2/forms/%d', $form_id ) ),
 			'embeddable' => true,
 		];
 
+		if ( ! empty( $entry_id ) ) {
+			$links['entry'] = [
+				'href'       => rest_url( sprintf( 'gf/v2/entries/%d', $entry_id ) ),
+				'embeddable' => true,
+			];
+		}
+
 		return $links;
 	}
 
@@ -1074,7 +1171,8 @@ protected function prepare_links( $request, $data ) {
 	 *
 	 * So merge tags can be used inside HTML attributes (like src="{tag:20}"), but the rich editor content
 	 * can still be sanitized, we'll replace the opening { tag with a valid protocol that isn't very common.
-	 * Doing this ensures the merge tag does not get malformed during sanitizing.
+	 * Doing this ensures the merge tag does not get malformed during initial sanitizing. Once the merge tags
+	 * are replaced, the values will be sanitized again before display.
 	 *
 	 * @param string $html
 	 *
@@ -1088,9 +1186,9 @@ protected function sanitize_rich_text( $html ) {
 		}
 
 		$pattern = '([^{]*?})';
-		$html   = preg_replace( "/=\"\{$pattern\"/mi", '="telnet://$1"', $html );
-		$html   = Kses::parse( $html );
-		$html   = preg_replace( "/=\"telnet:\/\/$pattern\"/mi", '="{$1"', $html );
+		$html    = preg_replace( "/=\"\{$pattern\"/mi", '="telnet://$1"', $html );
+		$html    = Kses::parse( $html );
+		$html    = preg_replace( "/=\"telnet:\/\/$pattern\"/mi", '="{$1"', $html );
 
 		return $html;
 	}
@@ -1099,7 +1197,7 @@ protected function sanitize_rich_text( $html ) {
 	 * Check if the schema item is of a specific type
 	 *
 	 * @param string|array $type
-	 * @param string|array  $property
+	 * @param string|array $property
 	 *
 	 * @return bool
 	 */
diff --git a/src/Rest/Rest_Pdf_Preview.php b/src/Rest/Rest_Pdf_Preview.php
new file mode 100644
index 000000000..9bf6bffa6
--- /dev/null
+++ b/src/Rest/Rest_Pdf_Preview.php
@@ -0,0 +1,136 @@
+<?php
+
+namespace GFPDF\Rest;
+
+use GFPDF\Model\Model_PDF;
+use WP_REST_Server;
+
+/**
+ * @package     Gravity PDF
+ * @copyright   Copyright (c) 2024, Blue Liquid Designs
+ * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ */
+
+/* Exit if accessed directly */
+if ( ! defined( 'ABSPATH' ) ) {
+	exit;
+}
+
+/**
+ * @since 6.12
+ */
+class Rest_Pdf_Preview extends Rest_Form_Settings {
+
+	/**
+	 * @var string[]
+	 * @since 6.12
+	 */
+	public static $endpoints = [
+		'pdf-settings-preview' => self::API_BASE . '/(?P<form>[\d]+)/preview',
+	];
+
+	/**
+	 * Registers the routes for this endpoint
+	 *
+	 * @return void
+	 * @since 6.12.0
+	 */
+	public function register_routes() {
+
+		register_rest_route(
+			static::NAMESPACE,
+			static::$endpoints['pdf-settings-preview'],
+			[
+				'args'   => [
+					'form'  => [
+						'description'       => __( 'The unique identifier for the Gravity Forms form.', 'gravity-forms-pdf-extended' ),
+						'type'              => 'integer',
+						'required'          => true,
+						'validate_callback' => [ $this, 'check_form_is_valid' ],
+					],
+
+					'entry' => [
+						'description'       => __( 'The unique identifier for the Gravity Forms entry.', 'gravity-forms-pdf-extended' ),
+						'type'              => 'integer',
+						'required'          => false,
+						'validate_callback' => [ $this, 'check_entry_is_valid' ],
+					],
+				],
+
+				[
+					'methods'             => WP_REST_Server::CREATABLE,
+					'callback'            => [ $this, 'create_item' ],
+					'permission_callback' => [ $this, 'create_item_permissions_check' ],
+					'args'                => $this->get_endpoint_args_for_item_schema( WP_REST_Server::CREATABLE ),
+				],
+
+				'schema' => [ $this, 'get_public_item_schema' ],
+			],
+			true
+		);
+	}
+
+	/**
+	 * Take the current PDF settings and generate a PDF Preview
+	 *
+	 * @param \WP_REST_Request $request
+	 *
+	 * @return \WP_Error|null
+	 *
+	 * @since 6.12
+	 */
+	public function create_item( $request ) {
+		$form  = \GFAPI::get_form( $request->get_param( 'form' ) );
+		$entry = $this->get_entry( $request, $form );
+
+		/* Prepare request for previewing */
+		$request->set_param( 'context', 'edit' );
+		$request->set_param( 'password', '' );
+
+		$pdf_settings       = $this->prepare_item_for_database( $request );
+		$pdf_settings['id'] = uniqid( 'review' );
+
+		/* Generate the PDF */
+		/** @var Model_PDF $pdf_model */
+		$pdf_model = \GPDFAPI::get_pdf_class( 'model' );
+
+		$pdf_path = $pdf_model->generate_and_save_pdf( $entry, $pdf_settings );
+		if ( is_wp_error( $pdf_path ) ) {
+			return $pdf_path;
+		}
+
+		/* Sends the PDF to browser, or return WP_Error */
+		return $pdf_model->send_pdf_to_browser( $pdf_path );
+	}
+
+	/**
+	 * Get a Gravity Forms Entry object
+	 *
+	 * @param \WP_REST_Request $request
+	 * @param array $form
+	 *
+	 * @return array|\WP_Error
+	 */
+	protected function get_entry( $request, $form ) {
+		/* user requested a specific entry to preview */
+		if ( $request->get_param( 'entry' ) ) {
+			return \GFAPI::get_entry( $request->get_param( 'entry' ) );
+		}
+
+		/* try to get the last form submission */
+		$latest_entry = \GFAPI::get_entries(
+			$form['id'],
+			[ 'status' => 'active' ],
+			null,
+			[ 'page_size' => 1 ]
+		);
+
+		if ( ! is_wp_error( $latest_entry ) && isset( $latest_entry[0] ) ) {
+			return $latest_entry[0];
+		}
+
+		/* fallback to a blank entry */
+
+		return \GFFormsModel::create_lead( $form );
+	}
+}
diff --git a/src/View/html/FormSettings/add_edit.php b/src/View/html/FormSettings/add_edit.php
index 0adeb5077..ea4c09590 100644
--- a/src/View/html/FormSettings/add_edit.php
+++ b/src/View/html/FormSettings/add_edit.php
@@ -54,15 +54,25 @@ class="gform_settings_form <?php echo esc_attr( $args['form_classes'] ); ?>">
 	}
 	?>
 
-	<div id="submit-and-promo-container">
-		<input type="submit" name="submit" id="submit" value="<?php echo esc_attr( $args['button_label'] ); ?>" class="button primary large">
+	<footer class="form-action-toolbar">
+		<div>
+			<input type="submit"
+				   name="submit"
+				   value="<?php echo esc_attr( $args['button_label'] ); ?>"
+				   class="button primary large" />
+
+			<input type="button"
+				   name="gpdf-preview-pdf-settings"
+				   value="<?php echo esc_attr__( 'Preview PDF', 'gravity-forms-pdf-extended' ); ?>"
+				   class="button large" />
+		</div>
 
 		<div class="extensions-upsell">
 			<a href="https://gravitypdf.com/store/">
 				<?php esc_html_e( 'Want more features? Take a look at our addons.', 'gravity-forms-pdf-extended' ); ?>
 			</a>
 		</div>
-	</div>
+	</footer>
 </form>
 
 <?php GFFormSettings::page_footer(); ?>
diff --git a/src/assets/js/admin/helper/spinner.js b/src/assets/js/admin/helper/spinner.js
index c68225cb5..25d703cf8 100644
--- a/src/assets/js/admin/helper/spinner.js
+++ b/src/assets/js/admin/helper/spinner.js
@@ -1,6 +1,8 @@
 import $ from 'jquery'
 
 export function spinner (classname) {
-  const $spinner = $('<img alt=' + GFPDF.spinnerAlt + ' src=' + GFPDF.spinnerUrl + ' class=' + classname + ' />')
-  return $spinner
+  return $('<img />')
+    .attr('alt', GFPDF.spinnerAlt)
+    .attr('src', GFPDF.spinnerUrl)
+    .addClass(classname)
 }
diff --git a/src/assets/js/admin/settings/common/setupDynamicTemplateFields.js b/src/assets/js/admin/settings/common/setupDynamicTemplateFields.js
index 79e397af1..7683a906a 100644
--- a/src/assets/js/admin/settings/common/setupDynamicTemplateFields.js
+++ b/src/assets/js/admin/settings/common/setupDynamicTemplateFields.js
@@ -5,7 +5,7 @@ import { loadTinyMCEEditor } from './dynamicTemplateFields/loadTinyMCEEditor'
 import { initialiseCommonElements } from './initialiseCommonElements'
 import { doMergetags } from './dynamicTemplateFields/doMergetags'
 import { toggleFontAppearance } from '../pdf/toggleFontAppearance'
-import { insertAfter } from '../../../react/utilities/PdfSettings/addEditButton'
+import { insertAfter } from '../../../react/utilities/PdfSettings/actionToolbar'
 
 /**
  * PDF Templates can assign their own custom settings which can enhance a template
@@ -31,7 +31,7 @@ export function setupDynamicTemplateFields () {
     }
 
     ajaxCall(data, function (response) {
-      const addEditButton = $('.submit-container-2')[0]
+      const actionToolbar = $('.form-action-toolbar-2')[0]
 
       /* Remove our UI loader */
       $spinner.remove()
@@ -54,9 +54,9 @@ export function setupDynamicTemplateFields () {
           }
         })
 
-        /* Add floating Add/Edit PDF button */
-        if (!addEditButton) {
-          insertAfter($('#gfpdf-fieldset-gfpdf_form_settings_template')[0], $('#gfpdf_pdf_form')[0], '2')
+        /* Add action toolbar after template section */
+        if (!actionToolbar) {
+          insertAfter($('#gfpdf-fieldset-gfpdf_form_settings_template')[0], $('#gfpdf_pdf_form')[0], '2', true)
         }
 
         /* Replace the custom appearance with the AJAX response fields */
@@ -74,8 +74,8 @@ export function setupDynamicTemplateFields () {
         gform_initialize_tooltips()
       } else {
         /* Remove floating Add/Edit PDF button */
-        if (addEditButton) {
-          addEditButton.remove()
+        if (actionToolbar) {
+          actionToolbar.remove()
         }
 
         /* Hide our template nav item as there are no fields and clear our the HTML */
diff --git a/src/assets/js/react/api/preview.js b/src/assets/js/react/api/preview.js
new file mode 100644
index 000000000..a748013eb
--- /dev/null
+++ b/src/assets/js/react/api/preview.js
@@ -0,0 +1,83 @@
+import { api } from './api'
+
+/**
+ * @package     Gravity PDF
+ * @copyright   Copyright (c) 2024, Blue Liquid Designs
+ * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ */
+
+/**
+ * A cache of template schema data, grouped by form
+ * @type {object}
+ */
+const templateSchema = {}
+
+/**
+ * Get template schema data
+ *
+ * @param {int} formId
+ * @param {string} template
+ * @returns {object} Template Schema data
+ *
+ * @since 6.12
+ */
+export async function getTemplateSchema (formId, template) {
+  // add formId key to cache
+  if (!templateSchema[formId]) {
+    templateSchema[formId] = {}
+  }
+
+  // return cached schema
+  if (templateSchema[formId][template]) {
+    return templateSchema[formId][template]
+  }
+
+  const url = GFPDF.restUrl + 'form/' + encodeURIComponent(formId) + '/schema/?template=' + encodeURIComponent(template)
+  const response = await api(url, {
+    method: 'GET',
+    headers: {
+      'X-WP-Nonce': GFPDF.restNonce
+    }
+  })
+
+  try {
+    if (!response.ok) {
+      throw new Error(await response.json())
+    }
+
+    templateSchema[formId][template] = await response.json()
+
+    return templateSchema[formId][template]
+  } catch (e) {
+    console.error(e)
+  }
+}
+
+/**
+ * Generate a PDF Preview using the defined PDF settings
+ *
+ * @param {FormData} formData
+ * @returns {Blob|null}
+ *
+ * @since 6.12
+ */
+export async function getPdfPreview (formData) {
+  const url = GFPDF.restUrl + 'form/' + encodeURIComponent(formData.get('form')) + '/preview'
+  const response = await api(url, {
+    method: 'POST',
+    headers: {
+      'X-WP-Nonce': GFPDF.restNonce
+    },
+    body: formData
+  })
+
+  try {
+    if (!response.ok) {
+      throw new Error(await response.json())
+    }
+
+    return await response.blob()
+  } catch (e) {
+    console.error(e)
+  }
+}
diff --git a/src/assets/js/react/bootstrap/templateBootstrap.js b/src/assets/js/react/bootstrap/templateBootstrap.js
index e7b9e93bc..e0a340afe 100644
--- a/src/assets/js/react/bootstrap/templateBootstrap.js
+++ b/src/assets/js/react/bootstrap/templateBootstrap.js
@@ -132,7 +132,6 @@ export function templateChangeStoreListener (store, $templateField) {
         $templateField
           .html(updateSelectBoxText)
           .val(store.getState().template.activeTemplate)
-          .trigger('chosen:updated')
       }))
     }
   }))
diff --git a/src/assets/js/react/gfpdf-main.js b/src/assets/js/react/gfpdf-main.js
index 7d2a1b283..bc9bd56a0 100644
--- a/src/assets/js/react/gfpdf-main.js
+++ b/src/assets/js/react/gfpdf-main.js
@@ -1,14 +1,12 @@
-/* Dependencies */
 import $ from 'jquery'
-/* Bootstrap */
 import { templateBootstrap } from './bootstrap/templateBootstrap'
 import { fontManagerBootstrap } from './bootstrap/fontManagerBootstrap'
 import coreFontBootstrap from './bootstrap/coreFontBootstrap'
 import helpBootstrap from './bootstrap/helpBootstrap'
-/* Utilities */
-import { addEditButton } from './utilities/PdfSettings/addEditButton'
+import { actionToolbar } from './utilities/PdfSettings/actionToolbar'
 import shortcodeButton from './utilities/PdfList/shortcodeButton'
-/* Sass Styling */
+import previewButton from './utilities/PdfSettings/previewButton'
+import unsavedChangesWarning from './utilities/PdfSettings/unsavedChangesWarning'
 import '../../scss/gfpdf-styles.scss'
 
 /**
@@ -61,11 +59,11 @@ $(function () {
   }
 
   const fmGeneralSettingsTab = document.querySelector('#gfpdf-settings-field-wrapper-default_font select')
-  const fmToolsTab = document.querySelector('#gfpdf-settings-field-wrapper-manage_fonts')
+  const fmToolsTab = document.getElementById('gfpdf-settings-field-wrapper-manage_fonts')
   const fmPdfSettings = document.querySelector('#gfpdf-settings-field-wrapper-font select')
-  const pdfSettingsForm = document.querySelector('#gfpdf_pdf_form')
+  const pdfSettingsForm = document.getElementById('gfpdf_pdf_form')
   const pdfSettingFieldSets = document.querySelectorAll('fieldset.gform-settings-panel--full')
-  const gfPdfListForm = document.querySelector('form#gfpdf_list_form')
+  const gfPdfListForm = document.getElementById('gfpdf_list_form')
 
   /* Initialize font manager under general settings tab */
   if (fmGeneralSettingsTab !== null) {
@@ -82,9 +80,16 @@ $(function () {
     fontManagerBootstrap(fmPdfSettings)
   }
 
-  /* Initialize additional add/update buttons on PDF setting panels */
-  if (pdfSettingsForm && pdfSettingFieldSets.length === 4) {
-    addEditButton(pdfSettingFieldSets, pdfSettingsForm)
+  /* Adding / Updating form PDF settings */
+  if (pdfSettingsForm) {
+    /* Initialize the PDF Preview button */
+    previewButton()
+
+    /* Initialize additional add/update/preview buttons on PDF setting panels */
+    actionToolbar(pdfSettingFieldSets, pdfSettingsForm)
+
+    /* Watch for unsaved changes */
+    unsavedChangesWarning(pdfSettingsForm)
   }
 
   /* Enable shortcode field click and auto select feature */
diff --git a/src/assets/js/react/utilities/PdfSettings/addEditButton.js b/src/assets/js/react/utilities/PdfSettings/actionToolbar.js
similarity index 52%
rename from src/assets/js/react/utilities/PdfSettings/addEditButton.js
rename to src/assets/js/react/utilities/PdfSettings/actionToolbar.js
index 3e9abb2aa..0ffb50309 100644
--- a/src/assets/js/react/utilities/PdfSettings/addEditButton.js
+++ b/src/assets/js/react/utilities/PdfSettings/actionToolbar.js
@@ -1,4 +1,16 @@
-export function addEditButton (pdfSettingFieldSets, form) {
+/**
+ * @package     Gravity PDF
+ * @copyright   Copyright (c) 2024, Blue Liquid Designs
+ * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ */
+
+/**
+ * Clone action toolbar below each fieldset if it is enabled
+ *
+ * @param {Element} pdfSettingFieldSets
+ * @param {Element} form
+ */
+export function actionToolbar (pdfSettingFieldSets, form) {
   const items = Array.from(pdfSettingFieldSets)
   /* Remove last element of the array */
   items.pop()
@@ -18,18 +30,16 @@ export function addEditButton (pdfSettingFieldSets, form) {
 }
 
 export function insertAfter (fieldset, form, index, firstLoad) {
-  const wrapperClass = 'submit-container-' + index
+  const wrapperClass = 'form-action-toolbar-' + index
 
   if (!fieldset.classList.contains('gform-settings-panel--collapsed')) {
-    const submitButton = form.querySelector('#submit')
-    const submitButtonClone = submitButton.cloneNode(true)
-    submitButtonClone.setAttribute('id', ('submit_' + index))
+    // get the original toolbar
+    const actionToolbar = form.querySelector('.form-action-toolbar:last-of-type')
+    const actionToolbarClone = actionToolbar.cloneNode(true)
 
-    const wrapper = document.createElement('div')
-    wrapper.setAttribute('class', wrapperClass)
-    wrapper.innerHTML = submitButtonClone.outerHTML
+    actionToolbarClone.classList.add(wrapperClass)
 
-    return fieldset.parentNode.insertBefore(wrapper, fieldset.nextSibling)
+    return fieldset.parentNode.insertBefore(actionToolbarClone, fieldset.nextSibling)
   }
 
   if (firstLoad) {
diff --git a/src/assets/js/react/utilities/PdfSettings/formSettings.js b/src/assets/js/react/utilities/PdfSettings/formSettings.js
new file mode 100644
index 000000000..02ce1775e
--- /dev/null
+++ b/src/assets/js/react/utilities/PdfSettings/formSettings.js
@@ -0,0 +1,145 @@
+import $ from 'jquery'
+
+/**
+ * @package     Gravity PDF
+ * @copyright   Copyright (c) 2024, Blue Liquid Designs
+ * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ */
+
+/**
+ * Prepare form inputs for use with Gravity PDF Form Settings API
+ * @returns {FormData}
+ *
+ * @since 6.12
+ */
+export function getCurrentPdfSettingsForApi (schema) {
+  let formData = new FormData()
+
+  // loop over the schema and get the values
+  for (const [key, property] of Object.entries(schema.properties)) {
+    // ignore readonly fields
+    if (property.readonly) {
+      continue
+    }
+
+    // if not matching DOM node, skip
+    const propertyNodes = document.querySelectorAll('[name^="gfpdf_settings[' + key + ']"]')
+    if (propertyNodes.length === 0) {
+      continue
+    }
+
+    // loop over matching HTML tags
+    for (const input of propertyNodes.values()) {
+      // add field data based on schema and input types
+      switch (property.type) {
+        case 'boolean':
+          formData.set(key, input.checked)
+          break
+
+        case 'array':
+          // handle individual checkboxes
+          if (input.type === 'checkbox' && input.checked) {
+            formData.append(key + '[]', input.value)
+          }
+
+          // Add all checked multiselect options
+          if (input.nodeName === 'SELECT' && input.multiple) {
+            for (const option of input.querySelectorAll('option:checked').values()) {
+              formData.append(key + '[]', option.value)
+            }
+          }
+          break
+
+        case 'string':
+        case 'number':
+        case 'integer':
+          // skip checkbox or radio fields that are not checked
+          if (['checkbox', 'radio'].includes(input.type) && !input.checked) {
+            continue
+          }
+
+          formData.set(key, input.value)
+
+          break
+      }
+    }
+  }
+
+  /**
+   * Manipulate the formData before sending to the PDF Preview API
+   *
+   * @param {FormData} formData The constructed Previewer API PDF settings
+   * @param {object} schema Valid Preview API schema for the current template
+   *
+   * @since 6.12
+   */
+  formData = gform.applyFilters('gfpdf_preview_settings', formData, schema)
+
+  return formData
+}
+
+/**
+ * Handle custom Paper Size for Preview API
+ */
+gform.addFilter('gfpdf_preview_settings', (formData, schema) => {
+  // Fix custom paper size (the API uses a structured object instead of an array)
+  if (!schema.properties.custom_pdf_size || formData.get('pdf_size') !== 'CUSTOM') {
+    return formData
+  }
+
+  formData.set('custom_pdf_size[width]', document.getElementById('gfpdf_settings[custom_pdf_size]_width').value)
+  formData.set('custom_pdf_size[height]', document.getElementById('gfpdf_settings[custom_pdf_size]_height').value)
+  formData.set('custom_pdf_size[unit]', document.getElementById('gfpdf_settings[custom_pdf_size]_measurement')
+    .value
+    .replace('millimeters', 'mm')
+    .replace('inches', 'in'))
+
+  return formData
+})
+
+/**
+ * Turn off conditional logic for PDF preview
+ */
+gform.addFilter('gfpdf_preview_settings', (formData, schema) => {
+  formData.delete('conditional')
+  formData.delete('conditionalLogic')
+
+  return formData
+})
+
+/**
+ * Unset the Label / Filename if empty for PDF Preview
+ * The default value set in the schema will be used instead
+ */
+gform.addFilter('gfpdf_preview_settings', (formData, schema) => {
+  if (formData.get('name') === '') {
+    formData.delete('name')
+  }
+
+  if (formData.get('filename') === '') {
+    formData.delete('filename')
+  }
+
+  return formData
+})
+
+/**
+ * Trigger the submit events on the form so fields can save their data
+ * but cancel the event before the browser actually posts the form data
+ *
+ * @param formId
+ *
+ * @since 6.12
+ */
+export function triggerFakeFormSubmit (formId) {
+  const form = document.getElementById(formId)
+  const formListener = (event) => event.preventDefault()
+
+  form.addEventListener('submit', formListener)
+
+  // trigger native submit and jQuery submit (two independent event systems)
+  $('#' + formId).trigger('submit')
+  form.requestSubmit()
+
+  form.removeEventListener('submit', formListener)
+}
diff --git a/src/assets/js/react/utilities/PdfSettings/previewButton.js b/src/assets/js/react/utilities/PdfSettings/previewButton.js
new file mode 100644
index 000000000..e47583f78
--- /dev/null
+++ b/src/assets/js/react/utilities/PdfSettings/previewButton.js
@@ -0,0 +1,60 @@
+import { getPdfPreview, getTemplateSchema } from '../../api/preview'
+import { getCurrentPdfSettingsForApi, triggerFakeFormSubmit } from './formSettings'
+import { viewFile } from '../download'
+import { spinner } from '../../../admin/helper/spinner'
+import $ from 'jquery'
+
+/**
+ * @package     Gravity PDF
+ * @copyright   Copyright (c) 2024, Blue Liquid Designs
+ * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ */
+
+/**
+ * Setup PDF Preview functionality in PDF settings
+ *
+ * @since 6.12
+ */
+export default function () {
+  // capture bubbled click event for the Preview buttons on the form
+  document.getElementById('gfpdf_pdf_form').addEventListener('click', async function (e) {
+    // ignore if wasn't triggered by Preview field
+    if (e.target.name !== 'gpdf-preview-pdf-settings') {
+      return
+    }
+
+    e.preventDefault()
+    e.stopImmediatePropagation()
+
+    const $spinner = spinner('gfpdf-spinner-template')
+    $(e.target).after($spinner)
+
+    // save JS-powered field data
+    triggerFakeFormSubmit('gfpdf_pdf_form')
+
+    // get the current template schema
+    const template = document.getElementById('gfpdf_settings[template]').value
+    const templateSchema = await getTemplateSchema(form.id, template)
+    if (!templateSchema) {
+      $spinner.remove()
+      window.alert(GFPDF.getPreviewResultError)
+      return
+    }
+
+    // get the current PDF settings
+    const formData = getCurrentPdfSettingsForApi(templateSchema)
+    formData.append('form', form.id)
+
+    // generate PDF preview
+    const pdfBlob = await getPdfPreview(formData)
+    if (!pdfBlob) {
+      $spinner.remove()
+      window.alert(GFPDF.getPreviewResultError)
+      return
+    }
+
+    $spinner.remove()
+
+    viewFile(pdfBlob)
+  })
+}
diff --git a/src/assets/js/react/utilities/PdfSettings/unsavedChangesWarning.js b/src/assets/js/react/utilities/PdfSettings/unsavedChangesWarning.js
new file mode 100644
index 000000000..351163c52
--- /dev/null
+++ b/src/assets/js/react/utilities/PdfSettings/unsavedChangesWarning.js
@@ -0,0 +1,29 @@
+/**
+ * @package     Gravity PDF
+ * @copyright   Copyright (c) 2024, Blue Liquid Designs
+ * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ */
+
+/**
+ * Track form changes and display an alert if the user has unsaved changes
+ * when navigating away from that form
+ *
+ * @param {Element} form
+ */
+export default function (form) {
+  const beforeUnloadHandler = e => e.preventDefault()
+
+  /* Add alert if form is modified but not saved */
+  form.addEventListener('change', () => {
+    window.addEventListener('beforeunload', beforeUnloadHandler)
+  })
+
+  /* Remove alert when doing form submission with a valid submitter (and not a simulated submit) */
+  form.addEventListener('submit', (e) => {
+    if (e.submitter === null) {
+      return
+    }
+
+    window.removeEventListener('beforeunload', beforeUnloadHandler)
+  })
+}
diff --git a/src/assets/js/react/utilities/download.js b/src/assets/js/react/utilities/download.js
new file mode 100644
index 000000000..9bc536ac4
--- /dev/null
+++ b/src/assets/js/react/utilities/download.js
@@ -0,0 +1,22 @@
+/**
+ * Open the file in a new window
+ * @param {File|Blob|MediaSource} file
+ */
+export function viewFile (file) {
+  // Create a link and set the URL using `createObjectURL`
+  const link = document.createElement('a')
+  link.style.display = 'none'
+  link.href = URL.createObjectURL(file)
+  link.target = 'gravity-pdf-preview'
+
+  // It needs to be added to the DOM so it can be clicked
+  document.body.appendChild(link)
+  link.click()
+
+  // To make this work on Firefox we need to wait
+  // a little while before removing it.
+  setTimeout(() => {
+    URL.revokeObjectURL(link.href)
+    link.parentNode.removeChild(link)
+  }, 0)
+}
diff --git a/src/assets/scss/Component/_submit.scss b/src/assets/scss/Component/_submit.scss
index 53a7c531d..b5197c032 100644
--- a/src/assets/scss/Component/_submit.scss
+++ b/src/assets/scss/Component/_submit.scss
@@ -1,5 +1,5 @@
 #tab_PDF {
-  #submit-and-promo-container {
+  .form-action-toolbar {
     display: flex;
     justify-content: space-between;
     margin-top: 0.5rem;
diff --git a/src/assets/scss/MediaQueries/_min-782.scss b/src/assets/scss/MediaQueries/_min-782.scss
new file mode 100644
index 000000000..9a5379603
--- /dev/null
+++ b/src/assets/scss/MediaQueries/_min-782.scss
@@ -0,0 +1,24 @@
+/* 782px and below */
+@media only screen and (max-width: 782px) {
+  .gfpdf-page {
+    /* Hide navigation label for small screens, but not from screen readers */
+    .gform-settings__wrapper {
+      grid-template-columns: 3.175rem auto;
+    }
+
+    .gform-settings__navigation {
+      .label {
+        border: 0;
+        clip: rect(1px, 1px, 1px, 1px);
+        clip-path: inset(50%);
+        height: 1px;
+        margin: -1px;
+        overflow: hidden;
+        padding: 0;
+        position: absolute;
+        width: 1px;
+        word-wrap: normal !important;
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/assets/scss/Pages/_pdf-settings.scss b/src/assets/scss/Pages/_pdf-settings.scss
index b006e2bec..4540174b2 100644
--- a/src/assets/scss/Pages/_pdf-settings.scss
+++ b/src/assets/scss/Pages/_pdf-settings.scss
@@ -1,9 +1,14 @@
 #tab_PDF {
 
-  /* Fieldsets (General, Appearance, Template, Advanced) */
+  // Large buttons
+  .button.large {
+    height: initial;
+  }
+
+  // Fieldsets (General, Appearance, Template, Advanced)
   .gform_settings_form {
 
-    /* Conditional Logic */
+    // Conditional Logic
     button {
       &.add_field_choice, &.delete_field_choice {
         max-width: 18px;
@@ -11,7 +16,7 @@
       }
     }
 
-    /* Merge tag box */
+    // Merge tag box
     .all-merge-tags {
       &.textarea {
         .tooltip-merge-tag {
@@ -41,7 +46,7 @@
     }
   }
 
-  /* GF 2.6 UI updates */
+  // GF 2.6 UI updates
   .gfpdf-gf-2-6 {
     .gfpdf-settings-field-wrapper {
       .wp-editor-wrap {
diff --git a/src/assets/scss/gfpdf-styles.scss b/src/assets/scss/gfpdf-styles.scss
index 65a1af65e..e6d499e00 100644
--- a/src/assets/scss/gfpdf-styles.scss
+++ b/src/assets/scss/gfpdf-styles.scss
@@ -32,6 +32,7 @@
 @use 'Pages/pdf-settings';
 
 /* Media queries */
+@use 'MediaQueries/min-782';
 @use 'MediaQueries/min-961';
 @use 'MediaQueries/min-1200';
 
diff --git a/src/bootstrap.php b/src/bootstrap.php
index f0851c12a..c78969758 100644
--- a/src/bootstrap.php
+++ b/src/bootstrap.php
@@ -215,7 +215,7 @@ public function init() {
 		$this->upgrade_routine();
 		$this->gf_settings();
 		$this->gf_form_settings();
-		$this->gf_form_settings_rest_api();
+		$this->rest_api();
 		$this->pdf();
 		$this->shortcodes();
 		$this->mergetags();
@@ -364,7 +364,7 @@ public function register_assets() {
 	 *
 	 */
 	private function register_styles() {
-		$version = PDF_EXTENDED_VERSION;
+		$version = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG === true ) ? time() : PDF_EXTENDED_VERSION;
 
 		wp_register_style( 'gfpdf_css_styles', PDF_PLUGIN_URL . 'dist/assets/css/gfpdf-styles.min.css', [ 'wp-color-picker', 'wp-jquery-ui-dialog' ], $version );
 	}
@@ -377,7 +377,7 @@ private function register_styles() {
 	 *
 	 */
 	private function register_scripts() {
-		$version = PDF_EXTENDED_VERSION;
+		$version = ( defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG === true ) ? time() : PDF_EXTENDED_VERSION;
 
 		$pdf_settings_dependencies = [
 			'jquery-ui-tooltip',
@@ -691,16 +691,39 @@ public function gf_form_settings() {
 	}
 
 	/**
-	 * Register Form PDF Rest API (CRUD)
+	 * Register Rest API
 	 *
 	 * @since 6.12.0
 	 */
-	public function gf_form_settings_rest_api() {
-		$controller = new Controller\Controller_Form_Settings_Rest_Api( $this->options, $this->gform, $this->misc, $this->templates );
-		$controller->init();
+	public function rest_api() {
+		$form_setting_controller = new Rest\Rest_Form_Settings( $this->options, $this->gform, $this->misc, $this->templates );
+		$form_setting_controller->init();
+
+		$pdf_preview_controller = new Rest\Rest_Pdf_Preview( $this->options, $this->gform, $this->misc, $this->templates );
+		$pdf_preview_controller->init();
 
 		/* Add to our singleton controller */
-		$this->singleton->add_class( $controller );
+		$this->singleton->add_class( $form_setting_controller );
+		$this->singleton->add_class( $pdf_preview_controller );
+
+		/* Log any errors for PDF endpoints */
+		$rest_request_after_callback = function( $response, $handle, $request ) {
+			if ( is_wp_error( $response ) && strpos( $request->get_route(), '/gravity-pdf' ) === 0 ) {
+				$this->log->error(
+					'The REST API request generated an error: ' . $request->get_route(),
+					[
+						'message' => $response->get_error_message(),
+						'code'    => $response->get_error_code(),
+						'method'  => $request->get_method(),
+						'params'  => $request->get_params(),
+					]
+				);
+			}
+
+			return $response;
+		};
+
+		add_filter( 'rest_request_after_callbacks', $rest_request_after_callback, 10, 3 );
 	}
 
 	/**
diff --git a/tests/e2e/advanced-checks/pdf-preview.test.js b/tests/e2e/advanced-checks/pdf-preview.test.js
new file mode 100644
index 000000000..f2e1ffd9b
--- /dev/null
+++ b/tests/e2e/advanced-checks/pdf-preview.test.js
@@ -0,0 +1,27 @@
+import Pdf from '../utilities/page-model/helpers/pdf'
+import { RequestLogger } from 'testcafe'
+
+const run = new Pdf()
+const downloadLogger = RequestLogger(null, { logResponseBody: true, logResponseHeaders: true })
+
+fixture`PDF Preview test`
+
+test('should open PDF preview in new tab', async t => {
+  // Actions
+  await run.addNewPdf(1)
+
+  downloadLogger.clear()
+
+  // Assertions
+  await t
+    .addRequestHooks(downloadLogger)
+    .click(run.previewSettings)
+    .wait(500)
+    .removeRequestHooks(downloadLogger)
+
+  await t
+    .expect(downloadLogger.contains(r => r.request.url.endsWith('gravity-pdf/v1/form/1/schema/?template=zadani'))).ok()
+    .expect(downloadLogger.contains(r => r.request.url.endsWith('gravity-pdf/v1/form/1/preview'))).ok()
+    .expect(downloadLogger.contains(r => r.response.headers['content-disposition'] === 'inline; filename="document.pdf"; filename*=utf-8\'\'document.pdf')).ok()
+    .expect(downloadLogger.contains(r => r.response.headers['content-type'] === 'application/pdf')).ok()
+})
diff --git a/tests/e2e/utilities/page-model/helpers/advanced-check.js b/tests/e2e/utilities/page-model/helpers/advanced-check.js
index de93fa63f..a41162cfb 100644
--- a/tests/e2e/utilities/page-model/helpers/advanced-check.js
+++ b/tests/e2e/utilities/page-model/helpers/advanced-check.js
@@ -44,7 +44,7 @@ class AdvancedCheck {
     this.addNewButton = Selector('.tablenav').find('a').withText('Add New')
     this.pdfLabelNameInputBox = Selector('#gfpdf-fieldset-gfpdf_form_settings_general').find('[id="gfpdf_settings[name]"]')
     this.pdfFilenameInputBox = Selector('#gfpdf-fieldset-gfpdf_form_settings_general').find('[id="gfpdf_settings[filename]"]')
-    this.addUpdatePdfButton = Selector('#submit-and-promo-container').find('[id="submit"]')
+    this.addUpdatePdfButton = Selector('[name="submit"]')
     this.templateItem = Selector('#the-list').find('tr')
     this.pdfListSection = Selector('.gform-settings__navigation').find('a').withText('PDF')
     this.toggleSwitch = Selector('#the-list').find('.check-column button')
diff --git a/tests/e2e/utilities/page-model/helpers/pdf.js b/tests/e2e/utilities/page-model/helpers/pdf.js
index 8d166ddd6..09d79a7cb 100644
--- a/tests/e2e/utilities/page-model/helpers/pdf.js
+++ b/tests/e2e/utilities/page-model/helpers/pdf.js
@@ -5,7 +5,9 @@ import { selectBox } from './field'
 class Pdf {
   constructor () {
     this.template = Selector('.alternate')
-    this.saveSettings = Selector('#submit-and-promo-container').find('input')
+    this.saveSettings = Selector('[name="submit"]')
+    this.previewSettings = Selector('[name="gpdf-preview-pdf-settings"]')
+    this.addNewButton = Selector('#tab_PDF a').withText('Add New')
 
     // General - Template field
     this.templateSelectBox = selectBox('gfpdf_settings_template large', 'gfpdf_settings[template]')
@@ -140,6 +142,11 @@ class Pdf {
       .setNativeDialogHandler(() => true)
       .navigateTo(`${baseURL}/wp-admin/admin.php?page=${uri}`)
   }
+
+  async addNewPdf (formId) {
+    await this.navigate('gf_edit_forms&view=settings&subview=PDF&id=' + formId)
+    await t.click(this.addNewButton)
+  }
 }
 
 export default Pdf
diff --git a/tests/e2e/utilities/page-model/tabs/general-settings.js b/tests/e2e/utilities/page-model/tabs/general-settings.js
index af6013314..7100a8427 100644
--- a/tests/e2e/utilities/page-model/tabs/general-settings.js
+++ b/tests/e2e/utilities/page-model/tabs/general-settings.js
@@ -53,7 +53,7 @@ class General {
     this.testTemplateDetailsLink = Selector('.theme[data-slug="test-template"]').find('span').withText('Template Details')
 
     this.addNewTemplate = Selector('input').withAttribute('type', 'file')
-    this.saveSettings = Selector('#submit-and-promo-container').find('input')
+    this.saveSettings = Selector('[name="submit"]')
 
     // PDF entries section
     this.viewEntryItem = Selector('#the-list').find('td.column-primary')
diff --git a/tests/e2e/utilities/page-model/tabs/license.js b/tests/e2e/utilities/page-model/tabs/license.js
index 60f4aa6ce..c089f8fd9 100644
--- a/tests/e2e/utilities/page-model/tabs/license.js
+++ b/tests/e2e/utilities/page-model/tabs/license.js
@@ -15,7 +15,7 @@ class License {
     this.deactivateLink = Selector('.gfpdf-deactivate-license')
     this.deactivatedMessage = Selector('.success').withText('License deactivated.')
 
-    this.saveSettings = Selector('#submit-and-promo-container').find('input')
+    this.saveSettings = Selector('[name="submit"]')
   }
 
   async navigateCoreBooster (uri) {
diff --git a/tests/phpunit/bootstrap.php b/tests/phpunit/bootstrap.php
index 8db0e9f4d..8411438dc 100644
--- a/tests/phpunit/bootstrap.php
+++ b/tests/phpunit/bootstrap.php
@@ -118,7 +118,7 @@ public function load() {
 		GFFormsModel::drop_tables();
 		gf_upgrade()->maybe_upgrade();
 
-		// Enabling GF Rest API v2.
+		/* Enabling GF Rest API v2. */
 		global $gf_webapi;
 		$gf_webapi = GFWebAPI::get_instance();
 		$gf_webapi->update_plugin_settings( [ 'enabled' => '1', 'version' => 'v2' ] );
@@ -146,8 +146,10 @@ public function create_stubs() {
 
 		];
 
+		$json_basepath = __DIR__ . '/data/json/';
+
 		foreach ( $forms as $json ) {
-			$form                                 = json_decode( trim( file_get_contents( dirname( __FILE__ ) . '/unit-tests/json/' . $json ) ), true );
+			$form                                 = json_decode( trim( file_get_contents( $json_basepath . $json ) ), true );
 			$form_id                              = GFAPI::add_form( $form );
 			$this->form[ substr( $json, 0, -5 ) ] = GFAPI::get_form( $form_id );
 		}
@@ -162,7 +164,7 @@ public function create_stubs() {
 		];
 
 		foreach ( $entries as $id => $json ) {
-			$entries   = json_decode( trim( file_get_contents( dirname( __FILE__ ) . '/unit-tests/json/' . $json ) ), true );
+			$entries   = json_decode( trim( file_get_contents( $json_basepath . $json ) ), true );
 			$entry_ids = GFAPI::add_entries( $entries, $this->form[ $id ]['id'] );
 
 			/* Loop through our new entry IDs and get the actual entries */
diff --git a/tests/phpunit/unit-tests/fonts/Chewy.ttf b/tests/phpunit/data/fonts/Chewy.ttf
similarity index 100%
rename from tests/phpunit/unit-tests/fonts/Chewy.ttf
rename to tests/phpunit/data/fonts/Chewy.ttf
diff --git a/tests/phpunit/unit-tests/fonts/DejaVuSans-Bold.ttf b/tests/phpunit/data/fonts/DejaVuSans-Bold.ttf
similarity index 100%
rename from tests/phpunit/unit-tests/fonts/DejaVuSans-Bold.ttf
rename to tests/phpunit/data/fonts/DejaVuSans-Bold.ttf
diff --git a/tests/phpunit/unit-tests/fonts/DejaVuSans.ttf b/tests/phpunit/data/fonts/DejaVuSans.ttf
similarity index 100%
rename from tests/phpunit/unit-tests/fonts/DejaVuSans.ttf
rename to tests/phpunit/data/fonts/DejaVuSans.ttf
diff --git a/tests/phpunit/unit-tests/fonts/DejaVuSansCondensed.ttf b/tests/phpunit/data/fonts/DejaVuSansCondensed.ttf
similarity index 100%
rename from tests/phpunit/unit-tests/fonts/DejaVuSansCondensed.ttf
rename to tests/phpunit/data/fonts/DejaVuSansCondensed.ttf
diff --git a/tests/phpunit/unit-tests/fonts/DejaVuSerifCondensed.ttf b/tests/phpunit/data/fonts/DejaVuSerifCondensed.ttf
similarity index 100%
rename from tests/phpunit/unit-tests/fonts/DejaVuSerifCondensed.ttf
rename to tests/phpunit/data/fonts/DejaVuSerifCondensed.ttf
diff --git a/tests/phpunit/unit-tests/fonts/chewy-LICENSE.txt b/tests/phpunit/data/fonts/chewy-LICENSE.txt
similarity index 100%
rename from tests/phpunit/unit-tests/fonts/chewy-LICENSE.txt
rename to tests/phpunit/data/fonts/chewy-LICENSE.txt
diff --git a/tests/phpunit/unit-tests/json/all-form-euro-product-entry.json b/tests/phpunit/data/json/all-form-euro-product-entry.json
similarity index 100%
rename from tests/phpunit/unit-tests/json/all-form-euro-product-entry.json
rename to tests/phpunit/data/json/all-form-euro-product-entry.json
diff --git a/tests/phpunit/unit-tests/json/all-form-fields-entries.json b/tests/phpunit/data/json/all-form-fields-entries.json
similarity index 100%
rename from tests/phpunit/unit-tests/json/all-form-fields-entries.json
rename to tests/phpunit/data/json/all-form-fields-entries.json
diff --git a/tests/phpunit/unit-tests/json/all-form-fields.json b/tests/phpunit/data/json/all-form-fields.json
similarity index 100%
rename from tests/phpunit/unit-tests/json/all-form-fields.json
rename to tests/phpunit/data/json/all-form-fields.json
diff --git a/tests/phpunit/unit-tests/json/form-settings-sample-input.json b/tests/phpunit/data/json/form-settings-sample-input.json
similarity index 100%
rename from tests/phpunit/unit-tests/json/form-settings-sample-input.json
rename to tests/phpunit/data/json/form-settings-sample-input.json
diff --git a/tests/phpunit/unit-tests/json/form-settings.json b/tests/phpunit/data/json/form-settings.json
similarity index 100%
rename from tests/phpunit/unit-tests/json/form-settings.json
rename to tests/phpunit/data/json/form-settings.json
diff --git a/tests/phpunit/unit-tests/json/gravityform-1-entries.json b/tests/phpunit/data/json/gravityform-1-entries.json
similarity index 100%
rename from tests/phpunit/unit-tests/json/gravityform-1-entries.json
rename to tests/phpunit/data/json/gravityform-1-entries.json
diff --git a/tests/phpunit/unit-tests/json/gravityform-1.json b/tests/phpunit/data/json/gravityform-1.json
similarity index 100%
rename from tests/phpunit/unit-tests/json/gravityform-1.json
rename to tests/phpunit/data/json/gravityform-1.json
diff --git a/tests/phpunit/unit-tests/json/gravityform-2.json b/tests/phpunit/data/json/gravityform-2.json
similarity index 100%
rename from tests/phpunit/unit-tests/json/gravityform-2.json
rename to tests/phpunit/data/json/gravityform-2.json
diff --git a/tests/phpunit/unit-tests/json/latest-posts.json b/tests/phpunit/data/json/latest-posts.json
similarity index 100%
rename from tests/phpunit/unit-tests/json/latest-posts.json
rename to tests/phpunit/data/json/latest-posts.json
diff --git a/tests/phpunit/unit-tests/json/migration_v3_to_v4.json b/tests/phpunit/data/json/migration_v3_to_v4.json
similarity index 100%
rename from tests/phpunit/unit-tests/json/migration_v3_to_v4.json
rename to tests/phpunit/data/json/migration_v3_to_v4.json
diff --git a/tests/phpunit/unit-tests/json/non-group-products-form-entries.json b/tests/phpunit/data/json/non-group-products-form-entries.json
similarity index 100%
rename from tests/phpunit/unit-tests/json/non-group-products-form-entries.json
rename to tests/phpunit/data/json/non-group-products-form-entries.json
diff --git a/tests/phpunit/unit-tests/json/non-group-products-form.json b/tests/phpunit/data/json/non-group-products-form.json
similarity index 100%
rename from tests/phpunit/unit-tests/json/non-group-products-form.json
rename to tests/phpunit/data/json/non-group-products-form.json
diff --git a/tests/phpunit/unit-tests/json/number-fields.json b/tests/phpunit/data/json/number-fields.json
similarity index 100%
rename from tests/phpunit/unit-tests/json/number-fields.json
rename to tests/phpunit/data/json/number-fields.json
diff --git a/tests/phpunit/unit-tests/json/options-settings.json b/tests/phpunit/data/json/options-settings.json
similarity index 100%
rename from tests/phpunit/unit-tests/json/options-settings.json
rename to tests/phpunit/data/json/options-settings.json
diff --git a/tests/phpunit/unit-tests/json/repeater-consent-entry.json b/tests/phpunit/data/json/repeater-consent-entry.json
similarity index 100%
rename from tests/phpunit/unit-tests/json/repeater-consent-entry.json
rename to tests/phpunit/data/json/repeater-consent-entry.json
diff --git a/tests/phpunit/unit-tests/json/repeater-consent-form.json b/tests/phpunit/data/json/repeater-consent-form.json
similarity index 100%
rename from tests/phpunit/unit-tests/json/repeater-consent-form.json
rename to tests/phpunit/data/json/repeater-consent-form.json
diff --git a/tests/phpunit/unit-tests/json/repeater-empty-entry.json b/tests/phpunit/data/json/repeater-empty-entry.json
similarity index 100%
rename from tests/phpunit/unit-tests/json/repeater-empty-entry.json
rename to tests/phpunit/data/json/repeater-empty-entry.json
diff --git a/tests/phpunit/unit-tests/json/repeater-empty-form.json b/tests/phpunit/data/json/repeater-empty-form.json
similarity index 100%
rename from tests/phpunit/unit-tests/json/repeater-empty-form.json
rename to tests/phpunit/data/json/repeater-empty-form.json
diff --git a/tests/phpunit/unit-tests/json/shortcode-data.json b/tests/phpunit/data/json/shortcode-data.json
similarity index 100%
rename from tests/phpunit/unit-tests/json/shortcode-data.json
rename to tests/phpunit/data/json/shortcode-data.json
diff --git a/tests/phpunit/unit-tests/Controller/Test_Controller_Custom_Fonts.php b/tests/phpunit/unit-tests/Controller/Test_Controller_Custom_Fonts.php
index aa16b6769..d0f203721 100644
--- a/tests/phpunit/unit-tests/Controller/Test_Controller_Custom_Fonts.php
+++ b/tests/phpunit/unit-tests/Controller/Test_Controller_Custom_Fonts.php
@@ -87,7 +87,7 @@ public function set_up() {
 
 		foreach ( $fonts as $font ) {
 			$tmp_font = get_temp_dir() . $font;
-			copy( __DIR__ . '/../fonts/' . $font, $tmp_font );
+			copy( __DIR__ . '/../../data/fonts/' . $font, $tmp_font );
 			$this->test_fonts[] = $tmp_font;
 		}
 
@@ -196,7 +196,7 @@ public function test_add_item_font_validation_failed() {
 		$request->set_param( 'label', 'Font' );
 
 		/* JSON file masquerading as a ttf file */
-		$test_file = __DIR__ . '/../json/all-form-fields.json';
+		$test_file = __DIR__ . '/../../data/json/all-form-fields.json';
 
 		$_FILES = [
 			'regular' => [
@@ -215,7 +215,7 @@ public function test_add_item_font_validation_failed() {
 		$this->assertSame( 400, $response->get_status() );
 
 		/* TTF file masquerading as a JSON file */
-		$test_file = __DIR__ . '/../fonts/DejaVuSans.ttf';
+		$test_file = __DIR__ . '/../../data/fonts/DejaVuSans.ttf';
 
 		$_FILES = [
 			'regular' => [
@@ -301,7 +301,7 @@ public function test_update_item_permission_failed() {
 		GPDFAPI::add_pdf_font(
 			[
 				'font_name' => 'Lato',
-				'regular'   => __DIR__ . '/../fonts/DejaVuSans.ttf',
+				'regular'   => __DIR__ . '/../../data/fonts/DejaVuSans.ttf',
 			]
 		);
 
@@ -318,7 +318,7 @@ public function test_update_item_basic_validation_failed() {
 		GPDFAPI::add_pdf_font(
 			[
 				'font_name' => 'Lato',
-				'regular'   => __DIR__ . '/../fonts/DejaVuSans.ttf',
+				'regular'   => __DIR__ . '/../../data/fonts/DejaVuSans.ttf',
 			]
 		);
 
@@ -349,7 +349,7 @@ public function test_update_item_font_validation_failed() {
 		GPDFAPI::add_pdf_font(
 			[
 				'font_name' => 'Lato',
-				'regular'   => __DIR__ . '/../fonts/DejaVuSans.ttf',
+				'regular'   => __DIR__ . '/../../data/fonts/DejaVuSans.ttf',
 			]
 		);
 
@@ -358,7 +358,7 @@ public function test_update_item_font_validation_failed() {
 		$request = new WP_REST_Request( 'POST', '/' . Helper_Data::REST_API_BASENAME . 'v1/fonts/lato' );
 
 		/* JSON file masquerading as a ttf file */
-		$test_file = __DIR__ . '/../json/all-form-fields.json';
+		$test_file = __DIR__ . '/../../data/json/all-form-fields.json';
 
 		$_FILES = [
 			'regular' => [
@@ -377,7 +377,7 @@ public function test_update_item_font_validation_failed() {
 		$this->assertSame( 400, $response->get_status() );
 
 		/* TTF file masquerading as a JSON file */
-		$test_file = __DIR__ . '/../fonts/DejaVuSans.ttf';
+		$test_file = __DIR__ . '/../../data/fonts/DejaVuSans.ttf';
 
 		$_FILES = [
 			'regular' => [
diff --git a/tests/phpunit/unit-tests/Rest/Test_Rest.php b/tests/phpunit/unit-tests/Rest/Test_Rest.php
new file mode 100644
index 000000000..16bf21272
--- /dev/null
+++ b/tests/phpunit/unit-tests/Rest/Test_Rest.php
@@ -0,0 +1,86 @@
+<?php
+
+namespace GFPDF\Tests;
+
+use GF_UnitTest_Factory;
+use GFPDF\Rest\Rest_Form_Settings;
+use WP_REST_Request;
+use WP_REST_Server;
+use WP_UnitTestCase;
+
+/**
+ *
+ * @package     Gravity PDF
+ * @copyright   Copyright (c) 2024, Blue Liquid Designs
+ * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ */
+
+/**
+ * @group api
+ */
+abstract class Test_Rest extends WP_UnitTestCase {
+
+	/**
+	 * @var GF_UnitTest_Factory
+	 */
+	protected $factory;
+
+	/**
+	 * @var int
+	 */
+	protected $form_id;
+
+	/**
+	 * @var int
+	 */
+	protected static $admin_id;
+
+	/**
+	 * @var int
+	 */
+	protected static $editor_id;
+
+	function set_up() {
+		parent::set_up();
+
+		self::$admin_id  = $this->factory->user->create( [ 'role' => 'administrator', ] );
+		self::$editor_id = $this->factory->user->create( [ 'role' => 'editor', ] );
+
+		$this->factory = new GF_UnitTest_Factory();
+		$this->form_id = $this->factory->form->create();
+		$this->factory->pdf->set_form_id( $this->form_id );
+
+		add_filter( 'rest_url', [ $this, 'filter_rest_url_for_leading_slash' ], 10, 2 );
+		/** @var WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = new \Spy_REST_Server();
+		do_action( 'rest_api_init', $wp_rest_server );
+	}
+
+	public function tear_down() {
+		remove_filter( 'rest_url', [ $this, 'test_rest_url_for_leading_slash' ], 10, 2 );
+		/** @var WP_REST_Server $wp_rest_server */
+		global $wp_rest_server;
+		$wp_rest_server = null;
+
+		parent::tear_down();
+	}
+
+	public function filter_rest_url_for_leading_slash( $url, $path ) {
+		if ( is_multisite() || get_option( 'permalink_structure' ) ) {
+			return $url;
+		}
+
+		// Make sure path for rest_url has a leading slash for proper resolution.
+		if ( 0 !== strpos( $path, '/' ) ) {
+			$this->fail(
+				sprintf(
+					'REST API URL "%s" should have a leading slash.',
+					$path
+				)
+			);
+		}
+
+		return $url;
+	}
+}
diff --git a/tests/phpunit/unit-tests/Controller/Test_Controller_Form_Settings_Rest_Api.php b/tests/phpunit/unit-tests/Rest/Test_Rest_Form_Settings.php
similarity index 70%
rename from tests/phpunit/unit-tests/Controller/Test_Controller_Form_Settings_Rest_Api.php
rename to tests/phpunit/unit-tests/Rest/Test_Rest_Form_Settings.php
index 6d699e3fa..1e7e8ba33 100644
--- a/tests/phpunit/unit-tests/Controller/Test_Controller_Form_Settings_Rest_Api.php
+++ b/tests/phpunit/unit-tests/Rest/Test_Rest_Form_Settings.php
@@ -2,11 +2,8 @@
 
 namespace GFPDF\Tests;
 
-use GF_UnitTest_Factory;
-use GFPDF\Controller\Controller_Form_Settings_Rest_Api;
+use GFPDF\Rest\Rest_Form_Settings;
 use WP_REST_Request;
-use WP_REST_Server;
-use WP_UnitTestCase;
 
 /**
  *
@@ -18,67 +15,27 @@
 /**
  * @group api
  */
-class Test_Controller_Form_Settings_Rest_Api extends WP_UnitTestCase {
+class Test_Rest_Form_Settings extends Test_Rest {
 
 	/**
-	 * @var GF_UnitTest_Factory
+	 * @var Rest_Form_Settings
 	 */
-	protected $factory;
-
-	/**
-	 * @var int
-	 */
-	protected $form_id;
-
-	/**
-	 * @var int
-	 */
-	protected static $admin_id;
-
-	/**
-	 * @var int
-	 */
-	protected static $editor_id;
-
-	/**
-	 * @var Controller_Form_Settings_Rest_Api
-	 */
-	protected $controller;
+	protected $api;
 
 	function set_up() {
 		global $gfpdf;
 
-		parent::set_up();
-
-		self::$admin_id  = $this->factory->user->create( [ 'role' => 'administrator', ] );
-		self::$editor_id = $this->factory->user->create( [ 'role' => 'editor', ] );
-
-		$this->factory = new GF_UnitTest_Factory();
-		$this->form_id = $this->factory->form->create();
-		$this->factory->pdf->set_form_id( $this->form_id );
+		$this->api = new Rest_Form_Settings( $gfpdf->options, $gfpdf->gform, $gfpdf->misc, $gfpdf->templates );
 
-		$this->controller = new Controller_Form_Settings_Rest_Api( $gfpdf->options, $gfpdf->gform, $gfpdf->misc, $gfpdf->templates );
-
-		add_filter( 'rest_url', [ $this, 'filter_rest_url_for_leading_slash' ], 10, 2 );
-		/** @var WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = new \Spy_REST_Server();
-		do_action( 'rest_api_init', $wp_rest_server );
-	}
-
-	public function tear_down() {
-		remove_filter( 'rest_url', [ $this, 'test_rest_url_for_leading_slash' ], 10, 2 );
-		/** @var WP_REST_Server $wp_rest_server */
-		global $wp_rest_server;
-		$wp_rest_server = null;
-
-		parent::tear_down();
+		parent::set_up();
 	}
 
 	public function test_register_routes() {
 		$routes = rest_get_server()->get_routes();
-		$this->assertArrayHasKey( '/gravity-pdf/v1/form/(?P<form>[\d]+)', $routes );
-		$this->assertArrayHasKey( '/gravity-pdf/v1/form/(?P<form>[\d]+)/(?P<pdf>[a-fA-F0-9]{13})', $routes );
+
+		foreach ( $this->api::$endpoints as $route ) {
+			$this->assertArrayHasKey( '/' . $this->api::NAMESPACE . $route, $routes );
+		}
 	}
 
 	public function test_context_param() {
@@ -90,7 +47,12 @@ public function test_context_param() {
 		$data     = $response->get_data();
 
 		$this->assertSame( 'edit', $data['endpoints'][0]['args']['context']['default'] );
-		$this->assertSame( [ 'edit' ], $data['endpoints'][0]['args']['context']['enum'] );
+
+		$contexts = [ 'advanced', 'appearance', 'edit', 'general', 'template' ];
+
+		$enum = $data['endpoints'][0]['args']['context']['enum'];
+		sort( $enum );
+		$this->assertSame( $contexts, $enum );
 
 		/* Single */
 		$pdf_id   = $this->factory->pdf->create();
@@ -99,12 +61,15 @@ public function test_context_param() {
 		$data     = $response->get_data();
 
 		$this->assertSame( 'edit', $data['endpoints'][0]['args']['context']['default'] );
-		$this->assertSame( [ 'edit' ], $data['endpoints'][0]['args']['context']['enum'] );
+
+		$enum = $data['endpoints'][0]['args']['context']['enum'];
+		sort( $enum );
+		$this->assertSame( $contexts, $enum );
 	}
 
 	public function test_get_items() {
 		$this->factory->pdf->create_many( 5, [
-			'template' => 'zadani',
+			'template' => 'rubix',
 		] );
 
 		wp_set_current_user( self::$admin_id );
@@ -117,6 +82,63 @@ public function test_get_items() {
 		$this->test_for_pdf_settings( $data[0] );
 	}
 
+	public function test_get_items_for_entry() {
+		$this->factory->pdf->create_many( 2, [
+			'template' => 'rubix',
+		] );
+
+		$this->factory->pdf->create( [ 'active' => false ] );
+		$this->factory->pdf->create( [
+			'conditional'      => 1,
+			'conditionalLogic' => [
+				'actionType' => 'show',
+				'logicType'  => 'all',
+				'rules'      => [
+					[
+						'fieldId'  => 1,
+						'operator' => 'is',
+						'value'    => 'something',
+					],
+				],
+			],
+		] );
+
+		/* Test we get all PDFs back */
+		wp_set_current_user( self::$admin_id );
+		$request  = new WP_REST_Request( 'GET', '/gravity-pdf/v1/form/' . $this->form_id );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 200, $response->get_status() );
+		$this->assertCount( 4, $data );
+
+		/* Test we only get 2 PDFs back */
+		$entry_id = $this->factory->entry->create( [ 'form_id' => $this->form_id ] );
+		$request->set_query_params( [
+			'entry' => $entry_id,
+		] );
+
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 200, $response->get_status() );
+		$this->assertCount( 2, $data );
+
+		$this->assertArrayHasKey( 'entry', $data[0]['_links'] );
+
+		/* Test we get 3 PDFs back */
+		$entry_id = $this->factory->entry->create( [ 'form_id' => $this->form_id, '1' => 'something' ] );
+		$request->set_query_params( [
+			'entry' => $entry_id,
+		] );
+
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 200, $response->get_status() );
+		$this->assertCount( 3, $data );
+	}
+
 	/**
 	 * @param $args
 	 *
@@ -145,7 +167,7 @@ protected function test_for_pdf_settings( $args ): void {
 		$this->assertArrayHasKey( 'pdf_size', $args );
 		$this->assertArrayHasKey( 'custom_pdf_size', $args );
 		$this->assertArrayHasKey( 'orientation', $args );
-		$this->assertArrayHasKey( 'zadani_border_colour', $args );
+		$this->assertArrayHasKey( 'rubix_container_background_colour', $args );
 		$this->assertArrayHasKey( 'show_form_title', $args );
 		$this->assertArrayHasKey( 'show_page_names', $args );
 		$this->assertArrayHasKey( 'show_html', $args );
@@ -160,6 +182,51 @@ protected function test_for_pdf_settings( $args ): void {
 		$this->assertArrayHasKey( 'first_footer', $args );
 	}
 
+	public function test_get_items_with_filters() {
+		$this->factory->pdf->create( [ 'template' => 'rubix' ] );
+		$this->factory->pdf->create( [ 'template' => 'focus-gravity' ] );
+		$this->factory->pdf->create( [ 'template' => 'zadani' ] );
+		$this->factory->pdf->create( [ 'template' => 'blank-slate' ] );
+
+		wp_set_current_user( self::$admin_id );
+		$request = new WP_REST_Request( 'GET', '/gravity-pdf/v1/form/' . $this->form_id );
+
+		/* Filter by context */
+		$request->set_query_params( [ 'context' => 'template' ] );
+
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertCount( 4, $data );
+
+		$this->assertArrayNotHasKey( 'name', $data[0] );
+		$this->assertArrayHasKey( 'rubix_container_background_colour', $data[0] );
+
+		$this->assertArrayNotHasKey( 'name', $data[1] );
+		$this->assertArrayHasKey( 'focusgravity_accent_colour', $data[1] );
+
+		$this->assertArrayNotHasKey( 'name', $data[2] );
+		$this->assertArrayHasKey( 'zadani_border_colour', $data[2] );
+
+		$this->assertArrayNotHasKey( 'name', $data[3] );
+		$this->assertArrayHasKey( 'header', $data[3] );
+
+		/* Filter using special _filter query param */
+		$request->set_query_params( [ '_fields' => 'name,filename,template' ] );
+
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertCount( 4, $data );
+		$this->assertCount( 4, $data[0] );
+		$this->assertCount( 4, $data[1] );
+
+		$this->assertArrayHasKey( 'id', $data[0] );
+		$this->assertArrayHasKey( 'name', $data[0] );
+		$this->assertArrayHasKey( 'filename', $data[0] );
+		$this->assertArrayHasKey( 'template', $data[0] );
+	}
+
 	public function test_get_items_invalid_permission() {
 		wp_set_current_user( 0 );
 
@@ -180,40 +247,40 @@ public function test_get_items_invalid_permission() {
 
 	public function test_get_item() {
 		$template_pdf_config = [
-			'name'                 => 'My First PDF Template',
-			'template'             => 'zadani',
-			'filename'             => 'Filename-{Text:5}',
-			'notification'         => [ '52246fd7af858' ],
-			'conditional'          => '1',
-			'conditionalLogic'     => [
+			'name'                              => 'My First PDF Template',
+			'template'                          => 'rubix',
+			'filename'                          => 'Filename-{Text:5}',
+			'notification'                      => [ '52246fd7af858' ],
+			'conditional'                       => '1',
+			'conditionalLogic'                  => [
 				'actionType' => 'show',
 				'logicType'  => 'any',
 				'rules'      => [
 					[ 'fieldId' => '7', 'operator' => 'is', 'value' => 'Albania' ],
 				],
 			],
-			'pdf_size'             => 'custom',
-			'custom_pdf_size'      => [ '150', '300', 'millimeters' ],
-			'orientation'          => 'landscape',
-			'font'                 => 'dejavusans',
-			'font_size'            => 12,
-			'font_colour'          => '#929292',
-			'format'               => 'PDFA1B',
-			'zadani_border_colour' => '#1C2C1C',
-			'rtl'                  => 'Yes',
-			'security'             => 'Yes',
-			'password'             => 'my password',
-			'master_password'      => 'test',
-			'privileges'           => [ 'copy', 'print' ],
-			'image_dpi'            => '300',
-			'show_html'            => 'Yes',
-			'public_access'        => 'Yes',
-			'restrict_owner'       => 'Yes',
-			'background_image'     => 'http://test.com/image.jpg',
-			'header'               => '<p>This is a header {Single:5}</p>',
-			'first_header'         => 'My First Page Header <img src="{Single:5}" />',
-			'footer'               => 'my footer',
-			'first_footer'         => 'footer on the first page',
+			'pdf_size'                          => 'custom',
+			'custom_pdf_size'                   => [ '150', '300', 'millimeters' ],
+			'orientation'                       => 'landscape',
+			'font'                              => 'dejavusans',
+			'font_size'                         => 12,
+			'font_colour'                       => '#929292',
+			'format'                            => 'PDFA1B',
+			'rubix_container_background_colour' => '#1C2C1C',
+			'rtl'                               => 'Yes',
+			'security'                          => 'Yes',
+			'password'                          => 'my password',
+			'master_password'                   => 'test',
+			'privileges'                        => [ 'copy', 'print' ],
+			'image_dpi'                         => '300',
+			'show_html'                         => 'Yes',
+			'public_access'                     => 'Yes',
+			'restrict_owner'                    => 'Yes',
+			'background_image'                  => 'http://test.com/image.jpg',
+			'header'                            => '<p>This is a header {Single:5}</p>',
+			'first_header'                      => 'My First Page Header <img src="{Single:5}" />',
+			'footer'                            => 'my footer',
+			'first_footer'                      => 'footer on the first page',
 		];
 
 		$template_pdf_id = $this->factory->pdf->create( $template_pdf_config );
@@ -253,7 +320,7 @@ public function test_get_item() {
 		$this->assertEquals( $template_pdf_config['custom_pdf_size'][1], $data['custom_pdf_size']['height'] );
 		$this->assertSame( $template_pdf_config['custom_pdf_size'][2], str_replace( [ 'mm', 'in' ], [ 'millimeters', 'inches' ], $data['custom_pdf_size']['unit'] ) );
 		$this->assertSame( $template_pdf_config['orientation'], $data['orientation'] );
-		$this->assertSame( '#1C2C1C', $data['zadani_border_colour'] );
+		$this->assertSame( '#1C2C1C', $data['rubix_container_background_colour'] );
 		$this->assertTrue( $data['show_form_title'] );
 		$this->assertFalse( $data['show_page_names'] );
 		$this->assertTrue( $data['show_html'] );
@@ -267,6 +334,12 @@ public function test_get_item() {
 		$this->assertSame( $template_pdf_config['footer'], $data['footer'] );
 		$this->assertSame( $template_pdf_config['first_footer'], $data['first_footer'] );
 
+		$links = $response->get_links();
+		$this->assertArrayHasKey( 'self', $links );
+		$this->assertArrayHasKey( 'admin', $links );
+		$this->assertArrayHasKey( 'collection', $links );
+		$this->assertArrayHasKey( 'form', $links );
+
 		$this->assertStringContainsString( 'admin.php?page=gf_edit_forms&view=settings&subview=PDF&id=', $response->get_links()['admin'][0]['href'] );
 	}
 
@@ -304,17 +377,26 @@ public function test_get_item_with_invalid_form() {
 		$this->assertSame( 'rest_invalid_param', $data['data']['details']['form']['code'] );
 	}
 
+	public function test_get_item_with_invalid_pdf() {
+		/* Test with invalid PDF */
+		$request  = new WP_REST_Request( 'GET', '/gravity-pdf/v1/form/' . $this->form_id . '/' . uniqid() );
+		$response = rest_get_server()->dispatch( $request );
+		$data     = $response->get_data();
+
+		$this->assertSame( 400, $response->get_status() );
+		$this->assertSame( 'Invalid parameter(s): pdf', $data['message'] );
+	}
+
 	public function test_create_item() {
 		wp_set_current_user( self::$admin_id );
 
-		$this->controller->reregister_routes( 'zadani' );
 		$request = new WP_REST_Request( 'POST', '/gravity-pdf/v1/form/' . $this->form_id );
 		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
 
 		/* Barebones PDF */
 		$request->set_body_params( [
-			'name'    => 'Simple PDF',
-			'template' => 'zadani',
+			'name'     => 'Simple PDF',
+			'template' => 'rubix',
 		] );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -323,42 +405,42 @@ public function test_create_item() {
 		/* Complex PDF */
 		$request->set_body_params( [
 			'name'             => 'Advanced PDF Template',
-			'template'          => 'zadani',
-			'filename'          => 'Filename-{Text:5}',
-			'notification'      => [ '52246fd7af858' ],
-			'conditionalLogic'  => [
+			'template'         => 'rubix',
+			'filename'         => 'Filename-{Text:5}',
+			'notification'     => [ '52246fd7af858' ],
+			'conditionalLogic' => [
 				'actionType' => 'show',
 				'logicType'  => 'any',
 				'rules'      => [
 					[ 'fieldId' => '7', 'operator' => 'is', 'value' => 'Albania' ],
 				],
 			],
-			'pdf_size'        => 'CUSTOM',
-			'custom_pdf_size' => [
+			'pdf_size'         => 'CUSTOM',
+			'custom_pdf_size'  => [
 				'width'  => '150',
 				'height' => '300',
 				'unit'   => 'mm',
 			],
-			'orientation'       => 'landscape',
-			'font'              => 'dejavusans',
-			'font_size'         => 12,
-			'font_colour'        => '#929292',
-			'format'            => 'PDFA1B',
-			'rtl'               => true,
-			'security'          => true,
-			'password'          => 'my password',
-			'master_password'   => 'test',
-			'privileges'        => [ 'copy', 'print' ],
-			'image_dpi'               => 300,
-			'public_access'     => true,
-			'restrict_owner'    => true,
-
-			'zadani_border_colour' => '#1C2C1C',
-			'background_image'     => 'http://test.com/image.jpg',
-			'header'               => '<p>This is a header {Single:5}</p>',
-			'first_header'         => 'My First Page Header <img src="{Single:5}" />',
-			'footer'               => 'my footer',
-			'first_footer'         => 'footer on the first page',
+			'orientation'      => 'landscape',
+			'font'             => 'dejavusans',
+			'font_size'        => 12,
+			'font_colour'      => '#929292',
+			'format'           => 'PDFA1B',
+			'rtl'              => true,
+			'security'         => true,
+			'password'         => 'my password',
+			'master_password'  => 'test',
+			'privileges'       => [ 'copy', 'print' ],
+			'image_dpi'        => 300,
+			'public_access'    => true,
+			'restrict_owner'   => true,
+
+			'rubix_container_background_colour' => '#1C2C1C',
+			'background_image'                  => 'http://test.com/image.jpg',
+			'header'                            => '<p>This is a header {Single:5}</p>',
+			'first_header'                      => 'My First Page Header <img src="{Single:5}" />',
+			'footer'                            => 'my footer',
+			'first_footer'                      => 'footer on the first page',
 		] );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -401,13 +483,13 @@ protected function check_template_pdf_data( $pdf, $data, $context, $links ) {
 
 		$this->assertSame( $pdf['orientation'], $data['orientation'] );
 
-		$this->assertSame( $pdf['zadani_border_colour'], $data['zadani_border_colour'] );
-		$this->assertSame( $pdf['show_form_title'], $data['show_form_title'] ? 'Yes' : '' );
-		$this->assertSame( $pdf['show_page_names'], $data['show_page_names'] ? 'Yes' : '' );
-		$this->assertSame( $pdf['show_html'], $data['show_html'] ? 'Yes' : '' );
-		$this->assertSame( $pdf['show_section_content'], $data['show_section_content'] ? 'Yes' : '' );
-		$this->assertSame( $pdf['enable_conditional'], $data['enable_conditional'] ? 'Yes' : '' );
-		$this->assertSame( $pdf['show_empty'], $data['show_empty'] ? 'Yes' : '' );
+		$this->assertSame( $pdf['rubix_container_background_colour'], $data['rubix_container_background_colour'] );
+		$this->assertSame( $pdf['show_form_title'], $data['show_form_title'] ? 'Yes' : 'No' );
+		$this->assertSame( $pdf['show_page_names'], $data['show_page_names'] ? 'Yes' : 'No' );
+		$this->assertSame( $pdf['show_html'], $data['show_html'] ? 'Yes' : 'No' );
+		$this->assertSame( $pdf['show_section_content'], $data['show_section_content'] ? 'Yes' : 'No' );
+		$this->assertSame( $pdf['enable_conditional'], $data['enable_conditional'] ? 'Yes' : 'No' );
+		$this->assertSame( $pdf['show_empty'], $data['show_empty'] ? 'Yes' : 'No' );
 		$this->assertSame( $pdf['background_color'], $data['background_color'] );
 
 		$this->assertSame( $pdf['background_image'], $data['background_image'] );
@@ -431,24 +513,24 @@ protected function check_common_pdf_data( $pdf, $data, $context, $links ) {
 		$this->assertSame( array_values( $pdf['notification'] ), $data['notification'] );
 
 		$this->assertSame( $pdf['conditionalLogic'], $data['conditionalLogic'] );
-		$this->assertEquals( $pdf['conditional'], $data['conditional'] );
+		$this->assertEquals( $pdf['conditional'] === 'Yes', $data['conditional'] );
 
 		$this->assertSame( $pdf['font'], $data['font'] );
 		$this->assertEquals( $pdf['font_size'], $data['font_size'] );
 		$this->assertSame( $pdf['font_colour'], $data['font_colour'] );
 
-		$this->assertSame( $pdf['rtl'], $data['rtl'] ? 'Yes' : '' );
+		$this->assertSame( $pdf['rtl'], $data['rtl'] ? 'Yes' : 'No' );
 
 		$this->assertSame( $pdf['format'], $data['format'] );
 
-		$this->assertSame( $pdf['security'], $data['security'] ? 'Yes' : '' );
+		$this->assertSame( $pdf['security'], $data['security'] ? 'Yes' : 'No' );
 		$this->assertSame( array_values( $pdf['privileges'] ), $data['privileges'] );
 		$this->assertSame( $pdf['password'], $data['password'] );
 		$this->assertSame( $pdf['master_password'], $data['master_password'] );
 
 		$this->assertEquals( $pdf['image_dpi'], $data['image_dpi'] );
-		$this->assertSame( $pdf['public_access'], $data['public_access'] ? 'Yes' : '' );
-		$this->assertSame( $pdf['restrict_owner'], $data['restrict_owner'] ? 'Yes' : '' );
+		$this->assertSame( $pdf['public_access'], $data['public_access'] ? 'Yes' : 'No' );
+		$this->assertSame( $pdf['restrict_owner'], $data['restrict_owner'] ? 'Yes' : 'No' );
 
 		if ( $links ) {
 			$links = test_rest_expand_compact_links( $links );
@@ -467,8 +549,8 @@ public function test_create_item_invalid_permission() {
 
 		/* Barebones PDF */
 		$request->set_body_params( [
-			'name'    => 'Simple PDF',
-			'template' => 'zadani',
+			'name'     => 'Simple PDF',
+			'template' => 'rubix',
 		] );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -491,18 +573,38 @@ public function test_create_item_invalid_permission() {
 		$this->assertSame( 201, $response->get_status() );
 	}
 
+	public function test_create_item_with_existing_pdf() {
+		$pdf_id = $this->factory->pdf->create();
+
+		wp_set_current_user( self::$admin_id );
+
+		$request = new WP_REST_Request( 'POST', '/gravity-pdf/v1/form/' . $this->form_id );
+		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+
+		/* Barebones PDF */
+		$request->set_body_params( [
+			'pdf'      => $pdf_id,
+			'name'     => 'Simple PDF',
+			'template' => 'rubix',
+		] );
+
+		$response = rest_get_server()->dispatch( $request );
+
+		$this->assertSame( 400, $response->get_status() );
+		$this->assertSame( 'Cannot create existing PDF.', $response->get_data()['message'] );
+	}
+
 	public function test_update_item() {
 		$template_pdf_id = $this->factory->pdf->create( [
-			'template'             => 'zadani',
-			'filename'             => 'Filename-{Text:5}',
-			'pdf_size'             => 'LETTER',
-			'zadani_border_colour' => '#1C2C1C',
+			'template'                          => 'rubix',
+			'filename'                          => 'Filename-{Text:5}',
+			'pdf_size'                          => 'LETTER',
+			'rubix_container_background_colour' => '#1C2C1C',
 		] );
 
 		wp_set_current_user( self::$admin_id );
 
 		/* Get original PDF */
-		$this->controller->reregister_routes( 'zadani' );
 		$request = new WP_REST_Request( 'GET', '/gravity-pdf/v1/form/' . $this->form_id . '/' . $template_pdf_id );
 		$request->set_param( 'context', 'edit' );
 		$response      = rest_get_server()->dispatch( $request );
@@ -514,9 +616,9 @@ public function test_update_item() {
 
 		/* Override a couple of the settings */
 		$request->set_body_params( [
-			'filename'             => 'Zadani Document',
-			'pdf_size'             => 'A3',
-			'zadani_border_colour' => '#000000',
+			'filename'                          => 'Zadani Document',
+			'pdf_size'                          => 'A3',
+			'rubix_container_background_colour' => '#000000',
 		] );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -526,17 +628,17 @@ public function test_update_item() {
 		$this->assertSame( $template_pdf_id, $data['id'] );
 		$this->assertSame( 'Zadani Document', $data['filename'] );
 		$this->assertSame( 'A3', $data['pdf_size'] );
-		$this->assertSame( '#000000', $data['zadani_border_colour'] );
+		$this->assertSame( '#000000', $data['rubix_container_background_colour'] );
 
-		unset( $original_data['filename'], $original_data['pdf_size'], $original_data['zadani_border_colour'] );
-		unset( $data['filename'], $data['pdf_size'], $data['zadani_border_colour'] );
+		unset( $original_data['filename'], $original_data['pdf_size'], $original_data['rubix_container_background_colour'] );
+		unset( $data['filename'], $data['pdf_size'], $data['rubix_container_background_colour'] );
 
 		$this->assertSame( $original_data, $data );
 
 		$pdf = \GPDFAPI::get_pdf( $this->form_id, $template_pdf_id );
 		$this->assertSame( 'Zadani Document', $pdf['filename'] );
 		$this->assertSame( 'A3', $pdf['pdf_size'] );
-		$this->assertSame( '#000000', $pdf['zadani_border_colour'] );
+		$this->assertSame( '#000000', $pdf['rubix_container_background_colour'] );
 	}
 
 	public function test_update_item_invalid_permission() {
@@ -572,8 +674,26 @@ public function test_update_item_invalid_permission() {
 		$this->assertSame( 200, $response->get_status() );
 	}
 
+	public function test_update_item_with_invalid_pdf() {
+		wp_set_current_user( self::$admin_id );
+
+		$request = new WP_REST_Request( 'PUT', '/gravity-pdf/v1/form/' . $this->form_id . '/' . uniqid() );
+		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
+
+		/* Barebones PDF */
+		$request->set_body_params( [
+			'name'     => 'Simple PDF',
+			'template' => 'rubix',
+		] );
+
+		$response = rest_get_server()->dispatch( $request );
+
+		$this->assertSame( 400, $response->get_status() );
+		$this->assertSame( 'Invalid parameter(s): pdf', $response->get_data()['message'] );
+	}
+
 	public function test_delete_item() {
-		$template_pdf_id = $this->factory->pdf->create( [ 'template' => 'zadani', 'header' => 'Custom Header' ] );
+		$template_pdf_id = $this->factory->pdf->create( [ 'template' => 'rubix', 'header' => 'Custom Header' ] );
 		$this->factory->pdf->create( [ 'template' => 'rubix' ] );
 
 		wp_set_current_user( self::$admin_id );
@@ -621,18 +741,27 @@ public function test_delete_item_invalid_permission() {
 		$this->assertTrue( $data['deleted'] );
 	}
 
+	public function test_delete_item_with_invalid_pdf() {
+		wp_set_current_user( self::$admin_id );
+
+		/* Test Template PDF */
+		$request  = new WP_REST_Request( 'DELETE', '/gravity-pdf/v1/form/' . $this->form_id . '/' . uniqid() );
+		$response = rest_get_server()->dispatch( $request );
+
+		$this->assertSame( 400, $response->get_status() );
+		$this->assertSame( 'Invalid parameter(s): pdf', $response->get_data()['message'] );
+	}
+
 	public function test_prepare_item() {
 		$template_pdf_id = $this->factory->pdf->create( [
-			'template'             => 'zadani',
-			'filename'             => 'Filename-{Text:5}',
-			'pdf_size'             => 'LETTER',
-			'zadani_border_colour' => '#1C2C1C',
+			'template'                          => 'rubix',
+			'filename'                          => 'Filename-{Text:5}',
+			'pdf_size'                          => 'LETTER',
+			'rubix_container_background_colour' => '#1C2C1C',
 		] );
 
 		wp_set_current_user( self::$admin_id );
 
-		$this->controller->reregister_routes( 'zadani' );
-
 		$request = new WP_REST_Request( 'GET', '/gravity-pdf/v1/form/' . $this->form_id . '/' . $template_pdf_id );
 
 		/* Test contexts */
@@ -641,7 +770,7 @@ public function test_prepare_item() {
 			$response = rest_get_server()->dispatch( $request );
 
 			$data   = $response->get_data();
-			$fields = array_filter( $this->controller->get_fields_for_response( $request ), function ( $item ) {
+			$fields = array_filter( $this->api->get_fields_for_response( $request ), function ( $item ) {
 				return ! in_array( $item, [ '_links', '_embedded' ], true );
 			} );
 
@@ -661,9 +790,8 @@ public function test_prepare_item() {
 	}
 
 	public function test_get_item_schema() {
-		$this->controller->reregister_routes( 'zadani' );
-
-		$request  = new WP_REST_Request( 'OPTIONS', '/gravity-pdf/v1/form/' . $this->form_id );
+		$request = new WP_REST_Request( 'OPTIONS', '/gravity-pdf/v1/form/' . $this->form_id );
+		$request->set_query_params( [ 'template' => 'rubix' ] );
 		$response = rest_do_request( $request );
 		$data     = $response->get_data();
 		$args     = $data['endpoints'][1]['args'];
@@ -706,14 +834,13 @@ public function test_get_item_schema() {
 	 */
 	public function test_input_validation_create() {
 		wp_set_current_user( self::$admin_id );
-		$this->controller->reregister_routes( 'zadani' );
 
 		/* Check valid form ID */
 		$request = new WP_REST_Request( 'POST', '/gravity-pdf/v1/form/4751' );
 		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( [
 			'name'     => 'Label',
-			'template' => 'zadani',
+			'template' => 'rubix',
 		] );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -727,7 +854,6 @@ public function test_input_validation_create() {
 		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
 
 		$request->set_body_params( [
-			'name'             => '',
 			'template'         => 'non-existent-template',
 			'active'           => 1,
 			'notification'     => [
@@ -746,7 +872,6 @@ public function test_input_validation_create() {
 
 		$this->assertSame( 400, $response->get_status() );
 
-		$this->assertSame( 'rest_invalid_param', $data['data']['details']['name']['code'] );
 		$this->assertSame( 'rest_not_in_enum', $data['data']['details']['template']['code'] );
 		$this->assertSame( 'rest_not_in_enum', $data['data']['details']['notification']['code'] );
 		$this->assertSame( 'rest_property_required', $data['data']['details']['conditionalLogic']['code'] );
@@ -759,14 +884,13 @@ public function test_input_validation_create() {
 	 */
 	public function test_input_validation_update() {
 		wp_set_current_user( self::$admin_id );
-		$this->controller->reregister_routes( 'zadani' );
 
 		/* Check valid form and PDF ID */
 		$request = new WP_REST_Request( 'PUT', '/gravity-pdf/v1/form/4751/abcdef1234567' );
 		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( [
 			'name'     => 'Label',
-			'template' => 'zadani',
+			'template' => 'rubix',
 		] );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -781,7 +905,7 @@ public function test_input_validation_update() {
 		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( [
 			'name'     => 'Label',
-			'template' => 'zadani',
+			'template' => 'rubix',
 		] );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -793,7 +917,6 @@ public function test_input_validation_update() {
 		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
 
 		$request->set_body_params( [
-			'name'             => '',
 			'template'         => 'non-existent-template',
 			'active'           => 1,
 			'notification'     => [
@@ -812,7 +935,6 @@ public function test_input_validation_update() {
 
 		$this->assertSame( 400, $response->get_status() );
 
-		$this->assertSame( 'rest_invalid_param', $data['data']['details']['name']['code'] );
 		$this->assertSame( 'rest_not_in_enum', $data['data']['details']['template']['code'] );
 		$this->assertSame( 'rest_not_in_enum', $data['data']['details']['notification']['code'] );
 		$this->assertSame( 'rest_property_required', $data['data']['details']['conditionalLogic']['code'] );
@@ -825,10 +947,9 @@ public function test_input_validation_update() {
 	 */
 	public function test_input_validation_delete() {
 		wp_set_current_user( self::$admin_id );
-		$this->controller->reregister_routes( 'zadani' );
 
 		/* Check valid form and PDF ID */
-		$request = new WP_REST_Request( 'DELETE', '/gravity-pdf/v1/form/4751/abcdef1234567' );
+		$request  = new WP_REST_Request( 'DELETE', '/gravity-pdf/v1/form/4751/abcdef1234567' );
 		$response = rest_get_server()->dispatch( $request );
 		$data     = $response->get_data();
 
@@ -842,15 +963,14 @@ public function test_input_validation_delete() {
 	 */
 	public function test_input_sanitizing_create() {
 		wp_set_current_user( self::$admin_id );
-		$this->controller->reregister_routes( 'zadani' );
 
 		$request = new WP_REST_Request( 'POST', '/gravity-pdf/v1/form/' . $this->form_id );
 		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( [
-			'name'     => '<strong>My Label {:20:value}</strong> %10',
-			'template' => 'zadani',
-			'font_size' => '20',
-			'header' => '<a href="{:20}">My link</a><barcode code="{Field:10.5:value}" /> <span onclick="javascript:alert()">Item</span>',
+			'name'          => '<strong>My Label {:20:value}</strong> %10',
+			'template'      => 'rubix',
+			'font_size'     => '20',
+			'header'        => '<a href="{:20}">My link</a><barcode code="{Field:10.5:value}" /> <span onclick="javascript:alert()">Item</span>',
 			'public_access' => true,
 		] );
 
@@ -877,14 +997,13 @@ public function test_input_sanitizing_create() {
 	 */
 	public function test_input_sanitizing_update() {
 		wp_set_current_user( self::$admin_id );
-		$this->controller->reregister_routes( 'zadani' );
 
 		/* Create valid PDF */
 		$request = new WP_REST_Request( 'POST', '/gravity-pdf/v1/form/' . $this->form_id );
 		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( [
 			'name'     => 'Label',
-			'template' => 'zadani',
+			'template' => 'rubix',
 		] );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -895,9 +1014,9 @@ public function test_input_sanitizing_update() {
 		$request = new WP_REST_Request( 'PUT', '/gravity-pdf/v1/form/' . $this->form_id . '/' . $pdf_id );
 		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( [
-			'name'     => '<strong>My Label {:20:value}</strong> %10',
-			'font_size' => '20',
-			'header' => '<a href="{:20}">My link</a><barcode code="{Field:10.5:value}" /> <span onclick="javascript:alert()">Item</span>',
+			'name'          => '<strong>My Label {:20:value}</strong> %10',
+			'font_size'     => '20',
+			'header'        => '<a href="{:20}">My link</a><barcode code="{Field:10.5:value}" /> <span onclick="javascript:alert()">Item</span>',
 			'public_access' => true,
 		] );
 
@@ -924,14 +1043,13 @@ public function test_input_sanitizing_update() {
 	 */
 	public function test_get_and_update_callbacks() {
 		wp_set_current_user( self::$admin_id );
-		$this->controller->reregister_routes( 'zadani' );
 
 		/* Check custom PDF size is not saved if pdf_size is not custom */
 		$request = new WP_REST_Request( 'POST', '/gravity-pdf/v1/form/' . $this->form_id );
 		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( [
 			'name'            => 'Label',
-			'template'        => 'zadani',
+			'template'        => 'rubix',
 			'pdf_size'        => 'A4',
 			'custom_pdf_size' => [
 				'width'  => 300,
@@ -952,7 +1070,7 @@ public function test_get_and_update_callbacks() {
 		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( [
 			'name'            => 'Label',
-			'template'        => 'zadani',
+			'template'        => 'rubix',
 			'pdf_size'        => 'CUSTOM',
 			'custom_pdf_size' => [
 				'width'  => 300,
@@ -975,17 +1093,20 @@ public function test_get_and_update_callbacks() {
 	}
 
 	public function test_default_custom_pdf_size() {
+		/* Update the default plugin options */
 		\GPDFAPI::update_plugin_option( 'default_pdf_size', 'CUSTOM' );
 		\GPDFAPI::update_plugin_option( 'default_custom_pdf_size', [ 5, 7, 'inches' ] );
 
+		/* Reregister the endpoints with new schema */
+		$this->api->register_routes();
+
+		/* Run the API request */
 		wp_set_current_user( self::$admin_id );
-		$this->controller->reregister_routes( 'zadani' );
 
 		$request = new WP_REST_Request( 'POST', '/gravity-pdf/v1/form/' . $this->form_id );
 		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( [
-			'name'     => 'Label',
-			'template' => 'zadani',
+			'name' => 'Label',
 		] );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -1004,16 +1125,15 @@ public function test_default_custom_pdf_size() {
 
 	public function test_custom_pdf_size() {
 		wp_set_current_user( self::$admin_id );
-		$this->controller->reregister_routes( 'zadani' );
 
 		/* test for an invalid option */
 		$request = new WP_REST_Request( 'POST', '/gravity-pdf/v1/form/' . $this->form_id );
 		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( [
-			'name'     => 'Label',
-			'template' => 'zadani',
-			'pdf_size' => 'CUSTOM',
-			'custom_pdf_size' => [ 5, 7, 'inches'],
+			'name'            => 'Label',
+			'template'        => 'rubix',
+			'pdf_size'        => 'CUSTOM',
+			'custom_pdf_size' => [ 5, 7, 'inches' ],
 		] );
 
 		$response = rest_get_server()->dispatch( $request );
@@ -1023,13 +1143,13 @@ public function test_custom_pdf_size() {
 		$request = new WP_REST_Request( 'POST', '/gravity-pdf/v1/form/' . $this->form_id );
 		$request->add_header( 'content-type', 'application/x-www-form-urlencoded' );
 		$request->set_body_params( [
-			'name'     => 'Label',
-			'template' => 'zadani',
-			'pdf_size' => 'CUSTOM',
+			'name'            => 'Label',
+			'template'        => 'rubix',
+			'pdf_size'        => 'CUSTOM',
 			'custom_pdf_size' => [
-				'width' => 5.0,
+				'width'  => 5.0,
 				'height' => 4.0,
-				'unit' => 'in',
+				'unit'   => 'in',
 			],
 		] );
 
@@ -1037,30 +1157,10 @@ public function test_custom_pdf_size() {
 		$this->assertSame( 201, $response->get_status() );
 	}
 
-	public function filter_rest_url_for_leading_slash( $url, $path ) {
-		if ( is_multisite() || get_option( 'permalink_structure' ) ) {
-			return $url;
-		}
-
-		// Make sure path for rest_url has a leading slash for proper resolution.
-		if ( 0 !== strpos( $path, '/' ) ) {
-			$this->fail(
-				sprintf(
-					'REST API URL "%s" should have a leading slash.',
-					$path
-				)
-			);
-		}
-
-		return $url;
-	}
-
 	public function test_assign_template_for_schema() {
-		$GLOBALS['wp']->query_vars['rest_route'] = '/' . $this->controller::NAMESPACE . $this->controller::API_BASE;
-		$_POST['template']                       = 'focus-gravity';
-		$this->controller->register_routes();
+		$this->api->get_template_schema( 'focus-gravity' );
 
-		$schema = $this->controller->get_item_schema();
+		$schema = $this->api->get_item_schema();
 
 		/* Check the template-specific properties are included */
 		$this->assertArrayHasKey( 'show_form_title', $schema['properties'] );
@@ -1069,22 +1169,45 @@ public function test_assign_template_for_schema() {
 		$this->assertArrayHasKey( 'header', $schema['properties'] );
 		$this->assertArrayHasKey( 'first_header', $schema['properties'] );
 		$this->assertArrayHasKey( 'background_color', $schema['properties'] );
+		$this->assertArrayHasKey( 'focusgravity_accent_colour', $schema['properties'] );
 	}
 
-	public function test_dont_assign_template_for_schema() {
-		/* Check we only match our specific endpoint */
-		$GLOBALS['wp']->query_vars['rest_route'] = '/' . $this->controller::NAMESPACE;
-		$_POST['template']                       = 'focus-gravity';
-		$this->controller->register_routes();
+	public function test_get_schema_for_template() {
+		wp_set_current_user( self::$admin_id );
+
+		$request = new WP_REST_Request( 'GET', '/' . $this->api::get_route_basepath() . '/' . $this->form_id . '/schema' );
+		$request->set_query_params( [
+				'template' => 'rubix',
+			]
+		);
 
-		$schema = $this->controller->get_item_schema();
+		$response = rest_get_server()->dispatch( $request );
+		$schema   = $response->get_data();
 
-		/* Check the template-specific properties are included */
-		$this->assertArrayNotHasKey( 'show_form_title', $schema['properties'] );
-		$this->assertArrayNotHasKey( 'show_html', $schema['properties'] );
-		$this->assertArrayNotHasKey( 'show_section_content', $schema['properties'] );
-		$this->assertArrayNotHasKey( 'header', $schema['properties'] );
-		$this->assertArrayNotHasKey( 'first_header', $schema['properties'] );
-		$this->assertArrayNotHasKey( 'background_color', $schema['properties'] );
+		$this->test_for_pdf_settings( $schema['properties'] );
+
+		/* Filter fields by context */
+		$request->set_query_params( [
+			'template' => 'focus-gravity',
+			'context'  => 'template',
+		] );
+
+		$response = rest_get_server()->dispatch( $request );
+		$schema   = $response->get_data();
+
+		$this->assertArrayHasKey( 'show_form_title', $schema['properties'] );
+		$this->assertArrayHasKey( 'show_html', $schema['properties'] );
+		$this->assertArrayHasKey( 'show_section_content', $schema['properties'] );
+		$this->assertArrayHasKey( 'header', $schema['properties'] );
+		$this->assertArrayHasKey( 'first_header', $schema['properties'] );
+		$this->assertArrayHasKey( 'background_color', $schema['properties'] );
+		$this->assertArrayHasKey( 'focusgravity_accent_colour', $schema['properties'] );
+
+		$this->assertArrayNotHasKey( 'form', $schema['properties'] );
+		$this->assertArrayNotHasKey( 'active', $schema['properties'] );
+		$this->assertArrayNotHasKey( 'name', $schema['properties'] );
+		$this->assertArrayNotHasKey( 'filename', $schema['properties'] );
+		$this->assertArrayNotHasKey( 'notification', $schema['properties'] );
+		$this->assertArrayNotHasKey( 'conditionalLogic', $schema['properties'] );
 	}
 }
diff --git a/tests/phpunit/unit-tests/Rest/Test_Rest_Pdf_Preview.php b/tests/phpunit/unit-tests/Rest/Test_Rest_Pdf_Preview.php
new file mode 100644
index 000000000..4c767caf3
--- /dev/null
+++ b/tests/phpunit/unit-tests/Rest/Test_Rest_Pdf_Preview.php
@@ -0,0 +1,143 @@
+<?php
+
+namespace GFPDF\Tests;
+
+use GFPDF\Rest\Rest_Pdf_Preview;
+use WP_REST_Request;
+
+/**
+ *
+ * @package     Gravity PDF
+ * @copyright   Copyright (c) 2024, Blue Liquid Designs
+ * @license     http://opensource.org/licenses/gpl-2.0.php GNU Public License
+ */
+
+/**
+ * @group api
+ */
+class Test_Rest_Pdf_Preview extends Test_Rest {
+
+	/**
+	 * @var Rest_Pdf_Preview
+	 */
+	protected $api;
+
+	function set_up() {
+		global $gfpdf;
+
+		$this->api = new Rest_Pdf_Preview( $gfpdf->options, $gfpdf->gform, $gfpdf->misc, $gfpdf->templates );
+
+		parent::set_up();
+
+		/* Configure mPDF with available fonts */
+		$config = static function ( $config ) {
+			return array_merge( $config, [
+				'fontDir'  => __DIR__ . '/../../data/fonts/',
+				'fontdata' => [
+					'dejavusans' => [
+						'R'          => 'DejaVuSans.ttf',
+						'useOTL'     => 0xff,
+						'useKashida' => 75,
+					],
+				],
+
+				'backupSubsFont' => [],
+				'backupSIPFont'  => '',
+				'BMPonly'        => [ 'dejavusans' ],
+			] );
+		};
+
+		add_filter( 'gfpdf_mpdf_class_config', $config );
+	}
+
+	public function test_register_routes() {
+		$routes = rest_get_server()->get_routes();
+
+		foreach ( $this->api::$endpoints as $route ) {
+			$this->assertArrayHasKey( '/' . $this->api::NAMESPACE . $route, $routes );
+		}
+	}
+
+	public function test_create_item_preview() {
+
+		$request = new WP_REST_Request( 'POST', '/' . $this->api::get_route_basepath() . '/' . $this->form_id . '/preview' );
+		$request->set_body_params( [
+			'name'     => 'Document',
+			'filename' => 'Filename',
+		] );
+
+		/* Test for authentication error */
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertEquals( 401, $response->get_status() );
+
+		/* Test the PDF generator creates the preview */
+		wp_set_current_user( self::$admin_id );
+
+		/* Test the PDF was actually created */
+		$response = rest_get_server()->dispatch( $request );
+
+		$this->assertEquals( 500, $response->get_status() );
+		$this->assertEquals( 'headers_sent', $response->get_data()['code'] );
+	}
+
+	public function test_create_item_preview_with_entry() {
+
+		$entry = $this->factory->entry->create_and_get( [ 'form_id' => $this->form_id ] );
+
+		wp_set_current_user( self::$admin_id );
+
+		$request = new WP_REST_Request( 'POST', '/' . $this->api::get_route_basepath() . '/' . $this->form_id . '/preview' );
+		$request->set_body_params( [
+			'name'     => 'Document',
+			'filename' => 'Filename',
+			'entry'    => $entry['id'],
+		] );
+
+		/* Test the PDF was actually created */
+		$response = rest_get_server()->dispatch( $request );
+
+		$this->assertEquals( 500, $response->get_status() );
+		$this->assertEquals( 'headers_sent', $response->get_data()['code'] );
+
+		/* Don't pass the entry */
+		$request->set_body_params( [
+			'name'     => 'Document',
+			'filename' => 'Filename',
+		] );
+
+		$response = rest_get_server()->dispatch( $request );
+
+		$this->assertEquals( 500, $response->get_status() );
+		$this->assertEquals( 'headers_sent', $response->get_data()['code'] );
+	}
+
+	public function test_create_item_preview_with_invalid_entry() {
+		wp_set_current_user( self::$admin_id );
+
+		$request = new WP_REST_Request( 'POST', '/' . $this->api::get_route_basepath() . '/' . $this->form_id . '/preview' );
+		$request->set_body_params( [
+			'name'     => 'Document',
+			'filename' => 'Filename',
+			'entry'    => 520,
+		] );
+
+		/* Test for error with invalid entry ID */
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertEquals( 400, $response->get_status() );
+
+		/* Test for error with invalid entry ID for requested form */
+		$form_id  = $this->factory->form->create();
+		$entry_id = $this->factory->entry->create( [ 'form_id' => $this->form_id ] );
+
+		$request = new WP_REST_Request( 'POST', '/' . $this->api::get_route_basepath() . '/' . $form_id . '/preview' );
+
+		$request->set_body_params( [
+			'name'     => 'Document',
+			'filename' => 'Filename',
+			'entry'    => $entry_id,
+		] );
+
+		$response = rest_get_server()->dispatch( $request );
+		$this->assertEquals( 400, $response->get_status() );
+	}
+}
diff --git a/tests/phpunit/unit-tests/php/simple_config b/tests/phpunit/unit-tests/php/simple_config
deleted file mode 100644
index dd75f3fed..000000000
--- a/tests/phpunit/unit-tests/php/simple_config
+++ /dev/null
@@ -1,106 +0,0 @@
-<?php
-
-/**
- * v3 Configuration sample for our testing suite
- */
-
-if( ! class_exists( 'GravityPDF_Unit_Tests_Bootstrap' ) ) {
-  die();
-}
-
-/*
- * Gravity PDF Configuration
- * Each option is explained in detail in this file but you can also find a more user-friendly option online:
- * https://developer.gravitypdf.com/documentation/configuration-options-examples/
- */
- 
- global $gf_pdf_default_configuration;
- 
- $gf_pdf_default_configuration = array(
-  'template' => 'default-template.php',
-  'pdf_size' => 'A4',
- );
- 
- /*
-  * ------------------------------------------------------------
-  * Bare minimum configuration code
-  * Usage: Will generate PDF and send to all notifications
-  * Remove the comments around the code blocks below to use (/*)
-  * form_id Mixed - Integer or Array. Required. The Gravity Form ID you are assigning the PDF to.
-  * notifications Mixed - String, Boolean or Array.
-  */
-  
-  $gf_pdf_config[] = array(
-    'form_id' => 1,
-    'notifications' => true,
-    'premium' => true,
-    'template' => 'health-care-directive.php',
-  );
-
-  $gf_pdf_config[] = array(
-    'form_id' => 1,
-    'template' => 'example-template.php',
-    'filename' => 'testman.pdf',
-    'notifications' => 'Admin Notification',
-    'access' => 'all',
-  );
-
-  $gf_pdf_config[] = array(
-    'form_id' => 1,
-    'template' => 'default-template-no-style.php',
-    'filename' => 'Double Trouble.pdf',
-    'default-show-html' => true,
-    'default-show-empty' => true,
-    'default-show-page-names' => true,
-    'default-show-section-content' => true,
-  );
-
-  $gf_pdf_config[] = array(
-    'form_id' => 1,
-    'notifications' => true,
-    'filename' => 'testman.pdf',
-     
-    'security' => true,
-    'pdf_password' => 'myPDFpass',
-    'pdf_privileges' => array('copy', 'print', 'modify', 'annot-forms', 'fill-forms', 'extract', 'assemble', 'print-highres'),
-    'pdf_master_password' => 'admin password',
-  );
-
-  $gf_pdf_config[] = array(
-    'form_id' => 1,
-    'filename' => 'testman2.pdf',
-    'notifications' => array('Admin Notification', 'User Notification'),
-     
-    'security' => true,
-    'pdf_password' => '',
-    'pdf_privileges' => array('copy', 'print', 'extract', 'assemble', 'print-highres'),
-    'pdf_master_password' => 'adfawfawr5q2atd',
-  );
-
-  $gf_pdf_config[] = array(
-    'form_id' => 1,
-    'filename' => 'testman3.pdf',
-     
-    'security' => true,
-    'pdf_password' => '',
-    'pdf_master_password' => '',
-  );
-
-  $gf_pdf_config[] = array(
-    'form_id' => 1,
-    'orientation' => 'landscape',
-    'pdf_size' => 'letter',
-    'rtl' => true,
-    'pdfa1b' => true,
-    'dpi' => 300,
-  );
-
-  /* Custom PDF Size */
-   $gf_pdf_config[] = array(
-    'form_id' => 1,
-    'notifications' => 'Admin Notification',
-    'pdf_size' => array(50, 200),
-    'save' => true,
-    'pdfx1a' => true,
-    'dpi' => 300,
-  );
diff --git a/tests/phpunit/unit-tests/test-ajax.php b/tests/phpunit/unit-tests/test-ajax.php
index bd1fd426d..1c3cf4e56 100644
--- a/tests/phpunit/unit-tests/test-ajax.php
+++ b/tests/phpunit/unit-tests/test-ajax.php
@@ -79,7 +79,7 @@ public static function set_up_before_class() {
 	 * @since 4.0
 	 */
 	private function import_form() {
-		$json          = json_decode( trim( file_get_contents( dirname( __FILE__ ) . '/json/form-settings.json' ) ), true );
+		$json          = json_decode( trim( file_get_contents( __DIR__ . '/../data/json/form-settings.json' ) ), true );
 		$this->form_id = GFAPI::add_form( $json );
 	}
 
diff --git a/tests/phpunit/unit-tests/test-api.php b/tests/phpunit/unit-tests/test-api.php
index 0f1ed7356..b9293d4df 100644
--- a/tests/phpunit/unit-tests/test-api.php
+++ b/tests/phpunit/unit-tests/test-api.php
@@ -236,7 +236,7 @@ public function test_add_pdf_font() {
 		$this->assertEquals( 'font_validation_error', $results->get_error_code() );
 
 		/* Test we correctly install the font */
-		$ttf_file = __DIR__ . '/fonts/Chewy.ttf';
+		$ttf_file = __DIR__ . '/../data/fonts/Chewy.ttf';
 
 		$font = [
 			'font_name' => 'Test',
@@ -254,7 +254,7 @@ public function test_add_pdf_font() {
 	}
 
 	public function test_add_pdf_font_duplicate() {
-		$ttf_file = __DIR__ . '/fonts/Chewy.ttf';
+		$ttf_file = __DIR__ . '/../data/fonts/Chewy.ttf';
 
 		$font = [
 			'font_name' => 'Test',
@@ -284,7 +284,7 @@ public function test_delete_pdf_font() {
 		$this->assertEquals( 'invalid_font_id', $results->get_error_code() );
 
 		/* Add a font and then see if we can remove it */
-		$ttf_file = __DIR__ . '/fonts/Chewy.ttf';
+		$ttf_file = __DIR__ . '/../data/fonts/Chewy.ttf';
 
 		$font = [
 			'font_name' => 'Test',
diff --git a/tests/phpunit/unit-tests/test-form-data.php b/tests/phpunit/unit-tests/test-form-data.php
index 4f45a7f8d..e5bcec63a 100644
--- a/tests/phpunit/unit-tests/test-form-data.php
+++ b/tests/phpunit/unit-tests/test-form-data.php
@@ -267,7 +267,7 @@ public function test_field_number() {
 	 * Test that number fields will use the local currency set in the entry
 	 */
 	public function test_field_number_currency() {
-		$form_json = json_decode( trim( file_get_contents( dirname( __FILE__ ) . '/json/number-fields.json' ) ), true );
+		$form_json = json_decode( trim( file_get_contents( __DIR__ . '/../data/json/number-fields.json' ) ), true );
 		$form_id   = GFAPI::add_form( $form_json );
 
 		$entry_id = GFAPI::add_entry(
@@ -1536,7 +1536,7 @@ public function test_empty_fields() {
 	 * Ensure the Product data calculations are correct when using Euros (or similar comma/decimal switched currency)
 	 */
 	public function test_euro_product_data() {
-		$json            = json_decode( trim( file_get_contents( dirname( __FILE__ ) . '/json/all-form-euro-product-entry.json' ) ), true );
+		$json            = json_decode( trim( file_get_contents( __DIR__ . '/../data/json/all-form-euro-product-entry.json' ) ), true );
 		$json['form_id'] = $this->form['id'];
 		$entry_id        = GFAPI::add_entry( $json );
 		$entry           = GFAPI::get_entry( $entry_id );
diff --git a/tests/phpunit/unit-tests/test-form-settings.php b/tests/phpunit/unit-tests/test-form-settings.php
index e61cd26e7..082bf98ba 100644
--- a/tests/phpunit/unit-tests/test-form-settings.php
+++ b/tests/phpunit/unit-tests/test-form-settings.php
@@ -468,7 +468,7 @@ public function test_settings_sanitize() {
 		remove_all_filters( 'gfpdf_form_settings_sanitize_hidden' );
 
 		/* get faux input data */
-		$input = json_decode( file_get_contents( dirname( __FILE__ ) . '/json/form-settings-sample-input.json' ), true );
+		$input = json_decode( file_get_contents( __DIR__ . '/../data/json/form-settings-sample-input.json' ), true );
 
 		/* Set up global filters we can check */
 		add_filter(
diff --git a/tests/phpunit/unit-tests/test-options-api.php b/tests/phpunit/unit-tests/test-options-api.php
index 17a44c19e..85a24ec15 100644
--- a/tests/phpunit/unit-tests/test-options-api.php
+++ b/tests/phpunit/unit-tests/test-options-api.php
@@ -56,7 +56,7 @@ public function set_up() {
 		$this->options = \GPDFAPI::get_options_class();
 
 		/* load settings in database  */
-		update_option( 'gfpdf_settings', json_decode( file_get_contents( dirname( __FILE__ ) . '/json/options-settings.json' ), true ) );
+		update_option( 'gfpdf_settings', json_decode( file_get_contents( __DIR__ . '/../data/json/options-settings.json' ), true ) );
 
 		/* Load a form / form PDF settings into database */
 		$this->form_id                                = $GLOBALS['GFPDF_Test']->form['form-settings']['id'];
diff --git a/tests/phpunit/unit-tests/test-shortcodes.php b/tests/phpunit/unit-tests/test-shortcodes.php
index e4347f9ee..f66aea44a 100644
--- a/tests/phpunit/unit-tests/test-shortcodes.php
+++ b/tests/phpunit/unit-tests/test-shortcodes.php
@@ -388,7 +388,7 @@ public function test_gravitypdf_notification() {
 	public function test_add_shortcode_attr() {
 
 		/* Setup our test data */
-		$content = json_decode( trim( file_get_contents( dirname( __FILE__ ) . '/json/shortcode-data.json' ) ), true );
+		$content = json_decode( trim( file_get_contents( __DIR__ . '/../data/json/shortcode-data.json' ) ), true );
 
 		$shortcodes = $this->model->get_shortcode_information( 'gravitypdf', $content );
 
@@ -481,7 +481,7 @@ public function test_gravitypdf_redirect_confirmation_shortcode_processing() {
 	 * @since 4.0
 	 */
 	public function test_get_shortcode_information() {
-		$content = json_decode( trim( file_get_contents( dirname( __FILE__ ) . '/json/shortcode-data.json' ) ), true );
+		$content = json_decode( trim( file_get_contents( __DIR__ . '/../data/json/shortcode-data.json' ) ), true );
 
 		$this->assertCount( 0, $this->model->get_shortcode_information( 'gravitypdf', [] ) );
 
diff --git a/tests/phpunit/unit-tests/test-slow-pdf-processes.php b/tests/phpunit/unit-tests/test-slow-pdf-processes.php
index f33cc3d4e..1f423b056 100644
--- a/tests/phpunit/unit-tests/test-slow-pdf-processes.php
+++ b/tests/phpunit/unit-tests/test-slow-pdf-processes.php
@@ -75,7 +75,7 @@ public function set_up() {
 
 		$this->controller = new Controller_PDF( $this->model, $this->view, $gfpdf->gform, $gfpdf->log, $gfpdf->misc );
 
-		$fonts = glob( dirname( __FILE__ ) . '/fonts/' . '*.[tT][tT][fF]' );
+		$fonts = glob( __DIR__ . '/../data/fonts/' . '*.[tT][tT][fF]' );
 		$fonts = ( is_array( $fonts ) ) ? $fonts : [];
 
 		foreach ( $fonts as $font ) {
@@ -153,9 +153,14 @@ public function test_process_legacy_pdf_endpoint() {
 		try {
 			$user_id = $this->factory->user->create( [ 'role' => 'administrator' ] );
 			wp_set_current_user( $user_id );
+
+			add_action( 'gfpdf_post_view_or_download_pdf', function () {
+				wp_die( 'PDF generated successfully' );
+			} );
+
 			$this->controller->process_legacy_pdf_endpoint();
 		} catch ( Exception $e ) {
-			$this->assertEquals( 'The PDF cannot be displayed because the server headers have already been sent.', $e->getMessage() );
+			$this->assertEquals( 'PDF generated successfully', $e->getMessage() );
 
 			return;
 		}
@@ -164,7 +169,7 @@ public function test_process_legacy_pdf_endpoint() {
 	}
 
 	/**
-	 * Test the DF endpoint is secured and will generate a PDF successfully
+	 * Test the PDF endpoint is secured and will generate a PDF successfully
 	 */
 	public function test_process_pdf_endpoint() {
 
@@ -187,9 +192,14 @@ public function test_process_pdf_endpoint() {
 		try {
 			$user_id = $this->factory->user->create( [ 'role' => 'administrator' ] );
 			wp_set_current_user( $user_id );
+
+			add_action( 'gfpdf_post_view_or_download_pdf', function () {
+				wp_die( 'PDF generated successfully' );
+			} );
+
 			$this->controller->process_pdf_endpoint();
 		} catch ( Exception $e ) {
-			$this->assertEquals( 'The PDF cannot be displayed because the server headers have already been sent.', $e->getMessage() );
+			$this->assertEquals( 'PDF generated successfully', $e->getMessage() );
 
 			return;
 		}