implement statuses on organisations (#169)

* implement statuses on organisations * resend invitation action * change status from guest to invited * wip --------- Co-authored-by: Andrei Ioniță <[email protected]>
code4romania · Apr 8, 2024 · 3bb9305 · 3bb9305
1 parent 4b4228f
commit 3bb9305
Show file tree

Hide file tree

Showing 11 changed files with 181 additions and 46 deletions.
diff --git a/app/Enum/OrganisationStatus.php b/app/Enum/OrganisationStatus.php
@@ -16,4 +16,10 @@ enum OrganisationStatus: string
 
     case active = 'active';
     case inactive = 'inactive';
+    case invited = 'invited';
+
+    protected function labelKeyPrefix(): ?string
+    {
+        return 'organisation.status';
+    }
 }
diff --git a/app/Filament/Resources/OrganisationResource.php b/app/Filament/Resources/OrganisationResource.php
@@ -6,6 +6,7 @@
 
 use App\Enum\NGOType;
 use App\Enum\OrganisationAreaType;
+use App\Enum\OrganisationStatus;
 use App\Enum\OrganisationType;
 use App\Filament\Forms\Components\Location;
 use App\Filament\Resources\OrganisationResource\Pages;
@@ -379,21 +380,13 @@ public static function table(Table $table): Table
                     ->sortable()
                     ->toggleable(),
 
-                IconColumn::make('status')
-                    ->options([
-                        'heroicon-o-x-circle',
-                        'heroicon-o-x' => 'inactive',
-                        'heroicon-o-check' => 'active',
-                    ])
+                Tables\Columns\BadgeColumn::make('status')
                     ->colors([
-                        'secondary',
-                        'danger' => 'inactive',
+                        'secondary' => 'inactive',
+                        'warning' => 'guest',
                         'success' => 'active',
                     ])
-                    ->label(__('organisation.field.status'))
-                    ->searchable()
-                    ->sortable()
-                    ->toggleable(),
+                    ->enum(OrganisationStatus::options()),
 
                 TextColumn::make('county.name')
                     ->label(__('organisation.field.hq'))

diff --git a/app/Filament/Resources/OrganisationResource/Actions/ResendInvitationAction.php b/app/Filament/Resources/OrganisationResource/Actions/ResendInvitationAction.php
@@ -0,0 +1,61 @@
+<?php
+
+declare(strict_types=1);
+
+namespace App\Filament\Resources\OrganisationResource\Actions;
+
+use App\Models\Organisation;
+use Filament\Notifications\Notification;
+use Filament\Pages\Actions\Action;
+use Illuminate\Support\Facades\RateLimiter;
+
+class ResendInvitationAction extends Action
+{
+    public static function getDefaultName(): ?string
+    {
+        return 'resend_invitation';
+    }
+
+    protected function setUp(): void
+    {
+        parent::setUp();
+
+        $this->color('secondary');
+
+        $this->action(function (Organisation $record) {
+            $key = $this->getRateLimiterKey($record);
+            $maxAttempts = 1;
+
+            if (RateLimiter::tooManyAttempts($key, $maxAttempts)) {
+                return $this->failure();
+            }
+
+            RateLimiter::increment($key, 3600); // 1h
+
+            $record->users->first()->sendWelcomeNotification();
+            $this->success();
+        });
+
+        $this->requiresConfirmation();
+
+        $this->label(__('organisation.action.resend_invitation.button'));
+
+        $this->modalHeading(__('organisation.action.resend_invitation.heading'));
+        $this->modalSubheading(__('organisation.action.resend_invitation.subheading'));
+        $this->modalButton(__('organisation.action.resend_invitation.button'));
+
+        $this->successNotificationTitle(__('organisation.action.resend_invitation.success'));
+
+        $this->failureNotification(
+            fn (Notification $notification) => $notification
+                ->danger()
+                ->title(__('organisation.action.resend_invitation.failure_title'))
+                ->body(__('organisation.action.resend_invitation.failure_body'))
+        );
+    }
+
+    private function getRateLimiterKey(Organisation $organisation): string
+    {
+        return 'resend-invitation:' . $organisation->id;
+    }
+}
diff --git a/app/Filament/Resources/OrganisationResource/Pages/ViewOrganisation.php b/app/Filament/Resources/OrganisationResource/Pages/ViewOrganisation.php
@@ -7,6 +7,7 @@
 use App\Filament\Resources\OrganisationResource;
 use App\Filament\Resources\OrganisationResource\Actions\ActivateOrganisationAction;
 use App\Filament\Resources\OrganisationResource\Actions\DeactivateOrganisationAction;
+use App\Filament\Resources\OrganisationResource\Actions\ResendInvitationAction;
 use App\Models\Organisation;
 use Filament\Pages\Actions\DeleteAction;
 use Filament\Pages\Actions\EditAction;
@@ -28,6 +29,10 @@ protected function getActions(): array
                 ->visible(fn (Organisation $record) => auth()->user()->isPlatformAdmin() && $record->isInactive())
                 ->record($this->getRecord()),
 
+            ResendInvitationAction::make()
+                ->visible(fn (Organisation $record) => auth()->user()->isPlatformAdmin() && $record->isInvited())
+                ->record($this->getRecord()),
+
             DeactivateOrganisationAction::make()
                 ->visible(fn (Organisation $record) => auth()->user()->isPlatformAdmin() && $record->isActive())
                 ->record($this->getRecord()),

diff --git a/app/Http/Livewire/Welcome.php b/app/Http/Livewire/Welcome.php
@@ -71,6 +71,8 @@ public function handle(): ?LoginResponse
             data_get($this->form->getState(), 'password')
         );
 
+        $this->user->activateOrganisation();
+
         Filament::auth()->login($this->user);
 
         return app(LoginResponse::class);

diff --git a/app/Models/Organisation.php b/app/Models/Organisation.php
@@ -182,6 +182,11 @@ public function isInactive(): bool
         return $this->status->is(OrganisationStatus::inactive);
     }
 
+    public function isInvited(): bool
+    {
+        return $this->status->is(OrganisationStatus::invited);
+    }
+
     public function routeNotificationForMail(?Notification $notification = null): string
     {
         return data_get($this->contact_person, ['email'], $this->email);

diff --git a/app/Models/User.php b/app/Models/User.php
@@ -8,6 +8,7 @@
 use App\Concerns\HasRole;
 use App\Concerns\LimitsVisibility;
 use App\Concerns\MustSetInitialPassword;
+use App\Enum\OrganisationStatus;
 use App\Enum\UserRole;
 use Filament\Models\Contracts\FilamentUser;
 use Filament\Models\Contracts\HasName;
@@ -83,4 +84,13 @@ public function getFilamentName(): string
     {
         return "{$this->first_name} {$this->last_name}";
     }
+
+    public function activateOrganisation(): void
+    {
+        $organisation = $this->organisation;
+        if ($this->isOrgAdmin($organisation) && $this->organisation->status === OrganisationStatus::invited)
+        {
+            $organisation->setActive();
+        }
+    }
 }
diff --git a/composer.json b/composer.json
@@ -20,7 +20,7 @@
         "sentry/sentry-laravel": "^4.1"
     },
     "require-dev": {
-        "barryvdh/laravel-debugbar": "^3.9",
+        "barryvdh/laravel-debugbar": "^3.13",
         "barryvdh/laravel-ide-helper": "^2.13",
         "fakerphp/faker": "^1.23",
         "friendsofphp/php-cs-fixer": "^3.39",

diff --git a/composer.lock b/composer.lock