decidim-action_delegator 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c49c4f035221be196d24b71ff42164efc9df22276522bcfc551fb786cb6ec06f
-  data.tar.gz: e25c82f314a0aa80f42dfba62ecc9967bb5118accb0c270113b629a92ae79e1b
+  metadata.gz: e5d669c45c0467b359830db39ef5ad435bc1a3f0a3f7f2663f74dac3ad6d3fab
+  data.tar.gz: 5011d0f2b42b00b28c69d38f91b15686f8072d29daf27dd1768102c01ff72e0b
 SHA512:
-  metadata.gz: 40f9793f2b9448286f87a0444b17e782b91a8e8011b2c458ace651710ede9c4390682112654b9ea084589b200486b0c3c9a6816fc05363470b088f2d8b7d0f86
-  data.tar.gz: b5366fefda7cfef045fe1479d5c59e2fd3887d78c10844d0f9756e04a3c014b8299c717797ac49150415e37be1d45b4b65705da983faa66adc9214c52bb44a49
+  metadata.gz: 82cb39a4606b7618df911928ced137624d41f03bb7cef98001ec55a2774a10bd0dac9ae79ce37a3dac6d88d36c98c1063009e050b77092f3707a8f9e24146bed
+  data.tar.gz: ac71746dc2894a410fc8d982196136074df69e9e2e3f4730be89622eae60a828fd13a153bb974875cec698b95065f8f0e464a90beec3084064e7a7617557dbc3

data/README.md

@@ -1,6 +1,6 @@
 # Decidim::ActionDelegator
 
-![[CI] Build](https://github.com/coopdevs/decidim-module-action_delegator/workflows/%5BCI%5D%20Build/badge.svg)
+[![Test](https://github.com/coopdevs/decidim-module-action_delegator/actions/workflows/test.yml/badge.svg)](https://github.com/coopdevs/decidim-module-action_delegator/actions/workflows/test.yml)
 [![Maintainability](https://api.codeclimate.com/v1/badges/6ec3c39e8dc2075808e1/maintainability)](https://codeclimate.com/github/coopdevs/decidim-module-action_delegator/maintainability)
 [![Codecov](https://codecov.io/gh/coopdevs/decidim-module-action_delegator/branch/master/graph/badge.svg)](https://codecov.io/gh/coopdevs/decidim-module-action_delegator)
 
@@ -188,7 +188,11 @@ To run the tests run the following in the gem development path:
 
 ```bash
 bundle
-DATABASE_USERNAME=<username> DATABASE_PASSWORD=<password> bundle exec rake test_app
+DATABASE_USERNAME=<username> DATABASE_PASSWORD=<password> bundle exec rake decidim:generate_external_test_app
+cd spec/decidim_dummy_app
+bundle exec rails decidim_action_delegator:install:migrations
+RAILS_ENV=test bundle exec rails db:migrate
+cd -
 DATABASE_USERNAME=<username> DATABASE_PASSWORD=<password> bundle exec rspec
 ```
 

data/app/packs/entrypoints/decidim_action_delegator.scss

@@ -0,0 +1 @@
+@import "stylesheets/decidim/action_delegator/questions.scss"

data/app/packs/entrypoints/decidim_action_delegator_admin_action_delegator_js.js

@@ -0,0 +1 @@
+import "src/decidim/action_delegator/admin/action_delegator.js.es6";

data/app/packs/entrypoints/decidim_action_delegator_questions.js

@@ -0,0 +1,3 @@
+require.context("../images", true)
+
+import "entrypoints/decidim_action_delegator.scss";

data/app/packs/entrypoints/decidim_action_delegator_questions_js.js

@@ -0,0 +1 @@
+import "src/decidim/action_delegator/questions.js.es6";

data/app/views/decidim/consultations/consultations/show.html.erb

@@ -7,7 +7,7 @@ edit_link(
 )
 %>
 
-<%= stylesheet_link_tag "decidim/action_delegator/questions" %>
+<%= stylesheet_pack_tag "decidim_action_delegator_questions" %>
 
 <%= render partial: "consultation_details", locals: { consultation: current_consultation } %>
 <%= render partial: "highlighted_questions", locals: { consultation: current_consultation } %>

data/app/views/decidim/consultations/questions/_vote_button.html.erb

@@ -1,5 +1,5 @@
-<%= stylesheet_link_tag "decidim/action_delegator/questions" %>
-<%= javascript_include_tag "decidim/action_delegator/questions" %>
+<%= stylesheet_pack_tag "decidim_action_delegator_questions" %>
+<%= javascript_pack_tag "decidim_action_delegator_questions_js" %>
 
 <div class="row column">
   <div class="callout hide" id="vote-result-callout" data-closable data-title-ok="<%= t("question_votes.create.title_success", scope: "decidim.consultations") %>" data-message-ok="<%= t("question_votes.create.success", scope: "decidim.consultations") %>" data-title-ko="<%= t("question_votes.create.title_error", scope: "decidim.consultations") %>" data-message-ko="<%= t("question_votes.create.error", scope: "decidim.consultations") %>">
@@ -103,5 +103,4 @@
 <%= render partial: "decidim/consultations/questions/vote_modal", locals: { question: question } %>
 <%= render partial: "decidim/consultations/questions/vote_modal_confirm", locals: { question: question } %>
 <%= render partial: "decidim/action_delegator/delegations_modal", locals: { question: question } %>
-<%= javascript_include_tag "decidim/consultations/utils" %>
-<%= javascript_include_tag "decidim/consultations/vote_dialog" %>
+<%= javascript_pack_tag "decidim_consultations" %>

data/config/assets.rb

@@ -0,0 +1,42 @@
+# 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_action_delegator_questions: "#{base_path}/app/packs/entrypoints/decidim_action_delegator_questions.js",
+  decidim_action_delegator_questions_js: "#{base_path}/app/packs/entrypoints/decidim_action_delegator_questions_js.js",
+  decidim_action_delegator_admin_action_delegator_js: "#{base_path}/app/packs/entrypoints/decidim_action_delegator_admin_action_delegator_js.js"
+)
+
+# If you want to import some extra SCSS files in the Decidim main SCSS file
+# without adding any extra stylesheet inclusion tags, you can use the following
+# method to register the stylesheet import for the main application.
+# Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/foo/app")
+
+# If you want to do the same but include the SCSS file for the admin panel's
+# main SCSS file, you can use the following method.
+# Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/foo/admin", group: :admin)
+
+# If you want to override some SCSS variables/settings for Foundation from the
+# module, you can add the following registered import.
+# Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/foo/settings", type: :settings)
+
+# If you want to do the same but override the SCSS variables of the admin
+# panel's styles, you can use the following method.
+# Decidim::Webpacker.register_stylesheet_import("stylesheets/decidim/foo/admin_settings", type: :settings, group: :admin)

data/config/locales/ca.yml

@@ -104,3 +104,7 @@ ca:
     decidim:
       user_profile:
         vote_delegations: Delegacions de vot
+      admin:
+        question:
+          attachments: Adjunts
+          categories: Categories

data/config/locales/en.yml

@@ -105,5 +105,9 @@ en:
         name: Delegations Verifier
   layouts:
     decidim:
+      admin:
+        question:
+          attachments: Attachments
+          categories: Categories
       user_profile:
         vote_delegations: Vote delegations

data/config/locales/es.yml

@@ -104,3 +104,7 @@ es:
     decidim:
       user_profile:
         vote_delegations: Vote delegations
+      admin:
+        question:
+          attachments: Adjuntos
+          categories: Categorías

data/lib/decidim/action_delegator/admin_engine.rb

@@ -30,10 +30,6 @@ module Decidim
         root to: "delegations#index"
       end
 
-      initializer "decidim_action_delegator.admin_assets" do |app|
-        app.config.assets.precompile += %w(admin/decidim_action_delegator_manifest.js admin/decidim_action_delegator_manifest.css)
-      end
-
       def load_seed
         nil
       end

data/lib/decidim/action_delegator/engine.rb

@@ -32,8 +32,14 @@ module Decidim
         Decidim::Verifications::Sms::AuthorizationsController.include(Decidim::ActionDelegator::Verifications::Sms::AuthorizationsControllerOverride)
       end
 
-      initializer "decidim_action_delegator.assets" do |app|
-        app.config.assets.precompile += %w(decidim_action_delegator_manifest.js decidim_action_delegator_manifest.css)
+      initializer "decidim_action_delegator.layout_helper" do |_app|
+        # activate Decidim LayoutHelper for the overriden views
+        ::Decidim::Admin::ApplicationController.helper ::Decidim::LayoutHelper
+        ::Decidim::ApplicationController.helper ::Decidim::LayoutHelper
+      end
+
+      initializer "decidim_action_delegator.webpacker.assets_path" do |_app|
+        Decidim.register_assets_path File.expand_path("app/packs", root)
       end
 
       initializer "decidim.user_menu" do

data/lib/decidim/action_delegator/version.rb

@@ -3,8 +3,8 @@
 module Decidim
   # This holds the decidim-action_delegator version.
   module ActionDelegator
-    MIN_DECIDIM_VERSION = ">= 0.24.0"
-    MAX_DECIDIM_VERSION = "<= 0.24.3"
-    VERSION = "0.4.1"
+    MIN_DECIDIM_VERSION = ">= 0.25.0"
+    MAX_DECIDIM_VERSION = "< 0.26.0"
+    VERSION = "0.5.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-action_delegator
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Pau Pérez Fabregat
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-01 00:00:00.000000000 Z
+date: 2022-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -17,60 +17,60 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.24.0
-    - - "<="
+        version: 0.25.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.24.0
-    - - "<="
+        version: 0.25.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.26.0
 - !ruby/object:Gem::Dependency
   name: decidim-consultations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.24.0
-    - - "<="
+        version: 0.25.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.24.0
-    - - "<="
+        version: 0.25.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.26.0
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.24.0
-    - - "<="
+        version: 0.25.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.26.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.24.0
-    - - "<="
+        version: 0.25.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.26.0
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
@@ -105,20 +105,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.24.0
-    - - "<="
+        version: 0.25.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.26.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.24.0
-    - - "<="
+        version: 0.25.0
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.26.0
 description: A tool for Decidim that provides extended functionalities for cooperatives
   and allows delegated voting.
 email:
@@ -131,14 +131,6 @@ files:
 - LICENSE-AGPLv3.txt
 - README.md
 - Rakefile
-- app/assets/config/admin/decidim_action_delegator_manifest.css
-- app/assets/config/admin/decidim_action_delegator_manifest.js
-- app/assets/config/decidim_action_delegator_manifest.css
-- app/assets/config/decidim_action_delegator_manifest.js
-- app/assets/images/decidim/action_delegator/icon.svg
-- app/assets/javascripts/decidim/action_delegator/admin/action_delegator.js.es6
-- app/assets/javascripts/decidim/action_delegator/questions.js.es6
-- app/assets/stylesheets/decidim/action_delegator/questions.scss
 - app/commands/decidim/action_delegator/admin/create_delegation.rb
 - app/commands/decidim/action_delegator/consultations/multiple_vote_question_override.rb
 - app/commands/decidim/action_delegator/consultations/vote_question_override.rb
@@ -169,6 +161,13 @@ files:
 - app/models/decidim/action_delegator/setting.rb
 - app/models/decidim/action_delegator/unversioned_vote.rb
 - app/models/decidim/action_delegator/whodunnit_vote.rb
+- app/packs/entrypoints/decidim_action_delegator.scss
+- app/packs/entrypoints/decidim_action_delegator_admin_action_delegator_js.js
+- app/packs/entrypoints/decidim_action_delegator_questions.js
+- app/packs/entrypoints/decidim_action_delegator_questions_js.js
+- app/packs/src/decidim/action_delegator/admin/action_delegator.js.es6
+- app/packs/src/decidim/action_delegator/questions.js.es6
+- app/packs/stylesheets/decidim/action_delegator/questions.scss
 - app/permissions/decidim/action_delegator/consultations_permissions_extension.rb
 - app/permissions/decidim/action_delegator/permissions.rb
 - app/presenters/decidim/action_delegator/admin/consultation_presenter.rb
@@ -220,6 +219,7 @@ files:
 - app/views/layouts/decidim/admin/consultation.html.erb
 - app/views/layouts/decidim/admin/question.html.erb
 - app/views/layouts/decidim/admin/users.html.erb
+- config/assets.rb
 - config/i18n-tasks.yml
 - config/locales/ca.yml
 - config/locales/cs.yml
@@ -260,7 +260,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A Decidim ActionDelegator module

data/app/assets/config/admin/decidim_action_delegator_manifest.js

@@ -1 +0,0 @@
-//= link decidim/action_delegator/admin/action_delegator.js

data/app/assets/config/decidim_action_delegator_manifest.css

@@ -1,3 +0,0 @@
-/*
- *= link decidim/action_delegator/questions.css
- */

data/app/assets/config/decidim_action_delegator_manifest.js

@@ -1,2 +0,0 @@
-//= link decidim/action_delegator/admin/action_delegator.js
-//= link decidim/action_delegator/questions.js

data/app/assets/images/decidim/action_delegator/icon.svg

@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 35 35"><path d="M17.5 35A17.5 17.5 0 1 1 35 17.5 17.52 17.52 0 0 1 17.5 35zm0-33.06A15.56 15.56 0 1 0 33.06 17.5 15.57 15.57 0 0 0 17.5 1.94zm9.5 13.7H8a1 1 0 0 1 0-1.94h19a1 1 0 0 1 0 1.94zm0 3.68H8a1 1 0 0 1 0-1.94h19a1 1 0 0 1 0 1.94zM22.26 23H8a1 1 0 0 1 0-1.94h14.26a1 1 0 0 1 0 1.94z"/></svg>