[ADVAPP-11]: Campaign Action Blocks execute_at minDate doesn't work

app-modules/campaign/config/permissions/web/custom.php

@@ -34,4 +34,6 @@
 </COPYRIGHT>
 */
 
-return [];
+return [
+    'view_campaign_settings',
+];

app-modules/campaign/config/roles/web/campaign_settings_management.php

@@ -0,0 +1,41 @@
+<?php
+
+/*
+<COPYRIGHT>
+
+    Copyright © 2022-2023, Canyon GBS LLC. All rights reserved.
+
+    Advising App™ is licensed under the Elastic License 2.0. For more details,
+    see https://github.com/canyongbs/advisingapp/blob/main/LICENSE.
+
+    Notice:
+
+    - You may not provide the software to third parties as a hosted or managed
+      service, where the service provides users with access to any substantial set of
+      the features or functionality of the software.
+    - You may not move, change, disable, or circumvent the license key functionality
+      in the software, and you may not remove or obscure any functionality in the
+      software that is protected by the license key.
+    - You may not alter, remove, or obscure any licensing, copyright, or other notices
+      of the licensor in the software. Any use of the licensor’s trademarks is subject
+      to applicable law.
+    - Canyon GBS LLC respects the intellectual property rights of others and expects the
+      same in return. Canyon GBS™ and Advising App™ are registered trademarks of
+      Canyon GBS LLC, and we are committed to enforcing and protecting our trademarks
+      vigorously.
+    - The software solution, including services, infrastructure, and code, is offered as a
+      Software as a Service (SaaS) by Canyon GBS LLC.
+    - Use of this software implies agreement to the license terms and conditions as stated
+      in the Elastic License 2.0.
+
+    For more information or inquiries please visit our website at
+    https://www.canyongbs.com or contact us via email at legal@canyongbs.com.
+
+</COPYRIGHT>
+*/
+
+return [
+    'custom' => [
+        'campaign.view_campaign_settings',
+    ],
+];

app-modules/campaign/database/migrations/2023_08_16_025823_create_campaign_settings.php

@@ -0,0 +1,44 @@
+<?php
+
+/*
+<COPYRIGHT>
+
+    Copyright © 2022-2023, Canyon GBS LLC. All rights reserved.
+
+    Advising App™ is licensed under the Elastic License 2.0. For more details,
+    see https://github.com/canyongbs/advisingapp/blob/main/LICENSE.
+
+    Notice:
+
+    - You may not provide the software to third parties as a hosted or managed
+      service, where the service provides users with access to any substantial set of
+      the features or functionality of the software.
+    - You may not move, change, disable, or circumvent the license key functionality
+      in the software, and you may not remove or obscure any functionality in the
+      software that is protected by the license key.
+    - You may not alter, remove, or obscure any licensing, copyright, or other notices
+      of the licensor in the software. Any use of the licensor’s trademarks is subject
+      to applicable law.
+    - Canyon GBS LLC respects the intellectual property rights of others and expects the
+      same in return. Canyon GBS™ and Advising App™ are registered trademarks of
+      Canyon GBS LLC, and we are committed to enforcing and protecting our trademarks
+      vigorously.
+    - The software solution, including services, infrastructure, and code, is offered as a
+      Software as a Service (SaaS) by Canyon GBS LLC.
+    - Use of this software implies agreement to the license terms and conditions as stated
+      in the Elastic License 2.0.
+
+    For more information or inquiries please visit our website at
+    https://www.canyongbs.com or contact us via email at legal@canyongbs.com.
+
+</COPYRIGHT>
+*/
+
+use Spatie\LaravelSettings\Migrations\SettingsMigration;
+
+return new class () extends SettingsMigration {
+    public function up(): void
+    {
+        $this->migrator->add('campaign.action_execution_timezone');
+    }
+};

app-modules/campaign/src/CampaignPlugin.php

@@ -48,10 +48,15 @@ public function getId(): string
 
     public function register(Panel $panel): void
     {
-        $panel->discoverResources(
-            in: __DIR__ . '/Filament/Resources',
-            for: 'AdvisingApp\\Campaign\\Filament\\Resources'
-        );
+        $panel
+            ->discoverResources(
+                in: __DIR__ . '/Filament/Resources',
+                for: 'AdvisingApp\\Campaign\\Filament\\Resources'
+            )
+            ->discoverPages(
+                in: __DIR__ . '/Filament/Pages',
+                for: 'AdvisingApp\\Campaign\\Filament\\Pages'
+            );
     }
 
     public function boot(Panel $panel): void {}

app-modules/campaign/src/Filament/Blocks/CampaignActionBlock.php

@@ -36,7 +36,9 @@
 
 namespace AdvisingApp\Campaign\Filament\Blocks;
 
+use Carbon\CarbonInterface;
 use Filament\Forms\Components\Builder\Block;
+use AdvisingApp\Campaign\Settings\CampaignSettings;
 
 abstract class CampaignActionBlock extends Block
 {
@@ -63,4 +65,11 @@ public function editFields(): array
     abstract public function generateFields(string $fieldPrefix = ''): array;
 
     abstract public static function type(): string;
+
+    public function generateUserTimezoneHint(CarbonInterface $dateTime): string
+    {
+        return $dateTime
+            ->shiftTimezone(app(CampaignSettings::class)->getActionExecutionTimezone())
+            ->setTimezone(auth()->user()->timezone)->format('M j, Y H:i:s') . ' in your timezone';
+    }
 }

app-modules/campaign/src/Filament/Blocks/CareTeamBlock.php

@@ -37,9 +37,11 @@
 namespace AdvisingApp\Campaign\Filament\Blocks;
 
 use App\Models\User;
+use Carbon\CarbonImmutable;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Toggle;
 use Filament\Forms\Components\DateTimePicker;
+use AdvisingApp\Campaign\Settings\CampaignSettings;
 
 class CareTeamBlock extends CampaignActionBlock
 {
@@ -69,9 +71,13 @@ public function generateFields(string $fieldPrefix = ''): array
                 ->hintIconTooltip('If checked, all prior care team assignments will be removed.'),
             DateTimePicker::make($fieldPrefix . 'execute_at')
                 ->label('When should the journey step be executed?')
+                ->columnSpanFull()
+                ->timezone(app(CampaignSettings::class)->getActionExecutionTimezone())
+                ->helperText(app(CampaignSettings::class)->getActionExecutionTimezoneLabel())
+                ->lazy()
+                ->hint(fn ($state): ?string => filled($state) ? $this->generateUserTimezoneHint(CarbonImmutable::parse($state)) : null)
                 ->required()
-                ->minDate(now(auth()->user()->timezone))
-                ->closeOnDateSelection(),
+                ->minDate(now()),
         ];
     }
 

app-modules/campaign/src/Filament/Blocks/EngagementBatchBlock.php

@@ -36,10 +36,12 @@
 
 namespace AdvisingApp\Campaign\Filament\Blocks;
 
+use Carbon\CarbonImmutable;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\DateTimePicker;
+use AdvisingApp\Campaign\Settings\CampaignSettings;
 use AdvisingApp\Engagement\Enums\EngagementDeliveryMethod;
 
 class EngagementBatchBlock extends CampaignActionBlock
@@ -88,9 +90,13 @@ public function generateFields(string $fieldPrefix = ''): array
                 }),
             DateTimePicker::make('execute_at')
                 ->label('When should the journey step be executed?')
+                ->columnSpanFull()
+                ->timezone(app(CampaignSettings::class)->getActionExecutionTimezone())
+                ->helperText(app(CampaignSettings::class)->getActionExecutionTimezoneLabel())
+                ->lazy()
+                ->hint(fn ($state): ?string => filled($state) ? $this->generateUserTimezoneHint(CarbonImmutable::parse($state)) : null)
                 ->required()
-                ->minDate(now(auth()->user()->timezone))
-                ->closeOnDateSelection(),
+                ->minDate(now()),
         ];
     }
 

app-modules/campaign/src/Filament/Blocks/InteractionBlock.php

@@ -37,6 +37,7 @@
 namespace AdvisingApp\Campaign\Filament\Blocks;
 
 use Closure;
+use Carbon\CarbonImmutable;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Fieldset;
 use Filament\Forms\Components\Textarea;
@@ -45,6 +46,7 @@
 use AdvisingApp\Division\Models\Division;
 use Filament\Forms\Components\DateTimePicker;
 use AdvisingApp\Interaction\Models\Interaction;
+use AdvisingApp\Campaign\Settings\CampaignSettings;
 use AdvisingApp\Interaction\Models\InteractionType;
 use AdvisingApp\Interaction\Models\InteractionDriver;
 use AdvisingApp\Interaction\Models\InteractionStatus;
@@ -128,9 +130,13 @@ public function generateFields(string $fieldPrefix = ''): array
                 ]),
             DateTimePicker::make($fieldPrefix . 'execute_at')
                 ->label('When should the journey step be executed?')
+                ->columnSpanFull()
+                ->timezone(app(CampaignSettings::class)->getActionExecutionTimezone())
+                ->helperText(app(CampaignSettings::class)->getActionExecutionTimezoneLabel())
+                ->lazy()
+                ->hint(fn ($state): ?string => filled($state) ? $this->generateUserTimezoneHint(CarbonImmutable::parse($state)) : null)
                 ->required()
-                ->minDate(now(auth()->user()->timezone))
-                ->closeOnDateSelection(),
+                ->minDate(now()),
         ];
     }
 

app-modules/campaign/src/Filament/Blocks/ProactiveAlertBlock.php

@@ -36,11 +36,13 @@
 
 namespace AdvisingApp\Campaign\Filament\Blocks;
 
+use Carbon\CarbonImmutable;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Textarea;
 use AdvisingApp\Alert\Enums\AlertStatus;
 use AdvisingApp\Alert\Enums\AlertSeverity;
 use Filament\Forms\Components\DateTimePicker;
+use AdvisingApp\Campaign\Settings\CampaignSettings;
 
 class ProactiveAlertBlock extends CampaignActionBlock
 {
@@ -76,9 +78,13 @@ public function generateFields(string $fieldPrefix = ''): array
                 ->enum(AlertStatus::class),
             DateTimePicker::make($fieldPrefix . 'execute_at')
                 ->label('When should the journey step be executed?')
+                ->columnSpanFull()
+                ->timezone(app(CampaignSettings::class)->getActionExecutionTimezone())
+                ->helperText(app(CampaignSettings::class)->getActionExecutionTimezoneLabel())
+                ->lazy()
+                ->hint(fn ($state): ?string => filled($state) ? $this->generateUserTimezoneHint(CarbonImmutable::parse($state)) : null)
                 ->required()
-                ->minDate(now(auth()->user()->timezone))
-                ->closeOnDateSelection(),
+                ->minDate(now()),
         ];
     }
 

app-modules/campaign/src/Filament/Blocks/ServiceRequestBlock.php

@@ -38,11 +38,13 @@
 
 use Closure;
 use App\Models\User;
+use Carbon\CarbonImmutable;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Textarea;
 use Illuminate\Database\Eloquent\Model;
 use AdvisingApp\Division\Models\Division;
 use Filament\Forms\Components\DateTimePicker;
+use AdvisingApp\Campaign\Settings\CampaignSettings;
 use Illuminate\Contracts\Database\Eloquent\Builder;
 use AdvisingApp\ServiceManagement\Models\ServiceRequest;
 use AdvisingApp\ServiceManagement\Models\ServiceRequestType;
@@ -107,9 +109,13 @@ public function generateFields(string $fieldPrefix = ''): array
                 ->string(),
             DateTimePicker::make('execute_at')
                 ->label('When should the journey step be executed?')
+                ->columnSpanFull()
+                ->timezone(app(CampaignSettings::class)->getActionExecutionTimezone())
+                ->helperText(app(CampaignSettings::class)->getActionExecutionTimezoneLabel())
+                ->lazy()
+                ->hint(fn ($state): ?string => filled($state) ? $this->generateUserTimezoneHint(CarbonImmutable::parse($state)) : null)
                 ->required()
-                ->minDate(now(auth()->user()->timezone))
-                ->closeOnDateSelection(),
+                ->minDate(now()),
         ];
     }
 

app-modules/campaign/src/Filament/Blocks/SubscriptionBlock.php

@@ -37,9 +37,11 @@
 namespace AdvisingApp\Campaign\Filament\Blocks;
 
 use App\Models\User;
+use Carbon\CarbonImmutable;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Toggle;
 use Filament\Forms\Components\DateTimePicker;
+use AdvisingApp\Campaign\Settings\CampaignSettings;
 
 class SubscriptionBlock extends CampaignActionBlock
 {
@@ -52,16 +54,13 @@ protected function setUp(): void
 
     public function generateFields(string $fieldPrefix = ''): array
     {
-        /** @var User $user */
-        $user = auth()->user();
-
         return [
             Select::make($fieldPrefix . 'user_ids')
                 ->label('Who should be subscribed?')
                 ->options(User::all()->pluck('name', 'id'))
                 ->multiple()
                 ->searchable()
-                ->default([$user->id])
+                ->default([auth()->id()])
                 ->required()
                 ->exists('users', 'id'),
             Toggle::make($fieldPrefix . 'remove_prior')
@@ -70,9 +69,13 @@ public function generateFields(string $fieldPrefix = ''): array
                 ->hintIconTooltip('If checked, all prior care subscriptions will be removed.'),
             DateTimePicker::make($fieldPrefix . 'execute_at')
                 ->label('When should the journey step be executed?')
+                ->columnSpanFull()
+                ->timezone(app(CampaignSettings::class)->getActionExecutionTimezone())
+                ->helperText(app(CampaignSettings::class)->getActionExecutionTimezoneLabel())
+                ->lazy()
+                ->hint(fn ($state): ?string => filled($state) ? $this->generateUserTimezoneHint(CarbonImmutable::parse($state)) : null)
                 ->required()
-                ->minDate(now($user->timezone))
-                ->closeOnDateSelection(),
+                ->minDate(now()),
         ];
     }
 

app-modules/campaign/src/Filament/Blocks/TaskBlock.php

@@ -36,13 +36,14 @@
 
 namespace AdvisingApp\Campaign\Filament\Blocks;
 
-use App\Models\User;
+use Carbon\CarbonImmutable;
 use AdvisingApp\Task\Models\Task;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Fieldset;
 use Filament\Forms\Components\Textarea;
 use Filament\Forms\Components\TextInput;
 use Filament\Forms\Components\DateTimePicker;
+use AdvisingApp\Campaign\Settings\CampaignSettings;
 
 class TaskBlock extends CampaignActionBlock
 {
@@ -57,9 +58,6 @@ protected function setUp(): void
 
     public function generateFields(string $fieldPrefix = ''): array
     {
-        /** @var User $user */
-        $user = auth()->user();
-
         return [
             Fieldset::make('Details')
                 ->schema([
@@ -81,9 +79,13 @@ public function generateFields(string $fieldPrefix = ''): array
                 ]),
             DateTimePicker::make($fieldPrefix . 'execute_at')
                 ->label('When should the journey step be executed?')
+                ->columnSpanFull()
+                ->timezone(app(CampaignSettings::class)->getActionExecutionTimezone())
+                ->helperText(app(CampaignSettings::class)->getActionExecutionTimezoneLabel())
+                ->lazy()
+                ->hint(fn ($state): ?string => filled($state) ? $this->generateUserTimezoneHint(CarbonImmutable::parse($state)) : null)
                 ->required()
-                ->minDate(now($user->timezone))
-                ->closeOnDateSelection(),
+                ->minDate(now()),
         ];
     }