data_porter 2.9.1 → 2.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a04398e443f704b747eff3f3b585e05f839cabd2f92ecf7871874811a079f15c
-  data.tar.gz: ade55b5a550d628acaf5f8d0e8cc0652fabcb2c7505b59bd14367e7ab56557cf
+  metadata.gz: fb7f4978449eef549b221a5bb8c2e297ca19ce4a91161d80a18f02dce1e68555
+  data.tar.gz: 995a508847ef2ecf97796096a374e142026074662d349c9cb912272a4a6c0b0c
 SHA512:
-  metadata.gz: 9647861c80be730b057a74854c91569bbc2e6e7d922cff5bffd28d7d4268f2a55e83bc08247b4ea93b2c9991e1ac2da1da3f4e71970b71225d9c08e5440ca7d6
-  data.tar.gz: b96e83067441054e1a0140c7b826043984d7fcc0d6c7b7f7ee7fe2a09d416365670a7bce7ed1eeb703d6949ee9dd24d7c791b06978d12d8c52929fa17b4553c6
+  metadata.gz: 3660607affb95f6f4325f3175adf413c472a7fec30961919cc3138a7cdb5bea4ea94fe29ee894425ff596663ded515e9ba7d6d33a3c15ea97ccfccce4bbef8a1
+  data.tar.gz: 5691769ca62b86555a372ef942a0049b3373a7c2ed6585990189cc266a8047071ae13cd613189bb0bc6d07b7e939535cd7d82331bce7a1ca850ebb8da9a050b5

data/CHANGELOG.md

@@ -7,6 +7,17 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [2.10.0] - 2026-10-19
+
+### Added
+
+- **Header row field in import form** -- The modal and standalone `new` import forms show a "Header row" input for CSV and XLSX sources. Users enter a 1-based row number, stored as a 0-based `config["header_row"]`. The field is pre-filled from the Target's `header_row` DSL value, exposed by `Registry.available` as `header_row`
+
+### Fixed
+
+- **Import params on inline edit** -- `RecordUpdater` now hydrates `import_params` on the target before revalidating, so validations depending on them no longer fail on valid records (#3)
+- **File extension validation** -- The uploaded file extension is cross-checked against the selected source type before saving, surfacing mismatches as a form error instead of crashing the parser (#4)
+
 ## [2.9.1] - 2026-03-11
 
 ### Changed

data/app/assets/javascripts/data_porter/import_form_controller.js

@@ -1,12 +1,13 @@
 import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
-  static targets = ["targetSelect", "sourceSelect", "fileField", "fileInput", "dropzone", "fileName", "modal", "paramsContainer"]
-  static values = { sources: Object, params: Object }
+  static targets = ["targetSelect", "sourceSelect", "fileField", "fileInput", "dropzone", "fileName", "modal", "paramsContainer", "headerRowField", "headerRowInput"]
+  static values = { sources: Object, params: Object, headerRows: Object }
 
   connect() {
     this.filterSources()
     this.renderParams()
+    this.toggleHeaderRow()
   }
 
   filterSources() {
@@ -21,6 +22,19 @@ export default class extends Controller {
       this.fileFieldTarget.style.display = ""
     }
     this.renderParams()
+    this.applyHeaderRowDefault()
+    this.toggleHeaderRow()
+  }
+
+  applyHeaderRowDefault() {
+    if (!this.hasHeaderRowInputTarget || !this.hasTargetSelectTarget) return
+    this.headerRowInputTarget.value = this.headerRowsValue[this.targetSelectTarget.value] || 1
+  }
+
+  toggleHeaderRow() {
+    if (!this.hasHeaderRowFieldTarget || !this.hasSourceSelectTarget) return
+    var visible = ["csv", "xlsx"].indexOf(this.sourceSelectTarget.value) !== -1
+    this.headerRowFieldTarget.style.display = visible ? "" : "none"
   }
 
   renderParams() {
@@ -83,6 +97,7 @@ export default class extends Controller {
 
   toggleFileField() {
     this.fileFieldTarget.style.display = this.sourceSelectTarget.value === "api" ? "none" : ""
+    this.toggleHeaderRow()
   }
 
   handleFile() {

data/app/controllers/data_porter/concerns/import_params_builder.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+module DataPorter
+  module Concerns
+    module ImportParamsBuilder
+      extend ActiveSupport::Concern
+
+      private
+
+      def import_params
+        permitted = params.require(:data_import).permit(:target_key, :source_type, :file, config: {})
+        permitted = merge_import_params(permitted)
+        merge_header_row(permitted)
+      end
+
+      def merge_import_params(permitted)
+        nested = params.dig(:data_import, :config, :import_params)
+        return permitted unless nested
+
+        config = permitted[:config]&.to_unsafe_h || {}
+        config["import_params"] = nested.permit(*allowed_param_keys).to_h
+        permitted.merge(config: config)
+      end
+
+      def merge_header_row(permitted)
+        raw = params.dig(:data_import, :header_row)
+        return permitted if raw.blank?
+
+        config = permitted[:config]&.to_unsafe_h || {}
+        config["header_row"] = [raw.to_i - 1, 0].max
+        permitted.merge(config: config)
+      end
+
+      def allowed_param_keys
+        target_key = params.dig(:data_import, :target_key)
+        return [] unless target_key
+
+        target = DataPorter::Registry.find(target_key)
+        (target._params || []).map { |p| p.name.to_s }
+      end
+    end
+  end
+end

data/app/controllers/data_porter/concerns/import_validation.rb

@@ -11,6 +11,12 @@ module DataPorter
         "xlsx" => %w[application/vnd.openxmlformats-officedocument.spreadsheetml.sheet]
       }.freeze
 
+      EXTENSIONS_BY_SOURCE = {
+        "csv" => %w[.csv],
+        "json" => %w[.json],
+        "xlsx" => %w[.xlsx]
+      }.freeze
+
       private
 
       def valid_source_for_target?
@@ -59,6 +65,26 @@ module DataPorter
         false
       end
 
+      def valid_file_extension_for_source?
+        return true unless @import.file.attached?
+
+        allowed = EXTENSIONS_BY_SOURCE[@import.source_type]
+        return true unless allowed
+
+        actual = File.extname(@import.file.blob.filename.to_s).downcase
+        return true if allowed.include?(actual)
+
+        @import.errors.add(
+          :file,
+          I18n.t(
+            "data_porter.errors.file_extension_mismatch",
+            expected: allowed.join(", "),
+            actual: actual.presence || "none"
+          )
+        )
+        false
+      end
+
       def valid_file_content_type?
         return true unless @import.file.attached?
 

data/app/controllers/data_porter/imports_controller.rb

@@ -3,6 +3,7 @@
 module DataPorter
   class ImportsController < DataPorter.configuration.parent_controller.constantize
     include Concerns::ImportValidation
+    include Concerns::ImportParamsBuilder
     include Concerns::MappingManagement
     include Concerns::RecordPagination
     include Concerns::ScopeManagement
@@ -144,33 +145,12 @@ module DataPorter
         valid_source_for_target?,
         valid_file_presence?,
         valid_file_size?,
+        valid_file_extension_for_source?,
         valid_file_content_type?,
         valid_import_params?
       ].all?
     end
 
-    def import_params
-      permitted = params.require(:data_import).permit(:target_key, :source_type, :file, config: {})
-      merge_import_params(permitted)
-    end
-
-    def merge_import_params(permitted)
-      nested = params.dig(:data_import, :config, :import_params)
-      return permitted unless nested
-
-      config = permitted[:config]&.to_unsafe_h || {}
-      config["import_params"] = nested.permit(*allowed_param_keys).to_h
-      permitted.merge(config: config)
-    end
-
-    def allowed_param_keys
-      target_key = params.dig(:data_import, :target_key)
-      return [] unless target_key
-
-      target = DataPorter::Registry.find(target_key)
-      (target._params || []).map { |p| p.name.to_s }
-    end
-
     def enqueue_after_create
       if @import.file_based?
         DataPorter::ExtractHeadersJob.perform_later(@import.id)

data/app/views/data_porter/imports/index.html.erb

@@ -1,6 +1,7 @@
 <div class="data-porter" data-controller="data-porter--import-form"
      data-data-porter--import-form-sources-value="<%= @targets.map { |t| [t[:key], t[:sources]] }.to_h.to_json %>"
      data-data-porter--import-form-params-value="<%= @targets.map { |t| [t[:key], t[:params]] }.to_h.to_json %>"
+     data-data-porter--import-form-header-rows-value="<%= @targets.map { |t| [t[:key], t[:header_row]] }.to_h.to_json %>"
      data-action="keydown@document->data-porter--import-form#closeModal">
   <div class="dp-header">
     <h1 class="dp-title"><%= t("data_porter.imports.title") %></h1>
@@ -105,6 +106,13 @@
           </label>
         </div>
 
+        <div class="dp-field" data-data-porter--import-form-target="headerRowField">
+          <%= label_tag "dp-header-row-input-modal", t("data_porter.imports.form.header_row_label"), class: "dp-label" %>
+          <input type="number" name="data_import[header_row]" id="dp-header-row-input-modal" class="dp-input" value="1" min="1" step="1"
+                 data-data-porter--import-form-target="headerRowInput" />
+          <small class="dp-hint"><%= t("data_porter.imports.form.header_row_hint") %></small>
+        </div>
+
         <div class="dp-modal__footer">
           <%= f.submit t("data_porter.imports.start_import"), class: "dp-btn dp-btn--primary" %>
           <button type="button" class="dp-btn dp-btn--secondary" data-action="data-porter--import-form#closeModalClick"><%= t("data_porter.imports.cancel") %></button>

data/app/views/data_porter/imports/new.html.erb

@@ -21,7 +21,8 @@
             class: "dp-select",
             data: {
               sources: @targets.map { |t| [t[:key], t[:sources]] }.to_h.to_json,
-              params: @targets.map { |t| [t[:key], t[:params]] }.to_h.to_json
+              params: @targets.map { |t| [t[:key], t[:params]] }.to_h.to_json,
+              header_rows: @targets.map { |t| [t[:key], t[:header_row]] }.to_h.to_json
             } %>
     </div>
 
@@ -49,6 +50,12 @@
       </label>
     </div>
 
+    <div id="dp-header-row-field-new" class="dp-field">
+      <%= label_tag "dp-header-row-input-new", t("data_porter.imports.form.header_row_label"), class: "dp-label" %>
+      <input type="number" name="data_import[header_row]" id="dp-header-row-input-new" class="dp-input" value="1" min="1" step="1" />
+      <small class="dp-hint"><%= t("data_porter.imports.form.header_row_hint") %></small>
+    </div>
+
     <div class="dp-actions">
       <%= f.submit t("data_porter.imports.start_import"), class: "dp-btn dp-btn--primary" %>
       <%= link_to t("data_porter.imports.cancel"), imports_path, class: "dp-btn dp-btn--secondary" %>
@@ -64,8 +71,23 @@
     var fileInput = document.getElementById("dp-file-input-new");
     var dropzone = document.getElementById("dp-dropzone-new");
     var fileName = document.getElementById("dp-file-name-new");
+    var headerRowField = document.getElementById("dp-header-row-field-new");
     var paramsContainer = document.getElementById("dp-params-container");
     var paramsData = JSON.parse((targetSelect && targetSelect.dataset.params) || "{}");
+    var HEADER_ROW_SOURCES = ["csv", "xlsx"];
+
+    var headerRowInput = document.getElementById("dp-header-row-input-new");
+    var headerRowsData = JSON.parse((targetSelect && targetSelect.dataset.headerRows) || "{}");
+
+    function toggleHeaderRow() {
+      if (!headerRowField || !sourceSelect) return;
+      headerRowField.style.display = HEADER_ROW_SOURCES.indexOf(sourceSelect.value) === -1 ? "none" : "";
+    }
+
+    function applyHeaderRowDefault() {
+      if (!headerRowInput || !targetSelect) return;
+      headerRowInput.value = headerRowsData[targetSelect.value] || 1;
+    }
 
     function renderParams() {
       if (!paramsContainer || !targetSelect) return;
@@ -124,13 +146,16 @@
       targetSelect.addEventListener("change", function() {
         filterSources();
         renderParams();
+        applyHeaderRowDefault();
       });
     }
 
     if (sourceSelect) {
       sourceSelect.addEventListener("change", function() {
         fileField.style.display = this.value === "api" ? "none" : "";
+        toggleHeaderRow();
       });
+      toggleHeaderRow();
     }
 
     if (fileInput) {

data/config/locales/en.yml

@@ -43,6 +43,8 @@ en:
         dropzone_text: "Drop your file here or <strong>browse</strong>"
         dropzone_hint: "CSV, JSON, or XLSX files accepted"
         select_prompt: "Select..."
+        header_row_label: "Header row"
+        header_row_hint: "Row number (starting at 1) containing the column headers. Leave at 1 unless your file has description rows above the headers."
     mapping:
       load_template: "Load Template"
       save_as_template: "Save as template"
@@ -124,3 +126,4 @@ en:
       file_required: "must be attached for %{source} imports"
       file_too_large: "is too large (max %{max} MB)"
       invalid_content_type: "has an invalid content type (%{type})"
+      file_extension_mismatch: "expected a %{expected} file but got %{actual}"

data/config/locales/fr.yml

@@ -43,6 +43,8 @@ fr:
         dropzone_text: "Déposez votre fichier ici ou <strong>parcourir</strong>"
         dropzone_hint: "Fichiers CSV, JSON ou XLSX acceptés"
         select_prompt: "Sélectionner..."
+        header_row_label: "Ligne des en-têtes"
+        header_row_hint: "Numéro de la ligne (à partir de 1) contenant les en-têtes de colonnes. Laissez 1 sauf si votre fichier a des lignes de description avant les en-têtes."
     mapping:
       load_template: "Charger un modèle"
       save_as_template: "Sauvegarder comme modèle"
@@ -124,3 +126,4 @@ fr:
       file_required: "doit être joint pour les imports %{source}"
       file_too_large: "est trop volumineux (max %{max} Mo)"
       invalid_content_type: "a un type de contenu invalide (%{type})"
+      file_extension_mismatch: "fichier %{expected} attendu mais %{actual} reçu"

data/lib/data_porter/record_updater.rb

@@ -5,6 +5,7 @@ module DataPorter
     def initialize(data_import)
       @data_import = data_import
       @target = data_import.target_class.new
+      @target.import_params = data_import.config&.dig("import_params") || {}
       @revalidator = RecordRevalidator.new(@target)
     end
 

data/lib/data_porter/registry.rb

@@ -16,15 +16,7 @@ module DataPorter
       end
 
       def available
-        @targets.map do |key, klass|
-          {
-            key: key,
-            label: klass._label,
-            icon: klass._icon,
-            sources: klass._sources || DataPorter.configuration.enabled_sources,
-            params: serialize_params(klass._params)
-          }
-        end
+        @targets.map { |key, klass| serialize_target(key, klass) }
       end
 
       def refresh!
@@ -37,6 +29,17 @@ module DataPorter
 
       private
 
+      def serialize_target(key, klass)
+        {
+          key: key,
+          label: klass._label,
+          icon: klass._icon,
+          sources: klass._sources || DataPorter.configuration.enabled_sources,
+          params: serialize_params(klass._params),
+          header_row: (klass._header_row || 0) + 1
+        }
+      end
+
       def resolve_collection(collection)
         return unless collection
 

data/lib/data_porter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DataPorter
-  VERSION = "2.9.1"
+  VERSION = "2.10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_porter
 version: !ruby/object:Gem::Version
-  version: 2.9.1
+  version: 2.10.0
 platform: ruby
 authors:
 - Seryl Lounis
@@ -123,6 +123,7 @@ files:
 - app/assets/stylesheets/data_porter/progress.css
 - app/assets/stylesheets/data_porter/table.css
 - app/channels/data_porter/import_channel.rb
+- app/controllers/data_porter/concerns/import_params_builder.rb
 - app/controllers/data_porter/concerns/import_validation.rb
 - app/controllers/data_porter/concerns/mapping_management.rb
 - app/controllers/data_porter/concerns/record_pagination.rb