From 448472b6d30bf467798b84d49c3f951d63e8c1a4 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Wed, 17 May 2023 09:45:45 -0700
Subject: [PATCH 01/19] testing input paddings

---
 resources/assets/less/overrides.less                           | 3 +++
 .../views/partials/forms/edit/department-select.blade.php      | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less
index e8dc67ce3d4e..1c0e2f426593 100644
--- a/resources/assets/less/overrides.less
+++ b/resources/assets/less/overrides.less
@@ -841,6 +841,9 @@ input[type="radio"]:checked::before {
   grid-template-columns: .1em auto;
   gap: 1.5em;
 }
+.multi-select-fix {
+  padding-left:10px;
+}
 
 /** --------------------------------------- **/
 /** End checkbox styles to replace iCheck   **/
diff --git a/resources/views/partials/forms/edit/department-select.blade.php b/resources/views/partials/forms/edit/department-select.blade.php
index c695d04ef420..85ecc79b2e62 100644
--- a/resources/views/partials/forms/edit/department-select.blade.php
+++ b/resources/views/partials/forms/edit/department-select.blade.php
@@ -3,7 +3,7 @@
     {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
 
     <div class="col-md-6">
-        <select class="js-data-ajax" data-endpoint="departments" data-placeholder="{{ trans('general.select_department') }}" name="{{ $fieldname }}" style="width: 100%" id="department_select" aria-label="{{ $fieldname }}"{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}>
+        <select class="js-data-ajax {{(isset($multiple) && ($multiple=='true')) ? "multi-select-fix" : ''}}" data-endpoint="departments" data-placeholder="{{ trans('general.select_department') }}" name="{{ $fieldname }}" style="width: 100%" id="department_select" aria-label="{{ $fieldname }}"{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}>
             @if ($department_id = old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
                 <option value="{{ $department_id }}" selected="selected" role="option" aria-selected="true"  role="option">
                     {{ (\App\Models\Department::find($department_id)) ? \App\Models\Department::find($department_id)->name : '' }}

From fe60309dfd8d35b6ab9cd9b1e21c7a726a30cf23 Mon Sep 17 00:00:00 2001
From: Godfrey M <godmartinz@gmail.com>
Date: Wed, 17 May 2023 10:19:25 -0700
Subject: [PATCH 02/19] adds padding to multi select2 inputs

---
 resources/assets/less/overrides.less                          | 4 ++--
 .../views/partials/forms/edit/department-select.blade.php     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/resources/assets/less/overrides.less b/resources/assets/less/overrides.less
index 1c0e2f426593..f4cee432bb77 100644
--- a/resources/assets/less/overrides.less
+++ b/resources/assets/less/overrides.less
@@ -841,8 +841,8 @@ input[type="radio"]:checked::before {
   grid-template-columns: .1em auto;
   gap: 1.5em;
 }
-.multi-select-fix {
-  padding-left:10px;
+.select2-container .select2-search--inline .select2-search__field{
+  padding-left:15px;
 }
 
 /** --------------------------------------- **/
diff --git a/resources/views/partials/forms/edit/department-select.blade.php b/resources/views/partials/forms/edit/department-select.blade.php
index 85ecc79b2e62..c695d04ef420 100644
--- a/resources/views/partials/forms/edit/department-select.blade.php
+++ b/resources/views/partials/forms/edit/department-select.blade.php
@@ -3,7 +3,7 @@
     {{ Form::label($fieldname, $translated_name, array('class' => 'col-md-3 control-label')) }}
 
     <div class="col-md-6">
-        <select class="js-data-ajax {{(isset($multiple) && ($multiple=='true')) ? "multi-select-fix" : ''}}" data-endpoint="departments" data-placeholder="{{ trans('general.select_department') }}" name="{{ $fieldname }}" style="width: 100%" id="department_select" aria-label="{{ $fieldname }}"{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}>
+        <select class="js-data-ajax" data-endpoint="departments" data-placeholder="{{ trans('general.select_department') }}" name="{{ $fieldname }}" style="width: 100%" id="department_select" aria-label="{{ $fieldname }}"{{ (isset($multiple) && ($multiple=='true')) ? " multiple='multiple'" : '' }}>
             @if ($department_id = old($fieldname, (isset($item)) ? $item->{$fieldname} : ''))
                 <option value="{{ $department_id }}" selected="selected" role="option" aria-selected="true"  role="option">
                     {{ (\App\Models\Department::find($department_id)) ? \App\Models\Department::find($department_id)->name : '' }}

From 9cb0decf35dcb3fee8821077dfc14febd1832a90 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 18 May 2023 12:54:00 -0700
Subject: [PATCH 03/19] Adapt multiple column search based on database driver

---
 app/Models/User.php                            | 18 +++++++++++++++++-
 .../Api/Users/UsersForSelectListTest.php       | 13 +++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)

diff --git a/app/Models/User.php b/app/Models/User.php
index 1e63ebad71d2..dd63a3c250a2 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -646,11 +646,27 @@ public function scopeSimpleNameSearch($query, $search)
     {
            $query = $query->where('first_name', 'LIKE', '%'.$search.'%')
                ->orWhere('last_name', 'LIKE', '%'.$search.'%')
-               ->orWhereRaw('CONCAT('.DB::getTablePrefix().'users.first_name," ",'.DB::getTablePrefix().'users.last_name) LIKE ?', ["%{$search}%"]);
+               ->orWhereRaw(
+                   $this->buildMultipleColumnSearch([
+                       DB::getTablePrefix() . 'users.first_name',
+                       DB::getTablePrefix() . 'users.last_name',
+                   ]),
+                   ["%{$search}%"]
+               );
 
         return $query;
     }
 
+    public function buildMultipleColumnSearch(array $columns): string
+    {
+        $driver = config('database.connections.' . config('database.default') . '.driver');
+
+        if ($driver === 'sqlite') {
+            return implode(" || ' ' || ", $columns) . ' LIKE ?';
+        }
+
+        return 'CONCAT(' . implode('," ",', $columns) . ') LIKE ?';
+    }
 
     /**
      * Run additional, advanced searches.
diff --git a/tests/Feature/Api/Users/UsersForSelectListTest.php b/tests/Feature/Api/Users/UsersForSelectListTest.php
index 6ab5bf9a8566..8cdf700f0402 100644
--- a/tests/Feature/Api/Users/UsersForSelectListTest.php
+++ b/tests/Feature/Api/Users/UsersForSelectListTest.php
@@ -30,6 +30,19 @@ public function testUsersAreReturned()
             ->assertJson(fn(AssertableJson $json) => $json->has('results', 3)->etc());
     }
 
+    public function testUsersCanBeSearchedByFirstAndLastName()
+    {
+        User::factory()->create(['first_name' => 'Luke', 'last_name' => 'Skywalker']);
+
+        Passport::actingAs(User::factory()->create());
+        $response = $this->getJson(route('api.users.selectlist', ['search' => 'luke sky']))->assertOk();
+
+        $results = collect($response->json('results'));
+
+        $this->assertEquals(1, $results->count());
+        $this->assertTrue($results->pluck('text')->contains(fn($text) => str_contains($text, 'Luke')));
+    }
+
     public function testUsersScopedToCompanyWhenMultipleFullCompanySupportEnabled()
     {
         $this->settings->enableMultipleFullCompanySupport();

From d8d672c4c15e40f3859509a1f6278f22c17e90fd Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 18 May 2023 13:05:40 -0700
Subject: [PATCH 04/19] Move multiple column search function to Searchable
 trait

---
 app/Models/Traits/Searchable.php | 11 +++++++++++
 app/Models/User.php              | 11 -----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/app/Models/Traits/Searchable.php b/app/Models/Traits/Searchable.php
index a7feb62957e2..687210788b52 100644
--- a/app/Models/Traits/Searchable.php
+++ b/app/Models/Traits/Searchable.php
@@ -257,4 +257,15 @@ private function getRelationTable($relation)
 
         return $related->getTable();
     }
+
+    private function buildMultipleColumnSearch(array $columns): string
+    {
+        $driver = config('database.connections.' . config('database.default') . '.driver');
+
+        if ($driver === 'sqlite') {
+            return implode(" || ' ' || ", $columns) . ' LIKE ?';
+        }
+
+        return 'CONCAT(' . implode('," ",', $columns) . ') LIKE ?';
+    }
 }
diff --git a/app/Models/User.php b/app/Models/User.php
index dd63a3c250a2..8f5946a65c08 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -657,17 +657,6 @@ public function scopeSimpleNameSearch($query, $search)
         return $query;
     }
 
-    public function buildMultipleColumnSearch(array $columns): string
-    {
-        $driver = config('database.connections.' . config('database.default') . '.driver');
-
-        if ($driver === 'sqlite') {
-            return implode(" || ' ' || ", $columns) . ' LIKE ?';
-        }
-
-        return 'CONCAT(' . implode('," ",', $columns) . ') LIKE ?';
-    }
-
     /**
      * Run additional, advanced searches.
      *

From ffbde4618030f711448712c986aafcea9bad0e50 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 18 May 2023 13:06:50 -0700
Subject: [PATCH 05/19] Simplify sqlite query

---
 app/Models/Traits/Searchable.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/Models/Traits/Searchable.php b/app/Models/Traits/Searchable.php
index 687210788b52..97ad19c27667 100644
--- a/app/Models/Traits/Searchable.php
+++ b/app/Models/Traits/Searchable.php
@@ -263,7 +263,7 @@ private function buildMultipleColumnSearch(array $columns): string
         $driver = config('database.connections.' . config('database.default') . '.driver');
 
         if ($driver === 'sqlite') {
-            return implode(" || ' ' || ", $columns) . ' LIKE ?';
+            return implode("||' '||", $columns) . ' LIKE ?';
         }
 
         return 'CONCAT(' . implode('," ",', $columns) . ') LIKE ?';

From 85974c7f6586d30617fff4886a952f4ed8135001 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 18 May 2023 13:16:52 -0700
Subject: [PATCH 06/19] Apply formatting

---
 app/Models/User.php | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

diff --git a/app/Models/User.php b/app/Models/User.php
index 8f5946a65c08..852851a771a2 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -644,17 +644,15 @@ public function decodePermissions()
      */
     public function scopeSimpleNameSearch($query, $search)
     {
-           $query = $query->where('first_name', 'LIKE', '%'.$search.'%')
-               ->orWhere('last_name', 'LIKE', '%'.$search.'%')
-               ->orWhereRaw(
-                   $this->buildMultipleColumnSearch([
-                       DB::getTablePrefix() . 'users.first_name',
-                       DB::getTablePrefix() . 'users.last_name',
-                   ]),
-                   ["%{$search}%"]
-               );
-
-        return $query;
+        return $query->where('first_name', 'LIKE', '%' . $search . '%')
+            ->orWhere('last_name', 'LIKE', '%' . $search . '%')
+            ->orWhereRaw(
+                $this->buildMultipleColumnSearch([
+                    DB::getTablePrefix() . 'users.first_name',
+                    DB::getTablePrefix() . 'users.last_name',
+                ]),
+                ["%{$search}%"]
+            );
     }
 
     /**

From 3a9670930d6f436262ef40836517a12608a684ad Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 18 May 2023 13:17:35 -0700
Subject: [PATCH 07/19] Define required fields in Custom Field seeder so sqlite
 can be seeded

---
 database/seeders/CustomFieldSeeder.php | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/database/seeders/CustomFieldSeeder.php b/database/seeders/CustomFieldSeeder.php
index 8776872644af..7891fbcacc6e 100644
--- a/database/seeders/CustomFieldSeeder.php
+++ b/database/seeders/CustomFieldSeeder.php
@@ -38,22 +38,32 @@ public function run()
             [
                 'custom_field_id' => '1',
                 'custom_fieldset_id' => '1',
+                'order' => 0,
+                'required' => 0,
             ],
             [
                 'custom_field_id' => '2',
                 'custom_fieldset_id' => '1',
+                'order' => 0,
+                'required' => 0,
             ],
             [
               'custom_field_id' => '3',
               'custom_fieldset_id' => '2',
+                'order' => 0,
+                'required' => 0,
             ],
             [
               'custom_field_id' => '4',
               'custom_fieldset_id' => '2',
+                'order' => 0,
+                'required' => 0,
             ],
             [
               'custom_field_id' => '5',
               'custom_fieldset_id' => '2',
+                'order' => 0,
+                'required' => 0,
             ],
 
       ]);

From 2d86c8f03065d7579ae31c096b1c0e0d07cd10a1 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Thu, 18 May 2023 17:06:41 -0700
Subject: [PATCH 08/19] Update advancedTextSearch methods in Asset and User
 models

---
 app/Models/Asset.php | 9 +++++++--
 app/Models/User.php  | 8 +++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index ac431253bcba..62b568dbf356 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -947,8 +947,13 @@ public function advancedTextSearch(Builder $query, array $terms)
                 ->orWhere('assets_users.first_name', 'LIKE', '%'.$term.'%')
                 ->orWhere('assets_users.last_name', 'LIKE', '%'.$term.'%')
                 ->orWhere('assets_users.username', 'LIKE', '%'.$term.'%')
-                ->orWhereRaw('CONCAT('.DB::getTablePrefix().'assets_users.first_name," ",'.DB::getTablePrefix().'assets_users.last_name) LIKE ?', ["%$term%"]);
-
+                ->orWhereRaw(
+                    $this->buildMultipleColumnSearch([
+                        DB::getTablePrefix().'assets_users.first_name',
+                        DB::getTablePrefix().'assets_users.last_name',
+                    ]),
+                    ["%{$term}%"]
+                );
         }
 
         /**
diff --git a/app/Models/User.php b/app/Models/User.php
index 852851a771a2..464e20ea4cca 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -665,7 +665,13 @@ public function scopeSimpleNameSearch($query, $search)
     public function advancedTextSearch(Builder $query, array $terms) {
 
         foreach($terms as $term) {
-            $query = $query->orWhereRaw('CONCAT('.DB::getTablePrefix().'users.first_name," ",'.DB::getTablePrefix().'users.last_name) LIKE ?', ["%{$term}%"]);
+            $query = $query->orWhereRaw(
+                $this->buildMultipleColumnSearch([
+                    DB::getTablePrefix() . 'users.first_name',
+                    DB::getTablePrefix() . 'users.last_name',
+                ]),
+                ["%{$term}%"]
+            );
         }
 
         return $query;

From 64e83ed9f552f6b32834ced54fe2d486d594de8a Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Mon, 22 May 2023 16:54:54 -0700
Subject: [PATCH 09/19] Update scopeAssignedSearch in Asset

---
 app/Models/Asset.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index 62b568dbf356..333ebe51ab52 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -1348,7 +1348,13 @@ public function scopeAssignedSearch($query, $search)
                 })->orWhere(function ($query) use ($search) {
                     $query->where('assets_users.first_name', 'LIKE', '%'.$search.'%')
                         ->orWhere('assets_users.last_name', 'LIKE', '%'.$search.'%')
-                        ->orWhereRaw('CONCAT('.DB::getTablePrefix().'assets_users.first_name," ",'.DB::getTablePrefix().'assets_users.last_name) LIKE ?', ["%$search%"])
+                        ->orWhereRaw(
+                            $this->buildMultipleColumnSearch([
+                                DB::getTablePrefix().'assets_users.first_name',
+                                DB::getTablePrefix().'assets_users.last_name',
+                            ]),
+                            ["%{$search}%"]
+                        )
                         ->orWhere('assets_users.username', 'LIKE', '%'.$search.'%')
                         ->orWhere('assets_locations.name', 'LIKE', '%'.$search.'%')
                         ->orWhere('assigned_assets.name', 'LIKE', '%'.$search.'%');

From 9b512648a3a9bf6e19edcb9801392bc5a939ad67 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Mon, 22 May 2023 17:33:19 -0700
Subject: [PATCH 10/19] Update searchRelations in Searchable trait

---
 app/Models/Traits/Searchable.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/Models/Traits/Searchable.php b/app/Models/Traits/Searchable.php
index 97ad19c27667..69b0f800f63d 100644
--- a/app/Models/Traits/Searchable.php
+++ b/app/Models/Traits/Searchable.php
@@ -5,6 +5,7 @@
 use App\Models\Asset;
 use App\Models\CustomField;
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Support\Facades\DB;
 
 /**
  * This trait allows for cleaner searching of models,
@@ -164,7 +165,13 @@ private function searchRelations(Builder $query, array $terms)
                 }
                 // I put this here because I only want to add the concat one time in the end of the user relation search
                 if($relation == 'user') {
-                    $query->orWhereRaw('CONCAT (users.first_name, " ", users.last_name) LIKE ?', ["%{$term}%"]);
+                    $query->orWhereRaw(
+                            $this->buildMultipleColumnSearch([
+                                DB::getTablePrefix() . 'users.first_name',
+                                DB::getTablePrefix() . 'users.last_name',
+                            ]),
+                            ["%{$term}%"]
+                        );
                 }
             });
         }

From 50234bc9a5479c0ae2c1dfc4cdcc141729468994 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Mon, 22 May 2023 17:40:06 -0700
Subject: [PATCH 11/19] Formatting

---
 database/seeders/CustomFieldSeeder.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/database/seeders/CustomFieldSeeder.php b/database/seeders/CustomFieldSeeder.php
index 7891fbcacc6e..551e05f40f1e 100644
--- a/database/seeders/CustomFieldSeeder.php
+++ b/database/seeders/CustomFieldSeeder.php
@@ -48,24 +48,24 @@ public function run()
                 'required' => 0,
             ],
             [
-              'custom_field_id' => '3',
-              'custom_fieldset_id' => '2',
+                'custom_field_id' => '3',
+                'custom_fieldset_id' => '2',
                 'order' => 0,
                 'required' => 0,
             ],
             [
-              'custom_field_id' => '4',
-              'custom_fieldset_id' => '2',
+                'custom_field_id' => '4',
+                'custom_fieldset_id' => '2',
                 'order' => 0,
                 'required' => 0,
             ],
             [
-              'custom_field_id' => '5',
-              'custom_fieldset_id' => '2',
+                'custom_field_id' => '5',
+                'custom_fieldset_id' => '2',
                 'order' => 0,
                 'required' => 0,
             ],
 
-      ]);
+        ]);
     }
 }

From f40e7223975c220430283f49c3b79c454b94e134 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Mon, 22 May 2023 17:44:17 -0700
Subject: [PATCH 12/19] Add docblock

---
 app/Models/Traits/Searchable.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/app/Models/Traits/Searchable.php b/app/Models/Traits/Searchable.php
index 69b0f800f63d..6ac6be735700 100644
--- a/app/Models/Traits/Searchable.php
+++ b/app/Models/Traits/Searchable.php
@@ -265,6 +265,12 @@ private function getRelationTable($relation)
         return $related->getTable();
     }
 
+    /**
+     * Builds a search string for either MySQL or sqlite by separating the provided columns with a space.
+     *
+     * @param array $columns Columns to include in search string.
+     * @return string
+     */
     private function buildMultipleColumnSearch(array $columns): string
     {
         $driver = config('database.connections.' . config('database.default') . '.driver');

From 05a2e568d7d802a65f64ec03a74c4db8e551523a Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 23 May 2023 11:37:09 -0700
Subject: [PATCH 13/19] Add comment

---
 app/Models/Traits/Searchable.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/Models/Traits/Searchable.php b/app/Models/Traits/Searchable.php
index 6ac6be735700..4165dc98b9ee 100644
--- a/app/Models/Traits/Searchable.php
+++ b/app/Models/Traits/Searchable.php
@@ -279,6 +279,7 @@ private function buildMultipleColumnSearch(array $columns): string
             return implode("||' '||", $columns) . ' LIKE ?';
         }
 
+        // Default to MySQL's concatenation method
         return 'CONCAT(' . implode('," ",', $columns) . ') LIKE ?';
     }
 }

From 9078d4c71cdf9942ed5eeb853af6dff5c57aed4c Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 23 May 2023 13:35:19 -0700
Subject: [PATCH 14/19] Add dynamic scope for prettier multiple column search

---
 app/Models/Traits/Searchable.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/app/Models/Traits/Searchable.php b/app/Models/Traits/Searchable.php
index 4165dc98b9ee..63ee0f5b23b7 100644
--- a/app/Models/Traits/Searchable.php
+++ b/app/Models/Traits/Searchable.php
@@ -282,4 +282,9 @@ private function buildMultipleColumnSearch(array $columns): string
         // Default to MySQL's concatenation method
         return 'CONCAT(' . implode('," ",', $columns) . ') LIKE ?';
     }
+
+    public function scopeOrWhereMultipleColumns($query, array $columns, $term)
+    {
+        return $query->orWhereRaw($this->buildMultipleColumnSearch($columns), ["%{$term}%"]);
+    }
 }

From 054d71aedc1fe7a02bd3a6e6312fcdc4291d2b05 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 23 May 2023 13:37:04 -0700
Subject: [PATCH 15/19] Add docblock

---
 app/Models/Traits/Searchable.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/app/Models/Traits/Searchable.php b/app/Models/Traits/Searchable.php
index 63ee0f5b23b7..8fe3b0d49963 100644
--- a/app/Models/Traits/Searchable.php
+++ b/app/Models/Traits/Searchable.php
@@ -283,6 +283,14 @@ private function buildMultipleColumnSearch(array $columns): string
         return 'CONCAT(' . implode('," ",', $columns) . ') LIKE ?';
     }
 
+    /**
+     * Search a string across multiple columns separated with a space.
+     *
+     * @param Builder $query
+     * @param array $columns - Columns to include in search string.
+     * @param $term
+     * @return Builder
+     */
     public function scopeOrWhereMultipleColumns($query, array $columns, $term)
     {
         return $query->orWhereRaw($this->buildMultipleColumnSearch($columns), ["%{$term}%"]);

From b2b6f0cf9637869a50dc41fb9d4081f102f506cb Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 23 May 2023 13:38:50 -0700
Subject: [PATCH 16/19] Use new dynamic scope where possible

---
 app/Models/Asset.php | 22 ++++++++--------------
 app/Models/User.php  | 22 ++++++++--------------
 2 files changed, 16 insertions(+), 28 deletions(-)

diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index 333ebe51ab52..32ffcfc3bf16 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -947,13 +947,10 @@ public function advancedTextSearch(Builder $query, array $terms)
                 ->orWhere('assets_users.first_name', 'LIKE', '%'.$term.'%')
                 ->orWhere('assets_users.last_name', 'LIKE', '%'.$term.'%')
                 ->orWhere('assets_users.username', 'LIKE', '%'.$term.'%')
-                ->orWhereRaw(
-                    $this->buildMultipleColumnSearch([
-                        DB::getTablePrefix().'assets_users.first_name',
-                        DB::getTablePrefix().'assets_users.last_name',
-                    ]),
-                    ["%{$term}%"]
-                );
+                ->orWhereMultipleColumns([
+                    DB::getTablePrefix() . 'assets_users.first_name',
+                    DB::getTablePrefix() . 'assets_users.last_name',
+                ], $term);
         }
 
         /**
@@ -1348,13 +1345,10 @@ public function scopeAssignedSearch($query, $search)
                 })->orWhere(function ($query) use ($search) {
                     $query->where('assets_users.first_name', 'LIKE', '%'.$search.'%')
                         ->orWhere('assets_users.last_name', 'LIKE', '%'.$search.'%')
-                        ->orWhereRaw(
-                            $this->buildMultipleColumnSearch([
-                                DB::getTablePrefix().'assets_users.first_name',
-                                DB::getTablePrefix().'assets_users.last_name',
-                            ]),
-                            ["%{$search}%"]
-                        )
+                        ->orWhereMultipleColumns([
+                            DB::getTablePrefix() . 'assets_users.first_name',
+                            DB::getTablePrefix() . 'assets_users.last_name',
+                        ], $search)
                         ->orWhere('assets_users.username', 'LIKE', '%'.$search.'%')
                         ->orWhere('assets_locations.name', 'LIKE', '%'.$search.'%')
                         ->orWhere('assigned_assets.name', 'LIKE', '%'.$search.'%');
diff --git a/app/Models/User.php b/app/Models/User.php
index 464e20ea4cca..a902e4737971 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -646,13 +646,10 @@ public function scopeSimpleNameSearch($query, $search)
     {
         return $query->where('first_name', 'LIKE', '%' . $search . '%')
             ->orWhere('last_name', 'LIKE', '%' . $search . '%')
-            ->orWhereRaw(
-                $this->buildMultipleColumnSearch([
-                    DB::getTablePrefix() . 'users.first_name',
-                    DB::getTablePrefix() . 'users.last_name',
-                ]),
-                ["%{$search}%"]
-            );
+            ->orWhereMultipleColumns([
+                DB::getTablePrefix() . 'users.first_name',
+                DB::getTablePrefix() . 'users.last_name',
+            ], $search);
     }
 
     /**
@@ -665,13 +662,10 @@ public function scopeSimpleNameSearch($query, $search)
     public function advancedTextSearch(Builder $query, array $terms) {
 
         foreach($terms as $term) {
-            $query = $query->orWhereRaw(
-                $this->buildMultipleColumnSearch([
-                    DB::getTablePrefix() . 'users.first_name',
-                    DB::getTablePrefix() . 'users.last_name',
-                ]),
-                ["%{$term}%"]
-            );
+            $query->orWhereMultipleColumns([
+                DB::getTablePrefix() . 'users.first_name',
+                DB::getTablePrefix() . 'users.last_name',
+            ], $term);
         }
 
         return $query;

From 6300909feebe229c91c28dc45868f9c0e51af7aa Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 23 May 2023 13:39:01 -0700
Subject: [PATCH 17/19] Add test for searching for user's first and last name

---
 tests/Feature/Api/Users/UsersSearchTest.php | 28 +++++++++++++++++++++
 1 file changed, 28 insertions(+)
 create mode 100644 tests/Feature/Api/Users/UsersSearchTest.php

diff --git a/tests/Feature/Api/Users/UsersSearchTest.php b/tests/Feature/Api/Users/UsersSearchTest.php
new file mode 100644
index 000000000000..33f77196f317
--- /dev/null
+++ b/tests/Feature/Api/Users/UsersSearchTest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace Tests\Feature\Api\Users;
+
+use App\Models\User;
+use Laravel\Passport\Passport;
+use Tests\Support\InteractsWithSettings;
+use Tests\TestCase;
+
+class UsersSearchTest extends TestCase
+{
+    use InteractsWithSettings;
+
+    public function testCanSearchByUserFirstAndLastName()
+    {
+        User::factory()->create(['first_name' => 'Luke', 'last_name' => 'Skywalker']);
+        User::factory()->create(['first_name' => 'Darth', 'last_name' => 'Vader']);
+
+        Passport::actingAs(User::factory()->viewUsers()->create());
+        $response = $this->getJson(route('api.users.index', ['search' => 'luke sky']))->assertOk();
+
+        $results = collect($response->json('rows'));
+
+        $this->assertEquals(1, $results->count());
+        $this->assertTrue($results->pluck('name')->contains(fn($text) => str_contains($text, 'Luke')));
+        $this->assertFalse($results->pluck('name')->contains(fn($text) => str_contains($text, 'Darth')));
+    }
+}

From f69caf77e5c04ffe1c60e50137398482d70d1411 Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 23 May 2023 14:57:57 -0700
Subject: [PATCH 18/19] Updated dev assets

Signed-off-by: snipe <snipe@snipe.net>
---
 public/css/build/app.css       | 3 +++
 public/css/build/overrides.css | 3 +++
 public/css/dist/all.css        | 6 ++++++
 public/mix-manifest.json       | 6 +++---
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/public/css/build/app.css b/public/css/build/app.css
index 623ae2df1de2..b07a73e0ae97 100644
--- a/public/css/build/app.css
+++ b/public/css/build/app.css
@@ -1104,6 +1104,9 @@ input[type="radio"]:checked::before {
   grid-template-columns: 0.1em auto;
   gap: 1.5em;
 }
+.select2-container .select2-search--inline .select2-search__field {
+  padding-left: 15px;
+}
 /** --------------------------------------- **/
 /** End checkbox styles to replace iCheck   **/
 /** --------------------------------------- **/
diff --git a/public/css/build/overrides.css b/public/css/build/overrides.css
index 2c4f57f85832..b6864a763bfe 100644
--- a/public/css/build/overrides.css
+++ b/public/css/build/overrides.css
@@ -737,6 +737,9 @@ input[type="radio"]:checked::before {
   grid-template-columns: 0.1em auto;
   gap: 1.5em;
 }
+.select2-container .select2-search--inline .select2-search__field {
+  padding-left: 15px;
+}
 /** --------------------------------------- **/
 /** End checkbox styles to replace iCheck   **/
 /** --------------------------------------- **/
diff --git a/public/css/dist/all.css b/public/css/dist/all.css
index 6db24038e10f..1cdb2ea99216 100644
--- a/public/css/dist/all.css
+++ b/public/css/dist/all.css
@@ -23870,6 +23870,9 @@ input[type="radio"]:checked::before {
   grid-template-columns: 0.1em auto;
   gap: 1.5em;
 }
+.select2-container .select2-search--inline .select2-search__field {
+  padding-left: 15px;
+}
 /** --------------------------------------- **/
 /** End checkbox styles to replace iCheck   **/
 /** --------------------------------------- **/
@@ -25096,6 +25099,9 @@ input[type="radio"]:checked::before {
   grid-template-columns: 0.1em auto;
   gap: 1.5em;
 }
+.select2-container .select2-search--inline .select2-search__field {
+  padding-left: 15px;
+}
 /** --------------------------------------- **/
 /** End checkbox styles to replace iCheck   **/
 /** --------------------------------------- **/
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 61e404923a22..1ec21a133679 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,8 +1,8 @@
 {
     "/js/build/app.js": "/js/build/app.js?id=7caeae38608edd96421f8ef59d33f5f6",
     "/css/dist/skins/skin-blue.css": "/css/dist/skins/skin-blue.css?id=f677207c6cf9678eb539abecb408c374",
-    "/css/build/overrides.css": "/css/build/overrides.css?id=97a58ce3a89cd0043a1c54ecf63d4686",
-    "/css/build/app.css": "/css/build/app.css?id=02dbcc25fce08e9b9a9b285883821805",
+    "/css/build/overrides.css": "/css/build/overrides.css?id=eb44bf9eb12277e0dc680c6d498ee6af",
+    "/css/build/app.css": "/css/build/app.css?id=62fd4966017ec9d8740b21869eca4302",
     "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=dc383f8560a8d4adb51d44fb4043e03b",
     "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=6f0563e726c2fe4fab4026daaa5bfdf2",
     "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=e6e53eef152bba01a4c666a4d8b01117",
@@ -18,7 +18,7 @@
     "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=0a82a6ae6bb4e58fe62d162c4fb50397",
     "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=da6c7997d9de2f8329142399f0ce50da",
     "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=44bf834f2110504a793dadec132a5898",
-    "/css/dist/all.css": "/css/dist/all.css?id=999cf8c1432f7baff31b61a04a9a8485",
+    "/css/dist/all.css": "/css/dist/all.css?id=654fb4ff3970fdd2f3094090ab18d098",
     "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced1cf5f13147f7",
     "/css/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced1cf5f13147f7",
     "/css/webfonts/fa-brands-400.ttf": "/css/webfonts/fa-brands-400.ttf?id=e2e2b1797606a266ed55549f5bb5a179",

From 0a3d46824e54d079031ae810cd03924ae08fbc4f Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 23 May 2023 15:58:58 -0700
Subject: [PATCH 19/19] Automatically add table prefixes when building
 multi-column search string

---
 app/Models/Asset.php             |  8 ++++----
 app/Models/Traits/Searchable.php | 10 ++++++----
 app/Models/User.php              |  9 ++++-----
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/app/Models/Asset.php b/app/Models/Asset.php
index 32ffcfc3bf16..42c97a5cd7d4 100644
--- a/app/Models/Asset.php
+++ b/app/Models/Asset.php
@@ -948,8 +948,8 @@ public function advancedTextSearch(Builder $query, array $terms)
                 ->orWhere('assets_users.last_name', 'LIKE', '%'.$term.'%')
                 ->orWhere('assets_users.username', 'LIKE', '%'.$term.'%')
                 ->orWhereMultipleColumns([
-                    DB::getTablePrefix() . 'assets_users.first_name',
-                    DB::getTablePrefix() . 'assets_users.last_name',
+                    'assets_users.first_name',
+                    'assets_users.last_name',
                 ], $term);
         }
 
@@ -1346,8 +1346,8 @@ public function scopeAssignedSearch($query, $search)
                     $query->where('assets_users.first_name', 'LIKE', '%'.$search.'%')
                         ->orWhere('assets_users.last_name', 'LIKE', '%'.$search.'%')
                         ->orWhereMultipleColumns([
-                            DB::getTablePrefix() . 'assets_users.first_name',
-                            DB::getTablePrefix() . 'assets_users.last_name',
+                            'assets_users.first_name',
+                            'assets_users.last_name',
                         ], $search)
                         ->orWhere('assets_users.username', 'LIKE', '%'.$search.'%')
                         ->orWhere('assets_locations.name', 'LIKE', '%'.$search.'%')
diff --git a/app/Models/Traits/Searchable.php b/app/Models/Traits/Searchable.php
index 8fe3b0d49963..06e05348fbef 100644
--- a/app/Models/Traits/Searchable.php
+++ b/app/Models/Traits/Searchable.php
@@ -167,8 +167,8 @@ private function searchRelations(Builder $query, array $terms)
                 if($relation == 'user') {
                     $query->orWhereRaw(
                             $this->buildMultipleColumnSearch([
-                                DB::getTablePrefix() . 'users.first_name',
-                                DB::getTablePrefix() . 'users.last_name',
+                                'users.first_name',
+                                'users.last_name',
                             ]),
                             ["%{$term}%"]
                         );
@@ -273,14 +273,16 @@ private function getRelationTable($relation)
      */
     private function buildMultipleColumnSearch(array $columns): string
     {
+        $mappedColumns = collect($columns)->map(fn($column) => DB::getTablePrefix() . $column)->toArray();
+
         $driver = config('database.connections.' . config('database.default') . '.driver');
 
         if ($driver === 'sqlite') {
-            return implode("||' '||", $columns) . ' LIKE ?';
+            return implode("||' '||", $mappedColumns) . ' LIKE ?';
         }
 
         // Default to MySQL's concatenation method
-        return 'CONCAT(' . implode('," ",', $columns) . ') LIKE ?';
+        return 'CONCAT(' . implode('," ",', $mappedColumns) . ') LIKE ?';
     }
 
     /**
diff --git a/app/Models/User.php b/app/Models/User.php
index a902e4737971..98a3ec346ba2 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -647,8 +647,8 @@ public function scopeSimpleNameSearch($query, $search)
         return $query->where('first_name', 'LIKE', '%' . $search . '%')
             ->orWhere('last_name', 'LIKE', '%' . $search . '%')
             ->orWhereMultipleColumns([
-                DB::getTablePrefix() . 'users.first_name',
-                DB::getTablePrefix() . 'users.last_name',
+                'users.first_name',
+                'users.last_name',
             ], $search);
     }
 
@@ -660,11 +660,10 @@ public function scopeSimpleNameSearch($query, $search)
      * @return \Illuminate\Database\Eloquent\Builder
      */
     public function advancedTextSearch(Builder $query, array $terms) {
-
         foreach($terms as $term) {
             $query->orWhereMultipleColumns([
-                DB::getTablePrefix() . 'users.first_name',
-                DB::getTablePrefix() . 'users.last_name',
+                'users.first_name',
+                'users.last_name',
             ], $term);
         }