From 2d9a5b9fad60488efebb811afd47341e87025044 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Mon, 25 Nov 2024 14:43:27 -0800
Subject: [PATCH 01/28] Add textarea component

---
 resources/views/blade/input/textarea.blade.php | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 resources/views/blade/input/textarea.blade.php

diff --git a/resources/views/blade/input/textarea.blade.php b/resources/views/blade/input/textarea.blade.php
new file mode 100644
index 000000000000..ba203271b137
--- /dev/null
+++ b/resources/views/blade/input/textarea.blade.php
@@ -0,0 +1,16 @@
+@props([
+    'name',
+    // use name if id is not provided
+    'id' => $id ?? $name,
+    'value' => '',
+    'cols' => 50,
+    'rows' => 10,
+])
+
+<textarea
+    {{ $attributes->merge(['class' => 'form-control']) }}
+    name="{{ $name }}"
+    id="{{ $id }}"
+    cols="{{ $cols }}"
+    rows="{{ $rows }}"
+>{{ $value }}</textarea>

From 6ba467b3f15e92fbfddcc8c3bb7ee5bc0432ad67 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Mon, 25 Nov 2024 14:43:49 -0800
Subject: [PATCH 02/28] Replace branding and eula textareas with new component

---
 resources/views/settings/branding.blade.php | 8 ++++----
 resources/views/settings/general.blade.php  | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php
index c586917ef534..19841ec416e3 100644
--- a/resources/views/settings/branding.blade.php
+++ b/resources/views/settings/branding.blade.php
@@ -233,11 +233,11 @@
                             </div>
                             <div class="col-md-9">
                                 @if (config('app.lock_passwords')===true)
-                                    {{ Form::textarea('custom_css', old('custom_css', $setting->custom_css), array('class' => 'form-control','placeholder' => 'Add your custom CSS','disabled'=>'disabled', 'aria-label'=>'custom_css')) }}
+                                    <x-input.textarea name="custom_css" :value="old('custom_css', $setting->custom_css)" placeholder="Add your custom CSS" aria-label="custom_css" disabled/>
                                     {!! $errors->first('custom_css', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                                     <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
                                 @else
-                                    {{ Form::textarea('custom_css', old('custom_css', $setting->custom_css), array('class' => 'form-control','placeholder' => 'Add your custom CSS', 'aria-label'=>'custom_css')) }}
+                                    <x-input.textarea name="custom_css" :value="old('custom_css', $setting->custom_css)" placeholder="Add your custom CSS" aria-label="custom_css"/>
                                     {!! $errors->first('custom_css', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                                 @endif
                                 <p class="help-block">{!! trans('admin/settings/general.custom_css_help') !!}</p>
@@ -289,10 +289,10 @@
                             </div>
                             <div class="col-md-9">
                                 @if (config('app.lock_passwords')===true)
-                                    {{ Form::textarea('footer_text', old('footer_text', $setting->footer_text), array('class' => 'form-control', 'rows' => '4', 'placeholder' => 'Optional footer text','disabled'=>'disabled')) }}
+                                    <x-input.textarea name="footer_text" :value="old('footer_text', $setting->footer_text)" rows="4" placeholder="Optional footer text" disabled/>
                                     <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
                                 @else
-                                    {{ Form::textarea('footer_text', old('footer_text', $setting->footer_text), array('class' => 'form-control','rows' => '4','placeholder' => 'Optional footer text')) }}
+                                    <x-input.textarea name="footer_text" :value="old('footer_text', $setting->footer_text)" rows="4" placeholder="Optional footer text"/>
                                 @endif
                                 <p class="help-block">{!! trans('admin/settings/general.footer_text_help') !!}</p>
                                 {!! $errors->first('footer_text', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php
index 17c0a8ec81db..536f4cc4b3e6 100644
--- a/resources/views/settings/general.blade.php
+++ b/resources/views/settings/general.blade.php
@@ -208,7 +208,7 @@
                            {{ Form::label('default_eula_text', trans('admin/settings/general.default_eula_text')) }}
                        </div>
                        <div class="col-md-9">
-                           {{ Form::textarea('default_eula_text', old('default_eula_text', $setting->default_eula_text), array('class' => 'form-control','placeholder' => 'Add your default EULA text')) }}
+                           <x-input.textarea name="default_eula_text" :value="old('default_eula_text', $setting->default_eula_text)" placeholder="Add your default EULA text"/>
                            {!! $errors->first('default_eula_text', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                            <p class="help-block">{{ trans('admin/settings/general.default_eula_help_text') }}</p>
                            <p class="help-block">{!! trans('admin/settings/general.eula_markdown') !!}</p>

From 80205275b3a3e5f1fa8bbae48ed30904c364590b Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Mon, 25 Nov 2024 15:09:37 -0800
Subject: [PATCH 03/28] Convert a couple more templates

---
 resources/views/custom_fields/fields/edit.blade.php   | 2 +-
 resources/views/livewire/category-edit-form.blade.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php
index 12c3a3fb735e..97937ee48ddd 100644
--- a/resources/views/custom_fields/fields/edit.blade.php
+++ b/resources/views/custom_fields/fields/edit.blade.php
@@ -70,7 +70,7 @@
               {{ trans('admin/custom_fields/general.field_values') }}
             </label>
             <div class="col-md-8 required">
-              {!! Form::textarea('field_values', old('name', $field->field_values), ['style' => 'width: 100%', 'rows' => 4, 'class' => 'form-control', 'aria-label'=>'field_values']) !!}
+                <x-input.textarea name="field_values" :value="old('field_values', $field->field_values)" style="width: 100%" rows="4" aria-label="field_values"/>
               {!! $errors->first('field_values', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
               <p class="help-block">{{ trans('admin/custom_fields/general.field_values_help') }}</p>
             </div>
diff --git a/resources/views/livewire/category-edit-form.blade.php b/resources/views/livewire/category-edit-form.blade.php
index cb80eb45d3d8..643a14049949 100644
--- a/resources/views/livewire/category-edit-form.blade.php
+++ b/resources/views/livewire/category-edit-form.blade.php
@@ -3,7 +3,7 @@
     <div class="form-group {{ $errors->has('eula_text') ? 'error' : '' }}">
         <label for="eula_text" class="col-md-3 control-label">{{ trans('admin/categories/general.eula_text') }}</label>
         <div class="col-md-7">
-            {{ Form::textarea('eula_text', null, ['wire:model.live' => 'eulaText', 'class' => 'form-control', 'aria-label'=>'eula_text', 'disabled' => $this->eulaTextDisabled]) }}
+            <x-input.textarea name="eula_text" wire:model.live="eulaText" aria-label="eula_text" :disabled="$this->eulaTextDisabled" />
             <p class="help-block">{!! trans('admin/categories/general.eula_text_help') !!} </p>
             <p class="help-block">{!! trans('admin/settings/general.eula_markdown') !!} </p>
             {!! $errors->first('eula_text', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}

From c35f70b4c7201a11f2bd23a83b9c37bfdaef4305 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Mon, 25 Nov 2024 15:27:57 -0800
Subject: [PATCH 04/28] Convert textarea in ldap settings

---
 resources/views/settings/ldap.blade.php | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/resources/views/settings/ldap.blade.php b/resources/views/settings/ldap.blade.php
index 5b483f48a2ea..b08e75d57c91 100644
--- a/resources/views/settings/ldap.blade.php
+++ b/resources/views/settings/ldap.blade.php
@@ -174,7 +174,12 @@
                                 {{ Form::label('ldap_client_tls_key', trans('admin/settings/general.ldap_client_tls_key')) }}
                             </div>
                             <div class="col-md-8">
-                                {{ Form::textarea('ldap_client_tls_key', old('ldap_client_tls_key', $setting->ldap_client_tls_key), ['class' => 'form-control','placeholder' =>  trans('general.example') .'-----BEGIN RSA PRIVATE KEY-----'."\r\n1234567890\r\n-----END RSA PRIVATE KEY-----"]) }}
+                                <x-input.textarea
+                                    name="ldap_client_tls_key"
+                                    value="{{ old('ldap_client_tls_key', $setting->ldap_client_tls_key) }}"
+                                    :placeholder="sprintf('%s-----BEGIN RSA PRIVATE KEY-----%s1234567890%s-----END RSA PRIVATE KEY-----', trans('general.example'), PHP_EOL, PHP_EOL)"
+                                />
+
                                 @error('ldap_client_tls_key')
                                     <span class="alert-msg">
                                          <x-icon type="x" />
@@ -197,7 +202,11 @@
                                 {{ Form::label('ldap_client_tls_cert', trans('admin/settings/general.ldap_client_tls_cert')) }}
                             </div>
                             <div class="col-md-8">
-                                {{ Form::textarea('ldap_client_tls_cert', old('ldap_client_tls_cert', $setting->ldap_client_tls_cert), ['class' => 'form-control','placeholder' =>  trans('general.example') .'-----BEGIN CERTIFICATE-----'."\r\n1234567890\r\n-----END CERTIFICATE-----"]) }}
+                                <x-input.textarea
+                                    name="ldap_client_tls_cert"
+                                    value="{{ old('ldap_client_tls_cert', $setting->ldap_client_tls_cert) }}"
+                                    :placeholder="sprintf('%s-----BEGIN CERTIFICATE-----%s1234567890%s-----END CERTIFICATE-----', trans('general.example'), PHP_EOL, PHP_EOL)"
+                                />
                                 <p class="help-block">{{ trans('admin/settings/general.ldap_client_tls_cert_help') }}</p>
                                 @error('ldap_client_tls_cert')
                                     <span class="alert-msg">

From 6af8412f63df4507c936d4830feea242defe81f9 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Mon, 25 Nov 2024 16:46:28 -0800
Subject: [PATCH 05/28] Convert textarea in saml settings

---
 resources/views/settings/saml.blade.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/views/settings/saml.blade.php b/resources/views/settings/saml.blade.php
index 9349023fc814..3beb639c1536 100644
--- a/resources/views/settings/saml.blade.php
+++ b/resources/views/settings/saml.blade.php
@@ -83,7 +83,7 @@
                                     <!-- SAML SP Certificate -->
                                     @if (!empty($setting->saml_sp_x509cert))
                                         {{ Form::label('saml_sp_x509cert', trans('admin/settings/general.saml_sp_x509cert')) }}
-                                        {{ Form::textarea('saml_sp_x509cert', $setting->saml_sp_x509cert, ['class' => 'form-control', 'wrap' => 'off', 'readonly']) }}
+                                        <x-input.textarea name="saml_sp_x509cert" :value="$setting->saml_sp_x509cert" wrap="off" readonly/>
                                         <br>
                                     @endif
                                     <!-- SAML SP Metadata URL -->
@@ -106,7 +106,7 @@
                             {{ Form::label('saml_idp_metadata', trans('admin/settings/general.saml_idp_metadata')) }}
                         </div>
                         <div class="col-md-9">
-                            {{ Form::textarea('saml_idp_metadata', old('saml_idp_metadata', $setting->saml_idp_metadata), ['class' => 'form-control','placeholder' => 'https://example.com/idp/metadata', 'wrap' => 'off', $setting->demoMode]) }}
+                            <x-input.textarea name="saml_idp_metadata" :value="old('saml_idp_metadata', $setting->saml_idp_metadata)" placeholder="https://example.com/idp/metadata" wrap="off"/>
                             {!! $errors->first('saml_idp_metadata', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}<br>
                             <button type="button" class="btn btn-default" id="saml_idp_metadata_upload_btn" {{ $setting->demoMode }}>{{ trans('button.select_file') }}</button>
                             <input type="file" class="js-uploadFile" id="saml_idp_metadata_upload"
@@ -166,7 +166,7 @@
                             {{ Form::label('saml_custom_settings', trans('admin/settings/general.saml_custom_settings')) }}
                         </div>
                         <div class="col-md-9">
-                            {{ Form::textarea('saml_custom_settings', old('saml_custom_settings', $setting->saml_custom_settings), ['class' => 'form-control','placeholder' => 'example.option=false&#13;&#10;sp_x509cert=file:///...&#13;&#10;sp_private_key=file:///', 'wrap' => 'off', $setting->demoMode]) }}
+                            <x-input.textarea name="saml_custom_settings" :value="old('saml_custom_settings', $setting->saml_custom_settings)" placeholder="example.option=false&#13;&#10;sp_x509cert=file:///...&#13;&#10;sp_private_key=file:///" wrap="off"/>
                             <p class="help-block">{{ trans('admin/settings/general.saml_custom_settings_help') }}</p>
                             {!! $errors->first('saml_custom_settings', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                         </div>

From 07b5544243d79cef13c18b503f3673428257c37e Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Mon, 25 Nov 2024 17:21:20 -0800
Subject: [PATCH 06/28] Convert textarea in upload modal

---
 resources/views/modals/upload-file.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/modals/upload-file.blade.php b/resources/views/modals/upload-file.blade.php
index c5816bf175f4..184110fb0f80 100644
--- a/resources/views/modals/upload-file.blade.php
+++ b/resources/views/modals/upload-file.blade.php
@@ -31,7 +31,7 @@
                     </div>
 
                     <div class="col-md-12">
-                        {{ Form::textarea('notes', old('notes', old('notes')), ['class' => 'form-control','placeholder' => 'Notes (Optional)', 'rows'=>3, 'aria-label' => 'file']) }}
+                        <x-input.textarea name="notes" :value="old('notes')" placeholder="Notes (Optional)" rows="3" aria-label="file"/>
                     </div>
                 </div>
 

From b6f8ac42c423c2feb5660b33851ed136c7fe41be Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 26 Nov 2024 14:30:33 -0800
Subject: [PATCH 07/28] Convert some selects

---
 resources/views/blade/input/select.blade.php     | 16 ++++++++++++++++
 resources/views/categories/edit.blade.php        |  9 ++++++++-
 .../views/custom_fields/fieldsets/view.blade.php |  8 ++++++--
 resources/views/hardware/checkin.blade.php       | 10 ++++++++--
 resources/views/statuslabels/edit.blade.php      |  8 +++++++-
 5 files changed, 45 insertions(+), 6 deletions(-)
 create mode 100644 resources/views/blade/input/select.blade.php

diff --git a/resources/views/blade/input/select.blade.php b/resources/views/blade/input/select.blade.php
new file mode 100644
index 000000000000..7bcb11fd99f2
--- /dev/null
+++ b/resources/views/blade/input/select.blade.php
@@ -0,0 +1,16 @@
+@props([
+    'items',
+    'selected' => null,
+    'includeEmpty' => false,
+])
+
+<select
+    {{ $attributes->merge(['class' => 'select2']) }}
+>
+    @if($includeEmpty)
+        <option value="" selected="selected"></option>
+    @endif
+    @foreach($items as $key => $value)
+        <option value="{{ $key }}" @selected($selected === $key)>{{ $value }}</option>
+    @endforeach
+</select>
diff --git a/resources/views/categories/edit.blade.php b/resources/views/categories/edit.blade.php
index 1ef3b7aa6a8d..ba772f25bb8e 100755
--- a/resources/views/categories/edit.blade.php
+++ b/resources/views/categories/edit.blade.php
@@ -15,7 +15,14 @@
 <div class="form-group {{ $errors->has('category_type') ? ' has-error' : '' }}">
     <label for="category_type" class="col-md-3 control-label">{{ trans('general.type') }}</label>
     <div class="col-md-7 required">
-        {{ Form::select('category_type', $category_types , old('category_type', $item->category_type), array('class'=>'select2', 'style'=>'min-width:350px', 'aria-label'=>'category_type', ($item->category_type!='') || ($item->itemCount() > 0) ? 'disabled' : '')) }}
+        <x-input.select
+            name="category_type"
+            :items="$category_types"
+            :selected="old('category_type', $item->category_type)"
+            style="min-width:350px"
+            aria-label="category_type"
+            :disabled="$item->category_type!='' || $item->itemCount() > 0"
+        />
         {!! $errors->first('category_type', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
     <div class="col-md-7 col-md-offset-3">
diff --git a/resources/views/custom_fields/fieldsets/view.blade.php b/resources/views/custom_fields/fieldsets/view.blade.php
index b73ae708c669..0c608a8303a9 100644
--- a/resources/views/custom_fields/fieldsets/view.blade.php
+++ b/resources/views/custom_fields/fieldsets/view.blade.php
@@ -98,8 +98,12 @@
                   <label for="field_id" class="sr-only">
                     {{ trans('admin/custom-field/general.add_field_to_fieldset')}}
                   </label>
-                  {{ Form::select("field_id",$custom_fields_list,"",['aria-label'=>'field_id', 'class'=>'select2', 'style' => 'min-width:400px;']) }}
-
+                  <x-input.select
+                    name="field_id"
+                    :items="$custom_fields_list"
+                    style="min-width:400px"
+                    aria-label="field_id"
+                  />
                 </div>
 
                 <div class="form-group" style="display: none;">
diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php
index 5686e74dd40e..6326bf5f8976 100755
--- a/resources/views/hardware/checkin.blade.php
+++ b/resources/views/hardware/checkin.blade.php
@@ -84,7 +84,13 @@
                                                 {{ trans('admin/hardware/form.status') }}
                                             </label>
                                             <div class="col-md-8 required">
-                                                {{ Form::select('status_id', $statusLabel_list, '', array('class'=>'select2', 'style'=>'width:100%','id' =>'modal-statuslabel_types', 'aria-label'=>'status_id')) }}
+                                                <x-input.select
+                                                    name="status_id"
+                                                    :items="$statusLabel_list"
+                                                    id="modal-statuslabel_types"
+                                                    style="width: 100%"
+                                                    aria-label="status_id"
+                                                />
                                                 {!! $errors->first('status_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                                             </div>
                                         </div>
@@ -142,4 +148,4 @@
         </div>
     </div>
 
-@stop
\ No newline at end of file
+@stop
diff --git a/resources/views/statuslabels/edit.blade.php b/resources/views/statuslabels/edit.blade.php
index af69f35de81e..4843b5046c0c 100755
--- a/resources/views/statuslabels/edit.blade.php
+++ b/resources/views/statuslabels/edit.blade.php
@@ -27,7 +27,13 @@
         {{ trans('admin/statuslabels/table.status_type') }}
     </label>
     <div class="col-md-7 required">
-        {{ Form::select('statuslabel_types', $statuslabel_types, $item->getStatuslabelType(), array('class'=>'select2', 'style'=>'width: 100%; min-width:400px', 'aria-label'=>'statuslabel_types')) }}
+        <x-input.select
+            name="statuslabel_types"
+            :items="$statuslabel_types"
+            :selected="$item->getStatuslabelType()"
+            style="width: 100%; min-width:400px"
+            aria-label="statuslabel_types"
+        />
         {!! $errors->first('statuslabel_types', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>

From 447bb40a472671bd2cfe6001d857ec0375b92531 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 26 Nov 2024 14:47:35 -0800
Subject: [PATCH 08/28] Convert selects on branding settings page

---
 resources/views/settings/branding.blade.php | 47 ++++++++++++++++++---
 1 file changed, 42 insertions(+), 5 deletions(-)

diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php
index 19841ec416e3..5bae1452b4f9 100644
--- a/resources/views/settings/branding.blade.php
+++ b/resources/views/settings/branding.blade.php
@@ -67,7 +67,14 @@
                                  {{ Form::label('brand', trans('admin/settings/general.web_brand')) }}
                             </div>
                             <div class="col-md-9">
-                                {!! Form::select('brand', array('1'=>'Text','2'=>'Logo','3'=>'Logo + Text'), old('brand', $setting->brand), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!}
+                                <x-input.select
+                                    class="form-control"
+                                    name="brand"
+                                    id="brand"
+                                    :items="['1'=>'Text','2'=>'Logo','3'=>'Logo + Text']"
+                                    :selected="old('brand', $setting->brand)"
+                                    style="width: 150px"
+                                />
                                 {!! $errors->first('brand', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                             </div>
                         </div>
@@ -252,10 +259,25 @@
                             </div>
                             <div class="col-md-9">
                                 @if (config('app.lock_passwords')===true)
-                                    {!! Form::select('support_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), old('support_footer', $setting->support_footer), ['class' => 'form-control select2 disabled', 'style'=>'width: 150px ;', 'disabled' => 'disabled']) !!}
+                                    <x-input.select
+                                        name="support_footer"
+                                        id="support_footer"
+                                        :items="['on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only']"
+                                        :selected="old('support_footer', $setting->support_footer)"
+                                        class="form-control disabled"
+                                        style="width: 150px"
+                                        disabled
+                                    />
                                     <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
                                 @else
-                                    {!! Form::select('support_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), old('support_footer', $setting->support_footer), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!}
+                                    <x-input.select
+                                        name="support_footer"
+                                        id="support_footer"
+                                        :items="['on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only']"
+                                        :selected="old('support_footer', $setting->support_footer)"
+                                        class="form-control"
+                                        style="width: 150px"
+                                    />
                                 @endif
 
 
@@ -271,10 +293,25 @@
                             </div>
                             <div class="col-md-9">
                                 @if (config('app.lock_passwords')===true)
-                                    {!! Form::select('version_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), old('version_footer', $setting->version_footer), ['class' => 'form-control select2 disabled', 'style'=>'width: 150px ;', 'disabled' => 'disabled']) !!}
+                                    <x-input.select
+                                        name="version_footer"
+                                        id="version_footer"
+                                        :items="['on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only']"
+                                        :selected="old('version_footer', $setting->version_footer)"
+                                        class="form-control disabled"
+                                        style="width: 150px"
+                                        disabled
+                                    />
                                     <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
                                 @else
-                                    {!! Form::select('version_footer', array('on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only'), old('version_footer', $setting->version_footer), array('class' => 'form-control select2', 'style'=>'width: 150px ;')) !!}
+                                    <x-input.select
+                                        name="version_footer"
+                                        id="version_footer"
+                                        :items="['on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only']"
+                                        :selected="old('version_footer', $setting->version_footer)"
+                                        class="form-control"
+                                        style="width: 150px"
+                                    />
                                 @endif
 
                                 <p class="help-block">{{ trans('admin/settings/general.version_footer_help') }}</p>

From f80b2716f002e1dc3d00ed6efa9c1c53a349963c Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 26 Nov 2024 15:55:47 -0800
Subject: [PATCH 09/28] Convert selects on general settings page

---
 resources/views/settings/general.blade.php | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php
index 536f4cc4b3e6..ef5f07909cce 100644
--- a/resources/views/settings/general.blade.php
+++ b/resources/views/settings/general.blade.php
@@ -342,9 +342,12 @@
                                               trans('general.pie_chart_type')) }}
                            </div>
                            <div class="col-md-9">
-                               {{ Form::select('dash_chart_type', array(
-                                   'name' => 'Status Label Name',
-                                   'type' => 'Status Label Type'), old('dash_chart_type', $setting->dash_chart_type), ['class' =>'select2', 'style' => 'width: 80%']) }}
+                               <x-input.select
+                                   name="dash_chart_type"
+                                   :items="['name' => 'Status Label Name', 'type' => 'Status Label Type']"
+                                   :selected="old('dash_chart_type', $setting->dash_chart_type)"
+                                   style="width: 80%"
+                               />
                            </div>
                        </div>
 
@@ -355,11 +358,13 @@
                                 {{ Form::label('depreciation_method', trans('Depreciation method')) }}
                            </div>
                            <div class="col-md-9">
-                               {{ Form::select('depreciation_method', array(
-                                    'default' => 'Linear (default)', 
-                                    'half_1' => 'Half-year convention, always applied', 
-                                    'half_2' => 'Half-year convention, applied with condition', 
-                                ), old('username_format', $setting->depreciation_method), ['class' =>'select2', 'style' => 'width: 80%']) }}
+                               <x-input.select
+                                   name="depreciation_method"
+                                   id="depreciation_method"
+                                   :items="['default' => 'Linear (default)', 'half_1' => 'Half-year convention, always applied', 'half_2' => 'Half-year convention, applied with condition']"
+                                   :selected="old('depreciation_method', $setting->depreciation_method)"
+                                   style="width: 80%"
+                               />
                            </div>
                        </div>
                        <!-- /.form-group -->

From 8ad3ec56eab76cef88416af9fd368608e3d307e8 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 3 Dec 2024 14:10:07 -0800
Subject: [PATCH 10/28] Convert additional selects

---
 .../views/custom_fields/fields/edit.blade.php |  9 ++++++-
 resources/views/hardware/bulk.blade.php       |  8 +++++-
 resources/views/hardware/checkout.blade.php   |  8 +++++-
 resources/views/settings/labels.blade.php     | 27 ++++++++++++++++---
 4 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php
index 97937ee48ddd..558231b9d282 100644
--- a/resources/views/custom_fields/fields/edit.blade.php
+++ b/resources/views/custom_fields/fields/edit.blade.php
@@ -88,7 +88,14 @@
               }
               @endphp
             <div class="col-md-8 required">
-              {{ Form::select("format",Helper::predefined_formats(), ($field_format == '') ? $field->format : $field_format, array('class'=>'format select2 form-control', 'aria-label'=>'format', 'style' => 'width:100%;')) }}
+              <x-input.select
+                class="format form-control"
+                name="format"
+                :items="Helper::predefined_formats()"
+                :selected="($field_format == '') ? $field->format : $field_format"
+                style="width:100%"
+                aria-label="format"
+              />
               {!! $errors->first('format', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
             </div>
           </div>
diff --git a/resources/views/hardware/bulk.blade.php b/resources/views/hardware/bulk.blade.php
index cc44993af50a..05f5b517c0d6 100755
--- a/resources/views/hardware/bulk.blade.php
+++ b/resources/views/hardware/bulk.blade.php
@@ -125,7 +125,13 @@
               {{ trans('admin/hardware/form.status') }}
             </label>
             <div class="col-md-7">
-              {{ Form::select('status_id', $statuslabel_list , old('status_id'), array('class'=>'select2', 'style'=>'width:100%', 'aria-label'=>'status_id')) }}
+              <x-input.select
+                name="status_id"
+                :items="$statuslabel_list"
+                :selected="old('status_id')"
+                style="width: 100%"
+                aria-label="status_id"
+              />
               <p class="help-block">{{ trans('general.status_compatibility') }}</p>
               {!! $errors->first('status_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
             </div>
diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php
index 943b4ba79810..6e01c9aa655c 100755
--- a/resources/views/hardware/checkout.blade.php
+++ b/resources/views/hardware/checkout.blade.php
@@ -82,7 +82,13 @@
                                 {{ trans('admin/hardware/form.status') }}
                             </label>
                             <div class="col-md-7 required">
-                                {{ Form::select('status_id', $statusLabel_list, $asset->status_id, array('class'=>'select2', 'style'=>'width:100%','', 'aria-label'=>'status_id')) }}
+                                <x-input.select
+                                    name="status_id"
+                                    :items="$statusLabel_list"
+                                    :selected="$asset->status_id"
+                                    style="width: 100%;"
+                                    aria-label="status_id"
+                                />
                                 {!! $errors->first('status_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                             </div>
                         </div>
diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index 33640edbf28a..db20efc0cfa3 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -156,7 +156,14 @@ class="table table-striped snipe-table"
                                              'none'    => trans('admin/settings/general.none'),
                                         ];
                                     @endphp
-                                    {{ Form::select('label2_1d_type', $select1DValues, old('label2_1d_type', $setting->label2_1d_type), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_1d_type' ]) }}
+                                    <x-input.select
+                                        class="col-md-4"
+                                        name="label2_1d_type"
+                                        id="label2_1d_type"
+                                        :items="$select1DValues"
+                                        :selected="old('label2_1d_type', $setting->label2_1d_type)"
+                                        aria-label="label2_1d_type"
+                                    />
                                     {!! $errors->first('label2_1d_type', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                                     <p class="help-block">
                                         {{ trans('admin/settings/general.label2_1d_type_help') }}.
@@ -184,7 +191,14 @@ class="table table-striped snipe-table"
                                             'none'       => trans('admin/settings/general.none'),
                                         ];
                                     @endphp
-                                    {{ Form::select('label2_2d_type', $select2DValues, old('label2_2d_type', $setting->label2_2d_type), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_2d_type' ]) }}
+                                    <x-input.select
+                                        class="col-md-4"
+                                        name="label2_2d_type"
+                                        id="label2_2d_type"
+                                        :items="$select2DValues"
+                                        :selected="old('label2_2d_type', $setting->label2_2d_type)"
+                                        aria-label="label2_2d_type"
+                                    />
                                     {!! $errors->first('label2_2d_type', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                                     <p class="help-block">
                                         {{ trans('admin/settings/general.label2_2d_type_help', ['current' => $setting->barcode_type]) }}.
@@ -204,7 +218,14 @@ class="table table-striped snipe-table"
                                     {{ Form::label('label2_2d_target', trans('admin/settings/general.label2_2d_target'), ['class'=>'control-label']) }}
                                 </div>
                                 <div class="col-md-9">
-                                    {{ Form::select('label2_2d_target', ['hardware_id'=>'/hardware/{id} ('.trans('admin/settings/general.default').')', 'ht_tag'=>'/ht/{asset_tag}'], old('label2_2d_target', $setting->label2_2d_target), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_2d_target' ]) }}
+                                    <x-input.select
+                                        class="col-md-4"
+                                        name="label2_2d_target"
+                                        id="label2_2d_target"
+                                        :items="['hardware_id'=>'/hardware/{id} ('.trans('admin/settings/general.default').')', 'ht_tag'=>'/ht/{asset_tag}']"
+                                        :selected="old('label2_2d_target', $setting->label2_2d_target)"
+                                        aria-label="label2_2d_target"
+                                    />
                                     {!! $errors->first('label2_2d_target', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                                     <p class="help-block">{{ trans('admin/settings/general.label2_2d_target_help') }}</p>
                                 </div>

From 8c37c3375a4bb41b43ac133c60270e6e0a0d0140 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 4 Dec 2024 16:16:49 -0800
Subject: [PATCH 11/28] Convert additional selects

---
 resources/views/blade/input/select.blade.php   |  4 +++-
 .../views/hardware/quickscan-checkin.blade.php | 16 +++++++++++-----
 ...ield-set-default-values-for-model.blade.php | 11 ++++++++++-
 .../livewire/slack-settings-form.blade.php     | 18 +++++++++++-------
 .../views/users/confirm-bulk-delete.blade.php  | 12 ++++++++++--
 5 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/resources/views/blade/input/select.blade.php b/resources/views/blade/input/select.blade.php
index 7bcb11fd99f2..6c1931924e58 100644
--- a/resources/views/blade/input/select.blade.php
+++ b/resources/views/blade/input/select.blade.php
@@ -2,10 +2,12 @@
     'items',
     'selected' => null,
     'includeEmpty' => false,
+    'forLivewire' => false,
 ])
 
 <select
-    {{ $attributes->merge(['class' => 'select2']) }}
+    {{ $attributes->class(['select2', 'livewire-select2' => $forLivewire]) }}
+    @if ($forLivewire) data-livewire-component="{{ $this->getId() }}" @endif
 >
     @if($includeEmpty)
         <option value="" selected="selected"></option>
diff --git a/resources/views/hardware/quickscan-checkin.blade.php b/resources/views/hardware/quickscan-checkin.blade.php
index de892399cc3a..66d142028c1b 100644
--- a/resources/views/hardware/quickscan-checkin.blade.php
+++ b/resources/views/hardware/quickscan-checkin.blade.php
@@ -16,7 +16,7 @@
         }
     </style>
 
-    
+
 
     <div class="row">
     {{ Form::open(['method' => 'POST', 'class' => 'form-horizontal', 'role' => 'form', 'id' => 'checkin-form' ]) }}
@@ -47,7 +47,13 @@
                             {{ trans('admin/hardware/form.status') }}
                         </label>
                         <div class="col-md-7">
-                            {{ Form::select('status_id', $statusLabel_list, '', array('class'=>'select2', 'style'=>'width:100%','', 'aria-label'=>'status_id')) }}
+                            <x-input.select
+                                name="status_id"
+                                id="status_id"
+                                :items="$statusLabel_list"
+                                aria-label="status_id"
+                                style="width:100%"
+                            />
                             {!! $errors->first('status_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                         </div>
                     </div>
@@ -63,8 +69,8 @@
                                 {!! $errors->first('note', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                             </div>
                         </div>
-    
-    
+
+
 
                 </div> <!--/.box-body-->
                 <div class="box-footer">
@@ -87,7 +93,7 @@
                     <h2 class="box-title"> {{ trans('general.quickscan_checkin_status') }} (<span id="checkin-counter">0</span> {{ trans('general.assets_checked_in_count') }}) </h2>
                 </div>
                 <div class="box-body">
-    
+
                     <table id="checkedin" class="table table-striped snipe-table">
                         <thead>
                         <tr>
diff --git a/resources/views/livewire/custom-field-set-default-values-for-model.blade.php b/resources/views/livewire/custom-field-set-default-values-for-model.blade.php
index 8f686440996e..bdfddd325ab8 100644
--- a/resources/views/livewire/custom-field-set-default-values-for-model.blade.php
+++ b/resources/views/livewire/custom-field-set-default-values-for-model.blade.php
@@ -5,7 +5,16 @@
             {{ trans('admin/models/general.fieldset') }}
         </label>
         <div class="col-md-5">
-            {{ Form::select('fieldset_id', Helper::customFieldsetList(), old('fieldset_id', $fieldset_id), array('class'=>'select2 js-fieldset-field livewire-select2', 'style'=>'width:100%; min-width:350px', 'aria-label'=>'custom_fieldset', 'data-livewire-component' => $this->getId())) }}
+            <x-input.select
+                name="fieldset_id"
+                id="fieldset_id"
+                class="js-fieldset-field"
+                :items="Helper::customFieldsetList()"
+                :selected="old('fieldset_id', $fieldset_id)"
+                aria-label="custom_fieldset"
+                style="width:100%; min-width:350px;"
+                :for-livewire="true"
+            />
             {!! $errors->first('custom_fieldset', '<span class="alert-msg" aria-hidden="true"><br><i class="fas fa-times"></i> :message</span>') !!}
         </div>
         <div class="col-md-3">
diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php
index 76b3987229e3..a45ad848f98c 100644
--- a/resources/views/livewire/slack-settings-form.blade.php
+++ b/resources/views/livewire/slack-settings-form.blade.php
@@ -66,13 +66,17 @@
 								</label>
                             </div>
                             <div class="col-md-9 required" wire:ignore>
-
-                            @if (Helper::isDemoMode())
-								{{ Form::select('webhook_selected', array('slack' => trans('admin/settings/general.slack'), 'general' => trans('admin/settings/general.general_webhook'),'google' => trans('admin/settings/general.google_workspaces'), 'microsoft' => trans('admin/settings/general.ms_teams')), old('webhook_selected', $webhook_selected), array('class'=>'select2 form-control', 'aria-label' => 'webhook_selected', 'id' => 'select2', 'style'=>'width:100%', 'disabled')) }}
-                            @else
-                                {{ Form::select('webhook_selected', array('slack' => trans('admin/settings/general.slack'), 'general' => trans('admin/settings/general.general_webhook'),'google' => trans('admin/settings/general.google_workspaces'), 'microsoft' => trans('admin/settings/general.ms_teams')), old('webhook_selected', $webhook_selected), array('class'=>'select2 form-control', 'aria-label' => 'webhook_selected', 'id' => 'select2', 'data-minimum-results-for-search' => '-1', 'style'=>'width:100%')) }}
-                            @endif
-
+                                <x-input.select
+                                    name="webhook_selected"
+                                    id="select2"
+                                    class="form-control"
+                                    :items="['slack' => trans('admin/settings/general.slack'), 'general' => trans('admin/settings/general.general_webhook'),'google' => trans('admin/settings/general.google_workspaces'), 'microsoft' => trans('admin/settings/general.ms_teams')]"
+                                    :selected="old('webhook_selected', $webhook_selected)"
+                                    aria-label="webhook_selected"
+                                    data-minimum-results-for-search="-1"
+                                    style="width:100%"
+                                    :disabled="Helper::isDemoMode()"
+                                />
                             </div>
                         </div>
 
diff --git a/resources/views/users/confirm-bulk-delete.blade.php b/resources/views/users/confirm-bulk-delete.blade.php
index 8e4ba3307123..7ea40120bf95 100644
--- a/resources/views/users/confirm-bulk-delete.blade.php
+++ b/resources/views/users/confirm-bulk-delete.blade.php
@@ -109,7 +109,15 @@
 
                   <tr>
                     <td colspan="8">
-                      {{ Form::select('status_id', $statuslabel_list , old('status_id'), array('class'=>'select2', 'style'=>'width:250px', 'required' => true)) }}
+                      <x-input.select
+                          name="status_id"
+                          id="status_id"
+                          :items="$statuslabel_list"
+                          :selected="old('status_id')"
+                          required
+                          style="width:250px"
+                          aria-label="status_id"
+                      />
                       <label>{{ trans('admin/users/general.update_user_assets_status') }}</label>
                     </td>
                   </tr>
@@ -159,4 +167,4 @@
      }
    });
 </script>
-@stop
\ No newline at end of file
+@stop

From 26ee4d7b1401c429c0fe2d5b2fec24cde5881a54 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Wed, 4 Dec 2024 17:23:29 -0800
Subject: [PATCH 12/28] Convert additional selects

---
 resources/views/models/bulk-edit.blade.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/resources/views/models/bulk-edit.blade.php b/resources/views/models/bulk-edit.blade.php
index 8a053b048fbf..2549772f2554 100644
--- a/resources/views/models/bulk-edit.blade.php
+++ b/resources/views/models/bulk-edit.blade.php
@@ -62,7 +62,13 @@
                                     {{ trans('admin/models/general.fieldset') }}
                                 </label>
                                 <div class="col-md-7">
-                                    {{ Form::select('fieldset_id', $fieldset_list , old('fieldset_id', 'NC'), array('class'=>'select2 js-fieldset-field', 'style'=>'width:350px')) }}
+                                    <x-input.select
+                                        name="fieldset_id"
+                                        class="js-fieldset-field"
+                                        :items="$fieldset_list"
+                                        :selected="old('fieldset_id', 'NC')"
+                                        style="width:350px"
+                                    />
                                     {!! $errors->first('fieldset_id', '<span class="alert-msg" aria-hidden="true"><br><i class="fas fa-times"></i> :message</span>') !!}
                                 </div>
                             </div>
@@ -74,7 +80,12 @@
                                     {{ trans('general.depreciation') }}
                                 </label>
                                 <div class="col-md-7">
-                                    {{ Form::select('depreciation_id', $depreciation_list , old('depreciation_id', 'NC'), array('class'=>'select2', 'style'=>'width:350px')) }}
+                                    <x-input.select
+                                        name="depreciation_id"
+                                        :items="$depreciation_list"
+                                        :selected="old('depreciation_id', 'NC')"
+                                        style="width:350px"
+                                    />
                                     {!! $errors->first('depreciation_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                                 </div>
                             </div>

From 657ea106686a61bff876268ac403d8d1c2ea13a6 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Mon, 9 Dec 2024 17:50:14 -0800
Subject: [PATCH 13/28] Convert additional selects

---
 .../views/partials/forms/edit/depreciation.blade.php  |  9 ++++++++-
 resources/views/partials/forms/edit/status.blade.php  | 11 ++++++++++-
 2 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/resources/views/partials/forms/edit/depreciation.blade.php b/resources/views/partials/forms/edit/depreciation.blade.php
index 4478a9c05fba..d702ae59e70e 100644
--- a/resources/views/partials/forms/edit/depreciation.blade.php
+++ b/resources/views/partials/forms/edit/depreciation.blade.php
@@ -2,7 +2,14 @@
 <div class="form-group {{ $errors->has('depreciation_id') ? ' has-error' : '' }}">
     <label for="depreciation_id" class="col-md-3 control-label">{{ trans('general.depreciation') }}</label>
     <div class="col-md-7">
-        {{ Form::select('depreciation_id', $depreciation_list , old('depreciation_id', $item->depreciation_id), array('class'=>'select2', 'style'=>'width:350px', 'aria-label'=>'depreciation_id')) }}
+        <x-input.select
+            name="depreciation_id"
+            id="depreciation_id"
+            :items="$depreciation_list"
+            :selected="old('depreciation_id', $item->depreciation_id)"
+            aria-label="depreciation_id"
+            style="width:350px;"
+        />
         {!! $errors->first('depreciation_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
 </div>
diff --git a/resources/views/partials/forms/edit/status.blade.php b/resources/views/partials/forms/edit/status.blade.php
index 8554f9a59c95..8acb9ca17cd8 100644
--- a/resources/views/partials/forms/edit/status.blade.php
+++ b/resources/views/partials/forms/edit/status.blade.php
@@ -2,7 +2,16 @@
 <div class="form-group {{ $errors->has('status_id') ? ' has-error' : '' }}">
     <label for="status_id" class="col-md-3 control-label">{{ trans('admin/hardware/form.status') }}</label>
     <div class="col-md-7 col-sm-11">
-        {{ Form::select('status_id', $statuslabel_list , old('status_id', $item->status_id), array('class'=>'select2 status_id', 'style'=>'width:100%','id'=>'status_select_id', 'aria-label'=>'status_id', 'required' => 'required')) }}
+        <x-input.select
+            name="status_id"
+            id="status_select_id"
+            class="status_id"
+            :items="$statuslabel_list"
+            :selected="old('status_id', $item->status_id)"
+            aria-label="status_id"
+            :required="$required"
+            style="width:100%;"
+        />
         {!! $errors->first('status_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
     <div class="col-md-2 col-sm-2 text-left">

From 2a8790cf6fb95d15419a2aed307cd3852732c3ec Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 10 Dec 2024 11:33:53 -0800
Subject: [PATCH 14/28] Convert additional selects

---
 .../views/modals/partials/fieldset-select.blade.php  | 12 ++++++++++--
 resources/views/modals/statuslabel.blade.php         | 10 +++++++++-
 resources/views/models/custom_fields_form.blade.php  |  8 ++++++--
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/resources/views/modals/partials/fieldset-select.blade.php b/resources/views/modals/partials/fieldset-select.blade.php
index 3f4efc24b6d7..0fd21242c09c 100644
--- a/resources/views/modals/partials/fieldset-select.blade.php
+++ b/resources/views/modals/partials/fieldset-select.blade.php
@@ -1,6 +1,14 @@
 <!-- partials/modals/partials/fieldset-select.blade.php -->
 <div class="dynamic-form-row">
     <div class="col-md-4 col-xs-12"><label for="modal-fieldset_id">{{ trans('admin/models/general.fieldset') }}:</label></div>
-    <div class="col-md-8 col-xs-12">{{ Form::select('fieldset_id', Helper::customFieldsetList(),old('fieldset_id'), array('class'=>'select2', 'id'=>'modal-fieldset_id', 'style'=>'width:100%;')) }}</div>
+    <div class="col-md-8 col-xs-12">
+        <x-input.select
+            name="fieldset_id"
+            id="modal-fieldset_id"
+            :items="Helper::customFieldsetList()"
+            :selected="old('fieldset_id')"
+            style="width:100%;"
+        />
+    </div>
 </div>
-<!-- partials/modals/partials/fieldset-select.blade.php -->
\ No newline at end of file
+<!-- partials/modals/partials/fieldset-select.blade.php -->
diff --git a/resources/views/modals/statuslabel.blade.php b/resources/views/modals/statuslabel.blade.php
index e7076f1bbbf0..7025f6a5e85a 100644
--- a/resources/views/modals/statuslabel.blade.php
+++ b/resources/views/modals/statuslabel.blade.php
@@ -16,7 +16,15 @@
                 <div class="dynamic-form-row">
                     <div class="col-md-3 col-xs-12"><label for="modal-type">{{ trans('admin/statuslabels/table.status_type') }}:
                         </label></div>
-                    <div class="col-md-8 col-xs-12">{{ Form::select('type', $statuslabel_types, '', array('class'=>'select2', 'style'=>'width:100%','id' =>'modal-type', 'required',)) }}</div>
+                    <div class="col-md-8 col-xs-12">
+                        <x-input.select
+                            name="type"
+                            id="modal-type"
+                            :items="$statuslabel_types"
+                            required
+                            style="width:100%;"
+                        />
+                    </div>
                 </div>
             </form>
         </div>
diff --git a/resources/views/models/custom_fields_form.blade.php b/resources/views/models/custom_fields_form.blade.php
index 8d414f337d09..aa52593ba67b 100644
--- a/resources/views/models/custom_fields_form.blade.php
+++ b/resources/views/models/custom_fields_form.blade.php
@@ -8,8 +8,12 @@
           @if ($field->element!='text')
               <!-- Listbox -->
               @if ($field->element=='listbox')
-                   {{ Form::select($field->db_column_name(), $field->formatFieldValuesAsArray(),
-                  old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))), ['class'=>'format select2 form-control']) }}
+                  <x-input.select
+                      :name="$field->db_column_name()"
+                      class="format form-control"
+                      :items="$field->formatFieldValuesAsArray()"
+                      :selected="old($field->db_column_name(), (isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id)))"
+                  />
 
               @elseif ($field->element=='textarea')
                   <textarea class="col-md-6 form-control" id="{{ $field->db_column_name() }}" name="{{ $field->db_column_name() }}">{{ old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))) }}</textarea>

From ca30f4e37a15f8274266fafe3957e273f039c1fc Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 10 Dec 2024 12:15:47 -0800
Subject: [PATCH 15/28] Convert additional selects

---
 resources/views/blade/input/select.blade.php  |  2 +-
 resources/views/livewire/importer.blade.php   | 24 ++++++++++++-------
 .../custom_fields_form_bulk_edit.blade.php    |  8 +++++--
 .../forms/edit/maintenance_type.blade.php     |  9 ++++++-
 4 files changed, 30 insertions(+), 13 deletions(-)

diff --git a/resources/views/blade/input/select.blade.php b/resources/views/blade/input/select.blade.php
index 6c1931924e58..ab927efeab71 100644
--- a/resources/views/blade/input/select.blade.php
+++ b/resources/views/blade/input/select.blade.php
@@ -10,7 +10,7 @@
     @if ($forLivewire) data-livewire-component="{{ $this->getId() }}" @endif
 >
     @if($includeEmpty)
-        <option value="" selected="selected"></option>
+        <option value=""></option>
     @endif
     @foreach($items as $key => $value)
         <option value="{{ $key }}" @selected($selected === $key)>{{ $value }}</option>
diff --git a/resources/views/livewire/importer.blade.php b/resources/views/livewire/importer.blade.php
index 027d9e3dc636..124aa9e8c859 100644
--- a/resources/views/livewire/importer.blade.php
+++ b/resources/views/livewire/importer.blade.php
@@ -153,15 +153,21 @@ class="col-md-12 table table-striped snipe-table">
                                                                 </label>
 
                                                             <div class="col-md-9 col-xs-12">
-                                                                    {{ Form::select('typeOfImport', $importTypes, $typeOfImport, [
-                                                                        'id' => 'import_type',
-                                                                        'class' => 'livewire-select2',
-                                                                        'style' => 'min-width: 350px',
-                                                                        'data-placeholder' => trans('general.select_var', ['thing' => trans('general.import_type')]),
-                                                                        'placeholder' => '', //needed so that the form-helper will put an empty option first
-                                                                        'data-minimum-results-for-search' => '-1', // Remove this if the list gets long enough that we need to search
-                                                                        'data-livewire-component' => $this->getId()
-                                                                    ]) }}
+                                                                    <x-input.select
+                                                                        name="typeOfImport"
+                                                                        id="import_type"
+                                                                        :items="$importTypes"
+                                                                        :selected="$typeOfImport"
+                                                                        :for-livewire="true"
+                                                                        :include-empty="true"
+                                                                        style="min-width: 350px;"
+                                                                        :data-placeholder="trans('general.select_var', ['thing' => trans('general.import_type')])"
+                                                                        {{--placeholder needed so that the form-helper will put an empty option first--}}
+                                                                        placeholder=""
+                                                                        {{--Remove this if the list gets long enough that we need to search--}}
+                                                                        data-minimum-results-for-search="-1"
+                                                                        :data-livewire-component="$this->getId()"
+                                                                    />
                                                                     @if ($typeOfImport === 'asset' && $snipeSettings->auto_increment_assets == 0)
                                                                         <p class="help-block">
                                                                             {{ trans('general.auto_incrementing_asset_tags_disabled_so_tags_required') }}
diff --git a/resources/views/models/custom_fields_form_bulk_edit.blade.php b/resources/views/models/custom_fields_form_bulk_edit.blade.php
index e048b38d0962..5e8966f11bcc 100644
--- a/resources/views/models/custom_fields_form_bulk_edit.blade.php
+++ b/resources/views/models/custom_fields_form_bulk_edit.blade.php
@@ -24,8 +24,12 @@
           @if ($field->element!='text')
               <!-- Listbox -->
               @if ($field->element=='listbox')
-                  {{ Form::select($field->db_column_name(), $field->formatFieldValuesAsArray(),
-                  old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id))), ['class'=>'format select2 form-control']) }}
+                  <x-input.select
+                      :name="$field->db_column_name()"
+                      class="format form-control"
+                      :items="$field->formatFieldValuesAsArray()"
+                      :selected="old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id)))"
+                  />
 
               @elseif ($field->element=='textarea')
                 @if($field->is_unique)
diff --git a/resources/views/partials/forms/edit/maintenance_type.blade.php b/resources/views/partials/forms/edit/maintenance_type.blade.php
index 24d008fa2332..d44d81b1f3ef 100644
--- a/resources/views/partials/forms/edit/maintenance_type.blade.php
+++ b/resources/views/partials/forms/edit/maintenance_type.blade.php
@@ -3,7 +3,14 @@
               <label for="asset_maintenance_type" class="col-md-3 control-label">{{ trans('admin/asset_maintenances/form.asset_maintenance_type') }}
               </label>
               <div class="col-md-7">
-                  {{ Form::select('asset_maintenance_type', $assetMaintenanceType , old('asset_maintenance_type', $item->asset_maintenance_type), ['class'=>'select2', 'aria-label'=>'asset_maintenance_type', 'required' => Helper::checkIfRequired($item, 'asset_maintenance_type') ? true : '', 'style'=> 'width:100%;']) }}
+                  <x-input.select
+                      name="asset_maintenance_type"
+                      :items="$assetMaintenanceType"
+                      :selected="old('asset_maintenance_type', $item->asset_maintenance_type)"
+                      aria-label="asset_maintenance_type"
+                      style="width:100%;"
+                      :required="Helper::checkIfRequired($item, 'asset_maintenance_type')"
+                  />
                   {!! $errors->first('asset_maintenance_type', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
               </div>
           </div>

From 26ee8e34a8bd566595a79fa6848d8dcc22fcbe41 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 10 Dec 2024 13:50:53 -0800
Subject: [PATCH 16/28] Allow passing options via a slot

---
 resources/views/blade/input/select.blade.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/resources/views/blade/input/select.blade.php b/resources/views/blade/input/select.blade.php
index ab927efeab71..0feace1d18f2 100644
--- a/resources/views/blade/input/select.blade.php
+++ b/resources/views/blade/input/select.blade.php
@@ -12,7 +12,11 @@
     @if($includeEmpty)
         <option value=""></option>
     @endif
-    @foreach($items as $key => $value)
-        <option value="{{ $key }}" @selected($selected === $key)>{{ $value }}</option>
-    @endforeach
+    @if($slot->isEmpty())
+        @foreach($items as $key => $value)
+            <option value="{{ $key }}" @selected($selected === $key)>{{ $value }}</option>
+        @endforeach
+    @else
+        {{ $slot }}
+    @endif
 </select>

From 8622448040d0b473cd7a72c1a98f2f18a561088e Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 10 Dec 2024 13:51:17 -0800
Subject: [PATCH 17/28] Convert select in importer

---
 resources/views/livewire/importer.blade.php | 28 +++++++++++++--------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/resources/views/livewire/importer.blade.php b/resources/views/livewire/importer.blade.php
index 124aa9e8c859..58726d07d1db 100644
--- a/resources/views/livewire/importer.blade.php
+++ b/resources/views/livewire/importer.blade.php
@@ -242,17 +242,23 @@ class="col-md-12 table table-striped snipe-table">
 
                                                                             <label for="field_map.{{ $index }}" class="col-md-3 control-label text-right">{{ $header }}</label>
                                                                             <div class="col-md-4">
-
-                                                                                {{ Form::select('field_map.'.$index, $columnOptions[$typeOfImport], @$field_map[$index],
-                                                                                    [
-                                                                                        'class' => 'mappings livewire-select2',
-                                                                                        'placeholder' => trans('general.importer.do_not_import'),
-                                                                                        'style' => 'min-width: 100%',
-                                                                                        'data-livewire-component' => $this->getId()
-                                                                                    ],[
-                                                                                        '-' => ['disabled' => true] // this makes the "-----" line unclickable
-                                                                                    ])
-                                                                                }}
+                                                                                <x-input.select
+                                                                                    :name="'field_map.'.$index"
+                                                                                    class="mappings"
+                                                                                    :for-livewire="true"
+                                                                                    :placeholder="trans('general.importer.do_not_import')"
+                                                                                    style="min-width: 100%;"
+                                                                                    :data-livewire-component="$this->getId()"
+                                                                                >
+                                                                                    <option selected="selected" value="">Do Not Import</option>
+                                                                                    @foreach($columnOptions[$typeOfImport] as $key => $value)
+                                                                                        <option
+                                                                                            value="{{ $key }}"
+                                                                                            @selected(@$field_map[$index] === $key)
+                                                                                            @disabled($key === '-')
+                                                                                        >{{ $value }}</option>
+                                                                                    @endforeach
+                                                                                </x-input.select>
                                                                             </div>
 									                                    @if (($this->activeFile->first_row) && (array_key_exists($index, $this->activeFile->first_row)))
                                                                             <div class="col-md-5">

From 5d4eb365c75296ad415c56ebbef05eb9eb8a24f7 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 10 Dec 2024 13:59:40 -0800
Subject: [PATCH 18/28] Add comments

---
 resources/views/blade/input/select.blade.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/views/blade/input/select.blade.php b/resources/views/blade/input/select.blade.php
index 0feace1d18f2..6da6a9329cf6 100644
--- a/resources/views/blade/input/select.blade.php
+++ b/resources/views/blade/input/select.blade.php
@@ -1,4 +1,6 @@
 @props([
+    // items can either be provided as key => value pairs
+    // or passed in via the default $slot
     'items',
     'selected' => null,
     'includeEmpty' => false,
@@ -7,11 +9,12 @@
 
 <select
     {{ $attributes->class(['select2', 'livewire-select2' => $forLivewire]) }}
-    @if ($forLivewire) data-livewire-component="{{ $this->getId() }}" @endif
+    @if($forLivewire) data-livewire-component="{{ $this->getId() }}" @endif
 >
     @if($includeEmpty)
         <option value=""></option>
     @endif
+    {{-- map the simple key => value pairs when nothing is passed in via the slot --}}
     @if($slot->isEmpty())
         @foreach($items as $key => $value)
             <option value="{{ $key }}" @selected($selected === $key)>{{ $value }}</option>

From 286293ab2cc8f7390b2997043bcd6fd6bdf587e1 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 17 Dec 2024 11:03:08 -0800
Subject: [PATCH 19/28] Delete unused partials

---
 .../views/partials/forms/edit/category.blade.php      |  8 --------
 resources/views/partials/forms/edit/company.blade.php | 11 -----------
 .../views/partials/forms/edit/location.blade.php      |  8 --------
 .../views/partials/forms/edit/manufacturer.blade.php  |  8 --------
 .../views/partials/forms/edit/supplier.blade.php      | 11 -----------
 5 files changed, 46 deletions(-)
 delete mode 100644 resources/views/partials/forms/edit/category.blade.php
 delete mode 100644 resources/views/partials/forms/edit/company.blade.php
 delete mode 100644 resources/views/partials/forms/edit/location.blade.php
 delete mode 100644 resources/views/partials/forms/edit/manufacturer.blade.php
 delete mode 100644 resources/views/partials/forms/edit/supplier.blade.php

diff --git a/resources/views/partials/forms/edit/category.blade.php b/resources/views/partials/forms/edit/category.blade.php
deleted file mode 100644
index 158cc3508bb6..000000000000
--- a/resources/views/partials/forms/edit/category.blade.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- Category -->
-<div class="form-group {{ $errors->has('category_id') ? ' has-error' : '' }}">
-    <label for="category_id" class="col-md-3 control-label">{{ trans('general.category') }}</label>
-    <div class="col-md-7 col-sm-12">
-        {{ Form::select('category_id', $category_list , old('category_id', $item->category_id), array('class'=>'select2', 'style'=>'width:100%', 'required' => Helper::checkIfRequired($item, 'category_id') ? true : '')) }}
-        {!! $errors->first('category_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-    </div>
-</div>
diff --git a/resources/views/partials/forms/edit/company.blade.php b/resources/views/partials/forms/edit/company.blade.php
deleted file mode 100644
index 22cb623584ac..000000000000
--- a/resources/views/partials/forms/edit/company.blade.php
+++ /dev/null
@@ -1,11 +0,0 @@
-@if (\App\Models\Company::isCurrentUserAuthorized())
-<div class="form-group {{ $errors->has('company_id') ? ' has-error' : '' }}">
-   <div class="col-md-3 control-label">
-       {{ Form::label('company_id', trans('general.company'), array('class' => 'col-md-3 control-label', 'for' => 'company_id')) }}
-   </div>
-    <div class="col-md-7 col-sm-12">
-       {{ Form::select('company_id', $company_list , old('company_id', $item->company_id), array('class'=>'select2', 'style'=>'width:100%', 'required' => Helper::checkIfRequired($item, 'company_id') ? true : '')) }}
-       {!! $errors->first('company_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-   </div>
-</div>
-@endif
diff --git a/resources/views/partials/forms/edit/location.blade.php b/resources/views/partials/forms/edit/location.blade.php
deleted file mode 100644
index 49bc2976d0a6..000000000000
--- a/resources/views/partials/forms/edit/location.blade.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<!--  Location -->
-<div class="form-group {{ $errors->has('location_id') ? ' has-error' : '' }}">
-    <label for="location_id" class="col-md-3 control-label">{{ trans('general.location') }}</label>
-    <div class="col-md-7 col-sm-12">
-        {{ Form::select('location_id', $location_list , old('location_id', $item->location_id), array('class'=>'select2', 'style'=>'width:350px')) }}
-        {!! $errors->first('location_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-    </div>
-</div>
diff --git a/resources/views/partials/forms/edit/manufacturer.blade.php b/resources/views/partials/forms/edit/manufacturer.blade.php
deleted file mode 100644
index 644b70d7bac7..000000000000
--- a/resources/views/partials/forms/edit/manufacturer.blade.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<!-- Manufacturer -->
-<div class="form-group{{ $errors->has('manufacturer_id') ? ' has-error' : '' }}">
-    <label for="manufacturer_id" class="col-md-3 control-label">{{ trans('general.manufacturer') }}</label>
-    <div class="col-md-7">
-        {{ Form::select('manufacturer_id', $manufacturer_list , old('manufacturer_id', $item->manufacturer_id), array('class'=>'select2', 'style'=>'width:100%', 'required' => Helper::checkIfRequired($item, 'manufacturer_id') ? true : '')) }}
-        {!! $errors->first('manufacturer_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-    </div>
-</div>
diff --git a/resources/views/partials/forms/edit/supplier.blade.php b/resources/views/partials/forms/edit/supplier.blade.php
deleted file mode 100644
index 40c1e2b2792c..000000000000
--- a/resources/views/partials/forms/edit/supplier.blade.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Supplier -->
-<div class="form-group {{ $errors->has('supplier_id') ? ' has-error' : '' }}">
-    <label for="supplier_id" class="col-md-3 control-label">{{ trans('general.supplier') }}</label>
-    <div class="col-md-7">
-        {{ Form::select('supplier_id', $supplier_list , old('supplier_id', $item->supplier_id), ['class'=>'select2', 'style'=>'min-width:350px', 'id' => 'supplier_select_id', 'required' => Helper::checkIfRequired($item, 'supplier_id') ? true : '']) }}
-        {!! $errors->first('supplier_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
-    </div>
-    <div class="col-md-1 col-sm-1 text-left">
-             <a href='{{ route('modal.show', 'supplier') }}' data-toggle="modal"  data-target="#createModal" data-dependency="supplier" data-select='supplier_select_id' class="btn btn-sm btn-primary">{{  trans('button.new') }}</a>
-    </div>
-</div>

From e8e22b4e94e45191c1c130b4377726c8bccfe61f Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 17 Dec 2024 11:15:24 -0800
Subject: [PATCH 20/28] Add required indicator to listbox

---
 resources/views/models/custom_fields_form.blade.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/views/models/custom_fields_form.blade.php b/resources/views/models/custom_fields_form.blade.php
index aa52593ba67b..2c7addfe24e2 100644
--- a/resources/views/models/custom_fields_form.blade.php
+++ b/resources/views/models/custom_fields_form.blade.php
@@ -13,6 +13,7 @@
                       class="format form-control"
                       :items="$field->formatFieldValuesAsArray()"
                       :selected="old($field->db_column_name(), (isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id)))"
+                      :required="$field->pivot->required == '1'"
                   />
 
               @elseif ($field->element=='textarea')

From 4b77d6d586096968a7fe9dd204ea63b5f52ddef1 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 17 Dec 2024 11:48:02 -0800
Subject: [PATCH 21/28] Convert the selects in the label settings

---
 resources/views/settings/labels.blade.php | 27 ++++++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index 46212b790daf..88658f328639 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -170,7 +170,14 @@ class="table table-striped snipe-table"
                                                  'none'    => trans('admin/settings/general.none'),
                                             ];
                                         @endphp
-                                        {{ Form::select('label2_1d_type', $select1DValues, old('label2_1d_type', $setting->label2_1d_type), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_1d_type' ]) }}
+                                        <x-input.select
+                                            class="col-md-4"
+                                            name="label2_1d_type"
+                                            id="label2_1d_type"
+                                            :items="$select1DValues"
+                                            :selected="old('label2_1d_type', $setting->label2_1d_type)"
+                                            aria-label="label2_1d_type"
+                                        />
                                         {!! $errors->first('label2_1d_type', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                                         <p class="help-block">
                                             {{ trans('admin/settings/general.label2_1d_type_help') }}.
@@ -213,7 +220,14 @@ class="table table-striped snipe-table"
                                                 'none'       => trans('admin/settings/general.none'),
                                             ]);
                                         @endphp
-                                        {{ Form::select('label2_2d_type', $select2DValues, old('label2_2d_type', $setting->label2_2d_type), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_2d_type' ]) }}
+                                        <x-input.select
+                                            class="col-md-4"
+                                            name="label2_2d_type"
+                                            id="label2_2d_type"
+                                            :items="$select2DValues"
+                                            :selected="old('label2_2d_type', $setting->label2_2d_type)"
+                                            aria-label="label2_2d_type"
+                                        />
                                         {!! $errors->first('label2_2d_type', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                                         <p class="help-block">
                                             {{ trans('admin/settings/general.label2_2d_type_help', ['current' => $setting->barcode_type]) }}.
@@ -279,7 +293,14 @@ class="table table-striped snipe-table"
                                     {{ Form::label('label2_2d_target', trans('admin/settings/general.label2_2d_target'), ['class'=>'control-label']) }}
                                 </div>
                                 <div class="col-md-9">
-                                    {{ Form::select('label2_2d_target', ['hardware_id'=>'/hardware/{id} ('.trans('admin/settings/general.default').')', 'ht_tag'=>'/ht/{asset_tag}'], old('label2_2d_target', $setting->label2_2d_target), [ 'class'=>'select2 col-md-4', 'aria-label'=>'label2_2d_target' ]) }}
+                                    <x-input.select
+                                        class="col-md-4"
+                                        name="label2_2d_target"
+                                        id="label2_2d_target"
+                                        :items="['hardware_id'=>'/hardware/{id} ('.trans('admin/settings/general.default').')', 'ht_tag'=>'/ht/{asset_tag}']"
+                                        :selected="old('label2_2d_target', $setting->label2_2d_target)"
+                                        aria-label="label2_2d_target"
+                                    />
                                     {!! $errors->first('label2_2d_target', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                                     <p class="help-block">{{ trans('admin/settings/general.label2_2d_target_help') }}</p>
                                 </div>

From b0a6a3dbdefd6441d7d4422e79e697f463b6b089 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 17 Dec 2024 12:11:22 -0800
Subject: [PATCH 22/28] Use "options" instead of "items"

---
 resources/views/blade/input/select.blade.php           |  6 +++---
 resources/views/categories/edit.blade.php              |  2 +-
 resources/views/custom_fields/fields/edit.blade.php    |  2 +-
 resources/views/custom_fields/fieldsets/view.blade.php |  2 +-
 resources/views/hardware/bulk.blade.php                |  2 +-
 resources/views/hardware/checkin.blade.php             |  2 +-
 resources/views/hardware/checkout.blade.php            |  2 +-
 resources/views/hardware/quickscan-checkin.blade.php   |  2 +-
 ...custom-field-set-default-values-for-model.blade.php |  2 +-
 resources/views/livewire/importer.blade.php            |  2 +-
 resources/views/livewire/slack-settings-form.blade.php |  2 +-
 .../views/modals/partials/fieldset-select.blade.php    |  2 +-
 resources/views/modals/statuslabel.blade.php           |  2 +-
 resources/views/models/bulk-edit.blade.php             |  4 ++--
 resources/views/models/custom_fields_form.blade.php    |  2 +-
 .../models/custom_fields_form_bulk_edit.blade.php      |  2 +-
 .../views/partials/forms/edit/depreciation.blade.php   |  2 +-
 .../partials/forms/edit/maintenance_type.blade.php     |  2 +-
 resources/views/partials/forms/edit/status.blade.php   |  2 +-
 resources/views/settings/branding.blade.php            | 10 +++++-----
 resources/views/settings/general.blade.php             |  4 ++--
 resources/views/settings/labels.blade.php              |  6 +++---
 resources/views/statuslabels/edit.blade.php            |  2 +-
 resources/views/users/confirm-bulk-delete.blade.php    |  2 +-
 24 files changed, 34 insertions(+), 34 deletions(-)

diff --git a/resources/views/blade/input/select.blade.php b/resources/views/blade/input/select.blade.php
index 6da6a9329cf6..58f398024dd6 100644
--- a/resources/views/blade/input/select.blade.php
+++ b/resources/views/blade/input/select.blade.php
@@ -1,7 +1,7 @@
 @props([
-    // items can either be provided as key => value pairs
+    // options can either be provided as key => value pairs
     // or passed in via the default $slot
-    'items',
+    'options',
     'selected' => null,
     'includeEmpty' => false,
     'forLivewire' => false,
@@ -16,7 +16,7 @@
     @endif
     {{-- map the simple key => value pairs when nothing is passed in via the slot --}}
     @if($slot->isEmpty())
-        @foreach($items as $key => $value)
+        @foreach($options as $key => $value)
             <option value="{{ $key }}" @selected($selected === $key)>{{ $value }}</option>
         @endforeach
     @else
diff --git a/resources/views/categories/edit.blade.php b/resources/views/categories/edit.blade.php
index ba772f25bb8e..d513424953c3 100755
--- a/resources/views/categories/edit.blade.php
+++ b/resources/views/categories/edit.blade.php
@@ -17,7 +17,7 @@
     <div class="col-md-7 required">
         <x-input.select
             name="category_type"
-            :items="$category_types"
+            :options="$category_types"
             :selected="old('category_type', $item->category_type)"
             style="min-width:350px"
             aria-label="category_type"
diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php
index 558231b9d282..b9e4847062e3 100644
--- a/resources/views/custom_fields/fields/edit.blade.php
+++ b/resources/views/custom_fields/fields/edit.blade.php
@@ -91,7 +91,7 @@
               <x-input.select
                 class="format form-control"
                 name="format"
-                :items="Helper::predefined_formats()"
+                :options="Helper::predefined_formats()"
                 :selected="($field_format == '') ? $field->format : $field_format"
                 style="width:100%"
                 aria-label="format"
diff --git a/resources/views/custom_fields/fieldsets/view.blade.php b/resources/views/custom_fields/fieldsets/view.blade.php
index 0c608a8303a9..51fae81d7818 100644
--- a/resources/views/custom_fields/fieldsets/view.blade.php
+++ b/resources/views/custom_fields/fieldsets/view.blade.php
@@ -100,7 +100,7 @@
                   </label>
                   <x-input.select
                     name="field_id"
-                    :items="$custom_fields_list"
+                    :options="$custom_fields_list"
                     style="min-width:400px"
                     aria-label="field_id"
                   />
diff --git a/resources/views/hardware/bulk.blade.php b/resources/views/hardware/bulk.blade.php
index 05f5b517c0d6..667401505ac1 100755
--- a/resources/views/hardware/bulk.blade.php
+++ b/resources/views/hardware/bulk.blade.php
@@ -127,7 +127,7 @@
             <div class="col-md-7">
               <x-input.select
                 name="status_id"
-                :items="$statuslabel_list"
+                :options="$statuslabel_list"
                 :selected="old('status_id')"
                 style="width: 100%"
                 aria-label="status_id"
diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php
index a65a64975435..e6c57f6b3b33 100755
--- a/resources/views/hardware/checkin.blade.php
+++ b/resources/views/hardware/checkin.blade.php
@@ -86,7 +86,7 @@
                                             <div class="col-md-8 required">
                                                 <x-input.select
                                                     name="status_id"
-                                                    :items="$statusLabel_list"
+                                                    :options="$statusLabel_list"
                                                     id="modal-statuslabel_types"
                                                     style="width: 100%"
                                                     aria-label="status_id"
diff --git a/resources/views/hardware/checkout.blade.php b/resources/views/hardware/checkout.blade.php
index a47798dfbb13..ca297fa9ce02 100755
--- a/resources/views/hardware/checkout.blade.php
+++ b/resources/views/hardware/checkout.blade.php
@@ -84,7 +84,7 @@
                             <div class="col-md-7 required">
                                 <x-input.select
                                     name="status_id"
-                                    :items="$statusLabel_list"
+                                    :options="$statusLabel_list"
                                     :selected="$asset->status_id"
                                     style="width: 100%;"
                                     aria-label="status_id"
diff --git a/resources/views/hardware/quickscan-checkin.blade.php b/resources/views/hardware/quickscan-checkin.blade.php
index 66d142028c1b..62e7e4231512 100644
--- a/resources/views/hardware/quickscan-checkin.blade.php
+++ b/resources/views/hardware/quickscan-checkin.blade.php
@@ -50,7 +50,7 @@
                             <x-input.select
                                 name="status_id"
                                 id="status_id"
-                                :items="$statusLabel_list"
+                                :options="$statusLabel_list"
                                 aria-label="status_id"
                                 style="width:100%"
                             />
diff --git a/resources/views/livewire/custom-field-set-default-values-for-model.blade.php b/resources/views/livewire/custom-field-set-default-values-for-model.blade.php
index 7d521bf72322..7cb67e46fa21 100644
--- a/resources/views/livewire/custom-field-set-default-values-for-model.blade.php
+++ b/resources/views/livewire/custom-field-set-default-values-for-model.blade.php
@@ -8,7 +8,7 @@
                 name="fieldset_id"
                 id="fieldset_id"
                 class="js-fieldset-field"
-                :items="Helper::customFieldsetList()"
+                :options="Helper::customFieldsetList()"
                 :selected="old('fieldset_id', $fieldset_id)"
                 aria-label="custom_fieldset"
                 style="width:100%; min-width:350px;"
diff --git a/resources/views/livewire/importer.blade.php b/resources/views/livewire/importer.blade.php
index 3d52dae4037c..1805cad57c06 100644
--- a/resources/views/livewire/importer.blade.php
+++ b/resources/views/livewire/importer.blade.php
@@ -158,7 +158,7 @@ class="col-md-12 table table-striped snipe-table">
                                                                     <x-input.select
                                                                         name="typeOfImport"
                                                                         id="import_type"
-                                                                        :items="$importTypes"
+                                                                        :options="$importTypes"
                                                                         :selected="$typeOfImport"
                                                                         :for-livewire="true"
                                                                         :include-empty="true"
diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php
index a45ad848f98c..b87996a79d87 100644
--- a/resources/views/livewire/slack-settings-form.blade.php
+++ b/resources/views/livewire/slack-settings-form.blade.php
@@ -70,7 +70,7 @@
                                     name="webhook_selected"
                                     id="select2"
                                     class="form-control"
-                                    :items="['slack' => trans('admin/settings/general.slack'), 'general' => trans('admin/settings/general.general_webhook'),'google' => trans('admin/settings/general.google_workspaces'), 'microsoft' => trans('admin/settings/general.ms_teams')]"
+                                    :options="['slack' => trans('admin/settings/general.slack'), 'general' => trans('admin/settings/general.general_webhook'),'google' => trans('admin/settings/general.google_workspaces'), 'microsoft' => trans('admin/settings/general.ms_teams')]"
                                     :selected="old('webhook_selected', $webhook_selected)"
                                     aria-label="webhook_selected"
                                     data-minimum-results-for-search="-1"
diff --git a/resources/views/modals/partials/fieldset-select.blade.php b/resources/views/modals/partials/fieldset-select.blade.php
index 0fd21242c09c..ec1e178f221e 100644
--- a/resources/views/modals/partials/fieldset-select.blade.php
+++ b/resources/views/modals/partials/fieldset-select.blade.php
@@ -5,7 +5,7 @@
         <x-input.select
             name="fieldset_id"
             id="modal-fieldset_id"
-            :items="Helper::customFieldsetList()"
+            :options="Helper::customFieldsetList()"
             :selected="old('fieldset_id')"
             style="width:100%;"
         />
diff --git a/resources/views/modals/statuslabel.blade.php b/resources/views/modals/statuslabel.blade.php
index 7025f6a5e85a..a6676c9292a0 100644
--- a/resources/views/modals/statuslabel.blade.php
+++ b/resources/views/modals/statuslabel.blade.php
@@ -20,7 +20,7 @@
                         <x-input.select
                             name="type"
                             id="modal-type"
-                            :items="$statuslabel_types"
+                            :options="$statuslabel_types"
                             required
                             style="width:100%;"
                         />
diff --git a/resources/views/models/bulk-edit.blade.php b/resources/views/models/bulk-edit.blade.php
index 2549772f2554..6d5bc3a443aa 100644
--- a/resources/views/models/bulk-edit.blade.php
+++ b/resources/views/models/bulk-edit.blade.php
@@ -65,7 +65,7 @@
                                     <x-input.select
                                         name="fieldset_id"
                                         class="js-fieldset-field"
-                                        :items="$fieldset_list"
+                                        :options="$fieldset_list"
                                         :selected="old('fieldset_id', 'NC')"
                                         style="width:350px"
                                     />
@@ -82,7 +82,7 @@ class="js-fieldset-field"
                                 <div class="col-md-7">
                                     <x-input.select
                                         name="depreciation_id"
-                                        :items="$depreciation_list"
+                                        :options="$depreciation_list"
                                         :selected="old('depreciation_id', 'NC')"
                                         style="width:350px"
                                     />
diff --git a/resources/views/models/custom_fields_form.blade.php b/resources/views/models/custom_fields_form.blade.php
index 34734f20ca20..4a5424b15951 100644
--- a/resources/views/models/custom_fields_form.blade.php
+++ b/resources/views/models/custom_fields_form.blade.php
@@ -12,7 +12,7 @@
                   <x-input.select
                       :name="$field->db_column_name()"
                       class="format form-control"
-                      :items="$field->formatFieldValuesAsArray()"
+                      :options="$field->formatFieldValuesAsArray()"
                       :selected="old($field->db_column_name(), (isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id)))"
                       :required="$field->pivot->required == '1'"
                   />
diff --git a/resources/views/models/custom_fields_form_bulk_edit.blade.php b/resources/views/models/custom_fields_form_bulk_edit.blade.php
index 5e8966f11bcc..7e38a9a41345 100644
--- a/resources/views/models/custom_fields_form_bulk_edit.blade.php
+++ b/resources/views/models/custom_fields_form_bulk_edit.blade.php
@@ -27,7 +27,7 @@
                   <x-input.select
                       :name="$field->db_column_name()"
                       class="format form-control"
-                      :items="$field->formatFieldValuesAsArray()"
+                      :options="$field->formatFieldValuesAsArray()"
                       :selected="old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id)))"
                   />
 
diff --git a/resources/views/partials/forms/edit/depreciation.blade.php b/resources/views/partials/forms/edit/depreciation.blade.php
index d702ae59e70e..a1cef25add58 100644
--- a/resources/views/partials/forms/edit/depreciation.blade.php
+++ b/resources/views/partials/forms/edit/depreciation.blade.php
@@ -5,7 +5,7 @@
         <x-input.select
             name="depreciation_id"
             id="depreciation_id"
-            :items="$depreciation_list"
+            :options="$depreciation_list"
             :selected="old('depreciation_id', $item->depreciation_id)"
             aria-label="depreciation_id"
             style="width:350px;"
diff --git a/resources/views/partials/forms/edit/maintenance_type.blade.php b/resources/views/partials/forms/edit/maintenance_type.blade.php
index d44d81b1f3ef..921715cf59d9 100644
--- a/resources/views/partials/forms/edit/maintenance_type.blade.php
+++ b/resources/views/partials/forms/edit/maintenance_type.blade.php
@@ -5,7 +5,7 @@
               <div class="col-md-7">
                   <x-input.select
                       name="asset_maintenance_type"
-                      :items="$assetMaintenanceType"
+                      :options="$assetMaintenanceType"
                       :selected="old('asset_maintenance_type', $item->asset_maintenance_type)"
                       aria-label="asset_maintenance_type"
                       style="width:100%;"
diff --git a/resources/views/partials/forms/edit/status.blade.php b/resources/views/partials/forms/edit/status.blade.php
index 8acb9ca17cd8..6a60f97b2310 100644
--- a/resources/views/partials/forms/edit/status.blade.php
+++ b/resources/views/partials/forms/edit/status.blade.php
@@ -6,7 +6,7 @@
             name="status_id"
             id="status_select_id"
             class="status_id"
-            :items="$statuslabel_list"
+            :options="$statuslabel_list"
             :selected="old('status_id', $item->status_id)"
             aria-label="status_id"
             :required="$required"
diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php
index 5bae1452b4f9..0b0a4dab2492 100644
--- a/resources/views/settings/branding.blade.php
+++ b/resources/views/settings/branding.blade.php
@@ -71,7 +71,7 @@
                                     class="form-control"
                                     name="brand"
                                     id="brand"
-                                    :items="['1'=>'Text','2'=>'Logo','3'=>'Logo + Text']"
+                                    :options="['1'=>'Text','2'=>'Logo','3'=>'Logo + Text']"
                                     :selected="old('brand', $setting->brand)"
                                     style="width: 150px"
                                 />
@@ -262,7 +262,7 @@ class="form-control"
                                     <x-input.select
                                         name="support_footer"
                                         id="support_footer"
-                                        :items="['on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only']"
+                                        :options="['on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only']"
                                         :selected="old('support_footer', $setting->support_footer)"
                                         class="form-control disabled"
                                         style="width: 150px"
@@ -273,7 +273,7 @@ class="form-control disabled"
                                     <x-input.select
                                         name="support_footer"
                                         id="support_footer"
-                                        :items="['on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only']"
+                                        :options="['on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only']"
                                         :selected="old('support_footer', $setting->support_footer)"
                                         class="form-control"
                                         style="width: 150px"
@@ -296,7 +296,7 @@ class="form-control"
                                     <x-input.select
                                         name="version_footer"
                                         id="version_footer"
-                                        :items="['on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only']"
+                                        :options="['on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only']"
                                         :selected="old('version_footer', $setting->version_footer)"
                                         class="form-control disabled"
                                         style="width: 150px"
@@ -307,7 +307,7 @@ class="form-control disabled"
                                     <x-input.select
                                         name="version_footer"
                                         id="version_footer"
-                                        :items="['on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only']"
+                                        :options="['on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only']"
                                         :selected="old('version_footer', $setting->version_footer)"
                                         class="form-control"
                                         style="width: 150px"
diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php
index b5892f2cf8d8..a69546f5d679 100644
--- a/resources/views/settings/general.blade.php
+++ b/resources/views/settings/general.blade.php
@@ -361,7 +361,7 @@
                            <div class="col-md-9">
                                <x-input.select
                                    name="dash_chart_type"
-                                   :items="['name' => 'Status Label Name', 'type' => 'Status Label Type']"
+                                   :options="['name' => 'Status Label Name', 'type' => 'Status Label Type']"
                                    :selected="old('dash_chart_type', $setting->dash_chart_type)"
                                    style="width: 80%"
                                />
@@ -378,7 +378,7 @@
                                <x-input.select
                                    name="depreciation_method"
                                    id="depreciation_method"
-                                   :items="['default' => 'Linear (default)', 'half_1' => 'Half-year convention, always applied', 'half_2' => 'Half-year convention, applied with condition']"
+                                   :options="['default' => 'Linear (default)', 'half_1' => 'Half-year convention, always applied', 'half_2' => 'Half-year convention, applied with condition']"
                                    :selected="old('depreciation_method', $setting->depreciation_method)"
                                    style="width: 80%"
                                />
diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index 88658f328639..dbffc7ddce89 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -174,7 +174,7 @@ class="table table-striped snipe-table"
                                             class="col-md-4"
                                             name="label2_1d_type"
                                             id="label2_1d_type"
-                                            :items="$select1DValues"
+                                            :options="$select1DValues"
                                             :selected="old('label2_1d_type', $setting->label2_1d_type)"
                                             aria-label="label2_1d_type"
                                         />
@@ -224,7 +224,7 @@ class="col-md-4"
                                             class="col-md-4"
                                             name="label2_2d_type"
                                             id="label2_2d_type"
-                                            :items="$select2DValues"
+                                            :options="$select2DValues"
                                             :selected="old('label2_2d_type', $setting->label2_2d_type)"
                                             aria-label="label2_2d_type"
                                         />
@@ -297,7 +297,7 @@ class="col-md-4"
                                         class="col-md-4"
                                         name="label2_2d_target"
                                         id="label2_2d_target"
-                                        :items="['hardware_id'=>'/hardware/{id} ('.trans('admin/settings/general.default').')', 'ht_tag'=>'/ht/{asset_tag}']"
+                                        :options="['hardware_id'=>'/hardware/{id} ('.trans('admin/settings/general.default').')', 'ht_tag'=>'/ht/{asset_tag}']"
                                         :selected="old('label2_2d_target', $setting->label2_2d_target)"
                                         aria-label="label2_2d_target"
                                     />
diff --git a/resources/views/statuslabels/edit.blade.php b/resources/views/statuslabels/edit.blade.php
index 4843b5046c0c..27fb91148b92 100755
--- a/resources/views/statuslabels/edit.blade.php
+++ b/resources/views/statuslabels/edit.blade.php
@@ -29,7 +29,7 @@
     <div class="col-md-7 required">
         <x-input.select
             name="statuslabel_types"
-            :items="$statuslabel_types"
+            :options="$statuslabel_types"
             :selected="$item->getStatuslabelType()"
             style="width: 100%; min-width:400px"
             aria-label="statuslabel_types"
diff --git a/resources/views/users/confirm-bulk-delete.blade.php b/resources/views/users/confirm-bulk-delete.blade.php
index 7ea40120bf95..0234ce576b2f 100644
--- a/resources/views/users/confirm-bulk-delete.blade.php
+++ b/resources/views/users/confirm-bulk-delete.blade.php
@@ -112,7 +112,7 @@
                       <x-input.select
                           name="status_id"
                           id="status_id"
-                          :items="$statuslabel_list"
+                          :options="$statuslabel_list"
                           :selected="old('status_id')"
                           required
                           style="width:250px"

From cef196f30ab65734de81c38fa10e17a11ad370e0 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 17 Dec 2024 12:13:47 -0800
Subject: [PATCH 23/28] Move name to first attribute

---
 resources/views/custom_fields/fields/edit.blade.php | 2 +-
 resources/views/settings/branding.blade.php         | 2 +-
 resources/views/settings/labels.blade.php           | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php
index b9e4847062e3..b4254fed23d0 100644
--- a/resources/views/custom_fields/fields/edit.blade.php
+++ b/resources/views/custom_fields/fields/edit.blade.php
@@ -89,8 +89,8 @@
               @endphp
             <div class="col-md-8 required">
               <x-input.select
-                class="format form-control"
                 name="format"
+                class="format form-control"
                 :options="Helper::predefined_formats()"
                 :selected="($field_format == '') ? $field->format : $field_format"
                 style="width:100%"
diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php
index 0b0a4dab2492..d050ba382fb0 100644
--- a/resources/views/settings/branding.blade.php
+++ b/resources/views/settings/branding.blade.php
@@ -68,8 +68,8 @@
                             </div>
                             <div class="col-md-9">
                                 <x-input.select
-                                    class="form-control"
                                     name="brand"
+                                    class="form-control"
                                     id="brand"
                                     :options="['1'=>'Text','2'=>'Logo','3'=>'Logo + Text']"
                                     :selected="old('brand', $setting->brand)"
diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index dbffc7ddce89..97fdb5fbd0f5 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -171,8 +171,8 @@ class="table table-striped snipe-table"
                                             ];
                                         @endphp
                                         <x-input.select
-                                            class="col-md-4"
                                             name="label2_1d_type"
+                                            class="col-md-4"
                                             id="label2_1d_type"
                                             :options="$select1DValues"
                                             :selected="old('label2_1d_type', $setting->label2_1d_type)"
@@ -221,8 +221,8 @@ class="col-md-4"
                                             ]);
                                         @endphp
                                         <x-input.select
-                                            class="col-md-4"
                                             name="label2_2d_type"
+                                            class="col-md-4"
                                             id="label2_2d_type"
                                             :options="$select2DValues"
                                             :selected="old('label2_2d_type', $setting->label2_2d_type)"
@@ -294,8 +294,8 @@ class="col-md-4"
                                 </div>
                                 <div class="col-md-9">
                                     <x-input.select
-                                        class="col-md-4"
                                         name="label2_2d_target"
+                                        class="col-md-4"
                                         id="label2_2d_target"
                                         :options="['hardware_id'=>'/hardware/{id} ('.trans('admin/settings/general.default').')', 'ht_tag'=>'/ht/{asset_tag}']"
                                         :selected="old('label2_2d_target', $setting->label2_2d_target)"

From b557ca623a1b7b3b47c57b26fb59fe6be9bfe924 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 17 Dec 2024 12:24:47 -0800
Subject: [PATCH 24/28] Standardize attribute order

---
 resources/views/categories/edit.blade.php                 | 2 +-
 resources/views/custom_fields/fields/edit.blade.php       | 2 +-
 resources/views/hardware/checkin.blade.php                | 2 +-
 resources/views/hardware/quickscan-checkin.blade.php      | 2 +-
 .../custom-field-set-default-values-for-model.blade.php   | 6 +++---
 resources/views/livewire/importer.blade.php               | 8 ++++----
 resources/views/livewire/slack-settings-form.blade.php    | 6 +++---
 resources/views/models/bulk-edit.blade.php                | 2 +-
 resources/views/models/custom_fields_form.blade.php       | 2 +-
 .../views/models/custom_fields_form_bulk_edit.blade.php   | 2 +-
 .../views/partials/forms/edit/depreciation.blade.php      | 2 +-
 .../views/partials/forms/edit/maintenance_type.blade.php  | 4 ++--
 resources/views/partials/forms/edit/status.blade.php      | 4 ++--
 resources/views/settings/branding.blade.php               | 6 +++---
 resources/views/settings/labels.blade.php                 | 6 +++---
 15 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/resources/views/categories/edit.blade.php b/resources/views/categories/edit.blade.php
index d513424953c3..d19e44dcd42c 100755
--- a/resources/views/categories/edit.blade.php
+++ b/resources/views/categories/edit.blade.php
@@ -19,9 +19,9 @@
             name="category_type"
             :options="$category_types"
             :selected="old('category_type', $item->category_type)"
+            :disabled="$item->category_type!='' || $item->itemCount() > 0"
             style="min-width:350px"
             aria-label="category_type"
-            :disabled="$item->category_type!='' || $item->itemCount() > 0"
         />
         {!! $errors->first('category_type', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php
index b4254fed23d0..0951556c46a8 100644
--- a/resources/views/custom_fields/fields/edit.blade.php
+++ b/resources/views/custom_fields/fields/edit.blade.php
@@ -90,9 +90,9 @@
             <div class="col-md-8 required">
               <x-input.select
                 name="format"
-                class="format form-control"
                 :options="Helper::predefined_formats()"
                 :selected="($field_format == '') ? $field->format : $field_format"
+                class="format form-control"
                 style="width:100%"
                 aria-label="format"
               />
diff --git a/resources/views/hardware/checkin.blade.php b/resources/views/hardware/checkin.blade.php
index e6c57f6b3b33..ef318926988d 100755
--- a/resources/views/hardware/checkin.blade.php
+++ b/resources/views/hardware/checkin.blade.php
@@ -86,8 +86,8 @@
                                             <div class="col-md-8 required">
                                                 <x-input.select
                                                     name="status_id"
-                                                    :options="$statusLabel_list"
                                                     id="modal-statuslabel_types"
+                                                    :options="$statusLabel_list"
                                                     style="width: 100%"
                                                     aria-label="status_id"
                                                 />
diff --git a/resources/views/hardware/quickscan-checkin.blade.php b/resources/views/hardware/quickscan-checkin.blade.php
index 62e7e4231512..53b038b1236e 100644
--- a/resources/views/hardware/quickscan-checkin.blade.php
+++ b/resources/views/hardware/quickscan-checkin.blade.php
@@ -51,8 +51,8 @@
                                 name="status_id"
                                 id="status_id"
                                 :options="$statusLabel_list"
-                                aria-label="status_id"
                                 style="width:100%"
+                                aria-label="status_id"
                             />
                             {!! $errors->first('status_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
                         </div>
diff --git a/resources/views/livewire/custom-field-set-default-values-for-model.blade.php b/resources/views/livewire/custom-field-set-default-values-for-model.blade.php
index 7cb67e46fa21..a18b7d60c48f 100644
--- a/resources/views/livewire/custom-field-set-default-values-for-model.blade.php
+++ b/resources/views/livewire/custom-field-set-default-values-for-model.blade.php
@@ -7,12 +7,12 @@
             <x-input.select
                 name="fieldset_id"
                 id="fieldset_id"
-                class="js-fieldset-field"
                 :options="Helper::customFieldsetList()"
                 :selected="old('fieldset_id', $fieldset_id)"
-                aria-label="custom_fieldset"
-                style="width:100%; min-width:350px;"
                 :for-livewire="true"
+                class="js-fieldset-field"
+                style="width:100%; min-width:350px;"
+                aria-label="custom_fieldset"
             />
             {!! $errors->first('custom_fieldset', '<span class="alert-msg" aria-hidden="true"><br><i class="fas fa-times"></i> :message</span>') !!}
         </div>
diff --git a/resources/views/livewire/importer.blade.php b/resources/views/livewire/importer.blade.php
index 1805cad57c06..f2fd5d2b2873 100644
--- a/resources/views/livewire/importer.blade.php
+++ b/resources/views/livewire/importer.blade.php
@@ -161,14 +161,14 @@ class="col-md-12 table table-striped snipe-table">
                                                                         :options="$importTypes"
                                                                         :selected="$typeOfImport"
                                                                         :for-livewire="true"
+                                                                        :data-livewire-component="$this->getId()"
                                                                         :include-empty="true"
-                                                                        style="min-width: 350px;"
                                                                         :data-placeholder="trans('general.select_var', ['thing' => trans('general.import_type')])"
                                                                         {{--placeholder needed so that the form-helper will put an empty option first--}}
                                                                         placeholder=""
                                                                         {{--Remove this if the list gets long enough that we need to search--}}
                                                                         data-minimum-results-for-search="-1"
-                                                                        :data-livewire-component="$this->getId()"
+                                                                        style="min-width: 350px;"
                                                                     />
                                                                     @if ($typeOfImport === 'asset' && $snipeSettings->auto_increment_assets == 0)
                                                                         <p class="help-block">
@@ -246,11 +246,11 @@ class="col-md-12 table table-striped snipe-table">
                                                                             <div class="col-md-4">
                                                                                 <x-input.select
                                                                                     :name="'field_map.'.$index"
-                                                                                    class="mappings"
                                                                                     :for-livewire="true"
+                                                                                    :data-livewire-component="$this->getId()"
                                                                                     :placeholder="trans('general.importer.do_not_import')"
+                                                                                    class="mappings"
                                                                                     style="min-width: 100%;"
-                                                                                    :data-livewire-component="$this->getId()"
                                                                                 >
                                                                                     <option selected="selected" value="">Do Not Import</option>
                                                                                     @foreach($columnOptions[$typeOfImport] as $key => $value)
diff --git a/resources/views/livewire/slack-settings-form.blade.php b/resources/views/livewire/slack-settings-form.blade.php
index b87996a79d87..09b4b0347404 100644
--- a/resources/views/livewire/slack-settings-form.blade.php
+++ b/resources/views/livewire/slack-settings-form.blade.php
@@ -69,13 +69,13 @@
                                 <x-input.select
                                     name="webhook_selected"
                                     id="select2"
-                                    class="form-control"
                                     :options="['slack' => trans('admin/settings/general.slack'), 'general' => trans('admin/settings/general.general_webhook'),'google' => trans('admin/settings/general.google_workspaces'), 'microsoft' => trans('admin/settings/general.ms_teams')]"
                                     :selected="old('webhook_selected', $webhook_selected)"
-                                    aria-label="webhook_selected"
+                                    :disabled="Helper::isDemoMode()"
                                     data-minimum-results-for-search="-1"
+                                    class="form-control"
                                     style="width:100%"
-                                    :disabled="Helper::isDemoMode()"
+                                    aria-label="webhook_selected"
                                 />
                             </div>
                         </div>
diff --git a/resources/views/models/bulk-edit.blade.php b/resources/views/models/bulk-edit.blade.php
index 6d5bc3a443aa..553914947175 100644
--- a/resources/views/models/bulk-edit.blade.php
+++ b/resources/views/models/bulk-edit.blade.php
@@ -64,9 +64,9 @@
                                 <div class="col-md-7">
                                     <x-input.select
                                         name="fieldset_id"
-                                        class="js-fieldset-field"
                                         :options="$fieldset_list"
                                         :selected="old('fieldset_id', 'NC')"
+                                        class="js-fieldset-field"
                                         style="width:350px"
                                     />
                                     {!! $errors->first('fieldset_id', '<span class="alert-msg" aria-hidden="true"><br><i class="fas fa-times"></i> :message</span>') !!}
diff --git a/resources/views/models/custom_fields_form.blade.php b/resources/views/models/custom_fields_form.blade.php
index 4a5424b15951..1da3609c929a 100644
--- a/resources/views/models/custom_fields_form.blade.php
+++ b/resources/views/models/custom_fields_form.blade.php
@@ -11,10 +11,10 @@
                   <!-- Listbox -->
                   <x-input.select
                       :name="$field->db_column_name()"
-                      class="format form-control"
                       :options="$field->formatFieldValuesAsArray()"
                       :selected="old($field->db_column_name(), (isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id)))"
                       :required="$field->pivot->required == '1'"
+                      class="format form-control"
                   />
 
               @elseif ($field->element=='textarea')
diff --git a/resources/views/models/custom_fields_form_bulk_edit.blade.php b/resources/views/models/custom_fields_form_bulk_edit.blade.php
index 7e38a9a41345..cea495ccd2e3 100644
--- a/resources/views/models/custom_fields_form_bulk_edit.blade.php
+++ b/resources/views/models/custom_fields_form_bulk_edit.blade.php
@@ -26,9 +26,9 @@
               @if ($field->element=='listbox')
                   <x-input.select
                       :name="$field->db_column_name()"
-                      class="format form-control"
                       :options="$field->formatFieldValuesAsArray()"
                       :selected="old($field->db_column_name(),(isset($item) ? Helper::gracefulDecrypt($field, $item->{$field->db_column_name()}) : $field->defaultValue($model->id)))"
+                      class="format form-control"
                   />
 
               @elseif ($field->element=='textarea')
diff --git a/resources/views/partials/forms/edit/depreciation.blade.php b/resources/views/partials/forms/edit/depreciation.blade.php
index a1cef25add58..8195ac394ef0 100644
--- a/resources/views/partials/forms/edit/depreciation.blade.php
+++ b/resources/views/partials/forms/edit/depreciation.blade.php
@@ -7,8 +7,8 @@
             id="depreciation_id"
             :options="$depreciation_list"
             :selected="old('depreciation_id', $item->depreciation_id)"
-            aria-label="depreciation_id"
             style="width:350px;"
+            aria-label="depreciation_id"
         />
         {!! $errors->first('depreciation_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
diff --git a/resources/views/partials/forms/edit/maintenance_type.blade.php b/resources/views/partials/forms/edit/maintenance_type.blade.php
index 921715cf59d9..b82bead76b04 100644
--- a/resources/views/partials/forms/edit/maintenance_type.blade.php
+++ b/resources/views/partials/forms/edit/maintenance_type.blade.php
@@ -7,9 +7,9 @@
                       name="asset_maintenance_type"
                       :options="$assetMaintenanceType"
                       :selected="old('asset_maintenance_type', $item->asset_maintenance_type)"
-                      aria-label="asset_maintenance_type"
-                      style="width:100%;"
                       :required="Helper::checkIfRequired($item, 'asset_maintenance_type')"
+                      style="width:100%;"
+                      aria-label="asset_maintenance_type"
                   />
                   {!! $errors->first('asset_maintenance_type', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
               </div>
diff --git a/resources/views/partials/forms/edit/status.blade.php b/resources/views/partials/forms/edit/status.blade.php
index 6a60f97b2310..01dd14612e7a 100644
--- a/resources/views/partials/forms/edit/status.blade.php
+++ b/resources/views/partials/forms/edit/status.blade.php
@@ -5,12 +5,12 @@
         <x-input.select
             name="status_id"
             id="status_select_id"
-            class="status_id"
             :options="$statuslabel_list"
             :selected="old('status_id', $item->status_id)"
-            aria-label="status_id"
             :required="$required"
+            class="status_id"
             style="width:100%;"
+            aria-label="status_id"
         />
         {!! $errors->first('status_id', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
     </div>
diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php
index d050ba382fb0..4dbf9c934fe5 100644
--- a/resources/views/settings/branding.blade.php
+++ b/resources/views/settings/branding.blade.php
@@ -69,10 +69,10 @@
                             <div class="col-md-9">
                                 <x-input.select
                                     name="brand"
-                                    class="form-control"
                                     id="brand"
                                     :options="['1'=>'Text','2'=>'Logo','3'=>'Logo + Text']"
                                     :selected="old('brand', $setting->brand)"
+                                    class="form-control"
                                     style="width: 150px"
                                 />
                                 {!! $errors->first('brand', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
@@ -264,9 +264,9 @@ class="form-control"
                                         id="support_footer"
                                         :options="['on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only']"
                                         :selected="old('support_footer', $setting->support_footer)"
+                                        disabled
                                         class="form-control disabled"
                                         style="width: 150px"
-                                        disabled
                                     />
                                     <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
                                 @else
@@ -298,9 +298,9 @@ class="form-control"
                                         id="version_footer"
                                         :options="['on'=>'Enabled','off'=>'Disabled','admin'=>'Superadmin Only']"
                                         :selected="old('version_footer', $setting->version_footer)"
+                                        disabled
                                         class="form-control disabled"
                                         style="width: 150px"
-                                        disabled
                                     />
                                     <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
                                 @else
diff --git a/resources/views/settings/labels.blade.php b/resources/views/settings/labels.blade.php
index 97fdb5fbd0f5..4e7450fc2968 100644
--- a/resources/views/settings/labels.blade.php
+++ b/resources/views/settings/labels.blade.php
@@ -172,10 +172,10 @@ class="table table-striped snipe-table"
                                         @endphp
                                         <x-input.select
                                             name="label2_1d_type"
-                                            class="col-md-4"
                                             id="label2_1d_type"
                                             :options="$select1DValues"
                                             :selected="old('label2_1d_type', $setting->label2_1d_type)"
+                                            class="col-md-4"
                                             aria-label="label2_1d_type"
                                         />
                                         {!! $errors->first('label2_1d_type', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
@@ -222,10 +222,10 @@ class="col-md-4"
                                         @endphp
                                         <x-input.select
                                             name="label2_2d_type"
-                                            class="col-md-4"
                                             id="label2_2d_type"
                                             :options="$select2DValues"
                                             :selected="old('label2_2d_type', $setting->label2_2d_type)"
+                                            class="col-md-4"
                                             aria-label="label2_2d_type"
                                         />
                                         {!! $errors->first('label2_2d_type', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
@@ -295,10 +295,10 @@ class="col-md-4"
                                 <div class="col-md-9">
                                     <x-input.select
                                         name="label2_2d_target"
-                                        class="col-md-4"
                                         id="label2_2d_target"
                                         :options="['hardware_id'=>'/hardware/{id} ('.trans('admin/settings/general.default').')', 'ht_tag'=>'/ht/{asset_tag}']"
                                         :selected="old('label2_2d_target', $setting->label2_2d_target)"
+                                        class="col-md-4"
                                         aria-label="label2_2d_target"
                                     />
                                     {!! $errors->first('label2_2d_target', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}

From f9dc650acabdd7a23029692bb0430cdf73d821aa Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 17 Dec 2024 15:28:18 -0800
Subject: [PATCH 25/28] Remove unneeded attribute

---
 resources/views/livewire/importer.blade.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/resources/views/livewire/importer.blade.php b/resources/views/livewire/importer.blade.php
index f2fd5d2b2873..de0f9fb1b3f9 100644
--- a/resources/views/livewire/importer.blade.php
+++ b/resources/views/livewire/importer.blade.php
@@ -161,7 +161,6 @@ class="col-md-12 table table-striped snipe-table">
                                                                         :options="$importTypes"
                                                                         :selected="$typeOfImport"
                                                                         :for-livewire="true"
-                                                                        :data-livewire-component="$this->getId()"
                                                                         :include-empty="true"
                                                                         :data-placeholder="trans('general.select_var', ['thing' => trans('general.import_type')])"
                                                                         {{--placeholder needed so that the form-helper will put an empty option first--}}
@@ -247,7 +246,6 @@ class="col-md-12 table table-striped snipe-table">
                                                                                 <x-input.select
                                                                                     :name="'field_map.'.$index"
                                                                                     :for-livewire="true"
-                                                                                    :data-livewire-component="$this->getId()"
                                                                                     :placeholder="trans('general.importer.do_not_import')"
                                                                                     class="mappings"
                                                                                     style="min-width: 100%;"

From 496cf93b68b37cd0a0d9c089045fdde268a76b76 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 17 Dec 2024 15:28:56 -0800
Subject: [PATCH 26/28] Improve comment

---
 resources/views/blade/input/select.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/blade/input/select.blade.php b/resources/views/blade/input/select.blade.php
index 58f398024dd6..c96b5e177220 100644
--- a/resources/views/blade/input/select.blade.php
+++ b/resources/views/blade/input/select.blade.php
@@ -1,5 +1,5 @@
 @props([
-    // options can either be provided as key => value pairs
+    // <options> can either be provided as key => value pairs
     // or passed in via the default $slot
     'options',
     'selected' => null,

From 848cd6219a67189f4f57a577787cf2913edaff4f Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 17 Dec 2024 15:32:31 -0800
Subject: [PATCH 27/28] Formatting

---
 .../views/custom_fields/fields/edit.blade.php |  8 ++++-
 .../livewire/category-edit-form.blade.php     |  7 ++++-
 resources/views/modals/upload-file.blade.php  |  8 ++++-
 resources/views/settings/branding.blade.php   | 30 ++++++++++++++++---
 resources/views/settings/general.blade.php    |  6 +++-
 resources/views/settings/saml.blade.php       | 21 +++++++++++--
 6 files changed, 69 insertions(+), 11 deletions(-)

diff --git a/resources/views/custom_fields/fields/edit.blade.php b/resources/views/custom_fields/fields/edit.blade.php
index 0951556c46a8..1718dca67750 100644
--- a/resources/views/custom_fields/fields/edit.blade.php
+++ b/resources/views/custom_fields/fields/edit.blade.php
@@ -70,7 +70,13 @@
               {{ trans('admin/custom_fields/general.field_values') }}
             </label>
             <div class="col-md-8 required">
-                <x-input.textarea name="field_values" :value="old('field_values', $field->field_values)" style="width: 100%" rows="4" aria-label="field_values"/>
+                <x-input.textarea
+                    name="field_values"
+                    :value="old('field_values', $field->field_values)"
+                    style="width: 100%"
+                    rows="4"
+                    aria-label="field_values"
+                />
               {!! $errors->first('field_values', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
               <p class="help-block">{{ trans('admin/custom_fields/general.field_values_help') }}</p>
             </div>
diff --git a/resources/views/livewire/category-edit-form.blade.php b/resources/views/livewire/category-edit-form.blade.php
index 643a14049949..82dbf57e85b6 100644
--- a/resources/views/livewire/category-edit-form.blade.php
+++ b/resources/views/livewire/category-edit-form.blade.php
@@ -3,7 +3,12 @@
     <div class="form-group {{ $errors->has('eula_text') ? 'error' : '' }}">
         <label for="eula_text" class="col-md-3 control-label">{{ trans('admin/categories/general.eula_text') }}</label>
         <div class="col-md-7">
-            <x-input.textarea name="eula_text" wire:model.live="eulaText" aria-label="eula_text" :disabled="$this->eulaTextDisabled" />
+            <x-input.textarea
+                name="eula_text"
+                wire:model.live="eulaText"
+                aria-label="eula_text"
+                :disabled="$this->eulaTextDisabled"
+            />
             <p class="help-block">{!! trans('admin/categories/general.eula_text_help') !!} </p>
             <p class="help-block">{!! trans('admin/settings/general.eula_markdown') !!} </p>
             {!! $errors->first('eula_text', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
diff --git a/resources/views/modals/upload-file.blade.php b/resources/views/modals/upload-file.blade.php
index 184110fb0f80..491eca2721d3 100644
--- a/resources/views/modals/upload-file.blade.php
+++ b/resources/views/modals/upload-file.blade.php
@@ -31,7 +31,13 @@
                     </div>
 
                     <div class="col-md-12">
-                        <x-input.textarea name="notes" :value="old('notes')" placeholder="Notes (Optional)" rows="3" aria-label="file"/>
+                        <x-input.textarea
+                            name="notes"
+                            :value="old('notes')"
+                            placeholder="Notes (Optional)"
+                            rows="3"
+                            aria-label="file"
+                        />
                     </div>
                 </div>
 
diff --git a/resources/views/settings/branding.blade.php b/resources/views/settings/branding.blade.php
index 4dbf9c934fe5..6fdb1f994d2d 100644
--- a/resources/views/settings/branding.blade.php
+++ b/resources/views/settings/branding.blade.php
@@ -240,11 +240,22 @@ class="form-control"
                             </div>
                             <div class="col-md-9">
                                 @if (config('app.lock_passwords')===true)
-                                    <x-input.textarea name="custom_css" :value="old('custom_css', $setting->custom_css)" placeholder="Add your custom CSS" aria-label="custom_css" disabled/>
+                                    <x-input.textarea
+                                        name="custom_css"
+                                        :value="old('custom_css', $setting->custom_css)"
+                                        placeholder="Add your custom CSS"
+                                        aria-label="custom_css"
+                                        disabled
+                                    />
                                     {!! $errors->first('custom_css', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                                     <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
                                 @else
-                                    <x-input.textarea name="custom_css" :value="old('custom_css', $setting->custom_css)" placeholder="Add your custom CSS" aria-label="custom_css"/>
+                                    <x-input.textarea
+                                        name="custom_css"
+                                        :value="old('custom_css', $setting->custom_css)"
+                                        placeholder="Add your custom CSS"
+                                        aria-label="custom_css"
+                                    />
                                     {!! $errors->first('custom_css', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                                 @endif
                                 <p class="help-block">{!! trans('admin/settings/general.custom_css_help') !!}</p>
@@ -326,10 +337,21 @@ class="form-control"
                             </div>
                             <div class="col-md-9">
                                 @if (config('app.lock_passwords')===true)
-                                    <x-input.textarea name="footer_text" :value="old('footer_text', $setting->footer_text)" rows="4" placeholder="Optional footer text" disabled/>
+                                    <x-input.textarea
+                                        name="footer_text"
+                                        :value="old('footer_text', $setting->footer_text)"
+                                        rows="4"
+                                        placeholder="Optional footer text"
+                                        disabled
+                                    />
                                     <p class="text-warning"><i class="fas fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
                                 @else
-                                    <x-input.textarea name="footer_text" :value="old('footer_text', $setting->footer_text)" rows="4" placeholder="Optional footer text"/>
+                                    <x-input.textarea
+                                        name="footer_text"
+                                        :value="old('footer_text', $setting->footer_text)"
+                                        rows="4"
+                                        placeholder="Optional footer text"
+                                    />
                                 @endif
                                 <p class="help-block">{!! trans('admin/settings/general.footer_text_help') !!}</p>
                                 {!! $errors->first('footer_text', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
diff --git a/resources/views/settings/general.blade.php b/resources/views/settings/general.blade.php
index a69546f5d679..564f6bff2fbf 100644
--- a/resources/views/settings/general.blade.php
+++ b/resources/views/settings/general.blade.php
@@ -208,7 +208,11 @@
                            {{ Form::label('default_eula_text', trans('admin/settings/general.default_eula_text')) }}
                        </div>
                        <div class="col-md-9">
-                           <x-input.textarea name="default_eula_text" :value="old('default_eula_text', $setting->default_eula_text)" placeholder="Add your default EULA text"/>
+                           <x-input.textarea
+                               name="default_eula_text"
+                               :value="old('default_eula_text', $setting->default_eula_text)"
+                               placeholder="Add your default EULA text"
+                           />
                            {!! $errors->first('default_eula_text', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                            <p class="help-block">{{ trans('admin/settings/general.default_eula_help_text') }}</p>
                            <p class="help-block">{!! trans('admin/settings/general.eula_markdown') !!}</p>
diff --git a/resources/views/settings/saml.blade.php b/resources/views/settings/saml.blade.php
index 3beb639c1536..497923a60e03 100644
--- a/resources/views/settings/saml.blade.php
+++ b/resources/views/settings/saml.blade.php
@@ -83,7 +83,12 @@
                                     <!-- SAML SP Certificate -->
                                     @if (!empty($setting->saml_sp_x509cert))
                                         {{ Form::label('saml_sp_x509cert', trans('admin/settings/general.saml_sp_x509cert')) }}
-                                        <x-input.textarea name="saml_sp_x509cert" :value="$setting->saml_sp_x509cert" wrap="off" readonly/>
+                                        <x-input.textarea
+                                            name="saml_sp_x509cert"
+                                            :value="$setting->saml_sp_x509cert"
+                                            wrap="off"
+                                            readonly
+                                        />
                                         <br>
                                     @endif
                                     <!-- SAML SP Metadata URL -->
@@ -106,7 +111,12 @@
                             {{ Form::label('saml_idp_metadata', trans('admin/settings/general.saml_idp_metadata')) }}
                         </div>
                         <div class="col-md-9">
-                            <x-input.textarea name="saml_idp_metadata" :value="old('saml_idp_metadata', $setting->saml_idp_metadata)" placeholder="https://example.com/idp/metadata" wrap="off"/>
+                            <x-input.textarea
+                                name="saml_idp_metadata"
+                                :value="old('saml_idp_metadata', $setting->saml_idp_metadata)"
+                                placeholder="https://example.com/idp/metadata"
+                                wrap="off"
+                            />
                             {!! $errors->first('saml_idp_metadata', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}<br>
                             <button type="button" class="btn btn-default" id="saml_idp_metadata_upload_btn" {{ $setting->demoMode }}>{{ trans('button.select_file') }}</button>
                             <input type="file" class="js-uploadFile" id="saml_idp_metadata_upload"
@@ -166,7 +176,12 @@
                             {{ Form::label('saml_custom_settings', trans('admin/settings/general.saml_custom_settings')) }}
                         </div>
                         <div class="col-md-9">
-                            <x-input.textarea name="saml_custom_settings" :value="old('saml_custom_settings', $setting->saml_custom_settings)" placeholder="example.option=false&#13;&#10;sp_x509cert=file:///...&#13;&#10;sp_private_key=file:///" wrap="off"/>
+                            <x-input.textarea
+                                name="saml_custom_settings"
+                                :value="old('saml_custom_settings', $setting->saml_custom_settings)"
+                                placeholder="example.option=false&#13;&#10;sp_x509cert=file:///...&#13;&#10;sp_private_key=file:///"
+                                wrap="off"
+                            />
                             <p class="help-block">{{ trans('admin/settings/general.saml_custom_settings_help') }}</p>
                             {!! $errors->first('saml_custom_settings', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                         </div>

From 9c677768f8a85ba6c7edc3e745054285e3ad02c2 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 17 Dec 2024 15:52:27 -0800
Subject: [PATCH 28/28] Use attribute spreading in text area

---
 resources/views/blade/input/textarea.blade.php | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/resources/views/blade/input/textarea.blade.php b/resources/views/blade/input/textarea.blade.php
index ba203271b137..85530e059984 100644
--- a/resources/views/blade/input/textarea.blade.php
+++ b/resources/views/blade/input/textarea.blade.php
@@ -1,7 +1,4 @@
 @props([
-    'name',
-    // use name if id is not provided
-    'id' => $id ?? $name,
     'value' => '',
     'cols' => 50,
     'rows' => 10,
@@ -9,8 +6,6 @@
 
 <textarea
     {{ $attributes->merge(['class' => 'form-control']) }}
-    name="{{ $name }}"
-    id="{{ $id }}"
     cols="{{ $cols }}"
     rows="{{ $rows }}"
 >{{ $value }}</textarea>