importo 3.0.23 → 3.0.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd095c43d38bb324dea0b158ebe7743bd84630c526b755fc7b031e761fff8e91
-  data.tar.gz: 772c031fe4446ce6db81e22c90f57ae9fb1dbfe1cbadd8ee62e0500fd3fe7a4e
+  metadata.gz: ab14d9e5565f7313de5ff1453e203bbf3f64670eb12d0f1f76c0f7149f747ee7
+  data.tar.gz: d9ab88a3625c778c7379def02f3f1680247c4228697e90fdd8d5f1f3599af954
 SHA512:
-  metadata.gz: ffc02a4f1a09ad49a624206c615cfcd44a81dd489c28d7c7cdbf6780b451c786e5fde236503585cbf864faaa3e870781de5286b64e10dad21d53d50d1b8e75e5
-  data.tar.gz: 75c6b5d26d837b23e5c7ac49514007121346dfb6ef1a7978e80a5105ebe41c666daf986a44c20fe3484bfefddc9d126d0fdad07e379036ccad214a4ca6aec243
+  metadata.gz: 41719578949eb007165adfac5c64ce78ce301dc12283cf6b66b29cf075bc3cab2ccd53c57b25bee71b88df7795a4b96285e1ce168fc2fa93b15f52e02215e892
+  data.tar.gz: 4c45ad49b70c9199c9ea9d7cc6766b1b937851fd730df733dc0985e8db00abbb89fcae86639022ecd7c69272de33ebb304870996b75831924a57adf230971127

data/app/controllers/importo/imports_controller.rb

@@ -35,11 +35,11 @@ module Importo
       end
       @import = Import.new(import_params.merge(locale: I18n.locale,
                                                importo_ownable: Importo.config.current_import_owner.call))
-      if params["commit"] == "upload" && @import.valid? && @import.save!
+      if params["commit"] == "Upload" && @import.valid? && @import.save!
         @import.confirm!
         @import.schedule!
         redirect_to importo.new_import_path(params[:kind] || @import.kind)                                         
-      elsif params["commit"] == "preview" && @import.valid?
+      elsif params["commit"] == "Preview" && @import.valid?
         @import.save!
         redirect_to action: :preview, id: @import.id, kind: @import.kind 
       else
@@ -52,7 +52,7 @@ module Importo
       @import = Import.find(params[:id])
       @import.original.purge if @import.concept?
       Signum.error(Current.user, text: t('.flash.cancel', id: @import.id))
-      # flash[:notice] = t('.flash.cancel', id: @import.id)
+      @import.destroy!
       redirect_to action: :new, kind: @import.kind
     end
 

data/app/importers/concerns/importable.rb

@@ -144,8 +144,8 @@ module Importable
             v.delay.call(attributes[k])
           end
         end
-        Importo::ImportJob.set(wait_until: (delay.max * index).seconds.from_now).perform_later(JSON.dump(attributes), index, import.id) if delay.present?
-        Importo::ImportJob.perform_later(JSON.dump(attributes), index, import.id) unless delay.present?
+        Importo::ImportJob.set(wait_until: (delay.max * index).seconds.from_now).perform_async(JSON.dump(attributes), index, import.id) if delay.present?
+        Importo::ImportJob.perform_async(JSON.dump(attributes), index, import.id) unless delay.present?
       end
     end
 

data/app/importers/importo/import_job_callback.rb

@@ -3,8 +3,8 @@ module Importo
     include Sidekiq::Batch::Callback
     include Rails.application.routes.url_helpers
 
-    def perform(batch, params)
-      import = Import.find(batch.properties[:import_id])
+    def perform(batch, import_id)
+      import = Import.find(import_id)
       complete_import(import)
     end
 

data/app/jobs/importo/import_job.rb

@@ -1,14 +1,27 @@
 module Importo
-  class ImportJob < ApplicationJob
+  base_class =
+    if Importo.config.batch_adapter == Importo::SidekiqBatchAdapter
+      Object
+    else
+      ApplicationJob
+    end
+
+  class ImportJob < base_class
+
     # No options here, gets added from the adapter
-    queue_as Importo.config.queue_name
-    include GoodJob::ActiveJobExtensions::Batches
 
     def perform(attributes, index, import_id)
-      self.class.execute_row(attributes, index, import_id, false)
+      batch_id = if defined?(bid)
+        bid
+      else
+        batch.id
+      end
+      batch
+
+      self.class.execute_row(attributes, index, import_id, false, batch_id)
     end
 
-    def self.execute_row(attributes, index, import_id, last_attempt)
+    def self.execute_row(attributes, index, import_id, last_attempt, bid)
       attributes = JSON.load(attributes).deep_symbolize_keys if attributes.is_a?(String)
 
       import = Import.find(import_id)
@@ -18,13 +31,13 @@ module Importo
       # - Sidekiq calls on_complete callback when all jobs ran at least once.
       # - GoodJob calls on_complete callback when all jobs are done (including retries).
       # i.e. this logic is only needed for sidekiq
-      # if Importo.config.batch_adapter == Importo::SidekiqBatchAdapter
-      #   batch = Importo::SidekiqBatchAdapter.find(bid)
+      if Importo.config.batch_adapter == Importo::SidekiqBatchAdapter
+        batch = Importo::SidekiqBatchAdapter.find(bid)
 
-      #   if !import.completed? && import.can_complete? && batch.finished?
-      #     ImportJobCallback.new.on_complete("success", {import_id: import.id})
-      #   end
-      # end
+        if !import.completed? && import.can_complete? && batch.finished?
+          ImportJobCallback.perform_now(batch, import.id)
+        end
+      end
     end
   end
 end

data/app/views/importo/imports/new.html.slim

@@ -4,9 +4,9 @@
       = f.input :kind, as: :hidden
       = sts.card :"importo_imports #{@import.kind}", title: t('.title'), icon: 'fad fa-file-spreadsheet' do |card|
         - card.with_action
-          = f.button 'preview', value: 'preview',  class: 'button secondary'
+          = f.button 'Preview', value: 'Preview',  class: 'button secondary'
         - card.with_action
-          = f.submit nil, value: 'upload'  
+          = f.submit nil, value: 'Upload'  
 
         .grid.grid-cols-12.gap-4
           .col-span-12

data/app/views/importo/imports/preview.html.slim

@@ -1,9 +1,8 @@
 = sts.form_with(model: false, url: upload_import_path) do |f|
   = sts.card :"importo_imports #{@import.kind}", title: t('.title', kind: @import&.kind.capitalize), icon: 'fad fa-file-spreadsheet' do |card|
     - card.with_action
-      / = f.button 'Cancel', value: 'cancel'
-      = f.submit 'Upload', value: 'upload'
-      = link_to(t('.cancel'), cancel_import_path(@import), method: :post, class: 'button')
+      = f.submit 'Upload', value: 'Upload'
+      = link_to(t('.back'), cancel_import_path(@import), data: { "turbo-method" => :post}, class: 'button')
     .px-4.sm:px-6.lg:px-8
       / .sm:flex.sm:items-center
       /   .sm:flex-auto

data/config/locales/en.yml

@@ -15,7 +15,8 @@ en:
         example: Example
     imports:
       cancel:
-        success: "Import canceled for id %{id}, Redirecting to new"
+        flash:
+          cancel: "Import canceled for id %{id}, Redirecting to new"
       index:
         title: Import results
         card:
@@ -43,7 +44,7 @@ en:
       preview:
         no_file: Import failed, please upload valid file.
         title: "%{kind} Import Preview"
-        cancel: Cancel
+        back: Back
       upload:
         flash:
           no_file: Import failed, please upload a file.

data/lib/importo/adapters/sidekiq_batch_adapter.rb

@@ -8,7 +8,6 @@ if !defined?(Sidekiq::Batch)
   end
 end
 
-require_relative "../../../app/jobs/importo/import_job"
 
 module Importo
   class SidekiqBatchAdapter
@@ -75,5 +74,8 @@ module Importo
   end
 end
 
-# Importo::ImportJob.send(:include, Sidekiq::Job)
-# Importo::ImportJob.send(:include, Importo::SidekiqBatchAdapter::ImportJobIncludes)
+require_relative "../../../app/jobs/importo/import_job"
+
+
+Importo::ImportJob.send(:include, Sidekiq::Job)
+Importo::ImportJob.send(:include, Importo::SidekiqBatchAdapter::ImportJobIncludes)

data/lib/importo/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Importo
-  VERSION = "3.0.23"
+  VERSION = "3.0.24"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: importo
 version: !ruby/object:Gem::Version
-  version: 3.0.23
+  version: 3.0.24
 platform: ruby
 authors:
 - Andre Meij
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-11-24 00:00:00.000000000 Z
+date: 2025-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: caxlsx