feat: upgrade to lattice 0.34

app/Actions/SetLocaleAction.php

@@ -9,14 +9,14 @@
 use Lattice\Lattice\Actions\ActionResult;
 use Lattice\Lattice\Actions\Components\Action;
 use Lattice\Lattice\Attributes\AsAction;
-use Lattice\Lattice\Core\Enums\ButtonVariant;
+use Lattice\Lattice\Ui\Enums\Emphasis;
 
 #[AsAction('app.locale.set')]
 class SetLocaleAction extends ActionDefinition
 {
     public function definition(Action $action): Action
     {
-        return $action->variant(ButtonVariant::Ghost);
+        return $action->emphasis(Emphasis::Ghost);
     }
 
     public function handle(Request $request): ActionResult

app/Actions/Settings/DeletePasskey.php

@@ -9,8 +9,7 @@
 use Lattice\Lattice\Actions\ActionResult;
 use Lattice\Lattice\Actions\Components\Action;
 use Lattice\Lattice\Attributes\AsAction;
-use Lattice\Lattice\Core\Enums\ButtonVariant;
-use Lattice\Lattice\Core\Enums\Variant;
+use Lattice\Lattice\Ui\Enums\Variant;
 
 #[AsAction('settings.passkeys.delete')]
 class DeletePasskey extends ActionDefinition
@@ -21,7 +20,7 @@ public function definition(Action $action): Action
     {
         return $action
             ->label(__('settings.passkeys.remove'))
-            ->variant(ButtonVariant::Destructive)
+            ->variant(Variant::Danger)
             ->confirm(
                 title: __('settings.passkeys.remove-confirm-title'),
                 description: __('settings.passkeys.remove-confirm-description'),
@@ -40,7 +39,7 @@ public function handle(Request $request): ActionResult
         $this->currentUser()->passkeys()->whereKey($this->context('passkey'))->delete();
 
         return ActionResult::success()
-            ->toast(Variant::Success, __('settings.passkeys.removed'))
+            ->toast(__('settings.passkeys.removed'))
             ->reloadComponent('settings.passkeys');
     }
 }

app/Actions/Settings/DisableTwoFactorAuthenticationAction.php

@@ -11,9 +11,8 @@
 use Lattice\Lattice\Actions\ActionResult;
 use Lattice\Lattice\Actions\Components\Action as ActionComponent;
 use Lattice\Lattice\Attributes\AsAction;
-use Lattice\Lattice\Core\Enums\ButtonVariant;
-use Lattice\Lattice\Core\Enums\HttpMethod;
-use Lattice\Lattice\Core\Enums\Variant;
+use Lattice\Lattice\Ui\Enums\HttpMethod;
+use Lattice\Lattice\Ui\Enums\Variant;
 
 #[AsAction('settings.two-factor.disable')]
 class DisableTwoFactorAuthenticationAction extends ActionDefinition
@@ -27,7 +26,7 @@ public function definition(ActionComponent $action): ActionComponent
         return $action
             ->label(__('settings.two-factor.disable'))
             ->method(HttpMethod::Post)
-            ->variant(ButtonVariant::Destructive)
+            ->variant(Variant::Danger)
             ->confirm(
                 title: __('settings.two-factor.disable-confirm-title'),
                 description: __('settings.two-factor.disable-confirm-description'),
@@ -44,7 +43,7 @@ public function handle(Request $request): ActionResult
         ($this->disable)($user);
 
         return ActionResult::success()
-            ->toast(Variant::Success, __('settings.two-factor.disabled-toast'))
+            ->toast(__('settings.two-factor.disabled-toast'))
             ->reloadPage();
     }
 }

app/Actions/Settings/EnableTwoFactorAuthenticationAction.php

@@ -11,8 +11,8 @@
 use Lattice\Lattice\Actions\ActionResult;
 use Lattice\Lattice\Actions\Components\Action as ActionComponent;
 use Lattice\Lattice\Attributes\AsAction;
-use Lattice\Lattice\Core\Enums\HttpMethod;
-use Lattice\Lattice\Core\Enums\Variant;
+use Lattice\Lattice\Ui\Enums\HttpMethod;
+use Lattice\Lattice\Ui\Enums\Variant;
 
 #[AsAction('settings.two-factor.enable')]
 class EnableTwoFactorAuthenticationAction extends ActionDefinition
@@ -37,7 +37,7 @@ public function handle(Request $request): ActionResult
         ($this->enable)($user);
 
         return ActionResult::success()
-            ->toast(Variant::Info, __('settings.two-factor.setup-started'))
+            ->toast(__('settings.two-factor.setup-started'), Variant::Info)
             ->openModal('settings.two-factor-setup');
     }
 }

app/Actions/Settings/RegenerateRecoveryCodesAction.php

@@ -11,9 +11,8 @@
 use Lattice\Lattice\Actions\ActionResult;
 use Lattice\Lattice\Actions\Components\Action as ActionComponent;
 use Lattice\Lattice\Attributes\AsAction;
-use Lattice\Lattice\Core\Enums\ButtonVariant;
-use Lattice\Lattice\Core\Enums\HttpMethod;
-use Lattice\Lattice\Core\Enums\Variant;
+use Lattice\Lattice\Ui\Enums\HttpMethod;
+use Lattice\Lattice\Ui\Enums\Variant;
 
 #[AsAction('settings.two-factor.regenerate-recovery-codes')]
 class RegenerateRecoveryCodesAction extends ActionDefinition
@@ -27,7 +26,7 @@ public function definition(ActionComponent $action): ActionComponent
         return $action
             ->label(__('settings.recovery-codes.regenerate'))
             ->method(HttpMethod::Post)
-            ->variant(ButtonVariant::Secondary)
+            ->variant(Variant::Secondary)
             ->confirm(
                 title: __('settings.recovery-codes.regenerate-confirm-title'),
                 description: __('settings.recovery-codes.regenerate-confirm-description'),
@@ -44,7 +43,7 @@ public function handle(Request $request): ActionResult
         ($this->generate)($user);
 
         return ActionResult::success()
-            ->toast(Variant::Success, __('settings.recovery-codes.regenerated'))
+            ->toast(__('settings.recovery-codes.regenerated'))
             ->reloadPage();
     }
 }

app/Actions/Settings/SendVerificationEmailAction.php

@@ -9,9 +9,9 @@
 use Lattice\Lattice\Actions\ActionResult;
 use Lattice\Lattice\Actions\Components\Action as ActionComponent;
 use Lattice\Lattice\Attributes\AsAction;
-use Lattice\Lattice\Core\Enums\ButtonVariant;
-use Lattice\Lattice\Core\Enums\HttpMethod;
-use Lattice\Lattice\Core\Enums\Variant;
+use Lattice\Lattice\Ui\Enums\Emphasis;
+use Lattice\Lattice\Ui\Enums\HttpMethod;
+use Lattice\Lattice\Ui\Enums\Variant;
 
 #[AsAction('settings.send-verification-email')]
 class SendVerificationEmailAction extends ActionDefinition
@@ -23,19 +23,19 @@ public function definition(ActionComponent $action): ActionComponent
         return $action
             ->label(__('settings.profile.resend-verification'))
             ->method(HttpMethod::Post)
-            ->variant(ButtonVariant::Link);
+            ->emphasis(Emphasis::Link);
     }
 
     public function handle(Request $request): ActionResult
     {
         $user = $this->currentUser();
 
         if ($user->hasVerifiedEmail()) {
-            return ActionResult::success()->toast(Variant::Info, __('settings.profile.already-verified'));
+            return ActionResult::success()->toast(__('settings.profile.already-verified'), Variant::Info);
         }
 
         $user->sendEmailVerificationNotification();
 
-        return ActionResult::success()->toast(Variant::Success, __('settings.profile.verification-sent'));
+        return ActionResult::success()->toast(__('settings.profile.verification-sent'));
     }
 }

app/Actions/Teams/CancelInvitation.php

@@ -10,9 +10,8 @@
 use Lattice\Lattice\Actions\ActionResult;
 use Lattice\Lattice\Actions\Components\Action;
 use Lattice\Lattice\Attributes\AsAction;
-use Lattice\Lattice\Core\Enums\ButtonVariant;
-use Lattice\Lattice\Core\Enums\HttpMethod;
-use Lattice\Lattice\Core\Enums\Variant;
+use Lattice\Lattice\Ui\Enums\HttpMethod;
+use Lattice\Lattice\Ui\Enums\Variant;
 
 #[AsAction('teams.invitations.cancel')]
 class CancelInvitation extends ActionDefinition
@@ -25,7 +24,7 @@ public function definition(Action $action): Action
         return $action
             ->label(__('teams.invitations.cancel'))
             ->method(HttpMethod::Delete)
-            ->variant(ButtonVariant::Destructive)
+            ->variant(Variant::Danger)
             ->confirm(
                 title: __('teams.invitations.cancel-confirm-title'),
                 description: __('teams.invitations.cancel-confirm-description'),
@@ -49,7 +48,7 @@ public function handle(Request $request): ActionResult
             ->delete();
 
         return ActionResult::success()
-            ->toast(Variant::Success, __('teams.invitations.cancelled'))
+            ->toast(__('teams.invitations.cancelled'))
             ->reloadComponent('teams.invitations');
     }
 }

app/Actions/Teams/RemoveMember.php

@@ -13,9 +13,8 @@
 use Lattice\Lattice\Actions\ActionResult;
 use Lattice\Lattice\Actions\Components\Action;
 use Lattice\Lattice\Attributes\AsAction;
-use Lattice\Lattice\Core\Enums\ButtonVariant;
-use Lattice\Lattice\Core\Enums\HttpMethod;
-use Lattice\Lattice\Core\Enums\Variant;
+use Lattice\Lattice\Ui\Enums\HttpMethod;
+use Lattice\Lattice\Ui\Enums\Variant;
 
 #[AsAction('teams.members.remove')]
 class RemoveMember extends ActionDefinition
@@ -28,7 +27,7 @@ public function definition(Action $action): Action
         return $action
             ->label(__('teams.members.remove'))
             ->method(HttpMethod::Delete)
-            ->variant(ButtonVariant::Destructive)
+            ->variant(Variant::Danger)
             ->confirm(
                 title: __('teams.members.remove-confirm-title'),
                 description: __('teams.members.remove-confirm-description'),
@@ -62,7 +61,7 @@ public function handle(Request $request): ActionResult
         }
 
         return ActionResult::success()
-            ->toast(Variant::Success, __('teams.members.removed'))
+            ->toast(__('teams.members.removed'))
             ->reloadComponent('teams.members');
     }
 }

app/Actions/Teams/SwitchTeam.php

@@ -10,7 +10,6 @@
 use Lattice\Lattice\Actions\ActionResult;
 use Lattice\Lattice\Actions\Components\Action;
 use Lattice\Lattice\Attributes\AsAction;
-use Lattice\Lattice\Core\Enums\Variant;
 
 #[AsAction('teams.switch')]
 class SwitchTeam extends ActionDefinition
@@ -36,7 +35,7 @@ public function handle(Request $request): ActionResult
         $this->currentUser()->switchTeam($team);
 
         return ActionResult::success()
-            ->toast(Variant::Success, __('teams.switch.switched', ['team' => $team->name]))
+            ->toast(__('teams.switch.switched', ['team' => $team->name]))
             ->toRoute('dashboard', ['current_team' => $team->slug]);
     }
 }

app/Actions/Teams/UpdateMemberRole.php

@@ -13,10 +13,9 @@
 use Lattice\Lattice\Actions\ActionResult;
 use Lattice\Lattice\Actions\Components\Action;
 use Lattice\Lattice\Attributes\AsAction;
-use Lattice\Lattice\Core\Enums\ButtonVariant;
-use Lattice\Lattice\Core\Enums\HttpMethod;
-use Lattice\Lattice\Core\Enums\Variant;
 use Lattice\Lattice\Forms\Components\Choice;
+use Lattice\Lattice\Ui\Enums\HttpMethod;
+use Lattice\Lattice\Ui\Enums\Variant;
 
 #[AsAction('teams.members.update')]
 class UpdateMemberRole extends ActionDefinition
@@ -29,7 +28,7 @@ public function definition(Action $action): Action
         return $action
             ->label(__('teams.members.change-role'))
             ->method(HttpMethod::Patch)
-            ->variant(ButtonVariant::Secondary)
+            ->variant(Variant::Secondary)
             ->form([
                 Choice::make('role', __('common.field.role'))
                     ->enum(TeamRole::assignableCases())
@@ -56,7 +55,7 @@ public function handle(Request $request): ActionResult
             ->update(['role' => TeamRole::from((string) $validated['role'])]);
 
         return ActionResult::success()
-            ->toast(Variant::Success, __('teams.members.role-updated'))
+            ->toast(__('teams.members.role-updated'))
             ->reloadComponent('teams.members');
     }
 }

app/Components/Auth/PasskeyVerify.php

@@ -3,8 +3,10 @@
 
 namespace App\Components\Auth;
 
-use Lattice\Lattice\Core\Components\Component;
+use Lattice\Lattice\Attributes\AsComponent;
+use Lattice\Lattice\Ui\Components\Component;
 
+#[AsComponent('auth.passkey-verify')]
 class PasskeyVerify extends Component
 {
     public string $optionsUrl;
@@ -46,9 +48,4 @@ public function separator(string $separator): static
 
         return $this;
     }
-
-    protected function type(): string
-    {
-        return 'auth.passkey-verify';
-    }
 }

app/Components/Settings/PasskeyRegistration.php

@@ -3,17 +3,14 @@
 
 namespace App\Components\Settings;
 
-use Lattice\Lattice\Core\Components\Component;
+use Lattice\Lattice\Attributes\AsComponent;
+use Lattice\Lattice\Ui\Components\Component;
 
+#[AsComponent('settings.passkey-registration')]
 class PasskeyRegistration extends Component
 {
     public static function make(): static
     {
         return new static;
     }
-
-    protected function type(): string
-    {
-        return 'settings.passkey-registration';
-    }
 }

app/Concerns/ResolvesTeamFromContext.php

@@ -1,43 +1,23 @@
 <?php
+
 declare(strict_types=1);
 
 namespace App\Concerns;
 
 use App\Models\Team;
+use Lattice\Lattice\Core\Concerns\ResolvesContextModels;
 
 trait ResolvesTeamFromContext
 {
+    use ResolvesContextModels;
+
     protected function teamFromContext(): Team
     {
-        return Team::where('slug', $this->contextString('team'))->firstOrFail();
+        return $this->contextModel('team', Team::class);
     }
 
     protected function optionalTeamFromContext(): ?Team
     {
-        $slug = $this->context('team');
-
-        if (! is_string($slug) || $slug === '') {
-            return null;
-        }
-
-        return Team::where('slug', $slug)->first();
-    }
-
-    protected function contextString(string $key): string
-    {
-        $value = $this->context($key);
-
-        abort_unless(is_string($value) && $value !== '', 404);
-
-        return $value;
-    }
-
-    protected function contextInt(string $key): int
-    {
-        $value = $this->context($key);
-
-        abort_unless(is_numeric($value), 404);
-
-        return (int) $value;
+        return $this->contextModelOrNull('team', Team::class);
     }
 }

app/Forms/Settings/ConfirmTwoFactorForm.php

@@ -8,7 +8,6 @@
 use Laravel\Fortify\Actions\ConfirmTwoFactorAuthentication;
 use Laravel\Fortify\Features;
 use Lattice\Lattice\Attributes\AsForm;
-use Lattice\Lattice\Core\Enums\Variant;
 use Lattice\Lattice\Forms\Components\Form;
 use Lattice\Lattice\Forms\Components\OtpInput;
 use Lattice\Lattice\Forms\FormDefinition;
@@ -41,6 +40,6 @@ public function handle(Request $request): LatticeResponse
 
         ($this->confirm)($user, (string) $request->input('code'));
 
-        return $this->toast(Variant::Success, __('settings.two-factor.enabled-toast'))->back();
+        return $this->toast(__('settings.two-factor.enabled-toast'))->back();
     }
 }