Skip to content

Commit 02c6380

Browse files
rebecca-canyonrebecca-canyon
authored
[AIDAPP-977]: Update existing Filament resource structure: contract-management module (#948)
* Update contract management resource to use Filament v4 resource structure * Update code formatting and copyright headers * Address failing tests * Update test structure to match new resource structure --------- Co-authored-by: rebecca-canyon <198644076+rebecca-canyon@users.noreply.github.com>
1 parent 4feb235 commit 02c6380

File tree

11 files changed

+30
-28
lines changed

11 files changed

+30
-28
lines changed

app-modules/contract-management/src/Filament/Resources/ContractTypeResource.php renamed to app-modules/contract-management/src/Filament/Resources/ContractTypes/ContractTypeResource.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,11 @@
3434
</COPYRIGHT>
3535
*/
3636

37-
namespace AidingApp\ContractManagement\Filament\Resources;
37+
namespace AidingApp\ContractManagement\Filament\Resources\ContractTypes;
3838

39-
use AidingApp\ContractManagement\Filament\Resources\ContractTypeResource\Pages\CreateContractType;
40-
use AidingApp\ContractManagement\Filament\Resources\ContractTypeResource\Pages\EditContractType;
41-
use AidingApp\ContractManagement\Filament\Resources\ContractTypeResource\Pages\ListContractTypes;
39+
use AidingApp\ContractManagement\Filament\Resources\ContractTypes\Pages\CreateContractType;
40+
use AidingApp\ContractManagement\Filament\Resources\ContractTypes\Pages\EditContractType;
41+
use AidingApp\ContractManagement\Filament\Resources\ContractTypes\Pages\ListContractTypes;
4242
use AidingApp\ContractManagement\Models\ContractType;
4343
use App\Filament\Clusters\ContractManagement;
4444
use Filament\Resources\Resource;

app-modules/contract-management/src/Filament/Resources/ContractTypeResource/Pages/CreateContractType.php renamed to app-modules/contract-management/src/Filament/Resources/ContractTypes/Pages/CreateContractType.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
</COPYRIGHT>
3535
*/
3636

37-
namespace AidingApp\ContractManagement\Filament\Resources\ContractTypeResource\Pages;
37+
namespace AidingApp\ContractManagement\Filament\Resources\ContractTypes\Pages;
3838

39-
use AidingApp\ContractManagement\Filament\Resources\ContractTypeResource;
39+
use AidingApp\ContractManagement\Filament\Resources\ContractTypes\ContractTypeResource;
4040
use AidingApp\ContractManagement\Models\ContractType;
4141
use Filament\Forms\Components\TextInput;
4242
use Filament\Forms\Components\Toggle;
@@ -60,7 +60,7 @@ public function form(Schema $schema): Schema
6060
Toggle::make('is_default')
6161
->label('Default')
6262
->live()
63-
->hint(function (?ContractType $record, $state): ?string {
63+
->hint(function (?ContractType $record, ?bool $state): ?string {
6464
if ($record?->is_default) {
6565
return null;
6666
}

app-modules/contract-management/src/Filament/Resources/ContractTypeResource/Pages/EditContractType.php renamed to app-modules/contract-management/src/Filament/Resources/ContractTypes/Pages/EditContractType.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
</COPYRIGHT>
3535
*/
3636

37-
namespace AidingApp\ContractManagement\Filament\Resources\ContractTypeResource\Pages;
37+
namespace AidingApp\ContractManagement\Filament\Resources\ContractTypes\Pages;
3838

39-
use AidingApp\ContractManagement\Filament\Resources\ContractTypeResource;
39+
use AidingApp\ContractManagement\Filament\Resources\ContractTypes\ContractTypeResource;
4040
use AidingApp\ContractManagement\Models\ContractType;
4141
use App\Concerns\EditPageRedirection;
4242
use Filament\Actions\DeleteAction;
@@ -64,7 +64,7 @@ public function form(Schema $schema): Schema
6464
Toggle::make('is_default')
6565
->label('Default')
6666
->live()
67-
->hint(function (?ContractType $record, $state): ?string {
67+
->hint(function (?ContractType $record, ?bool $state): ?string {
6868
if ($record?->is_default) {
6969
return null;
7070
}

app-modules/contract-management/src/Filament/Resources/ContractTypeResource/Pages/ListContractTypes.php renamed to app-modules/contract-management/src/Filament/Resources/ContractTypes/Pages/ListContractTypes.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
</COPYRIGHT>
3535
*/
3636

37-
namespace AidingApp\ContractManagement\Filament\Resources\ContractTypeResource\Pages;
37+
namespace AidingApp\ContractManagement\Filament\Resources\ContractTypes\Pages;
3838

39-
use AidingApp\ContractManagement\Filament\Resources\ContractTypeResource;
39+
use AidingApp\ContractManagement\Filament\Resources\ContractTypes\ContractTypeResource;
4040
use Filament\Actions\BulkActionGroup;
4141
use Filament\Actions\CreateAction;
4242
use Filament\Actions\DeleteAction;

app-modules/contract-management/src/Filament/Resources/ContractResource.php renamed to app-modules/contract-management/src/Filament/Resources/Contracts/ContractResource.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@
3434
</COPYRIGHT>
3535
*/
3636

37-
namespace AidingApp\ContractManagement\Filament\Resources;
37+
namespace AidingApp\ContractManagement\Filament\Resources\Contracts;
3838

39-
use AidingApp\ContractManagement\Filament\Resources\ContractResource\Pages\CreateContract;
40-
use AidingApp\ContractManagement\Filament\Resources\ContractResource\Pages\EditContract;
41-
use AidingApp\ContractManagement\Filament\Resources\ContractResource\Pages\ListContracts;
42-
use AidingApp\ContractManagement\Filament\Resources\ContractResource\Pages\ViewContract;
39+
use AidingApp\ContractManagement\Filament\Resources\Contracts\Pages\CreateContract;
40+
use AidingApp\ContractManagement\Filament\Resources\Contracts\Pages\EditContract;
41+
use AidingApp\ContractManagement\Filament\Resources\Contracts\Pages\ListContracts;
42+
use AidingApp\ContractManagement\Filament\Resources\Contracts\Pages\ViewContract;
4343
use AidingApp\ContractManagement\Models\Contract;
4444
use BackedEnum;
4545
use Filament\Resources\Resource;

app-modules/contract-management/src/Filament/Resources/ContractResource/Pages/CreateContract.php renamed to app-modules/contract-management/src/Filament/Resources/Contracts/Pages/CreateContract.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
</COPYRIGHT>
3535
*/
3636

37-
namespace AidingApp\ContractManagement\Filament\Resources\ContractResource\Pages;
37+
namespace AidingApp\ContractManagement\Filament\Resources\Contracts\Pages;
3838

39-
use AidingApp\ContractManagement\Filament\Resources\ContractResource;
39+
use AidingApp\ContractManagement\Filament\Resources\Contracts\ContractResource;
4040
use AidingApp\ContractManagement\Models\ContractType;
4141
use Cknow\Money\Money;
4242
use Filament\Forms\Components\DatePicker;

app-modules/contract-management/src/Filament/Resources/ContractResource/Pages/EditContract.php renamed to app-modules/contract-management/src/Filament/Resources/Contracts/Pages/EditContract.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
</COPYRIGHT>
3535
*/
3636

37-
namespace AidingApp\ContractManagement\Filament\Resources\ContractResource\Pages;
37+
namespace AidingApp\ContractManagement\Filament\Resources\Contracts\Pages;
3838

39-
use AidingApp\ContractManagement\Filament\Resources\ContractResource;
39+
use AidingApp\ContractManagement\Filament\Resources\Contracts\ContractResource;
4040
use AidingApp\ContractManagement\Models\Contract;
4141
use AidingApp\ContractManagement\Models\ContractType;
4242
use App\Concerns\EditPageRedirection;
@@ -172,6 +172,8 @@ protected function mutateFormDataBeforeSave(array $data): array
172172

173173
protected function mutateFormDataBeforeFill(array $data): array
174174
{
175+
assert($this->getRecord() instanceof Contract);
176+
175177
$data['contract_value'] = $this->getRecord()->contract_value?->formatByDecimal();
176178

177179
return $data;

app-modules/contract-management/src/Filament/Resources/ContractResource/Pages/ListContracts.php renamed to app-modules/contract-management/src/Filament/Resources/Contracts/Pages/ListContracts.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,10 @@
3434
</COPYRIGHT>
3535
*/
3636

37-
namespace AidingApp\ContractManagement\Filament\Resources\ContractResource\Pages;
37+
namespace AidingApp\ContractManagement\Filament\Resources\Contracts\Pages;
3838

3939
use AidingApp\ContractManagement\Enums\ContractStatus;
40-
use AidingApp\ContractManagement\Filament\Resources\ContractResource;
40+
use AidingApp\ContractManagement\Filament\Resources\Contracts\ContractResource;
4141
use Filament\Actions\BulkActionGroup;
4242
use Filament\Actions\CreateAction;
4343
use Filament\Actions\DeleteAction;
@@ -77,7 +77,7 @@ public function table(Table $table): Table
7777
->options(collect(ContractStatus::cases())->mapWithKeys(fn (ContractStatus $contractStatus) => [
7878
$contractStatus->value => $contractStatus->getLabel(),
7979
]))
80-
->query(function (Builder $query, $state) {
80+
->query(function (Builder $query, array $state) {
8181
$today = now();
8282

8383
return match ($state['value']) {

app-modules/contract-management/src/Filament/Resources/ContractResource/Pages/ViewContract.php renamed to app-modules/contract-management/src/Filament/Resources/Contracts/Pages/ViewContract.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,9 @@
3434
</COPYRIGHT>
3535
*/
3636

37-
namespace AidingApp\ContractManagement\Filament\Resources\ContractResource\Pages;
37+
namespace AidingApp\ContractManagement\Filament\Resources\Contracts\Pages;
3838

39-
use AidingApp\ContractManagement\Filament\Resources\ContractResource;
39+
use AidingApp\ContractManagement\Filament\Resources\Contracts\ContractResource;
4040
use AidingApp\ContractManagement\Models\Contract;
4141
use Filament\Actions\DeleteAction;
4242
use Filament\Actions\EditAction;

app-modules/contract-management/tests/Tenant/Filament/ContractTypeResource/Pages/ListContractTypesTest.php renamed to app-modules/contract-management/tests/Tenant/Filament/Resources/ContractTypes/Pages/ListContractTypesTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
</COPYRIGHT>
3535
*/
3636

37-
use AidingApp\ContractManagement\Filament\Resources\ContractTypeResource\Pages\ListContractTypes;
37+
use AidingApp\ContractManagement\Filament\Resources\ContractTypes\Pages\ListContractTypes;
3838
use App\Models\User;
3939
use App\Settings\LicenseSettings;
4040

0 commit comments

Comments
 (0)