Merge Dev into Main

.github/workflows/build-and-deploy.yml

@@ -117,3 +117,7 @@ jobs:
       - name: Run Helm upgrade
         run: |
           helm upgrade --install klamm-app ./helm --set image.tag=${{ needs.build.outputs.image_tag }}
+
+      - name: Trigger OpenShift Rollout
+        run: |
+          oc rollout restart deployment/klamm-app

app/Console/Commands/CreateUser.php

@@ -27,24 +27,26 @@ public function handle()
         if ($user) {
             $this->info('User created successfully!');
 
-            // Fetch all available roles
-            $availableRoles = Role::pluck('name')->toArray();
-            if (empty($availableRoles)) {
-                $this->info('No roles available to assign.');
-                return;
-            }
-
-            $roles = $this->choice(
-                'Select roles for the user (comma-separated for multiple roles)',
-                $availableRoles,
-                null,
-                null,
-                true // Allow multiple selections
-            );
-
-            // Assign roles to the user
-            $user->syncRoles($roles);
-            $this->info('Roles assigned successfully!');
+            if ($this->confirm('Do you want to assign a role(s) to this user?', true)) {
+                // Fetch all available roles
+                $availableRoles = Role::pluck('name')->toArray();
+                if (empty($availableRoles)) {
+                    $this->info('No roles available to assign.');
+                    return;
+                }
+
+                $roles = $this->choice(
+                    'Select roles for the user (comma-separated for multiple roles)',
+                    $availableRoles,
+                    null,
+                    null,
+                    true // Allow multiple selections
+                );
+
+                // Assign roles to the user
+                $user->syncRoles($roles);
+                $this->info('Roles assigned successfully!');
+        }
         } else {
             $this->error('Failed to create user.');
         }

app/Filament/Admin/Resources/UserResource.php

@@ -3,7 +3,6 @@
 namespace App\Filament\Admin\Resources;
 
 use App\Filament\Admin\Resources\UserResource\Pages;
-use App\Filament\Admin\Resources\UserResource\RelationManagers;
 use App\Models\User;
 use Filament\Forms;
 use Filament\Forms\Form;
@@ -31,8 +30,8 @@ public static function form(Form $form): Form
                 Forms\Components\TextInput::make('password')
                     ->password()
                     ->maxLength(255)
-                    ->required(fn ($record) => $record === null)
-                    ->hidden(fn ($record) => $record !== null),
+                    ->required(fn($record) => $record === null)
+                    ->hidden(fn($record) => $record !== null),
                 Forms\Components\Select::make('roles')
                     ->multiple()
                     ->preload()
@@ -47,27 +46,19 @@ public static function table(Table $table): Table
                 Tables\Columns\TextColumn::make('name'),
                 Tables\Columns\TextColumn::make('email'),
             ])
-            ->filters([
-                //
-            ])
-            ->actions([
-                Tables\Actions\EditAction::make(),
-            ])
-            ->bulkActions([
-                //
-            ])
-            ->paginated([
-                10, 25, 50, 100,
-            ]);
+            ->filters([])
+            ->actions([])
+            ->bulkActions([])
+            ->paginated([10, 25, 50, 100]);
     }
 
     public static function getPages(): array
     {
         return [
             'index' => Pages\ListUsers::route('/'),
             'create' => Pages\CreateUser::route('/create'),
+            'view' => Pages\ViewUser::route('/{record}'),
             'edit' => Pages\EditUser::route('/{record}/edit'),
         ];
     }
 }
-

app/Filament/Admin/Resources/UserResource/Pages/ViewUser.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Filament\Admin\Resources\UserResource\Pages;
+
+use App\Filament\Admin\Resources\UserResource;
+use Filament\Actions;
+use Filament\Forms;
+use Filament\Resources\Pages\ViewRecord;
+use Illuminate\Support\Facades\Hash;
+use Filament\Notifications\Notification;
+
+class ViewUser extends ViewRecord
+{
+    protected static string $resource = UserResource::class;
+
+    protected function getHeaderActions(): array
+    {
+        return [
+            Actions\EditAction::make(),
+            Actions\Action::make('resetPassword')
+                ->label('Reset Password')
+                ->modalHeading('Reset User Password')
+                ->form([
+                    Forms\Components\TextInput::make('new_password')
+                        ->label('New Password')
+                        ->password()
+                        ->required(),
+                    Forms\Components\TextInput::make('confirm_password')
+                        ->label('Confirm Password')
+                        ->password()
+                        ->required()
+                        ->same('new_password'),
+                ])
+                ->action(function ($data) {
+                    $this->record->update([
+                        'password' => Hash::make($data['new_password']),
+                    ]);
+                    Notification::make()
+                        ->title("Password reset successfully!")
+                        ->success()
+                        ->send();
+                })
+                ->requiresConfirmation(),
+        ];
+    }
+}

app/Filament/Bre/Resources/DataValidationResource.php

@@ -64,6 +64,13 @@ public static function table(Table $table): Table
             ])
             ->defaultSort('name')
             ->filters([
+                Tables\Filters\SelectFilter::make('bre_validation_type')
+                    ->label('Value Type')
+                    ->multiple()
+                    ->searchable()
+                    ->preload()
+                    ->attribute(('bre_validation_type'))
+                    ->relationship('breValidationType', 'name'),
                 //
             ])
             ->actions([