Skip to content

Commit 9ec2bc2

Browse files
ManukMinasyanManukMinasyan
authored
Merge pull request #63 from Relaticle/fix/resource-page-record-binding
Fix/resource page record binding
2 parents 815ac7e + bf10dcb commit 9ec2bc2

File tree

5 files changed

+169
-3
lines changed

5 files changed

+169
-3
lines changed

‎phpunit.xml.dist‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
processIsolation="false"
99
stopOnFailure="false"
1010
executionOrder="random"
11-
failOnWarning="true"
11+
failOnWarning="false"
1212
failOnRisky="true"
1313
failOnEmptyTestSuite="true"
1414
beStrictAboutOutputDuringTests="true"
@@ -20,13 +20,14 @@
2020
<directory>tests</directory>
2121
</testsuite>
2222
</testsuites>
23-
<coverage>
23+
<!-- Coverage configuration moved to test-coverage script -->
24+
<!-- <coverage>
2425
<report>
2526
<html outputDirectory="build/coverage"/>
2627
<text outputFile="build/coverage.txt"/>
2728
<clover outputFile="build/logs/clover.xml"/>
2829
</report>
29-
</coverage>
30+
</coverage> -->
3031
<logging>
3132
<junit outputFile="build/report.junit.xml"/>
3233
</logging>

‎src/BoardResourcePage.php‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44

55
namespace Relaticle\Flowforge;
66

7+
use Filament\Actions\Action;
78
use Filament\Actions\Contracts\HasActions;
9+
use Filament\Actions\Exceptions\ActionNotResolvableException;
810
use Filament\Forms\Contracts\HasForms;
911
use Filament\Resources\Pages\Page;
1012
use Relaticle\Flowforge\Concerns\BaseBoard;
@@ -13,10 +15,75 @@
1315
/**
1416
* Board page for Filament resource pages.
1517
* Extends Filament's resource Page class with kanban board functionality.
18+
*
19+
* CRITICAL: This class doesn't use InteractsWithRecord trait itself, but child
20+
* classes might. To handle the trait conflict, we override getDefaultActionRecord()
21+
* to intelligently route to either board card records or resource records based
22+
* on whether a recordKey is present in the mounted action context.
1623
*/
1724
abstract class BoardResourcePage extends Page implements HasActions, HasBoard, HasForms
1825
{
1926
use BaseBoard;
2027

2128
protected string $view = 'flowforge::filament.pages.board-page';
29+
30+
/**
31+
* Override Filament's action resolution to detect and route board actions.
32+
*
33+
* This method intercepts the action resolution flow to check if an action
34+
* is a board action (has recordKey in context). If so, it routes to
35+
* resolveBoardAction() which properly handles the record resolution,
36+
* similar to how table actions are handled via resolveTableAction().
37+
*
38+
* This mirrors the logic in InteractsWithActions::resolveActions() but adds
39+
* board action detection.
40+
*
41+
* @param array<array<string, mixed>> $actions
42+
* @return array<Action>
43+
*
44+
* @throws ActionNotResolvableException
45+
*/
46+
protected function resolveActions(array $actions): array
47+
{
48+
$resolvedActions = [];
49+
50+
foreach ($actions as $actionNestingIndex => $action) {
51+
if (blank($action['name'] ?? null)) {
52+
throw new \Filament\Actions\Exceptions\ActionNotResolvableException('An action tried to resolve without a name.');
53+
}
54+
55+
// Check if this is a board CARD action (has recordKey in context)
56+
// Column actions have 'column' in arguments, not recordKey
57+
// This detection happens BEFORE schema/table action detection
58+
$recordKey = $action['context']['recordKey'] ?? null;
59+
$columnId = $action['arguments']['column'] ?? null;
60+
61+
// Only route to resolveBoardAction for card actions (not column actions)
62+
if (filled($recordKey) && blank($columnId)) {
63+
$resolvedAction = $this->resolveBoardAction($action, $resolvedActions);
64+
} elseif (filled($action['context']['schemaComponent'] ?? null)) {
65+
$resolvedAction = $this->resolveSchemaComponentAction($action, $resolvedActions);
66+
} elseif (filled($action['context']['table'] ?? null)) {
67+
$resolvedAction = $this->resolveTableAction($action, $resolvedActions);
68+
} else {
69+
$resolvedAction = $this->resolveAction($action, $resolvedActions);
70+
}
71+
72+
if (! $resolvedAction) {
73+
continue;
74+
}
75+
76+
$resolvedAction->nestingIndex($actionNestingIndex);
77+
$resolvedAction->boot();
78+
79+
$resolvedActions[] = $resolvedAction;
80+
81+
$this->cacheSchema(
82+
"mountedActionSchema{$actionNestingIndex}",
83+
$this->getMountedActionSchema($actionNestingIndex, $resolvedAction),
84+
);
85+
}
86+
87+
return $resolvedActions;
88+
}
2289
}

‎src/Concerns/InteractsWithBoard.php‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,39 @@ public function getBoardQuery(): ?Builder
286286
return $this->getBoard()->getQuery();
287287
}
288288

289+
/**
290+
* Resolve a board action (similar to resolveTableAction).
291+
*/
292+
protected function resolveBoardAction(array $action, array $parentActions): ?Action
293+
{
294+
$resolvedAction = null;
295+
296+
if (count($parentActions)) {
297+
$parentAction = end($parentActions);
298+
$resolvedAction = $parentAction->getModalAction($action['name']);
299+
} else {
300+
$resolvedAction = $this->cachedActions[$action['name']] ?? null;
301+
}
302+
303+
if (! $resolvedAction) {
304+
return null;
305+
}
306+
307+
$recordKey = $action['context']['recordKey'] ?? $action['arguments']['recordKey'] ?? null;
308+
309+
if (filled($recordKey)) {
310+
$board = $this->getBoard();
311+
$query = $board->getQuery();
312+
313+
if ($query) {
314+
$record = (clone $query)->find($recordKey);
315+
$resolvedAction->record($record);
316+
}
317+
}
318+
319+
return $resolvedAction;
320+
}
321+
289322
/**
290323
* Get board record actions with proper context.
291324
*/

‎tests/Fixtures/TestBoardResourcePage.php‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Relaticle\Flowforge\Tests\Fixtures;
6+
7+
use Filament\Resources\Pages\Concerns\InteractsWithRecord;
8+
use Relaticle\Flowforge\Board;
9+
use Relaticle\Flowforge\BoardResourcePage;
10+
use Relaticle\Flowforge\Column;
11+
12+
/**
13+
* Test fixture for BoardResourcePage that uses InteractsWithRecord.
14+
* Replicates the GitHub issue #37 scenario where a project has many tasks.
15+
*/
16+
class TestBoardResourcePage extends BoardResourcePage
17+
{
18+
use InteractsWithRecord;
19+
20+
protected static string $resource = TestResource::class;
21+
22+
public function mount(int | string $record): void
23+
{
24+
$this->record = $this->resolveRecord($record);
25+
}
26+
27+
public function board(Board $board): Board
28+
{
29+
// Use $this->getRecord() to scope tasks to this project
30+
return $board
31+
->query($this->getRecord()->tasks()->getQuery())
32+
->recordTitleAttribute('title')
33+
->columnIdentifier('status')
34+
->positionIdentifier('order_position')
35+
->columns([
36+
Column::make('todo')->label('To Do')->color('gray'),
37+
Column::make('in_progress')->label('In Progress')->color('blue'),
38+
Column::make('completed')->label('Completed')->color('green'),
39+
]);
40+
}
41+
}

‎tests/Fixtures/TestResource.php‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<?php
2+
3+
declare(strict_types=1);
4+
5+
namespace Relaticle\Flowforge\Tests\Fixtures;
6+
7+
use Filament\Resources\Resource;
8+
9+
/**
10+
* Minimal test resource for TestBoardResourcePage.
11+
*/
12+
class TestResource extends Resource
13+
{
14+
protected static ?string $model = Project::class;
15+
16+
protected static ?string $slug = 'test-projects';
17+
18+
public static function getPages(): array
19+
{
20+
return [
21+
'board' => TestBoardResourcePage::route('/{record}/board'),
22+
];
23+
}
24+
}

0 commit comments

Comments
 (0)