decidim-templates 0.27.6 → 0.28.0.rc4

data/db/seeds.rb

@@ -6,7 +6,7 @@ if !Rails.env.production? || ENV.fetch("SEED", nil)
   require "decidim/faker/localized"
 
   # Since we usually migrate and seed in the same process, make sure
-  # that we don't have invalid or cached information after a migration.
+  # that we do not have invalid or cached information after a migration.
   decidim_tables = ActiveRecord::Base.connection.tables.select do |table|
     table.starts_with?("decidim_")
   end
@@ -17,7 +17,7 @@ if !Rails.env.production? || ENV.fetch("SEED", nil)
   organization = Decidim::Organization.first
 
   questionnaire_template = Decidim::Templates::Template.create!(
-    organization: organization,
+    organization:,
     name: Decidim::Faker::Localized.sentence(word_count: 2),
     description: Decidim::Faker::Localized.paragraph
   )
@@ -35,7 +35,7 @@ if !Rails.env.production? || ENV.fetch("SEED", nil)
 
   %w(short_answer long_answer).each_with_index do |text_question_type, index|
     Decidim::Forms::Question.create!(
-      questionnaire: questionnaire,
+      questionnaire:,
       body: Decidim::Faker::Localized.paragraph,
       question_type: text_question_type,
       position: index
@@ -44,7 +44,7 @@ if !Rails.env.production? || ENV.fetch("SEED", nil)
 
   %w(single_option multiple_option).each_with_index do |multiple_choice_question_type, index|
     question = Decidim::Forms::Question.create!(
-      questionnaire: questionnaire,
+      questionnaire:,
       body: Decidim::Faker::Localized.paragraph,
       question_type: multiple_choice_question_type,
       position: index + 2
@@ -56,7 +56,7 @@ if !Rails.env.production? || ENV.fetch("SEED", nil)
 
     question.display_conditions.create!(
       condition_question: questionnaire.questions.find_by(position: question.position - 2),
-      question: question,
+      question:,
       condition_type: :answered,
       mandatory: true
     )
@@ -64,7 +64,7 @@ if !Rails.env.production? || ENV.fetch("SEED", nil)
 
   %w(matrix_single matrix_multiple).each do |matrix_question_type|
     question = Decidim::Forms::Question.create!(
-      questionnaire: questionnaire,
+      questionnaire:,
       body: Decidim::Faker::Localized.paragraph,
       question_type: matrix_question_type
     )

data/lib/decidim/templates/admin_engine.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require "decidim/templates/menu"
+
 module Decidim
   module Templates
     # This is the engine that runs on the public interface of `Templates`.
@@ -10,6 +12,15 @@ module Decidim
       paths["lib/tasks"] = nil
 
       routes do
+        resources :proposal_answer_templates do
+          member do
+            post :copy
+          end
+          collection do
+            get :fetch
+          end
+        end
+
         ## Routes for Questionnaire Templates
         resources :questionnaire_templates do
           member do
@@ -24,32 +35,26 @@ module Decidim
             get :preview # To provide a preview for the template in the object creation view
           end
         end
+        resources :block_user_templates do
+          member do
+            post :copy
+          end
+          collection do
+            get :fetch
+          end
+        end
 
         get "/questionnaire_template/questionnaire/answer_options", to: "questionnaires#answer_options", as: "answer_options_template"
 
         root to: "questionnaire_templates#index"
       end
 
-      initializer "decidim_participatory_processes.admin_participatory_processes_menu" do
-        Decidim.menu :admin_template_types_menu do |menu|
-          template_types.each_pair do |name, url|
-            menu.add_item name, name, url,
-                          if: allowed_to?(:index, :templates),
-                          active: is_active_link?(url)
-          end
-        end
+      initializer "decidim_templates_admin.participatory_processes_menu" do
+        Decidim::Templates::Menu.register_admin_template_types_menu!
       end
 
       initializer "decidim_templates_admin.menu" do
-        Decidim.menu :admin_menu do |menu|
-          menu.add_item :questionnaire_templates,
-                        I18n.t("menu.templates", scope: "decidim.admin", default: "Templates"),
-                        decidim_admin_templates.questionnaire_templates_path,
-                        icon_name: "document",
-                        position: 12,
-                        active: :inclusive,
-                        if: allowed_to?(:read, :templates)
-        end
+        Decidim::Templates::Menu.register_admin_menu!
       end
 
       def load_seed

data/lib/decidim/templates/engine.rb

@@ -15,6 +15,10 @@ module Decidim
         # root to: "templates#index"
       end
 
+      initializer "decidim_templates.register_icons" do
+        Decidim.icons.register(name: "user-forbid-line", icon: "user-forbid-line", category: "system", description: "", engine: :templates)
+      end
+
       initializer "decidim_templates.webpacker.assets_path" do
         Decidim.register_assets_path File.expand_path("app/packs", root)
       end

data/lib/decidim/templates/menu.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Templates
+    class Menu
+      def self.register_admin_template_types_menu!
+        Decidim.menu :admin_template_types_menu do |menu|
+          menu.add_item :questionnaires,
+                        I18n.t("template_types.questionnaires", scope: "decidim.templates"),
+                        decidim_admin_templates.questionnaire_templates_path,
+                        icon_name: "clipboard-line",
+                        if: allowed_to?(:index, :templates),
+                        active: (
+                          is_active_link?(decidim_admin_templates.questionnaire_templates_path) ||
+                            is_active_link?(decidim_admin_templates.root_path)
+                        ) && !is_active_link?(decidim_admin_templates.block_user_templates_path) &&
+                                !is_active_link?(decidim_admin_templates.proposal_answer_templates_path)
+
+          menu.add_item :user_reports,
+                        I18n.t("template_types.block_user", scope: "decidim.templates"),
+                        decidim_admin_templates.block_user_templates_path,
+                        icon_name: "user-forbid-line",
+                        if: allowed_to?(:index, :templates),
+                        active: is_active_link?(decidim_admin_templates.block_user_templates_path)
+
+          menu.add_item :proposal_answers,
+                        I18n.t("template_types.proposal_answer_templates", scope: "decidim.templates"),
+                        decidim_admin_templates.proposal_answer_templates_path,
+                        icon_name: "file-copy-line",
+                        if: allowed_to?(:index, :templates),
+                        active: is_active_link?(decidim_admin_templates.proposal_answer_templates_path)
+        end
+      end
+
+      def self.register_admin_menu!
+        Decidim.menu :admin_menu do |menu|
+          menu.add_item :questionnaire_templates,
+                        I18n.t("menu.templates", scope: "decidim.admin", default: "Templates"),
+                        decidim_admin_templates.questionnaire_templates_path,
+                        icon_name: "file-copy-line",
+                        position: 12,
+                        active: is_active_link?(decidim_admin_templates.root_path),
+                        if: allowed_to?(:read, :templates)
+        end
+      end
+    end
+  end
+end

data/lib/decidim/templates/test/factories.rb

@@ -5,35 +5,43 @@ require "decidim/dev"
 
 FactoryBot.define do
   factory :template, class: "Decidim::Templates::Template" do
-    transient do
-      skip_injection { false }
-    end
     organization
-    name { generate_localized_title(:template_name, skip_injection: skip_injection) }
-    description { generate_localized_title(:template_description, skip_injection: skip_injection) }
-    templatable { build(:dummy_resource, skip_injection: skip_injection) }
+    name { Decidim::Faker::Localized.sentence }
+    description { Decidim::Faker::Localized.sentence }
+    target { "generic-template" }
+    templatable { build(:dummy_resource) }
+
+    trait :user_block do
+      templatable { organization }
+      target { :user_block }
+    end
+
+    trait :proposal_answer do
+      templatable { organization }
+      target { :proposal_answer }
+      field_values { { internal_state: :accepted } }
+    end
 
     ## Questionnaire templates
     factory :questionnaire_template do
-      transient do
-        skip_injection { false }
-      end
+      target { "questionnaire" }
+
       trait :with_questions do
-        after(:create) do |template, evaluator|
-          template.templatable = create(:questionnaire, :with_questions, questionnaire_for: template, skip_injection: evaluator.skip_injection)
+        after(:create) do |template|
+          template.templatable = create(:questionnaire, :with_questions, questionnaire_for: template)
           template.save!
         end
       end
 
       trait :with_all_questions do
-        after(:create) do |template, evaluator|
-          template.templatable = create(:questionnaire, :with_all_questions, questionnaire_for: template, skip_injection: evaluator.skip_injection)
+        after(:create) do |template|
+          template.templatable = create(:questionnaire, :with_all_questions, questionnaire_for: template)
           template.save!
         end
       end
 
-      after(:create) do |template, evaluator|
-        template.templatable = create(:questionnaire, questionnaire_for: template, skip_injection: evaluator.skip_injection)
+      after(:create) do |template|
+        template.templatable = create(:questionnaire, questionnaire_for: template)
         template.save!
       end
     end

data/lib/decidim/templates/test/shared_examples/copies_all_questionnaire_contents_examples.rb

@@ -31,7 +31,7 @@ shared_examples_for "copies all questionnaire contents" do
     end
 
     def check_answer_options(source_question, new_question)
-      expect(source_question.answer_options.size).to eq(new_question.answer_options.size)
+      expect(source_question.answer_options.count).to eq(new_question.answer_options.count)
 
       source_question.answer_options.each_with_index do |source_answer_option, idx|
         new_answer_option = new_question.answer_options[idx]
@@ -41,7 +41,7 @@ shared_examples_for "copies all questionnaire contents" do
     end
 
     def check_matrix_rows(source_question, new_question)
-      expect(source_question.matrix_rows.size).to eq(new_question.matrix_rows.size)
+      expect(source_question.matrix_rows.count).to eq(new_question.matrix_rows.count)
 
       source_question.matrix_rows.each_with_index do |source_matrix_row, idx|
         new_matrix_row = new_question.matrix_rows[idx]
@@ -52,7 +52,7 @@ shared_examples_for "copies all questionnaire contents" do
     end
 
     def check_display_conditions(source_display_conditions, new_display_conditions)
-      expect(source_display_conditions.size).to eq(new_display_conditions.size)
+      expect(source_display_conditions.count).to eq(new_display_conditions.count)
 
       source_display_conditions.each_with_index do |source_matrix_row, idx|
         new_matrix_row = new_display_conditions[idx]

data/lib/decidim/templates/test/shared_examples/uses_questionnaire_templates.rb

@@ -14,13 +14,13 @@ shared_examples_for "uses questionnaire templates" do |_questionnaire_for|
         )
       end
 
-      it "doesn't show the template selection screen" do
-        expect(page).to have_no_content("Choose template")
+      it "does not show the template selection screen" do
+        expect(page).not_to have_content("Choose template")
       end
     end
 
     context "when there are templates" do
-      let!(:templates) { create_list(:questionnaire_template, 6, :with_questions, skip_injection: true, organization: questionnaire.questionnaire_for.organization) }
+      let!(:templates) { create_list(:questionnaire_template, 6, :with_questions, organization: questionnaire.questionnaire_for.organization) }
       let(:template) { templates.first }
       let(:question) { template.templatable.questions.first }
 
@@ -32,8 +32,8 @@ shared_examples_for "uses questionnaire templates" do |_questionnaire_for|
           )
         end
 
-        it "doesn't show the template selection screen" do
-          expect(page).to have_no_content("Choose template")
+        it "does not show the template selection screen" do
+          expect(page).not_to have_content("Choose template")
         end
       end
 
@@ -74,7 +74,7 @@ shared_examples_for "uses questionnaire templates" do |_questionnaire_for|
   end
 
   describe "apply a template" do
-    let!(:templates) { create_list(:questionnaire_template, 6, :with_questions, skip_injection: true, organization: questionnaire.questionnaire_for.organization) }
+    let!(:templates) { create_list(:questionnaire_template, 6, :with_questions, organization: questionnaire.questionnaire_for.organization) }
     let(:template) { templates.first }
     let(:question) { template.templatable.questions.first }
     let(:questionnaire_question) { questionnaire.questions.first }
@@ -91,9 +91,11 @@ shared_examples_for "uses questionnaire templates" do |_questionnaire_for|
 
       select(template.name["en"], from: "select-template")
 
-      within ".create-from-template" do
-        find("*[type=submit]").click
+      within ".questionnaire-template-preview" do
+        expect(page).to have_content(template.templatable.title["en"])
       end
+
+      click_button "Create from template"
     end
 
     it "copies the template data to the questionnaire on submit" do

data/lib/decidim/templates/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-templates version.
   module Templates
     def self.version
-      "0.27.6"
+      "0.28.0.rc4"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-templates
 version: !ruby/object:Gem::Version
-  version: 0.27.6
+  version: 0.28.0.rc4
 platform: ruby
 authors:
 - Vera Rojman
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-04-30 00:00:00.000000000 Z
+date: 2023-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -16,84 +16,56 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.6
+        version: 0.28.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.6
+        version: 0.28.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.6
+        version: 0.28.0.rc4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.6
+        version: 0.28.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.6
+        version: 0.28.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.6
+        version: 0.28.0.rc4
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.6
+        version: 0.28.0.rc4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.27.6
-- !ruby/object:Gem::Dependency
-  name: decidim-participatory_processes
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.27.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.27.6
-- !ruby/object:Gem::Dependency
-  name: decidim-surveys
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.27.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.27.6
+        version: 0.28.0.rc4
 description: This module provides a solution to create templates for different Decidim
   models, such as Proposals and Questionnaires..
 email:
@@ -102,31 +74,56 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE-AGPLv3.txt
 - README.md
 - Rakefile
 - app/commands/decidim/templates/admin/apply_questionnaire_template.rb
+- app/commands/decidim/templates/admin/copy_proposal_answer_template.rb
 - app/commands/decidim/templates/admin/copy_questionnaire_template.rb
+- app/commands/decidim/templates/admin/copy_template.rb
+- app/commands/decidim/templates/admin/create_block_user_template.rb
+- app/commands/decidim/templates/admin/create_proposal_answer_template.rb
 - app/commands/decidim/templates/admin/create_questionnaire_template.rb
+- app/commands/decidim/templates/admin/create_template.rb
+- app/commands/decidim/templates/admin/destroy_questionnaire_template.rb
 - app/commands/decidim/templates/admin/destroy_template.rb
 - app/commands/decidim/templates/admin/questionnaire_copier.rb
+- app/commands/decidim/templates/admin/update_proposal_answer_template.rb
 - app/commands/decidim/templates/admin/update_template.rb
 - app/controllers/decidim/templates/admin/application_controller.rb
+- app/controllers/decidim/templates/admin/block_user_templates_controller.rb
 - app/controllers/decidim/templates/admin/concerns/templatable.rb
+- app/controllers/decidim/templates/admin/proposal_answer_templates_controller.rb
 - app/controllers/decidim/templates/admin/questionnaire_templates/questionnaires_controller.rb
 - app/controllers/decidim/templates/admin/questionnaire_templates_controller.rb
 - app/controllers/decidim/templates/application_controller.rb
+- app/forms/decidim/templates/admin/proposal_answer_template_form.rb
 - app/forms/decidim/templates/admin/template_form.rb
+- app/helpers/decidim/templates/admin/application_helper.rb
 - app/helpers/decidim/templates/application_helper.rb
 - app/models/concerns/decidim/templates/templatable.rb
 - app/models/decidim/templates/application_record.rb
 - app/models/decidim/templates/template.rb
 - app/packs/entrypoints/decidim_templates.js
 - app/packs/entrypoints/decidim_templates.scss
+- app/packs/entrypoints/decidim_templates_admin.js
 - app/packs/images/decidim/templates/decidim_templates.svg
+- app/packs/src/decidim/templates/admin/block_user_template_chooser.js
 - app/packs/src/decidim/templates/admin/choose_template.js
+- app/packs/src/decidim/templates/admin/proposal_answer_template_chooser.js
 - app/packs/stylesheets/decidim/templates/templates.scss
 - app/permissions/decidim/templates/admin/permissions.rb
 - app/presenters/decidim/templates/admin_log/template_presenter.rb
+- app/views/decidim/templates/admin/block_user_templates/_form.html.erb
+- app/views/decidim/templates/admin/block_user_templates/_template_chooser.html.erb
+- app/views/decidim/templates/admin/block_user_templates/edit.html.erb
+- app/views/decidim/templates/admin/block_user_templates/index.html.erb
+- app/views/decidim/templates/admin/block_user_templates/new.html.erb
+- app/views/decidim/templates/admin/proposal_answer_templates/_form.html.erb
+- app/views/decidim/templates/admin/proposal_answer_templates/_template_chooser.html.erb
+- app/views/decidim/templates/admin/proposal_answer_templates/edit.html.erb
+- app/views/decidim/templates/admin/proposal_answer_templates/index.html.erb
+- app/views/decidim/templates/admin/proposal_answer_templates/new.html.erb
 - app/views/decidim/templates/admin/questionnaire_templates/_choose.html.erb
 - app/views/decidim/templates/admin/questionnaire_templates/_form.html.erb
 - app/views/decidim/templates/admin/questionnaire_templates/_preview.html.erb
@@ -160,7 +157,6 @@ files:
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
 - config/locales/gn-PY.yml
-- config/locales/he-IL.yml
 - config/locales/hr.yml
 - config/locales/hu.yml
 - config/locales/id-ID.yml
@@ -204,37 +200,43 @@ files:
 - config/locales/zh-CN.yml
 - config/locales/zh-TW.yml
 - db/migrate/20200518093819_create_decidim_templates.rb
+- db/migrate/20221006055954_add_field_values_and_target_to_decidim_templates.rb
 - db/seeds.rb
-- decidim-templates.gemspec
 - lib/decidim/templates.rb
 - lib/decidim/templates/admin.rb
 - lib/decidim/templates/admin_engine.rb
 - lib/decidim/templates/engine.rb
+- lib/decidim/templates/menu.rb
 - lib/decidim/templates/test/factories.rb
 - lib/decidim/templates/test/shared_examples/copies_all_questionnaire_contents_examples.rb
 - lib/decidim/templates/test/shared_examples/uses_questionnaire_templates.rb
 - lib/decidim/templates/version.rb
-homepage: https://github.com/decidim/decidim-module-templates
+homepage: https://decidim.org
 licenses:
 - AGPL-3.0
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/decidim/decidim/issues
+  documentation_uri: https://docs.decidim.org/
+  funding_uri: https://opencollective.com/decidim
+  homepage_uri: https://decidim.org
+  source_code_uri: https://github.com/decidim/decidim
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 3.0.0
+      version: '3.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.2.22
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
 summary: A decidim templates module
 test_files: []

data/config/locales/he-IL.yml

@@ -1 +0,0 @@
-he:

data/decidim-templates.gemspec

@@ -1,33 +0,0 @@
-# frozen_string_literal: true
-
-$LOAD_PATH.push File.expand_path("lib", __dir__)
-
-require "decidim/templates/version"
-
-Gem::Specification.new do |s|
-  s.version = Decidim::Templates.version
-  s.authors = ["Vera Rojman"]
-  s.email = ["vrojman@protonmail.com"]
-  s.license = "AGPL-3.0"
-  s.homepage = "https://github.com/decidim/decidim-module-templates"
-  s.required_ruby_version = "~> 3.0.0"
-
-  s.name = "decidim-templates"
-  s.summary = "A decidim templates module"
-  s.description = "This module provides a solution to create templates for different Decidim models, such as Proposals and Questionnaires.."
-
-  s.files = Dir.chdir(__dir__) do
-    `git ls-files -z`.split("\x0").select do |f|
-      (File.expand_path(f) == __FILE__) ||
-        f.start_with?(*%w(app/ config/ db/ lib/ Rakefile README.md))
-    end
-  end
-
-  s.add_dependency "decidim-core", Decidim::Templates.version
-  s.add_dependency "decidim-forms", Decidim::Templates.version
-
-  s.add_development_dependency "decidim-admin", Decidim::Templates.version
-  s.add_development_dependency "decidim-dev", Decidim::Templates.version
-  s.add_development_dependency "decidim-participatory_processes", Decidim::Templates.version
-  s.add_development_dependency "decidim-surveys", Decidim::Templates.version
-end