Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions app/Filament/Resources/Consultations/ConsultationResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,15 @@ class ConsultationResource extends Resource

protected static string|BackedEnum|null $navigationIcon = Heroicon::OutlinedRectangleStack;

protected static bool $shouldRegisterNavigation = false;

protected static string|UnitEnum|null $navigationGroup = 'Portal';

public static function canAccess(): bool
{
return false;
}

public static function form(Schema $schema): Schema
{
return ConsultationForm::configure($schema);
Expand Down
13 changes: 0 additions & 13 deletions app/Filament/Widgets/StatsOverview.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,12 @@

namespace App\Filament\Widgets;

use App\Enums\ConsultationStatus;
use App\Enums\SubmissionStatus;
use App\Enums\UserRole;
use App\Filament\Resources\Consultations\ConsultationResource;
use App\Filament\Resources\Organizations\OrganizationResource;
use App\Filament\Resources\Resources\ResourceResource;
use App\Filament\Resources\ResourceSubmissions\ResourceSubmissionResource;
use App\Filament\Resources\Users\UserResource;
use App\Models\Consultation;
use App\Models\Organization;
use App\Models\Resource as ResourceModel;
use App\Models\ResourceSubmission;
Expand All @@ -31,10 +28,6 @@ protected function getStats(): array
->where('status', SubmissionStatus::Pending)
->count();

$openConsultations = Consultation::query()
->whereIn('status', [ConsultationStatus::Open, ConsultationStatus::InProgress])
->count();

$pendingProfessionals = User::query()
->where('role', UserRole::Professional)
->whereNull('verified_at')
Expand All @@ -59,12 +52,6 @@ protected function getStats(): array
->icon(Heroicon::OutlinedInboxArrowDown)
->color($pendingSubmissions > 0 ? 'warning' : 'gray')
->url(ResourceSubmissionResource::getUrl('index')),
Stat::make(__('admin.stats.open_consultations'), $openConsultations)
->description(__('admin.stats.open_consultations_desc'))
->descriptionIcon(Heroicon::OutlinedChatBubbleLeftRight)
->icon(Heroicon::OutlinedChatBubbleOvalLeftEllipsis)
->color($openConsultations > 0 ? 'info' : 'gray')
->url(ConsultationResource::getUrl('index')),
Stat::make(__('admin.stats.professionals_to_verify'), $pendingProfessionals)
->description(__('admin.stats.professionals_to_verify_desc'))
->descriptionIcon(Heroicon::OutlinedShieldCheck)
Expand Down
1 change: 0 additions & 1 deletion resources/views/pages/⚡portal-index.blade.php
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ public function resourceCount(): int
<div class="grid md:grid-cols-3 gap-6">
@foreach ([
['route' => 'portal.resources', 'title' => 'portal.resources', 'body' => 'portal.resources_body'],
['route' => 'portal.consultations.index', 'title' => 'portal.consultations', 'body' => 'portal.consultations_body'],
['route' => 'portal.profile', 'title' => 'portal.profile', 'body' => 'portal.profile_body'],
] as $item)
<a wire:key="{{ $item['route'] }}" href="{{ localized_route($item['route']) }}"
Expand Down
5 changes: 1 addition & 4 deletions routes/web.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
use App\Http\Middleware\SetLocale;
use Illuminate\Support\Facades\Route;

Route::redirect('/', '/' . config('cpc.default_locale', 'ro'));
Route::redirect('/', '/'.config('cpc.default_locale', 'ro'));

Route::prefix('{locale}')
->where(['locale' => 'ro|en'])
Expand All @@ -24,9 +24,6 @@
->group(function (): void {
Route::livewire('/', 'pages::portal-index')->name('portal.index');
Route::livewire('/resources', 'pages::portal-resources')->name('portal.resources');
Route::livewire('/consultations', 'pages::portal-consultations-index')->name('portal.consultations.index');
Route::livewire('/consultations/create', 'pages::portal-consultations-create')->name('portal.consultations.create');
Route::livewire('/consultations/{consultation}', 'pages::portal-consultations-show')->name('portal.consultations.show');
Route::livewire('/profile', 'pages::portal-profile')->name('portal.profile');
});
});
Expand Down
2 changes: 1 addition & 1 deletion tests/Feature/FilamentAdminLocaleTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
->assertSee(__('admin.resources.organizations.navigation', locale: 'ro'))
->assertSee(__('admin.resources.partner_organizations.navigation', locale: 'ro'))
->assertSee(__('admin.resources.resources.navigation', locale: 'ro'))
->assertSee(__('admin.resources.consultations.navigation', locale: 'ro'));
->assertDontSee(__('admin.resources.consultations.navigation', locale: 'ro'));

Livewire::test(ListOrganizations::class)
->assertSee(OrganizationType::Ngo->label());
Expand Down
5 changes: 1 addition & 4 deletions tests/Feature/FilamentDashboardStatsTest.php
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
<?php

use App\Enums\ConsultationStatus;
use App\Enums\ResourceStatus;
use App\Enums\SubmissionStatus;
use App\Filament\Widgets\StatsOverview;
use App\Models\Consultation;
use App\Models\Organization;
use App\Models\Resource;
use App\Models\ResourceSubmission;
Expand All @@ -17,7 +15,6 @@
Resource::factory()->create(['status' => ResourceStatus::Published, 'published_at' => now()]);
Organization::factory()->create(['is_published' => true]);
ResourceSubmission::factory()->create(['status' => SubmissionStatus::Pending]);
Consultation::factory()->create(['status' => ConsultationStatus::Open]);
User::factory()->unverifiedProfessional()->create();

$this->actingAs($admin);
Expand All @@ -26,7 +23,7 @@
->assertSee(__('admin.stats.published_resources'))
->assertSee(__('admin.stats.organizations'))
->assertSee(__('admin.stats.pending_submissions'))
->assertSee(__('admin.stats.open_consultations'))
->assertDontSee(__('admin.stats.open_consultations'))
->assertSee(__('admin.stats.professionals_to_verify'));
});

Expand Down
10 changes: 5 additions & 5 deletions tests/Feature/PortalTest.php
Original file line number Diff line number Diff line change
@@ -1,27 +1,27 @@
<?php

use App\Models\Consultation;
use App\Models\User;
use Illuminate\Foundation\Testing\RefreshDatabase;

uses(RefreshDatabase::class);

it('allows a verified professional to access the portal', function () {
$user = User::factory()->verifiedProfessional()->create();
$consultation = Consultation::factory()->for($user)->create();

$this->actingAs($user);

foreach ([
'/ro/portal',
'/ro/portal/resources',
'/ro/portal/consultations',
'/ro/portal/consultations/create',
'/ro/portal/consultations/' . $consultation->id,
'/ro/portal/profile',
] as $path) {
$this->get($path)->assertSuccessful();
}

$this->get('/ro/portal')
->assertDontSee(__('portal.consultations', [], 'ro'), false);

$this->get('/ro/portal/consultations')->assertNotFound();
});

it('redirects an unverified professional to the pending page', function () {
Expand Down
Loading