058-tenant-ui-polish #70
@ -14,6 +14,8 @@ class InventoryCoverage extends Page
|
|||||||
{
|
{
|
||||||
protected static string|BackedEnum|null $navigationIcon = 'heroicon-o-table-cells';
|
protected static string|BackedEnum|null $navigationIcon = 'heroicon-o-table-cells';
|
||||||
|
|
||||||
|
protected static ?int $navigationSort = 3;
|
||||||
|
|
||||||
protected static string|UnitEnum|null $navigationGroup = 'Inventory';
|
protected static string|UnitEnum|null $navigationGroup = 'Inventory';
|
||||||
|
|
||||||
protected static ?string $navigationLabel = 'Coverage';
|
protected static ?string $navigationLabel = 'Coverage';
|
||||||
|
|||||||
@ -4,32 +4,16 @@
|
|||||||
|
|
||||||
use App\Filament\Clusters\Inventory\InventoryCluster;
|
use App\Filament\Clusters\Inventory\InventoryCluster;
|
||||||
use App\Filament\Resources\InventoryItemResource;
|
use App\Filament\Resources\InventoryItemResource;
|
||||||
use App\Filament\Resources\InventorySyncRunResource;
|
|
||||||
use App\Filament\Widgets\Inventory\InventoryKpiHeader;
|
use App\Filament\Widgets\Inventory\InventoryKpiHeader;
|
||||||
use App\Jobs\RunInventorySyncJob;
|
|
||||||
use App\Models\InventorySyncRun;
|
|
||||||
use App\Models\Tenant;
|
use App\Models\Tenant;
|
||||||
use App\Models\User;
|
|
||||||
use App\Services\Intune\AuditLogger;
|
|
||||||
use App\Services\Inventory\InventorySyncService;
|
|
||||||
use App\Services\OperationRunService;
|
|
||||||
use App\Support\Inventory\InventoryPolicyTypeMeta;
|
|
||||||
use App\Support\OperationRunLinks;
|
|
||||||
use App\Support\OpsUx\OperationUxPresenter;
|
|
||||||
use App\Support\OpsUx\OpsUxBrowserEvents;
|
|
||||||
use BackedEnum;
|
use BackedEnum;
|
||||||
use Filament\Actions\Action;
|
|
||||||
use Filament\Actions\Action as HintAction;
|
|
||||||
use Filament\Forms\Components\Hidden;
|
|
||||||
use Filament\Forms\Components\Select;
|
|
||||||
use Filament\Forms\Components\Toggle;
|
|
||||||
use Filament\Notifications\Notification;
|
|
||||||
use Filament\Pages\Page;
|
use Filament\Pages\Page;
|
||||||
use Filament\Support\Enums\Size;
|
|
||||||
use UnitEnum;
|
use UnitEnum;
|
||||||
|
|
||||||
class InventoryLanding extends Page
|
class InventoryLanding extends Page
|
||||||
{
|
{
|
||||||
|
protected static bool $shouldRegisterNavigation = false;
|
||||||
|
|
||||||
protected static string|BackedEnum|null $navigationIcon = 'heroicon-o-squares-2x2';
|
protected static string|BackedEnum|null $navigationIcon = 'heroicon-o-squares-2x2';
|
||||||
|
|
||||||
protected static string|UnitEnum|null $navigationGroup = 'Inventory';
|
protected static string|UnitEnum|null $navigationGroup = 'Inventory';
|
||||||
@ -40,229 +24,15 @@ class InventoryLanding extends Page
|
|||||||
|
|
||||||
protected string $view = 'filament.pages.inventory-landing';
|
protected string $view = 'filament.pages.inventory-landing';
|
||||||
|
|
||||||
|
public function mount(): void
|
||||||
|
{
|
||||||
|
$this->redirect(InventoryItemResource::getUrl('index', tenant: Tenant::current()));
|
||||||
|
}
|
||||||
|
|
||||||
protected function getHeaderWidgets(): array
|
protected function getHeaderWidgets(): array
|
||||||
{
|
{
|
||||||
return [
|
return [
|
||||||
InventoryKpiHeader::class,
|
InventoryKpiHeader::class,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
protected function getHeaderActions(): array
|
|
||||||
{
|
|
||||||
return [
|
|
||||||
Action::make('run_inventory_sync')
|
|
||||||
->label('Run Inventory Sync')
|
|
||||||
->icon('heroicon-o-arrow-path')
|
|
||||||
->color('warning')
|
|
||||||
->form([
|
|
||||||
Select::make('policy_types')
|
|
||||||
->label('Policy types')
|
|
||||||
->multiple()
|
|
||||||
->searchable()
|
|
||||||
->preload()
|
|
||||||
->native(false)
|
|
||||||
->hintActions([
|
|
||||||
fn (Select $component): HintAction => HintAction::make('select_all_policy_types')
|
|
||||||
->label('Select all')
|
|
||||||
->link()
|
|
||||||
->size(Size::Small)
|
|
||||||
->action(function (InventorySyncService $inventorySyncService) use ($component): void {
|
|
||||||
$component->state($inventorySyncService->defaultSelectionPayload()['policy_types']);
|
|
||||||
}),
|
|
||||||
fn (Select $component): HintAction => HintAction::make('clear_policy_types')
|
|
||||||
->label('Clear')
|
|
||||||
->link()
|
|
||||||
->size(Size::Small)
|
|
||||||
->action(function () use ($component): void {
|
|
||||||
$component->state([]);
|
|
||||||
}),
|
|
||||||
])
|
|
||||||
->options(function (): array {
|
|
||||||
return collect(InventoryPolicyTypeMeta::supported())
|
|
||||||
->filter(fn (array $meta): bool => filled($meta['type'] ?? null))
|
|
||||||
->groupBy(fn (array $meta): string => (string) ($meta['category'] ?? 'Other'))
|
|
||||||
->mapWithKeys(function ($items, string $category): array {
|
|
||||||
$options = collect($items)
|
|
||||||
->mapWithKeys(function (array $meta): array {
|
|
||||||
$type = (string) $meta['type'];
|
|
||||||
$label = (string) ($meta['label'] ?? $type);
|
|
||||||
$platform = (string) ($meta['platform'] ?? 'all');
|
|
||||||
|
|
||||||
return [$type => "{$label} • {$platform}"];
|
|
||||||
})
|
|
||||||
->all();
|
|
||||||
|
|
||||||
return [$category => $options];
|
|
||||||
})
|
|
||||||
->all();
|
|
||||||
})
|
|
||||||
->columnSpanFull(),
|
|
||||||
Toggle::make('include_foundations')
|
|
||||||
->label('Include foundation types')
|
|
||||||
->helperText('Include scope tags, assignment filters, and notification templates.')
|
|
||||||
->default(true)
|
|
||||||
->dehydrated()
|
|
||||||
->rules(['boolean'])
|
|
||||||
->columnSpanFull(),
|
|
||||||
Toggle::make('include_dependencies')
|
|
||||||
->label('Include dependencies')
|
|
||||||
->helperText('Include dependency extraction where supported.')
|
|
||||||
->default(true)
|
|
||||||
->dehydrated()
|
|
||||||
->rules(['boolean'])
|
|
||||||
->columnSpanFull(),
|
|
||||||
Hidden::make('tenant_id')
|
|
||||||
->default(fn (): ?string => Tenant::current()?->getKey())
|
|
||||||
->dehydrated(),
|
|
||||||
])
|
|
||||||
->visible(function (): bool {
|
|
||||||
$user = auth()->user();
|
|
||||||
if (! $user instanceof User) {
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
return $user->canSyncTenant(Tenant::current());
|
|
||||||
})
|
|
||||||
->action(function (array $data, self $livewire, InventorySyncService $inventorySyncService, AuditLogger $auditLogger): void {
|
|
||||||
$tenant = Tenant::current();
|
|
||||||
|
|
||||||
$user = auth()->user();
|
|
||||||
if (! $user instanceof User) {
|
|
||||||
abort(403, 'Not allowed');
|
|
||||||
}
|
|
||||||
|
|
||||||
if (! $user->canSyncTenant($tenant)) {
|
|
||||||
abort(403, 'Not allowed');
|
|
||||||
}
|
|
||||||
|
|
||||||
$requestedTenantId = $data['tenant_id'] ?? null;
|
|
||||||
if ($requestedTenantId !== null && (int) $requestedTenantId !== (int) $tenant->getKey()) {
|
|
||||||
Notification::make()
|
|
||||||
->title('Not allowed')
|
|
||||||
->danger()
|
|
||||||
->send();
|
|
||||||
|
|
||||||
abort(403, 'Not allowed');
|
|
||||||
}
|
|
||||||
|
|
||||||
$selectionPayload = $inventorySyncService->defaultSelectionPayload();
|
|
||||||
if (array_key_exists('policy_types', $data)) {
|
|
||||||
$selectionPayload['policy_types'] = $data['policy_types'];
|
|
||||||
}
|
|
||||||
if (array_key_exists('include_foundations', $data)) {
|
|
||||||
$selectionPayload['include_foundations'] = (bool) $data['include_foundations'];
|
|
||||||
}
|
|
||||||
if (array_key_exists('include_dependencies', $data)) {
|
|
||||||
$selectionPayload['include_dependencies'] = (bool) $data['include_dependencies'];
|
|
||||||
}
|
|
||||||
$computed = $inventorySyncService->normalizeAndHashSelection($selectionPayload);
|
|
||||||
|
|
||||||
/** @var OperationRunService $opService */
|
|
||||||
$opService = app(OperationRunService::class);
|
|
||||||
$opRun = $opService->ensureRun(
|
|
||||||
tenant: $tenant,
|
|
||||||
type: 'inventory.sync',
|
|
||||||
inputs: $computed['selection'],
|
|
||||||
initiator: $user
|
|
||||||
);
|
|
||||||
|
|
||||||
if (! $opRun->wasRecentlyCreated && in_array($opRun->status, ['queued', 'running'], true)) {
|
|
||||||
Notification::make()
|
|
||||||
->title('Inventory sync already active')
|
|
||||||
->body('This operation is already queued or running.')
|
|
||||||
->warning()
|
|
||||||
->actions([
|
|
||||||
Action::make('view_run')
|
|
||||||
->label('View Run')
|
|
||||||
->url(OperationRunLinks::view($opRun, $tenant)),
|
|
||||||
])
|
|
||||||
->send();
|
|
||||||
|
|
||||||
OpsUxBrowserEvents::dispatchRunEnqueued($livewire);
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Legacy checks (kept for safety if parallel usage needs it, though OpRun handles idempotency now)
|
|
||||||
$existing = InventorySyncRun::query()
|
|
||||||
->where('tenant_id', $tenant->getKey())
|
|
||||||
->where('selection_hash', $computed['selection_hash'])
|
|
||||||
->whereIn('status', [InventorySyncRun::STATUS_PENDING, InventorySyncRun::STATUS_RUNNING])
|
|
||||||
->first();
|
|
||||||
|
|
||||||
// If legacy thinks it's running but OpRun didn't catch it (unlikely with shared hash logic), fail safe.
|
|
||||||
if ($existing instanceof InventorySyncRun) {
|
|
||||||
Notification::make()
|
|
||||||
->title('Inventory sync already active')
|
|
||||||
->body('A matching inventory sync run is already pending or running.')
|
|
||||||
->warning()
|
|
||||||
->actions([
|
|
||||||
Action::make('view_run')
|
|
||||||
->label('View Run')
|
|
||||||
->url(OperationRunLinks::view($opRun, $tenant)),
|
|
||||||
])
|
|
||||||
->send();
|
|
||||||
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
$run = $inventorySyncService->createPendingRunForUser($tenant, $user, $computed['selection']);
|
|
||||||
|
|
||||||
$policyTypes = $computed['selection']['policy_types'] ?? [];
|
|
||||||
if (! is_array($policyTypes)) {
|
|
||||||
$policyTypes = [];
|
|
||||||
}
|
|
||||||
|
|
||||||
$auditLogger->log(
|
|
||||||
tenant: $tenant,
|
|
||||||
action: 'inventory.sync.dispatched',
|
|
||||||
context: [
|
|
||||||
'metadata' => [
|
|
||||||
'inventory_sync_run_id' => $run->id,
|
|
||||||
'selection_hash' => $run->selection_hash,
|
|
||||||
],
|
|
||||||
],
|
|
||||||
actorId: $user->id,
|
|
||||||
actorEmail: $user->email,
|
|
||||||
actorName: $user->name,
|
|
||||||
resourceType: 'inventory_sync_run',
|
|
||||||
resourceId: (string) $run->id,
|
|
||||||
);
|
|
||||||
|
|
||||||
$opService->dispatchOrFail($opRun, function () use ($tenant, $user, $run, $opRun): void {
|
|
||||||
RunInventorySyncJob::dispatch(
|
|
||||||
tenantId: (int) $tenant->getKey(),
|
|
||||||
userId: (int) $user->getKey(),
|
|
||||||
inventorySyncRunId: (int) $run->id,
|
|
||||||
operationRun: $opRun
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
OperationUxPresenter::queuedToast((string) $opRun->type)
|
|
||||||
->actions([
|
|
||||||
Action::make('view_run')
|
|
||||||
->label('View run')
|
|
||||||
->url(OperationRunLinks::view($opRun, $tenant)),
|
|
||||||
])
|
|
||||||
->send();
|
|
||||||
|
|
||||||
OpsUxBrowserEvents::dispatchRunEnqueued($livewire);
|
|
||||||
}),
|
|
||||||
];
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getInventoryItemsUrl(): string
|
|
||||||
{
|
|
||||||
return InventoryItemResource::getUrl('index', tenant: Tenant::current());
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getSyncRunsUrl(): string
|
|
||||||
{
|
|
||||||
return InventorySyncRunResource::getUrl('index', tenant: Tenant::current());
|
|
||||||
}
|
|
||||||
|
|
||||||
public function getCoverageUrl(): string
|
|
||||||
{
|
|
||||||
return InventoryCoverage::getUrl(tenant: Tenant::current());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@ -28,6 +28,8 @@ class InventoryItemResource extends Resource
|
|||||||
|
|
||||||
protected static ?string $cluster = InventoryCluster::class;
|
protected static ?string $cluster = InventoryCluster::class;
|
||||||
|
|
||||||
|
protected static ?int $navigationSort = 1;
|
||||||
|
|
||||||
protected static string|BackedEnum|null $navigationIcon = 'heroicon-o-rectangle-stack';
|
protected static string|BackedEnum|null $navigationIcon = 'heroicon-o-rectangle-stack';
|
||||||
|
|
||||||
protected static string|UnitEnum|null $navigationGroup = 'Inventory';
|
protected static string|UnitEnum|null $navigationGroup = 'Inventory';
|
||||||
|
|||||||
@ -4,7 +4,25 @@
|
|||||||
|
|
||||||
use App\Filament\Resources\InventoryItemResource;
|
use App\Filament\Resources\InventoryItemResource;
|
||||||
use App\Filament\Widgets\Inventory\InventoryKpiHeader;
|
use App\Filament\Widgets\Inventory\InventoryKpiHeader;
|
||||||
|
use App\Jobs\RunInventorySyncJob;
|
||||||
|
use App\Models\InventorySyncRun;
|
||||||
|
use App\Models\Tenant;
|
||||||
|
use App\Models\User;
|
||||||
|
use App\Services\Intune\AuditLogger;
|
||||||
|
use App\Services\Inventory\InventorySyncService;
|
||||||
|
use App\Services\OperationRunService;
|
||||||
|
use App\Support\Inventory\InventoryPolicyTypeMeta;
|
||||||
|
use App\Support\OperationRunLinks;
|
||||||
|
use App\Support\OpsUx\OperationUxPresenter;
|
||||||
|
use App\Support\OpsUx\OpsUxBrowserEvents;
|
||||||
|
use Filament\Actions\Action;
|
||||||
|
use Filament\Actions\Action as HintAction;
|
||||||
|
use Filament\Forms\Components\Hidden;
|
||||||
|
use Filament\Forms\Components\Select;
|
||||||
|
use Filament\Forms\Components\Toggle;
|
||||||
|
use Filament\Notifications\Notification;
|
||||||
use Filament\Resources\Pages\ListRecords;
|
use Filament\Resources\Pages\ListRecords;
|
||||||
|
use Filament\Support\Enums\Size;
|
||||||
|
|
||||||
class ListInventoryItems extends ListRecords
|
class ListInventoryItems extends ListRecords
|
||||||
{
|
{
|
||||||
@ -16,4 +34,208 @@ protected function getHeaderWidgets(): array
|
|||||||
InventoryKpiHeader::class,
|
InventoryKpiHeader::class,
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
protected function getHeaderActions(): array
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
Action::make('run_inventory_sync')
|
||||||
|
->label('Run Inventory Sync')
|
||||||
|
->icon('heroicon-o-arrow-path')
|
||||||
|
->color('warning')
|
||||||
|
->form([
|
||||||
|
Select::make('policy_types')
|
||||||
|
->label('Policy types')
|
||||||
|
->multiple()
|
||||||
|
->searchable()
|
||||||
|
->preload()
|
||||||
|
->native(false)
|
||||||
|
->hintActions([
|
||||||
|
fn (Select $component): HintAction => HintAction::make('select_all_policy_types')
|
||||||
|
->label('Select all')
|
||||||
|
->link()
|
||||||
|
->size(Size::Small)
|
||||||
|
->action(function (InventorySyncService $inventorySyncService) use ($component): void {
|
||||||
|
$component->state($inventorySyncService->defaultSelectionPayload()['policy_types']);
|
||||||
|
}),
|
||||||
|
fn (Select $component): HintAction => HintAction::make('clear_policy_types')
|
||||||
|
->label('Clear')
|
||||||
|
->link()
|
||||||
|
->size(Size::Small)
|
||||||
|
->action(function () use ($component): void {
|
||||||
|
$component->state([]);
|
||||||
|
}),
|
||||||
|
])
|
||||||
|
->options(function (): array {
|
||||||
|
return collect(InventoryPolicyTypeMeta::supported())
|
||||||
|
->filter(fn (array $meta): bool => filled($meta['type'] ?? null))
|
||||||
|
->groupBy(fn (array $meta): string => (string) ($meta['category'] ?? 'Other'))
|
||||||
|
->mapWithKeys(function ($items, string $category): array {
|
||||||
|
$options = collect($items)
|
||||||
|
->mapWithKeys(function (array $meta): array {
|
||||||
|
$type = (string) $meta['type'];
|
||||||
|
$label = (string) ($meta['label'] ?? $type);
|
||||||
|
$platform = (string) ($meta['platform'] ?? 'all');
|
||||||
|
|
||||||
|
return [$type => "{$label} • {$platform}"];
|
||||||
|
})
|
||||||
|
->all();
|
||||||
|
|
||||||
|
return [$category => $options];
|
||||||
|
})
|
||||||
|
->all();
|
||||||
|
})
|
||||||
|
->columnSpanFull(),
|
||||||
|
Toggle::make('include_foundations')
|
||||||
|
->label('Include foundation types')
|
||||||
|
->helperText('Include scope tags, assignment filters, and notification templates.')
|
||||||
|
->default(true)
|
||||||
|
->dehydrated()
|
||||||
|
->rules(['boolean'])
|
||||||
|
->columnSpanFull(),
|
||||||
|
Toggle::make('include_dependencies')
|
||||||
|
->label('Include dependencies')
|
||||||
|
->helperText('Include dependency extraction where supported.')
|
||||||
|
->default(true)
|
||||||
|
->dehydrated()
|
||||||
|
->rules(['boolean'])
|
||||||
|
->columnSpanFull(),
|
||||||
|
Hidden::make('tenant_id')
|
||||||
|
->default(fn (): ?string => Tenant::current()?->getKey())
|
||||||
|
->dehydrated(),
|
||||||
|
])
|
||||||
|
->visible(function (): bool {
|
||||||
|
$user = auth()->user();
|
||||||
|
if (! $user instanceof User) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return $user->canSyncTenant(Tenant::current());
|
||||||
|
})
|
||||||
|
->action(function (array $data, self $livewire, InventorySyncService $inventorySyncService, AuditLogger $auditLogger): void {
|
||||||
|
$tenant = Tenant::current();
|
||||||
|
|
||||||
|
$user = auth()->user();
|
||||||
|
if (! $user instanceof User) {
|
||||||
|
abort(403, 'Not allowed');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! $user->canSyncTenant($tenant)) {
|
||||||
|
abort(403, 'Not allowed');
|
||||||
|
}
|
||||||
|
|
||||||
|
$requestedTenantId = $data['tenant_id'] ?? null;
|
||||||
|
if ($requestedTenantId !== null && (int) $requestedTenantId !== (int) $tenant->getKey()) {
|
||||||
|
Notification::make()
|
||||||
|
->title('Not allowed')
|
||||||
|
->danger()
|
||||||
|
->send();
|
||||||
|
|
||||||
|
abort(403, 'Not allowed');
|
||||||
|
}
|
||||||
|
|
||||||
|
$selectionPayload = $inventorySyncService->defaultSelectionPayload();
|
||||||
|
if (array_key_exists('policy_types', $data)) {
|
||||||
|
$selectionPayload['policy_types'] = $data['policy_types'];
|
||||||
|
}
|
||||||
|
if (array_key_exists('include_foundations', $data)) {
|
||||||
|
$selectionPayload['include_foundations'] = (bool) $data['include_foundations'];
|
||||||
|
}
|
||||||
|
if (array_key_exists('include_dependencies', $data)) {
|
||||||
|
$selectionPayload['include_dependencies'] = (bool) $data['include_dependencies'];
|
||||||
|
}
|
||||||
|
$computed = $inventorySyncService->normalizeAndHashSelection($selectionPayload);
|
||||||
|
|
||||||
|
/** @var OperationRunService $opService */
|
||||||
|
$opService = app(OperationRunService::class);
|
||||||
|
$opRun = $opService->ensureRun(
|
||||||
|
tenant: $tenant,
|
||||||
|
type: 'inventory.sync',
|
||||||
|
inputs: $computed['selection'],
|
||||||
|
initiator: $user
|
||||||
|
);
|
||||||
|
|
||||||
|
if (! $opRun->wasRecentlyCreated && in_array($opRun->status, ['queued', 'running'], true)) {
|
||||||
|
Notification::make()
|
||||||
|
->title('Inventory sync already active')
|
||||||
|
->body('This operation is already queued or running.')
|
||||||
|
->warning()
|
||||||
|
->actions([
|
||||||
|
Action::make('view_run')
|
||||||
|
->label('View Run')
|
||||||
|
->url(OperationRunLinks::view($opRun, $tenant)),
|
||||||
|
])
|
||||||
|
->send();
|
||||||
|
|
||||||
|
OpsUxBrowserEvents::dispatchRunEnqueued($livewire);
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Legacy checks (kept for safety if parallel usage needs it, though OpRun handles idempotency now)
|
||||||
|
$existing = InventorySyncRun::query()
|
||||||
|
->where('tenant_id', $tenant->getKey())
|
||||||
|
->where('selection_hash', $computed['selection_hash'])
|
||||||
|
->whereIn('status', [InventorySyncRun::STATUS_PENDING, InventorySyncRun::STATUS_RUNNING])
|
||||||
|
->first();
|
||||||
|
|
||||||
|
// If legacy thinks it's running but OpRun didn't catch it (unlikely with shared hash logic), fail safe.
|
||||||
|
if ($existing instanceof InventorySyncRun) {
|
||||||
|
Notification::make()
|
||||||
|
->title('Inventory sync already active')
|
||||||
|
->body('A matching inventory sync run is already pending or running.')
|
||||||
|
->warning()
|
||||||
|
->actions([
|
||||||
|
Action::make('view_run')
|
||||||
|
->label('View Run')
|
||||||
|
->url(OperationRunLinks::view($opRun, $tenant)),
|
||||||
|
])
|
||||||
|
->send();
|
||||||
|
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
$run = $inventorySyncService->createPendingRunForUser($tenant, $user, $computed['selection']);
|
||||||
|
|
||||||
|
$policyTypes = $computed['selection']['policy_types'] ?? [];
|
||||||
|
if (! is_array($policyTypes)) {
|
||||||
|
$policyTypes = [];
|
||||||
|
}
|
||||||
|
|
||||||
|
$auditLogger->log(
|
||||||
|
tenant: $tenant,
|
||||||
|
action: 'inventory.sync.dispatched',
|
||||||
|
context: [
|
||||||
|
'metadata' => [
|
||||||
|
'inventory_sync_run_id' => $run->id,
|
||||||
|
'selection_hash' => $run->selection_hash,
|
||||||
|
],
|
||||||
|
],
|
||||||
|
actorId: $user->id,
|
||||||
|
actorEmail: $user->email,
|
||||||
|
actorName: $user->name,
|
||||||
|
resourceType: 'inventory_sync_run',
|
||||||
|
resourceId: (string) $run->id,
|
||||||
|
);
|
||||||
|
|
||||||
|
$opService->dispatchOrFail($opRun, function () use ($tenant, $user, $run, $opRun): void {
|
||||||
|
RunInventorySyncJob::dispatch(
|
||||||
|
tenantId: (int) $tenant->getKey(),
|
||||||
|
userId: (int) $user->getKey(),
|
||||||
|
inventorySyncRunId: (int) $run->id,
|
||||||
|
operationRun: $opRun
|
||||||
|
);
|
||||||
|
});
|
||||||
|
|
||||||
|
OperationUxPresenter::queuedToast((string) $opRun->type)
|
||||||
|
->actions([
|
||||||
|
Action::make('view_run')
|
||||||
|
->label('View run')
|
||||||
|
->url(OperationRunLinks::view($opRun, $tenant)),
|
||||||
|
])
|
||||||
|
->send();
|
||||||
|
|
||||||
|
OpsUxBrowserEvents::dispatchRunEnqueued($livewire);
|
||||||
|
}),
|
||||||
|
];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -27,10 +27,17 @@ class InventorySyncRunResource extends Resource
|
|||||||
|
|
||||||
protected static ?string $cluster = InventoryCluster::class;
|
protected static ?string $cluster = InventoryCluster::class;
|
||||||
|
|
||||||
|
protected static ?int $navigationSort = 2;
|
||||||
|
|
||||||
protected static string|BackedEnum|null $navigationIcon = 'heroicon-o-clock';
|
protected static string|BackedEnum|null $navigationIcon = 'heroicon-o-clock';
|
||||||
|
|
||||||
protected static string|UnitEnum|null $navigationGroup = 'Inventory';
|
protected static string|UnitEnum|null $navigationGroup = 'Inventory';
|
||||||
|
|
||||||
|
public static function getNavigationLabel(): string
|
||||||
|
{
|
||||||
|
return 'Sync History';
|
||||||
|
}
|
||||||
|
|
||||||
public static function form(Schema $schema): Schema
|
public static function form(Schema $schema): Schema
|
||||||
{
|
{
|
||||||
return $schema;
|
return $schema;
|
||||||
|
|||||||
@ -4,21 +4,25 @@
|
|||||||
|
|
||||||
namespace App\Filament\Widgets\Inventory;
|
namespace App\Filament\Widgets\Inventory;
|
||||||
|
|
||||||
|
use App\Filament\Resources\InventorySyncRunResource;
|
||||||
use App\Models\InventoryItem;
|
use App\Models\InventoryItem;
|
||||||
use App\Models\InventorySyncRun;
|
use App\Models\InventorySyncRun;
|
||||||
use App\Models\OperationRun;
|
use App\Models\OperationRun;
|
||||||
use App\Models\Tenant;
|
use App\Models\Tenant;
|
||||||
use App\Services\Inventory\CoverageCapabilitiesResolver;
|
use App\Services\Inventory\CoverageCapabilitiesResolver;
|
||||||
|
use App\Support\Inventory\InventoryKpiBadges;
|
||||||
use App\Support\Inventory\InventoryPolicyTypeMeta;
|
use App\Support\Inventory\InventoryPolicyTypeMeta;
|
||||||
|
use App\Support\Inventory\InventorySyncStatusBadge;
|
||||||
use Filament\Facades\Filament;
|
use Filament\Facades\Filament;
|
||||||
use Filament\Widgets\Widget;
|
use Filament\Widgets\StatsOverviewWidget;
|
||||||
|
use Filament\Widgets\StatsOverviewWidget\Stat;
|
||||||
|
use Illuminate\Support\Facades\Blade;
|
||||||
|
use Illuminate\Support\HtmlString;
|
||||||
|
|
||||||
class InventoryKpiHeader extends Widget
|
class InventoryKpiHeader extends StatsOverviewWidget
|
||||||
{
|
{
|
||||||
protected static bool $isLazy = false;
|
protected static bool $isLazy = false;
|
||||||
|
|
||||||
protected string $view = 'filament.widgets.inventory.inventory-kpi-header';
|
|
||||||
|
|
||||||
protected int|string|array $columnSpan = 'full';
|
protected int|string|array $columnSpan = 'full';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -27,23 +31,19 @@ class InventoryKpiHeader extends Widget
|
|||||||
* - `config('tenantpilot.supported_policy_types')` + `config('tenantpilot.foundation_types')` meta (`restore`, `risk`)
|
* - `config('tenantpilot.supported_policy_types')` + `config('tenantpilot.foundation_types')` meta (`restore`, `risk`)
|
||||||
* - dependency capability via `CoverageCapabilitiesResolver`
|
* - dependency capability via `CoverageCapabilitiesResolver`
|
||||||
*
|
*
|
||||||
* @return array<string, mixed>
|
* @return array<Stat>
|
||||||
*/
|
*/
|
||||||
protected function getViewData(): array
|
protected function getStats(): array
|
||||||
{
|
{
|
||||||
$tenant = Filament::getTenant();
|
$tenant = Filament::getTenant();
|
||||||
|
|
||||||
if (! $tenant instanceof Tenant) {
|
if (! $tenant instanceof Tenant) {
|
||||||
return [
|
return [
|
||||||
'totalItems' => 0,
|
Stat::make('Total items', 0),
|
||||||
'coveragePercent' => 0,
|
Stat::make('Coverage', '0%')->description('Restorable 0 • Partial 0'),
|
||||||
'lastInventorySyncLabel' => '—',
|
Stat::make('Last inventory sync', '—'),
|
||||||
'activeOps' => 0,
|
Stat::make('Active ops', 0),
|
||||||
'inventoryOps' => 0,
|
Stat::make('Inventory ops', 0)->description('Dependencies 0 • Risk 0'),
|
||||||
'dependenciesItems' => 0,
|
|
||||||
'partialItems' => 0,
|
|
||||||
'restorableItems' => 0,
|
|
||||||
'riskItems' => 0,
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -85,17 +85,49 @@ protected function getViewData(): array
|
|||||||
->latest('id')
|
->latest('id')
|
||||||
->first();
|
->first();
|
||||||
|
|
||||||
$lastInventorySyncLabel = '—';
|
$lastInventorySyncTimeLabel = '—';
|
||||||
|
$lastInventorySyncStatusLabel = '—';
|
||||||
|
$lastInventorySyncStatusColor = 'gray';
|
||||||
|
$lastInventorySyncStatusIcon = 'heroicon-m-clock';
|
||||||
|
$lastInventorySyncViewUrl = null;
|
||||||
|
|
||||||
if ($lastRun instanceof InventorySyncRun) {
|
if ($lastRun instanceof InventorySyncRun) {
|
||||||
$timestamp = $lastRun->finished_at ?? $lastRun->started_at;
|
$timestamp = $lastRun->finished_at ?? $lastRun->started_at;
|
||||||
|
|
||||||
$lastInventorySyncLabel = trim(sprintf(
|
if ($timestamp) {
|
||||||
'%s%s',
|
$lastInventorySyncTimeLabel = $timestamp->diffForHumans(['short' => true]);
|
||||||
(string) ($lastRun->status ?? '—'),
|
}
|
||||||
$timestamp ? ' • '.$timestamp->diffForHumans() : ''
|
|
||||||
));
|
$status = (string) ($lastRun->status ?? '');
|
||||||
|
|
||||||
|
$badge = InventorySyncStatusBadge::for($status);
|
||||||
|
$lastInventorySyncStatusLabel = $badge['label'];
|
||||||
|
$lastInventorySyncStatusColor = $badge['color'];
|
||||||
|
$lastInventorySyncStatusIcon = $badge['icon'];
|
||||||
|
|
||||||
|
$lastInventorySyncViewUrl = InventorySyncRunResource::getUrl('view', ['record' => $lastRun], tenant: $tenant);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$badgeColor = $lastInventorySyncStatusColor;
|
||||||
|
|
||||||
|
$lastInventorySyncDescription = Blade::render(<<<'BLADE'
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<x-filament::badge :color="$badgeColor" size="sm">
|
||||||
|
{{ $statusLabel }}
|
||||||
|
</x-filament::badge>
|
||||||
|
|
||||||
|
@if ($viewUrl)
|
||||||
|
<x-filament::link :href="$viewUrl" size="sm">
|
||||||
|
View run
|
||||||
|
</x-filament::link>
|
||||||
|
@endif
|
||||||
|
</div>
|
||||||
|
BLADE, [
|
||||||
|
'badgeColor' => $badgeColor,
|
||||||
|
'statusLabel' => $lastInventorySyncStatusLabel,
|
||||||
|
'viewUrl' => $lastInventorySyncViewUrl,
|
||||||
|
]);
|
||||||
|
|
||||||
$activeOps = (int) OperationRun::query()
|
$activeOps = (int) OperationRun::query()
|
||||||
->where('tenant_id', $tenantId)
|
->where('tenant_id', $tenantId)
|
||||||
->active()
|
->active()
|
||||||
@ -117,15 +149,14 @@ protected function getViewData(): array
|
|||||||
}
|
}
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'totalItems' => $totalItems,
|
Stat::make('Total items', $totalItems),
|
||||||
'coveragePercent' => $coveragePercent,
|
Stat::make('Coverage', $coveragePercent.'%')
|
||||||
'lastInventorySyncLabel' => $lastInventorySyncLabel,
|
->description(new HtmlString(InventoryKpiBadges::coverage($restorableItems, $partialItems))),
|
||||||
'activeOps' => $activeOps,
|
Stat::make('Last inventory sync', $lastInventorySyncTimeLabel)
|
||||||
'inventoryOps' => $inventoryOps,
|
->description(new HtmlString($lastInventorySyncDescription)),
|
||||||
'dependenciesItems' => $dependenciesItems,
|
Stat::make('Active ops', $activeOps),
|
||||||
'partialItems' => $partialItems,
|
Stat::make('Inventory ops', $inventoryOps)
|
||||||
'restorableItems' => $restorableItems,
|
->description(new HtmlString(InventoryKpiBadges::inventoryOps($dependenciesItems, $riskItems))),
|
||||||
'riskItems' => $riskItems,
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -11,31 +11,40 @@
|
|||||||
use App\Support\OpsUx\ActiveRuns;
|
use App\Support\OpsUx\ActiveRuns;
|
||||||
use Carbon\CarbonInterval;
|
use Carbon\CarbonInterval;
|
||||||
use Filament\Facades\Filament;
|
use Filament\Facades\Filament;
|
||||||
use Filament\Widgets\Widget;
|
use Filament\Widgets\StatsOverviewWidget;
|
||||||
|
use Filament\Widgets\StatsOverviewWidget\Stat;
|
||||||
use Illuminate\Support\Collection;
|
use Illuminate\Support\Collection;
|
||||||
|
|
||||||
class OperationsKpiHeader extends Widget
|
class OperationsKpiHeader extends StatsOverviewWidget
|
||||||
{
|
{
|
||||||
protected static bool $isLazy = false;
|
protected static bool $isLazy = false;
|
||||||
|
|
||||||
protected string $view = 'filament.widgets.operations.operations-kpi-header';
|
|
||||||
|
|
||||||
protected int|string|array $columnSpan = 'full';
|
protected int|string|array $columnSpan = 'full';
|
||||||
|
|
||||||
|
protected function getPollingInterval(): ?string
|
||||||
|
{
|
||||||
|
$tenant = Filament::getTenant();
|
||||||
|
|
||||||
|
if (! $tenant instanceof Tenant) {
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
return ActiveRuns::existForTenant($tenant) ? '10s' : null;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return array<string, mixed>
|
* @return array<Stat>
|
||||||
*/
|
*/
|
||||||
protected function getViewData(): array
|
protected function getStats(): array
|
||||||
{
|
{
|
||||||
$tenant = Filament::getTenant();
|
$tenant = Filament::getTenant();
|
||||||
|
|
||||||
if (! $tenant instanceof Tenant) {
|
if (! $tenant instanceof Tenant) {
|
||||||
return [
|
return [
|
||||||
'pollingInterval' => null,
|
Stat::make('Total Runs (30 days)', 0),
|
||||||
'totalRuns30Days' => 0,
|
Stat::make('Active Runs', 0),
|
||||||
'activeRuns' => 0,
|
Stat::make('Failed/Partial (7 days)', 0),
|
||||||
'failedOrPartial7Days' => 0,
|
Stat::make('Avg Duration (7 days)', '—'),
|
||||||
'avgDuration7Days' => '—',
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -99,11 +108,10 @@ protected function getViewData(): array
|
|||||||
}
|
}
|
||||||
|
|
||||||
return [
|
return [
|
||||||
'pollingInterval' => ActiveRuns::existForTenant($tenant) ? '10s' : null,
|
Stat::make('Total Runs (30 days)', $totalRuns30Days),
|
||||||
'totalRuns30Days' => $totalRuns30Days,
|
Stat::make('Active Runs', $activeRuns),
|
||||||
'activeRuns' => $activeRuns,
|
Stat::make('Failed/Partial (7 days)', $failedOrPartial7Days),
|
||||||
'failedOrPartial7Days' => $failedOrPartial7Days,
|
Stat::make('Avg Duration (7 days)', $avgDuration7Days),
|
||||||
'avgDuration7Days' => $avgDuration7Days,
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
46
app/Support/Inventory/InventoryKpiBadges.php
Normal file
46
app/Support/Inventory/InventoryKpiBadges.php
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Support\Inventory;
|
||||||
|
|
||||||
|
use Illuminate\Support\Facades\Blade;
|
||||||
|
|
||||||
|
class InventoryKpiBadges
|
||||||
|
{
|
||||||
|
public static function coverage(int $restorableCount, int $partialCount): string
|
||||||
|
{
|
||||||
|
return Blade::render(<<<'BLADE'
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<x-filament::badge color="success" size="sm">
|
||||||
|
Restorable {{ $restorableCount }}
|
||||||
|
</x-filament::badge>
|
||||||
|
|
||||||
|
<x-filament::badge color="warning" size="sm">
|
||||||
|
Partial {{ $partialCount }}
|
||||||
|
</x-filament::badge>
|
||||||
|
</div>
|
||||||
|
BLADE, [
|
||||||
|
'restorableCount' => $restorableCount,
|
||||||
|
'partialCount' => $partialCount,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public static function inventoryOps(int $dependenciesCount, int $riskCount): string
|
||||||
|
{
|
||||||
|
return Blade::render(<<<'BLADE'
|
||||||
|
<div class="flex items-center gap-2">
|
||||||
|
<x-filament::badge color="gray" size="sm">
|
||||||
|
Dependencies {{ $dependenciesCount }}
|
||||||
|
</x-filament::badge>
|
||||||
|
|
||||||
|
<x-filament::badge color="danger" size="sm">
|
||||||
|
Risk {{ $riskCount }}
|
||||||
|
</x-filament::badge>
|
||||||
|
</div>
|
||||||
|
BLADE, [
|
||||||
|
'dependenciesCount' => $dependenciesCount,
|
||||||
|
'riskCount' => $riskCount,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
55
app/Support/Inventory/InventorySyncStatusBadge.php
Normal file
55
app/Support/Inventory/InventorySyncStatusBadge.php
Normal file
@ -0,0 +1,55 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
declare(strict_types=1);
|
||||||
|
|
||||||
|
namespace App\Support\Inventory;
|
||||||
|
|
||||||
|
use App\Models\InventorySyncRun;
|
||||||
|
|
||||||
|
class InventorySyncStatusBadge
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* @return array{label: string, color: string, icon: string}
|
||||||
|
*/
|
||||||
|
public static function for(?string $status): array
|
||||||
|
{
|
||||||
|
$status = (string) ($status ?? '');
|
||||||
|
|
||||||
|
$label = match ($status) {
|
||||||
|
InventorySyncRun::STATUS_SUCCESS => 'Success',
|
||||||
|
InventorySyncRun::STATUS_PARTIAL => 'Partial',
|
||||||
|
InventorySyncRun::STATUS_FAILED => 'Failed',
|
||||||
|
InventorySyncRun::STATUS_RUNNING => 'Running',
|
||||||
|
InventorySyncRun::STATUS_PENDING => 'Pending',
|
||||||
|
InventorySyncRun::STATUS_SKIPPED => 'Skipped',
|
||||||
|
'queued' => 'Queued',
|
||||||
|
default => '—',
|
||||||
|
};
|
||||||
|
|
||||||
|
$color = match ($status) {
|
||||||
|
InventorySyncRun::STATUS_SUCCESS => 'success',
|
||||||
|
InventorySyncRun::STATUS_PARTIAL => 'warning',
|
||||||
|
InventorySyncRun::STATUS_FAILED => 'danger',
|
||||||
|
InventorySyncRun::STATUS_RUNNING => 'info',
|
||||||
|
InventorySyncRun::STATUS_PENDING, 'queued' => 'gray',
|
||||||
|
InventorySyncRun::STATUS_SKIPPED => 'gray',
|
||||||
|
default => 'gray',
|
||||||
|
};
|
||||||
|
|
||||||
|
$icon = match ($status) {
|
||||||
|
InventorySyncRun::STATUS_SUCCESS => 'heroicon-m-check-circle',
|
||||||
|
InventorySyncRun::STATUS_PARTIAL => 'heroicon-m-exclamation-triangle',
|
||||||
|
InventorySyncRun::STATUS_FAILED => 'heroicon-m-x-circle',
|
||||||
|
InventorySyncRun::STATUS_RUNNING => 'heroicon-m-arrow-path',
|
||||||
|
InventorySyncRun::STATUS_PENDING, 'queued' => 'heroicon-m-clock',
|
||||||
|
InventorySyncRun::STATUS_SKIPPED => 'heroicon-m-minus-circle',
|
||||||
|
default => 'heroicon-m-clock',
|
||||||
|
};
|
||||||
|
|
||||||
|
return [
|
||||||
|
'label' => $label,
|
||||||
|
'color' => $color,
|
||||||
|
'icon' => $icon,
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
||||||
@ -1,36 +0,0 @@
|
|||||||
<div class="rounded-xl bg-white p-6 shadow-sm ring-1 ring-gray-950/5 dark:bg-gray-900 dark:ring-white/10">
|
|
||||||
<div class="grid grid-cols-1 gap-4 md:grid-cols-5">
|
|
||||||
<div class="flex flex-col gap-1">
|
|
||||||
<div class="text-sm text-gray-500 dark:text-gray-400">Total items</div>
|
|
||||||
<div class="text-2xl font-semibold text-gray-950 dark:text-white">{{ $totalItems }}</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex flex-col gap-1">
|
|
||||||
<div class="text-sm text-gray-500 dark:text-gray-400">Coverage</div>
|
|
||||||
<div class="text-2xl font-semibold text-gray-950 dark:text-white">{{ $coveragePercent }}%</div>
|
|
||||||
<div class="flex flex-wrap gap-2">
|
|
||||||
<x-filament::badge size="sm" color="success">Restorable {{ $restorableItems }}</x-filament::badge>
|
|
||||||
<x-filament::badge size="sm" color="warning">Partial {{ $partialItems }}</x-filament::badge>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex flex-col gap-1">
|
|
||||||
<div class="text-sm text-gray-500 dark:text-gray-400">Last inventory sync</div>
|
|
||||||
<div class="text-sm font-medium text-gray-950 dark:text-white">{{ $lastInventorySyncLabel }}</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex flex-col gap-1">
|
|
||||||
<div class="text-sm text-gray-500 dark:text-gray-400">Active ops</div>
|
|
||||||
<div class="text-2xl font-semibold text-gray-950 dark:text-white">{{ $activeOps }}</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex flex-col gap-1">
|
|
||||||
<div class="text-sm text-gray-500 dark:text-gray-400">Inventory ops</div>
|
|
||||||
<div class="text-2xl font-semibold text-gray-950 dark:text-white">{{ $inventoryOps }}</div>
|
|
||||||
<div class="flex flex-wrap gap-2">
|
|
||||||
<x-filament::badge size="sm" color="info">Dependencies {{ $dependenciesItems }}</x-filament::badge>
|
|
||||||
<x-filament::badge size="sm" color="danger">Risk {{ $riskItems }}</x-filament::badge>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
@ -1,28 +0,0 @@
|
|||||||
<div
|
|
||||||
@if ($pollingInterval)
|
|
||||||
wire:poll.{{ $pollingInterval }}
|
|
||||||
@endif
|
|
||||||
class="rounded-xl bg-white p-6 shadow-sm ring-1 ring-gray-950/5 dark:bg-gray-900 dark:ring-white/10"
|
|
||||||
>
|
|
||||||
<div class="grid grid-cols-1 gap-4 md:grid-cols-4">
|
|
||||||
<div class="flex flex-col gap-1">
|
|
||||||
<div class="text-sm text-gray-500 dark:text-gray-400">Total Runs (30 days)</div>
|
|
||||||
<div class="text-2xl font-semibold text-gray-950 dark:text-white">{{ $totalRuns30Days }}</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex flex-col gap-1">
|
|
||||||
<div class="text-sm text-gray-500 dark:text-gray-400">Active Runs</div>
|
|
||||||
<div class="text-2xl font-semibold text-gray-950 dark:text-white">{{ $activeRuns }}</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex flex-col gap-1">
|
|
||||||
<div class="text-sm text-gray-500 dark:text-gray-400">Failed/Partial (7 days)</div>
|
|
||||||
<div class="text-2xl font-semibold text-gray-950 dark:text-white">{{ $failedOrPartial7Days }}</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex flex-col gap-1">
|
|
||||||
<div class="text-sm text-gray-500 dark:text-gray-400">Avg Duration (7 days)</div>
|
|
||||||
<div class="text-2xl font-semibold text-gray-950 dark:text-white">{{ $avgDuration7Days }}</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
@ -61,22 +61,22 @@ ## Phase 4: User Story 2 — Inventory becomes a hub module (Priority: P2)
|
|||||||
|
|
||||||
### Tests (US2)
|
### Tests (US2)
|
||||||
|
|
||||||
- [x] T016 [P] [US2] Add DB-only render test for Inventory hub surfaces in tests/Feature/Filament/InventoryHubDbOnlyTest.php
|
- [X] T016 [P] [US2] Add DB-only render test for Inventory hub surfaces in tests/Feature/Filament/InventoryHubDbOnlyTest.php
|
||||||
- [x] T017 [P] [US2] Extend/adjust inventory navigation smoke coverage in tests/Feature/Filament/InventoryPagesTest.php
|
- [X] T017 [P] [US2] Extend/adjust inventory navigation smoke coverage in tests/Feature/Filament/InventoryPagesTest.php
|
||||||
|
|
||||||
### Implementation (US2)
|
### Implementation (US2)
|
||||||
|
|
||||||
- [x] T018 [US2] Enable cluster discovery in app/Providers/Filament/AdminPanelProvider.php (add `discoverClusters(...)`)
|
- [X] T018 [US2] Enable cluster discovery in app/Providers/Filament/AdminPanelProvider.php (add `discoverClusters(...)`)
|
||||||
- [x] T019 [US2] Create Inventory cluster class in app/Filament/Clusters/Inventory/InventoryCluster.php
|
- [X] T019 [US2] Create Inventory cluster class in app/Filament/Clusters/Inventory/InventoryCluster.php
|
||||||
- [x] T020 [US2] Assign Inventory cluster to inventory pages in app/Filament/Pages/InventoryLanding.php and app/Filament/Pages/InventoryCoverage.php
|
- [X] T020 [US2] Assign Inventory cluster to inventory pages in app/Filament/Pages/InventoryLanding.php and app/Filament/Pages/InventoryCoverage.php
|
||||||
- [x] T021 [US2] Assign Inventory cluster to inventory resources in app/Filament/Resources/InventoryItemResource.php and app/Filament/Resources/InventorySyncRunResource.php
|
- [X] T021 [US2] Assign Inventory cluster to inventory resources in app/Filament/Resources/InventoryItemResource.php and app/Filament/Resources/InventorySyncRunResource.php
|
||||||
- [x] T022 [P] [US2] Create shared Inventory KPI header widget in app/Filament/Widgets/Inventory/InventoryKpiHeader.php
|
- [X] T022 [P] [US2] Create shared Inventory KPI header widget in app/Filament/Widgets/Inventory/InventoryKpiHeader.php
|
||||||
- [x] T023 [US2] Add Inventory KPI header widget to InventoryLanding in app/Filament/Pages/InventoryLanding.php
|
- [X] T023 [US2] Add Inventory KPI header widget to InventoryLanding in app/Filament/Pages/InventoryLanding.php
|
||||||
- [x] T024 [US2] Add Inventory KPI header widget to InventoryCoverage in app/Filament/Pages/InventoryCoverage.php
|
- [X] T024 [US2] Add Inventory KPI header widget to InventoryCoverage in app/Filament/Pages/InventoryCoverage.php
|
||||||
- [x] T025 [US2] Add Inventory KPI header widget to Inventory items list in app/Filament/Resources/InventoryItemResource.php (or its list page)
|
- [X] T025 [US2] Add Inventory KPI header widget to Inventory items list in app/Filament/Resources/InventoryItemResource.php (or its list page)
|
||||||
- [x] T026 [US2] Add Inventory KPI header widget to Inventory sync runs list in app/Filament/Resources/InventorySyncRunResource.php (or its list page)
|
- [X] T026 [US2] Add Inventory KPI header widget to Inventory sync runs list in app/Filament/Resources/InventorySyncRunResource.php (or its list page)
|
||||||
- [x] T027 [US2] Ensure Inventory KPI definitions match specs/058-tenant-ui-polish/contracts/ui.md (coverage % restorable/total; partial separate; two active operations counts)
|
- [X] T027 [US2] Ensure Inventory KPI definitions match specs/058-tenant-ui-polish/contracts/ui.md (coverage % restorable/total; partial separate; two active operations counts)
|
||||||
- [x] T041 [US2] Inventory coverage semantics reference (A2)
|
- [X] T041 [US2] Inventory coverage semantics reference (A2)
|
||||||
- Identify and document the exact source-of-truth fields for Inventory KPI aggregation:
|
- Identify and document the exact source-of-truth fields for Inventory KPI aggregation:
|
||||||
- `inventory_items.policy_type`
|
- `inventory_items.policy_type`
|
||||||
- `config('tenantpilot.supported_policy_types')` meta fields (`restore`, `risk`)
|
- `config('tenantpilot.supported_policy_types')` meta fields (`restore`, `risk`)
|
||||||
@ -85,8 +85,8 @@ ### Implementation (US2)
|
|||||||
- DoD:
|
- DoD:
|
||||||
- One canonical place documented and referenced by inventory KPIs.
|
- One canonical place documented and referenced by inventory KPIs.
|
||||||
- No “magic” or duplicated classification logic across pages/widgets.
|
- No “magic” or duplicated classification logic across pages/widgets.
|
||||||
- [x] T028 [US2] Ensure “Sync Runs” view is inventory-only per spec in app/Filament/Resources/InventorySyncRunResource.php (query/filter by run type/intent if needed)
|
- [X] T028 [US2] Ensure “Sync Runs” view is inventory-only per spec in app/Filament/Resources/InventorySyncRunResource.php (query/filter by run type/intent if needed)
|
||||||
- [x] T029 [US2] Standardize coverage chips set on coverage-related surfaces in app/Filament/Pages/InventoryCoverage.php (Restorable, Partial, Risk, Dependencies only)
|
- [X] T029 [US2] Standardize coverage chips set on coverage-related surfaces in app/Filament/Pages/InventoryCoverage.php (Restorable, Partial, Risk, Dependencies only)
|
||||||
|
|
||||||
**Checkpoint**: Inventory hub behaves as a module with consistent sub-navigation + header.
|
**Checkpoint**: Inventory hub behaves as a module with consistent sub-navigation + header.
|
||||||
|
|
||||||
@ -135,6 +135,8 @@ ## Phase 6: Polish & Cross-Cutting Concerns
|
|||||||
- [X] T038 [P] Run formatting on changed files in app/** and tests/** via `vendor/bin/sail bin pint --dirty`
|
- [X] T038 [P] Run formatting on changed files in app/** and tests/** via `vendor/bin/sail bin pint --dirty`
|
||||||
- [X] T039 Run targeted tests from specs/058-tenant-ui-polish/quickstart.md and ensure green
|
- [X] T039 Run targeted tests from specs/058-tenant-ui-polish/quickstart.md and ensure green
|
||||||
- [X] T040 [P] Smoke-check key pages render for a tenant in tests/Feature/Filament/AdminSmokeTest.php (add assertions only if gaps are found)
|
- [X] T040 [P] Smoke-check key pages render for a tenant in tests/Feature/Filament/AdminSmokeTest.php (add assertions only if gaps are found)
|
||||||
|
- [X] T043 Refactor KPI headers to StatsOverviewWidget (Inventory + Operations) to match Filament demo tiles and reduce custom Blade drift
|
||||||
|
- [X] T044 Inventory IA polish: remove Inventory “Overview”, make Items the default entry, rename “Inventory Sync Runs” → “Sync History”, and move “Run Inventory Sync” to Items header actions
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
|||||||
@ -3,7 +3,6 @@
|
|||||||
declare(strict_types=1);
|
declare(strict_types=1);
|
||||||
|
|
||||||
use App\Filament\Pages\InventoryCoverage;
|
use App\Filament\Pages\InventoryCoverage;
|
||||||
use App\Filament\Pages\InventoryLanding;
|
|
||||||
use App\Filament\Resources\InventoryItemResource;
|
use App\Filament\Resources\InventoryItemResource;
|
||||||
use App\Filament\Resources\InventorySyncRunResource;
|
use App\Filament\Resources\InventorySyncRunResource;
|
||||||
use App\Models\InventoryItem;
|
use App\Models\InventoryItem;
|
||||||
@ -32,12 +31,9 @@
|
|||||||
Bus::fake();
|
Bus::fake();
|
||||||
|
|
||||||
assertNoOutboundHttp(function () use ($tenant): void {
|
assertNoOutboundHttp(function () use ($tenant): void {
|
||||||
$this->get(InventoryLanding::getUrl(tenant: $tenant))
|
|
||||||
->assertOk()
|
|
||||||
->assertSee('Run Inventory Sync');
|
|
||||||
|
|
||||||
$this->get(InventoryItemResource::getUrl('index', tenant: $tenant))
|
$this->get(InventoryItemResource::getUrl('index', tenant: $tenant))
|
||||||
->assertOk()
|
->assertOk()
|
||||||
|
->assertSee('Run Inventory Sync')
|
||||||
->assertSee('Item A');
|
->assertSee('Item A');
|
||||||
|
|
||||||
$this->get(InventorySyncRunResource::getUrl('index', tenant: $tenant))
|
$this->get(InventorySyncRunResource::getUrl('index', tenant: $tenant))
|
||||||
|
|||||||
@ -1,7 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use App\Filament\Pages\InventoryCoverage;
|
use App\Filament\Pages\InventoryCoverage;
|
||||||
use App\Filament\Pages\InventoryLanding;
|
|
||||||
use App\Filament\Resources\InventoryItemResource;
|
use App\Filament\Resources\InventoryItemResource;
|
||||||
use App\Filament\Resources\InventorySyncRunResource;
|
use App\Filament\Resources\InventorySyncRunResource;
|
||||||
use App\Models\InventoryItem;
|
use App\Models\InventoryItem;
|
||||||
@ -11,7 +10,7 @@
|
|||||||
|
|
||||||
uses(\Illuminate\Foundation\Testing\RefreshDatabase::class);
|
uses(\Illuminate\Foundation\Testing\RefreshDatabase::class);
|
||||||
|
|
||||||
test('inventory landing and coverage pages load for a tenant', function () {
|
test('inventory hub pages load for a tenant', function () {
|
||||||
$tenant = Tenant::factory()->create();
|
$tenant = Tenant::factory()->create();
|
||||||
|
|
||||||
$user = User::factory()->create();
|
$user = User::factory()->create();
|
||||||
@ -19,11 +18,6 @@
|
|||||||
$tenant->getKey() => ['role' => 'owner'],
|
$tenant->getKey() => ['role' => 'owner'],
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$this->actingAs($user)
|
|
||||||
->get(InventoryLanding::getUrl(tenant: $tenant))
|
|
||||||
->assertOk()
|
|
||||||
->assertSee('Run Inventory Sync');
|
|
||||||
|
|
||||||
InventoryItem::factory()->create([
|
InventoryItem::factory()->create([
|
||||||
'tenant_id' => $tenant->getKey(),
|
'tenant_id' => $tenant->getKey(),
|
||||||
'display_name' => 'Item A',
|
'display_name' => 'Item A',
|
||||||
@ -38,7 +32,6 @@
|
|||||||
'status' => InventorySyncRun::STATUS_SUCCESS,
|
'status' => InventorySyncRun::STATUS_SUCCESS,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$landingUrl = InventoryLanding::getUrl(tenant: $tenant);
|
|
||||||
$itemsUrl = InventoryItemResource::getUrl('index', tenant: $tenant);
|
$itemsUrl = InventoryItemResource::getUrl('index', tenant: $tenant);
|
||||||
$syncRunsUrl = InventorySyncRunResource::getUrl('index', tenant: $tenant);
|
$syncRunsUrl = InventorySyncRunResource::getUrl('index', tenant: $tenant);
|
||||||
$coverageUrl = InventoryCoverage::getUrl(tenant: $tenant);
|
$coverageUrl = InventoryCoverage::getUrl(tenant: $tenant);
|
||||||
@ -51,18 +44,10 @@
|
|||||||
'Inventory ops',
|
'Inventory ops',
|
||||||
];
|
];
|
||||||
|
|
||||||
$this->actingAs($user)
|
|
||||||
->get($landingUrl)
|
|
||||||
->assertOk()
|
|
||||||
->assertSee($itemsUrl)
|
|
||||||
->assertSee($syncRunsUrl)
|
|
||||||
->assertSee($coverageUrl)
|
|
||||||
->assertSee($kpiLabels);
|
|
||||||
|
|
||||||
$this->actingAs($user)
|
$this->actingAs($user)
|
||||||
->get($itemsUrl)
|
->get($itemsUrl)
|
||||||
->assertOk()
|
->assertOk()
|
||||||
->assertSee($landingUrl)
|
->assertSee('Run Inventory Sync')
|
||||||
->assertSee($syncRunsUrl)
|
->assertSee($syncRunsUrl)
|
||||||
->assertSee($coverageUrl)
|
->assertSee($coverageUrl)
|
||||||
->assertSee($kpiLabels)
|
->assertSee($kpiLabels)
|
||||||
@ -71,7 +56,6 @@
|
|||||||
$this->actingAs($user)
|
$this->actingAs($user)
|
||||||
->get($syncRunsUrl)
|
->get($syncRunsUrl)
|
||||||
->assertOk()
|
->assertOk()
|
||||||
->assertSee($landingUrl)
|
|
||||||
->assertSee($itemsUrl)
|
->assertSee($itemsUrl)
|
||||||
->assertSee($coverageUrl)
|
->assertSee($coverageUrl)
|
||||||
->assertSee($kpiLabels)
|
->assertSee($kpiLabels)
|
||||||
@ -80,7 +64,6 @@
|
|||||||
$this->actingAs($user)
|
$this->actingAs($user)
|
||||||
->get(InventoryCoverage::getUrl(tenant: $tenant))
|
->get(InventoryCoverage::getUrl(tenant: $tenant))
|
||||||
->assertOk()
|
->assertOk()
|
||||||
->assertSee($landingUrl)
|
|
||||||
->assertSee($itemsUrl)
|
->assertSee($itemsUrl)
|
||||||
->assertSee($syncRunsUrl)
|
->assertSee($syncRunsUrl)
|
||||||
->assertSee($kpiLabels)
|
->assertSee($kpiLabels)
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use App\Filament\Pages\InventoryLanding;
|
use App\Filament\Resources\InventoryItemResource\Pages\ListInventoryItems;
|
||||||
use App\Jobs\RunInventorySyncJob;
|
use App\Jobs\RunInventorySyncJob;
|
||||||
use App\Livewire\BulkOperationProgress;
|
use App\Livewire\BulkOperationProgress;
|
||||||
use App\Models\InventorySyncRun;
|
use App\Models\InventorySyncRun;
|
||||||
@ -24,7 +24,7 @@
|
|||||||
$sync = app(InventorySyncService::class);
|
$sync = app(InventorySyncService::class);
|
||||||
$allTypes = $sync->defaultSelectionPayload()['policy_types'];
|
$allTypes = $sync->defaultSelectionPayload()['policy_types'];
|
||||||
|
|
||||||
Livewire::test(InventoryLanding::class)
|
Livewire::test(ListInventoryItems::class)
|
||||||
->callAction('run_inventory_sync', data: ['policy_types' => $allTypes])
|
->callAction('run_inventory_sync', data: ['policy_types' => $allTypes])
|
||||||
->assertDispatchedTo(BulkOperationProgress::class, OpsUxBrowserEvents::RunEnqueued, tenantId: (int) $tenant->getKey());
|
->assertDispatchedTo(BulkOperationProgress::class, OpsUxBrowserEvents::RunEnqueued, tenantId: (int) $tenant->getKey());
|
||||||
|
|
||||||
@ -58,7 +58,7 @@
|
|||||||
$allTypes = $sync->defaultSelectionPayload()['policy_types'];
|
$allTypes = $sync->defaultSelectionPayload()['policy_types'];
|
||||||
$selectedTypes = array_slice($allTypes, 0, min(2, count($allTypes)));
|
$selectedTypes = array_slice($allTypes, 0, min(2, count($allTypes)));
|
||||||
|
|
||||||
Livewire::test(InventoryLanding::class)
|
Livewire::test(ListInventoryItems::class)
|
||||||
->mountAction('run_inventory_sync')
|
->mountAction('run_inventory_sync')
|
||||||
->set('mountedActions.0.data.policy_types', $selectedTypes)
|
->set('mountedActions.0.data.policy_types', $selectedTypes)
|
||||||
->assertActionDataSet(['policy_types' => $selectedTypes])
|
->assertActionDataSet(['policy_types' => $selectedTypes])
|
||||||
@ -85,7 +85,7 @@
|
|||||||
$allTypes = $sync->defaultSelectionPayload()['policy_types'];
|
$allTypes = $sync->defaultSelectionPayload()['policy_types'];
|
||||||
$selectedTypes = array_slice($allTypes, 0, min(2, count($allTypes)));
|
$selectedTypes = array_slice($allTypes, 0, min(2, count($allTypes)));
|
||||||
|
|
||||||
Livewire::test(InventoryLanding::class)
|
Livewire::test(ListInventoryItems::class)
|
||||||
->callAction('run_inventory_sync', data: [
|
->callAction('run_inventory_sync', data: [
|
||||||
'policy_types' => $selectedTypes,
|
'policy_types' => $selectedTypes,
|
||||||
'include_dependencies' => false,
|
'include_dependencies' => false,
|
||||||
@ -110,7 +110,7 @@
|
|||||||
$allTypes = $sync->defaultSelectionPayload()['policy_types'];
|
$allTypes = $sync->defaultSelectionPayload()['policy_types'];
|
||||||
$selectedTypes = array_slice($allTypes, 0, min(2, count($allTypes)));
|
$selectedTypes = array_slice($allTypes, 0, min(2, count($allTypes)));
|
||||||
|
|
||||||
Livewire::test(InventoryLanding::class)
|
Livewire::test(ListInventoryItems::class)
|
||||||
->mountAction('run_inventory_sync')
|
->mountAction('run_inventory_sync')
|
||||||
->set('mountedActions.0.data.policy_types', $selectedTypes)
|
->set('mountedActions.0.data.policy_types', $selectedTypes)
|
||||||
->assertActionDataSet(['include_foundations' => true])
|
->assertActionDataSet(['include_foundations' => true])
|
||||||
@ -135,7 +135,7 @@
|
|||||||
$allTypes = $sync->defaultSelectionPayload()['policy_types'];
|
$allTypes = $sync->defaultSelectionPayload()['policy_types'];
|
||||||
$selectedTypes = array_slice($allTypes, 0, min(2, count($allTypes)));
|
$selectedTypes = array_slice($allTypes, 0, min(2, count($allTypes)));
|
||||||
|
|
||||||
Livewire::test(InventoryLanding::class)
|
Livewire::test(ListInventoryItems::class)
|
||||||
->callAction('run_inventory_sync', data: [
|
->callAction('run_inventory_sync', data: [
|
||||||
'policy_types' => $selectedTypes,
|
'policy_types' => $selectedTypes,
|
||||||
'include_foundations' => false,
|
'include_foundations' => false,
|
||||||
@ -159,7 +159,7 @@
|
|||||||
$sync = app(InventorySyncService::class);
|
$sync = app(InventorySyncService::class);
|
||||||
$allTypes = $sync->defaultSelectionPayload()['policy_types'];
|
$allTypes = $sync->defaultSelectionPayload()['policy_types'];
|
||||||
|
|
||||||
Livewire::test(InventoryLanding::class)
|
Livewire::test(ListInventoryItems::class)
|
||||||
->callAction('run_inventory_sync', data: ['tenant_id' => $tenantB->getKey(), 'policy_types' => $allTypes])
|
->callAction('run_inventory_sync', data: ['tenant_id' => $tenantB->getKey(), 'policy_types' => $allTypes])
|
||||||
->assertStatus(403);
|
->assertStatus(403);
|
||||||
|
|
||||||
@ -196,7 +196,7 @@
|
|||||||
'errors_count' => 0,
|
'errors_count' => 0,
|
||||||
]);
|
]);
|
||||||
|
|
||||||
Livewire::test(InventoryLanding::class)
|
Livewire::test(ListInventoryItems::class)
|
||||||
->callAction('run_inventory_sync', data: ['policy_types' => $computed['selection']['policy_types']]);
|
->callAction('run_inventory_sync', data: ['policy_types' => $computed['selection']['policy_types']]);
|
||||||
|
|
||||||
Queue::assertNothingPushed();
|
Queue::assertNothingPushed();
|
||||||
@ -211,7 +211,7 @@
|
|||||||
$this->actingAs($user);
|
$this->actingAs($user);
|
||||||
Filament::setTenant($tenant, true);
|
Filament::setTenant($tenant, true);
|
||||||
|
|
||||||
Livewire::test(InventoryLanding::class)
|
Livewire::test(ListInventoryItems::class)
|
||||||
->assertActionHidden('run_inventory_sync');
|
->assertActionHidden('run_inventory_sync');
|
||||||
|
|
||||||
Queue::assertNothingPushed();
|
Queue::assertNothingPushed();
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use App\Filament\Pages\InventoryLanding;
|
use App\Filament\Resources\InventoryItemResource\Pages\ListInventoryItems;
|
||||||
use App\Jobs\RunInventorySyncJob;
|
use App\Jobs\RunInventorySyncJob;
|
||||||
use App\Models\OperationRun;
|
use App\Models\OperationRun;
|
||||||
use App\Services\Graph\GraphClientInterface;
|
use App\Services\Graph\GraphClientInterface;
|
||||||
@ -31,7 +31,7 @@
|
|||||||
$sync = app(InventorySyncService::class);
|
$sync = app(InventorySyncService::class);
|
||||||
$policyTypes = $sync->defaultSelectionPayload()['policy_types'] ?? [];
|
$policyTypes = $sync->defaultSelectionPayload()['policy_types'] ?? [];
|
||||||
|
|
||||||
Livewire::test(InventoryLanding::class)
|
Livewire::test(ListInventoryItems::class)
|
||||||
->callAction('run_inventory_sync', data: ['policy_types' => $policyTypes]);
|
->callAction('run_inventory_sync', data: ['policy_types' => $policyTypes]);
|
||||||
|
|
||||||
$opRun = OperationRun::query()
|
$opRun = OperationRun::query()
|
||||||
|
|||||||
@ -1,6 +1,6 @@
|
|||||||
<?php
|
<?php
|
||||||
|
|
||||||
use App\Filament\Pages\InventoryLanding;
|
use App\Filament\Resources\InventoryItemResource\Pages\ListInventoryItems;
|
||||||
use App\Models\InventorySyncRun;
|
use App\Models\InventorySyncRun;
|
||||||
use App\Models\OperationRun;
|
use App\Models\OperationRun;
|
||||||
use App\Models\Tenant;
|
use App\Models\Tenant;
|
||||||
@ -23,7 +23,7 @@
|
|||||||
$sync = app(InventorySyncService::class);
|
$sync = app(InventorySyncService::class);
|
||||||
$allTypes = $sync->defaultSelectionPayload()['policy_types'];
|
$allTypes = $sync->defaultSelectionPayload()['policy_types'];
|
||||||
|
|
||||||
Livewire::test(InventoryLanding::class)
|
Livewire::test(ListInventoryItems::class)
|
||||||
->callAction('run_inventory_sync', data: ['tenant_id' => $tenantB->getKey(), 'policy_types' => $allTypes])
|
->callAction('run_inventory_sync', data: ['tenant_id' => $tenantB->getKey(), 'policy_types' => $allTypes])
|
||||||
->assertStatus(403);
|
->assertStatus(403);
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user