From 31e3c75bc953d44c0ba29cd650bdd3eedeb9da84 Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Wed, 11 Jun 2025 19:33:36 +0930
Subject: [PATCH] Enhancements to logic that makes form.select component

---
 .../components/attribute/widget/options.blade.php   |  2 +-
 resources/views/components/form/reset.blade.php     |  2 +-
 resources/views/components/form/select.blade.php    | 13 +++++++------
 3 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/resources/views/components/attribute/widget/options.blade.php b/resources/views/components/attribute/widget/options.blade.php
index cd903f31..7d01a557 100644
--- a/resources/views/components/attribute/widget/options.blade.php
+++ b/resources/views/components/attribute/widget/options.blade.php
@@ -38,7 +38,7 @@
 							</div>
 
 							<div class="modal-body">
-								<x-form.select id="newoc" label="Select from..."/>
+								<x-form.select id="newoc" name="newoc" :label="__('Select from').'...'"/>
 							</div>
 
 							<div class="modal-footer">
diff --git a/resources/views/components/form/reset.blade.php b/resources/views/components/form/reset.blade.php
index 62fc4587..b3e3d7b2 100644
--- a/resources/views/components/form/reset.blade.php
+++ b/resources/views/components/form/reset.blade.php
@@ -1,4 +1,4 @@
-<button id="form-reset" class="btn btn-outline-danger">@lang('Reset')</button>
+<button id="form-reset" class="btn btn-sm btn-outline-danger">@lang('Reset')</button>
 
 @section('page-scripts')
 	<script>
diff --git a/resources/views/components/form/select.blade.php b/resources/views/components/form/select.blade.php
index 1a18c557..4d6dd4fc 100644
--- a/resources/views/components/form/select.blade.php
+++ b/resources/views/components/form/select.blade.php
@@ -2,27 +2,28 @@
 	@isset($name)
 		<input type="hidden" id="{{ $id ?? $name }}_disabled" name="{{ $name }}" value="" disabled>
 	@endisset
-	<select class="form-select @isset($name)@error((! empty($old)) ? $old : ($id ?? $name)) is-invalid @enderror @endisset" id="{{ $id ?? $name }}" @isset($name)name="{{ $name }}"@endisset @required(isset($required) && $required) @disabled(isset($disabled) && $disabled)>
-		@if((empty($value) && ! empty($options)) || isset($addnew) || isset($choose))
+
+	<select class="form-select @error($old ?? $id ?? $name) is-invalid @enderror" id="{{ $id ?? $name}}" @isset($name)name="{{ $name }}"@endisset @required($required ?? FALSE) @disabled($disabled ?? FALSE)>
+		@if((empty($value) && ! empty($options)) || isset($addnew))
 			<option value=""></option>
+
 			@isset($addnew)
 				<option value="new">{{ $addnew ?: 'Add New' }}</option>
 			@endisset
 		@endif
-
 		@isset($options)
 			@empty($groupby)
 				@foreach($options as $option)
 					@continue(! Arr::get($option,'value'))
-					<option value="{{ Arr::get($option,'id') }}" @selected(isset($name) && (Arr::get($option,'id') == old($old ?? $name,$value ?? '')))>{{ Arr::get($option,'value') }}</option>
+					<option value="{{ Arr::get($option,'id') }}" @selected(Arr::get($option,'id') == collect(old())->dot()->get(isset($old) ? $old.'.0' : ($id ?? $name)))>{{ Arr::get($option,'value') }}</option>
 				@endforeach
 
 			@else
 				@foreach($options->groupBy($groupby) as $group)
-					<optgroup label="{{ $groupby == 'active' ? (Arr::get($group->first(),$groupby) ? 'Active' : 'Not Active') : Arr::get($group->first(),$groupby) }}">
+					<optgroup label="{{ Arr::get($group->first(),$groupby) }}">
 						@foreach($group as $option)
 							@continue(! Arr::get($option,'value'))
-							<option value="{{ Arr::get($option,'id') }}" @selected(isset($name) && (Arr::get($option,'id') == old($old ?? $name,$value ?? '')))>{{ Arr::get($option,'value') }}</option>
+							<option value="{{ Arr::get($option,'id') }}" @selected(Arr::get($option,'id') == collect(old())->dot()->get(isset($old) ? $old.'.0' : ($id ?? $name)))>{{ Arr::get($option,'value') }}</option>
 						@endforeach
 					</optgroup>
 				@endforeach