updating block admin enque

infinum · Jan 17, 2024 · 9dcb5cc · 9dcb5cc
1 parent 06c112d
commit 9dcb5cc
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 9 deletions.
diff --git a/src/Config/UtilsConfig.php b/src/Config/UtilsConfig.php
@@ -469,7 +469,6 @@ class UtilsConfig
 	public const FD_API_STEPS = 'apiSteps';
 	public const FD_CAPTCHA = 'captcha';
 	public const FD_STORAGE = 'storage';
-	public const FD_ADDON_DATA = 'addonData';
 	public const FD_EMAIL_RESPONSE_TAGS = 'emailResponseTags';
 	public const FD_IS_VALID = 'isValid';
 	public const FD_IS_API_VALID = 'isApiValid';
@@ -481,6 +480,9 @@ class UtilsConfig
 	public const FD_FIELD_NAMES_FULL = 'fieldNamesFull';
 	public const FD_STEPS_SETUP = 'stepsSetup';
 	public const FD_RESPONSE_OUTPUT_DATA = 'responseOutputData';
+	public const FD_ADDON = 'addon';
+	public const FD_SUCCESS_REDIRECT = 'successRedirect';
+	public const FD_VALIDATION = 'validation';
 
 
 	// ------------------------------------------------------------------

diff --git a/src/Helpers/UtilsApiHelper.php b/src/Helpers/UtilsApiHelper.php
@@ -149,10 +149,15 @@ public static function getIntegrationApiPublicOutput(array $formDetails, string
 
 		$additionalOutput = [];
 
-		$allowedOutputKeys = UtilsHelper::getStateResponseOutputKeys();
+		$allowedOutput = [
+			UtilsConfig::FD_SUCCESS_REDIRECT => UtilsHelper::getStateResponseOutputKey('successRedirect'),
+			UtilsConfig::FD_ADDON => UtilsHelper::getStateResponseOutputKey('addon'),
+			UtilsConfig::FD_VALIDATION => UtilsHelper::getStateResponseOutputKey('validation'),
+		];
 
-		foreach ($allowedOutputKeys as $value) {
-			if (isset($response[$value])) {
+		// Populate additional output with allowed keys and aproppriate allowed output keys used in JS.
+		foreach ($allowedOutput as $key => $value) {
+			if (isset($response[$key])) {
 				$additionalOutput[$value] = $response[$value];
 			}
 		}

diff --git a/src/Rest/Routes/AbstractUtilsBaseRoute.php b/src/Rest/Routes/AbstractUtilsBaseRoute.php
@@ -460,9 +460,6 @@ protected function getFormDetailsApi($request): array
 		// Get form storage from params.
 		$output[UtilsConfig::FD_STORAGE] = \json_decode($params['storage'] ?? '', true) ?? [];
 
-		// Create placeholder for addon data.
-		$output[UtilsConfig::FD_ADDON_DATA] = [];
-
 		return $output;
 	}
 

diff --git a/src/manifest.json b/src/manifest.json
@@ -226,8 +226,8 @@
 		},
 		"responseOutputKeys": {
 			"validation": "validation",
-			"addon": "addon",
-			"successRedirectData": "successRedirectData",
+			"addon": "addonData",
+			"successRedirect": "successRedirectData",
 			"file": "file",
 			"stepType": "stepType",
 			"stepNextStep": "stepNextStep",