Skip to content

A free open source IT asset/license management system

Reworking livewire blade

snipe814cda09357e
diff --git a/resources/views/livewire/importer.blade.php b/resources/views/livewire/importer.blade.php
index a2f458a3f5..d8a5253bb7 100644
--- a/resources/views/livewire/importer.blade.php
+++ b/resources/views/livewire/importer.blade.php
@@ -71,40 +71,7 @@
<div class="box box-default">
<div class="box-body">
<div class="row">
-
- <div class="col-md-12">
-
- @if($progress != -1)
- <div class="col-md-10 col-sm-5 col-xs-12" style="height: 33px;" id='progress-container'>
- <div class="progress progress-striped-active" style="height: 100%;">
- <div id='progress-bar' class="progress-bar progress-bar-striped {{ $progress_bar_class }}" role="progressbar" style="width: {{ $progress }}%">
- <h4 id="progress-text">{!! $progress_message !!}</h4>
- </div>
- </div>
- </div>
- @endif
-
- <div class="col-md-2 col-sm-5 col-xs-12 text-right pull-right">
-
- <!-- The fileinput-button span is used to style the file input field as button -->
- @if (!config('app.lock_passwords'))
- <span class="btn btn-theme btn-block fileinput-button">
- <span>{{ trans('button.select_file') }}</span>
- <!-- The file input field used as target for the file upload widget -->
- <label for="files[]"><span class="sr-only">{{ trans('admin/importer/general.select_file') }}</span></label>
- <input id="fileupload" type="file" name="files[]" data-url="{{ route('api.imports.index') }}" accept="text/csv" aria-label="files[]">
- </span>
- @endif
-
- </div>
-
- </div>
-
-
-
- </div>
- <div class="row">
- <div class="col-md-12 table-responsive" style="padding-top: 30px;">
+ <div class="col-md-12 table-responsive">
@if (count($selectedIds) > 0)
<div class="row" style="padding-bottom: 10px;">
@@ -112,7 +79,8 @@
<button type="button"
class="btn btn-danger"
data-toggle="modal"
- data-target="#bulkDeleteImportsModal">
+ data-target="#bulkDeleteImportsModal"
+ @disabled(config('app.lock_passwords'))>
<i class="fas fa-trash" aria-hidden="true"></i>
{{ trans('admin/hardware/message.import.bulk_delete.button', ['count' => count($selectedIds)]) }}
</button>
@@ -155,7 +123,7 @@
@foreach($this->files as $currentFile)
- <tr style="{{ ($this->activeFile && ($currentFile->id == $this->activeFile->id)) ? 'font-weight: bold' : '' }}" class="{{ ($this->activeFile && ($currentFile->id == $this->activeFile->id)) ? '' : '' }}">
+ <tr style="{{ ($this->activeFile && ($currentFile->id == $this->activeFile->id)) ? 'font-weight: bold' : '' }}">
<td>
<label class="sr-only" for="import-row-{{ $currentFile->id }}">
{{ trans('admin/hardware/message.import.bulk_delete.select_row', ['file' => $currentFile->file_path]) }}
@@ -174,6 +142,16 @@
@else
{{ $currentFile->file_path }}
@endif
+ @if (in_array($currentFile->id, $newlyUploadedIds, true))
+ {{-- Yellow spinning star flags rows the user
+ just uploaded. Faster spin than fa-spin's
+ default 2s via inline animation-duration,
+ and an opacity transition so the JS
+ timeout can add .newly-uploaded-fading
+ for a soft dissolve before Livewire
+ removes the DOM. --}}
+ <i class="fas fa-star fa-spin text-yellow newly-uploaded-star" style="margin-left: 6px; animation-duration: 0.7s; transition: opacity 0.6s ease-out;" aria-label="{{ trans('general.newly_uploaded') }}" data-tooltip="true" data-title="{{ trans('general.newly_uploaded') }}"></i>
+ @endif
</td>
<td>{{ Helper::getFormattedDateObject($currentFile->created_at, 'datetime', false) }}</td>
<td>
@@ -195,7 +173,7 @@
<span class="sr-only">{{ trans('general.import') }}</span>
</button>
- @if ((auth()->user()->id == $currentFile->adminuser?->id) || (auth()->user()->isSuperUser()))
+ @if (((auth()->user()->id == $currentFile->adminuser?->id) || (auth()->user()->isSuperUser())) && ! config('app.lock_passwords'))
<a href="#" wire:click.prevent="$set('activeFileId',null)" data-tooltip="true" data-title="{{ trans('general.delete') }}">
<button class="btn btn-sm btn-danger" wire:click="destroy({{ $currentFile->id }})">
<i class="fas fa-trash icon-white" aria-hidden="true"></i>
@@ -211,165 +189,6 @@
</td>
</tr>
-
- @if( $currentFile && $this->activeFile && ($currentFile->id == $this->activeFile->id))
- <tr>
- <td colspan="6">
-
- <div class="form-group">
-
- <label for="typeOfImport" class="col-md-3 col-xs-12 control-label">
- {{ trans('general.import_type') }}
- </label>
-
- <div class="col-md-9 col-xs-12">
- <x-input.select
- name="typeOfImport"
- id="import_type"
- :options="$importTypes"
- :selected="$typeOfImport"
- :for-livewire="true"
- :include-empty="true"
- :data-placeholder="trans('general.select_var', ['thing' => trans('general.import_type')])"
- {{--placeholder needed so that the form-helper will put an empty option first--}}
- placeholder=""
- {{--Remove this if the list gets long enough that we need to search--}}
- data-minimum-results-for-search="-1"
- style="min-width: 350px;"
- />
- @if ($typeOfImport === 'asset' && $snipeSettings->auto_increment_assets == 0)
- <p class="help-block">
- {{ trans('general.auto_incrementing_asset_tags_disabled_so_tags_required') }}
- </p>
- @endif
- </div>
- </div>
-
- <div class="form-group col-md-9 col-md-offset-3">
- <label class="form-control">
- <input type="checkbox" name="update" data-livewire-component="{{ $this->getId() }}" wire:model.live="update">
- {{ trans('general.update_existing_values') }}
- </label>
-
- @if ($typeOfImport === 'asset' && $snipeSettings->auto_increment_assets == 1 && $update)
- <p class="help-block">
- {{ trans('general.auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created') }}
- </p>
- @endif
-
-
-
- @if ($typeOfImport === 'user')
- <label class="form-control">
- <input type="checkbox" name="send_welcome" data-livewire-component="{{ $this->getId() }}" wire:model.live="send_welcome">
- {{ trans('general.send_welcome_email_to_users') }}
- </label>
- <p class="help-block"> {{ trans('general.send_welcome_email_import_help') }}</p>
- @endif
-
- <label class="form-control">
- <input type="checkbox" name="run_backup" data-livewire-component="{{ $this->getId() }}" wire:model.live="run_backup">
- {{ trans('general.back_before_importing') }}
- </label>
-
- </div>
-
-
- @if($statusText)
- <div class="alert col-md-8 col-md-offset-3{{ $statusType == 'success' ? ' alert-success' : ($statusType == 'error' ? ' alert-danger' : ' alert-info') }}" style="padding-top: 20px;">
- {!! $statusText !!}
- </div>
- @endif
-
-
- @if ($typeOfImport)
- <div class="form-group col-md-12">
- <hr style="border-top: 1px solid lightgray">
- <h3>
- <i class="{{ \App\Helpers\IconHelper::icon($typeOfImport) }}">
- </i>
- {{ trans('general.map_fields', ['item_type' => $importTypes[$typeOfImport]]) }}
- </h3>
- <hr style="border-top: 1px solid lightgray">
- </div>
- <div class="form-group col-md-12">
- <div class="col-md-3 text-right">
- <strong>{{ trans('general.csv_header_field') }}</strong>
- </div>
- <div class="col-md-4">
- <strong>{{ trans('general.import_field') }}</strong>
- </div>
- <div class="col-md-5">
- <strong>{{ trans('general.sample_value') }}</strong>
- </div>
- </div><!-- /div row -->
-
- @if(! empty($headerRow))
-
- @foreach($headerRow as $index => $header)
-
- <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>
- <div class="col-md-4">
- <x-input.select
- :name="'field_map.'.$index"
- :for-livewire="true"
- :placeholder="trans('general.importer.do_not_import')"
- class="mappings"
- style="min-width: 100%;"
- >
- <option selected="selected" value="">{{ trans('general.importer.do_not_import') }}</option>
- @foreach($columnOptions[$typeOfImport] as $key => $value)
- <option
- value="{{ $key }}"
- @selected(@$field_map[$index] === $key)
- @disabled($key === '-')
- >{{ $value }}</option>
- @endforeach
- </x-input.select>
- </div>
- @if (($this->activeFile->first_row) && (array_key_exists($index, $this->activeFile->first_row)))
- <div class="col-md-5">
- <p class="form-control-static">{{ str_limit($this->activeFile->first_row[$index], 50, '...') }}</p>
- </div>
- @else
- @php
- $statusText = trans('help.empty_file');
- $statusType = 'info';
- @endphp
- @endif
- </div><!-- /div row -->
- @endforeach
- @else
- {{ trans('general.no_headers') }}
- @endif
-
- <div class="form-group col-md-12">
- <div class="col-md-3 text-left">
- <a href="#" wire:click.prevent="$set('activeFileId',null)">{{ trans('general.cancel') }}</a>
- </div>
- <div class="col-md-9">
- <button type="submit" class="btn btn-primary col-md-5" id="import">{{ trans('admin/hardware/message.import.import_button') }}</button>
- <br><br>
- </div>
- </div>
-
- @if($statusText)
- <div class="alert col-md-8 col-md-offset-3{{ $statusType == 'success' ? ' alert-success' : ($statusType == 'error' ? ' alert-danger' : ' alert-info') }}" style="padding-top: 20px;">
- {!! $statusText !!}
- </div>
- @endif
- @else
- <div class="form-group col-md-10">
- <div class="col-md-3 text-left">
- <a href="#" wire:click.prevent="$set('activeFileId',null)">{{ trans('general.cancel') }}</a>
- </div>
- </div>
- @endif {{-- end of if ... $typeOfImport --}}
- </td>
- </tr>
- @endif
@endforeach
</table>
@@ -386,12 +205,528 @@
</div>
</div>
<div class="col-md-3">
- <h2>{{ trans('general.importing') }}</h2>
- <p>{!! trans('general.importing_help') !!}</p>
+ <div class="box box-default">
+ <div class="box-header with-border">
+ <h2 class="box-title" style="margin: 0;">{{ trans('general.importing') }}</h2>
+ </div>
+ <div class="box-body">
+
+ <p>{!! trans('general.importing_help') !!}</p>
+
+ {{-- Feature-level demo-mode notice for the whole
+ importer path (upload, process, destroy).
+ x-demo-lock self-gates on editableOnDemo. --}}
+ <x-demo-lock style="width: 100%;">{{ trans('general.feature_disabled') }}</x-demo-lock>
+
+ {{-- Upload button. The fileupload jQuery widget is
+ bound to #fileupload down in @script, so the
+ input still has to be present in the DOM even
+ when lock_passwords is set. --}}
+ @if (! config('app.lock_passwords'))
+ <span class="btn btn-theme btn-block fileinput-button" style="margin-bottom: 15px;">
+ <span>{{ trans('button.select_file') }}</span>
+ <label for="files[]"><span class="sr-only">{{ trans('admin/importer/general.select_file') }}</span></label>
+ {{-- multiple lets users pick a batch of CSVs
+ in one dialog; jQuery fileupload fires
+ add()/progress()/done() per file, so the
+ Livewire callbacks already handle each
+ one individually. Server-side
+ ImportController::store already iterates
+ Request::file('files'). --}}
+ <input id="fileupload" type="file" name="files[]" multiple data-url="{{ route('api.imports.index') }}" accept="text/csv" aria-label="files[]">
+ </span>
+ @endif
+
+ {{-- One progress bar per uploading file. JS
+ appends a `.upload-progress-item` for each
+ file in the fileupload widget's add() callback
+ and mutates its own bar/message in place, so
+ concurrent uploads don't trample each other's
+ UI. wire:ignore keeps Livewire's morphdom
+ from wiping the JS-appended children when
+ uploadSucceeded / uploadFailed triggers a
+ component re-render - especially important
+ for failed uploads whose error text needs to
+ stay put so the user can read it. --}}
+ <div id="upload-progress-list" style="margin-bottom: 15px;" wire:ignore></div>
+ <template id="upload-progress-item-tpl">
+ <div class="upload-progress-item" style="margin-bottom: 10px;">
+ <small class="upload-progress-filename text-muted" style="display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;"></small>
+ <div class="progress" style="margin-bottom: 4px;">
+ <div class="progress-bar progress-bar-warning" role="progressbar" style="width: 0%;">
+ <span class="sr-only upload-progress-sr">0%</span>
+ </div>
+ </div>
+ <p class="upload-progress-message" style="margin-bottom: 0;"></p>
+ </div>
+ </template>
+
+
+ </div>
+ </div>
</div>
</div>
+ {{-- Import wizard modal. Three steps: pick type + options, map
+ columns, preview first N rows. Opened by selectFile() via
+ dispatch('open-import-modal'). The submit ("Process") button
+ on step 3 is the only path that fires the actual import POST;
+ steps 1 and 2 just advance wizardStep. --}}
+ <div wire:ignore.self class="modal fade" id="importMappingModal" tabindex="-1" role="dialog" aria-labelledby="importMappingModalLabel" aria-hidden="true">
+ <div class="modal-dialog modal-xl" role="document">
+ <div class="modal-content">
+ <div class="modal-header">
+ <button type="button" class="close" data-dismiss="modal" aria-label="{{ trans('button.close') }}">
+ <span aria-hidden="true">&times;</span>
+ </button>
+ <h4 class="modal-title" id="importMappingModalLabel">
+ @if ($this->activeFile)
+ {{ $this->activeFile->file_path }}
+ @else
+ {{ trans('general.import') }}
+ @endif
+ </h4>
+ <p class="text-muted" style="margin-top: 6px; margin-bottom: 0;">
+ {{ trans_choice('admin/hardware/message.import.row_count', $activeFileRowCount, ['count' => $activeFileRowCount]) }}
+ </p>
+ </div>
+ {{-- form-horizontal on the body so .control-label picks up
+ the right-aligned style bootstrap only applies inside
+ a form-horizontal container. Everything in this modal
+ uses the col-md-3 label / col-md-9 input layout, so
+ this is safe across all three steps. --}}
+ <div class="modal-body form-horizontal">
+ {{-- bs-wizard progress header. Same class set the
+ setup wizard uses so we inherit the styles
+ already shipped in all.css. Three col-xs-4
+ cells because we have three steps here. Hidden
+ during processing so the small step-indicator
+ bars don't visually compete with the actual
+ processing progress bar rendered below. --}}
+ @unless ($processing)
+ <div class="row bs-wizard" style="border-bottom:0; margin-bottom: 20px;">
+ <div class="col-xs-4 bs-wizard-step {{ $wizardStep > 1 ? 'complete' : 'active' }}">
+ <div class="text-center bs-wizard-stepnum">{{ trans('admin/hardware/message.import.wizard.step_type') }}</div>
+ <div class="progress">
+ <div class="progress-bar"></div>
+ </div>
+ <span class="bs-wizard-dot" aria-hidden="true"></span>
+ </div>
+ <div class="col-xs-4 bs-wizard-step {{ $wizardStep === 2 ? 'active' : ($wizardStep < 2 ? 'disabled' : 'complete') }}">
+ <div class="text-center bs-wizard-stepnum">{{ trans('admin/hardware/message.import.wizard.step_map') }}</div>
+ <div class="progress">
+ <div class="progress-bar"></div>
+ </div>
+ <span class="bs-wizard-dot" aria-hidden="true"></span>
+ </div>
+ <div class="col-xs-4 bs-wizard-step {{ $wizardStep === 3 ? 'active' : ($wizardStep < 3 ? 'disabled' : 'complete') }}">
+ <div class="text-center bs-wizard-stepnum">{{ trans('admin/hardware/message.import.wizard.step_preview') }}</div>
+ <div class="progress">
+ <div class="progress-bar"></div>
+ </div>
+ <span class="bs-wizard-dot" aria-hidden="true"></span>
+ </div>
+ </div>
+ @endunless
+
+ {{-- Status text (e.g. "required fields not mapped")
+ renders above the step content so users see the
+ message before scrolling past the form to find
+ out why their click didn't advance. --}}
+ @if ($statusText)
+ <div class="row">
+ <div class="col-md-12">
+ <div class="alert{{ $statusType == 'success' ? ' alert-success' : ($statusType == 'error' ? ' alert-danger' : ' alert-info') }}" style="margin-bottom: 15px;">
+ {!! $statusText !!}
+ </div>
+ </div>
+ </div>
+ @endif
+
+ {{-- Step 1: type selection + type-specific options. Only
+ step 2's mapping grid gets an x-well; step 1's plain
+ form fields sit directly in the modal body. --}}
+ @if ($wizardStep === 1)
+ <div class="row">
+ <div class="form-group">
+ <label for="typeOfImport" class="col-md-3 col-xs-12 control-label">
+ {{ trans('general.import_type') }}
+ </label>
+ <div class="col-md-6 col-xs-12">
+ <x-input.select
+ name="typeOfImport"
+ id="import_type"
+ :options="$importTypes"
+ :selected="$typeOfImport"
+ :for-livewire="true"
+ :include-empty="true"
+ :data-placeholder="trans('general.select_var', ['thing' => trans('general.import_type')])"
+ placeholder=""
+ data-minimum-results-for-search="-1"
+ style="width: 100%"
+ />
+ @if ($typeOfImport === 'asset' && $snipeSettings->auto_increment_assets == 0)
+ <p class="help-block">
+ {{ trans('general.auto_incrementing_asset_tags_disabled_so_tags_required') }}
+ </p>
+ @endif
+ </div>
+ </div>
+
+ {{-- Asset history import doesn't create or update
+ rows in the "entity" sense - it writes
+ actionlogs and re-stamps the assigned_to
+ field. "Update existing values" has no
+ meaning there. --}}
+ @if ($typeOfImport !== 'assetHistory')
+ <x-form.checkbox-row
+ name="update"
+ :label="trans('general.update_existing_values')"
+ :checked="(bool) $update"
+ wire:model.live="update"
+ />
+ @endif
+
+ @if ($typeOfImport === 'asset' && $snipeSettings->auto_increment_assets == 1 && $update)
+ <div class="form-group">
+ <p class="help-block col-md-8 col-md-offset-3">
+ {{ trans('general.auto_incrementing_asset_tags_enabled_so_now_assets_will_be_created') }}
+ </p>
+ </div>
+ @endif
+
+ @if ($typeOfImport === 'user')
+ <x-form.checkbox-row
+ name="send_welcome"
+ :label="trans('general.send_welcome_email_to_users')"
+ :checked="(bool) $send_welcome"
+ :help_text="trans('general.send_welcome_email_import_help')"
+ wire:model.live="send_welcome"
+ />
+ @endif
+
+ {{-- assetHistory matcher labels ship as
+ translation strings that include <strong>
+ and <code> markup. The boxed
+ x-form.checkbox-row (label.form-control)
+ doesn't lay these out well - the inline
+ <strong>/<code> block elements push the
+ layout around inside a fixed-height box.
+ Use Bootstrap 3's plain .checkbox wrapper
+ instead, which handles multi-formatted
+ labels cleanly. --}}
+ @if ($typeOfImport === 'assetHistory')
+ <div class="form-group">
+ <div class="col-md-8 col-md-offset-3">
+ <p class="help-block">{!! trans('admin/hardware/general.import_text') !!}</p>
+ </div>
+ </div>
+
+ <div class="form-group">
+ <div class="col-md-8 col-md-offset-3">
+ @foreach ([
+ 'match_firstnamelastname' => 'csv_import_match_f-l',
+ 'match_flastname' => 'csv_import_match_initial_last',
+ 'match_firstname' => 'csv_import_match_first',
+ 'match_email' => 'csv_import_match_email',
+ 'match_username' => 'csv_import_match_username',
+ ] as $prop => $transKey)
+ <div class="checkbox">
+ <label>
+ <input type="checkbox" wire:model.live="{{ $prop }}" @checked((bool) $$prop)>
+ {{-- Extra span for visual spacing between the
+ checkbox input and the label text; a plain
+ whitespace gap gets collapsed against inline
+ HTML (<strong>/<code>) that follows. --}}
+ <span style="margin-left: 6px;">{!! trans('admin/hardware/general.'.$transKey) !!}</span>
+ </label>
+ </div>
+ @endforeach
+ </div>
+ </div>
+ @endif
+
+ <x-form.checkbox-row
+ name="run_backup"
+ :label="trans('general.back_before_importing')"
+ :checked="(bool) $run_backup"
+ wire:model.live="run_backup"
+ />
+ </div>
+ @endif
+
+ {{-- Step 2: column mapping --}}
+ @if ($wizardStep === 2 && $typeOfImport && $this->activeFile)
+ <div class="row">
+ <div class="col-md-12">
+ <x-well>
+ <div class="form-group col-md-12">
+ <h2 style="margin-top: 0;">
+ <i class="{{ \App\Helpers\IconHelper::icon($typeOfImport) }}"></i>
+ {{ trans('general.map_fields', ['item_type' => $importTypes[$typeOfImport]]) }}
+ </h2>
+ </div>
+
+ @php
+ $requiredKeys = $this->requiredForType($typeOfImport);
+ @endphp
+
+ <div class="form-group col-md-12">
+ <div class="col-md-3 text-right">
+ <strong>{{ trans('general.csv_header_field') }}</strong>
+ </div>
+ <div class="col-md-4">
+ <strong>{{ trans('general.import_field') }}</strong>
+ </div>
+ <div class="col-md-5">
+ <strong>{{ trans('general.sample_value') }}</strong>
+ </div>
+ </div>
+
+ @if (! empty($headerRow))
+ @foreach ($headerRow as $index => $header)
+ @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.
+ $currentMapping = $field_map[$index] ?? null;
+ @endphp
+ @continue(empty($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>
+ <div class="col-md-4">
+ {{-- Rows whose current mapping is a required
+ target field get the browser :required
+ pseudo-class, so the app-wide input:required
+ style renders an orange right-border. Same
+ visual convention as model-required fields
+ elsewhere in the app. --}}
+ <x-input.select
+ :name="'field_map.'.$index"
+ :for-livewire="true"
+ :placeholder="trans('general.importer.do_not_import')"
+ :required="in_array($currentMapping, $requiredKeys, true)"
+ class="mappings"
+ style="min-width: 100%;"
+ >
+ <option selected="selected" value="">{{ trans('general.importer.do_not_import') }}</option>
+ @foreach ($columnOptions[$typeOfImport] as $key => $value)
+ <option
+ value="{{ $key }}"
+ @selected($currentMapping === $key)
+ @disabled($key === '-')
+ >{{ $value }}</option>
+ @endforeach
+ </x-input.select>
+ </div>
+ @if (($this->activeFile->first_row) && (array_key_exists($index, $this->activeFile->first_row)))
+ <div class="col-md-5">
+ <p class="form-control-static">{{ str_limit($this->activeFile->first_row[$index], 50, '...') }}</p>
+ </div>
+ @endif
+ </div>
+ @endforeach
+ @else
+ {{ trans('general.no_headers') }}
+ @endif
+ </x-well>
+ </div>
+ </div>
+ @endif
+
+ {{-- Step 3: preview + Process (or processing-progress
+ once Process has been clicked). Two bars in the
+ processing state - backup first (only when the
+ user asked for one, since the sync backup runs
+ at the top of Api\ImportController::process()
+ before any row work), then the import progress
+ which fills as slices complete. --}}
+ @if ($wizardStep === 3 && $processing)
+ <div class="row">
+ <div class="col-md-12">
+ @if ($backupRequested)
+ <p style="margin-bottom: 4px;">
+ <strong>{{ trans('admin/hardware/message.import.backup_label') }}</strong>
+ </p>
+ {{-- Fake progress. The sync backup
+ emits no percentage we can wire
+ to a real bar, so JS eases the
+ width from 0% toward 90% on an
+ curve while slice 0
+ is in flight, then the .done()
+ callback snaps to 100% green.
+ wire:ignore keeps Livewire
+ from wiping the JS-driven inline style during
+ re-renders. --}}
+ <div wire:ignore class="progress" id="backup-progress-track" style="margin-bottom: 4px; height: 20px;">
+ <div id="backup-progress-bar" class="progress-bar progress-bar-warning" role="progressbar" style="width: 0%;">
+ <span class="sr-only">0%</span>
+ </div>
+ </div>
+ <p id="backup-progress-text" style="margin-bottom: 16px;">
+ @if ($backupComplete)
+ <i class="fas fa-check text-success" aria-hidden="true"></i>
+ {{ trans('admin/hardware/message.import.backup_complete') }}
+ @else
+ <i class="fas fa-spinner fa-spin" aria-hidden="true"></i>
+ {{ trans('admin/hardware/message.import.backup_running') }}
+ @endif
+ </p>
+ @endif
+
+ <p style="margin-bottom: 4px;">
+ <strong>{{ trans('admin/hardware/message.import.import_label') }}</strong>
+ </p>
+ <div class="progress" style="margin-bottom: 8px; height: 20px;">
+ <div id="process-progress-bar" class="progress-bar {{ $progress_bar_class }}" role="progressbar" style="width: {{ $progress }}%;">
+ <span class="sr-only">{{ $progress }}%</span>
+ </div>
+ </div>
+ @if (! empty($progress_message))
+ <p id="process-progress-text">{!! $progress_message !!}</p>
+ @endif
+ </div>
+ </div>
+ @elseif ($wizardStep === 3)
+ @php
+ // Preview only shows columns the user chose to
+ // import - "Do not import" columns are dropped
+ // entirely so the table stays scannable on wide
+ // CSVs. Build the visible column set once here
+ // and reuse it for both headers and body cells.
+ $visibleColumns = [];
+ foreach ($headerRow as $index => $header) {
+ $mappedKey = $field_map[$index] ?? null;
+ if (! $mappedKey) {
+ continue;
+ }
+ $visibleColumns[] = [
+ 'header' => $header,
+ 'mappedLabel' => $columnOptions[$typeOfImport][$mappedKey] ?? $mappedKey,
+ ];
+ }
+ @endphp
+
+ <div class="row">
+ <div class="col-md-12">
+ <p>{{ trans('admin/hardware/message.import.wizard.preview_intro', ['count' => count($previewRows)]) }}</p>
+ @if (! empty($previewRows) && ! empty($visibleColumns))
+ {{-- Sticky first column so users can
+ scroll horizontally through wide
+ imports without losing the row's
+ identity. Scoped to
+ .preview-sticky-first via inline
+ style below so nothing else in
+ the app is affected. Background
+ uses currentColor's inverse via
+ the theme's own body-bg CSS var
+ so it works in light + dark
+ mode; the box-shadow gives a
+ subtle right-edge divider. --}}
+ <style>
+ #importMappingModal .preview-sticky-first thead th:first-child,
+ #importMappingModal .preview-sticky-first tbody td:first-child {
+ position: sticky;
+ left: 0;
+ z-index: 2;
+ background-color: var(--section-bg, #fff);
+ box-shadow: 2px 0 2px -1px rgba(0, 0, 0, 0.1);
+ }
+
+ [data-theme="dark"] #importMappingModal .preview-sticky-first thead th:first-child,
+ [data-theme="dark"] #importMappingModal .preview-sticky-first tbody td:first-child {
+ background-color: #2a2a2a;
+ box-shadow: 2px 0 2px -1px rgba(255, 255, 255, 0.08);
+ }
+ </style>
+ <div class="table-responsive">
+ <table class="table table-striped table-condensed preview-sticky-first">
+ <thead>
+ <tr>
+ @foreach ($visibleColumns as $col)
+ {{-- Just the target field name in the
+ header; the CSV column-to-target
+ mapping was already confirmed in
+ step 2 so we don't need to repeat
+ both here. Full CSV column name
+ surfaces in the title tooltip. --}}
+ <th scope="col" title="{{ $col['header'] }}">{{ $col['mappedLabel'] }}</th>
+ @endforeach
+ </tr>
+ </thead>
+ <tbody>
+ @foreach ($previewRows as $row)
+ <tr>
+ @foreach ($visibleColumns as $col)
+ @php
+ $cellValue = (string) ($row[$col['header']] ?? '');
+ @endphp
+ <td title="{{ $cellValue }}">{{ str_limit($cellValue, 25, '...') }}</td>
+ @endforeach
+ </tr>
+ @endforeach
+ </tbody>
+ </table>
+ </div>
+ @endif
+ </div>
+ </div>
+ @endif
+
+ {{-- Belt-and-suspenders clearfix so any stray float
+ in the step content doesn't push the modal-footer
+ around. --}}
+ <div class="clearfix"></div>
+ </div>
+ <div class="modal-footer">
+ {{-- While processing all footer buttons hide - the
+ slice loop shouldn't be interruptible mid-flight
+ or we'd leave the import half-committed. --}}
+ @unless ($processing)
+ @if ($wizardStep > 1)
+ <button type="button" class="btn btn-default pull-left" wire:click="previousStep">
+ <i class="fas fa-arrow-left" aria-hidden="true"></i>
+ {{ trans('admin/hardware/message.import.wizard.back') }}
+ </button>
+ @else
+ {{-- Cancel only makes sense on step 1; past that,
+ "Back" is the way to unwind. Users can still
+ close via the modal's × or backdrop click. --}}
+ <a href="#" class="pull-left" style="padding: 6px 12px; margin-left: 10px;" data-dismiss="modal" wire:click.prevent="$set('activeFileId',null)">{{ trans('general.cancel') }}</a>
+ @endif
+
+ @if ($wizardStep === 1)
+ <button type="button" class="btn btn-primary" wire:click="nextStep" @disabled(! $typeOfImport)>
+ {{ trans('admin/hardware/message.import.wizard.next') }}
+ <i class="fas fa-arrow-right" aria-hidden="true"></i>
+ </button>
+ @elseif ($wizardStep === 2)
+ <button type="button" class="btn btn-primary" wire:click="nextStep">
+ {{ trans('admin/hardware/message.import.wizard.preview_button') }}
+ <i class="fas fa-arrow-right" aria-hidden="true"></i>
+ </button>
+ @else
+ {{-- Demo mode: server side blocks the actual
+ API POST + Livewire startProcessing(); we
+ disable the button here so the user gets
+ an obvious signal instead of clicking and
+ seeing a 422. --}}
+ <button type="button" class="btn btn-success" id="import" @disabled(config('app.lock_passwords'))>
+ <i class="fas fa-check" aria-hidden="true"></i>
+ {{ trans('admin/hardware/message.import.wizard.process') }}
+ </button>
+ @endif
+ @endunless
+ </div>
+ </div>
+ </div>
+ </div>
+
{{-- Bulk delete confirmation modal. Kept as a Livewire-driven Bootstrap
modal (not the shared confirm-action partial, which POSTs a form)
so the confirm button can fire wire:click and let Livewire handle
@@ -434,41 +769,162 @@
@script
<script>
- {{-- TODO: Maybe change this to the file upload thing that's baked-in to Livewire? --}}
+ {{-- Per-file progress. With multiple uploads in flight the single
+ shared $progress prop from before would trample itself. Each
+ file gets its own DOM element cloned from #upload-progress-
+ item-tpl. Keyed by the File object itself (via Map) because
+ jQuery fileupload creates fresh `data` context objects for
+ each event (add/progress/done/fail), so stashing a reference
+ on data.* only survives one event and we'd end up rendering
+ a duplicate row per file. --}}
+ var uploadItems = new Map();
+
+ function uploadItemFor(data) {
+ var file = data.files && data.files[0];
+ if (!file) return null;
+ if (uploadItems.has(file)) return uploadItems.get(file);
+ var $item = $($('#upload-progress-item-tpl').prop('content')).find('.upload-progress-item').first().clone();
+ $item.find('.upload-progress-filename').text(file.name || '');
+ $('#upload-progress-list').append($item);
+ uploadItems.set(file, $item);
+ return $item;
+ }
+
$('#fileupload').fileupload({
dataType: 'json',
- done: function(e, data) {
- $wire.$set('progress_bar_class', 'progress-bar-success');
- $wire.$set('progress_message', '<i class="fas fa-check faa-pulse animated"></i> {{ trans('general.notification_success') }}');
- $wire.$set('progress', 100);
+ singleFileUploads: true,
+ change: function (e, data) {
+ // Fires once per user file-picker action, before add()
+ // splits the batch into per-file entries. Wipe the prior
+ // batch's rows so success/failure UI from an earlier
+ // attempt doesn't linger alongside the new one.
+ $('#upload-progress-list').empty();
+ uploadItems.clear();
+ },
+ drop: function (e, data) {
+ // Same clear on drag-drop uploads.
+ $('#upload-progress-list').empty();
+ uploadItems.clear();
},
add: function(e, data) {
data.headers = {
"X-Requested-With": 'XMLHttpRequest',
"X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
};
- data.process().done( function () {data.submit();});
- $wire.$set('progress', 0);
+ data.process().done(function () {
+ data.submit();
+ });
+ uploadItemFor(data);
$wire.clearMessage();
},
progress: function(e, data) {
- $wire.$set('progress', parseInt((data.loaded / data.total * 100, 10)));
- $wire.$set('progress_message', '{{ trans('general.uploading') }}');
+ var $item = uploadItemFor(data);
+ var pct = Math.round((data.loaded / data.total) * 100);
+ $item.find('.progress-bar').css('width', pct + '%');
+ $item.find('.upload-progress-sr').text(pct + '%');
+ $item.find('.upload-progress-message').removeClass('text-danger').text('{{ trans('general.uploading') }}');
+ },
+ done: function (e, data) {
+ // Success: mark THIS file's bar green + clear its
+ // "Uploading..." caption. Also pass the returned IDs so
+ // Livewire can highlight the new file's row in the list.
+ var $item = uploadItemFor(data);
+ $item.find('.progress-bar').removeClass('progress-bar-warning progress-bar-danger').addClass('progress-bar-success').css('width', '100%');
+ $item.find('.upload-progress-sr').text('100%');
+ $item.find('.upload-progress-message').text('');
+
+ var uploadedIds = (data.result && data.result.files)
+ ? data.result.files.map(function (f) {
+ return f.id;
+ })
+ : [];
+ $wire.uploadSucceeded(uploadedIds);
},
- fail: function() {
- $wire.$set('progress_bar_class', "progress-bar-danger");
- $wire.$set('progress', 100);
- $wire.$set('progress_message', '<i class="fas fa-exclamation-triangle faa-pulse animated"></i> {{ trans('general.upload_error') }}');
+ fail: function (e, data) {
+ // Failure: red bar with red error text for this file only.
+ var $item = uploadItemFor(data);
+ $item.find('.progress-bar').removeClass('progress-bar-warning progress-bar-success').addClass('progress-bar-danger').css('width', '100%');
+ $item.find('.upload-progress-sr').text('100%');
+ $item.find('.upload-progress-message').addClass('text-danger').html('<i class="fas fa-exclamation-triangle" aria-hidden="true"></i> {{ trans('general.upload_error') }}');
+ $wire.uploadFailed();
+ },
+ });
+
+ // Highlight-fade choreography for the freshly-uploaded rows:
+ // T+0 spinning star appears (Livewire render after upload)
+ // T+2000 add opacity:0 - CSS transition on the star handles
+ // the visual dissolve over the next 600ms
+ // T+2600 ask Livewire to clear the tracked IDs so the star
+ // element leaves the DOM on the next render
+ window.addEventListener('new-uploads-highlighted', function () {
+ setTimeout(function () {
+ $('.newly-uploaded-star').css('opacity', '0');
+ setTimeout(function () {
+ $wire.clearNewlyUploadedIds();
+ }, 600);
+ }, 2000);
+ });
+
+ // Open the mapping modal when the Livewire component asks us to.
+ // Fires from selectFile() after headerRow / field_map / row count
+ // are populated so the modal has real content on first paint.
+ window.addEventListener('open-import-modal', function () {
+ $('#importMappingModal').modal('show');
+ });
+
+ // select2 measures its parent width at init time. Because
+ // snipeit.js runs select2 init on all .select2 elements on
+ // page-ready, the type dropdown inside the modal gets a 0-width
+ // parent (modal is display:none) and renders as a tiny stub. Kick
+ // it after Bootstrap 3's shown.bs.modal fires so it can measure
+ // for real. Full-width to match the modal-body column, matching
+ // what the inline style already asks for via min-width.
+ // snipeit.js runs select2() on page-ready with no options, so it
+ // measures against the still-hidden modal (0px parent width) and
+ // sets .select2-container to width:0px inline. That stays wrong
+ // after the modal opens - and worse, it never reflows on browser
+ // resize. Re-init on shown.bs.modal with width:'100%' so select2
+ // writes a percentage width to the container instead of a pixel
+ // value; from there CSS reflow handles resizing for free.
+ // dropdownParent scopes the dropdown panel to the modal so it
+ // z-indexes correctly above the backdrop.
+ $('#importMappingModal').on('shown.bs.modal', function () {
+ $('#importMappingModal select.select2').each(function () {
+ var $el = $(this);
+ if ($el.hasClass('select2-hidden-accessible')) {
+ var current = $el.val();
+ $el.select2('destroy');
+ $el.select2({
+ width: '100%',
+ dropdownParent: $('#importMappingModal'),
+ });
+ if (current !== null) {
+ $el.val(current).trigger('change.select2');
+ }
+ }
+ });
+ });
+
+ // Bootstrap 3 fires this after the modal fully closes (backdrop
+ // click, ESC, cancel button, close 'x'). Clear activeFileId so
+ // Livewire's mapping / row-count state gets reset for the next
+ // file. Skip the reset if the modal is closing because we already
+ // succeeded (statusType='success' triggers a page redirect anyway).
+ $('#importMappingModal').on('hidden.bs.modal', function () {
+ if ($wire.$get('statusType') !== 'success') {
+ $wire.$set('activeFileId', null);
}
- })
+ });
// For the importFile part:
$(function () {
-
- // we have to hook up to the `<tr id='importer-file'>` at the root of this display,
- // because the #import button isn't visible until you click an import_type
- $('#upload-table').on('click', '#import', function () {
+ // The #import button lives inside #importMappingModal now, but
+ // the modal is rendered as a sibling of #upload-table (not
+ // inside it), so delegate from document to catch the click
+ // regardless of where in the DOM the modal ends up after
+ // Bootstrap moves it.
+ $(document).on('click', '#importMappingModal #import', function () {
if (!$wire.$get('typeOfImport')) {
$wire.$set('statusType', 'error');
$wire.$set('statusText', "An import type is required... "); //TODO: translate?
@@ -476,62 +932,239 @@
}
$wire.$set('statusType', 'pending');
$wire.$set('statusText', '<i class="fa fa-spinner fa-spin" aria-hidden="true"></i> {{ trans('admin/hardware/form.processing_spinner') }}');
+
+ // Flip step 3 from preview mode to processing mode so
+ // the progress bar takes over that section of the modal
+ // and the footer buttons disappear (the footer wraps its
+ // buttons in a processing guard). Pass the backup flag
+ // so the panel decides whether to render the dedicated
+ // backup bar above the import bar.
+ var withBackup = !!$wire.$get('run_backup');
+ $wire.startProcessing(withBackup);
+
+ // Fake backup progress. Real progress isn't available -
+ // the sync artisan snipeit:backup call emits no percentage
+ // hook - so tick the bar toward 90% on an asymptotic
+ // curve so it visibly moves without ever claiming to be
+ // done. The .done()/.fail() for slice 0 snaps it to 100%
+ // green when the request actually returns. The Livewire
+ // panel gives the bar wire:ignore so this JS-driven
+ // width survives re-renders.
+ var backupProgressTimer = null;
+
+ function startFakeBackupProgress() {
+ if (!withBackup) return;
+ var $bar = $('#backup-progress-bar');
+ if (!$bar.length) {
+ // Livewire hasn't rendered the panel yet - retry
+ // on next tick.
+ setTimeout(startFakeBackupProgress, 50);
+ return;
+ }
+ var startedAt = Date.now();
+ // tau tuned so bar reaches ~50% around 15s, ~75%
+ // around 30s, ~90% around 60s.
+ var tau = 22000;
+ backupProgressTimer = setInterval(function () {
+ var elapsed = Date.now() - startedAt;
+ // 90 * (1 - e^(-t/tau)) — asymptotes at 90%.
+ var pct = 90 * (1 - Math.exp(-elapsed / tau));
+ $('#backup-progress-bar').css('width', pct.toFixed(1) + '%').find('.sr-only').text(Math.round(pct) + '%');
+ }, 300);
+ }
+
+ function finishFakeBackupProgress() {
+ if (backupProgressTimer !== null) {
+ clearInterval(backupProgressTimer);
+ backupProgressTimer = null;
+ }
+ $('#backup-progress-bar').removeClass('progress-bar-warning').addClass('progress-bar-success').css('width', '100%').find('.sr-only').text('100%');
+ }
+
+ startFakeBackupProgress();
+
+ // Slice size: how many CSV rows to hand the server per
+ // request. Small enough that each slice comfortably fits
+ // inside PHP's request budget + any upstream proxy timeout,
+ // large enough that the round-trip overhead doesn't
+ // dominate. 500 is a compromise; adjust if imports at your
+ // scale start bumping the ceiling either way.
+ var SLICE_SIZE = {{ (int) config('importer.slice_size', 500) }};
+
$wire.generate_field_map().then(function (mappings_raw) {
- var mappings = JSON.parse(mappings_raw)
- // console.warn("Here is the mappings:")
- // console.dir(mappings)
- // console.warn("Uh, active file id is, I guess: "+$wire.$get('activeFile.id'))
+ var mappings = JSON.parse(mappings_raw);
var file_id = $wire.$get('activeFileId');
- $.post({
- {{-- I want to do something like: route('api.imports.importFile', $activeFile->id) }} --}}
- url: "api/v1/imports/process/"+file_id, // maybe? Good a guess as any..FIXME. HARDCODED DUMB FILE
- contentType: 'application/json',
- data: JSON.stringify({
+ var totalRows = $wire.$get('activeFileRowCount') || 0;
+
+ // No rows at all? Nothing to slice, but still hit the
+ // endpoint once so the server-side flash / redirect
+ // logic fires and the user gets consistent feedback.
+ var totalSlices = Math.max(1, Math.ceil(totalRows / SLICE_SIZE));
+
+ // Aggregated across every slice so a partial-success
+ // failure at slice K doesn't blow away errors from
+ // earlier slices when the modal renders results.
+ var aggregatedErrors = {};
+ var lastRedirectUrl = null;
+ var anySliceFailed = false;
+
+ function processSlice(sliceIndex) {
+ var offset = sliceIndex * SLICE_SIZE;
+ var isLastSlice = (sliceIndex === totalSlices - 1);
+ var payload = {
'import-update': !!$wire.$get('update'),
'send-welcome': !!$wire.$get('send_welcome'),
'import-type': $wire.$get('typeOfImport'),
- 'run-backup': !!$wire.$get('run_backup'),
- 'column-mappings': mappings
- }),
- headers: {
- "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
+ // run-backup only makes sense before the first
+ // slice; downstream slices would trigger a
+ // duplicate backup for no gain.
+ 'run-backup': sliceIndex === 0 ? !!$wire.$get('run_backup') : false,
+ 'match_username': !!$wire.$get('match_username'),
+ 'match_email': !!$wire.$get('match_email'),
+ 'match_firstnamelastname': !!$wire.$get('match_firstnamelastname'),
+ 'match_flastname': !!$wire.$get('match_flastname'),
+ 'match_firstname': !!$wire.$get('match_firstname'),
+ 'column-mappings': mappings,
+ 'offset': offset,
+ 'limit': SLICE_SIZE,
+ };
+
+ var pctBefore = Math.floor((sliceIndex / totalSlices) * 100);
+ $wire.$set('progress', pctBefore);
+ $wire.$set('progress_bar_class', 'progress-bar-warning');
+
+ // Slice 0 with run-backup=true is doing the sync
+ // backup for most of its wall-clock time - no
+ // rows are actually landing yet. Clear the
+ // import-side message so the panel isn't
+ // redundant with the dedicated backup bar above;
+ // the import bar just sits at 0% until backup
+ // ends and slice 1 kicks in.
+ if (sliceIndex === 0 && payload['run-backup']) {
+ $wire.$set('progress_message', '');
+ }
+ else {
+ $wire.$set('progress_message',
+ '<i class="fa fa-spinner fa-spin" aria-hidden="true"></i> ' +
+ 'Processing rows ' + (offset + 1) + ' – ' +
+ Math.min(offset + SLICE_SIZE, totalRows) + ' of ' + totalRows + '…',
+ );
}
- }).done( function (body) {
- // Success
- $wire.$set('statusType', "success");
- $wire.$set('statusText', "{{ trans('general.success_redirecting') }}");
- // console.dir(body)
- window.location.href = body.messages.redirect_url;
- }).fail( function (jqXHR, textStatus, error) {
- // Failure
- var body = jqXHR.responseJSON
- if((body) && (body.status) && body.status == 'import-errors') {
- $wire.$dispatch('importError', body.messages);
- $wire.$set('import_errors', body.messages);
- $wire.$set('statusType', 'error');
- $wire.$set('statusText', "Error");
-
- // If Slack/notifications hits API thresholds, we *do* 500, but we never
- // actually surface that info.
- //
- // A 500 on notifications doesn't mean your import failed, so this is a confusing state.
- //
- // Ideally we'd have a message like "Your import worked, but not all
- // notifications could be sent".
- } else {
- console.warn("Not import-errors, just regular errors - maybe API limits")
- $wire.$set('message_type', "warning");
- if ((body) && (error in body)) {
- $wire.$set('message', body.error ? body.error : "Unknown error - might just be throttling by notifications.");
- } else {
- $wire.$set('message', "{{ trans('general.importer_generic_error') }}");
+ return $.post({
+ url: "api/v1/imports/process/" + file_id,
+ contentType: 'application/json',
+ data: JSON.stringify(payload),
+ headers: {
+ "X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content'),
+ },
+ }).done(function (body) {
+ if (body && body.messages && body.messages.redirect_url) {
+ lastRedirectUrl = body.messages.redirect_url;
+ }
+ // Slice 0's response is our earliest signal
+ // that the sync backup has finished on the
+ // server (it runs at the top of process()
+ // before any row work). Snap the JS-driven
+ // fake progress to 100% green and update
+ // Livewire state so the text below the bar
+ // flips to "Backup complete".
+ if (sliceIndex === 0 && payload['run-backup']) {
+ finishFakeBackupProgress();
+ $wire.markBackupComplete();
+ }
+ }).fail(function (jqXHR) {
+ anySliceFailed = true;
+ // Slice 0 has returned (with an error) - the
+ // backup either finished or was never
+ // attempted. Either way we shouldn't leave
+ // the fake-progress timer running.
+ if (sliceIndex === 0 && payload['run-backup']) {
+ finishFakeBackupProgress();
+ $wire.markBackupComplete();
+ }
+ var body = jqXHR.responseJSON;
+ if (body && body.status === 'import-errors' && body.messages) {
+ // Merge each slice's per-row messages flat
+ // into the aggregate map. The server
+ // returns { itemIdentity: { tableLabel:
+ // { field: [messages] } } } which the
+ // blade's three-deep foreach + implode
+ // expects. Wrapping under a slice-N key
+ // would add a fourth level and break the
+ // implode.
+ Object.assign(aggregatedErrors, body.messages);
}
+ else if (body && body.messages) {
+ // Non-import-errors server error - wrap as
+ // a synthetic row so it still renders in
+ // the errors table under a recognizable
+ // identity.
+ aggregatedErrors['Slice ' + (sliceIndex + 1)] = {
+ 'Server error': {error: [body.messages]},
+ };
+ }
+ });
+ }
+
+ // Chain slices sequentially. jQuery's .then() returns a
+ // new promise so each slice waits for the previous to
+ // complete (whether success or failure) before firing.
+ var chain = $.Deferred().resolve();
+ for (var i = 0; i < totalSlices; i++) {
+ (function (sliceIndex) {
+ chain = chain.then(function () {
+ return processSlice(sliceIndex);
+ }, function () {
+ // Previous slice failed; keep going. Per-
+ // slice rollback means each slice is
+ // independent, so a partial success is a
+ // valid outcome.
+ return processSlice(sliceIndex);
+ });
+ })(i);
+ }
+ chain.always(function () {
+ $wire.$set('progress', 100);
+ if (anySliceFailed) {
+ $wire.$set('progress_bar_class', 'progress-bar-danger');
+ $wire.$dispatch('importError', aggregatedErrors);
+ $wire.$set('import_errors', aggregatedErrors);
+ $wire.$set('statusType', 'error');
+ $wire.$set('statusText', "Some slices failed. Successful slices were still committed.");
+ // Reset processing so the modal footer's Back
+ // button reappears and the user can retry or
+ // navigate away rather than being trapped in
+ // the progress-bar view.
+ $wire.stopProcessing();
+ $wire.$set('activeFileId', null);
+ $('#importMappingModal').modal('hide');
+ }
+ else {
+ $wire.$set('progress_bar_class', 'progress-bar-success');
+ // Deliberately not setting statusText here.
+ // The two bars going green (backup + import)
+ // already communicate "done"; the extra
+ // alert-success box was reading as a third
+ // green progress rectangle stacked above
+ // them. The 800ms setTimeout below still
+ // gives the user time to see the completed
+ // bars before the browser navigates.
+ if (lastRedirectUrl) {
+ // Tiny CSVs complete so fast that the
+ // success flash never renders before the
+ // browser navigates. Hold the redirect
+ // for ~800ms so the user actually sees
+ // the green bar + "success, redirecting"
+ // message.
+ setTimeout(function () {
+ window.location.href = lastRedirectUrl;
+ }, 800);
+ }
}
- $wire.$set('activeFileId', null); //$wire.$set('hideDetails')
});
- })
+ });
return false;
});})