decidim-direct_verifications 1.0 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 46d0f12ed4661879a4cdec82f1482875823fe9c5f4fba39c129e2a020d3c7f19
-  data.tar.gz: 5cf039fb0a1b3474082dbf7acc28013d8d0034c6d959c7c7ad589aca85c1fdf8
+  metadata.gz: e42a469a3e54d28a703c6565abdb73aa70d33c540882e8737c0e92592d18d238
+  data.tar.gz: 1c2ff4b72713ad26ba30b350efbcc31840fa42aac1f171faa32f0b1b64596d22
 SHA512:
-  metadata.gz: 4f960edacf1528f9801d6cfd82aa6898a5bffbf9233a2386a57cdb0c55c0a3d5ef45ddf501d1775db1ab325dbcd61925b012dcc3ab8bf83bedbd4630abbf3b03
-  data.tar.gz: 909e8c8be3368861bc6fe75c1290f820a4d697e20bf4ded85d9e91ec9a5b7a27d3aa65953d749460d3fe0efbfe132fd8aa586ac27e032782127463be98476a61
+  metadata.gz: 1514cdfd920925b28b1d89e4c615a4ce0a97ceca4a85fcffab0706e6b740e0ae11541c04ce77a992da7aa21ef6b289795abf8cd3ccb950f7c1613531b3f57460
+  data.tar.gz: 618916a01ea8ac5fb19188e1b10d15c56a40ed6648da422d5d48c16a93feb8a2ff1f5507ac88f62a08c0651a704fb5c2a5efa502d887b2df07b6eb1bca8f66a4

data/README.md

@@ -73,6 +73,7 @@ Depending on your Decidim version, you might want to specify the version to ensu
 
 | Direct Verifications version | Compatible Decidim versions |
 |---|---|
+| 1.1 | >= 0.25.x |
 | 1.0 | >= 0.23.x |
 | 0.22.x | 0.22.x |
 

data/app/commands/decidim/direct_verifications/verification/create_import.rb

@@ -17,13 +17,14 @@ module Decidim
 
           case action
           when :register
-            register_users_async
+            register_users_async(remove_file: true)
+          when :authorize
+            authorize_users_async(remove_file: true)
           when :register_and_authorize
             register_users_async
-            file.rewind
-            authorize_users_async
+            authorize_users_async(remove_file: true)
           when :revoke
-            revoke_users_async
+            revoke_users_async(remove_file: true)
           end
 
           broadcast(:ok)
@@ -33,16 +34,24 @@ module Decidim
 
         attr_reader :form, :file, :organization, :user, :action
 
-        def register_users_async
-          RegisterUsersJob.perform_later(file.read, organization, user, form.authorization_handler)
+        def register_users_async(options = {})
+          RegisterUsersJob.perform_later(blob.id, organization, user, form.authorization_handler, options)
+        end
+
+        def revoke_users_async(options = {})
+          RevokeUsersJob.perform_later(blob.id, organization, user, form.authorization_handler, options)
+        end
+
+        def authorize_users_async(options = {})
+          AuthorizeUsersJob.perform_later(blob.id, organization, user, form.authorization_handler, options)
         end
 
-        def revoke_users_async
-          RevokeUsersJob.perform_later(file.read, organization, user, form.authorization_handler)
+        def blob
+          @blob ||= ActiveStorage::Blob.create_and_upload!(io: file, filename: secure_name)
         end
 
-        def authorize_users_async
-          AuthorizeUsersJob.perform_later(file.read, organization, user, form.authorization_handler)
+        def secure_name
+          @secure_name ||= "#{SecureRandom.uuid}#{File.extname(file.tempfile)}"
         end
       end
     end

data/app/controllers/decidim/direct_verifications/verification/admin/authorizations_controller.rb

@@ -10,6 +10,8 @@ module Decidim
           def index
             enforce_permission_to :index, :authorization
             @authorizations = collection.includes(:user)
+                                        .page(params[:page])
+                                        .per(15)
           end
 
           def destroy

data/app/jobs/decidim/direct_verifications/authorize_users_job.rb

@@ -8,7 +8,9 @@ module Decidim
       class NullSession; end
 
       def process_users
+        Rails.logger.info "AuthorizeUsersJob: Authorizing #{emails.count} emails"
         emails.each do |email, data|
+          Rails.logger.debug "AuthorizeUsersJob: Authorizing #{email}"
           AuthorizeUser.new(
             email,
             data,

data/app/jobs/decidim/direct_verifications/base_import_job.rb

@@ -10,20 +10,32 @@ module Decidim
     class BaseImportJob < ApplicationJob
       queue_as :default
 
-      def perform(userslist, organization, current_user, authorization_handler)
-        @emails = Parsers::MetadataParser.new(userslist).to_h
+      def perform(blob_id, organization, current_user, authorization_handler, options = {})
+        @blob = ActiveStorage::Blob.find(blob_id)
         @organization = organization
         @current_user = current_user
-        @instrumenter = Instrumenter.new(current_user)
         @authorization_handler = authorization_handler
 
-        process_users
-        send_email_notification
+        begin
+          @emails = Parsers::MetadataParser.new(userslist).to_h
+          @instrumenter = Instrumenter.new(current_user)
+
+          Rails.logger.info "BaseImportJob: Processing file #{@blob.filename}"
+          process_users
+          send_email_notification
+        rescue StandardError => e
+          Rails.logger.error "BaseImportJob Error: #{e.message} #{e.backtrace.filter { |f| f =~ /direct_verifications/ }}"
+        end
+        remove_file! if options.fetch(:remove_file, false)
       end
 
       private
 
-      attr_reader :emails, :organization, :current_user, :instrumenter, :authorization_handler
+      attr_reader :blob, :emails, :organization, :current_user, :instrumenter, :authorization_handler
+
+      def userslist
+        @userslist ||= blob.download.force_encoding("UTF-8")
+      end
 
       def send_email_notification
         ImportMailer.finished_processing(
@@ -33,6 +45,10 @@ module Decidim
           authorization_handler
         ).deliver_now
       end
+
+      def remove_file!
+        blob.purge
+      end
     end
   end
 end

data/app/jobs/decidim/direct_verifications/register_users_job.rb

@@ -6,6 +6,7 @@ module Decidim
   module DirectVerifications
     class RegisterUsersJob < BaseImportJob
       def process_users
+        Rails.logger.info "RegisterUsersJob: Registering #{emails.count} emails"
         emails.each do |email, data|
           RegisterUser.new(email, data, organization, current_user, instrumenter).call
         end

data/app/jobs/decidim/direct_verifications/revoke_users_job.rb

@@ -4,6 +4,7 @@ module Decidim
   module DirectVerifications
     class RevokeUsersJob < BaseImportJob
       def process_users
+        Rails.logger.info "RevokeUsersJob: Revoking #{emails.count} emails"
         emails.each do |email, _name|
           RevokeUser.new(email, organization, instrumenter, authorization_handler).call
         end

data/app/packs/entrypoints/decidim_direct_verifications.js

@@ -0,0 +1,4 @@
+import "src/decidim/direct_verifications/admin/checkboxes.js"
+
+// CSS
+import "entrypoints/decidim_direct_verifications.scss";

data/app/packs/entrypoints/decidim_direct_verifications.scss

@@ -0,0 +1 @@
+@import "stylesheets/decidim/direct_verifications/admin/authorizations";

data/app/packs/src/decidim/direct_verifications/admin/checkboxes.js

@@ -0,0 +1,7 @@
+// = require_self
+
+$(() => {
+  $('[type="checkbox"]#register').change(function () {
+    $(this).closest("label").find(".callout").toggleClass("hide", !$(this).prop("checked"))
+  })
+})

data/app/{assets/stylesheets/decidim/direct_verifications → packs/stylesheets/decidim/direct_verifications/admin}/authorizations.scss

@@ -1,4 +1,4 @@
-@import "decidim/admin/utils/settings";
+@import "stylesheets/decidim/admin/utils/settings";
 
 $code-color: $black;
 $code-font-family: $font-family-monospace;

data/app/views/decidim/direct_verifications/verification/admin/authorizations/index.html.erb

@@ -1,4 +1,4 @@
-<%= stylesheet_link_tag "decidim/direct_verifications/authorizations" %>
+<%= stylesheet_pack_tag "decidim_direct_verifications" %>
 
 <div class="card">
   <div class="card-divider">
@@ -37,6 +37,7 @@
           <% end %>
         </tbody>
       </table>
+      <%= paginate @authorizations, theme: "decidim" %>
     </div>
   </div>
 </div>

data/app/views/decidim/direct_verifications/verification/admin/direct_verifications/index.html.erb

@@ -42,4 +42,4 @@
   </div>
 </div>
 
-<%= javascript_include_tag "decidim/direct_verifications/verification/admin/direct_verifications_admin" %>
+<%= javascript_pack_tag "decidim_direct_verifications" %>

data/app/views/decidim/direct_verifications/verification/admin/imports/new.html.erb

@@ -47,4 +47,4 @@
   </div>
 </div>
 
-<%= javascript_include_tag "decidim/direct_verifications/verification/admin/direct_verifications_admin" %>
+<%= javascript_pack_tag "decidim_direct_verifications" %>

data/config/assets.rb

@@ -0,0 +1,24 @@
+# frozen_string_literal: true
+
+# This file is located at `config/assets.rb` of your module.
+
+# Define the base path of your module. Please note that `Rails.root` may not be
+# used because we are not inside the Rails environment when this file is loaded.
+base_path = File.expand_path("..", __dir__)
+
+# Register an additional load path for webpack. All the assets within these
+# directories will be available for inclusion within the Decidim assets. For
+# example, if you have `app/packs/src/decidim/foo.js`, you can include that file
+# in your JavaScript entrypoints (or other JavaScript files within Decidim)
+# using `import "src/decidim/foo"` after you have registered the additional path
+# as follows.
+Decidim::Webpacker.register_path("#{base_path}/app/packs")
+
+# Register the entrypoints for your module. These entrypoints can be included
+# within your application using `javascript_pack_tag` and if you include any
+# SCSS files within the entrypoints, they become available for inclusion using
+# `stylesheet_pack_tag`.
+Decidim::Webpacker.register_entrypoints(
+  decidim_direct_verifications: "#{base_path}/app/packs/entrypoints/decidim_direct_verifications.js",
+  decidim_direct_verifications_css: "#{base_path}/app/packs/entrypoints/decidim_direct_verifications.scss"
+)

data/config/locales/ca.yml

@@ -10,12 +10,12 @@ ca:
       admin:
         direct_verifications:
           help:
-            - 'Permet la introducció massiva d''usuaris per tal de:'
-            - Registrar-los directament a la organització amb l'enviament d'invitacions
-            - Verificar-los en qualsevol mètode de verificació actiu
-            - Revocar la verificació en qualsevol mètode de verificació actiu
+            - 'Permet la introducció massiva de participants per tal de:'
+            - Registrar-les directament a la organització amb l'enviament d'invitacions
+            - Verificar-les amb qualsevol mètode de verificació actiu
+            - Revocar la verificació amb qualsevol mètode de verificació actiu
       direct_verifications:
-        explanation: Verificació manual per par dels administradors de l'organització
+        explanation: Verificació manual per part de les administradores de l'organització
         name: Verificació directa
     direct_verifications:
       verification:
@@ -25,40 +25,54 @@ ca:
               created_at: Data de creació
               metadata: Metadades
               name: Nom
-              title: Autoritzacions
-              user_name: Nom d'usuari
               new_import: Nova importació
+              title: Autoritzacions
+              user_name: Nom de la participant
           direct_verifications:
             create:
-              authorized: "S'han verificat correctament %{authorized} usuaris utilitzant [%{handler}] (%{count} detectats, %{errors} errors)"
-              info: "S'han detectat %{count} usuaris, dels quals %{registered} estan registrats, %{authorized} autoritzats utilitzant [%{handler}] (%{unconfirmed} sense confirmar)"
+              authorized: "S'han verificat correctament %{authorized} participants utilitzant [%{handler}] (%{count} detectats, %{errors} errors)"
+              info: "S'han detectat %{count} participants, de les quals %{registered} estan registrades, %{authorized} autoritzades utilitzant [%{handler}] (%{unconfirmed} sense confirmar)"
               missing_header: Si us plau, proporcioneu una fila d'encapçalament
-              registered: "S'han registrat correctament %{registered} usuaris (%{count} detectats, %{errors} errors)"
-              revoked: S'ha revocat correctament la verificació de %{revoked} usuaris utilitzant [%{handler}] (%{count} detectats, %{errors} errors)
-            gdpr_disclaimer: Feu-ho sota la vostra responsabilitat. Recordeu que heu de tenir el consentiment explícit dels vostres usuaris per registrar-los. En cas contrari, estareu infringint la regulació GDPR als països de la UE.
+              registered: "S'han registrat correctament %{registered} participants (%{count} detectades, %{errors} errors)"
+              revoked: S'ha revocat correctament la verificació de %{revoked} participants utilitzant [%{handler}] (%{count} detectades, %{errors} errors)
+            gdpr_disclaimer: Feu-ho sota la vostra responsabilitat. Recordeu que heu de tenir el consentiment explícit de les vostres participants per a registrar-les. En cas contrari, estareu infringint la regulació GDPR als països de la UE.
+          imports:
+            create:
+              error: No s'ha pogut importar el fitxer
+              success: S'ha importat el fitxer. Rebràs un email quan totes les participants hagin estat importades.
+            mailer:
+              authorized: "%{successful} participants han estat verificades utilitzant [%{handler}] (%{count} detectades, %{errors} errors)"
+              info: "%{count} participants detectades, de les quals %{registered} estan registrades, %{authorized} autoritzades utilitzant [%{handler}] (%{unconfirmed} sense confirmar)"
+              registered: "%{successful} participants han estat registrades (%{count} detectades, %{errors} errors) "
+              revoked: S'ha revocat correctament la verificació de %{successful} participants utilitzant [%{handler}] (%{count} detectades, %{errors} errors)
+              subject: Resultats de la importació
+            new:
+              file: Fitxer CSV amb dades de participants
+              info: Importa un fitxer CSV file amb una participant per línia copiant el format de l'exemple següent
+              submit: Pujar fitxer
           index:
-            authorizations: Usuaris autoritzats
-            stats: Estadístiques d'usuaris
-            title: Inscriu i autoritza usuaris
+            authorizations: Participants autoritzades
+            stats: Estadístiques de les participants
+            title: Inscriu i autoritza participants
           new:
             authorization_handler: Mètode de verificació
-            authorize: Autoritza els usuaris
-            check: Comprova l'estat dels usuaris
-            info: Introdueix aquí els emails, un per línia. Si els emails estan precedits per un text, s'interpretarà com el nom de l'usuari
-            register: Registra els usuaris a la plataforma (si existeixen s'ignoraran)
-            revoke: Revoca l'autorització dels usuaris
+            authorize: Autoritza les participants
+            check: Comprova l'estat de les participants
+            info_html: Pots <a href=%{link}>importar un fitxer CSV</a> o introduir els emails aquí, un per línia. Si els emails estan precedits per un text, aquest s'interpretarà com el nom de la participant
+            register: Registra les participants a la plataforma (si existeixen s'ignoraran)
+            revoke: Revoca l'autorització de les participants
             submit: Envia i processa el llistat
-            textarea: Llista d''emails
+            textarea: Llistat d'emails
           stats:
             index:
-              authorized: Verificats
-              authorized_unconfirmed: Verificats però no confirmats
+              authorized: Verificades
+              authorized_unconfirmed: Verificades però no confirmades
               global: "- Qualsevol mètode de verificació -"
-              registered: Registrats
-              unconfirmed: No confirmats
+              registered: Registrades
+              unconfirmed: No confirmades
         authorizations:
           new:
-            no_action: Aquest mètode requereix que un administrador us verifiqui
+            no_action: Aquest mètode requereix que una administradora us verifiqui
     verifications:
       authorizations:
         first_login:

data/config/locales/cs.yml

@@ -25,16 +25,31 @@ cs:
               created_at: Vytvořeno v
               metadata: Metadata
               name: Název
+              new_import: Nový import
               title: Autorizace
               user_name: Uživatelské jméno
-              new_import: Nový import
           direct_verifications:
             create:
               authorized: "%{authorized} uživatelů bylo úspěšně ověřeno pomocí [%{handler}] (%{count} detekováno, %{errors} chyb)"
               info: "Zjištěno %{count} uživatelů, z nichž %{registered} jsou registrováni, %{authorized} autorizováni pomocí [%{handler}] (%{unconfirmed} nepotvrzeno)"
+              missing_header: Zadejte řádek záhlaví
               registered: "%{registered} uživatelů bylo úspěšně zaregistrováno (%{count} detekováno, %{errors} chyb) "
               revoked: Ověření od %{revoked} uživatelů bylo zrušeno pomocí [%{handler}] (%{count} detekováno, %{errors} chyb)
             gdpr_disclaimer: Udělejte to v rámci vaší odpovědnosti. Nezapomeňte, že potřebujete mít výslovný souhlas svých uživatelů, abyste je mohli zaregistrovat. V opačném případě můžete porušovat nařízení o GDPR v zemích EU.
+          imports:
+            create:
+              error: Při importu souboru došlo k chybě
+              success: Soubor byl úspěšně nahrán. Až budou importováni všichni účastníci, pošleme vám e-mail.
+            mailer:
+              authorized: "%{successful} účastníků bylo úspěšně ověřeno pomocí [%{handler}] (%{count} detekováno, %{errors} chyby)"
+              info: "%{count} účastníků detekováno, z toho %{registered} jsou registrováni, %{authorized} povoleno pomocí [%{handler}] (%{unconfirmed} nepotvrzeno)"
+              registered: "%{successful} účastníků bylo úspěšně registrováno (%{count} detekováno, %{errors} chyb) "
+              revoked: Ověření od %{successful} účastníků bylo zrušeno pomocí [%{handler}] (%{count} detekováno, %{errors} chyby)
+              subject: Výsledky importu souboru
+            new:
+              file: Soubor CSV s daty účastníků
+              info: Importovat CSV soubor s účastníkem na řádku, který zkopíruje formát z příkladu
+              submit: Nahrát soubor
           index:
             authorizations: Autorizovaní uživatelé
             stats: Statistiky uživatelů
@@ -43,7 +58,7 @@ cs:
             authorization_handler: Ověřovací metoda
             authorize: Autorizovat uživatele
             check: Zkontrolovat stav uživatelů
-            info: Zadejte e-maily zde, jeden na řádek. Pokud e-mailům předchází text, bude interpretován jako jméno uživatele
+            info_html: Můžete <a href=%{link}>importovat CSV</a> nebo zde zadat e-maily, jedno na řádek. Pokud e-mailům předchází text, bude interpretován jako jméno účastníka.
             register: Registrovat uživatele na platformě (pokud existují, budou ignorováni)
             revoke: Zrušit autorizaci od uživatelů
             submit: Odeslat a zpracovat seznam

data/config/locales/en.yml

@@ -11,7 +11,7 @@ en:
       admin:
         direct_verifications:
           help:
-          - 'Allows the massive introduction of users in order to:'
+          - 'Allows the massive introduction of participants in order to:'
           - Direct register in the organization and sends invitations
           - Verify them in any active verification method
           - Revoke their verification in any active verification method
@@ -21,57 +21,61 @@ en:
     direct_verifications:
       verification:
         admin:
-          imports:
-            new:
-              info: Import a CSV file with a user entry per line copying the format from the example below
-              submit: Upload file
-              file: CSV file with users data
-            create:
-              success: File successfully uploaded. We'll email you when all users are imported.
-              error: There was an error importing the file
-            mailer:
-              subject: File import results
-              authorized: "%{successful} users have been successfully verified using
-                [%{handler}] (%{count} detected, %{errors} errors)"
-              info: "%{count} users detected, of which %{registered} are registered,
-                %{authorized} authorized using [%{handler}] (%{unconfirmed} unconfirmed)"
-              registered: "%{successful} users have been successfully registered (%{count}
-                detected, %{errors} errors) "
-              revoked: Verification from %{successful} users have been revoked using
-                [%{handler}] (%{count} detected, %{errors} errors)
           authorizations:
             index:
               created_at: Created at
               metadata: Metadata
               name: Name
-              title: Authorizations
-              user_name: User name
               new_import: New import
+              title: Authorizations
+              user_name: Participant name
           direct_verifications:
             create:
-              authorized: "%{authorized} users have been successfully verified using
+              authorized: "%{authorized} participants have been successfully verified using
                 [%{handler}] (%{count} detected, %{errors} errors)"
-              info: "%{count} users detected, of which %{registered} are registered,
+              info: "%{count} participants detected, of which %{registered} are registered,
                 %{authorized} authorized using [%{handler}] (%{unconfirmed} unconfirmed)"
               missing_header: Please, provide a header row
-              registered: "%{registered} users have been successfully registered (%{count}
+              registered: "%{registered} participants have been successfully registered (%{count}
                 detected, %{errors} errors) "
-              revoked: Verification from %{revoked} users have been revoked using
+              revoked: Verification from %{revoked} participants have been revoked using
                 [%{handler}] (%{count} detected, %{errors} errors)
             gdpr_disclaimer: Do this under your responsibility. Remember that you
-              need to have explicit consent from your users in order to register them.
+              need to have explicit consent from your participants in order to register them.
               Otherwise you will be infringing the GDPR regulation in EU countries.
+          imports:
+            create:
+              error: There was an error importing the file
+              success: File successfully uploaded. We'll email you when all participants
+                are imported.
+            mailer:
+              authorized: "%{successful} participants have been successfully verified using
+                [%{handler}] (%{count} detected, %{errors} errors)"
+              info: "%{count} participants detected, of which %{registered} are registered,
+                %{authorized} authorized using [%{handler}] (%{unconfirmed} unconfirmed)"
+              registered: "%{successful} participants have been successfully registered (%{count}
+                detected, %{errors} errors) "
+              revoked: Verification from %{successful} participants have been revoked using
+                [%{handler}] (%{count} detected, %{errors} errors)
+              subject: File import results
+            new:
+              file: CSV file with participants data
+              info: Import a CSV file with a participant entry per line copying the format
+                from the example below
+              submit: Upload file
           index:
-            authorizations: Authorized users
+            authorizations: Authorized participants
             stats: User stats
-            title: Register and authorize users
+            title: Register and authorize participants
           new:
             authorization_handler: Verification method
-            authorize: Authorize users
-            check: Check users status
-            info_html: You can <a href=%{link}>import a CSV</a> or enter the emails here, one per line. If the emails are preceded by a text, it will be interpreted as the user's name.
-            register: Register users in the platform (if they exist they will be ignored)
-            revoke: Revoke authorization from users
+            authorize: Authorize participants
+            check: Check participants status
+            info_html: You can <a href=%{link}>import a CSV</a> or enter the emails
+              here, one per line. If the emails are preceded by a text, it will be
+              interpreted as the participant's name.
+            register: Register participants in the platform (if they exist they will be ignored)
+            revoke: Revoke authorization from participants
             submit: Send and process the list
             textarea: Emails list
           stats:

data/config/locales/es.yml

@@ -10,12 +10,12 @@ es:
       admin:
         direct_verifications:
           help:
-            - 'Permite la introducción masiva d usuarios con el fin de:'
-            - Registrarlos directamente a la organización con el envío de invitaciones
-            - Verificarlos en cualquier método de verificación activo
-            - Revocar la verificación en cualquier método de verificación activo
+            - 'Permite la introducción masiva de participantes con el fin de:'
+            - Registrarlas directamente en la organización con el envío de invitaciones
+            - Verificarlas con cualquier método de verificación activo
+            - Revocar la verificación con cualquier método de verificación activo
       direct_verifications:
-        explanation: Verificación manual por parte de los administradores de la organización
+        explanation: Verificación manual por parte de las administradoras de la organización
         name: Verificación directa
     direct_verifications:
       verification:
@@ -25,40 +25,54 @@ es:
               created_at: Creado el
               metadata: Metadatos
               name: Nombre
-              title: Autorizaciones
-              user_name: Nombre de usuario
               new_import: Nueva importación
+              title: Autorizaciones
+              user_name: Nombre de la participante
           direct_verifications:
             create:
-              authorized: "Se han verificado correctamente %{authorized} usuarios usando [%{handler}] (%{count} detectados, %{errors} errores)"
-              info: "Se han detectado %{count} usuarios, de los cuales %{registered} están registrados, %{authorized} autorizados usando [%{handler}] (%{unconfirmed} sin confirmar)"
-              missing_header: Por favor, proporcionad una fila de encabezamiento
-              registered: "Se han registrado correctamente %{registered} usuarios (%{count} detectados, %{errors} errores)"
-              revoked: Se ha revocado correctament la verificación de %{revoked} usuarios usando [%{handler}] (%{count} detectados, %{errors} errores)
-            gdpr_disclaimer: Haga esto bajo su responsabilidad. Recuerde que debe contar con el consentimiento explícito de sus usuarios para poder registrarlos. De lo contrario, estará infringiendo la regulación GDPR en los países de la UE.
+              authorized: "Se han verificado correctamente %{authorized} participantes usando [%{handler}] (%{count} detectadas, %{errors} errores)"
+              info: "Se han detectado %{count} participantes, de las cuales %{registered} están registradas, %{authorized} autorizadas usando [%{handler}] (%{unconfirmed} sin confirmar)"
+              missing_header: Por favor, proporciona una fila de encabezamiento
+              registered: "Se han registrado correctamente %{registered} participantes (%{count} detectadas, %{errors} errores)"
+              revoked: Se ha revocado correctamente la verificación de %{revoked} participantes usando [%{handler}] (%{count} detectadas, %{errors} errores)
+            gdpr_disclaimer: Haz esto bajo tu responsabilidad. Recuerda que debes contar con el consentimiento explícito de las participantes para poder registrarlas. De lo contrario, estarás infringiendo la regulación GDPR en los países de la UE.
+          imports:
+            create:
+              error: Ha habido un error al importar el archivo.
+              success: Se ha importado el archivo. Recibirás un email cuando todas las participantes hayan sido importadas.
+            mailer:
+              authorized: "%{successful} participantes han sido verificadas usando [%{handler}] (%{count} detectades, %{errors} errores)"
+              info: "%{count} participantes detectadas, de las cuales %{registered} están registradas, %{authorized} autorizadas usando [%{handler}] (%{unconfirmed} sin confirmar)"
+              registered: "%{successful} participantes han sido registradas (%{count} detectadas, %{errors} errores) "
+              revoked: Se ha revocado correctamente la verificación de %{successful} participantes usando [%{handler}] (%{count} detectadas, %{errors} errores)
+              subject: Resultados de la importación
+            new:
+              file: Archivo CSV con datos de participantes
+              info: Importa un archivo CSV con una participante por línea copiando el formato del siguiente ejemplo
+              submit: Subir archivo
           index:
-            authorizations: Usuarios autorizados
-            stats: Estadísticas de usuarios
-            title: Inscribe y autoriza usuarios
+            authorizations: Participantes autorizadas
+            stats: Estadísticas de participantes
+            title: Inscribe y autoriza participantes
           new:
             authorization_handler: Método de verificación
-            authorize: Autoriza los usuarios
-            check: Comprueba el estado de los usuarios
-            info: Introduce aquí los emails, uno por linea. Si los emails están precedidos por un texto, se interpretará como el nombre del usuario
-            register: Registra los usuarios a la plataforma (si existen se ignorarán)
-            revoke: Revoca la autorización de los usuarios
+            authorize: Autoriza las participantes
+            check: Comprueba el estado de las participantes
+            info_html: Puedes <a href=%{link}>importar un fichero CSV</a> o introducir aquí los emails, uno por linea. Si los emails están precedidos por un texto, éste se interpretará como el nombre de la participante
+            register: Registra las participantes a la plataforma (si existen se ignorarán)
+            revoke: Revoca la autorización de las participantes
             submit: Envía y procesa el listado
             textarea: Lista de emails
           stats:
             index:
-              authorized: Verificados
-              authorized_unconfirmed: Verificados pero sin confirmar
+              authorized: Verificadas
+              authorized_unconfirmed: Verificadas pero sin confirmar
               global: "- Cualquier método de verificación -"
-              registered: Registrados
+              registered: Registradas
               unconfirmed: Sin confirmar
         authorizations:
           new:
-            no_action: Este método requiere que un administrador os verifique
+            no_action: Este método requiere que una administradora os verifique
     verifications:
       authorizations:
         first_login:

data/config/locales/fr.yml

@@ -25,16 +25,31 @@ fr:
               created_at: Créé à
               metadata: Métadonnées
               name: Nom
+              new_import: Nouvel import
               title: Autorisations
               user_name: Nom de l'utilisateur
-              new_import: Nouvel import
           direct_verifications:
             create:
               authorized: "%{authorized} utilisateurs ont été vérifiés avec succès en utilisant [%{handler}] (%{count} détectés, %{errors} erreurs)"
               info: "%{count} utilisateurs détectés, dont %{registered} sont enregistrés, %{authorized} autorisés à utiliser [%{handler}] (%{unconfirmed} non confirmés)"
+              missing_header: Please, provide a header row
               registered: "%{registered} utilisateurs ont été enregistrés avec succès (%{count} détectés, %{errors} erreurs) "
               revoked: La vérification de %{revoked} utilisateurs ont été révoqués en utilisant [%{handler}] (%{count} détectés, %{errors} erreurs)
             gdpr_disclaimer: Faites-le sous votre responsabilité. N'oubliez pas que vous devez avoir le consentement explicite de vos utilisateurs afin de les enregistrer. Dans le cas contraire, vous enfreindrez le règlement du RGPD dans les pays de l'UE.
+          imports:
+            create:
+              error: There was an error importing the file
+              success: File successfully uploaded. We'll email you when all participants are imported.
+            mailer:
+              authorized: "%{successful} participants have been successfully verified using [%{handler}] (%{count} detected, %{errors} errors)"
+              info: "%{count} participants detected, of which %{registered} are registered, %{authorized} authorized using [%{handler}] (%{unconfirmed} unconfirmed)"
+              registered: "%{successful} participants have been successfully registered (%{count} detected, %{errors} errors) "
+              revoked: Verification from %{successful} participants have been revoked using [%{handler}] (%{count} detected, %{errors} errors)
+              subject: File import results
+            new:
+              file: CSV file with participants data
+              info: Import a CSV file with a participant entry per line copying the format from the example below
+              submit: Upload file
           index:
             authorizations: Utilisateurs autorisés
             stats: Statistiques des utilisateurs
@@ -43,7 +58,7 @@ fr:
             authorization_handler: Méthode de vérification
             authorize: Utilisateurs autorisés
             check: Vérifier le statut des utilisateurs
-            info: Entrez les e-mails ici, un par ligne. Si les e-mails sont précédés d'un texte, il sera interprété comme le nom de l'utilisateur
+            info_html: You can <a href=%{link}>import a CSV</a> or enter the emails here, one per line. If the emails are preceded by a text, it will be interpreted as the participant's name.
             register: Inscrire des utilisateurs sur la plateforme (si ils existent, ils seront ignorés)
             revoke: Révoquer l'autorisation des utilisateurs
             submit: Envoyer et traiter la liste

data/lib/decidim/direct_verifications/parsers/metadata_parser.rb

@@ -10,9 +10,9 @@ module Decidim
 
         def header
           @header ||= begin
-            header_row = lines[0].chomp
-            header_row = tokenize(header_row)
-            normalize_header(header_row)
+            raise InputParserError, I18n.t("#{I18N_SCOPE}.create.missing_header") if lines.count <= 1
+
+            tokenize(lines[0].chomp).map { |h| h.to_s.downcase }
           end
         end
 
@@ -25,6 +25,8 @@ module Decidim
 
           hash = {}
           header.each_with_index do |column, index|
+            next if column.blank?
+
             value = tokens[index]
             next if value&.include?(email)
 
@@ -40,14 +42,6 @@ module Decidim
             token&.strip
           end
         end
-
-        def normalize_header(line)
-          line.map do |field|
-            raise InputParserError, I18n.t("#{I18N_SCOPE}.create.missing_header") if field.nil?
-
-            field.to_sym.downcase
-          end
-        end
       end
     end
   end

data/lib/decidim/direct_verifications/tests/verification_controller_examples.rb

@@ -8,7 +8,7 @@ shared_examples_for "checking users" do |params|
       perform_enqueued_jobs do
         post :create, params: params
         expect(flash[:info]).not_to be_empty
-        expect(flash[:info]).to include("0 users detected")
+        expect(flash[:info]).to include("0 participants detected")
         expect(subject).to render_template("decidim/direct_verifications/verification/admin/direct_verifications/index")
       end
     end
@@ -21,7 +21,7 @@ shared_examples_for "checking users" do |params|
       perform_enqueued_jobs do
         post :create, params: params
         expect(flash[:info]).not_to be_empty
-        expect(flash[:info]).to include("1 users detected")
+        expect(flash[:info]).to include("1 participants detected")
         expect(subject).to render_template("decidim/direct_verifications/verification/admin/direct_verifications/index")
       end
     end
@@ -36,7 +36,7 @@ shared_examples_for "registering users" do |params|
         expect(flash[:warning]).not_to be_empty
         expect(flash[:warning]).to include("1 detected")
         expect(flash[:warning]).to include("0 errors")
-        expect(flash[:warning]).to include("1 users")
+        expect(flash[:warning]).to include("1 participants")
         expect(flash[:warning]).to include("registered")
       end
     end
@@ -51,7 +51,7 @@ shared_examples_for "authorizing users" do |params|
         expect(flash[:notice]).not_to be_empty
         expect(flash[:notice]).to include("1 detected")
         expect(flash[:notice]).to include("0 errors")
-        expect(flash[:notice]).to include("1 users")
+        expect(flash[:notice]).to include("1 participants")
         expect(flash[:notice]).to include("verified")
       end
     end
@@ -75,7 +75,7 @@ shared_examples_for "revoking users" do |params|
         expect(flash[:notice]).not_to be_empty
         expect(flash[:notice]).to include("1 detected")
         expect(flash[:notice]).to include("0 errors")
-        expect(flash[:notice]).to include("1 users")
+        expect(flash[:notice]).to include("1 participants")
         expect(flash[:notice]).to include("revoked")
       end
     end

data/lib/decidim/direct_verifications/verification/admin_engine.rb

@@ -16,11 +16,8 @@ module Decidim
           root to: "direct_verifications#index"
         end
 
-        initializer "decidim_direct_verifications.admin_assets" do |app|
-          app.config.assets.precompile += %w(
-            direct_verifications_admin_manifest.js
-            direct_verifications_admin_manifest.css
-          )
+        initializer "decidim_notify.webpacker.assets_path" do
+          Decidim.register_assets_path File.expand_path("app/packs", root)
         end
       end
     end

data/lib/decidim/direct_verifications/version.rb

@@ -3,8 +3,8 @@
 module Decidim
   # This holds the decidim-direct_verifications version.
   module DirectVerifications
-    VERSION = "1.0"
-    DECIDIM_VERSION = "0.24.3"
-    MIN_DECIDIM_VERSION = ">= 0.23.0"
+    VERSION = "1.1"
+    DECIDIM_VERSION = "0.26.0"
+    MIN_DECIDIM_VERSION = ">= 0.25.0"
   end
 end

data/package.json

@@ -0,0 +1,192 @@
+{
+  "name": "decidim-verifications-direct_verifications",
+  "version": "1.1.0",
+  "description": "A tool for Decidim that allows to track time spent by volunteers doing any arbitrary task",
+  "scripts": {
+    "lint": "eslint -c .eslintrc.json --ext .js app/packs/",
+    "lint-fix": "eslint -c .eslintrc.json --ext .js app/packs/ --fix",
+    "stylelint": "stylelint **/*.scss",
+    "stylelint-fix": "stylelint **/*.scss --fix"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/Platoniq/decidim-verifications-direct_verifications.git"
+  },
+  "keywords": [
+    "decidim"
+  ],
+  "author": "ivan@platoniq.net",
+  "license": "AGPL-3.0-or-later",
+  "bugs": {
+    "url": "https://github.com/Platoniq/decidim-verifications-direct_verifications/issues"
+  },
+  "homepage": "https://github.com/Platoniq/decidim-verifications-direct_verifications#readme",
+  "stylelint": {
+    "rules": {
+      "at-rule-empty-line-before": [
+        "always",
+        {
+          "except": [
+            "blockless-after-same-name-blockless",
+            "first-nested"
+          ],
+          "ignore": [
+            "after-comment"
+          ],
+          "ignoreAtRules": [
+            "else"
+          ]
+        }
+      ],
+      "at-rule-name-case": "lower",
+      "at-rule-semicolon-newline-after": "always",
+      "block-closing-brace-empty-line-before": "never",
+      "block-closing-brace-newline-after": "always",
+      "block-closing-brace-newline-before": "always-multi-line",
+      "block-closing-brace-space-before": "always-single-line",
+      "block-no-empty": true,
+      "block-opening-brace-newline-after": "always-multi-line",
+      "block-opening-brace-space-after": "always-single-line",
+      "block-opening-brace-space-before": "always",
+      "color-hex-case": "lower",
+      "color-hex-length": "short",
+      "color-no-invalid-hex": true,
+      "comment-empty-line-before": [
+        "always",
+        {
+          "except": [
+            "first-nested"
+          ],
+          "ignore": [
+            "stylelint-commands"
+          ]
+        }
+      ],
+      "comment-no-empty": true,
+      "comment-whitespace-inside": "always",
+      "custom-property-empty-line-before": [
+        "always",
+        {
+          "except": [
+            "after-custom-property",
+            "first-nested"
+          ],
+          "ignore": [
+            "after-comment",
+            "inside-single-line-block"
+          ]
+        }
+      ],
+      "declaration-bang-space-after": "never",
+      "declaration-bang-space-before": "always",
+      "declaration-block-no-duplicate-properties": [
+        true,
+        {
+          "ignore": [
+            "consecutive-duplicates-with-different-values"
+          ]
+        }
+      ],
+      "declaration-block-no-redundant-longhand-properties": true,
+      "declaration-block-no-shorthand-property-overrides": true,
+      "declaration-block-semicolon-newline-after": "always-multi-line",
+      "declaration-block-semicolon-space-after": "always-single-line",
+      "declaration-block-semicolon-space-before": "never",
+      "declaration-block-single-line-max-declarations": 1,
+      "declaration-block-trailing-semicolon": "always",
+      "declaration-colon-newline-after": "always-multi-line",
+      "declaration-colon-space-after": "always-single-line",
+      "declaration-colon-space-before": "never",
+      "declaration-empty-line-before": [
+        "always",
+        {
+          "except": [
+            "after-declaration",
+            "first-nested"
+          ],
+          "ignore": [
+            "after-comment",
+            "inside-single-line-block"
+          ]
+        }
+      ],
+      "function-calc-no-unspaced-operator": true,
+      "function-comma-newline-after": "always-multi-line",
+      "function-comma-space-after": "always-single-line",
+      "function-comma-space-before": "never",
+      "function-linear-gradient-no-nonstandard-direction": true,
+      "function-max-empty-lines": 0,
+      "function-name-case": "lower",
+      "function-parentheses-newline-inside": "always-multi-line",
+      "function-parentheses-space-inside": "never-single-line",
+      "function-whitespace-after": "always",
+      "indentation": 2,
+      "keyframe-declaration-no-important": true,
+      "length-zero-no-unit": true,
+      "max-empty-lines": 1,
+      "media-feature-colon-space-after": "always",
+      "media-feature-colon-space-before": "never",
+      "media-feature-name-case": "lower",
+      "media-feature-name-no-unknown": true,
+      "media-feature-parentheses-space-inside": "never",
+      "media-feature-range-operator-space-after": "always",
+      "media-feature-range-operator-space-before": "always",
+      "media-query-list-comma-newline-after": "always-multi-line",
+      "media-query-list-comma-space-after": "always-single-line",
+      "media-query-list-comma-space-before": "never",
+      "no-empty-source": true,
+      "no-eol-whitespace": true,
+      "no-extra-semicolons": true,
+      "no-invalid-double-slash-comments": true,
+      "no-missing-end-of-source-newline": true,
+      "number-leading-zero": "never",
+      "number-no-trailing-zeros": true,
+      "property-case": "lower",
+      "property-no-unknown": true,
+      "rule-empty-line-before": [
+        "always-multi-line",
+        {
+          "except": [
+            "first-nested"
+          ],
+          "ignore": [
+            "after-comment"
+          ]
+        }
+      ],
+      "selector-attribute-brackets-space-inside": "never",
+      "selector-attribute-operator-space-after": "never",
+      "selector-attribute-operator-space-before": "never",
+      "selector-combinator-space-after": "always",
+      "selector-combinator-space-before": "always",
+      "selector-descendant-combinator-no-non-space": true,
+      "selector-list-comma-newline-after": "always",
+      "selector-list-comma-space-before": "never",
+      "selector-max-empty-lines": 0,
+      "selector-pseudo-class-case": "lower",
+      "selector-pseudo-class-no-unknown": true,
+      "selector-pseudo-class-parentheses-space-inside": "never",
+      "selector-pseudo-element-case": "lower",
+      "selector-pseudo-element-colon-notation": "double",
+      "selector-pseudo-element-no-unknown": true,
+      "selector-type-case": "lower",
+      "selector-type-no-unknown": true,
+      "shorthand-property-no-redundant-values": true,
+      "string-no-newline": true,
+      "unit-case": "lower",
+      "unit-no-unknown": true,
+      "value-list-comma-newline-after": "always-multi-line",
+      "value-list-comma-space-after": "always-single-line",
+      "value-list-comma-space-before": "never",
+      "value-list-max-empty-lines": 0
+    }
+  },
+  "devDependencies": {
+    "eslint": "^7.32.0",
+    "eslint": "^7.25.0",
+    "eslint-config-prettier": "^8.2.0",
+    "eslint-config-standard": "^11.0.0",
+    "eslint-plugin-import": "^2.22.0",
+    "stylelint": "13.11.0"
+  }
+}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-direct_verifications
 version: !ruby/object:Gem::Version
-  version: '1.0'
+  version: '1.1'
 platform: ruby
 authors:
 - Ivan Vergés
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-09 00:00:00.000000000 Z
+date: 2022-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.25.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.25.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.25.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.23.0
+        version: 0.25.0
 description: Provides a verification method that also registers users directly in
   the platform. Can be used to mass verificate user with other verification handlers
 email:
@@ -49,10 +49,6 @@ files:
 - LICENSE-AGPLv3.txt
 - README.md
 - Rakefile
-- app/assets/config/direct_verifications_admin_manifest.css
-- app/assets/config/direct_verifications_admin_manifest.js
-- app/assets/javascripts/decidim/direct_verifications/verification/admin/direct_verifications_admin.js.es6
-- app/assets/stylesheets/decidim/direct_verifications/authorizations.scss
 - app/commands/decidim/direct_verifications/verification/confirm_user_authorization.rb
 - app/commands/decidim/direct_verifications/verification/create_import.rb
 - app/commands/decidim/direct_verifications/verification/destroy_user_authorization.rb
@@ -70,6 +66,10 @@ files:
 - app/jobs/decidim/direct_verifications/revoke_users_job.rb
 - app/mailers/decidim/direct_verifications/import_mailer.rb
 - app/mailers/decidim/direct_verifications/stats.rb
+- app/packs/entrypoints/decidim_direct_verifications.js
+- app/packs/entrypoints/decidim_direct_verifications.scss
+- app/packs/src/decidim/direct_verifications/admin/checkboxes.js
+- app/packs/stylesheets/decidim/direct_verifications/admin/authorizations.scss
 - app/views/decidim/direct_verifications/import_mailer/finished_processing.html.erb
 - app/views/decidim/direct_verifications/import_mailer/finished_processing.text.erb
 - app/views/decidim/direct_verifications/verification/admin/authorizations/index.html.erb
@@ -78,6 +78,7 @@ files:
 - app/views/decidim/direct_verifications/verification/admin/stats/index.html.erb
 - app/views/devise/mailer/direct_invite.html.erb
 - app/views/devise/mailer/direct_invite.text.erb
+- config/assets.rb
 - config/initializers/mail_previews.rb
 - config/locales/ca.yml
 - config/locales/cs.yml
@@ -103,6 +104,7 @@ files:
 - lib/decidim/direct_verifications/verification/engine.rb
 - lib/decidim/direct_verifications/verification/workflow.rb
 - lib/decidim/direct_verifications/version.rb
+- package.json
 homepage: https://github.com/Platoniq/decidim-verifications-direct_verifications
 licenses:
 - AGPL-3.0
@@ -122,7 +124,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A decidim batch direct registration and verification module

data/app/assets/config/direct_verifications_admin_manifest.css

@@ -1,3 +0,0 @@
-/*
- *= link decidim/direct_verifications/authorizations.css
- */

data/app/assets/config/direct_verifications_admin_manifest.js

@@ -1 +0,0 @@
-//= link decidim/direct_verifications/verification/admin/direct_verifications_admin.js

data/app/assets/javascripts/decidim/direct_verifications/verification/admin/direct_verifications_admin.js.es6

@@ -1,7 +0,0 @@
-// = require_self
-
-$(() => {
-  $('[type="checkbox"]#register').change(function () {
-      $(this).closest('label').find('.callout').toggleClass('hide', !$(this).prop('checked'))
-  })
-})