release 5.0.5 (#440)

* adding new filter * adding new api for custom api
infinum · Aug 12, 2024 · 043dc26 · 043dc26
1 parent fbc768a
commit 043dc26
Show file tree

Hide file tree

Showing 15 changed files with 140 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 
 This projects adheres to [Semantic Versioning](https://semver.org/) and [Keep a CHANGELOG](https://keepachangelog.com/).
 
+## [5.0.5]
+
+### Added
+
+- new integration filter `overridePostRequest` to override the post request data.
+- new public helper `getFormsGetCountryList` to get the list of countries.
+
 ## [5.0.4]
 
 ### Fixed
@@ -610,9 +617,10 @@ This projects adheres to [Semantic Versioning](https://semver.org/) and [Keep a
 
 - Initial production release.
 
-[5.0.3]: https://github.com/infinum/eightshift-forms/compare/5.0.3...5.0.4
-[5.0.2]: https://github.com/infinum/eightshift-forms/compare/5.0.2...5.0.3
-[5.0.1]: https://github.com/infinum/eightshift-forms/compare/5.0.1...5.0.2
+[5.0.5]: https://github.com/infinum/eightshift-forms/compare/5.0.4...5.0.5
+[5.0.4]: https://github.com/infinum/eightshift-forms/compare/5.0.3...5.0.4
+[5.0.3]: https://github.com/infinum/eightshift-forms/compare/5.0.2...5.0.3
+[5.0.2]: https://github.com/infinum/eightshift-forms/compare/5.0.1...5.0.2
 [5.0.1]: https://github.com/infinum/eightshift-forms/compare/5.0.0...5.0.1
 [5.0.0]: https://github.com/infinum/eightshift-forms/compare/4.0.7...5.0.0
 [4.0.7]: https://github.com/infinum/eightshift-forms/compare/4.0.6...4.0.7

diff --git a/eightshift-forms.php b/eightshift-forms.php
@@ -6,7 +6,7 @@
  * Description: Eightshift Forms is a complete form builder plugin that utilizes modern Block editor features with multiple third-party integrations, bringing your project to a new level.
  * Author: WordPress team @Infinum
  * Author URI: https://eightshift.com/
- * Version: 5.0.4
+ * Version: 5.0.5
  * Text Domain: eightshift-forms
  *
  * @package EightshiftForms

diff --git a/src/Helpers/publicHelper.php b/src/Helpers/publicHelper.php
@@ -7,6 +7,7 @@
  */
 
 use EightshiftForms\Cache\ManifestCache;
+use EightshiftForms\Countries\Countries;
 use EightshiftForms\Entries\EntriesHelper;
 use EightshiftFormsVendor\EightshiftFormsUtils\Helpers\UtilsGeneralHelper;
 use EightshiftForms\General\SettingsGeneral;
@@ -126,3 +127,13 @@ function esFormGetEntry(string $id): array
 {
 	return EntriesHelper::getEntry($id);
 }
+
+/**
+ * Get countries data set depending on the provided filter and default set.
+ *
+ * @return array<string, mixed>
+ */
+function getFormsGetCountryList(): array
+{
+	return (new Countries())->getCountriesDataSet();
+}
diff --git a/src/Hooks/Filters.php b/src/Hooks/Filters.php
@@ -176,6 +176,7 @@ private static function getPublicFilters(): array
 					'data',
 					'order',
 					'prePostId',
+					'overridePostRequest',
 					'prePostParams',
 					'beforeSuccessResponse',
 					'afterCustomResultOutputProcess',
@@ -184,6 +185,7 @@ private static function getPublicFilters(): array
 					'data',
 					'order',
 					'prePostId',
+					'overridePostRequest',
 					'prePostParams',
 					'beforeSuccessResponse',
 					'afterCustomResultOutputProcess',
@@ -193,6 +195,7 @@ private static function getPublicFilters(): array
 					'data',
 					'order',
 					'prePostId',
+					'overridePostRequest',
 					'prePostParams',
 					'beforeSuccessResponse',
 					'afterCustomResultOutputProcess',
@@ -201,6 +204,7 @@ private static function getPublicFilters(): array
 					'data',
 					'order',
 					'prePostId',
+					'overridePostRequest',
 					'prePostParams',
 					'beforeSuccessResponse',
 					'afterCustomResultOutputProcess',
@@ -209,6 +213,7 @@ private static function getPublicFilters(): array
 					'data',
 					'order',
 					'prePostId',
+					'overridePostRequest',
 					'prePostParams',
 					'beforeSuccessResponse',
 					'afterCustomResultOutputProcess',
@@ -220,6 +225,7 @@ private static function getPublicFilters(): array
 					'data',
 					'order',
 					'prePostId',
+					'overridePostRequest',
 					'prePostParams',
 					'beforeSuccessResponse',
 					'afterCustomResultOutputProcess',
@@ -228,6 +234,7 @@ private static function getPublicFilters(): array
 					'data',
 					'order',
 					'prePostId',
+					'overridePostRequest',
 					'prePostParams',
 					'beforeSuccessResponse',
 					'afterCustomResultOutputProcess',
@@ -236,6 +243,7 @@ private static function getPublicFilters(): array
 					'data',
 					'order',
 					'prePostId',
+					'overridePostRequest',
 					'prePostParams',
 					'beforeSuccessResponse',
 					'afterCustomResultOutputProcess',
@@ -246,21 +254,25 @@ private static function getPublicFilters(): array
 					'data',
 					'order',
 					'prePostId',
+					'overridePostRequest',
 					'prePostParams',
 					'beforeSuccessResponse',
 					'afterCustomResultOutputProcess',
 				],
 				SettingsJira::SETTINGS_TYPE_KEY => [
+					'overridePostRequest',
 					'prePostParams',
 					'beforeSuccessResponse',
 					'afterCustomResultOutputProcess',
 				],
 				SettingsPipedrive::SETTINGS_TYPE_KEY => [
+					'overridePostRequest',
 					'prePostParams',
 					'beforeSuccessResponse',
 					'afterCustomResultOutputProcess',
 				],
 				SettingsCalculator::SETTINGS_TYPE_KEY => [
+					'overridePostRequest',
 					'prePostParams',
 					'beforeSuccessResponse',
 					'afterCustomResultOutputProcess',

diff --git a/src/Integrations/Airtable/AirtableClient.php b/src/Integrations/Airtable/AirtableClient.php
@@ -185,6 +185,16 @@ static function ($item) {
 	 */
 	public function postApplication(string $itemId, array $params, array $files, string $formId): array
 	{
+		// Filter override post request.
+		$filterName = UtilsHooksHelper::getFilterName(['integrations', SettingsAirtable::SETTINGS_TYPE_KEY, 'overridePostRequest']);
+		if (\has_filter($filterName)) {
+			$filterValue = \apply_filters($filterName, [], $itemId, $params, $files, $formId) ?? [];
+
+			if ($filterValue) {
+				return $filterValue;
+			}
+		}
+
 		$body = [
 			'fields' => $this->prepareParams($params, $formId),
 		];

diff --git a/src/Integrations/Goodbits/GoodbitsClient.php b/src/Integrations/Goodbits/GoodbitsClient.php
@@ -108,6 +108,16 @@ public function getItem(string $itemId): array
 	 */
 	public function postApplication(string $itemId, array $params, array $files, string $formId): array
 	{
+		// Filter override post request.
+		$filterName = UtilsHooksHelper::getFilterName(['integrations', SettingsGoodbits::SETTINGS_TYPE_KEY, 'overridePostRequest']);
+		if (\has_filter($filterName)) {
+			$filterValue = \apply_filters($filterName, [], $itemId, $params, $files, $formId) ?? [];
+
+			if ($filterValue) {
+				return $filterValue;
+			}
+		}
+
 		$body = [
 			'subscriber' => $this->prepareParams($params, $formId),
 		];

diff --git a/src/Integrations/Greenhouse/GreenhouseClient.php b/src/Integrations/Greenhouse/GreenhouseClient.php
@@ -149,6 +149,16 @@ public function getItem(string $itemId): array
 	 */
 	public function postApplication(string $itemId, array $params, array $files, string $formId): array
 	{
+		// Filter override post request.
+		$filterName = UtilsHooksHelper::getFilterName(['integrations', SettingsGreenhouse::SETTINGS_TYPE_KEY, 'overridePostRequest']);
+		if (\has_filter($filterName)) {
+			$filterValue = \apply_filters($filterName, [], $itemId, $params, $files, $formId) ?? [];
+
+			if ($filterValue) {
+				return $filterValue;
+			}
+		}
+
 		$paramsPrepared = $this->prepareParams($params, $formId);
 		$paramsFiles = $this->prepareFiles($files);
 

diff --git a/src/Integrations/Hubspot/HubspotClient.php b/src/Integrations/Hubspot/HubspotClient.php
@@ -214,6 +214,16 @@ public function getContactProperties(): array
 	 */
 	public function postApplication(string $itemId, array $params, array $files, string $formId): array
 	{
+		// Filter override post request.
+		$filterName = UtilsHooksHelper::getFilterName(['integrations', SettingsHubspot::SETTINGS_TYPE_KEY, 'overridePostRequest']);
+		if (\has_filter($filterName)) {
+			$filterValue = \apply_filters($filterName, [], $itemId, $params, $files, $formId) ?? [];
+
+			if ($filterValue) {
+				return $filterValue;
+			}
+		}
+
 		$paramsPrepared = $this->prepareParams($params, $formId);
 		$paramsFiles = $this->prepareFiles($files, $formId);
 

diff --git a/src/Integrations/Jira/JiraClient.php b/src/Integrations/Jira/JiraClient.php
@@ -164,6 +164,16 @@ public function getIssueType(string $itemId): array
 	 */
 	public function postApplication(array $params, array $files, string $formId): array
 	{
+		// Filter override post request.
+		$filterName = UtilsHooksHelper::getFilterName(['integrations', SettingsJira::SETTINGS_TYPE_KEY, 'overridePostRequest']);
+		if (\has_filter($filterName)) {
+			$filterValue = \apply_filters($filterName, [], $params, $files, $formId) ?? [];
+
+			if ($filterValue) {
+				return $filterValue;
+			}
+		}
+
 		$url = $this->getBaseUrl() . "issue";
 
 		$body = [

diff --git a/src/Integrations/Mailchimp/MailchimpClient.php b/src/Integrations/Mailchimp/MailchimpClient.php
@@ -171,6 +171,16 @@ static function ($item) {
 	 */
 	public function postApplication(string $itemId, array $params, array $files, string $formId): array
 	{
+		// Filter override post request.
+		$filterName = UtilsHooksHelper::getFilterName(['integrations', SettingsMailchimp::SETTINGS_TYPE_KEY, 'overridePostRequest']);
+		if (\has_filter($filterName)) {
+			$filterValue = \apply_filters($filterName, [], $itemId, $params, $files, $formId) ?? [];
+
+			if ($filterValue) {
+				return $filterValue;
+			}
+		}
+
 		$email = UtilsGeneralHelper::getEmailParamsField($params);
 		$emailHash = \md5(\strtolower($email));
 

diff --git a/src/Integrations/Mailerlite/MailerliteClient.php b/src/Integrations/Mailerlite/MailerliteClient.php
@@ -141,6 +141,16 @@ public function getItem(string $itemId): array
 	 */
 	public function postApplication(string $itemId, array $params, array $files, string $formId): array
 	{
+		// Filter override post request.
+		$filterName = UtilsHooksHelper::getFilterName(['integrations', SettingsMailerlite::SETTINGS_TYPE_KEY, 'overridePostRequest']);
+		if (\has_filter($filterName)) {
+			$filterValue = \apply_filters($filterName, [], $itemId, $params, $files, $formId) ?? [];
+
+			if ($filterValue) {
+				return $filterValue;
+			}
+		}
+
 		$email = $params['email']['value'];
 
 		$body = [

diff --git a/src/Integrations/Moments/MomentsClient.php b/src/Integrations/Moments/MomentsClient.php
@@ -123,11 +123,21 @@ public function getItem(string $itemId): array
 	 */
 	public function postApplication(string $itemId, array $params, array $files, string $formId): array
 	{
+		// Filter override post request.
+		$filterName = UtilsHooksHelper::getFilterName(['integrations', SettingsMoments::SETTINGS_TYPE_KEY, 'overridePostRequest']);
+		if (\has_filter($filterName)) {
+			$filterValue = \apply_filters($filterName, [], $itemId, $params, $files, $formId) ?? [];
+
+			if ($filterValue) {
+				return $filterValue;
+			}
+		}
+
 		$body = $this->prepareParams($params, $formId);
 
 		$filterName = UtilsHooksHelper::getFilterName(['integrations', SettingsMoments::SETTINGS_TYPE_KEY, 'prePostId']);
 		if (\has_filter($filterName)) {
-			$itemId = \apply_filters($filterName, $itemId, $body, $formId) ?? $itemId;
+			$itemId = \apply_filters($filterName, $itemId, $body, $formId);
 		}
 
 		$url = "{$this->getBaseUrl()}forms/1/forms/{$itemId}/data";

diff --git a/src/Integrations/Pipedrive/PipedriveClient.php b/src/Integrations/Pipedrive/PipedriveClient.php
@@ -199,6 +199,16 @@ public function getLeadsFields(bool $hideUpdateTime = true): array
 	 */
 	public function postApplication(array $params, array $files, string $formId): array
 	{
+		// Filter override post request.
+		$filterName = UtilsHooksHelper::getFilterName(['integrations', SettingsPipedrive::SETTINGS_TYPE_KEY, 'overridePostRequest']);
+		if (\has_filter($filterName)) {
+			$filterValue = \apply_filters($filterName, [], $params, $files, $formId) ?? [];
+
+			if ($filterValue) {
+				return $filterValue;
+			}
+		}
+
 		$organization = [];
 		$lead = [];
 		$person = [];

diff --git a/src/Integrations/Workable/WorkableClient.php b/src/Integrations/Workable/WorkableClient.php
@@ -142,6 +142,16 @@ public function getItem(string $itemId): array
 	 */
 	public function postApplication(string $itemId, array $params, array $files, string $formId): array
 	{
+		// Filter override post request.
+		$filterName = UtilsHooksHelper::getFilterName(['integrations', SettingsWorkable::SETTINGS_TYPE_KEY, 'overridePostRequest']);
+		if (\has_filter($filterName)) {
+			$filterValue = \apply_filters($filterName, [], $itemId, $params, $files, $formId) ?? [];
+
+			if ($filterValue) {
+				return $filterValue;
+			}
+		}
+
 		$paramsPrepared = $this->prepareParams($params, $formId);
 		$paramsFiles = $this->prepareFiles($files);
 

diff --git a/src/Validation/Validator.php b/src/Validation/Validator.php
@@ -278,12 +278,16 @@ public function validateParams(array $formDetails, bool $strictValidation = true
 						break;
 					// Check validation for min array items length.
 					case 'minCount':
+						$inputValue = $inputValue ? \explode(UtilsConfig::DELIMITER, $inputValue) : [];
+
 						if ($dataValue > \count($inputValue)) {
 							$output[$paramKey] = \sprintf($this->getValidationLabel('validationMinCount', $formId), $dataValue);
 						}
 						break;
 					// Check validation for max array items length.
 					case 'maxCount':
+						$inputValue = $inputValue ? \explode(UtilsConfig::DELIMITER, $inputValue) : [];
+
 						if ($dataValue < \count($inputValue)) {
 							$output[$paramKey] = \sprintf($this->getValidationLabel('validationMaxCount', $formId), $dataValue);
 						}