Beautiful Open-Source Form Builder
Refactor AbstractIntegrationHandler and FormSubmissionDataFactory for improved data handling
JhumanJfe67296e548b
diff --git a/api/app/Integrations/Handlers/AbstractIntegrationHandler.php b/api/app/Integrations/Handlers/AbstractIntegrationHandler.phpindex 3b20ca8c4..0debae648 100644--- a/api/app/Integrations/Handlers/AbstractIntegrationHandler.php+++ b/api/app/Integrations/Handlers/AbstractIntegrationHandler.php@@ -140,10 +140,8 @@ abstract class AbstractIntegrationHandler'data' => $formattedData,'message' => 'Please do not use the `submission` field. It is deprecated and will be removed in the future.'];- if ($form->is_pro && $form->editable_submissions) {- $data['edit_link'] = $form->share_url . '?submission_id=' . Hashids::encode(- $submissionData['submission_id']- );+ if ($form->is_pro && $form->editable_submissions && isset($submissionData['submission_id'])) {+ $data['edit_link'] = $form->share_url . '?submission_id=' . Hashids::encode($submissionData['submission_id']);}return $data;diff --git a/api/app/Service/Forms/FormSubmissionDataFactory.php b/api/app/Service/Forms/FormSubmissionDataFactory.phpindex c445c0bb7..0e77f8838 100644--- a/api/app/Service/Forms/FormSubmissionDataFactory.php+++ b/api/app/Service/Forms/FormSubmissionDataFactory.php@@ -99,7 +99,12 @@ class FormSubmissionDataFactory}$option = $this->faker->randomElement($property['options']);- return $option['id'];+ // Support both [{id: ...}] and ["id1", "id2"] option formats+ if (is_array($option) && array_key_exists('id', $option)) {+ return $option['id'];+ }++ return $option;}private function generateMultiSelectValues($property)@@ -108,14 +113,24 @@ class FormSubmissionDataFactoryreturn [];}- $numOptions = count($property['options']);- $numToSelect = $this->faker->numberBetween(1, min(3, $numOptions));+ // Normalize options to a flat list of IDs/values+ $normalizedValues = array_values(array_filter(array_map(function ($option) {+ if (is_array($option) && array_key_exists('id', $option)) {+ return $option['id'];+ }+ return is_scalar($option) ? $option : null;+ }, $property['options']), function ($value) {+ return $value !== null && $value !== '';+ }));- $selectedOptions = $this->faker->randomElements(- array_column($property['options'], 'id'),- $numToSelect- );+ if (count($normalizedValues) === 0) {+ // Nothing valid to choose from+ return [];+ }++ $numOptions = count($normalizedValues);+ $numToSelect = $this->faker->numberBetween(1, min(3, $numOptions));- return $selectedOptions;+ return $this->faker->randomElements($normalizedValues, $numToSelect);}}diff --git a/integrations/zapier/package-lock.json b/integrations/zapier/package-lock.jsonindex 504e4fea3..0b7d202cb 100644--- a/integrations/zapier/package-lock.json+++ b/integrations/zapier/package-lock.json@@ -1,12 +1,12 @@{- "name": "opnform-test-1",- "version": "1.0.1",+ "name": "opnform",+ "version": "1.0.4","lockfileVersion": 3,"requires": true,"packages": {"": {- "name": "opnform-test-1",- "version": "1.0.1",+ "name": "opnform",+ "version": "1.0.4","dependencies": {"zapier-platform-core": "15.8.0"},diff --git a/integrations/zapier/package.json b/integrations/zapier/package.jsonindex 906494b47..d5b72032b 100644--- a/integrations/zapier/package.json+++ b/integrations/zapier/package.json@@ -1,6 +1,6 @@{"name": "opnform",- "version": "1.0.3",+ "version": "1.0.4","description": "OpnForm is an open-source form builder for creating and managing forms, enabling seamless data collection and automation.","main": "index.js","scripts": {