poc/pds
1
0
Fork 1
Code Issues Pull Requests 12 Actions Packages Projects Releases Wiki Activity

Updated item code validation logic
All checks were successful
Scan for leaked secrets using Kingfisher / kingfisher-secrets-scan (push) Successful in 16s
Details

Browse Source
This commit is contained in:
dhanabalan
2026-11-03 15:30:18 +05:30
parent f3d1aab505
commit 8dd0fd597b
1 changed files with 38 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
app/Filament/Resources/LeakTestReadingResource.php
View File

@@ -14,6 +14,8 @@ use Filament\Forms\Components\Select;
use Filament\Forms\Components\TextInput; use Filament\Forms\Components\TextInput;
use Filament\Forms\Form; use Filament\Forms\Form;
use Filament\Forms\Get; use Filament\Forms\Get;
use Filament\Forms\Set;
use Filament\Notifications\Notification;
use Filament\Resources\Resource; use Filament\Resources\Resource;
use Filament\Tables; use Filament\Tables;
use Filament\Tables\Actions\ExportAction; use Filament\Tables\Actions\ExportAction;
@@ -21,8 +23,6 @@ use Filament\Tables\Filters\Filter;
use Filament\Tables\Table; use Filament\Tables\Table;
use Illuminate\Database\Eloquent\Builder; use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\SoftDeletingScope; use Illuminate\Database\Eloquent\SoftDeletingScope;
use Filament\Forms\Set;
use Filament\Notifications\Notification;
class LeakTestReadingResource extends Resource class LeakTestReadingResource extends Resource
{ {
@@ -85,77 +85,53 @@ class LeakTestReadingResource extends Resource
// ->minLength(6) // ->minLength(6)
->reactive() ->reactive()
->disabled(fn (Get $get) => ! empty($get('id')) && ! Filament::auth()->user()->hasRole('Super Admin')) ->disabled(fn (Get $get) => ! empty($get('id')) && ! Filament::auth()->user()->hasRole('Super Admin'))
// ->afterStateUpdated(function ($state, callable $set, callable $get) {
// $code = $get('item_code');
// $set('lsrCodeError', null);
// if (! $code) {
// $set('lsrCodeError', 'Scan the valid item code.');
// return;
// } else {
// if (strlen($code) < 6) {
// $set('lsrCodeError', 'Item code must be at least 6 digits.');
// return;
// } elseif (! ctype_alnum($code)) {
// $set('item_code', null);
// $set('lsrCodeError', 'Item code must contain only alpha-numeric characters!');
// return;
// } elseif (! preg_match('/^[a-zA-Z1-9][a-zA-Z0-9]{5,}$/', $code)) {
// $set('item_code', null);
// $set('lsrCodeError', "Item code should not begin with '0' or letter!");
// return;
// }
// $set('lsrCodeError', null);
// }
// })
->afterStateUpdated(function ($state, Set $set, Get $get, $livewire) { ->afterStateUpdated(function ($state, Set $set, Get $get, $livewire) {
if (blank($state)) { if (blank($state)) {
$set('item_code', null); $set('item_code', null);
$set('serial_number', null); $set('serial_number', null);
return;
}
$parts = explode('|', trim($state)); return;
}
$parts = explode('|', trim($state));
if (! preg_match('/^[^|]+\|[^|]+\|?$/', trim($state))) {
Notification::make()
->title('Invalid QR Format')
->body("Expected format: ItemCode|SerialNumber<br>Received Format '$state'")
->danger()
->send();
$set('item_code', null);
return;
} else {
$iCode = $parts[0];
if (strlen($parts[0]) < 6) {
if (! preg_match('/^[^|]+\|[^|]+\|?$/', trim($state))) {
Notification::make() Notification::make()
->title('Invalid QR Format') ->title('Invalid Item Code')
->body("Expected format: ItemCode|SerialNumber<br>Received Format '$state'") ->body("Item code '$iCode' should contain minimum 6 digits!")
->danger() ->danger()
->send(); ->send();
$set('item_code', null); $set('item_code', null);
return;
}
else{
$iCode = $parts[0];
if (strlen($parts[0]) > 6) {
Notification::make() return;
->title('Invalid Item Code') } elseif (! preg_match('/^[a-zA-Z0-9]+$/', $iCode)) {
->body("Item code '$iCode' should contain minimum 6 digits!") Notification::make()
->danger() ->title('Invalid Item Code')
->send(); ->body("Item code '$iCode' should contain alpha numeric values!")
$set('item_code', null); ->danger()
return; ->send();
} $set('item_code', null);
elseif(!preg_match('/^[a-zA-Z0-9]+$/', $iCode)){
Notification::make() return;
->title('Invalid Item Code') } else {
->body("Item code '$iCode' should contain alpha numeric values!")
->danger()
->send();
$set('item_code', null);
return;
}
$set('item_code', trim($parts[0])); $set('item_code', trim($parts[0]));
$set('serial_number', isset($parts[1]) ? trim($parts[1]) : null); $set('serial_number', isset($parts[1]) ? trim($parts[1]) : null);
// $set('test_status', 'P');
$livewire->dispatch('submit-leak-test-form'); $livewire->dispatch('submit-leak-test-form');
} }
}) }
})
->extraAttributes(fn ($get) => [ ->extraAttributes(fn ($get) => [
'class' => $get('lsrCodeError') ? 'border-red-500' : '', 'class' => $get('lsrCodeError') ? 'border-red-500' : '',
]) ])
@@ -212,7 +188,7 @@ class LeakTestReadingResource extends Resource
// $itemCode = $get('item_code'); // $itemCode = $get('item_code');
// $serialNumber = $get('serial_number'); // $serialNumber = $get('serial_number');
if (! $plantId) { //|| ! $itemCode || ! $serialNumber if (! $plantId) { // || ! $itemCode || ! $serialNumber
$set('test_status', null); $set('test_status', null);
return []; return [];