From 2cadbdcd3181b215ea8452d47c6ddfff6f2e0272 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Hru=C5=A1ka?= <ondra@ondrovo.com>
Date: Sat, 11 Aug 2018 18:59:00 +0200
Subject: [PATCH] fix CSV import asking for cols that were removed

---
 app/Http/Controllers/TableEditController.php | 2 +-
 app/Tables/Changeset.php                     | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/Http/Controllers/TableEditController.php b/app/Http/Controllers/TableEditController.php
index 8fcb60f..f267b57 100644
--- a/app/Http/Controllers/TableEditController.php
+++ b/app/Http/Controllers/TableEditController.php
@@ -129,7 +129,7 @@ class TableEditController extends Controller
         return view('table.propose.add-rows-csv', [
             'changeset' => $changeset,
             'table' => $changeset->table,
-            'columns' => collect($columns),
+            'columns' => collect($columns)->where('toRemove', false),
         ]);
     }
 
diff --git a/app/Tables/Changeset.php b/app/Tables/Changeset.php
index 966f006..ed0b6a5 100644
--- a/app/Tables/Changeset.php
+++ b/app/Tables/Changeset.php
@@ -643,8 +643,10 @@ class Changeset
      */
     public function addFilledRows($csvArray)
     {
+        $columns = collect($this->fetchAndTransformColumns())->where('toRemove', false);
+
         /** @var Column[] $columns */
-        $columns = array_values($this->fetchAndTransformColumns());
+        $columns = $columns->values()->all();
 
         $rows = self::csvToRowsArray($columns, $csvArray, false, true)
             ->keyBy('_id');