Skip to content

A free open source IT asset/license management system

Added warning to sync adapters

sniped8a40cb09e28
diff --git a/app/Helpers/IconHelper.php b/app/Helpers/IconHelper.php
index 80596de64d..9f250189fe 100644
--- a/app/Helpers/IconHelper.php
+++ b/app/Helpers/IconHelper.php
@@ -301,6 +301,8 @@ class IconHelper
case 'models':
case 'model':
return 'fa-solid fa-boxes-stacked';
+ case 'dungeon':
+ return 'fa-solid fa-dungeon';
case 'min-qty':
return 'fa-solid fa-chart-pie';
diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
index 0c419c989b..b9c1e81839 100644
--- a/app/Http/Controllers/Api/AssetsController.php
+++ b/app/Http/Controllers/Api/AssetsController.php
@@ -477,10 +477,11 @@ class AssetsController extends Controller
if ($numeric_sort) {
$assets->orderByRaw(DB::getTablePrefix().'assets.'.$sort_override.' * 1 '.$order);
} else {
- $assets->orderBy($sort_override, $order);
+ $assets->orderBy('assets.' . $sort_override, $order);
}
} else {
- $assets->orderBy($column_sort, $order);
+ $qualifiedSort = str_contains($column_sort, '.') ? $column_sort : 'assets.' . $column_sort;
+ $assets->orderBy($qualifiedSort, $order);
}
break;
}
@@ -490,7 +491,26 @@ class AssetsController extends Controller
$offset = ($request->input('offset') > $total) ? $total : app('api_offset_value');
$limit = app('api_limit_value');
- $assets = $assets->skip($offset)->take($limit)->get();
+ // Deferred-join pagination. Instead of running the full query
+ // with all its joins and eager loads through OFFSET / LIMIT
+ // (which forces MySQL to pull entire row bodies for the
+ // (offset + limit) rows it walks before returning the last
+ // `limit` of them), pluck only the primary-key ids on the
+ // fully-joined + sorted + filtered query, then re-hydrate the
+ // limited set of ids with their eager loads on a separate query.
+ $ids = (clone $assets)->select('assets.id')->skip($offset)->take($limit)->pluck('id')->all();
+
+ if (empty($ids)) {
+ $assets = Asset::query()->whereRaw('1 = 0')->get();
+ } else {
+ $order = array_flip($ids);
+ $assets = Asset::query()
+ ->whereIn('assets.id', $ids)
+ ->setEagerLoads($assets->getEagerLoads())
+ ->get()
+ ->sortBy(fn($model) => $order[$model->getKey()] ?? PHP_INT_MAX)
+ ->values();
+ }
/**
* Include additional associated relationships
diff --git a/resources/lang/en-US/admin/settings/sync_adapters.php b/resources/lang/en-US/admin/settings/sync_adapters.php
index 5d919b61cf..0e92a7bb54 100644
--- a/resources/lang/en-US/admin/settings/sync_adapters.php
+++ b/resources/lang/en-US/admin/settings/sync_adapters.php
@@ -25,6 +25,8 @@ return [
'instance_deleted' => 'Adapter removed. Previously synced assets stay in place with their existing external-id links.',
'help_tab_label' => 'Adapter Help',
+ 'experimental_banner_title' => 'Here be dragons',
+ 'experimental_banner_body' => 'Sync adapters are experimental. Adapter runs can create, update, and delete Snipe-IT assets in bulk based on data pulled from the vendor. Take a fresh backup before enabling any adapter and before every material configuration change.',
'empty_state_title' => 'Getting started with sync adapters',
'empty_state_intro' => 'Sync adapters connect Snipe-IT to the MDM, RMM, and endpoint tools you already use, so devices and their assigned users flow into Snipe-IT automatically instead of being typed in by hand.',
'empty_state_supported_intro' => 'Snipe-IT currently supports :count adapter types out of the box:',
diff --git a/resources/views/blade/sync-adapter/credentials.blade.php b/resources/views/blade/sync-adapter/credentials.blade.php
index acaafed14d..955fc58b76 100644
--- a/resources/views/blade/sync-adapter/credentials.blade.php
+++ b/resources/views/blade/sync-adapter/credentials.blade.php
@@ -13,6 +13,15 @@
$locked = config('app.lock_passwords') === true;
@endphp
+<x-alert
+ type="warning"
+ icon="dungeon"
+ :title="trans('admin/settings/sync_adapters.experimental_banner_title')"
+ style="margin-bottom: 15px;"
+>
+ {{ trans('admin/settings/sync_adapters.experimental_banner_body') }}
+</x-alert>
+
@if ($adapter->supportsGroupScoping() && $adapter->isEnabled())
{{-- Refresh-groups action lives outside the config form because
it POSTs to a different route (settings.adapters.refresh_groups)
diff --git a/resources/views/settings/adapters.blade.php b/resources/views/settings/adapters.blade.php
index e03d97bd9a..590e46b720 100644
--- a/resources/views/settings/adapters.blade.php
+++ b/resources/views/settings/adapters.blade.php
@@ -152,6 +152,14 @@
>
<div class="sync-adapters-empty-state">
+ <x-alert
+ type="warning"
+ icon="dungeon"
+ :title="trans('admin/settings/sync_adapters.experimental_banner_title')"
+ style="margin-bottom: 20px;"
+ >
+ {{ trans('admin/settings/sync_adapters.experimental_banner_body') }}
+ </x-alert>
<h3>
<x-icon type="tip" class="text-info"/> {{ trans('admin/settings/sync_adapters.empty_state_title') }}