Skip to content

A free open source IT asset/license management system

Add generic history method and component blade for loggables

snipea500dd4e9e5e
diff --git a/app/Http/Controllers/Api/AccessoriesController.php b/app/Http/Controllers/Api/AccessoriesController.php
index 7e88833eb6..93e5047b67 100644
--- a/app/Http/Controllers/Api/AccessoriesController.php
+++ b/app/Http/Controllers/Api/AccessoriesController.php
@@ -10,6 +10,7 @@ use App\Http\Requests\AccessoryCheckoutRequest;
use App\Http\Requests\ImageUploadRequest;
use App\Http\Requests\StoreAccessoryRequest;
use App\Http\Transformers\AccessoriesTransformer;
+use App\Http\Transformers\ActionlogsTransformer;
use App\Http\Transformers\SelectlistTransformer;
use App\Models\Accessory;
use App\Models\AccessoryCheckout;
@@ -411,4 +412,11 @@ class AccessoriesController extends Controller
return (new SelectlistTransformer)->transformSelectlist($accessories);
}
+
+ public function history(Request $request, Accessory $accessory): JsonResponse|array
+ {
+ $this->authorize('history', $accessory);
+ $history = $accessory->getHistory($request);
+ return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $history->count()), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
+ }
}
diff --git a/app/Http/Controllers/Api/AssetModelsController.php b/app/Http/Controllers/Api/AssetModelsController.php
index 6abb3bb4d3..bb6fb26c43 100644
--- a/app/Http/Controllers/Api/AssetModelsController.php
+++ b/app/Http/Controllers/Api/AssetModelsController.php
@@ -6,6 +6,7 @@ use App\Helpers\Helper;
use App\Http\Controllers\Controller;
use App\Http\Requests\ImageUploadRequest;
use App\Http\Requests\StoreAssetModelRequest;
+use App\Http\Transformers\ActionlogsTransformer;
use App\Http\Transformers\AssetModelsTransformer;
use App\Http\Transformers\AssetsTransformer;
use App\Http\Transformers\SelectlistTransformer;
@@ -350,4 +351,12 @@ class AssetModelsController extends Controller
return (new SelectlistTransformer)->transformSelectlist($assetmodels);
}
+
+ public function history(Request $request, AssetModel $model): JsonResponse|array
+ {
+ $this->authorize('history', $model);
+ $history = $model->getHistory($request);
+
+ return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $history->count()), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
+ }
}
diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index 22145d6efe..4f982b918a 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -11,6 +11,7 @@ use App\Http\Requests\ImageUploadRequest;
use App\Http\Requests\StoreAssetRequest;
use App\Http\Requests\UpdateAssetRequest;
use App\Http\Traits\MigratesLegacyAssetLocations;
+use App\Http\Transformers\ActionlogsTransformer;
use App\Http\Transformers\AssetsTransformer;
use App\Http\Transformers\SelectlistTransformer;
use App\Models\AccessoryCheckout;
@@ -1451,4 +1452,12 @@ class AssetsController extends Controller
], $e->getMessage()), 500);
}
}
+
+ public function history(Request $request, Asset $asset): JsonResponse|array
+ {
+ $this->authorize('history', $asset);
+ $history = $asset->getHistory($request);
+
+ return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $history->count()), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
+ }
}
diff --git a/app/Http/Controllers/Api/ComponentsController.php b/app/Http/Controllers/Api/ComponentsController.php
index 8b47419ba1..eb35d21986 100644
--- a/app/Http/Controllers/Api/ComponentsController.php
+++ b/app/Http/Controllers/Api/ComponentsController.php
@@ -6,6 +6,7 @@ use App\Events\CheckoutableCheckedIn;
use App\Helpers\Helper;
use App\Http\Controllers\Controller;
use App\Http\Requests\ImageUploadRequest;
+use App\Http\Transformers\ActionlogsTransformer;
use App\Http\Transformers\ComponentsTransformer;
use App\Models\Asset;
use App\Models\Component;
@@ -387,4 +388,12 @@ class ComponentsController extends Controller
return response()->json(Helper::formatStandardApiResponse('error', null, 'No matching checkouts for that component join record'));
}
+
+ public function history(Request $request, Component $component): JsonResponse|array
+ {
+ $this->authorize('history', $component);
+ $history = $component->getHistory($request);
+
+ return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $history->count()), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
+ }
}
diff --git a/app/Http/Controllers/Api/ConsumablesController.php b/app/Http/Controllers/Api/ConsumablesController.php
index 0fd3ba2ffe..b342e1fe74 100644
--- a/app/Http/Controllers/Api/ConsumablesController.php
+++ b/app/Http/Controllers/Api/ConsumablesController.php
@@ -7,6 +7,7 @@ use App\Helpers\Helper;
use App\Http\Controllers\Controller;
use App\Http\Requests\ImageUploadRequest;
use App\Http\Requests\StoreConsumableRequest;
+use App\Http\Transformers\ActionlogsTransformer;
use App\Http\Transformers\ConsumablesTransformer;
use App\Http\Transformers\SelectlistTransformer;
use App\Models\Company;
@@ -367,4 +368,11 @@ class ConsumablesController extends Controller
return (new SelectlistTransformer)->transformSelectlist($consumables);
}
+
+ public function history(Request $request, Consumable $consumable): JsonResponse|array
+ {
+ $this->authorize('history', $consumable);
+ $history = $consumable->getHistory($request);
+ return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $history->count()), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
+ }
}
diff --git a/app/Http/Controllers/Api/LicensesController.php b/app/Http/Controllers/Api/LicensesController.php
index 4d1b46f68e..c624c52758 100644
--- a/app/Http/Controllers/Api/LicensesController.php
+++ b/app/Http/Controllers/Api/LicensesController.php
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api;
use App\Helpers\Helper;
use App\Http\Controllers\Controller;
+use App\Http\Transformers\ActionlogsTransformer;
use App\Http\Transformers\LicensesTransformer;
use App\Http\Transformers\SelectlistTransformer;
use App\Models\License;
@@ -275,4 +276,12 @@ class LicensesController extends Controller
return (new SelectlistTransformer)->transformSelectlist($licenses);
}
+
+ public function history(Request $request, License $license): JsonResponse|array
+ {
+ $this->authorize('history', $license);
+ $history = $license->getHistory($request);
+
+ return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $history->count()), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
+ }
}
diff --git a/app/Http/Controllers/Api/LocationsController.php b/app/Http/Controllers/Api/LocationsController.php
index cbbb0d056d..9a7bab6314 100644
--- a/app/Http/Controllers/Api/LocationsController.php
+++ b/app/Http/Controllers/Api/LocationsController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api;
use App\Helpers\Helper;
use App\Http\Controllers\Controller;
use App\Http\Requests\ImageUploadRequest;
+use App\Http\Transformers\ActionlogsTransformer;
use App\Http\Transformers\AssetsTransformer;
use App\Http\Transformers\LocationsTransformer;
use App\Http\Transformers\SelectlistTransformer;
@@ -455,4 +456,12 @@ class LocationsController extends Controller
return (new SelectlistTransformer)->transformSelectlist($paginated_results);
}
+
+ public function history(Request $request, Location $location): JsonResponse|array
+ {
+ $this->authorize('history', $location);
+ $history = $location->getHistory($request);
+
+ return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $history->count()), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
+ }
}
diff --git a/app/Http/Controllers/Api/MaintenancesController.php b/app/Http/Controllers/Api/MaintenancesController.php
index b4e1be790f..fc5cb3198b 100644
--- a/app/Http/Controllers/Api/MaintenancesController.php
+++ b/app/Http/Controllers/Api/MaintenancesController.php
@@ -5,6 +5,7 @@ namespace App\Http\Controllers\Api;
use App\Helpers\Helper;
use App\Http\Controllers\Controller;
use App\Http\Requests\ImageUploadRequest;
+use App\Http\Transformers\ActionlogsTransformer;
use App\Http\Transformers\MaintenancesTransformer;
use App\Models\Asset;
use App\Models\Company;
@@ -251,4 +252,13 @@ class MaintenancesController extends Controller
return (new MaintenancesTransformer)->transformMaintenance($maintenance);
}
+
+ public function history(Request $request, Maintenance $maintenance): JsonResponse|array
+ {
+ $this->authorize('view', Asset::class);
+ $asset = $maintenance->asset;
+ $this->authorize('history', $asset);
+ $history = $maintenance->getHistory($request);
+ return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $history->count()), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
+ }
}
diff --git a/app/Http/Controllers/Api/UsersController.php b/app/Http/Controllers/Api/UsersController.php
index ac72968a43..d147a2cc6d 100644
--- a/app/Http/Controllers/Api/UsersController.php
+++ b/app/Http/Controllers/Api/UsersController.php
@@ -967,4 +967,12 @@ class UsersController extends Controller
return response()->json(Helper::formatStandardApiResponse('success', null, $ldap_results['summary']), 200);
}
+
+ public function history(Request $request, User $user): JsonResponse|array
+ {
+ $this->authorize('history', $user);
+ $history = $user->getHistory($request);
+
+ return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $history->count()), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
+ }
}
diff --git a/app/Models/Traits/Loggable.php b/app/Models/Traits/Loggable.php
index 03ef513e80..ecc399f0e1 100644
--- a/app/Models/Traits/Loggable.php
+++ b/app/Models/Traits/Loggable.php
@@ -14,6 +14,7 @@ use GuzzleHttp\Exception\ClientException;
use GuzzleHttp\Exception\ConnectException;
use GuzzleHttp\Exception\RequestException;
use GuzzleHttp\Exception\ServerException;
+use Illuminate\Http\Request;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\Str;
use Osama\LaravelTeamsNotification\TeamsNotification;
@@ -36,6 +37,77 @@ trait Loggable
return $this->morphMany(Actionlog::class, 'item');
}
+ public function history()
+ {
+ return $this->hasMany(Actionlog::class, 'item_id')
+ ->where('item_type', self::class);
+ }
+
+ public function getHistory(Request $request)
+ {
+ $allowed_columns = [
+ 'id',
+ 'created_at',
+ 'target_id',
+ 'created_by',
+ 'accept_signature',
+ 'action_type',
+ 'note',
+ 'remote_ip',
+ 'user_agent',
+ 'target_type',
+ 'item_type',
+ 'action_source',
+ 'action_date',
+ ];
+
+ $history = $this->with('item', 'user', 'adminuser', 'target', 'location', 'history');
+
+ if ($request->filled('search')) {
+ $history = $this->history()->TextSearch(e($request->input('search')));
+ }
+
+ if ($request->filled('action_type')) {
+ $history = $this->history()->where('action_type', '=', $request->input('action_type'));
+ }
+
+ if ($request->filled('created_by')) {
+ $history = $this->history()->where('created_by', '=', $request->input('created_by'));
+ }
+
+ if ($request->filled('action_source')) {
+ $history = $this->history()->where('action_source', '=', $request->input('action_source'));
+ }
+
+ if ($request->filled('remote_ip')) {
+ $history = $this->history()->where('remote_ip', '=', $request->input('remote_ip'));
+ }
+
+ if ($request->filled('uploads')) {
+ $history = $this->history()->whereNotNull('filename');
+ }
+
+ $total = $this->history()->count();
+ // Make sure the offset and limit are actually integers and do not exceed system limits
+ $offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');
+ $limit = app('api_limit_value');
+
+ $order = ($request->input('order') == 'asc') ? 'asc' : 'desc';
+
+ switch ($request->input('sort')) {
+ case 'created_by':
+ $this->history()->OrderByCreatedBy($order);
+ break;
+ default:
+ $sort = in_array($request->input('sort'), $allowed_columns) ? e($request->input('sort')) : 'action_logs.created_at';
+ $history = $this->history()->orderBy($sort, $order);
+ break;
+ }
+
+ return $history->skip($offset)->take($limit)->get();
+
+ }
+
public function setImported(bool $bool): void
{
$this->imported = $bool;
diff --git a/app/Observers/AssetModelObserver.php b/app/Observers/AssetModelObserver.php
new file mode 100644
index 0000000000..89b6078811
--- /dev/null
+++ b/app/Observers/AssetModelObserver.php
@@ -0,0 +1,83 @@
+<?php
+
+namespace App\Observers;
+
+use App\Models\Actionlog;
+use App\Models\AssetModel;
+
+class AssetModelObserver
+{
+ /**
+ * Listen to the User created event.
+ *
+ * @return void
+ */
+ public function updating(AssetModel $model)
+ {
+
+ $changed = [];
+
+ foreach ($model->getRawOriginal() as $key => $value) {
+ // Check and see if the value changed
+ if ($model->getRawOriginal()[$key] != $model->getAttributes()[$key]) {
+ $changed[$key]['old'] = $model->getRawOriginal()[$key];
+ $changed[$key]['new'] = $model->getAttributes()[$key];
+ }
+ }
+
+ if (count($changed) > 0) {
+ $logAction = new Actionlog;
+ $logAction->item_type = AssetModel::class;
+ $logAction->item_id = $model->id;
+ $logAction->created_at = date('Y-m-d H:i:s');
+ $logAction->created_by = auth()->id();
+ $logAction->log_meta = json_encode($changed);
+ $logAction->logaction('update');
+ }
+
+ }
+
+ /**
+ * Listen to the Location created event when
+ * a new location is created.
+ *
+ * @return void
+ */
+ public function created(AssetModel $model)
+ {
+ $logAction = new Actionlog;
+ $logAction->item_type = AssetModel::class;
+ $logAction->item_id = $model->id;
+ $logAction->created_at = date('Y-m-d H:i:s');
+ $logAction->created_by = auth()->id();
+ if ($model->imported) {
+ $logAction->setActionSource('importer');
+ }
+ $logAction->logaction('create');
+ }
+
+ /**
+ * Listen to the Location deleting event.
+ *
+ * @return void
+ */
+ public function deleting(AssetModel $model)
+ {
+ $logAction = new Actionlog;
+ $logAction->item_type = AssetModel::class;
+ $logAction->item_id = $model->id;
+ $logAction->created_at = date('Y-m-d H:i:s');
+ $logAction->created_by = auth()->id();
+ $logAction->logaction('delete');
+ }
+
+ public function restoring(AssetModel $model)
+ {
+ $logAction = new Actionlog;
+ $logAction->item_type = AssetModel::class;
+ $logAction->item_id = $model->id;
+ $logAction->created_at = date('Y-m-d H:i:s');
+ $logAction->created_by = auth()->id();
+ $logAction->logaction('restore');
+ }
+}
diff --git a/app/Observers/ComponentObserver.php b/app/Observers/ComponentObserver.php
index cf9db6723e..4a02c6ccfd 100644
--- a/app/Observers/ComponentObserver.php
+++ b/app/Observers/ComponentObserver.php
@@ -14,16 +14,29 @@ class ComponentObserver
*/
public function updated(Component $component)
{
- $logAction = new Actionlog;
- $logAction->item_type = Component::class;
- $logAction->item_id = $component->id;
- $logAction->created_at = date('Y-m-d H:i:s');
- $logAction->action_date = date('Y-m-d H:i:s');
- $logAction->created_by = auth()->id();
- if ($component->imported) {
- $logAction->setActionSource('importer');
+
+ foreach ($component->getRawOriginal() as $key => $value) {
+ // Check and see if the value changed
+ if ($component->getRawOriginal()[$key] != $component->getAttributes()[$key]) {
+ $changed[$key]['old'] = $component->getRawOriginal()[$key];
+ $changed[$key]['new'] = $component->getAttributes()[$key];
+ }
}
- $logAction->logaction('update');
+
+ if (count($changed) > 0) {
+ $logAction = new Actionlog;
+ $logAction->item_type = Component::class;
+ $logAction->item_id = $component->id;
+ $logAction->created_at = date('Y-m-d H:i:s');
+ $logAction->action_date = date('Y-m-d H:i:s');
+ $logAction->created_by = auth()->id();
+ $logAction->log_meta = json_encode($changed);
+ if ($component->imported) {
+ $logAction->setActionSource('importer');
+ }
+ $logAction->logaction('update');
+ }
+
}
/**
diff --git a/app/Policies/SnipePermissionsPolicy.php b/app/Policies/SnipePermissionsPolicy.php
index eab440b3c8..3b95cf32a5 100644
--- a/app/Policies/SnipePermissionsPolicy.php
+++ b/app/Policies/SnipePermissionsPolicy.php
@@ -6,6 +6,7 @@ use App\Models\Company;
use App\Models\User;
use Illuminate\Auth\Access\HandlesAuthorization;
use Illuminate\Database\Eloquent\Model;
+use Illuminate\Support\Facades\Gate;
/**
* SnipePermissionsPolicy provides methods for handling the granular permissions used throughout Snipe-IT.
@@ -91,6 +92,11 @@ abstract class SnipePermissionsPolicy
return $user->hasAccess($this->columnName().'.view');
}
+ public function history(User $user, $item = null)
+ {
+ return Gate::allows('view', $item) || $user->hasAccess('activity.view');
+ }
+
public function files(User $user, $item = null)
{
return $user->hasAccess($this->columnName().'.files');
diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
index c01231b2f1..a6a4e79127 100644
--- a/app/Providers/AppServiceProvider.php
+++ b/app/Providers/AppServiceProvider.php
@@ -4,6 +4,7 @@ namespace App\Providers;
use App\Models\Accessory;
use App\Models\Asset;
+use App\Models\AssetModel;
use App\Models\Component;
use App\Models\Consumable;
use App\Models\License;
@@ -13,6 +14,7 @@ use App\Models\Setting;
use App\Models\SnipeSCIMConfig;
use App\Models\User;
use App\Observers\AccessoryObserver;
+use App\Observers\AssetModelObserver;
use App\Observers\AssetObserver;
use App\Observers\ComponentObserver;
use App\Observers\ConsumableObserver;
@@ -76,6 +78,7 @@ class AppServiceProvider extends ServiceProvider
Schema::defaultStringLength(191);
Accessory::observe(AccessoryObserver::class);
Asset::observe(AssetObserver::class);
+ AssetModel::observe(AssetModelObserver::class);
Component::observe(ComponentObserver::class);
Consumable::observe(ConsumableObserver::class);
License::observe(LicenseObserver::class);
diff --git a/app/Providers/AuthServiceProvider.php b/app/Providers/AuthServiceProvider.php
index 7f47c0fab2..78111cbd15 100644
--- a/app/Providers/AuthServiceProvider.php
+++ b/app/Providers/AuthServiceProvider.php
@@ -148,6 +148,7 @@ class AuthServiceProvider extends ServiceProvider
return false;
});
+
/**
* Define the demo mode gate so we have an easy way to use @can and Gate::allows()
diff --git a/database/factories/UserFactory.php b/database/factories/UserFactory.php
index 874989e21c..9b36581dc2 100644
--- a/database/factories/UserFactory.php
+++ b/database/factories/UserFactory.php
@@ -115,6 +115,42 @@ class UserFactory extends Factory
return $this->appendPermission(['assets.view' => '1']);
}
+ public function viewAssetHistory()
+ {
+ return $this->appendPermission(['assets.view' => '1']);
+ }
+
+ public function viewUserHistory()
+ {
+ return $this->appendPermission(['users.view' => '1']);
+ }
+
+ public function viewLocationHistory()
+ {
+ return $this->appendPermission(['locations.view' => '1']);
+ }
+
+ public function viewAccessoryHistory()
+ {
+ return $this->appendPermission(['accessories.view' => '1']);
+ }
+
+ public function viewLicenseHistory()
+ {
+ return $this->appendPermission(['licenses.view' => '1']);
+ }
+
+ public function viewComponentHistory()
+ {
+ return $this->appendPermission(['components.view' => '1']);
+ }
+
+ public function viewConsumableHistory()
+ {
+ return $this->appendPermission(['consumables.view' => '1']);
+ }
+
+
public function createAssets()
{
return $this->appendPermission(['assets.create' => '1']);
diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.php
index 8411fb944c..a66bd9671c 100644
--- a/resources/views/accessories/view.blade.php
+++ b/resources/views/accessories/view.blade.php
@@ -26,7 +26,7 @@
<x-tabs.checkedout-tab :item="$accessory" count="{{ $accessory->checkouts_count }}" />
<x-tabs.files-tab count="{{ $accessory->uploads()->count() }}" />
- <x-tabs.history-tab model="\App\Models\Accessory::class"/>
+ <x-tabs.history-tab count="{{ $user->history()->count() }}" :model="$accessory"/>
<x-tabs.upload-tab :item="$accessory"/>
</x-slot:tabnav>
@@ -49,17 +49,7 @@
<!-- start history tab pane -->
<x-tabs.pane name="history">
- <x-slot:table_header>
- {{ trans('general.history') }}
- </x-slot:table_header>
-
- <x-table
- name="accessoryHistory"
- api_url="{{ route('api.activity.index', ['item_id' => $accessory->id, 'item_type' => 'accessory']) }}"
- :presenter="\App\Presenters\HistoryPresenter::dataTableLayout()"
- export_filename="export-accessory-{{ str_slug($accessory->name) }}-{{ date('Y-m-d') }}"
- />
-
+ <x-table.history :model="$accessory" :route="route('api.accessories.history', $accessory)"/>
</x-tabs.pane>
<!-- end history tab pane -->
diff --git a/resources/views/blade/table/history.blade.php b/resources/views/blade/table/history.blade.php
new file mode 100644
index 0000000000..da2d5439f1
--- /dev/null
+++ b/resources/views/blade/table/history.blade.php
@@ -0,0 +1,25 @@
+@props([
+ 'route',
+ 'name' => 'default',
+ 'presenter' => \App\Presenters\HistoryPresenter::dataTableLayout(),
+ 'table_header' => trans('general.history'),
+ 'model' => null,
+])
+
+
+<!-- start history tab pane -->
+@can('history', $model)
+ <x-slot:table_header>
+ {{ $table_header }}
+ </x-slot:table_header>
+
+ <x-table
+ :$presenter
+ show_advanced_search="false"
+ api_url="{{ $route }}"
+ export_filename="export-history-{{ date('Y-m-d') }}"
+ />
+@else
+ Nope
+@endcan
+<!-- end assets tab pane -->
\ No newline at end of file
diff --git a/resources/views/blade/tabs/history-tab.blade.php b/resources/views/blade/tabs/history-tab.blade.php
index 2cb79e12ff..ec20d01a21 100644
--- a/resources/views/blade/tabs/history-tab.blade.php
+++ b/resources/views/blade/tabs/history-tab.blade.php
@@ -1,10 +1,11 @@
@props([
- 'count' => null,
+ 'count' => 0,
'model' => null,
'class' => false,
])
-@can('view', $model)
+@can('history', $model)
+ @if ($count > 0)
<x-tabs.nav-item
:$class
name="history"
@@ -13,4 +14,5 @@
count="{{ $count }}"
tooltip="{{ trans('general.history') }}"
/>
+ @endif
@endcan
\ No newline at end of file
diff --git a/resources/views/components/view.blade.php b/resources/views/components/view.blade.php
index 8e2294a6d3..40ff1d64c2 100644
--- a/resources/views/components/view.blade.php
+++ b/resources/views/components/view.blade.php
@@ -25,7 +25,7 @@
/>
<x-tabs.files-tab count="{{ $snipe_component->uploads()->count() }}" />
- <x-tabs.history-tab model="\App\Models\Component::class"/>
+ <x-tabs.history-tab count="{{ $snipe_component->history()->count() }}" :model="$snipe_component"/>
<x-tabs.upload-tab :item="$snipe_component"/>
</x-slot:tabnav>
@@ -45,23 +45,16 @@
</x-tabs.pane>
+ <!-- start files tab pane -->
<x-tabs.pane name="files">
<x-table.files object_type="components" :object="$snipe_component"/>
</x-tabs.pane>
<!-- start history tab pane -->
<x-tabs.pane name="history">
- <x-slot:table_header>
- {{ trans('general.history') }}
- </x-slot:table_header>
-
- <x-table
- name="componentHistory"
- api_url="{{ route('api.activity.index', ['item_id' => $snipe_component->id, 'item_type' => 'component']) }}"
- :presenter="\App\Presenters\HistoryPresenter::dataTableLayout()"
- export_filename="export-licenses-{{ str_slug($snipe_component->name) }}-{{ date('Y-m-d') }}"
- />
+ <x-table.history :model="$snipe_component" :route="route('api.components.history', $snipe_component)"/>
</x-tabs.pane>
+
</x-slot:tabpanes>
</x-tabs>
</x-page-column>
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
index 444b906c71..f97241fb4e 100755
--- a/resources/views/hardware/view.blade.php
+++ b/resources/views/hardware/view.blade.php
@@ -64,7 +64,7 @@
<x-tabs.maintenance-tab count="{{ $asset->maintenances->count() }}"/>
<x-tabs.files-tab count="{{ $asset->uploads()->count() }}"/>
<x-tabs.model-files-tab count="{{ $asset->model?->uploads()->count() }}"/>
- <x-tabs.history-tab count="{{ $asset->assetlog()->count() }}" model=" \App\Models\Asset::class"/>
+ <x-tabs.history-tab count="{{ $asset->history()->count() }}" :model="$asset"/>
<x-tabs.upload-tab :item="$asset"/>
</x-slot:tabnav>
@@ -159,14 +159,6 @@
@endif
</x-data-row>
- @if (($asset->model) && ($asset->model->fieldset))
- @foreach($asset->model->fieldset->fields as $field)
- <x-data-row :label="$field->name">
- <x-info-element.customfield :item="$asset" :field="$field"/>
- </x-data-row>
- @endforeach
- @endif
-
<x-data-row :label="trans('admin/hardware/form.default_location')" copy_what="default_location">
{!! $asset->defaultLoc?->present()->formattedNameLink !!}
</x-data-row>
@@ -188,6 +180,17 @@
</x-data-row>
@endif
+
+ @if (($asset->model) && ($asset->model->fieldset))
+ @foreach($asset->model->fieldset->fields as $field)
+ <x-data-row :label="$field->name">
+ <x-info-element.customfield :item="$asset" :field="$field"/>
+ </x-data-row>
+ @endforeach
+ @endif
+
+
+
@if($asset->journal->last())
<x-data-row :label="trans('general.last_note')" copy_what="last_note">
<i class="fa-solid fa-quote-left"></i>
@@ -246,28 +249,30 @@
}
@endphp
- <x-well class="well-sm">
- <x-progressbar use_well="false" columns="12" text="{{ trans('general.device_eol') }}" :percent="$eolPercent">
+ @if($asset->purchase_date || $asset->asset_eol_date || $deprDate || $asset->warranty_expires)
+ <x-well class="well-sm">
@if($asset->purchase_date && $asset->asset_eol_date)
+ <x-progressbar use_well="false" columns="12" text="{{ trans('general.device_eol') }}" :percent="$eolPercent">
<strong>{{ (int) Carbon::now()->diffInMonths($asset->asset_eol_date, true) }}</strong>
- /{{ $asset->model?->eol }} {{ trans('general.months') }}
+ /{{ $asset->model?->eol }} {{ trans('general.months') }}
+ </x-progressbar>
@endif
- </x-progressbar>
- <x-progressbar use_well="false" columns="12" :text="trans('admin/hardware/form.fully_depreciated')" :percent="$deprPercent">
@if($deprDate)
- {{ Helper::getFormattedDateObject($deprDate->format('Y-m-d'), 'date', false) }}
+ <x-progressbar use_well="false" columns="12" :text="trans('admin/hardware/form.fully_depreciated')" :percent="$deprPercent">
+ {{ Helper::getFormattedDateObject($deprDate->format('Y-m-d'), 'date', false) }}
+ </x-progressbar>
@endif
- </x-progressbar>
- <x-progressbar use_well="false" columns="12" :text="trans('admin/hardware/form.warranty_expires')" :percent="$warrantyPercent">
@if($asset->warranty_expires)
+ <x-progressbar use_well="false" columns="12" :text="trans('admin/hardware/form.warranty_expires')" :percent="$warrantyPercent">
{{ Helper::getFormattedDateObject($asset->warranty_expires, 'date', false) }}
+ </x-progressbar>
@endif
- </x-progressbar>
- </x-well>
+ </x-well>
+ @endif
<x-well class="well-sm">
<div class="well-display">
@@ -328,18 +333,7 @@
<!-- start history tab pane -->
<x-tabs.pane name="history">
-
- <x-slot:table_header>
- {{ trans('general.history') }}
- </x-slot:table_header>
-
- <x-table
- name="assetHistory_{{ $asset->id }}"
- api_url="{{ route('api.activity.index', ['item_id' => $asset->id, 'item_type' => 'asset']) }}"
- :presenter="\App\Presenters\HistoryPresenter::dataTableLayout()"
- export_filename="export-history-{{ str_slug($asset->name) }}-{{ date('Y-m-d') }}"
- />
-
+ <x-table.history :model="$asset" :route="route('api.assets.history', $asset)"/>
</x-tabs.pane>
<!-- end history tab pane -->
diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index de90ff7759..acfec601e8 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -18,7 +18,6 @@
<x-tabs>
<x-slot:tabnav>
-
<x-tabs.nav-item
name="seats"
icon_type="checkedout"
@@ -34,7 +33,7 @@
/>
<x-tabs.files-tab name="files" count="{{ $license->uploads()->count() }}"/>
- <x-tabs.history-tab model="\App\Models\License::class"/>
+ <x-tabs.history-tab count="{{ $license->history()->count() }}" :model="$license"/>
<x-tabs.upload-tab :item="$license"/>
</x-slot:tabnav>
@@ -73,17 +72,7 @@
<!-- start history tab pane -->
<x-tabs.pane name="history">
- <x-slot:table_header>
- {{ trans('general.history') }}
- </x-slot:table_header>
-
- <x-table
- name="locationHistory_{{ $license->id }}"
- api_url="{{ route('api.activity.index', ['item_id' => $license->id, 'item_type' => 'license']) }}"
- :presenter="\App\Presenters\HistoryPresenter::dataTableLayout()"
- export_filename="export-licenses-{{ str_slug($license->name) }}-{{ date('Y-m-d') }}"
- />
-
+ <x-table.history :model="$license" :route="route('api.licenses.history', $license)"/>
</x-tabs.pane>
<!-- end history tab pane -->
diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php
index dab2adea36..99e9b78b0b 100644
--- a/resources/views/locations/view.blade.php
+++ b/resources/views/locations/view.blade.php
@@ -95,7 +95,7 @@
/>
<x-tabs.files-tab count="{{ $location->uploads()->count() }}"/>
- <x-tabs.history-tab count="{{ $location->actionlog()->count() }}" model="\App\Models\Location::class"/>
+ <x-tabs.history-tab count="{{ $location->history()->count() }}" :model="$location"/>
<x-tabs.upload-tab count="{{ $location->uploads()->count() }}" :item="$location"/>
</x-slot:tabnav>
@@ -192,17 +192,7 @@
<!-- start history tab pane -->
<x-tabs.pane name="history">
- <x-slot:table_header>
- {{ trans('general.history') }}
- </x-slot:table_header>
-
- <x-table
- name="locationHistory"
- api_url="{{ route('api.activity.index', ['item_id' => $location->id, 'item_type' => 'location']) }}"
- :presenter="\App\Presenters\HistoryPresenter::dataTableLayout()"
- export_filename="export-locations-history-{{ str_slug($location->name) }}-{{ date('Y-m-d') }}"
- />
-
+ <x-table.history :model="$location" :route="route('api.locations.history', $location)"/>
</x-tabs.pane>
<!-- end history tab pane -->
diff --git a/resources/views/models/view.blade.php b/resources/views/models/view.blade.php
index 449ed13398..767c40c0b3 100755
--- a/resources/views/models/view.blade.php
+++ b/resources/views/models/view.blade.php
@@ -29,6 +29,7 @@
<x-slot:tabnav>
<x-tabs.asset-tab count="{{ $model->assets()->AssetsForShow()->count() }}" />
<x-tabs.files-tab name="files" count="{{ $model->uploads()->count() }}" />
+ <x-tabs.history-tab count="{{ $model->history()->count() }}" :model="$model"/>
<x-tabs.upload-tab :item="$model"/>
</x-slot:tabnav>
@@ -38,6 +39,12 @@
<x-table.assets :route="route('api.assets.index', ['model_id' => $model->id, 'status' => $model->deleted_at!='' ? 'Deleted' : ''])" />
</x-tabs.pane>
+ <!-- start history tab pane -->
+ <x-tabs.pane name="history">
+ <x-table.history :model="$model" :route="route('api.models.history', $model)"/>
+ </x-tabs.pane>
+ <!-- end history tab pane -->
+
<x-tabs.pane name="files">
<x-table.files :object="$model" object_type="models" />
</x-tabs.pane>
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 0fa311476e..cf0fe05144 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -37,7 +37,7 @@
<x-tabs.eula-tab count="{{ $user->eulas()->count() }}"/>
<x-tabs.location-tab count="{{ $user->managedLocations()->count() }}"/>
<x-tabs.user-tab count="{{ $user->managesUsers()->count() }}" name="managed-users" icon_type="manager" :label="trans('admin/users/table.managed_users')"/>
- <x-tabs.history-tab count="{{ $user->userlog()->count() }}" model="\App\Models\User::class"/>
+ <x-tabs.history-tab count="{{ $user->history()->count() }}" :model="$user"/>
<x-tabs.upload-tab :item="$user"/>
</x-slot:tabnav>
@@ -501,18 +501,7 @@
<!-- start history tab pane -->
<x-tabs.pane name="history">
-
- <x-slot:table_header>
- {{ trans('general.history') }}
- </x-slot:table_header>
-
- <x-table
- name="userHistory_{{ $user->id }}"
- api_url="{{ route('api.activity.index', ['target_id' => $user->id, 'target_type' => User::class]) }}"
- :presenter="\App\Presenters\HistoryPresenter::dataTableLayout()"
- export_filename="export-history-{{ str_slug($user->name) }}-{{ date('Y-m-d') }}"
- />
-
+ <x-table.history :model="$user" :route="route('api.users.history', $user)"/>
</x-tabs.pane>
<!-- end history tab pane -->
</x-slot:tabpanes>
diff --git a/routes/api.php b/routes/api.php
index 25119836bd..34a63d03ae 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -82,6 +82,13 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'api-throttle:api']], fu
*/
Route::group(['prefix' => 'accessories'], function () {
+ Route::get('{accessory}/history',
+ [
+ Api\AccessoriesController::class,
+ 'history',
+ ]
+ )->name('api.accessories.history');
+
Route::get('{accessory}/checkedout',
[
Api\AccessoriesController::class,
@@ -215,6 +222,14 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'api-throttle:api']], fu
*/
Route::group(['prefix' => 'components'], function () {
+ Route::get('{component}/history',
+ [
+ Api\ComponentsController::class,
+ 'history',
+ ]
+ )->name('api.components.history');
+
+
Route::get('selectlist',
[
Api\ComponentsController::class,
@@ -263,6 +278,13 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'api-throttle:api']], fu
*/
Route::group(['prefix' => 'consumables'], function () {
+ Route::get('{consumable}/history',
+ [
+ Api\ConsumablesController::class,
+ 'history',
+ ]
+ )->name('api.consumables.history');
+
Route::get('selectlist',
[
Api\ConsumablesController::class,
@@ -436,6 +458,13 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'api-throttle:api']], fu
]
)->name('api.assets.licenselist');
+ Route::get('{asset}/history',
+ [
+ Api\AssetsController::class,
+ 'history',
+ ]
+ )->name('api.assets.history');
+
Route::get('bytag/{tag}',
[
Api\AssetsController::class,
@@ -572,6 +601,14 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'api-throttle:api']], fu
/**
* Asset maintenances API routes
*/
+
+ Route::get('/maintenances/{maintenance}/history',
+ [
+ Api\MaintenancesController::class,
+ 'history',
+ ]
+ )->name('api.maintenances.history');
+
Route::resource('maintenances',
Api\MaintenancesController::class,
['names' => [
@@ -637,6 +674,13 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'api-throttle:api']], fu
]
)->name('api.licenses.selectlist');
+ Route::get('{license}/history',
+ [
+ Api\LicensesController::class,
+ 'history',
+ ]
+ )->name('api.licenses.history');
+
});
Route::resource('licenses',
@@ -708,6 +752,14 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'api-throttle:api']], fu
'assignedAccessories',
]
)->name('api.locations.assigned_accessories');
+
+ Route::get('{location}/history',
+ [
+ Api\LocationsController::class,
+ 'history',
+ ]
+ )->name('api.locations.history');
+
/** End assigned routes */
});
@@ -765,6 +817,13 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'api-throttle:api']], fu
*/
Route::group(['prefix' => 'models'], function () {
+ Route::get('{model}/history',
+ [
+ Api\AssetModelsController::class,
+ 'history',
+ ]
+ )->name('api.models.history');
+
Route::get('selectlist',
[
Api\AssetModelsController::class,
@@ -1002,6 +1061,13 @@ Route::group(['prefix' => 'v1', 'middleware' => ['api', 'api-throttle:api']], fu
*/
Route::group(['prefix' => 'users'], function () {
+ Route::get('{user}/history',
+ [
+ Api\UsersController::class,
+ 'history',
+ ]
+ )->name('api.users.history');
+
Route::get('selectlist',
[
Api\UsersController::class,
diff --git a/tests/Feature/History/Api/HistoryTest.php b/tests/Feature/History/Api/HistoryTest.php
new file mode 100644
index 0000000000..8a8a0e59f5
--- /dev/null
+++ b/tests/Feature/History/Api/HistoryTest.php
@@ -0,0 +1,192 @@
+<?php
+
+namespace Tests\Feature\History\Api;
+
+use App\Models\Accessory;
+use App\Models\Asset;
+use App\Models\Consumable;
+use App\Models\License;
+use App\Models\Location;
+use App\Models\Component;
+use App\Models\Maintenance;
+use App\Models\User;
+use Tests\TestCase;
+
+class IndexHistoryTest extends TestCase
+{
+ /** Assets */
+ public function test_viewing_asset_history_index_requires_permission()
+ {
+ $this->actingAsForApi(User::factory()->create())
+ ->getJson(route('api.assets.history', Asset::factory()->create()))
+ ->assertForbidden();
+ }
+
+ public function test_viewing_asset_history_user_has_permission()
+ {
+ $this->actingAsForApi(User::factory()->viewAssetHistory()->create())
+ ->getJson(route('api.assets.history', Asset::factory()->create()))
+ ->assertOk();
+ }
+
+ public function test_viewing_asset_history_admin_has_permission()
+ {
+ $this->actingAsForApi(User::factory()->admin()->create())
+ ->getJson(route('api.assets.history', Asset::factory()->create()))
+ ->assertOk();
+ }
+
+ /** Users */
+ public function test_viewing_user_history_index_requires_permission()
+ {
+ $this->actingAsForApi(User::factory()->create())
+ ->getJson(route('api.users.history', User::factory()->create()))
+ ->assertForbidden();
+ }
+
+ public function test_viewing_user_history_user_has_permission()
+ {
+ $this->actingAsForApi(User::factory()->viewUserHistory()->create())
+ ->getJson(route('api.users.history', User::factory()->create()))
+ ->assertOk();
+ }
+
+ public function test_viewing_user_history_admin_has_permission()
+ {
+ $this->actingAsForApi(User::factory()->admin()->create())
+ ->getJson(route('api.users.history', User::factory()->create()))
+ ->assertOk();
+ }
+
+ /** Locations */
+ public function test_viewing_location_history_index_requires_permission()
+ {
+ $this->actingAsForApi(User::factory()->create())
+ ->getJson(route('api.locations.history', Location::factory()->create()))
+ ->assertForbidden();
+ }
+
+ public function test_viewing_location_history_user_has_permission()
+ {
+ $this->actingAsForApi(User::factory()->viewLocationHistory()->create())
+ ->getJson(route('api.locations.history', Location::factory()->create()))
+ ->assertOk();
+ }
+
+ public function test_viewing_location_history_admin_has_permission()
+ {
+ $this->actingAsForApi(User::factory()->admin()->create())
+ ->getJson(route('api.locations.history', Location::factory()->create()))
+ ->assertOk();
+ }
+
+ /** Accessories */
+ public function test_viewing_accessory_history_index_requires_permission()
+ {
+ $this->actingAsForApi(User::factory()->create())
+ ->getJson(route('api.accessories.history', Accessory::factory()->create()))
+ ->assertForbidden();
+ }
+
+ public function test_viewing_accessory_history_user_has_permission()
+ {
+ $this->actingAsForApi(User::factory()->viewAccessoryHistory()->create())
+ ->getJson(route('api.accessories.history', Accessory::factory()->create()))
+ ->assertOk();
+ }
+
+ public function test_viewing_accessory_history_admin_has_permission()
+ {
+ $this->actingAsForApi(User::factory()->admin()->create())
+ ->getJson(route('api.accessories.history', Accessory::factory()->create()))
+ ->assertOk();
+ }
+
+ /** Licenses */
+ public function test_viewing_license_history_index_requires_permission()
+ {
+ $this->actingAsForApi(User::factory()->create())
+ ->getJson(route('api.licenses.history', License::factory()->create()))
+ ->assertForbidden();
+ }
+
+ public function test_viewing_license_history_user_has_permission()
+ {
+ $this->actingAsForApi(User::factory()->viewLicenseHistory()->create())
+ ->getJson(route('api.licenses.history', License::factory()->create()))
+ ->assertOk();
+ }
+
+ public function test_viewing_license_history_admin_has_permission()
+ {
+ $this->actingAsForApi(User::factory()->admin()->create())
+ ->getJson(route('api.licenses.history', License::factory()->create()))
+ ->assertOk();
+ }
+
+ /** Components */
+ public function test_viewing_component_history_index_requires_permission()
+ {
+ $this->actingAsForApi(User::factory()->create())
+ ->getJson(route('api.components.history', Component::factory()->create()))
+ ->assertForbidden();
+ }
+
+ public function test_viewing_component_history_user_has_permission()
+ {
+ $this->actingAsForApi(User::factory()->viewComponentHistory()->create())
+ ->getJson(route('api.components.history', Component::factory()->create()))
+ ->assertOk();
+ }
+
+ public function test_viewing_component_history_admin_has_permission()
+ {
+ $this->actingAsForApi(User::factory()->admin()->create())
+ ->getJson(route('api.components.history', Component::factory()->create()))
+ ->assertOk();
+ }
+
+ /** Consumables */
+ public function test_viewing_consumable_history_index_requires_permission()
+ {
+ $this->actingAsForApi(User::factory()->create())
+ ->getJson(route('api.consumables.history', Consumable::factory()->create()))
+ ->assertForbidden();
+ }
+
+ public function test_viewing_consumable_history_user_has_permission()
+ {
+ $this->actingAsForApi(User::factory()->viewConsumableHistory()->create())
+ ->getJson(route('api.consumables.history', Consumable::factory()->create()))
+ ->assertOk();
+ }
+
+ public function test_viewing_consumable_history_admin_has_permission()
+ {
+ $this->actingAsForApi(User::factory()->admin()->create())
+ ->getJson(route('api.consumables.history', Consumable::factory()->create()))
+ ->assertOk();
+ }
+
+ /** Maintenances */
+ public function test_viewing_maintenance_history_index_requires_permission()
+ {
+ $this->actingAsForApi(User::factory()->create())
+ ->getJson(route('api.maintenances.history', Maintenance::factory()->create()))
+ ->assertForbidden();
+ }
+
+ public function test_viewing_maintenance_history_user_has_permission()
+ {
+ $this->actingAsForApi(User::factory()->viewAssetHistory()->create())
+ ->getJson(route('api.maintenances.history', Maintenance::factory()->create()))
+ ->assertOk();
+ }
+
+ public function test_viewing_maintenance_history_admin_has_permission()
+ {
+ $this->actingAsForApi(User::factory()->admin()->create())
+ ->getJson(route('api.maintenances.history', Maintenance::factory()->create()))
+ ->assertOk();
+ }
+}