Skip to content

Commit b2e5761

Browse files
author
Backstage
committed
fix: add missing site ulid to resources (#43)
1 parent 34eeb6b commit b2e5761

File tree

7 files changed

+20
-20
lines changed

7 files changed

+20
-20
lines changed

src/Notifications/UserInvitationNotification.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ public function toMail(User $notifiable): MailMessage
4141
$url = GenerateSignedRegistrationUri::run(user: $notifiable);
4242

4343
return (new MailMessage)
44-
->subject(__('Welcome to Our Platform'))
44+
->subject(__('Welcome to :appName', ['appName' => config('app.name', 'Backstagephp')]))
4545
->greeting(__('Hello :name!', ['name' => $notifiable->getAttribute('name')]))
4646
->line(__('We are excited to have you on board.'))
4747
->action(__('Register'), $url)

src/Resources/RoleResource/RoleResource.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public static function getSlug(?Panel $panel = null): string
3131

3232
public static function getNavigationGroup(): ?string
3333
{
34-
return __('User management');
34+
return __('Manage');
3535
}
3636

3737
public static function getNavigationIcon(): string | BackedEnum | Htmlable | null

src/Resources/UserResource/Pages/CreateUser.php

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,8 @@
33
namespace Backstage\Filament\Users\Resources\UserResource\Pages;
44

55
use Backstage\Filament\Users\Resources\UserResource\UserResource;
6-
use Backstage\Laravel\Users\Events\Auth\UserCreated;
6+
use Filament\Facades\Filament;
77
use Filament\Resources\Pages\CreateRecord;
8-
use Illuminate\Support\Facades\Event;
98

109
class CreateUser extends CreateRecord
1110
{
@@ -14,13 +13,13 @@ public static function getResource(): string
1413
return config('backstage.users.resources.users', UserResource::class);
1514
}
1615

17-
public function beforeCreate(): void
16+
protected function getCreatedNotificationTitle(): ?string
1817
{
19-
Event::forget(UserCreated::class);
18+
return __('User created successfully, the user will receive an email with their registeration details.');
2019
}
2120

22-
protected function getCreatedNotificationTitle(): ?string
21+
public function getRedirectUrl(): string
2322
{
24-
return __('User created successfully, the user will receive an email with their registeration details.');
23+
return $this->getResource()::getUrl('index', ['tenant' => Filament::getTenant()?->getRouteKey()]);
2524
}
2625
}

src/Resources/UserResource/Pages/ListUsers.php

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
namespace Backstage\Filament\Users\Resources\UserResource\Pages;
44

55
use Backstage\Filament\Users\Resources\UserResource\UserResource;
6+
use Backstage\Filament\Users\Widgets\StatsOverviewWidget;
67
use Filament\Actions;
78
use Filament\Resources\Pages\ListRecords;
89
use Filament\Schemas\Components\Tabs\Tab;
9-
use Filament\Support\Colors\Color;
1010

1111
class ListUsers extends ListRecords
1212
{
@@ -25,22 +25,18 @@ protected function getHeaderActions(): array
2525
protected function getHeaderWidgets(): array
2626
{
2727
return [
28-
\Backstage\Filament\Users\Widgets\StatsOverviewWidget::class,
28+
StatsOverviewWidget::class,
2929
];
3030
}
3131

3232
public function getTabs(): array
3333
{
3434
return [
3535
'users' => Tab::make(__('Users'))
36-
->badge(static::getResource()::getEloquentQuery()->verified()->count())
37-
->badgeColor(Color::Green)
38-
->modifyQueryUsing(fn ($query) => $query->verified()),
36+
->modifyQueryUsing(fn () => static::getResource()::getEloquentQuery()->verified()),
3937

4038
'pending' => Tab::make(__('Pending'))
41-
->badge(static::getResource()::getEloquentQuery()->unverified()->count())
42-
->badgeColor(Color::Red)
43-
->modifyQueryUsing(fn ($query) => $query->unverified()),
39+
->modifyQueryUsing(fn () => static::getResource()::getEloquentQuery()->unverified()),
4440
];
4541
}
4642
}

src/Resources/UserResource/Pages/ManageRoles.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,7 @@ public function table(Table $table): Table
4343
AttachAction::make()
4444
->preloadRecordSelect()
4545
->recordTitleAttribute('name')
46+
->hidden(fn () => ! static::getResource()::canEdit($this->getOwnerRecord()))
4647
->multiple(),
4748

4849
CreateAction::make(),

src/Resources/UserResource/Schemas/UserForm.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ public static function configure(Schema $schema): Schema
3838
->label(__('Email'))
3939
->prefixIcon(fn (): BackedEnum => Heroicon::Envelope, true)
4040
->email()
41+
->unique()
4142
->required(),
4243

4344
Select::make('roles')

src/Resources/UserResource/UserResource.php

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public static function getSlug(?Panel $panel = null): string
4343

4444
public static function canAccess(): bool
4545
{
46-
return UsersPlugin::get()->canManageUsersCondition();
46+
return parent::canAccess() && UsersPlugin::get()->canManageUsersCondition();
4747
}
4848

4949
public static function getModel(): string
@@ -58,7 +58,7 @@ public static function getRecordTitleAttribute(): ?string
5858

5959
public static function getNavigationGroup(): ?string
6060
{
61-
return __('User management');
61+
return __('Manage');
6262
}
6363

6464
public static function getNavigationIcon(): string | BackedEnum | Htmlable | null
@@ -95,10 +95,12 @@ public static function table(Table $table): Table
9595
->headerActions([
9696
ImportAction::make('import')
9797
->importer(UserImporter::class)
98-
->color('primary'),
98+
->color('primary')
99+
->visible(fn () => static::canCreate()),
99100

100101
ExportAction::make()
101-
->exporter(UserExporter::class),
102+
->exporter(UserExporter::class)
103+
->visible(fn () => static::canCreate()),
102104
])
103105
->columns([
104106
Tables\Columns\ImageColumn::make('avatar')
@@ -129,6 +131,7 @@ public static function table(Table $table): Table
129131
->label('')
130132
->color('gray')
131133
->tooltip(__('Impersonate'))
134+
->hidden(fn ($record) => ! static::canEdit($record))
132135
->hiddenLabel(),
133136
])
134137
->toolbarActions([

0 commit comments

Comments
 (0)