mirror/snipe-it
3
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2026-08-18 11:15:42 +00:00
Code Issues Projects Releases Wiki Activity

Possible fix for #19450 - handle “do not import” better

Browse Source
This commit is contained in:
snipe
2026-08-12 16:23:16 +01:00
parent 1125e595b4
commit fb0ee60bf5
2 changed files with 31 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/Livewire/Importer.php
View File

@ -211,7 +211,14 @@ class Importer extends Component
$tmp = [];
if ($this->activeFile) {
$tmp = array_combine($this->headerRow, $this->field_map);
$tmp = array_filter($tmp);
// Drop only nulls (columns the auto-map couldn't bind to
// anything for this import type). Preserve empty strings,
// which encode the user's explicit "Do not import" choice
// in the wizard select. Bare array_filter($tmp) treats both
// as falsy and silently loses the user selection, forcing
// them to re-set "Do not import" every time the template
// is reloaded (see the wizard-side companion fix for #19450).
$tmp = array_filter($tmp, fn ($v) => $v !== null);
}
return json_encode($tmp);
@ -866,9 +873,18 @@ class Importer extends Component
$this->field_map = null;
foreach ($this->headerRow as $element) {
if (isset($this->activeFile->field_map[$element])) {
// Preserved values may be either a real target-field key
// or the empty string "" (user's explicit "Do not import"
// choice, persisted by generate_field_map). Push through
// as-is; the blade side's is_null-based @continue keeps
// "" rows visible so the user can flip them back.
$this->field_map[] = $this->activeFile->field_map[$element];
} else {
$this->field_map[] = null; // re-inject the 'nulls' if a file was imported with some 'Do Not Import' settings
// Header wasn't in the saved map at all. Treat as
// never-mapped (auto-map couldn't bind or this header
// is new since the template was saved). Null hides the
// row in the wizard by design.
$this->field_map[] = null;
}
}

18
resources/views/livewire/importer.blade.php
View File

@ -515,13 +515,21 @@
@php
// Skip CSV columns that the auto-map
// couldn't bind to any target for the
// current import type. If the user
// needs manual control they can
// pick a different import type in
// step 1 and the map re-runs.
// current import type — those come
// through as PHP null. Rows the USER
// set to "Do not import" come through
// as empty string (Livewire binds the
// select's value="" as ""), so those
// stay visible and the user can change
// their mind. Previously used empty()
// here, which conflated the two and
// made "Do not import" rows disappear
// from the wizard with no way to bring
// them back short of restarting the
// import (#19450).
$currentMapping = $field_map[$index] ?? null;
@endphp
@continue(empty($currentMapping))
@continue(is_null($currentMapping))
<div class="form-group col-md-12" wire:key="header-row-{{ $index }}">
<label for="field_map.{{ $index }}" class="col-md-3 control-label text-right">{{ $header }}</label>