Merge pull request #475 from canyongbs/fix/advapp-239-correct-issue-e…

…vent-creation-form-empty [ADVAPP-239]: Correct issue for event creation when form is empty
canyongbs · Jan 29, 2024 · eec7619 · eec7619
2 parents 4a92ee7 + d7d0e2e
commit eec7619
Show file tree

Hide file tree

Showing 7 changed files with 33 additions and 6 deletions.
diff --git a/.gitignore b/.gitignore
@@ -32,3 +32,4 @@ public/api-docs/*
 /_lighthouse_ide_helper.php
 /programmatic-types.graphql
 /schema-directives.graphql
+/*tinkerwell.php
diff --git a/.../src/Filament/Resources/ApplicationResource/Pages/Concerns/HasSharedFormConfiguration.php b/.../src/Filament/Resources/ApplicationResource/Pages/Concerns/HasSharedFormConfiguration.php
@@ -150,7 +150,12 @@ public function fieldBuilder(): TiptapEditor
                     ->when($applicationStep, fn (EloquentBuilder $query) => $query->whereBelongsTo($applicationStep, 'step'))
                     ->delete();
 
-                $content = $component->decodeBlocksBeforeSave($component->getJSON(decoded: true));
+                $content = [];
+
+                if (filled($component->getState())) {
+                    $content = $component->decodeBlocksBeforeSave($component->getJSON(decoded: true));
+                }
+
                 $content['content'] = $this->saveFieldsFromComponents(
                     $application,
                     $content['content'] ?? [],

diff --git a/...es/form/src/Filament/Resources/FormResource/Pages/Concerns/HasSharedFormConfiguration.php b/...es/form/src/Filament/Resources/FormResource/Pages/Concerns/HasSharedFormConfiguration.php
@@ -163,7 +163,12 @@ public function fieldBuilder(): TiptapEditor
                     ->when($formStep, fn (EloquentBuilder $query) => $query->whereBelongsTo($formStep, 'step'))
                     ->delete();
 
-                $content = $component->decodeBlocksBeforeSave($component->getJSON(decoded: true));
+                $content = [];
+
+                if (filled($component->getState())) {
+                    $content = $component->decodeBlocksBeforeSave($component->getJSON(decoded: true));
+                }
+
                 $content['content'] = $this->saveFieldsFromComponents(
                     $form,
                     $content['content'] ?? [],

diff --git a/app-modules/form/src/Filament/Resources/FormResource/Pages/SubmissionOnScreenResponse.php b/app-modules/form/src/Filament/Resources/FormResource/Pages/SubmissionOnScreenResponse.php
@@ -55,7 +55,8 @@ public function form(FilamentForm $form): FilamentForm
             ->schema(
                 [
                     MarkdownEditor::make('on_screen_response')
-                        ->disableToolbarButtons(['attachFiles']),
+                        ->disableToolbarButtons(['attachFiles'])
+                        ->columnSpanFull(),
                 ]
             );
     }

diff --git a/...r/src/Filament/Resources/EventResource/Pages/Concerns/HasSharedEventFormConfiguration.php b/...r/src/Filament/Resources/EventResource/Pages/Concerns/HasSharedEventFormConfiguration.php
@@ -190,7 +190,12 @@ public function fieldBuilder(): TiptapEditor
                     ->when($formStep, fn (EloquentBuilder $query) => $query->whereBelongsTo($formStep, 'step'))
                     ->delete();
 
-                $content = $component->decodeBlocksBeforeSave($component->getJSON(decoded: true));
+                $content = [];
+
+                if (filled($component->getState())) {
+                    $content = $component->decodeBlocksBeforeSave($component->getJSON(decoded: true));
+                }
+
                 $content['content'] = $this->saveFieldsFromComponents(
                     $form,
                     $content['content'] ?? [],

diff --git a/...lament/Resources/ServiceRequestFormResource/Pages/Concerns/HasSharedFormConfiguration.php b/...lament/Resources/ServiceRequestFormResource/Pages/Concerns/HasSharedFormConfiguration.php
@@ -167,7 +167,12 @@ public function fieldBuilder(): TiptapEditor
                     ->when($serviceRequestFormStep, fn (EloquentBuilder $query) => $query->whereBelongsTo($serviceRequestFormStep, 'step'))
                     ->delete();
 
-                $content = $component->decodeBlocksBeforeSave($component->getJSON(decoded: true));
+                $content = [];
+
+                if (filled($component->getState())) {
+                    $content = $component->decodeBlocksBeforeSave($component->getJSON(decoded: true));
+                }
+
                 $content['content'] = $this->saveFieldsFromComponents(
                     $serviceRequestForm,
                     $content['content'] ?? [],

diff --git a/...urvey/src/Filament/Resources/SurveyResource/Pages/Concerns/HasSharedFormConfiguration.php b/...urvey/src/Filament/Resources/SurveyResource/Pages/Concerns/HasSharedFormConfiguration.php
@@ -163,7 +163,12 @@ public function fieldBuilder(): TiptapEditor
                     ->when($surveyStep, fn (EloquentBuilder $query) => $query->whereBelongsTo($surveyStep, 'step'))
                     ->delete();
 
-                $content = $component->decodeBlocksBeforeSave($component->getJSON(decoded: true));
+                $content = [];
+
+                if (filled($component->getState())) {
+                    $content = $component->decodeBlocksBeforeSave($component->getJSON(decoded: true));
+                }
+
                 $content['content'] = $this->saveFieldsFromComponents(
                     $survey,
                     $content['content'] ?? [],