From 8d205e80e59e1bbb808c090eaeb829014d2488e3 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 9 May 2023 14:44:43 -0700
Subject: [PATCH 1/4] Add ejected pipeline configuration for ChipperCI

---
 .chipperci.yml | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 .chipperci.yml

diff --git a/.chipperci.yml b/.chipperci.yml
new file mode 100644
index 0000000000..7ac6659039
--- /dev/null
+++ b/.chipperci.yml
@@ -0,0 +1,52 @@
+version: 1
+
+environment:
+  php: 8.0
+  node: 12
+
+services:
+  - mysql: 5.7
+
+pipeline:
+  - name: Setup
+    cmd: |
+      cp -v .env.example .env
+      
+      composer install --no-interaction --prefer-dist --optimize-autoloader
+
+  - name: Generate Key
+    cmd: |
+      php artisan key:generate --force
+
+  - name: Passport Keys
+    cmd: |
+      php artisan passport:keys
+
+  - name: Run Migrations
+    cmd: |
+      # php artisan migrate --force
+
+  - name: PHPUnit Unit Tests
+    cmd: |
+      # php artisan test --testsuite Unit
+
+  - name: PHPUnit Feature Tests
+    cmd: |
+      # php artisan test --testsuite Feature
+
+  - name: Dusk
+    cmd: |
+      cp -v .env.dusk.example .env.dusk.ci
+      sed -i "s@APP_ENV=.*@APP_ENV=ci@g" .env.dusk.ci
+      sed -i "s@APP_URL=.*@APP_URL=http://$BUILD_HOST:8000@g" .env.dusk.ci
+      #sed -i "s@DB_HOST=.*@DB_HOST=mysql@g" .env.dusk.ci
+      sed -i "s@DB_HOST=.*@DB_HOST=$DB_HOST@g" .env.dusk.ci
+      sed -i "s@DB_USERNAME=.*@DB_USERNAME=chipperci@g" .env.dusk.ci
+      sed -i "s@DB_DATABASE=.*@DB_DATABASE=chipperci@g" .env.dusk.ci
+      sed -i "s@DB_PASSWORD=.*@DB_PASSWORD=secret@g" .env.dusk.ci
+      
+      php -S [::0]:8000 -t public 2>server.log &
+      sleep 2
+      php artisan dusk:chrome-driver $CHROME_DRIVER
+      php artisan dusk --env=ci
+

From 1f11a8a2c1e04886c856c1cc3bdae5a932a82830 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 9 May 2023 14:45:18 -0700
Subject: [PATCH 2/4] Configure Dusk for ChipperCI

---
 .chipperci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.chipperci.yml b/.chipperci.yml
index 7ac6659039..0d7bfbe6b1 100644
--- a/.chipperci.yml
+++ b/.chipperci.yml
@@ -6,6 +6,7 @@ environment:
 
 services:
   - mysql: 5.7
+  - dusk:
 
 pipeline:
   - name: Setup
@@ -34,7 +35,7 @@ pipeline:
     cmd: |
       # php artisan test --testsuite Feature
 
-  - name: Dusk
+  - name: Browser Tests
     cmd: |
       cp -v .env.dusk.example .env.dusk.ci
       sed -i "s@APP_ENV=.*@APP_ENV=ci@g" .env.dusk.ci

From 1e7986d75b369a3824f214aefe859925f5538845 Mon Sep 17 00:00:00 2001
From: Marcus Moore <contact@marcusmoore.io>
Date: Tue, 9 May 2023 16:39:56 -0700
Subject: [PATCH 3/4] Limit ChipperCI to running on push to master or develop

---
 .chipperci.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.chipperci.yml b/.chipperci.yml
index 0d7bfbe6b1..fa3b3fd920 100644
--- a/.chipperci.yml
+++ b/.chipperci.yml
@@ -8,6 +8,12 @@ services:
   - mysql: 5.7
   - dusk:
 
+on:
+  push:
+    branches:
+      - master
+      - develop
+
 pipeline:
   - name: Setup
     cmd: |

From 999dc3c358dc3f515a6cc0a3a7bacffa389f47cc Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Tue, 9 May 2023 19:43:37 -0700
Subject: [PATCH 4/4] Added icon field back into assets page

Signed-off-by: snipe <snipe@snipe.net>
---
 resources/views/hardware/view.blade.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 50b80de0f2..fa2e7f7e62 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -1163,7 +1163,7 @@
                       data-cookie="true">
                 <thead>
                 <tr>
-                  <th data-visible="true" style="width: 40px;" class="hidden-xs">{{ trans('admin/hardware/table.icon') }}</th>
+                  <th data-visible="true" data-field="icon" style="width: 40px;" class="hidden-xs" data-formatter="iconFormatter">{{ trans('admin/hardware/table.icon') }}</th>
                   <th class="col-sm-2" data-visible="true" data-field="action_date" data-formatter="dateDisplayFormatter">{{ trans('general.date') }}</th>
                   <th class="col-sm-1" data-visible="true" data-field="admin" data-formatter="usersLinkObjFormatter">{{ trans('general.admin') }}</th>
                   <th class="col-sm-1" data-visible="true" data-field="action_type">{{ trans('general.action') }}</th>