Merge pull request #233 from ECFMP/167-mandatory-route-deleting-boxes

fix(FlowMeasureResource): fix mandatory_route being broken
ECFMP · Aug 13, 2022 · f471bd4 · f471bd4
2 parents 4e0947c + 831442c
commit f471bd4
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 1 deletion.
diff --git a/app/Filament/Resources/FlowMeasureResource.php b/app/Filament/Resources/FlowMeasureResource.php
@@ -212,7 +212,7 @@ public static function form(Form $form): Form
                             ->required()
                             ->visible(fn (Closure $get) => $get('type') == FlowMeasureType::MANDATORY_ROUTE->value)
                             ->schema([
-                                Forms\Components\Textarea::make('')->required()
+                                Forms\Components\Textarea::make('mandatory_route')->required()
                             ]),
                     ]),
                 self::filters($events),

diff --git a/app/Filament/Resources/FlowMeasureResource/Pages/CreateFlowMeasure.php b/app/Filament/Resources/FlowMeasureResource/Pages/CreateFlowMeasure.php
@@ -123,6 +123,7 @@ protected function mutateFormDataBeforeCreate(array $data): array
         switch ($data['type']) {
             case FlowMeasureType::MANDATORY_ROUTE->value:
                 Arr::pull($data, 'value');
+                $data['mandatory_route'] = Arr::flatten($data['mandatory_route']);
                 break;
             case FlowMeasureType::MINIMUM_DEPARTURE_INTERVAL->value:
             case FlowMeasureType::AVERAGE_DEPARTURE_INTERVAL->value:

diff --git a/app/Filament/Resources/FlowMeasureResource/Pages/EditFlowMeasure.php b/app/Filament/Resources/FlowMeasureResource/Pages/EditFlowMeasure.php
@@ -86,6 +86,14 @@ protected function mutateFormDataBeforeFill(array $data): array
 
         $data['filters'] = $newFilters->toArray();
 
+        if (Arr::has($data, 'mandatory_route')) {
+            Arr::set($data, 'mandatory_route', collect($data['mandatory_route'])
+                ->map(function (string $value) {
+                    return ['mandatory_route' => $value];
+                })
+                ->toArray());
+        }
+
         return $data;
     }
 
@@ -96,6 +104,7 @@ protected function mutateFormDataBeforeSave(array $data): array
         switch ($data['type']) {
             case FlowMeasureType::MANDATORY_ROUTE->value:
                 Arr::pull($data, 'value');
+                $data['mandatory_route'] = Arr::flatten($data['mandatory_route']);
                 break;
             case FlowMeasureType::MINIMUM_DEPARTURE_INTERVAL->value:
             case FlowMeasureType::AVERAGE_DEPARTURE_INTERVAL->value:

diff --git a/app/Filament/Resources/FlowMeasureResource/Pages/ViewFlowMeasure.php b/app/Filament/Resources/FlowMeasureResource/Pages/ViewFlowMeasure.php
@@ -93,6 +93,14 @@ protected function mutateFormDataBeforeFill(array $data): array
 
         $data['filters'] = $newFilters->toArray();
 
+        if (Arr::has($data, 'mandatory_route')) {
+            Arr::set($data, 'mandatory_route', collect($data['mandatory_route'])
+                ->map(function (string $value) {
+                    return ['mandatory_route' => $value];
+                })
+                ->toArray());
+        }
+
         return $data;
     }