Skip to content

Commit

Permalink
Running
Browse files Browse the repository at this point in the history
  • Loading branch information
adrolli committed Aug 30, 2023
1 parent bacfa6d commit 34011dd
Show file tree
Hide file tree
Showing 7 changed files with 30 additions and 29 deletions.
4 changes: 2 additions & 2 deletions src/FilamentFailedJobsPlugin.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use Filament\Panel;
use Filament\Support\Concerns\EvaluatesClosures;

class FilamentJobManagerPlugin implements Plugin
class FilamentFailedJobsPlugin implements Plugin
{
use EvaluatesClosures;

Expand Down Expand Up @@ -66,7 +66,7 @@ class FilamentJobManagerPlugin implements Plugin
*/
public function getId(): string
{
return 'filament-job-manager';
return 'filament-failed-jobs';
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
use Filament\Panel;
use Filament\Support\Concerns\EvaluatesClosures;

class FilamentJobsPlugin implements Plugin
class FilamentJobManagerPlugin implements Plugin
{
use EvaluatesClosures;

Expand Down
9 changes: 4 additions & 5 deletions src/FilamentJobManagerServiceProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@ class FilamentJobManagerServiceProvider extends PackageServiceProvider
{
public function configurePackage(Package $package): void
{
$package->name('filament-job-manager');

$this->publishes([
__DIR__.'/../config/filament-job-manager.php' => config_path('filament-job-manager.php'),
], 'filament-job-manager');
$package->name('filament-job-manager')
->hasConfigFile()
->hasTranslations()
->hasMigration('create_filament-job-manager_table');

}
}
4 changes: 3 additions & 1 deletion src/Models/JobManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ class JobManager extends Model
{
use HasFactory, Prunable;

protected $table = 'job_manager';

protected $fillable = [
'job_id',
'name',
Expand Down Expand Up @@ -109,4 +111,4 @@ public function prunable()

return false;
}
}
}
18 changes: 9 additions & 9 deletions src/Resources/FailedJobsResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Adrolli\FilamentJobManager\Resources;

use Adrolli\FilamentJobManager\FilamentJobManagerPlugin;
use Adrolli\FilamentJobManager\FilamentFailedJobsPlugin;
use Adrolli\FilamentJobManager\Models\FailedJob;
use Adrolli\FilamentJobManager\Resources\FailedJobsResource\Pages\ListFailedJobs;
use Filament\Forms\Components\Textarea;
Expand All @@ -27,17 +27,17 @@ class FailedJobsResource extends Resource

public static function getNavigationBadge(): ?string
{
return FilamentJobManagerPlugin::get()->getNavigationCountBadge() ? number_format(static::getModel()::count()) : null;
return FilamentFailedJobsPlugin::get()->getNavigationCountBadge() ? number_format(static::getModel()::count()) : null;
}

public static function getModelLabel(): string
{
return FilamentJobManagerPlugin::get()->getLabel();
return FilamentFailedJobsPlugin::get()->getLabel();
}

public static function getPluralModelLabel(): string
{
return FilamentJobManagerPlugin::get()->getPluralLabel();
return FilamentFailedJobsPlugin::get()->getPluralLabel();
}

public static function getNavigationLabel(): string
Expand All @@ -47,27 +47,27 @@ public static function getNavigationLabel(): string

public static function getNavigationGroup(): ?string
{
return FilamentJobManagerPlugin::get()->getNavigationGroup();
return FilamentFailedJobsPlugin::get()->getNavigationGroup();
}

public static function getNavigationSort(): ?int
{
return FilamentJobManagerPlugin::get()->getNavigationSort();
return FilamentFailedJobsPlugin::get()->getNavigationSort();
}

public static function getBreadcrumb(): string
{
return FilamentJobManagerPlugin::get()->getBreadcrumb();
return FilamentFailedJobsPlugin::get()->getBreadcrumb();
}

public static function shouldRegisterNavigation(): bool
{
return FilamentJobManagerPlugin::get()->shouldRegisterNavigation();
return FilamentFailedJobsPlugin::get()->shouldRegisterNavigation();
}

public static function getNavigationIcon(): string
{
return FilamentJobManagerPlugin::get()->getNavigationIcon();
return FilamentFailedJobsPlugin::get()->getNavigationIcon();
}

public static function form(Form $form): Form
Expand Down
18 changes: 9 additions & 9 deletions src/Resources/JobsResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Adrolli\FilamentJobManager\Resources;

use Adrolli\FilamentJobManager\FilamentJobsPlugin;
use Adrolli\FilamentJobManager\FilamentJobManagerPlugin;
use Adrolli\FilamentJobManager\Models\JobManager;
use Adrolli\FilamentJobManager\Resources\JobsResource\Pages\ListJobs;
use Adrolli\FilamentJobManager\Resources\JobsResource\Widgets\JobStatsOverview;
Expand All @@ -23,17 +23,17 @@ class JobsResource extends Resource

public static function getNavigationBadge(): ?string
{
return FilamentJobsPlugin::get()->getNavigationCountBadge() ? number_format(static::getModel()::count()) : null;
return FilamentJobManagerPlugin::get()->getNavigationCountBadge() ? number_format(static::getModel()::count()) : null;
}

public static function getModelLabel(): string
{
return FilamentJobsPlugin::get()->getLabel();
return FilamentJobManagerPlugin::get()->getLabel();
}

public static function getPluralModelLabel(): string
{
return FilamentJobsPlugin::get()->getPluralLabel();
return FilamentJobManagerPlugin::get()->getPluralLabel();
}

public static function getNavigationLabel(): string
Expand All @@ -43,27 +43,27 @@ public static function getNavigationLabel(): string

public static function getNavigationGroup(): ?string
{
return FilamentJobsPlugin::get()->getNavigationGroup();
return FilamentJobManagerPlugin::get()->getNavigationGroup();
}

public static function getNavigationSort(): ?int
{
return FilamentJobsPlugin::get()->getNavigationSort();
return FilamentJobManagerPlugin::get()->getNavigationSort();
}

public static function getBreadcrumb(): string
{
return FilamentJobsPlugin::get()->getBreadcrumb();
return FilamentJobManagerPlugin::get()->getBreadcrumb();
}

public static function shouldRegisterNavigation(): bool
{
return FilamentJobsPlugin::get()->shouldRegisterNavigation();
return FilamentJobManagerPlugin::get()->shouldRegisterNavigation();
}

public static function getNavigationIcon(): string
{
return FilamentJobsPlugin::get()->getNavigationIcon();
return FilamentJobManagerPlugin::get()->getNavigationIcon();
}

public static function form(Form $form): Form
Expand Down
4 changes: 2 additions & 2 deletions src/Resources/JobsResource/Widgets/JobStatsOverview.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

namespace Adrolli\FilamentJobManager\Resources\JobsResource\Widgets;

use Adrolli\FilamentJobManager\Models\Job;
use Adrolli\FilamentJobManager\Models\JobManager;
use Filament\Widgets\StatsOverviewWidget as BaseWidget;
use Filament\Widgets\StatsOverviewWidget\Stat;
use Illuminate\Support\Facades\DB;
Expand All @@ -17,7 +17,7 @@ protected function getCards(): array
DB::raw('AVG(2 - 1) as average_time_elapsed'),
];

$aggregatedInfo = Job::query()
$aggregatedInfo = JobManager::query()
->select($aggregationColumns)
->first();

Expand Down

0 comments on commit 34011dd

Please sign in to comment.