From 7edec26e731b86c54116d03711dac778797bdf69 Mon Sep 17 00:00:00 2001
From: Brady Wetherington <bwetherington@grokability.com>
Date: Wed, 1 Mar 2023 17:18:36 -0800
Subject: [PATCH] Fixes to layout, improvements to import types, better icons
 for processing.

---
 .../views/livewire/importer-file.blade.php    | 103 +++++++++---------
 resources/views/livewire/importer.blade.php   |   3 +-
 2 files changed, 54 insertions(+), 52 deletions(-)

diff --git a/resources/views/livewire/importer-file.blade.php b/resources/views/livewire/importer-file.blade.php
index 68747dcbc..bf8b83d2e 100644
--- a/resources/views/livewire/importer-file.blade.php
+++ b/resources/views/livewire/importer-file.blade.php
@@ -9,7 +9,7 @@
                     </div>
 
                     <div class="col-md-7 col-xs-12">
-                        {{ Form::select('activeFile.import_type', $importTypes, $activeFile->import_type, ['id' => 'import_type', 'class' => 'livewire-select2', 'placeholder' => '', 'data-livewire-component' => $_instance->id]) }}
+                        {{ Form::select('activeFile.import_type', $importTypes, $activeFile->import_type, ['id' => 'import_type', 'class' => 'livewire-select2', 'style' => 'min-width: 350px', 'data-placeholder' => 'Select an import type...', /* TODO: translate me */ 'placeholder' => '', 'data-livewire-component' => $_instance->id]) }}
                     </div>
 
                 </div><!-- /dynamic-form-row -->
@@ -47,60 +47,61 @@
                 @endif
         </div> <!-- /div row -->
 
-        <div class="row">
-            <div class="col-md-12" style="padding-top: 30px;">
-                <div class="col-md-4 text-right"><h4>Header Field</h4></div>
-                <div class="col-md-4"><h4>Import Field</h4></div>
-                <div class="col-md-4"><h4>Sample Value</h4></div>
-            </div>
-        </div><!-- /div row -->
+        @if($activeFile->import_type)
+            <div class="row">
+                <div class="col-md-12" style="padding-top: 30px;">
+                    <div class="col-md-4 text-right"><h4>Header Field</h4></div>
+                    <div class="col-md-4"><h4>Import Field</h4></div>
+                    <div class="col-md-4"><h4>Sample Value</h4></div>
+                </div>
+            </div><!-- /div row -->
 
-        @if($activeFile->header_row)
-            @foreach($activeFile->header_row AS $index => $header)
-                <div class="row" wire:key="header-row-{{ $index }}">
-                    <div class="col-md-12">
-                        <div class="col-md-4 text-right">
-                            <label for="field_map.{{ $index }}" class="control-label">{{ $header }}</label>
-                        </div>
-                        <div class="col-md-4 form-group">
-                            <div required>
-                                {{-- this, along with the JS glue below, is quite possibly near to the new Universal LW2 stuff? --}}
-                                {{ Form::select('field_map.'.$index, $columnOptions[$activeFile->import_type], @$field_map[$index],
-                                    [
-                                        'class' => 'mappings livewire-select2',
-                                        'placeholder' => 'Do Not Import',
-                                        'data-livewire-component' => $_instance->id
-                                    ])
-
-                                }}
+            @if($activeFile->header_row)
+                @foreach($activeFile->header_row AS $index => $header)
+                    <div class="row" wire:key="header-row-{{ $index }}">
+                        <div class="col-md-12">
+                            <div class="col-md-4 text-right">
+                                <label for="field_map.{{ $index }}" class="control-label">{{ $header }}</label>
                             </div>
-                        </div>
-                        <div class="col-md-4">
-                            <p class="form-control-static">{{ $activeFile->first_row[$index] }}</p>
-                        </div>
-                    </div><!-- /div col-md-8 -->
-                </div><!-- /div row -->
-            @endforeach
-        @else
-            No Columns Found!
-        @endif
+                            <div class="col-md-4 form-group">
+                                <div required>
+                                    {{ Form::select('field_map.'.$index, $columnOptions[$activeFile->import_type], @$field_map[$index],
+                                        [
+                                            'class' => 'mappings livewire-select2',
+                                            'placeholder' => 'Do Not Import',
+                                            'data-livewire-component' => $_instance->id
+                                        ])
 
-        <div class="row">
-            <div class="col-md-6 col-md-offset-2 text-right" style="padding-top: 20px;">
-                <button type="button" class="btn btn-sm btn-default" wire:click="$emit('hideDetails')">Cancel</button>
-                <button type="submit" class="btn btn-sm btn-primary" id="import">Import</button>
-                <br><br>
-            </div>
-        </div><!-- /div row -->
-        <div class="row">
-            @if($statusText)
-            <div class="alert col-md-8 col-md-offset-2 {{ $statusType == 'success' ? 'alert-success' : ($statusType == 'error' ? 'alert-danger' : 'alert-info') }}"
-                 style="padding-top: 20px;"
-                 >
-                {{ $statusText }}
-            </div>
+                                    }}
+                                </div>
+                            </div>
+                            <div class="col-md-4">
+                                <p class="form-control-static">{{ $activeFile->first_row[$index] }}</p>
+                            </div>
+                        </div><!-- /div col-md-8 -->
+                    </div><!-- /div row -->
+                @endforeach
+            @else
+                No Columns Found!
             @endif
-        </div><!-- /div row -->
+
+            <div class="row">
+                <div class="col-md-6 col-md-offset-2 text-right" style="padding-top: 20px;">
+                    <button type="button" class="btn btn-sm btn-default" wire:click="$emit('hideDetails')">Cancel</button>
+                    <button type="submit" class="btn btn-sm btn-primary" id="import">Import</button>
+                    <br><br>
+                </div>
+            </div><!-- /div row -->
+            <div class="row">
+                @if($statusText)
+                <div class="alert col-md-8 col-md-offset-2 {{ $statusType == 'success' ? 'alert-success' : ($statusType == 'error' ? 'alert-danger' : 'alert-info') }}"
+                     style="padding-top: 20px;"
+                     >
+                    {{ $statusText }}
+                </div>
+                @endif
+            </div><!-- /div row -->
+        @endif {{-- end of if ... activeFile->import_type --}}
 
     </div><!-- /div v-show -->
 
diff --git a/resources/views/livewire/importer.blade.php b/resources/views/livewire/importer.blade.php
index ddf07b2af..817fa7861 100644
--- a/resources/views/livewire/importer.blade.php
+++ b/resources/views/livewire/importer.blade.php
@@ -109,7 +109,8 @@
                                     			<td class="col-md-1">{{ $currentFile->filesize }}</td>
                                                 <td class="col-md-1 text-right">
                                                     <button class="btn btn-sm btn-info" wire:click="toggleEvent({{ $currentFile->id }})">
-                                                        {{ trans('general.import')  }}
+                                                        <i class="fas fa-retweet fa-fw" aria-hidden="true"></i>
+                                                        <span class="sr-only">{{ trans('general.import') }}</span>
                                                     </button>
                                                     <button class="btn btn-sm btn-danger" wire:click="destroy({{ $currentFile->id }})">
                                                         <i class="fas fa-trash icon-white" aria-hidden="true"></i><span class="sr-only"></span></button>