decidim-templates 0.29.2 → 0.30.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e2cb752d5f4dee564866721b0d92291a1307a1c0c138763461d4e2a33ee01f1
-  data.tar.gz: fe7640fc196a7fab656b094abb2273396aa1f3c162a9c5c2cf2d97734f2c9a96
+  metadata.gz: a793533f2b4fb4408cce29852916f93f7ae9dd29455fa6dcfa475e395e5589c6
+  data.tar.gz: 174ec859275de2c2fa9f244a8816fa6688122bf78f8b5c7c20b8dc94241b549c
 SHA512:
-  metadata.gz: e1afeb0f954cc005a3e9087e32628a451b5819228531b499102a9f14581878a68c7ddeb5f7814f47f9dcfb2e3cced9aa3a56999f965a571884d15e8ceb9b7e0d
-  data.tar.gz: ed6b6f0f345e8643660b6c06b04a0fa33666ff64e885032344eafa249fcfa17b586c09af1e5d8baf1e8380f616bc706bef2724e8f2d429ef6c47f591022339d9
+  metadata.gz: 47d803c5f0d6a04b6788b34a2fd17f05f218478c3bada4dabcc0f27562bd651d3f42ff4cfac0622f8b58be55f0e68ba9caca32e59959311266217dd8d072e4dd
+  data.tar.gz: 0ece47a454b602bd94f0bde18e97961d4d153c5856209414398e73fd93565fd6b644885dc48440005ad8f96926074a2c4f3e4375942acb938479413e09fc010e

data/app/controllers/decidim/templates/admin/proposal_answer_templates_controller.rb

@@ -6,6 +6,7 @@ module Decidim
       class ProposalAnswerTemplatesController < Decidim::Templates::Admin::ApplicationController
         include Decidim::TranslatableAttributes
         include Decidim::Paginable
+        include Decidim::Proposals::Admin::NeedsInterpolations
 
         helper_method :availability_option_as_text, :availability_options_for_select, :available_states, :proposal_state
 
@@ -63,7 +64,7 @@ module Decidim
 
           response_object = {
             state: state&.token,
-            template: populate_template_interpolations(proposal)
+            template: populate_interpolations(template.description, proposal)
           }
 
           respond_to do |format|
@@ -138,20 +139,6 @@ module Decidim
           Decidim::Proposals::ProposalState.where(decidim_component_id: component_id)
         end
 
-        def populate_template_interpolations(proposal)
-          template.description.to_h do |language, value|
-            value.gsub!("%{organization}", translated_attribute(proposal.organization.name))
-            value.gsub!("%{name}", author_name(proposal))
-            value.gsub!("%{admin}", current_user.name)
-
-            [language, value]
-          end
-        end
-
-        def author_name(proposal)
-          proposal.creator_author.try(:title) || proposal.creator_author.try(:name)
-        end
-
         def proposal
           @proposal ||= Decidim::Proposals::Proposal.find(params[:proposalId])
         end

data/app/controllers/decidim/templates/admin/questionnaire_templates_controller.rb

@@ -7,8 +7,10 @@ module Decidim
       #
       class QuestionnaireTemplatesController < Decidim::Templates::Admin::ApplicationController
         include Decidim::TranslatableAttributes
+        include Decidim::Forms::Admin::Concerns::HasQuestionnaire
+        helper Decidim::Forms::Admin::ApplicationHelper
 
-        helper_method :template
+        helper_method :template, :questionnaire
 
         add_breadcrumb_item_from_menu :admin_template_types_menu
 
@@ -135,8 +137,24 @@ module Decidim
           redirect_to URI.parse(params[:url]).path
         end
 
+        def edit_questions_template
+          "decidim/templates/admin/questionnaire_templates/edit_questions"
+        end
+
+        def after_update_url
+          edit_questionnaire_template_path(template)
+        end
+
         private
 
+        def questionnaire
+          template.templatable
+        end
+
+        def i18n_flashes_scope
+          "decidim.forms.admin.questionnaires"
+        end
+
         def collection
           @collection ||= current_organization.templates.where(templatable_type: "Decidim::Forms::Questionnaire")
         end

data/app/views/decidim/templates/admin/questionnaire_templates/edit.html.erb

@@ -17,8 +17,10 @@
 
     <div class="card mt-4">
       <div class="card-divider">
-        <h2 class="card-title"><%= t(".questionnaire") %>
+        <h2 class="font-semibold text-secondary block sm:flex items-center justify-between gap-4 w-full first:[&>div]:ml-0 first:[&>*]:ml-auto">
+          <%= t(".questionnaire") %>
           <%= link_to t(".edit"), edit_questionnaire_path(template), class: "button button__sm button__secondary" %>
+          <%= link_to t(".manage_questions"), edit_questions_questionnaire_template_path(template), class: "button button__sm button__secondary" %>
         </h2>
       </div>
 

data/app/views/decidim/templates/admin/questionnaire_templates/edit_questions.erb

@@ -0,0 +1,27 @@
+<% add_decidim_page_title(t("decidim.forms.admin.questionnaires.edit.title")) %>
+
+<div class="questionnaire-questions">
+  <div class="item_show__header">
+    <h1 class="item_show__header-title">
+      <%= t("decidim.forms.admin.questionnaires.edit_questions.title") %>
+        <% if questionnaire.questions_editable? %>
+          <button class="button button__sm button__secondary add-question"><%= t(".add_question") %></button>
+          <button class="button button__sm button__secondary add-separator"><%= t(".add_separator") %></button>
+          <button class="button button__sm button__secondary add-title-and-description"><%= t(".add_title_and_description") %></button>
+        <% end %>
+    </h1>
+  </div>
+</div>
+
+<div class="item__edit item__edit-1col">
+  <div class="item__edit-form">
+    <%= decidim_form_for(@form, url: update_questions_questionnaire_template_path(template), method: :patch, html: { class: "form-defaults form edit_questions_survey" }) do |form| %>
+      <%= render partial: "decidim/forms/admin/questionnaires/questions_form", object: form %>
+      <div class="item__edit-sticky">
+        <div class="item__edit-sticky-container">
+          <%= form.submit t("save", scope: "decidim.forms.admin.questionnaires.edit"), class: "button button__sm button__secondary" %>
+        </div>
+      </div>
+    <% end %>
+  </div>
+</div>

data/config/locales/ca.yml

@@ -89,8 +89,13 @@ ca:
           edit:
             edit: Editar
             empty: Encara no hi ha preguntes.
+            manage_questions: Gestionar les preguntes
             questionnaire: Qüestionari
             title: Editar la plantilla del qüestionari
+          edit_questions:
+            add_question: Afegeix una pregunta
+            add_separator: Afegir un separador
+            add_title_and_description: Afegir títol i descripció
           form:
             title: Plantilla del qüestionari %{questionnaire_for}
           index:

data/config/locales/cs.yml

@@ -89,8 +89,13 @@ cs:
           edit:
             edit: Upravit
             empty: Zatím nejsou žádné otázky.
+            manage_questions: Spravovat otázky
             questionnaire: Dotazník
             title: Upravit šablonu dotazníku
+          edit_questions:
+            add_question: Přidat otázku
+            add_separator: Přidat oddělovač
+            add_title_and_description: Přidat název a popis
           form:
             title: Šablona dotazníku %{questionnaire_for}
           index:

data/config/locales/de.yml

@@ -89,8 +89,13 @@ de:
           edit:
             edit: Bearbeiten
             empty: Es gibt noch keine Fragen.
+            manage_questions: Fragen verwalten
             questionnaire: Fragebogen
             title: Formular-Vorlage bearbeiten
+          edit_questions:
+            add_question: Frage hinzufügen
+            add_separator: Trennzeichen hinzufügen
+            add_title_and_description: Titel und Beschreibung hinzufügen
           form:
             title: Fragebogenvorlage %{questionnaire_for}
           index:

data/config/locales/en.yml

@@ -89,8 +89,13 @@ en:
           edit:
             edit: Edit
             empty: There are no questions yet.
+            manage_questions: Manage questions
             questionnaire: Questionnaire
             title: Edit questionnaire template
+          edit_questions:
+            add_question: Add question
+            add_separator: Add separator
+            add_title_and_description: Add title and description
           form:
             title: Questionnaire template %{questionnaire_for}
           index:

data/config/locales/es-MX.yml

@@ -89,8 +89,13 @@ es-MX:
           edit:
             edit: Editar
             empty: Aún no hay preguntas.
+            manage_questions: Gestionar las preguntas
             questionnaire: Cuestionario
             title: Editar plantilla del cuestionario
+          edit_questions:
+            add_question: Añadir una pregunta
+            add_separator: Añadir un separador
+            add_title_and_description: Añadir título y descripción
           form:
             title: Plantilla de cuestionario %{questionnaire_for}
           index:

data/config/locales/es-PY.yml

@@ -89,8 +89,13 @@ es-PY:
           edit:
             edit: Editar
             empty: Aún no hay preguntas.
+            manage_questions: Gestionar las preguntas
             questionnaire: Cuestionario
             title: Editar plantilla del cuestionario
+          edit_questions:
+            add_question: Añadir una pregunta
+            add_separator: Añadir un separador
+            add_title_and_description: Añadir título y descripción
           form:
             title: Plantilla de cuestionario %{questionnaire_for}
           index:

data/config/locales/es.yml

@@ -89,8 +89,13 @@ es:
           edit:
             edit: Editar
             empty: Aún no hay preguntas.
+            manage_questions: Gestionar las preguntas
             questionnaire: Cuestionario
             title: Editar plantilla del cuestionario
+          edit_questions:
+            add_question: Añadir una pregunta
+            add_separator: Añadir un separador
+            add_title_and_description: Añadir título y descripción
           form:
             title: Plantilla de cuestionario %{questionnaire_for}
           index:

data/config/locales/eu.yml

@@ -89,8 +89,13 @@ eu:
           edit:
             edit: Editatu
             empty: Oraindik ez dago galderarik.
+            manage_questions: Kudeatu galderak
             questionnaire: Galdetegia
             title: Editatu galdetegiaren txantiloia
+          edit_questions:
+            add_question: Gehitu galdera
+            add_separator: Gehitu banatzailea
+            add_title_and_description: Gehitu izenburua eta deskribapena
           form:
             title: '%{questionnaire_for}% galdetegiaren txantiloia'
           index:

data/config/locales/fi-plain.yml

@@ -89,8 +89,13 @@ fi-pl:
           edit:
             edit: Muokkaa
             empty: Kysymyksiä ei ole vielä.
+            manage_questions: Hallinnoi kysymyksiä
             questionnaire: Kysely
             title: Muokkaa kyselylomakkeen mallipohjaa
+          edit_questions:
+            add_question: Lisää kysymys
+            add_separator: Lisää erotinviiva
+            add_title_and_description: Lisää otsikko ja kuvaus
           form:
             title: Kyselylomakemalli %{questionnaire_for}
           index:

data/config/locales/fi.yml

@@ -89,8 +89,13 @@ fi:
           edit:
             edit: Muokkaa
             empty: Kysymyksiä ei ole vielä.
+            manage_questions: Hallinnoi kysymyksiä
             questionnaire: Kysely
             title: Muokkaa kyselylomakkeen mallipohjaa
+          edit_questions:
+            add_question: Lisää kysymys
+            add_separator: Lisää erotinviiva
+            add_title_and_description: Lisää otsikko ja kuvaus
           form:
             title: Kyselylomakemalli %{questionnaire_for}
           index:

data/config/locales/fr-CA.yml

@@ -89,8 +89,13 @@ fr-CA:
           edit:
             edit: Modifier
             empty: Il n'y a pas encore de question.
+            manage_questions: Gérer les questions
             questionnaire: Questionnaire
             title: Modifier le modèle de questionnaire
+          edit_questions:
+            add_question: Ajouter une question
+            add_separator: Ajouter un séparateur
+            add_title_and_description: Ajouter un titre et une description
           form:
             title: Modèle de questionnaire %{questionnaire_for}
           index:

data/config/locales/fr.yml

@@ -89,8 +89,13 @@ fr:
           edit:
             edit: Modifier
             empty: Il n'y a pas encore de question.
+            manage_questions: Gérer les questions
             questionnaire: Questionnaire
             title: Modifier le modèle de questionnaire
+          edit_questions:
+            add_question: Ajouter une question
+            add_separator: Ajouter un séparateur
+            add_title_and_description: Ajouter un titre et une description
           form:
             title: Modèle de questionnaire %{questionnaire_for}
           index:

data/config/locales/ja.yml

@@ -89,8 +89,13 @@ ja:
           edit:
             edit: 編集
             empty: 質問はまだありません。
+            manage_questions: 質問の管理
             questionnaire: アンケート
             title: アンケートテンプレートの編集
+          edit_questions:
+            add_question: 質問の追加
+            add_separator: 区切り文字を追加
+            add_title_and_description: タイトルと説明を追加
           form:
             title: アンケートテンプレート %{questionnaire_for}
           index:

data/db/seeds.rb

@@ -62,11 +62,12 @@ if !Rails.env.production? || ENV.fetch("SEED", nil)
     )
   end
 
-  %w(matrix_single matrix_multiple).each do |matrix_question_type|
+  %w(matrix_single matrix_multiple).each_with_index do |matrix_question_type, index|
     question = Decidim::Forms::Question.create!(
       questionnaire:,
       body: Decidim::Faker::Localized.paragraph,
-      question_type: matrix_question_type
+      question_type: matrix_question_type,
+      position: index + 4
     )
 
     3.times do |idx|

data/decidim-templates.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
     "homepage_uri" => "https://decidim.org",
     "source_code_uri" => "https://github.com/decidim/decidim"
   }
-  s.required_ruby_version = "~> 3.2.0"
+  s.required_ruby_version = "~> 3.3.0"
 
   s.name = "decidim-templates"
   s.summary = "A decidim templates module"

data/lib/decidim/templates/admin_engine.rb

@@ -12,41 +12,51 @@ module Decidim
       paths["lib/tasks"] = nil
 
       routes do
-        resources :proposal_answer_templates do
-          member do
-            post :copy
+        constraints(->(request) { Decidim::Admin::OrganizationDashboardConstraint.new(request).matches? }) do
+          resources :proposal_answer_templates do
+            member do
+              post :copy
+            end
+            collection do
+              get :fetch
+            end
           end
-          collection do
-            get :fetch
-          end
-        end
 
-        ## Routes for Questionnaire Templates
-        resources :questionnaire_templates do
-          member do
-            post :copy
+          ## Routes for Questionnaire Templates
+          resources :questionnaire_templates do
+            member do
+              post :copy
+              get :edit_questions
+              patch :update_questions
+              resource :questionnaire, module: :questionnaire_templates # To manage the templatable resource
+            end
 
-            resource :questionnaire, module: :questionnaire_templates # To manage the templatable resource
+            collection do
+              post :apply # To use when creating an object from a template
+              post :skip # To use when creating an object without a template
+              get :preview # To provide a preview for the template in the object creation view
+            end
           end
 
-          collection do
-            post :apply # To use when creating an object from a template
-            post :skip # To use when creating an object without a template
-            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
+          resources :block_user_templates do
+            member do
+              post :copy
+            end
+            collection do
+              get :fetch
+            end
           end
-        end
 
-        get "/questionnaire_template/questionnaire/answer_options", to: "questionnaire_templates/questionnaires#answer_options", as: "answer_options_template"
+          get "/questionnaire_template/questionnaire/answer_options", to: "questionnaire_templates/questionnaires#answer_options", as: "answer_options_template"
 
-        root to: "questionnaire_templates#index"
+          root to: "questionnaire_templates#index"
+        end
+      end
+
+      initializer "decidim_templates_admin.mount_routes" do
+        Decidim::Core::Engine.routes do
+          mount Decidim::Templates::AdminEngine, at: "/admin/templates", as: "decidim_admin_templates"
+        end
       end
 
       initializer "decidim_templates_admin.menu" do

data/lib/decidim/templates/engine.rb

@@ -15,10 +15,6 @@ 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/test/shared_examples/uses_questionnaire_templates.rb

@@ -46,7 +46,7 @@ shared_examples_for "uses questionnaire templates" do |_questionnaire_for|
             description: {},
             tos: {}
           )
-          visit questionnaire_edit_path
+          click_on "Edit"
         end
 
         it "shows the template choosing screen" do
@@ -87,7 +87,7 @@ shared_examples_for "uses questionnaire templates" do |_questionnaire_for|
         description: {},
         tos: {}
       )
-      visit questionnaire_edit_path
+      click_on "Edit"
 
       select(template.name["en"], from: "select-template")
 
@@ -96,14 +96,13 @@ shared_examples_for "uses questionnaire templates" do |_questionnaire_for|
       end
 
       click_on "Create from template"
+      click_on "Save"
     end
 
     it "copies the template data to the questionnaire on submit" do
-      within "form.edit_questionnaire" do
-        click_on "Expand all"
-        expect(page.find_by_id("questionnaire_title_en").value).to eq(template.templatable.title["en"])
-        expect(page.find("#questionnaire_questions_#{questionnaire_question.id}_body_en").value).to eq(question.body["en"])
-      end
+      click_on "Manage questions"
+      click_on "Expand all"
+      expect(page.find("#questions_questions_#{questionnaire_question.id}_body_en").value).to eq(question.body["en"])
     end
   end
 end

data/lib/decidim/templates/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-templates version.
   module Templates
     def self.version
-      "0.29.2"
+      "0.30.0.rc2"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-templates
 version: !ruby/object:Gem::Version
-  version: 0.29.2
+  version: 0.30.0.rc2
 platform: ruby
 authors:
 - Vera Rojman
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-02-12 00:00:00.000000000 Z
+date: 2025-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -16,98 +16,98 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-forms
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-proposals
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
 - !ruby/object:Gem::Dependency
   name: decidim-surveys
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.29.2
+        version: 0.30.0.rc2
 description: This module provides a solution to create templates for different Decidim
   models, such as Proposals and Questionnaires..
 email:
@@ -169,6 +169,7 @@ files:
 - app/views/decidim/templates/admin/questionnaire_templates/_form.html.erb
 - app/views/decidim/templates/admin/questionnaire_templates/_preview.html.erb
 - app/views/decidim/templates/admin/questionnaire_templates/edit.html.erb
+- app/views/decidim/templates/admin/questionnaire_templates/edit_questions.erb
 - app/views/decidim/templates/admin/questionnaire_templates/index.html.erb
 - app/views/decidim/templates/admin/questionnaire_templates/new.html.erb
 - app/views/decidim/templates/admin/questionnaire_templates/preview.js.erb
@@ -273,14 +274,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - "~>"
     - !ruby/object:Gem::Version
-      version: 3.2.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
+rubygems_version: 3.5.11
 signing_key:
 specification_version: 4
 summary: A decidim templates module