decidim-direct_verifications 1.0.2 → 1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42d98e0b62840fec678713b3538cc6c6bc10c1a76e813e02e0ce6a848b65924e
-  data.tar.gz: 811a6783064250e01d8bed38e68495a341774ce7a86c1927e65719263c465f6a
+  metadata.gz: e42a469a3e54d28a703c6565abdb73aa70d33c540882e8737c0e92592d18d238
+  data.tar.gz: 1c2ff4b72713ad26ba30b350efbcc31840fa42aac1f171faa32f0b1b64596d22
 SHA512:
-  metadata.gz: 96b417c297794fa7c6e8cef31d7627b0cfe961e10005a3f6eaa57a42f46830d408f021f850ff949daa1756884cb814985af6f0a789c566403faca55d80f4804b
-  data.tar.gz: b0ca0ef2dc79844b1d3d1ff48284debe43c32d0f581fb33ef868d9a9707f46ff82dc30914670c1ce0a8ad9e7e5d27dde577bb05f2327df2f489a7336643af90b
+  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

@@ -15,7 +15,6 @@ module Decidim
         def call
           return broadcast(:invalid) unless form.valid?
 
-          save_or_upload_file!
           case action
           when :register
             register_users_async(remove_file: true)
@@ -36,20 +35,19 @@ module Decidim
         attr_reader :form, :file, :organization, :user, :action
 
         def register_users_async(options = {})
-          RegisterUsersJob.perform_later(secure_name, organization, user, form.authorization_handler, options)
+          RegisterUsersJob.perform_later(blob.id, organization, user, form.authorization_handler, options)
         end
 
         def revoke_users_async(options = {})
-          RevokeUsersJob.perform_later(secure_name, organization, user, form.authorization_handler, options)
+          RevokeUsersJob.perform_later(blob.id, organization, user, form.authorization_handler, options)
         end
 
         def authorize_users_async(options = {})
-          AuthorizeUsersJob.perform_later(secure_name, organization, user, form.authorization_handler, options)
+          AuthorizeUsersJob.perform_later(blob.id, organization, user, form.authorization_handler, options)
         end
 
-        def save_or_upload_file!
-          file.instance_variable_set(:@original_filename, secure_name)
-          CsvUploader.new(organization).store!(file)
+        def blob
+          @blob ||= ActiveStorage::Blob.create_and_upload!(io: file, filename: secure_name)
         end
 
         def secure_name

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

@@ -10,8 +10,8 @@ module Decidim
     class BaseImportJob < ApplicationJob
       queue_as :default
 
-      def perform(filename, organization, current_user, authorization_handler, options = {})
-        @filename = filename
+      def perform(blob_id, organization, current_user, authorization_handler, options = {})
+        @blob = ActiveStorage::Blob.find(blob_id)
         @organization = organization
         @current_user = current_user
         @authorization_handler = authorization_handler
@@ -20,7 +20,7 @@ module Decidim
           @emails = Parsers::MetadataParser.new(userslist).to_h
           @instrumenter = Instrumenter.new(current_user)
 
-          Rails.logger.info "BaseImportJob: Processing file #{filename}"
+          Rails.logger.info "BaseImportJob: Processing file #{@blob.filename}"
           process_users
           send_email_notification
         rescue StandardError => e
@@ -31,14 +31,10 @@ module Decidim
 
       private
 
-      attr_reader :uploader, :filename, :emails, :organization, :current_user, :instrumenter, :authorization_handler
+      attr_reader :blob, :emails, :organization, :current_user, :instrumenter, :authorization_handler
 
       def userslist
-        return @userslist if @userslist
-
-        @uploader = CsvUploader.new(organization)
-        @uploader.retrieve_from_store!(filename)
-        @userslist = @uploader.file.read.force_encoding("UTF-8")
+        @userslist ||= blob.download.force_encoding("UTF-8")
       end
 
       def send_email_notification
@@ -51,7 +47,7 @@ module Decidim
       end
 
       def remove_file!
-        uploader.remove!
+        blob.purge
       end
     end
   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">

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/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.2"
-    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.2
+  version: '1.1'
 platform: ruby
 authors:
 - Ivan Vergés
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-04 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,7 +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/uploaders/decidim/direct_verifications/csv_uploader.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
@@ -79,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
@@ -104,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

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'))
-  })
-})

data/app/uploaders/decidim/direct_verifications/csv_uploader.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module DirectVerifications
-    class CsvUploader < ApplicationUploader
-      # Override the directory where uploaded files will be stored.
-      def store_dir
-        default_path = "uploads/direct-verifications/"
-
-        return File.join(Decidim.base_uploads_path, default_path) if Decidim.base_uploads_path.present?
-
-        default_path
-      end
-    end
-  end
-end