Skip to content

feat: form versioning #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andreiio merged 3 commits into from
Mar 20, 2025
Merged

feat: form versioning #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1da39eb
feat: form versioning
andreiio Mar 19, 2025
a80ecff
Merge branch 'main' into feat/form-versioning
andreiio Mar 20, 2025
1f81c10
wip
andreiio Mar 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion app/Filament/Shelter/Resources/BeneficiaryResource.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,17 @@ public static function infolist(Infolist $infolist): Infolist
->columns(3)
->heading(__('app.beneficiary.steps.personal_details'))
->headerActions([
Action::make('data')
->label(__('app.form.actions.history'))
->url(fn (Beneficiary $record) => static::getUrl('versions.index', ['record' => $record]))
->visible(fn (Beneficiary $record) => $record->hasMoreThanOneForm())
->icon('heroicon-o-clock')
->link()
->outlined(),

Action::make('edit')
->label(__('filament-actions::edit.single.label'))
->url(fn ($record) => static::getUrl('edit', ['record' => $record]))
->url(fn (Beneficiary $record) => static::getUrl('edit', ['record' => $record]))
->icon('heroicon-o-pencil-square')
->color('gray')
->outlined(),
Expand Down Expand Up @@ -171,8 +179,12 @@ public static function getPages(): array
'create' => Pages\CreateBeneficiary::route('/create'),
'view' => Pages\ViewBeneficiary::route('/{record}'),
'edit' => Pages\EditBeneficiary::route('/{record}/edit'),

'stay' => Pages\ViewStay::route('/{record}/stay/{stay}'),
'document' => Pages\ViewDocument::route('/{record}/document/{document}'),

'versions.index' => Pages\ListPersonalDataVersions::route('/{record}/data'),
'versions.view' => Pages\ViewPersonalDataVersion::route('/{record}/data/{response}'),
];
}
}
36 changes: 19 additions & 17 deletions app/Filament/Shelter/Resources/BeneficiaryResource/Pages/EditBeneficiary.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
use App\Filament\Shelter\Resources\BeneficiaryResource;
use App\Models\Form;
use App\Models\Form\FieldResponse;
use App\Models\Form\Response;
use Filament\Actions;
use Filament\Resources\Pages\EditRecord;

Expand Down Expand Up @@ -36,24 +37,23 @@ protected function mutateFormDataBeforeFill(array $data): array

protected function mutateFormDataBeforeSave(array $data): array
{
$form = Form::query()
->latestPublished(Type::PERSONAL)
->first(['id']);

/** @var Response */
$response = $this->getRecord()
->latestPersonal()
->firstOr(function () {
$form = Form::query()
->latestPublished(Type::PERSONAL)
->first(['id']);

if (blank($form)) {
return;
}
->where('form_id', $form->id)
->firstOr(
fn () => $this->getRecord()
->personal()->create([
'form_id' => $form->id,
])
);

return $this->getRecord()->personal()->create([
'form_id' => $form->id,
]);
});

$this->wrapInDatabaseTransaction(
fn () => collect(data_get($data, 'form'))->each(
$this->wrapInDatabaseTransaction(function () use ($data, $response) {
collect(data_get($data, 'form'))->each(
fn ($value, int $field_id) => FieldResponse::updateOrCreate(
[
'response_id' => $response->id,
Expand All @@ -63,8 +63,10 @@ protected function mutateFormDataBeforeSave(array $data): array
'value' => $value,
]
)
)
);
);

$response->touch();
});

return $data;
}
Expand Down
55 changes: 55 additions & 0 deletions app/Filament/Shelter/Resources/BeneficiaryResource/Pages/ListPersonalDataVersions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
<?php

declare(strict_types=1);

namespace App\Filament\Shelter\Resources\BeneficiaryResource\Pages;

use App\Filament\Concerns\UsesBreadcrumbFromTitle;
use App\Filament\Shelter\Resources\BeneficiaryResource;
use Filament\Forms\Form;
use Filament\Infolists\Infolist;
use Filament\Resources\Pages\ViewRecord;

class ListPersonalDataVersions extends ViewRecord
{
use UsesBreadcrumbFromTitle;

protected static string $resource = BeneficiaryResource::class;

protected function authorizeAccess(): void
{
parent::authorizeAccess();

abort_unless($this->getRecord()->hasMoreThanOneForm(), 404);
}

public function getTitle(): string
{
return __('app.form.actions.history');
}

protected function fillForm(): void
{
//
}

public function infolist(Infolist $infolist): Infolist
{
return $infolist;
}

protected function getForms(): array
{
return [
// Disables form
'form' => $this->makeForm(),
];
}

protected function getHeaderWidgets(): array
{
return [
BeneficiaryResource\Widgets\PersonalDataVersionsWidget::class,
];
}
}
2 changes: 0 additions & 2 deletions app/Filament/Shelter/Resources/BeneficiaryResource/Pages/ViewDocument.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ class ViewDocument extends ViewRecord
protected function getHeaderActions(): array
{
return [

Actions\DeleteAction::make()
->label(__('app.documents.actions.delete'))
->record($this->document)
Expand Down Expand Up @@ -59,7 +58,6 @@ protected function getHeaderActions(): array

return response()->download($mediaItem->getPath(), $mediaItem->file_name);
}),

];
}

Expand Down
53 changes: 53 additions & 0 deletions app/Filament/Shelter/Resources/BeneficiaryResource/Pages/ViewPersonalDataVersion.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
<?php

declare(strict_types=1);

namespace App\Filament\Shelter\Resources\BeneficiaryResource\Pages;

use App\Filament\Concerns\UsesBreadcrumbFromTitle;
use App\Filament\Shelter\Resources\BeneficiaryResource;
use App\Filament\Shelter\Resources\BeneficiaryResource\Schemas\BeneficiaryDynamicInfolist;
use App\Models\Form\Response;
use Filament\Infolists\Components\Section;
use Filament\Infolists\Components\TextEntry;
use Filament\Infolists\Infolist;
use Filament\Resources\Pages\ViewRecord;

class ViewPersonalDataVersion extends ViewRecord
{
use UsesBreadcrumbFromTitle;

public Response $response;

protected static string $resource = BeneficiaryResource::class;

public function getTitle(): string
{
return __('app.form.actions.history') . ' #' . $this->response->id;
}

public function infolist(Infolist $infolist): Infolist
{
return $infolist
->record($this->response)
->schema(fn (Response $record) => [
Section::make()
->columns(3)
->schema([
TextEntry::make('id')
->label(__('app.field.id'))
->prefix('#'),

TextEntry::make('created_at')
->label(__('app.field.created_at'))
->dateTime(),

TextEntry::make('updated_at')
->label(__('app.field.updated_at'))
->dateTime(),
]),

...BeneficiaryDynamicInfolist::getSchemaForResponse($record),
]);
}
}
75 changes: 40 additions & 35 deletions app/Filament/Shelter/Resources/BeneficiaryResource/Schemas/BeneficiaryDynamicInfolist.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,47 +25,52 @@ public static function getSchema(): array
return [];
}

$state->loadMissing('form.sections.fields:id,label,type,section_id');
return static::getSchemaForResponse($state);
}),
];
}

$fieldIndex = 0;
public static function getSchemaForResponse(Response $response): array
{
$fieldIndex = 0;

return $state->form
->sections
->map(function ($section) use (&$fieldIndex) {
return Section::make($section->name)
->description($section->description)
->columns(3)
->collapsible()
->schema(
$section->fields->map(function (Field $field) use (&$fieldIndex) {
$component = TextEntry::make("fields.{$fieldIndex}.value")
->label($field->label);
$response->loadMissing('form.sections.fields');

$fieldIndex++;
return $response->form
->sections
->map(function ($section) use (&$fieldIndex) {
return Section::make($section->name)
->description($section->description)
->columns(3)
->collapsible()
->schema(
$section->fields->map(function (Field $field) use (&$fieldIndex) {
$component = TextEntry::make("fields.{$fieldIndex}.value")
->label($field->label);

switch ($field->type) {
case FieldType::CHECKBOX:
case FieldType::RADIO:
case FieldType::SELECT:
$component->listWithLineBreaks();
break;
$fieldIndex++;

case FieldType::NUMBER:
$component->numeric();
break;
switch ($field->type) {
case FieldType::CHECKBOX:
case FieldType::RADIO:
case FieldType::SELECT:
$component->listWithLineBreaks();
break;

case FieldType::DATE:
$component->formatStateUsing(function ($state) {
return rescue(fn () => Carbon::parse($state)->toFormattedDate(), $state, false);
});
break;
}
case FieldType::NUMBER:
$component->numeric();
break;

return $component;
})->all()
);
})->all();
}),
];
case FieldType::DATE:
$component->formatStateUsing(function ($state) {
return rescue(fn () => Carbon::parse($state)->toFormattedDate(), $state, false);
});
break;
}

return $component;
})->all()
);
})->all();
}
}
58 changes: 58 additions & 0 deletions app/Filament/Shelter/Resources/BeneficiaryResource/Widgets/PersonalDataVersionsWidget.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,58 @@
<?php

declare(strict_types=1);

namespace App\Filament\Shelter\Resources\BeneficiaryResource\Widgets;

use App\Filament\Shelter\Resources\BeneficiaryResource;
use App\Models\Beneficiary;
use App\Models\Form\Response;
use Filament\Tables\Actions\ViewAction;
use Filament\Tables\Columns\TextColumn;
use Filament\Tables\Table;
use Filament\Widgets\TableWidget as BaseWidget;

class PersonalDataVersionsWidget extends BaseWidget
{
public ?Beneficiary $record = null;

protected int | string | array $columnSpan = 'full';

public function table(Table $table): Table
{
return $table
->query(fn () => $this->record->personal())
->heading(__('app.form.actions.history'))
->columns([
TextColumn::make('id')
->label(__('app.field.id'))
->prefix('#')
->sortable()
->shrink(),

TextColumn::make('form.sections.name')
->label(__('app.field.form_sections'))
->wrap(),

TextColumn::make('created_at')
->label(__('app.field.created_at'))
->dateTime()
->sortable()
->shrink(),

TextColumn::make('updated_at')
->label(__('app.field.updated_at'))
->dateTime()
->sortable()
->shrink(),

])
->actions([
ViewAction::make()
->url(fn (Response $record) => BeneficiaryResource::getUrl('versions.view', [
'record' => $this->record,
'response' => $record,
])),
]);
}
}
5 changes: 5 additions & 0 deletions app/Models/Beneficiary.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,4 +123,9 @@ public function scopeWhereInShelter(Builder $query, Shelter $shelter): Builder
{
return $query->whereRelation('stays', 'shelter_id', $shelter->id);
}

public function hasMoreThanOneForm(): bool
{
return $this->personal()->count() > 1;
}
}
2 changes: 2 additions & 0 deletions lang/en/app.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
'enabled' => 'Enabled',
'end_date' => 'End date',
'fields' => 'Fields',
'form_sections' => 'Form sections',
'form_type' => 'Form type',
'gender' => 'Gender',
'group_size' => 'No.',
Expand Down Expand Up @@ -165,6 +166,7 @@
'obsolete' => 'Obsolete',
],
'actions' => [
'history' => 'Form history',
'draft' => [
'button' => 'Draft',
'confirm' => [
Expand Down
Loading