adalal/solidtime
1
0
Fork 0
mirror of https://github.com/solidtime-io/solidtime.git synced 2026-08-16 12:12:15 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add more tests; Add filter in filament resource; Added options for user create command

Browse Source
This commit is contained in:
Constantin Graf
2025-02-05 18:02:24 -05:00
committed by Constantin Graf
parent 84c9cfe2f2
commit dce608e403
20 changed files with 413 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/Console/Commands/Admin/UserCreateCommand.php
View File

@@ -22,7 +22,8 @@ class UserCreateCommand extends Command
protected $signature = 'admin:user:create
{ name : The name of the user }
{ email : The email of the user }
{ --ask-for-password : Ask for the password, otherwise the command will generate a random one }';
{ --ask-for-password : Ask for the password, otherwise the command will generate a random one }
{ --verify-email : Verify the email address of the user }';
/**
* The console command description.
@@ -39,6 +40,7 @@ class UserCreateCommand extends Command
$name = $this->argument('name');
$email = $this->argument('email');
$askForPassword = (bool) $this->option('ask-for-password');
$verifyEmail = (bool) $this->option('verify-email');
if (User::query()->where('email', $email)->where('is_placeholder', '=', false)->exists()) {
$this->error('User with email "'.$email.'" already exists.');
@@ -71,6 +73,10 @@ class UserCreateCommand extends Command
throw new LogicException('User does not have an organization');
}
if ($verifyEmail) {
$user->markEmailAsVerified();
}
$this->info('Created user "'.$name.'" ("'.$email.'")');
$this->line('ID: '.$user->getKey());
$this->line('Name: '.$name);

5
app/Filament/Resources/ClientResource.php
View File

@@ -60,8 +60,13 @@ class ClientResource extends Resource
->defaultSort('created_at', 'desc')
->filters([
SelectFilter::make('organization')
->label('Organization')
->relationship('organization', 'name')
->searchable(),
SelectFilter::make('organization_id')
->label('Organization ID')
->relationship('organization', 'id')
->searchable(),
])
->actions([
Tables\Actions\EditAction::make(),

3
app/Filament/Resources/OrganizationInvitationResource/Pages/EditOrganizationInvitation.php
View File

@@ -5,6 +5,7 @@ declare(strict_types=1);
namespace App\Filament\Resources\OrganizationInvitationResource\Pages;
use App\Filament\Resources\OrganizationInvitationResource;
use Filament\Actions;
use Filament\Resources\Pages\EditRecord;
class EditOrganizationInvitation extends EditRecord
@@ -14,6 +15,8 @@ class EditOrganizationInvitation extends EditRecord
protected function getHeaderActions(): array
{
return [
Actions\DeleteAction::make()
->icon('heroicon-m-trash'),
];
}
}

1
app/Filament/Resources/OrganizationResource/RelationManagers/UsersRelationManager.php
View File

@@ -56,6 +56,7 @@ class UsersRelationManager extends RelationManager
])
->headerActions([
Tables\Actions\AttachAction::make()
->recordTitle(fn (User $record): string => "{$record->name} ({$record->email})")
->form(fn (AttachAction $action): array => [
$action->getRecordSelect(),
Select::make('role')

5
app/Filament/Resources/ProjectResource.php
View File

@@ -72,8 +72,13 @@ class ProjectResource extends Resource
])
->filters([
SelectFilter::make('organization')
->label('Organization')
->relationship('organization', 'name')
->searchable(),
SelectFilter::make('organization_id')
->label('Organization ID')
->relationship('organization', 'id')
->searchable(),
])
->defaultSort('created_at', 'desc')
->actions([

5
app/Filament/Resources/ReportResource.php
View File

@@ -101,8 +101,13 @@ class ReportResource extends Resource
->defaultSort('created_at', 'desc')
->filters([
SelectFilter::make('organization')
->label('Organization')
->relationship('organization', 'name')
->searchable(),
SelectFilter::make('organization_id')
->label('Organization ID')
->relationship('organization', 'id')
->searchable(),
])
->actions([
Action::make('public-view')

5
app/Filament/Resources/TagResource.php
View File

@@ -60,8 +60,13 @@ class TagResource extends Resource
->defaultSort('created_at', 'desc')
->filters([
SelectFilter::make('organization')
->label('Organization')
->relationship('organization', 'name')
->searchable(),
SelectFilter::make('organization_id')
->label('Organization ID')
->relationship('organization', 'id')
->searchable(),
])
->actions([
Tables\Actions\EditAction::make(),

5
app/Filament/Resources/TaskResource.php
View File

@@ -61,8 +61,13 @@ class TaskResource extends Resource
])
->filters([
SelectFilter::make('organization')
->label('Organization')
->relationship('organization', 'name')
->searchable(),
SelectFilter::make('organization_id')
->label('Organization ID')
->relationship('organization', 'id')
->searchable(),
])
->defaultSort('created_at', 'desc')
->actions([

5
app/Filament/Resources/TimeEntryResource.php
View File

@@ -92,8 +92,13 @@ class TimeEntryResource extends Resource
])
->filters([
SelectFilter::make('organization')
->label('Organization')
->relationship('organization', 'name')
->searchable(),
SelectFilter::make('organization_id')
->label('Organization ID')
->relationship('organization', 'id')
->searchable(),
])
->defaultSort('created_at', 'desc')
->actions([

1
app/Service/Import/ImportDatabaseHelper.php
View File

@@ -196,6 +196,7 @@ class ImportDatabaseHelper
if ($this->mapKeyToModel === null) {
return [];
}
return array_values($this->mapKeyToModel);
}