From 25215fd3c9be1441b85a34bc5dd836a5d94a0001 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 18 Feb 2025 15:20:06 -0800 Subject: [PATCH 01/16] WIP: begin migrating notes to ui controller --- app/Http/Controllers/NotesController.php | 13 ++++++ resources/views/hardware/view.blade.php | 10 +++-- resources/views/modals/add-note.blade.php | 51 +++++++++++++---------- routes/web.php | 5 +++ 4 files changed, 53 insertions(+), 26 deletions(-) create mode 100644 app/Http/Controllers/NotesController.php diff --git a/app/Http/Controllers/NotesController.php b/app/Http/Controllers/NotesController.php new file mode 100644 index 0000000000..56d9fff27d --- /dev/null +++ b/app/Http/Controllers/NotesController.php @@ -0,0 +1,13 @@ +all()); + } +} diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index d3e0768095..eb387a9c39 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -217,14 +217,16 @@ @can('update', \App\Models\Asset::class) - + @endcan diff --git a/resources/views/modals/add-note.blade.php b/resources/views/modals/add-note.blade.php index 9c14098f06..70fe8421a1 100644 --- a/resources/views/modals/add-note.blade.php +++ b/resources/views/modals/add-note.blade.php @@ -1,28 +1,35 @@ {{-- See snipeit_modals.js for what powers this --}} -
-
-
- -

{{ trans('general.add_note') }}

-
+ diff --git a/routes/web.php b/routes/web.php index 517f8778ae..fac651dea8 100644 --- a/routes/web.php +++ b/routes/web.php @@ -14,6 +14,7 @@ use App\Http\Controllers\LabelsController; use App\Http\Controllers\LocationsController; use App\Http\Controllers\ManufacturersController; use App\Http\Controllers\ModalController; +use App\Http\Controllers\NotesController; use App\Http\Controllers\ProfileController; use App\Http\Controllers\ReportsController; use App\Http\Controllers\ReportTemplatesController; @@ -339,6 +340,10 @@ Route::group(['prefix' => 'account', 'middleware' => ['auth']], function () { }); +Route::group(['middleware' => ['auth']], function () { + Route::post('notes', [NotesController::class, 'store'])->name('notes.store'); +}); + Route::group(['middleware' => ['auth']], function () { Route::get('reports/audit', [ReportsController::class, 'audit'] From c165e6f40032f2dfaa3a62a2f35a8d190f3f96f8 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 18 Feb 2025 15:20:22 -0800 Subject: [PATCH 02/16] Formatting --- resources/views/hardware/view.blade.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php index eb387a9c39..1fb0acfb4e 100755 --- a/resources/views/hardware/view.blade.php +++ b/resources/views/hardware/view.blade.php @@ -217,8 +217,6 @@ @can('update', \App\Models\Asset::class) - -
@@ -226,7 +224,6 @@ @include ('modals.add-note', ['type' => 'asset', 'id' => $asset->id])
- @endcan From 53c084c6c0009ff60c4a9c662ed4b243422795ed Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 18 Feb 2025 15:43:58 -0800 Subject: [PATCH 03/16] WIP: begin to store notes --- app/Http/Controllers/NotesController.php | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/NotesController.php b/app/Http/Controllers/NotesController.php index 56d9fff27d..7d21420a06 100644 --- a/app/Http/Controllers/NotesController.php +++ b/app/Http/Controllers/NotesController.php @@ -2,12 +2,28 @@ namespace App\Http\Controllers; +use App\Events\NoteAdded; +use App\Models\Asset; use Illuminate\Http\Request; +use Illuminate\Support\Facades\Auth; class NotesController extends Controller { public function store(Request $request) { - dd($request->all()); + // @todo: validation + + $item = Asset::findOrFail($request->input('id')); + + // @todo: authorization + + event(new NoteAdded($item, Auth::user(), $request->input('note'))); + + return redirect() + // @todo: make dynamic + ->route('hardware.show', $request->input('id')) + ->withFragment('history') + // @todo: translate + ->with('success', 'Success!'); } } From 79d1147f202693349aef720956df7aaffda4e89c Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 18 Feb 2025 15:46:52 -0800 Subject: [PATCH 04/16] Add validation --- app/Http/Controllers/NotesController.php | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/app/Http/Controllers/NotesController.php b/app/Http/Controllers/NotesController.php index 7d21420a06..3538e076f3 100644 --- a/app/Http/Controllers/NotesController.php +++ b/app/Http/Controllers/NotesController.php @@ -6,24 +6,32 @@ use App\Events\NoteAdded; use App\Models\Asset; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; +use Illuminate\Validation\Rule; class NotesController extends Controller { public function store(Request $request) { - // @todo: validation + $validated = $request->validate([ + // @todo: improve? + 'id' => 'required', + 'note' => 'required|string|max:500', + 'type' => [ + 'required', + Rule::in(['asset']), + ], + ]); - $item = Asset::findOrFail($request->input('id')); + $item = Asset::findOrFail($validated['id']); // @todo: authorization - event(new NoteAdded($item, Auth::user(), $request->input('note'))); + event(new NoteAdded($item, Auth::user(), $validated['note'])); return redirect() - // @todo: make dynamic - ->route('hardware.show', $request->input('id')) + ->route('hardware.show', $validated['id']) ->withFragment('history') // @todo: translate - ->with('success', 'Success!'); + ->with('success', 'Note Added!'); } } From 1995e1399e835002310f6998c3c2bf03fa5f3443 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 18 Feb 2025 16:04:53 -0800 Subject: [PATCH 05/16] Start recording ip, user agent, and source --- app/Http/Controllers/NotesController.php | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/Http/Controllers/NotesController.php b/app/Http/Controllers/NotesController.php index 3538e076f3..dd32b17ebc 100644 --- a/app/Http/Controllers/NotesController.php +++ b/app/Http/Controllers/NotesController.php @@ -3,6 +3,7 @@ namespace App\Http\Controllers; use App\Events\NoteAdded; +use App\Models\Actionlog; use App\Models\Asset; use Illuminate\Http\Request; use Illuminate\Support\Facades\Auth; @@ -26,7 +27,12 @@ class NotesController extends Controller // @todo: authorization - event(new NoteAdded($item, Auth::user(), $validated['note'])); + $logaction = new Actionlog(); + $logaction->item_id = $item->id; + $logaction->item_type = get_class($item); + $logaction->note = $validated['note']; + $logaction->created_by = Auth::id(); + $logaction->logaction('note added'); return redirect() ->route('hardware.show', $validated['id']) From 3d69721af013c4d9e0dab5361f7e46fec29eafc7 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 18 Feb 2025 16:16:00 -0800 Subject: [PATCH 06/16] Scaffold tests --- tests/Feature/Notes/CreateNotesTest.php | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 tests/Feature/Notes/CreateNotesTest.php diff --git a/tests/Feature/Notes/CreateNotesTest.php b/tests/Feature/Notes/CreateNotesTest.php new file mode 100644 index 0000000000..a993e7508f --- /dev/null +++ b/tests/Feature/Notes/CreateNotesTest.php @@ -0,0 +1,23 @@ +markTestIncomplete(); + } + + public function testValidation() + { + $this->markTestIncomplete(); + } + + public function testCanCreateNote() + { + $this->markTestIncomplete(); + } +} From cf0ce1c5ea2f1f61c723efb518f81a2790a15e20 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Tue, 18 Feb 2025 16:24:52 -0800 Subject: [PATCH 07/16] Start to implement tests --- app/Http/Controllers/NotesController.php | 2 +- tests/Feature/Notes/CreateNotesTest.php | 22 +++++++++++++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/NotesController.php b/app/Http/Controllers/NotesController.php index dd32b17ebc..e24436e5ad 100644 --- a/app/Http/Controllers/NotesController.php +++ b/app/Http/Controllers/NotesController.php @@ -25,7 +25,7 @@ class NotesController extends Controller $item = Asset::findOrFail($validated['id']); - // @todo: authorization + $this->authorize('update', $item); $logaction = new Actionlog(); $logaction->item_id = $item->id; diff --git a/tests/Feature/Notes/CreateNotesTest.php b/tests/Feature/Notes/CreateNotesTest.php index a993e7508f..a42d501bb9 100644 --- a/tests/Feature/Notes/CreateNotesTest.php +++ b/tests/Feature/Notes/CreateNotesTest.php @@ -2,6 +2,8 @@ namespace Tests\Feature\Notes; +use App\Models\Asset; +use App\Models\User; use Tests\TestCase; class CreateNotesTest extends TestCase @@ -9,6 +11,10 @@ class CreateNotesTest extends TestCase public function testRequiresPermission() { $this->markTestIncomplete(); + + $this->actingAs(User::factory()->create()) + ->post(route('notes.store')) + ->assertForbidden(); } public function testValidation() @@ -18,6 +24,20 @@ class CreateNotesTest extends TestCase public function testCanCreateNote() { - $this->markTestIncomplete(); + // @todo: make dynamic? + + $actor = User::factory()->editAssets()->create(); + + $asset = Asset::factory()->create(); + + $this->actingAs($actor) + ->post(route('notes.store'), [ + 'id' => $asset->id, + 'type' => 'asset', + 'note' => 'my special note', + ]) + ->assertRedirect(route('hardware.show', $asset->id) . '#history'); + + // @todo: assert action log created with expected data } } From 0190ccea27ccc665a95806cbd90a22dd3a6b0ccf Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 20 Feb 2025 12:40:05 -0800 Subject: [PATCH 08/16] Finish implementing test --- tests/Feature/Notes/CreateNotesTest.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/tests/Feature/Notes/CreateNotesTest.php b/tests/Feature/Notes/CreateNotesTest.php index a42d501bb9..789991adb0 100644 --- a/tests/Feature/Notes/CreateNotesTest.php +++ b/tests/Feature/Notes/CreateNotesTest.php @@ -22,22 +22,32 @@ class CreateNotesTest extends TestCase $this->markTestIncomplete(); } - public function testCanCreateNote() + public function testCanCreateNoteForAsset() { - // @todo: make dynamic? - $actor = User::factory()->editAssets()->create(); $asset = Asset::factory()->create(); $this->actingAs($actor) + ->withHeader('User-Agent', 'Custom User Agent For Test') ->post(route('notes.store'), [ + '_token' => '_token-to-simulate-request-from-gui', 'id' => $asset->id, 'type' => 'asset', 'note' => 'my special note', ]) ->assertRedirect(route('hardware.show', $asset->id) . '#history'); - // @todo: assert action log created with expected data + $this->assertDatabaseHas('action_logs', [ + 'created_by' => $actor->id, + 'action_type' => 'note added', + 'target_id' => null, + 'target_type' => null, + 'note' => 'my special note', + 'item_type' => Asset::class, + 'item_id' => $asset->id, + 'action_source' => 'gui', + 'user_agent' => 'Custom User Agent For Test', + ]); } } From 44503fc423d3e761d5733153613c26a8dfdd9eaa Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 20 Feb 2025 12:41:56 -0800 Subject: [PATCH 09/16] Use translation --- app/Http/Controllers/NotesController.php | 6 ++---- tests/Feature/Notes/CreateNotesTest.php | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/app/Http/Controllers/NotesController.php b/app/Http/Controllers/NotesController.php index e24436e5ad..a3e7a36b3b 100644 --- a/app/Http/Controllers/NotesController.php +++ b/app/Http/Controllers/NotesController.php @@ -2,7 +2,6 @@ namespace App\Http\Controllers; -use App\Events\NoteAdded; use App\Models\Actionlog; use App\Models\Asset; use Illuminate\Http\Request; @@ -14,7 +13,6 @@ class NotesController extends Controller public function store(Request $request) { $validated = $request->validate([ - // @todo: improve? 'id' => 'required', 'note' => 'required|string|max:500', 'type' => [ @@ -27,7 +25,7 @@ class NotesController extends Controller $this->authorize('update', $item); - $logaction = new Actionlog(); + $logaction = new Actionlog; $logaction->item_id = $item->id; $logaction->item_type = get_class($item); $logaction->note = $validated['note']; @@ -38,6 +36,6 @@ class NotesController extends Controller ->route('hardware.show', $validated['id']) ->withFragment('history') // @todo: translate - ->with('success', 'Note Added!'); + ->with('success', trans('general.note_added')); } } diff --git a/tests/Feature/Notes/CreateNotesTest.php b/tests/Feature/Notes/CreateNotesTest.php index 789991adb0..fac13c1ac8 100644 --- a/tests/Feature/Notes/CreateNotesTest.php +++ b/tests/Feature/Notes/CreateNotesTest.php @@ -36,7 +36,8 @@ class CreateNotesTest extends TestCase 'type' => 'asset', 'note' => 'my special note', ]) - ->assertRedirect(route('hardware.show', $asset->id) . '#history'); + ->assertRedirect(route('hardware.show', $asset->id) . '#history') + ->assertSessionHas('success', trans('general.note_added')); $this->assertDatabaseHas('action_logs', [ 'created_by' => $actor->id, From 41129829e6df877ba95cc547698ba291aee5b628 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 20 Feb 2025 12:43:51 -0800 Subject: [PATCH 10/16] Add frontend required validation --- resources/views/modals/add-note.blade.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/views/modals/add-note.blade.php b/resources/views/modals/add-note.blade.php index 70fe8421a1..8208fc36a9 100644 --- a/resources/views/modals/add-note.blade.php +++ b/resources/views/modals/add-note.blade.php @@ -20,7 +20,7 @@
- + {!! $errors->first('note', '') !!}
From 39bb2c2adbd28f267f880de914417893918a9090 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 20 Feb 2025 12:49:58 -0800 Subject: [PATCH 11/16] Implement tests --- tests/Feature/Notes/CreateNotesTest.php | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/tests/Feature/Notes/CreateNotesTest.php b/tests/Feature/Notes/CreateNotesTest.php index fac13c1ac8..84c8ec34bf 100644 --- a/tests/Feature/Notes/CreateNotesTest.php +++ b/tests/Feature/Notes/CreateNotesTest.php @@ -19,7 +19,25 @@ class CreateNotesTest extends TestCase public function testValidation() { - $this->markTestIncomplete(); + $asset = Asset::factory()->create(); + + $this->actingAs(User::factory()->editAssets()->create()) + ->post(route('notes.store'), [ + 'id' => $asset->id, + // should be more... + ]) + ->assertSessionHas('errors'); + } + + public function testAssetMustExist() + { + $this->actingAs(User::factory()->editAssets()->create()) + ->post(route('notes.store'), [ + 'id' => 999_999, + 'type' => 'asset', + 'note' => 'my note', + ]) + ->assertStatus(404); } public function testCanCreateNoteForAsset() From 992b4c7d868ad6ab3f7af6154b356aade0874e6d Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 20 Feb 2025 12:50:03 -0800 Subject: [PATCH 12/16] Remove old comment --- app/Http/Controllers/NotesController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Controllers/NotesController.php b/app/Http/Controllers/NotesController.php index a3e7a36b3b..8a73b80e2e 100644 --- a/app/Http/Controllers/NotesController.php +++ b/app/Http/Controllers/NotesController.php @@ -35,7 +35,6 @@ class NotesController extends Controller return redirect() ->route('hardware.show', $validated['id']) ->withFragment('history') - // @todo: translate ->with('success', trans('general.note_added')); } } From f1bf9fcf5c7238f0c0fbc47c2b6b14528bccc923 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 20 Feb 2025 12:51:08 -0800 Subject: [PATCH 13/16] Implement test --- app/Http/Controllers/NotesController.php | 2 ++ tests/Feature/Notes/CreateNotesTest.php | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/NotesController.php b/app/Http/Controllers/NotesController.php index 8a73b80e2e..ecac627c0f 100644 --- a/app/Http/Controllers/NotesController.php +++ b/app/Http/Controllers/NotesController.php @@ -12,6 +12,8 @@ class NotesController extends Controller { public function store(Request $request) { + $this->authorize('update', Asset::class); + $validated = $request->validate([ 'id' => 'required', 'note' => 'required|string|max:500', diff --git a/tests/Feature/Notes/CreateNotesTest.php b/tests/Feature/Notes/CreateNotesTest.php index 84c8ec34bf..dedcabf0f7 100644 --- a/tests/Feature/Notes/CreateNotesTest.php +++ b/tests/Feature/Notes/CreateNotesTest.php @@ -10,8 +10,6 @@ class CreateNotesTest extends TestCase { public function testRequiresPermission() { - $this->markTestIncomplete(); - $this->actingAs(User::factory()->create()) ->post(route('notes.store')) ->assertForbidden(); From 43f679a554b46d4147c70d9598a70f2b79ce6447 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 20 Feb 2025 12:59:16 -0800 Subject: [PATCH 14/16] Revert some changes from #15525 --- app/Events/NoteAdded.php | 28 -------- app/Http/Controllers/Api/NotesController.php | 43 ----------- app/Listeners/LogListener.php | 18 ----- resources/assets/js/snipeit_modals.js | 17 ++--- routes/api.php | 14 ---- tests/Feature/Notes/AssetNotesTest.php | 76 -------------------- tests/Unit/Listeners/LogListenerTest.php | 16 ----- 7 files changed, 7 insertions(+), 205 deletions(-) delete mode 100644 app/Events/NoteAdded.php delete mode 100644 app/Http/Controllers/Api/NotesController.php delete mode 100644 tests/Feature/Notes/AssetNotesTest.php diff --git a/app/Events/NoteAdded.php b/app/Events/NoteAdded.php deleted file mode 100644 index de5f91ce78..0000000000 --- a/app/Events/NoteAdded.php +++ /dev/null @@ -1,28 +0,0 @@ -itemNoteAddedOn = $itemNoteAddedOn; - $this->note = $note; - $this->noteAddedBy = $noteAddedBy; - } -} \ No newline at end of file diff --git a/app/Http/Controllers/Api/NotesController.php b/app/Http/Controllers/Api/NotesController.php deleted file mode 100644 index 97b7ca4134..0000000000 --- a/app/Http/Controllers/Api/NotesController.php +++ /dev/null @@ -1,43 +0,0 @@ -validate([ - 'note' => 'required|string|max:500', - 'type' => [ - 'required', - Rule::in(['asset']), - ], - ]); - - // This can be made dynamic by using $request->input('type') to determine which model type to add the note to. - // For now, we are only placing this on Assets - $item = Asset::findOrFail($request->input("id")); - $this->authorize('update', $item); - - event(new NoteAdded($item, Auth::user(), $validated['note'])); - - return response()->json(Helper::formatStandardApiResponse('success')); - } - - public function update(Request $request) - { - - } - public function destroy(Request $request) - { - - } -} diff --git a/app/Listeners/LogListener.php b/app/Listeners/LogListener.php index d0da80614c..27a9168484 100644 --- a/app/Listeners/LogListener.php +++ b/app/Listeners/LogListener.php @@ -17,7 +17,6 @@ use App\Events\ItemAccepted; use App\Events\ItemDeclined; use App\Events\LicenseCheckedIn; use App\Events\LicenseCheckedOut; -use App\Events\NoteAdded; use App\Models\Actionlog; use App\Models\User; use App\Models\LicenseSeat; @@ -129,23 +128,6 @@ class LogListener } - - /** - * Note is added to action log - * - */ - public function onNoteAdded(NoteAdded $event) - { - $logaction = new Actionlog(); - $logaction->item_id = $event->itemNoteAddedOn->id; - $logaction->item_type = get_class($event->itemNoteAddedOn); - $logaction->note = $event->note; //this is the received alphanumeric text from the box - $logaction->created_by = $event->noteAddedBy->id; - $logaction->action_type = 'note_added'; - $logaction->save(); - } - - /** * Register the listeners for the subscriber. * diff --git a/resources/assets/js/snipeit_modals.js b/resources/assets/js/snipeit_modals.js index 250868bbbb..874f888a52 100644 --- a/resources/assets/js/snipeit_modals.js +++ b/resources/assets/js/snipeit_modals.js @@ -28,7 +28,7 @@ $(function () { var baseUrl = $('meta[name="baseUrl"]').attr('content'); //handle modal-add-interstitial calls - var model, select, refreshSelector, hasnopayload; + var model, select, refreshSelector; if($('#createModal').length == 0) { $('body').append(''); @@ -40,8 +40,6 @@ $(function () { select = link.data("select"); refreshSelector = link.data("refresh"); - hasnopayload = link.data("hasnopayload"); - $('#createModal').load(link.attr('href'),function () { // this sets the focus to be the name field @@ -123,13 +121,12 @@ $(function () { $('#modal_error_msg').html(error_message).show(); return false; } - if(!hasnopayload) { - var id = result.payload.id; - var name = result.payload.name || (result.payload.first_name + " " + result.payload.last_name); - if (!id || !name) { - console.error("Could not find resulting name or ID from modal-create. Name: " + name + ", id: " + id); - return false; - } + + var id = result.payload.id; + var name = result.payload.name || (result.payload.first_name + " " + result.payload.last_name); + if (!id || !name) { + console.error("Could not find resulting name or ID from modal-create. Name: " + name + ", id: " + id); + return false; } $('#createModal').modal('hide'); $('#createModal').html(""); diff --git a/routes/api.php b/routes/api.php index b51e139a41..96792a8f55 100644 --- a/routes/api.php +++ b/routes/api.php @@ -1302,20 +1302,6 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'throttle:api']], functi )->name('api.activity.index'); }); // end reports api routes - /** - * Notes API routes - */ - - Route::group(['prefix' => 'notes'], function () { - - Route::post( - '/', - [ Api\NotesController::class, - 'store' - ] - )->name('api.notes.store'); - }); // end notes api routes - /** diff --git a/tests/Feature/Notes/AssetNotesTest.php b/tests/Feature/Notes/AssetNotesTest.php deleted file mode 100644 index c666cb9e3f..0000000000 --- a/tests/Feature/Notes/AssetNotesTest.php +++ /dev/null @@ -1,76 +0,0 @@ -create(); - - $this->actingAsForApi(User::factory()->create()) - ->postJson(route('api.notes.store'), [ - 'note' => 'New Note!', - 'type' => 'asset', - 'id' => $asset->id, - ]) - ->assertForbidden(); - } - - public function testValidation() - { - $asset = Asset::factory()->create(); - - $this->actingAsForApi(User::factory()->editAssets()->create()) - ->postJson(route('api.notes.store'), [ - // 'note' => '', - 'type' => 'a_type_not_asset', - 'id' => $asset->id, - ]) - ->assertOk() - ->assertStatusMessageIs('error') - ->assertJsonValidationErrors(['note', 'type'], 'messages'); - } - - public function testRequiresExistingAsset() - { - $this->actingAsForApi(User::factory()->editAssets()->create()) - ->postJson(route('api.notes.store'), [ - 'note' => 'New Note!', - 'type' => 'asset', - 'id' => 999_999, - ]) - ->assertStatusMessageIs('error') - ->assertMessagesAre('Asset not found'); - } - - public function testCanAddNoteToAsset() - { - Event::fake([NoteAdded::class]); - - $asset = Asset::factory()->create(); - $user = User::factory()->editAssets()->create(); - - $this->actingAsForApi($user) - ->postJson(route('api.notes.store'), [ - 'note' => 'New Note!', - 'type' => 'asset', - 'id' => $asset->id, - ]) - ->assertOk() - ->assertStatusMessageIs('success'); - - Event::assertDispatchedTimes(NoteAdded::class, 1); - Event::assertDispatched(NoteAdded::class, function (NoteAdded $event) use ($asset, $user) { - return $event->itemNoteAddedOn->is($asset) - && $event->note === 'New Note!' - && $event->noteAddedBy->is($user); - }); - } -} diff --git a/tests/Unit/Listeners/LogListenerTest.php b/tests/Unit/Listeners/LogListenerTest.php index 5b0813c281..64dd2a3d67 100644 --- a/tests/Unit/Listeners/LogListenerTest.php +++ b/tests/Unit/Listeners/LogListenerTest.php @@ -3,7 +3,6 @@ namespace Tests\Unit\Listeners; use App\Events\CheckoutableCheckedOut; -use App\Events\NoteAdded; use App\Listeners\LogListener; use App\Models\Asset; use App\Models\User; @@ -38,19 +37,4 @@ class LogListenerTest extends TestCase ]); } - public function testLogsEntryOnAssetNoteCreation() - { - $asset = Asset::factory()->create(); - $noteAddedBy = User::factory()->create(); - - event(new NoteAdded($asset, $noteAddedBy, 'My Cool Note!')); - - $this->assertDatabaseHas('action_logs', [ - 'action_type' => 'note_added', - 'created_by' => $noteAddedBy->id, - 'item_id' => $asset->id, - 'item_type' => Asset::class, - 'note' => 'My Cool Note!', - ]); - } } From 96ab828cec8a16fc0ac21bc64e39c7149a015dc4 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 20 Feb 2025 13:05:42 -0800 Subject: [PATCH 15/16] Fix indent --- resources/assets/js/snipeit_modals.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/assets/js/snipeit_modals.js b/resources/assets/js/snipeit_modals.js index 874f888a52..cea79e1141 100644 --- a/resources/assets/js/snipeit_modals.js +++ b/resources/assets/js/snipeit_modals.js @@ -28,7 +28,7 @@ $(function () { var baseUrl = $('meta[name="baseUrl"]').attr('content'); //handle modal-add-interstitial calls - var model, select, refreshSelector; + var model, select, refreshSelector; if($('#createModal').length == 0) { $('body').append(''); From c6bee0c47a61248f30716a4e247e7dcef5a14c32 Mon Sep 17 00:00:00 2001 From: Marcus Moore Date: Thu, 20 Feb 2025 13:24:01 -0800 Subject: [PATCH 16/16] Fix test --- tests/Feature/Notes/CreateNotesTest.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Feature/Notes/CreateNotesTest.php b/tests/Feature/Notes/CreateNotesTest.php index dedcabf0f7..a2caae6459 100644 --- a/tests/Feature/Notes/CreateNotesTest.php +++ b/tests/Feature/Notes/CreateNotesTest.php @@ -35,7 +35,7 @@ class CreateNotesTest extends TestCase 'type' => 'asset', 'note' => 'my note', ]) - ->assertStatus(404); + ->assertStatus(302); } public function testCanCreateNoteForAsset()