ixport 0.3.0 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 571077183f90149d06c934dbfc5de2eedeaa972747a6449911af9f823a073d53
-  data.tar.gz: 98a736581d838a51b59111457fcf37a5f428ff7a918ac97bb985a49a73b4f039
+  metadata.gz: 03be028cedf3161974f8143be44d6f31d79cc669e0388d266bc787d12a9dcd9e
+  data.tar.gz: e7aec59ef0d4d8288a4062e713f0ef87eb7bc23f3bbda19db8e638eabc2872ad
 SHA512:
-  metadata.gz: d36d12873d7e4daefa43065e7778fa839e71507ba9cb93d34065b8754382cf1a73b153893770cfa2d4e2caf7bc9053e36959be40f387095e6d5cfe1bc4f6aecc
-  data.tar.gz: 3ed3b12877932c4229294da54a59050dee026b887cb754e6072506e443b619265967da83b18d84ed889699a422aa782d4b278ebe8d13aacd47f01deb63e9218b
+  metadata.gz: 2afc07d8cba3ef5d3272d5e74d4981ffd882c4dafe969d70af85dd85947049acea43356b804b8afc7bc4f3a918027f3a6aecebe990c774686cef254420f3873f
+  data.tar.gz: eb1aba5fb3eecb5071f3ce89fd847eea67d0e79bf6270f639fc0d0c24bb92c3216e0ce8924a191622b07c07afae1af004312523db31dcf89436f527ba0897731

data/README.md

@@ -81,7 +81,7 @@ To match on several fields, name them all, for example `match_on :happened_on, :
 
 From the engine's root page, a person picks a registered import and uploads a CSV for it. The upload is refused, with a message on the upload page, when the file is not UTF-8 text, when its quoting is broken (the message names the line where reading stopped), when it has no header row, or, in an app with no background runner, when it has more rows than `config.inline_row_limit`. A byte order mark at the start of the file is ignored, so the first column keeps its name.
 
-After uploading, the person matches each column of the file's header row to one of the importer's fields, by its label, or skips it. Saving the mapping moves them on to the preview.
+After uploading, the person matches each column of the file's header row to one of the importer's fields, by its label, or skips it. Saving the mapping moves them on to the preview, and going back to the mapping page shows the choices already made.
 
 The preview shows how many rows will add a record, update one or be refused, before anything is saved. It lists each row that will update a record and each refused row, by its row number in the file, with the reason the record gives for a refusal. A row is refused when the record it builds is not valid. Viewing the preview saves nothing, and the person can go back from it to change the mapping.
 
@@ -89,7 +89,7 @@ The preview shows how many rows will add a record, update one or be refused, bef
 
 The person runs the import from the preview. With no background runner configured, it runs inside the request. Each row that passes the record's validations is saved, updating the record it matches or adding a new one. Each row that fails them is refused and kept with its row number and reason, and the record it matched is left unchanged.
 
-The import's result page then shows how many rows were added and how many updated, and lists each refused row. It shows the same thing on every later visit. A finished import offers no Run button, its preview leads to its result page, and running it again adds or changes nothing.
+The import's result page then shows its status, how many rows the file had, how many were added and how many updated, and lists each refused row. It shows the same thing on every later visit. A finished import offers no Run button, its preview leads to its result page, and running it again adds or changes nothing.
 
 An import belongs to the person and account that uploaded it, and anyone else gets not found when they open it.
 

data/app/models/ixport/import.rb

@@ -54,6 +54,10 @@ module Ixport
       Ixport.registration(key).importer.constantize
     end
 
+    def row_count
+      [ CSV.parse(contents).size - 1, 0 ].max
+    end
+
     def headers
       CSV.parse_line(contents) || []
     end

data/app/models/ixport/row_walk.rb

@@ -19,7 +19,7 @@ module Ixport
 
     def row_for(cells, number)
       values = values_of(cells)
-      existing = existing_records[match_key(values)]
+      existing = own_copy(existing_records[match_key(values)])
       record = existing ? existing.tap { |found| found.assign_attributes(values) } : @importer.records.new(values)
       return Row.new(number: number, record: record, outcome: :refused, reason: record.errors.full_messages.to_sentence) unless record.valid?
 
@@ -34,11 +34,17 @@ module Ixport
       @import.mapping.to_h { |column, field| [ field.to_sym, cells[column.to_i] ] }
     end
 
+    def own_copy(record)
+      record&.class&.instantiate(record.attributes_before_type_cast)
+    end
+
     def match_fields
       @importer.class.match_fields
     end
 
     def match_key(values)
+      return if match_fields.empty?
+
       key = match_fields.map { |field| cast(field, values[field]) }
       key unless key.any?(&:blank?)
     end

data/app/views/ixport/imports/show.html.erb

@@ -15,9 +15,11 @@
       <%= ui_alert(type: :error, message: tag.span(@import.error_message, data: { import_error: true })) %>
       <p>Rows saved before it stopped stay saved.</p>
     <% end %>
-    <%= ui_grid(cols: { default: 1, sm: 2 }) do %>
+    <%= ui_badge(label: tag.span(@import.status.humanize, data: { import_status: true }), variant: @import.failed? ? :danger : :success) %>
+    <%= ui_grid(cols: { default: 1, sm: 3 }) do %>
       <%= ui_stat_card(label: "Added", value: tag.span(@import.added_count, data: { result_count: "added" })) %>
       <%= ui_stat_card(label: "Updated", value: tag.span(@import.updated_count, data: { result_count: "updated" })) %>
+      <%= ui_stat_card(label: "Rows in file", value: tag.span(@import.row_count, data: { result_count: "total" })) %>
     <% end %>
     <% if @import.refusals.any? %>
       <%= ui_section(title: "Refused") do %>

data/app/views/ixport/mappings/show.html.erb

@@ -1,10 +1,14 @@
 <%= ui_form_page(title: "Match columns", back_url: root_path) %>
 <%= ui_page(max_width: :md) do %>
   <%= ui_form(action: import_mapping_path(@import), method: :patch) do %>
-    <% @import.headers.each_with_index do |header, index| %>
-      <%= tag.div(data: { column: true }) do %>
-        <%= tag.span(header, data: { column_name: true }) %>
-        <%= ui_select(name: "mapping[#{index}]", options: @fields.map { |field| [field.label, field.key] }, include_blank: "Skip") %>
+    <%= ui_grid(cols: { default: 1 }, gap: :md) do %>
+      <% @import.headers.each_with_index do |header, index| %>
+        <%= tag.div(data: { column: true }) do %>
+          <%= ui_grid(cols: { default: 1, sm: 2 }, gap: :sm) do %>
+            <%= tag.span(header, data: { column_name: true }) %>
+            <%= ui_select(name: "mapping[#{index}]", options: @fields.map { |field| [field.label, field.key] }, selected: @import.mapping&.dig(index.to_s), include_blank: "Skip") %>
+          <% end %>
+        <% end %>
       <% end %>
     <% end %>
     <%= ui_button(label: "Save mapping") %>

data/lib/ixport/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Ixport
-  VERSION = "0.3.0"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ixport
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.2
 platform: ruby
 authors:
 - Tyler Schneider