[ADVAPP-1131]: When creating a campaign task due dates are being auto…

…matically added even if not populated when configuring the journey step (#1248) * Solve due date bug * chore: fix code style --------- Co-authored-by: jayushi-canyon <[email protected]>
canyongbs · Jan 21, 2025 · bf8ce97 · bf8ce97
1 parent 2eb5461
commit bf8ce97
Show file tree

Hide file tree

Showing 9 changed files with 1,227 additions and 1,910 deletions.
diff --git a/app-modules/campaign/src/Filament/Blocks/CareTeamBlock.php b/app-modules/campaign/src/Filament/Blocks/CareTeamBlock.php
@@ -69,7 +69,7 @@ public function generateFields(string $fieldPrefix = ''): array
                 ->label('Remove all prior care team assignments?')
                 ->default(false)
                 ->hintIconTooltip('If checked, all prior care team assignments will be removed.'),
-            DateTimePicker::make($fieldPrefix . 'execute_at')
+            DateTimePicker::make('execute_at')
                 ->label('When should the journey step be executed?')
                 ->columnSpanFull()
                 ->timezone(app(CampaignSettings::class)->getActionExecutionTimezone())

diff --git a/app-modules/campaign/src/Filament/Blocks/EventBlock.php b/app-modules/campaign/src/Filament/Blocks/EventBlock.php
@@ -63,7 +63,7 @@ public function generateFields(string $fieldPrefix = ''): array
                 ->options(Event::where('ends_at', '>=', now())->pluck('title', 'id')->toArray())
                 ->nullable()
                 ->searchable(),
-            DateTimePicker::make($fieldPrefix . 'execute_at')
+            DateTimePicker::make('execute_at')
                 ->label('When should the journey step be executed?')
                 ->columnSpanFull()
                 ->timezone(app(CampaignSettings::class)->getActionExecutionTimezone())

diff --git a/app-modules/campaign/src/Filament/Blocks/InteractionBlock.php b/app-modules/campaign/src/Filament/Blocks/InteractionBlock.php
@@ -137,7 +137,7 @@ public function generateFields(string $fieldPrefix = ''): array
                     Textarea::make($fieldPrefix . 'description')
                         ->required(),
                 ]),
-            DateTimePicker::make($fieldPrefix . 'execute_at')
+            DateTimePicker::make('execute_at')
                 ->label('When should the journey step be executed?')
                 ->columnSpanFull()
                 ->timezone(app(CampaignSettings::class)->getActionExecutionTimezone())

diff --git a/app-modules/campaign/src/Filament/Blocks/ProactiveAlertBlock.php b/app-modules/campaign/src/Filament/Blocks/ProactiveAlertBlock.php
@@ -77,7 +77,7 @@ public function generateFields(string $fieldPrefix = ''): array
                 ->selectablePlaceholder(false)
                 ->default(fn () => SystemAlertStatusClassification::default()?->getKey())
                 ->required(),
-            DateTimePicker::make($fieldPrefix . 'execute_at')
+            DateTimePicker::make('execute_at')
                 ->label('When should the journey step be executed?')
                 ->columnSpanFull()
                 ->timezone(app(CampaignSettings::class)->getActionExecutionTimezone())

diff --git a/app-modules/campaign/src/Filament/Blocks/SubscriptionBlock.php b/app-modules/campaign/src/Filament/Blocks/SubscriptionBlock.php
@@ -67,7 +67,7 @@ public function generateFields(string $fieldPrefix = ''): array
                 ->label('Remove all prior subscriptions?')
                 ->default(false)
                 ->hintIconTooltip('If checked, all prior care subscriptions will be removed.'),
-            DateTimePicker::make($fieldPrefix . 'execute_at')
+            DateTimePicker::make('execute_at')
                 ->label('When should the journey step be executed?')
                 ->columnSpanFull()
                 ->timezone(app(CampaignSettings::class)->getActionExecutionTimezone())

diff --git a/app-modules/campaign/src/Filament/Blocks/TaskBlock.php b/app-modules/campaign/src/Filament/Blocks/TaskBlock.php
@@ -78,7 +78,7 @@ public function generateFields(string $fieldPrefix = ''): array
                         ->searchable()
                         ->default(auth()->id()),
                 ]),
-            DateTimePicker::make($fieldPrefix . 'execute_at')
+            DateTimePicker::make('execute_at')
                 ->label('When should the journey step be executed?')
                 ->columnSpanFull()
                 ->timezone(app(CampaignSettings::class)->getActionExecutionTimezone())