From f1493c5139971e79d0bb41ad81ed24a650d37b8b Mon Sep 17 00:00:00 2001
From: notCharles <charles@pelican.dev>
Date: Fri, 10 May 2024 16:42:05 -0400
Subject: [PATCH] Fix creating api keys

---
 .../ApiKeyResource/Pages/CreateApiKey.php      | 18 ++++++------------
 .../ApiKeyResource/Pages/ListApiKeys.php       | 10 +++-------
 2 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/app/Filament/Resources/ApiKeyResource/Pages/CreateApiKey.php b/app/Filament/Resources/ApiKeyResource/Pages/CreateApiKey.php
index d39f63c4d..e8abde957 100644
--- a/app/Filament/Resources/ApiKeyResource/Pages/CreateApiKey.php
+++ b/app/Filament/Resources/ApiKeyResource/Pages/CreateApiKey.php
@@ -21,29 +21,25 @@ class CreateApiKey extends CreateRecord
                 Forms\Components\Hidden::make('identifier')->default(ApiKey::generateTokenIdentifier(ApiKey::TYPE_APPLICATION)),
                 Forms\Components\Hidden::make('token')->default(encrypt(str_random(ApiKey::KEY_LENGTH))),
 
-                Forms\Components\Select::make('user_id')
-                    ->hidden()
-                    ->searchable()
-                    ->preload()
-                    ->relationship('user', 'username')
+                Forms\Components\Hidden::make('user_id')
                     ->default(auth()->user()->id)
                     ->required(),
 
                 Forms\Components\Select::make('key_type')
+                    ->inlineLabel()
                     ->options(function (ApiKey $apiKey) {
                         $originalOptions = [
-                            ApiKey::TYPE_NONE => 'None',
+                            //ApiKey::TYPE_NONE => 'None',
                             ApiKey::TYPE_ACCOUNT => 'Account',
                             ApiKey::TYPE_APPLICATION => 'Application',
-                            ApiKey::TYPE_DAEMON_USER => 'Daemon User',
-                            ApiKey::TYPE_DAEMON_APPLICATION => 'Daemon Application',
+                            //ApiKey::TYPE_DAEMON_USER => 'Daemon User',
+                            //ApiKey::TYPE_DAEMON_APPLICATION => 'Daemon Application',
                         ];
 
                         return collect($originalOptions)
                             ->filter(fn ($value, $key) => $key <= ApiKey::TYPE_APPLICATION || $apiKey->key_type === $key)
                             ->all();
                     })
-                    ->hidden()
                     ->selectablePlaceholder(false)
                     ->required()
                     ->default(ApiKey::TYPE_APPLICATION),
@@ -56,7 +52,7 @@ class CreateApiKey extends CreateRecord
                     ])
                     ->schema(
                         collect(ApiKey::RESOURCES)->map(fn ($resource) => Forms\Components\ToggleButtons::make("r_$resource")
-                            ->label(str($resource)->replace('_', ' ')->title())
+                            ->label(str($resource)->replace('_', ' ')->title())->inline()
                             ->options([
                                 0 => 'None',
                                 1 => 'Read',
@@ -75,9 +71,7 @@ class CreateApiKey extends CreateRecord
                                 2 => 'danger',
                                 3 => 'danger',
                             ])
-                            ->inline()
                             ->required()
-                            ->disabledOn('edit')
                             ->columnSpan([
                                 'default' => 1,
                                 'sm' => 1,
diff --git a/app/Filament/Resources/ApiKeyResource/Pages/ListApiKeys.php b/app/Filament/Resources/ApiKeyResource/Pages/ListApiKeys.php
index 3d5c4b9a0..0932848eb 100644
--- a/app/Filament/Resources/ApiKeyResource/Pages/ListApiKeys.php
+++ b/app/Filament/Resources/ApiKeyResource/Pages/ListApiKeys.php
@@ -21,8 +21,8 @@ class ListApiKeys extends ListRecords
             ->searchable(false)
             ->columns([
                 Tables\Columns\TextColumn::make('user.username')
-                    ->searchable()
                     ->hidden()
+                    ->searchable()
                     ->sortable(),
 
                 Tables\Columns\TextColumn::make('key')
@@ -53,12 +53,8 @@ class ListApiKeys extends ListRecords
                 //
             ])
             ->actions([
-                Tables\Actions\EditAction::make(),
-            ])
-            ->bulkActions([
-                Tables\Actions\BulkActionGroup::make([
-                    Tables\Actions\DeleteBulkAction::make(),
-                ]),
+                Tables\Actions\DeleteAction::make(),
+                //Tables\Actions\EditAction::make()
             ]);
     }