Skip to content

Commit 7290558

Browse files
KilianTrunkKilianTrunk
committed
chore: ci, tests, permission fixes
1 parent e7bc9be commit 7290558

14 files changed

Lines changed: 235 additions & 154 deletions

‎.github/workflows/test-runner.yml‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,13 @@
11
name: Tests
22

33
on:
4-
# Run testing on all push and pull requests for the main branch that have committed changes in PHP files
4+
# Run testing on all push and pull requests that have committed changes in PHP files
55
push:
6-
branches: [ "main" ]
76
paths:
8-
- '**.php'
7+
- '**/*.php'
98
pull_request:
10-
branches: [ "main" ]
119
paths:
12-
- '**.php'
10+
- '**/*.php'
1311
# Make it possible to run the workflow manually
1412
workflow_dispatch:
1513

‎config/filament-shield.php‎

Lines changed: 153 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,153 @@
1+
<?php
2+
3+
use Eclipse\World\Filament\Clusters\World\Resources\CountryResource;
4+
use Eclipse\World\Filament\Clusters\World\Resources\CurrencyResource;
5+
use Eclipse\World\Filament\Clusters\World\Resources\PostResource;
6+
use Eclipse\World\Filament\Clusters\World\Resources\RegionResource;
7+
use Eclipse\World\Filament\Clusters\World\Resources\TariffCodeResource;
8+
9+
return [
10+
'shield_resource' => [
11+
'slug' => 'shield/roles',
12+
'show_model_path' => true,
13+
'cluster' => null,
14+
'tabs' => [
15+
'pages' => true,
16+
'widgets' => true,
17+
'resources' => true,
18+
'custom_permissions' => true,
19+
],
20+
],
21+
22+
'tenant_model' => \Eclipse\Core\Models\Site::class,
23+
24+
'auth_provider_model' => \Eclipse\Core\Models\User::class,
25+
26+
'super_admin' => [
27+
'enabled' => true,
28+
'name' => 'super_admin',
29+
'define_via_gate' => false,
30+
'intercept_gate' => 'before',
31+
],
32+
33+
'panel_user' => [
34+
'enabled' => true,
35+
'name' => 'panel_user',
36+
],
37+
38+
'permissions' => [
39+
'separator' => '_',
40+
'case' => 'lower_snake',
41+
'generate' => true,
42+
],
43+
44+
'policies' => [
45+
'path' => app_path('Policies'),
46+
'merge' => true,
47+
'generate' => true,
48+
'methods' => [
49+
'viewAny', 'view', 'create', 'update', 'restore', 'restoreAny',
50+
'replicate', 'reorder', 'delete', 'deleteAny', 'forceDelete', 'forceDeleteAny',
51+
],
52+
'single_parameter_methods' => [
53+
'viewAny', 'create', 'deleteAny', 'forceDeleteAny', 'restoreAny', 'reorder',
54+
],
55+
],
56+
57+
'localization' => [
58+
'enabled' => false,
59+
'key' => 'filament-shield::filament-shield',
60+
],
61+
62+
'resources' => [
63+
'subject' => 'model',
64+
'manage' => [
65+
CountryResource::class => [
66+
'viewAny',
67+
'view',
68+
'create',
69+
'update',
70+
'restore',
71+
'restoreAny',
72+
'delete',
73+
'deleteAny',
74+
'forceDelete',
75+
'forceDeleteAny',
76+
],
77+
RegionResource::class => [
78+
'viewAny',
79+
'view',
80+
'create',
81+
'update',
82+
'restore',
83+
'restoreAny',
84+
'delete',
85+
'deleteAny',
86+
'forceDelete',
87+
'forceDeleteAny',
88+
],
89+
CurrencyResource::class => [
90+
'viewAny',
91+
'view',
92+
'create',
93+
'update',
94+
'restore',
95+
'restoreAny',
96+
'delete',
97+
'deleteAny',
98+
'forceDelete',
99+
'forceDeleteAny',
100+
],
101+
TariffCodeResource::class => [
102+
'viewAny',
103+
'view',
104+
'create',
105+
'update',
106+
'restore',
107+
'restoreAny',
108+
'delete',
109+
'deleteAny',
110+
'forceDelete',
111+
'forceDeleteAny',
112+
],
113+
PostResource::class => [
114+
'viewAny',
115+
'view',
116+
'create',
117+
'update',
118+
'restore',
119+
'restoreAny',
120+
'delete',
121+
'deleteAny',
122+
'forceDelete',
123+
'forceDeleteAny',
124+
],
125+
],
126+
'exclude' => [],
127+
],
128+
129+
'pages' => [
130+
'subject' => 'class',
131+
'prefix' => 'view',
132+
'exclude' => [
133+
],
134+
],
135+
136+
'widgets' => [
137+
'subject' => 'class',
138+
'prefix' => 'view',
139+
'exclude' => [
140+
],
141+
],
142+
143+
'custom_permissions' => [
144+
],
145+
146+
'discovery' => [
147+
'discover_all_resources' => false,
148+
'discover_all_widgets' => false,
149+
'discover_all_pages' => false,
150+
],
151+
152+
'register_role_policy' => true,
153+
];

‎src/Filament/Clusters/World/Resources/CountryResource.php‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace Eclipse\World\Filament\Clusters\World\Resources;
44

5-
use BezhanSalleh\FilamentShield\Contracts\HasShieldPermissions;
65
use Closure;
76
use Eclipse\World\Filament\Clusters\World;
87
use Eclipse\World\Filament\Clusters\World\Resources\CountryResource\Pages\ListCountries;
@@ -32,7 +31,7 @@
3231
use Illuminate\Database\Eloquent\SoftDeletingScope;
3332
use TangoDevIt\FilamentEmojiPicker\EmojiPickerAction;
3433

35-
class CountryResource extends Resource implements HasShieldPermissions
34+
class CountryResource extends Resource
3635
{
3736
protected static ?string $model = Country::class;
3837

@@ -267,21 +266,6 @@ public static function getEloquentQuery(): Builder
267266
]);
268267
}
269268

270-
public static function getPermissionPrefixes(): array
271-
{
272-
return [
273-
'view_any',
274-
'create',
275-
'update',
276-
'restore',
277-
'restore_any',
278-
'delete',
279-
'delete_any',
280-
'force_delete',
281-
'force_delete_any',
282-
];
283-
}
284-
285269
public static function getNavigationLabel(): string
286270
{
287271
return __('eclipse-world::countries.nav_label');

‎src/Filament/Clusters/World/Resources/CurrencyResource.php‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace Eclipse\World\Filament\Clusters\World\Resources;
44

5-
use BezhanSalleh\FilamentShield\Contracts\HasShieldPermissions;
65
use Eclipse\World\Filament\Clusters\World;
76
use Eclipse\World\Filament\Clusters\World\Resources\CurrencyResource\Pages\ListCurrencies;
87
use Eclipse\World\Models\Currency;
@@ -26,7 +25,7 @@
2625
use Illuminate\Database\Eloquent\Builder;
2726
use Illuminate\Database\Eloquent\SoftDeletingScope;
2827

29-
class CurrencyResource extends Resource implements HasShieldPermissions
28+
class CurrencyResource extends Resource
3029
{
3130
protected static ?string $model = Currency::class;
3231

@@ -129,21 +128,6 @@ public static function getEloquentQuery(): Builder
129128
]);
130129
}
131130

132-
public static function getPermissionPrefixes(): array
133-
{
134-
return [
135-
'view_any',
136-
'create',
137-
'update',
138-
'restore',
139-
'restore_any',
140-
'delete',
141-
'delete_any',
142-
'force_delete',
143-
'force_delete_any',
144-
];
145-
}
146-
147131
public static function getNavigationLabel(): string
148132
{
149133
return __('eclipse-world::currencies.nav_label');

‎src/Filament/Clusters/World/Resources/PostResource.php‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace Eclipse\World\Filament\Clusters\World\Resources;
44

5-
use BezhanSalleh\FilamentShield\Contracts\HasShieldPermissions;
65
use Eclipse\World\Filament\Clusters\World;
76
use Eclipse\World\Filament\Clusters\World\Resources\PostResource\Pages\ListPosts;
87
use Eclipse\World\Models\Post;
@@ -28,7 +27,7 @@
2827
use Illuminate\Database\Eloquent\SoftDeletingScope;
2928
use Illuminate\Validation\Rule;
3029

31-
class PostResource extends Resource implements HasShieldPermissions
30+
class PostResource extends Resource
3231
{
3332
protected static ?string $model = Post::class;
3433

@@ -143,21 +142,6 @@ public static function getEloquentQuery(): Builder
143142
]);
144143
}
145144

146-
public static function getPermissionPrefixes(): array
147-
{
148-
return [
149-
'view_any',
150-
'create',
151-
'update',
152-
'restore',
153-
'restore_any',
154-
'delete',
155-
'delete_any',
156-
'force_delete',
157-
'force_delete_any',
158-
];
159-
}
160-
161145
public static function getNavigationLabel(): string
162146
{
163147
return __('eclipse-world::posts.nav_label');

‎src/Filament/Clusters/World/Resources/RegionResource.php‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace Eclipse\World\Filament\Clusters\World\Resources;
44

5-
use BezhanSalleh\FilamentShield\Contracts\HasShieldPermissions;
65
use Eclipse\World\Filament\Clusters\World;
76
use Eclipse\World\Filament\Clusters\World\Resources\RegionResource\Pages\ListRegions;
87
use Eclipse\World\Models\Region;
@@ -28,7 +27,7 @@
2827
use Illuminate\Database\Eloquent\Builder;
2928
use Illuminate\Database\Eloquent\SoftDeletingScope;
3029

31-
class RegionResource extends Resource implements HasShieldPermissions
30+
class RegionResource extends Resource
3231
{
3332
protected static ?string $model = Region::class;
3433

@@ -182,21 +181,6 @@ public static function getEloquentQuery(): Builder
182181
]);
183182
}
184183

185-
public static function getPermissionPrefixes(): array
186-
{
187-
return [
188-
'view_any',
189-
'create',
190-
'update',
191-
'restore',
192-
'restore_any',
193-
'delete',
194-
'delete_any',
195-
'force_delete',
196-
'force_delete_any',
197-
];
198-
}
199-
200184
public static function getNavigationLabel(): string
201185
{
202186
return __('eclipse-world::regions.nav_label');

‎src/Filament/Clusters/World/Resources/TariffCodeResource.php‎

Lines changed: 1 addition & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
namespace Eclipse\World\Filament\Clusters\World\Resources;
44

5-
use BezhanSalleh\FilamentShield\Contracts\HasShieldPermissions;
65
use Eclipse\World\Filament\Clusters\World;
76
use Eclipse\World\Filament\Clusters\World\Resources\TariffCodeResource\Pages\ListTariffCodes;
87
use Eclipse\World\Models\TariffCode;
@@ -25,7 +24,7 @@
2524
use Illuminate\Database\Eloquent\SoftDeletingScope;
2625
use LaraZeus\SpatieTranslatable\Resources\Concerns\Translatable;
2726

28-
class TariffCodeResource extends Resource implements HasShieldPermissions
27+
class TariffCodeResource extends Resource
2928
{
3029
use Translatable;
3130

@@ -131,19 +130,4 @@ public static function getEloquentQuery(): Builder
131130
SoftDeletingScope::class,
132131
]);
133132
}
134-
135-
public static function getPermissionPrefixes(): array
136-
{
137-
return [
138-
'view_any',
139-
'create',
140-
'update',
141-
'restore',
142-
'restore_any',
143-
'delete',
144-
'delete_any',
145-
'force_delete',
146-
'force_delete_any',
147-
];
148-
}
149133
}

0 commit comments

Comments
 (0)