Skip to content

A free open source IT asset/license management system

Use new mapping targets path

snipe6bc3cfdc1d1f
diff --git a/resources/views/blade/sync-adapter/form.blade.php b/resources/views/blade/sync-adapter/form.blade.php
index dfb6eca203..b175f42738 100644
--- a/resources/views/blade/sync-adapter/form.blade.php
+++ b/resources/views/blade/sync-adapter/form.blade.php
@@ -353,7 +353,7 @@
</x-form.legend>
- @foreach (\App\SyncAdapters\Support\MappingTargets::FIELDS as $mappingField)
+ @foreach (\App\SyncAdapters\MappingTargets::FIELDS as $mappingField)
<x-form.row
:label="trans('admin/settings/sync_adapters.field_' . $mappingField)"
:name="$slug . '_mapping_' . $mappingField"
@@ -369,7 +369,7 @@
<div class="col-md-8">
<x-input.select
:name="$slug . '_mapping[' . $mappingField . ']'"
- :options="\App\SyncAdapters\Support\MappingTargets::options($mappingField)"
+ :options="\App\SyncAdapters\MappingTargets::options($mappingField)"
:selected="$adapter->mappingFor($mappingField)"
style="width: 100%"
:disabled="$locked"
@@ -389,7 +389,7 @@
@else
<x-input.select
:name="$slug . '_mapping[' . $mappingField . ']'"
- :options="\App\SyncAdapters\Support\MappingTargets::options($mappingField)"
+ :options="\App\SyncAdapters\MappingTargets::options($mappingField)"
:selected="$adapter->mappingFor($mappingField)"
style="width: 100%"
:disabled="$locked"
@@ -446,7 +446,7 @@
<div class="col-md-8">
<x-input.select
:name="$slug . '_mapping[' . $extraKey . ']'"
- :options="\App\SyncAdapters\Support\MappingTargets::optionsForExtra($extraType, $extraAdminDefined)"
+ :options="\App\SyncAdapters\MappingTargets::optionsForExtra($extraType, $extraAdminDefined)"
:selected="$adapter->mappingFor($extraKey)"
style="width: 100%"
:disabled="$locked"
@@ -466,7 +466,7 @@
@else
<x-input.select
:name="$slug . '_mapping[' . $extraKey . ']'"
- :options="\App\SyncAdapters\Support\MappingTargets::optionsForExtra($extraType, $extraAdminDefined)"
+ :options="\App\SyncAdapters\MappingTargets::optionsForExtra($extraType, $extraAdminDefined)"
:selected="$adapter->mappingFor($extraKey)"
style="width: 100%"
:disabled="$locked"
diff --git a/tests/Feature/SyncAdapters/ExtraFieldMappingTest.php b/tests/Feature/SyncAdapters/ExtraFieldMappingTest.php
index 049eb80e28..e638b111f8 100644
--- a/tests/Feature/SyncAdapters/ExtraFieldMappingTest.php
+++ b/tests/Feature/SyncAdapters/ExtraFieldMappingTest.php
@@ -7,7 +7,7 @@ use App\Models\Statuslabel;
use App\Models\SyncAdapterConfig;
use App\Models\SyncAdapterInstance;
use App\SyncAdapters\Fleet\FleetAdapter;
-use App\SyncAdapters\Support\MappingTargets;
+use App\SyncAdapters\MappingTargets;
use App\SyncAdapters\SyncHostFromAdapter;
use Illuminate\Support\Facades\Crypt;
use Illuminate\Support\Facades\Http;
diff --git a/tests/Feature/SyncAdapters/KaseyaVsa10/KaseyaVsa10CustomFieldsTest.php b/tests/Feature/SyncAdapters/KaseyaVsa10/KaseyaVsa10CustomFieldsTest.php
index 9488be3cac..2da9ec869f 100644
--- a/tests/Feature/SyncAdapters/KaseyaVsa10/KaseyaVsa10CustomFieldsTest.php
+++ b/tests/Feature/SyncAdapters/KaseyaVsa10/KaseyaVsa10CustomFieldsTest.php
@@ -7,21 +7,12 @@ use App\Models\SyncAdapterConfig;
use App\Models\SyncAdapterInstance;
use App\Models\User;
use App\SyncAdapters\KaseyaVsa10\KaseyaVsa10Adapter;
-use App\SyncAdapters\Support\MappingTargets;
+use App\SyncAdapters\MappingTargets;
use Illuminate\Support\Facades\Crypt;
use Illuminate\Support\Facades\Http;
use Tests\TestCase;
-/**
- * Coverage for the VSA 10 vendor-custom-field flow:
- * - fetching the definitions from /customfields
- * - caching them under vendor_custom_fields
- * - surfacing them in extraFields() with admin_defined = true
- * - narrowing the mapping-target pool to skip + custom-only
- * - enriching pulled records with per-device values only when at
- * least one field has been mapped
- * - refresh route flow via the settings controller
- */
+
class KaseyaVsa10CustomFieldsTest extends TestCase
{
protected function setUp(): void