decidim-forms 0.31.7 → 0.31.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0ba9f43cbc4445bdc706cf213d8b99ac38a8270e2c9969e14937c73005bb99a
-  data.tar.gz: 9f90e9f87e6387e2e4514f3bd5219699d43e1e9efe91f13bb7fb11ac2c750d3b
+  metadata.gz: b84a65887877bd8ffdbb7c872bdd1f2a885cceacbd270d6ecc09eb979d4c99c4
+  data.tar.gz: 831bd2c87a75931b4c23177bbfc7885d1fb194aeaa6615f8292632d3f9ece517
 SHA512:
-  metadata.gz: fc1ffc539c4234c5a1afbad6ee8c980b63829892f30b9a68a0f6dab87ec1fedb7b56b969f08785e69a6b9891adaf5329d55e7760f7ff06ca8d2ffe17fd4f1832
-  data.tar.gz: '095c5e8668a8d22e15c07cc83f3bc6aea6ded38303f176ae657becb4c81aa5c388745dce06e7e235d4907a960ced01f9fc0ce1a020c13ba56128d3f2bf930c8b'
+  metadata.gz: 71987f2643d3d28978ef8c6b73a9ae03b92c2ffe180e572d21618e21664a7ffbb498da2fc729e14b5b4ec7c618c790319f2e89eb9d75853cdbd4f56c317d9ab9
+  data.tar.gz: 74ae0de2474b4be8e1c504ccd6a1dd678d1b9904ba8f6f10c3569c417c85f6dc7ddf4a3281f27164df455e9b4af66f942f54b33325fe94c7ebdac20fa4182cde

data/app/cells/decidim/forms/step_navigation_cell.rb

@@ -51,7 +51,8 @@ module Decidim
           data: {
             confirm:,
             disable: true,
-            data: "survey-buttons"
+            data: "survey-buttons",
+            confirm_icon: "checkbox-circle-line"
           }
         }
       end

data/app/controllers/decidim/forms/admin/concerns/has_questionnaire.rb

@@ -20,19 +20,6 @@ module Decidim
             helper_method :questionnaire_for, :questionnaire, :blank_question, :blank_response_option, :blank_matrix_row,
                           :blank_display_condition, :question_types, :display_condition_types, :update_url, :public_url, :response_options_url, :edit_questionnaire_title
 
-            if defined?(Decidim::Templates::Admin::Concerns::Templatable)
-              include Decidim::Templates::Admin::Concerns::Templatable
-              helper Decidim::DatalistSelectHelper
-
-              def templatable_type
-                "Decidim::Forms::Questionnaire"
-              end
-
-              def templatable
-                questionnaire
-              end
-            end
-
             def edit
               enforce_permission_to(:update, permission_subject, questionnaire:)
 
@@ -88,18 +75,41 @@ module Decidim
               end
             end
 
+            # This endpoint is only used by the questions form rendered by the
+            # already authorized "edit_questions" action. The host controllers
+            # resolve their resource from params (e.g. "params[:id]") that have
+            # a different meaning in this request, so the authorization cannot
+            # be delegated to "questionnaire_for" here. Access is already
+            # restricted by the admin dashboard routing constraint.
+            # rubocop:disable Decidim/EnforcePermissionTo
             def response_options
               respond_to do |format|
                 format.json do
                   question_id = params["id"]
-                  question = Question.find_by(id: question_id)
+                  question = questionnaire.questions.find_by(id: question_id)
                   render json: question.response_options.map { |response_option| ResponseOptionPresenter.new(response_option).as_json } if question.present?
                 end
               end
             end
+            # rubocop:enable Decidim/EnforcePermissionTo
+
+            protected
+
+            if defined?(Decidim::Templates::Admin::Concerns::Templatable)
+              include Decidim::Templates::Admin::Concerns::Templatable
+
+              helper Decidim::DatalistSelectHelper
+
+              def templatable_type
+                "Decidim::Forms::Questionnaire"
+              end
+
+              def templatable
+                questionnaire
+              end
+            end
 
-            # Public: The only method to be implemented at the controller. You need to
-            # return the object that will hold the questionnaire.
+            # You need to return the object that will hold the questionnaire.
             def questionnaire_for
               raise "#{self.class.name} is expected to implement #questionnaire_for"
             end
@@ -155,7 +165,7 @@ module Decidim
             end
 
             def questionnaire
-              @questionnaire ||= Questionnaire.find_by(questionnaire_for:)
+              @questionnaire ||= Questionnaire.find_by(questionnaire_for:) # rubocop:disable Decidim/OrganizationScopedFinder -- questionnaire_for is scoped by the host controller
             end
 
             def blank_question

data/app/controllers/decidim/forms/admin/concerns/has_questionnaire_responses.rb

@@ -60,6 +60,8 @@ module Decidim
               redirect_back(fallback_location: questionnaire_participant_responses_url(session_token))
             end
 
+            protected
+
             # Public: The only method to be implemented at the controller. You need to
             # return the object that will hold the questionnaire.
             def questionnaire_for
@@ -77,7 +79,7 @@ module Decidim
             end
 
             def questionnaire
-              @questionnaire ||= Questionnaire.find_by(questionnaire_for:)
+              @questionnaire ||= Questionnaire.find_by(questionnaire_for:) # rubocop:disable Decidim/OrganizationScopedFinder -- questionnaire_for is scoped by the host controller
             end
 
             def participants_query

data/app/controllers/decidim/forms/concerns/has_questionnaire.rb

@@ -22,6 +22,8 @@ module Decidim
           invisible_captcha on_spam: :spam_detected
 
           def show
+            enforce_permission_to :read, :component
+
             @form = form(Decidim::Forms::QuestionnaireForm).from_model(questionnaire)
             render template:
           end
@@ -46,6 +48,8 @@ module Decidim
             end
           end
 
+          private
+
           def template
             "decidim/forms/questionnaires/show"
           end

data/app/models/decidim/forms/question.rb

@@ -39,13 +39,13 @@ module Decidim
                class_name: "DisplayCondition",
                foreign_key: "decidim_condition_question_id",
                dependent: :destroy,
-               inverse_of: :question,
+               inverse_of: :condition_question,
                counter_cache: :display_conditions_for_other_questions_count
 
       # Questions which have display conditions based on the value of this question's response
       has_many :conditioned_questions,
                through: :display_conditions_for_other_questions,
-               foreign_key: "decidim_condition_question_id",
+               source: :question,
                class_name: "Question"
 
       has_many :responses,

data/app/packs/src/decidim/forms/admin/collapsible_questions.js

@@ -1,14 +1,4 @@
 document.addEventListener("turbo:load", () => {
-  const getButtons = document.querySelectorAll("button.question--collapse");
-
-  setTimeout(() => {
-    getButtons.forEach((button) => {
-      if (button.classList.contains("question-error")) {
-        button.click();
-      }
-    });
-  }, 100);
-
   document.querySelector("button.collapse-all")?.addEventListener("click", () => {
     document.querySelectorAll("[id$=field] button.question--collapse[aria-expanded='true']").
       forEach((button) => button.click());

data/app/packs/src/decidim/forms/display_conditions.component.js

@@ -15,12 +15,23 @@ class DisplayCondition {
   bindEvent() {
     this.checkCondition();
     this.getInputsToListen().on("change", this.checkCondition.bind(this));
+
+    const conditionWrapper = document.querySelector(`.question[data-question-id='${this.conditionQuestion}']`);
+    conditionWrapper?.addEventListener("display-conditions:visibility", this.checkCondition.bind(this));
   }
 
   getInputValue() {
     const $conditionWrapperField = $(`.question[data-question-id='${this.conditionQuestion}']`);
     const $textInput = $conditionWrapperField.find("textarea, input[type='text']:not([name$=\\[custom_body\\]])");
 
+    // A hidden question counts as unanswered, like the server sees it: its inputs are
+    // disabled, so it submits nothing. The response itself is left alone.
+    if ($conditionWrapperField.is("[data-condition-hidden]")) {
+      return $textInput.length
+        ? ""
+        : [];
+    }
+
     if ($textInput.length) {
       return $textInput.val();
     }
@@ -181,6 +192,7 @@ class DisplayConditionsComponent {
     this.wrapperField.fadeIn();
     this.wrapperField.find("input, textarea").prop("disabled", null);
     this.showCount++;
+    this.setHidden(false);
   }
 
   hideQuestion() {
@@ -192,6 +204,21 @@ class DisplayConditionsComponent {
     }
 
     this.wrapperField.find("input, textarea").prop("disabled", "disabled");
+    this.setHidden(true);
+  }
+
+  // A hidden question stops counting as answered, so questions conditioned on this
+  // one have to re-evaluate, which the visibility event asks them to do. Only a real
+  // change is propagated, so the cascade settles after one pass and cannot loop.
+  setHidden(hidden) {
+    const [wrapper] = this.wrapperField;
+
+    if (wrapper.hasAttribute("data-condition-hidden") === hidden) {
+      return;
+    }
+
+    wrapper.toggleAttribute("data-condition-hidden", hidden);
+    wrapper.dispatchEvent(new CustomEvent("display-conditions:visibility"));
   }
 }
 

data/app/packs/src/decidim/forms/display_conditions.component.test.js

@@ -0,0 +1,142 @@
+import $ from "jquery"; // eslint-disable-line id-length
+
+// Relative import: the forms pack is not in jest's moduleDirectories, so it
+// cannot be resolved through the absolute "src/..." path used elsewhere.
+import createDisplayConditions from "./display_conditions.component"; // eslint-disable-line no-relative-import-paths/no-relative-import-paths
+
+describe("DisplayConditionsComponent", () => {
+  // Renders a single-choice (radio) question with the DOM structure the
+  // component expects (js-collection-input wrapping body/custom_body/option_id).
+  const radioCollection = (qid, options) => `
+    <div class="js-radio-button-collection">
+      ${options.map((opt) => `
+        <div class="js-collection-input">
+          <input name="resp[${qid}][body]" type="radio" value="${opt.value}" />
+          <input name="resp[${qid}][custom_body]" type="text" />
+          <input name="resp[${qid}][response_option_id]" type="hidden" value="${opt.optionId}" />
+        </div>
+      `).join("")}
+    </div>
+  `;
+
+  const conditionTag = (data) => {
+    const attrs = Object.entries(data).map(([key, val]) => `data-${key}='${val}'`).join(" ");
+    return `<div class="display-condition" ${attrs}></div>`;
+  };
+
+  // Q0 (A/B/C) --C--> Q3 (0/1) --0--> FINAL0
+  //                            \--1--> FINAL1
+  const content = `
+    <div class="answer-questionnaire">
+      <div class="question" data-question-id="Q0" data-conditioned="false">
+        ${radioCollection("Q0", [{ optionId: "optA", value: "A" }, { optionId: "optB", value: "B" }, { optionId: "optC", value: "C" }])}
+      </div>
+      <div class="question" data-question-id="Q3" data-conditioned="true">
+        ${conditionTag({ id: "dcQ3", type: "equal", condition: "Q0", option: "optC", mandatory: false })}
+        ${radioCollection("Q3", [{ optionId: "opt0", value: "0" }, { optionId: "opt1", value: "1" }])}
+      </div>
+      <div class="question" data-question-id="FINAL0" data-conditioned="true">
+        ${conditionTag({ id: "dcF0", type: "equal", condition: "Q3", option: "opt0", mandatory: false })}
+        ${radioCollection("FINAL0", [{ optionId: "f0opt", value: "yes" }])}
+      </div>
+      <div class="question" data-question-id="FINAL1" data-conditioned="true">
+        ${conditionTag({ id: "dcF1", type: "equal", condition: "Q3", option: "opt1", mandatory: false })}
+        ${radioCollection("FINAL1", [{ optionId: "f1opt", value: "yes" }])}
+      </div>
+    </div>
+  `;
+
+  const wrapper = (qid) => $(`.question[data-question-id='${qid}']`);
+  // The component enables inputs when a question is shown and disables them when
+  // hidden, so the disabled state is a reliable proxy for visibility in jsdom.
+  const isVisible = (qid) => !wrapper(qid).find("input[name$='[body]']").first().prop("disabled");
+  const selectOption = (qid, value) => {
+    const $input = wrapper(qid).find(`input[name$='[body]'][value='${value}']`);
+    $input.prop("checked", true);
+    $input.trigger("change");
+  };
+
+  beforeEach(() => {
+    document.body.innerHTML = content;
+    $(".answer-questionnaire .question[data-conditioned='true']").each((idx, el) => {
+      createDisplayConditions({ wrapperField: $(el) });
+    });
+  });
+
+  it("keeps conditioned questions hidden until their trigger is fulfilled", () => {
+    expect(isVisible("Q3")).toBe(false);
+    expect(isVisible("FINAL0")).toBe(false);
+    expect(isVisible("FINAL1")).toBe(false);
+  });
+
+  it("shows only the directly conditioned question when its trigger is met", () => {
+    selectOption("Q0", "C");
+
+    expect(isVisible("Q3")).toBe(true);
+    // Q3 is not answered yet, so neither final must appear
+    expect(isVisible("FINAL0")).toBe(false);
+    expect(isVisible("FINAL1")).toBe(false);
+  });
+
+  it("shows the matching final once the intermediate question is answered", () => {
+    selectOption("Q0", "C");
+    selectOption("Q3", "1");
+
+    expect(isVisible("FINAL1")).toBe(true);
+    expect(isVisible("FINAL0")).toBe(false);
+  });
+
+  it("cascades hiding down the chain when an ancestor trigger stops being fulfilled", () => {
+    selectOption("Q0", "C");
+    selectOption("Q3", "1");
+    expect(isVisible("FINAL1")).toBe(true);
+
+    // Move Q0 away from C: Q3 hides and stops counting as answered, and the
+    // visibility change propagates so FINAL1 hides too instead of lingering.
+    selectOption("Q0", "A");
+
+    expect(isVisible("Q3")).toBe(false);
+    expect(isVisible("FINAL1")).toBe(false);
+    // Q3's response is kept, so showing it again restores the chain as it was
+    expect(wrapper("Q3").find("input[value='1']").prop("checked")).toBe(true);
+
+    selectOption("Q0", "C");
+
+    expect(isVisible("Q3")).toBe(true);
+    expect(isVisible("FINAL1")).toBe(true);
+  });
+
+  it("keeps file upload responses of a hidden question out of the submission without destroying them", () => {
+    document.body.innerHTML = `
+      <div class="answer-questionnaire">
+        <div class="question" data-question-id="Q0" data-conditioned="false">
+          ${radioCollection("Q0", [{ optionId: "optA", value: "A" }, { optionId: "optC", value: "C" }])}
+        </div>
+        <div class="question" data-question-id="QFILE" data-conditioned="true">
+          ${conditionTag({ id: "dcFile", type: "equal", condition: "Q0", option: "optC", mandatory: false })}
+          <div class="upload-modal__files" data-active-uploads="QFILE">
+            <div class="attachment-details" data-filename="doc.pdf" data-state="uploaded">
+              <input name="resp[QFILE][add_attachments]" type="hidden" value="signed-id-123" />
+            </div>
+          </div>
+        </div>
+      </div>
+    `;
+    $(".answer-questionnaire .question[data-conditioned='true']").each((idx, el) => {
+      createDisplayConditions({ wrapperField: $(el) });
+    });
+
+    // Q0 is not "C", so QFILE is hidden. The attachment stays in the DOM, but it is
+    // disabled, so nothing stale is submitted and nothing already uploaded is lost.
+    const $hiddenField = wrapper("QFILE").find("input[name='resp[QFILE][add_attachments]']");
+
+    expect(wrapper("QFILE").find(".attachment-details").length).toBe(1);
+    expect($hiddenField.length).toBe(1);
+    expect($hiddenField.prop("disabled")).toBe(true);
+
+    // and it is submitted again once the question is shown
+    selectOption("Q0", "C");
+
+    expect($hiddenField.prop("disabled")).toBe(false);
+  });
+});

data/app/packs/src/decidim/forms/display_conditions_hidden_responses.test.js

@@ -0,0 +1,224 @@
+/* eslint-disable no-relative-import-paths/no-relative-import-paths, id-length */
+//
+// Covers what happens to a hidden question's response, for the two question types
+// the display-conditions component cannot clear by hand: `files` (its response
+// lives in UploadModal's markup) and `sorting` (hidden fields only).
+//
+// On the clearAnswers() implementation, the three cases about an already-saved
+// attachment fail: its preview and hidden add_attachments field are removed, and
+// showQuestion() never puts them back. The other two pass there as well, and show
+// why the selector was inconsistent: a file uploaded in the current session, and a
+// sorting question, were never cleared at all.
+//
+// The fixture reproduces the markup actually rendered to participants:
+//   decidim-core/app/cells/decidim/upload_modal/files.erb
+//   decidim-core/app/cells/decidim/upload_modal/modal.erb
+//   decidim-forms/app/views/decidim/forms/questionnaires/responses/_files.html.erb
+//   decidim-forms/app/views/decidim/forms/questionnaires/responses/_sorting.html.erb
+// and drives it through the real initializeUploadFields() and
+// createDisplayConditions(), so no behaviour is stubbed.
+//
+// Run with: npx jest decidim-forms/app/packs/src/decidim/forms/display_conditions_hidden_responses.test.js
+//
+
+import $ from "jquery";
+import createDisplayConditions from "./display_conditions.component";
+import { initializeUploadFields } from "src/decidim/direct_uploads/upload_field";
+
+const MODAL_ID = "modal-qfile";
+// Raw JSON because the keys are the snake_case ones upload_modal/modal.erb emits.
+const LOCALES = `{
+  "error": "error", "title_required": "title required", "filename": "filename",
+  "file_size_too_large": "too large", "remove": "remove", "title": "title",
+  "uploaded": "uploaded", "validating": "validating", "validation_error": "validation error"
+}`;
+const UPLOAD_OPTS = JSON.stringify({
+  addAttribute: "add_attachments",
+  resourceName: "questionnaire",
+  resourceClass: "Decidim::Forms::Questionnaire",
+  required: false,
+  maxFileSize: 10485760,
+  multiple: true,
+  titled: false,
+  formObjectClass: "Decidim::Forms::QuestionnaireForm"
+});
+
+const radioCollection = (qid, options) => `
+  <div class="js-radio-button-collection">
+    ${options.map((opt) => `
+      <div class="js-collection-input">
+        <input name="questionnaire[responses][${qid}][body]" type="radio" value="${opt.value}" />
+        <input name="questionnaire[responses][${qid}][custom_body]" type="text" />
+        <input name="questionnaire[responses][${qid}][response_option_id]" type="hidden" value="${opt.optionId}" />
+      </div>
+    `).join("")}
+  </div>
+`;
+
+const conditionTag = (data) =>
+  `<div class="display-condition" ${Object.entries(data).map(([key, val]) => `data-${key}='${val}'`).join(" ")}></div>`;
+
+// Mirrors upload_modal/files.erb for one already-persisted, non-image attachment.
+const uploadMarkup = () => `
+  <div class="upload-modal__files-container upload-container-for-add_attachments">
+    <div>
+      <div class="upload-modal__files" data-active-uploads="${MODAL_ID}">
+        <div class="attachment-details" data-attachment-id="99" data-title="doc.pdf" data-filename="doc.pdf" data-state="uploaded" data-hidden-field="signed-id-abc">
+          <a href="/rails/active_storage/blobs/doc.pdf">doc.pdf</a>
+          <input type="hidden" name="questionnaire[responses][QFILE][add_attachments]" value="99" id="hidden_add_attachments_99" />
+        </div>
+      </div>
+    </div>
+    <button id="button-${MODAL_ID}" name="add_attachments" type="button" data-dialog-open="${MODAL_ID}" data-upload='${UPLOAD_OPTS}'>Add file</button>
+  </div>
+  <div id="${MODAL_ID}" data-dialog="${MODAL_ID}">
+    <div id="${MODAL_ID}-content" class="upload-modal">
+      <div data-dialog-container>
+        <h2 data-dialog-title data-addlabel="Add file" data-editlabel="Edit file">Add file</h2>
+        <div data-name="add_attachments" data-dropzone>
+          <input id="files-${MODAL_ID}" type="file" multiple hidden />
+          <ul hidden data-dropzone-items="" data-locales='${LOCALES}'></ul>
+          <div data-dropzone-no-items="">
+            <label for="files-${MODAL_ID}"><span>Select file</span></label>
+          </div>
+        </div>
+      </div>
+      <div data-dialog-actions>
+        <button type="button" data-dropzone-cancel data-dialog-close="${MODAL_ID}">Cancel</button>
+        <button type="button" data-dropzone-save data-dialog-close="${MODAL_ID}" disabled>Save</button>
+      </div>
+    </div>
+  </div>
+`;
+
+// Mirrors responses/_sorting.html.erb
+const sortingMarkup = (qid) => `
+  <div class="response-questionnaire__sorting-container js-sortable-check-box-collection">
+    ${[["10", "1"], ["11", "2"], ["12", "3"]].map(([optId, pos], idx) => `
+      <div class="response-questionnaire__sorting js-collection-input" role="button">
+        <input type="hidden" name="questionnaire[responses][${qid}][choices][${idx}][position]" value="${pos}" />
+        <input type="hidden" name="questionnaire[responses][${qid}][choices][${idx}][body]" value="opt${optId}" />
+        <input type="hidden" name="questionnaire[responses][${qid}][choices][${idx}][response_option_id]" value="${optId}" />
+      </div>
+    `).join("")}
+  </div>
+`;
+
+const page = () => `
+  <form class="response-questionnaire" data-safe-path="/f">
+    <div class="question" data-question-id="Q0" data-conditioned="false">
+      ${radioCollection("Q0", [{ optionId: "optA", value: "A" }, { optionId: "optC", value: "C" }])}
+    </div>
+    <div class="question" data-question-id="QFILE" data-conditioned="true">
+      ${conditionTag({ id: "dcFile", type: "equal", condition: "Q0", option: "optC", mandatory: false })}
+      ${uploadMarkup()}
+      <input type="hidden" name="questionnaire[responses][QFILE][question_id]" value="QFILE" />
+    </div>
+    <div class="question" data-question-id="QSORT" data-conditioned="true">
+      ${conditionTag({ id: "dcSort", type: "equal", condition: "Q0", option: "optC", mandatory: false })}
+      ${sortingMarkup("QSORT")}
+      <input type="hidden" name="questionnaire[responses][QSORT][question_id]" value="QSORT" />
+    </div>
+  </form>
+`;
+
+const initUploads = () => initializeUploadFields(document.querySelectorAll("button[data-upload]"));
+const initConditions = () =>
+  $(".response-questionnaire .question[data-conditioned='true']").each((idx, el) =>
+    createDisplayConditions({ wrapperField: $(el) })
+  );
+
+const wrapper = (qid) => $(`.question[data-question-id='${qid}']`);
+const selectOption = (qid, value) => {
+  const $input = wrapper(qid).find(`input[name$='[body]'][value='${value}']`);
+  $input.prop("checked", true);
+  $input.trigger("change");
+};
+// What the browser would actually submit: enabled fields only.
+const submitted = () =>
+  Array.from(document.querySelectorAll("form input:not([disabled])")).
+    filter((el) => el.name && (!["radio", "checkbox"].includes(el.type) || el.checked)).
+    map((el) => `${el.name}=${el.value}`);
+// Any preview node holding the hidden add_attachments field, whether server
+// rendered (.attachment-details) or re-rendered by updateActiveUploads (no class).
+const previews = () => document.querySelectorAll(`[data-active-uploads='${MODAL_ID}'] > *`).length;
+const serverRenderedPreviews = () => document.querySelectorAll(`[data-active-uploads='${MODAL_ID}'] .attachment-details`).length;
+const modalItems = () => document.querySelectorAll(`#${MODAL_ID} [data-dropzone-items] > *`).length;
+const buttonLabel = () => document.getElementById(`button-${MODAL_ID}`).innerHTML;
+const positions = () =>
+  Array.from(document.querySelectorAll("[data-question-id='QSORT'] input[name$='[position]']")).map((el) => el.value);
+
+describe("hidden questions and their responses", () => {
+  beforeEach(() => {
+    // UploadModal renders icons through window.Decidim.config
+    window.Decidim = { config: { get: () => "/icons.svg" } };
+    document.body.innerHTML = page();
+  });
+
+  describe("a file question hidden on page load", () => {
+    it("keeps the attachment and UploadModal in sync, whichever initializes first", () => {
+      initUploads();
+      initConditions();
+
+      expect(previews()).toBe(1);
+      expect(serverRenderedPreviews()).toBe(1);
+      expect(modalItems()).toBe(1);
+      expect(buttonLabel()).toBe("Add file");
+      // kept, but disabled, so it is not submitted while the question is hidden
+      expect(submitted().filter((field) => field.includes("add_attachments"))).toEqual([]);
+    });
+
+    it("behaves the same when the display conditions initialize first", () => {
+      initConditions();
+      initUploads();
+
+      expect(previews()).toBe(1);
+      expect(modalItems()).toBe(1);
+      expect(submitted().filter((field) => field.includes("add_attachments"))).toEqual([]);
+    });
+  });
+
+  describe("a file question hidden and shown again", () => {
+    it("submits the attachment it already had", () => {
+      initUploads();
+      initConditions();
+
+      selectOption("Q0", "C");
+
+      expect(previews()).toBe(1);
+      expect(submitted()).toContain("questionnaire[responses][QFILE][add_attachments]=99");
+    });
+
+    it("submits a file uploaded in this session, whose preview carries no attachment-details class", () => {
+      initUploads();
+      initConditions();
+      selectOption("Q0", "C");
+
+      // saving the modal makes updateActiveUploads() re-render the preview
+      document.getElementById(`button-${MODAL_ID}`).click();
+      document.querySelector(`#${MODAL_ID} [data-dropzone-save]`).click();
+      expect(serverRenderedPreviews()).toBe(0);
+
+      selectOption("Q0", "A");
+      selectOption("Q0", "C");
+
+      expect(previews()).toBe(1);
+      expect(submitted().filter((field) => field.includes("add_attachments"))).not.toEqual([]);
+    });
+  });
+
+  describe("a sorting question", () => {
+    it("keeps its order out of the submission while hidden, and restores it when shown", () => {
+      initUploads();
+      initConditions();
+
+      expect(positions()).toEqual(["1", "2", "3"]);
+      expect(submitted().filter((field) => field.includes("QSORT"))).toEqual([]);
+
+      selectOption("Q0", "C");
+
+      expect(positions()).toEqual(["1", "2", "3"]);
+      expect(submitted()).toContain("questionnaire[responses][QSORT][choices][0][position]=1");
+    });
+  });
+});

data/app/views/decidim/forms/admin/questionnaires/_question.html.erb

@@ -12,7 +12,7 @@
         </span>
 
         <span class="ml-auto flex flex-row-reverse items-center gap-2">
-          <button type="button" class="question--collapse <%= "question-error" if is_expanded %>" data-controls="panel-<%= id %>-question-card">
+          <button type="button" class="question--collapse" data-controls="panel-<%= id %>-question-card" data-open="<%= is_expanded %>">
             <span class="icon-collapse">
               <%== icon("arrow-up-s-line", aria_label: t(".collapse"), role: "img") %>
             </span>

data/config/locales/de.yml

@@ -44,6 +44,7 @@ de:
             allow_editing_responses: Registrierten Benutzern die Bearbeitung eigener Umfrageantworten ermöglichen
             allow_responses: Antworten erlauben
             allow_unregistered: Teilnahme an der Umfrage ohne Registrierung erlauben
+            allow_unregistered_help: Wenn aktiviert, ist keine Anmeldung erforderlich, um die Umfrage zu beantworten. Dies kann zu ungenauen oder unzuverlässigen Daten führen und macht die Umfrage anfälliger für automatisierte Angriffe. Mit Vorsicht verwenden! Beachten Sie, dass dieselbe Umfrage von einer teilnehmenden Person mehrfach beantwortet werden kann, etwa durch die Verwendung unterschiedlicher Browser oder der Funktion "Privates Surfen" des Webbrowsers.
             announcement: Ankündigung
             clean_after_publish: Antworten beim Veröffentlichen der Umfrage löschen
             description: Beschreibung

data/config/locales/eu.yml

@@ -31,7 +31,7 @@ eu:
         responses:
           id: Erantzunaren identifikatzaile bakarra
           question: Erantzun den galdera
-          questionnaire: Erantzun zen galdetegia
+          questionnaire: Galdetegia erantzuna izan da
           response: Galderaren erantzuna
           user: Inkesta erantzun duen parte-hartzailea
       show:
@@ -48,9 +48,9 @@ eu:
             announcement: Oharra
             clean_after_publish: Ezabatu erantzunak inkesta argitaratzean
             description: Deskribapena
-            ends_at: Erantzunak noiz arte onartuta
+            ends_at: Erantzunak noiz arte onartua
             ends_at_help: Utzi zuriz data zehatzik ez badago
-            starts_at: Erantzunak noiztik onartuta
+            starts_at: Erantzunak noiztik onartua
             starts_at_help: Zuriz utzi data zehatzik ez badago
             tos: Zerbitzu-baldintzak
         questionnaires:
@@ -70,7 +70,7 @@ eu:
             condition_value: Testua barne
             display_condition: Bistaratzeko baldintza
             mandatory: Baldintza hau beti bete behar da, beste baldintza batzuen egoera edozein dela ere
-            remove: Kendu
+            remove: Ezabatu
             response_option: Erantzuteko aukera
             save_warning: Gogoratu formularioa gorde behar duzula bistaratzeko baldintzak konfiguratu aurretik
             select_condition_question: Hautatu galdera bat
@@ -78,7 +78,7 @@ eu:
             select_response_option: Hautatu erantzuteko aukera
           edit:
             save: Gorde
-            title: Galdetegia editau
+            title: Galdetegia editatu
           edit_questions:
             add_question: Gehitu galdera
             add_separator: Gehitu banatzailea
@@ -89,11 +89,11 @@ eu:
             add_question: Gehitu galdera
             collapse: Bildu galdera guztiak
             expand: Zabaldu galdera guztiak
-            preview: Aurreikusi
+            preview: Aurrebistaratu
             title: Editatu galdetegia honetarako %{questionnaire_for}
           matrix_row:
             matrix_row: Errenkada
-            remove: Kendu
+            remove: Ezabatu
             statement: Adierazpena
           question:
             add_display_condition: Bistaratzeko baldintza gehitu
@@ -105,7 +105,7 @@ eu:
             description: Deskribapena
             expand: Zabaldu
             question: Galdera
-            remove: Kendu
+            remove: Ezabatu
             statement: Adierazpena
           questions_form:
             already_responded_warning: Formularioa parte-hartzaile batzuek erantzuten dute dagoeneko; beraz, ezin dituzu galderak aldatu.
@@ -116,7 +116,7 @@ eu:
               success: Inkestaren galderak zuzen gordeta.
           response_option:
             free_text: Testu librea
-            remove: Kendu
+            remove: Ezabatu
             response_option: Erantzuteko aukera
             statement: Adierazpena
           responses:
@@ -137,7 +137,7 @@ eu:
             show:
               title: '#%{number} erantzun'
           separator:
-            remove: Kendu
+            remove: Ezabatu
             separator: Bereizlea
           title_and_description:
             collapse: Kolapsoa

data/config/locales/gl.yml

@@ -7,27 +7,136 @@ gl:
         question_type: Tipo
       questionnaire_question:
         mandatory: Obrigatorio
+        max_characters: Límite de caracteres (deixa 0 se non hai límite)
+      response:
+        body: Resposta
+        choices: Opcións
+        selected_choices: Opcións seleccionadas
+    errors:
+      models:
+        questionnaire:
+          request_invalid: Produciuse un problema ao procesar a solicitude. Téntao de novo.
+        response:
+          attributes:
+            add_documents:
+              needs_to_be_reattached: Debe anexarse de novo
+            body:
+              too_long: é demasiado longo
+            choices:
+              missing: non están completas
+              too_many: Podes escoller un máximo de %{count}.
   decidim:
+    download_your_data:
+      help:
+        responses:
+          id: O identificador único da resposta
+          question: A pregunta que se respondeu
+          questionnaire: O cuestionario que se respondeu
+          response: A resposta á pregunta
+          user: A persoa participante que respondeu ao cuestionario
+      show:
+        responses: Exportación de respostas
+        survey_user_responses: Respostas das persoas participantes á enquisa
     forms:
       admin:
         models:
           components:
+            allow_editing_responses: Permitir que as persoas participantes rexistradas editen as súas propias respostas á enquisa
+            allow_responses: Permitir respostas
+            allow_unregistered: Permitir que persoas participantes non rexistradas respondan á enquisa
+            allow_unregistered_help: Se está activado, non será necesario iniciar sesión para responder á enquisa. Isto pode producir datos de baixa calidade ou pouco fiables e aumentar a vulnerabilidade fronte a ataques automatizados. Úsao con precaución. Ten en conta que unha persoa participante podería responder á mesma enquisa varias veces usando navegadores distintos ou a función de «navegación privada» do navegador.
+            announcement: Aviso
             description: Descrición
+            ends_at: Respostas aceptadas ata
+            ends_at_help: Déixao en branco se non hai unha data específica
+            starts_at: Respostas aceptadas desde
+            starts_at_help: Déixao en branco se non hai unha data específica
             tos: Condicións de servicio
         questionnaires:
+          actions:
+            back: Volver ás respostas
+            publish_responses: Publicar respostas
+            show: Respostas
+          display_condition:
+            condition_question: Pregunta
+            condition_type: Condición
+            condition_types:
+              equal: Igual
+              match: Inclúe texto
+              not_equal: Distinto
+              not_responded: Sen responder
+              responded: Respondida
+            condition_value: Texto incluído
+            display_condition: Condición de visualización
+            mandatory: Esta condición debe cumprirse sempre, independentemente do estado das demais condicións
+            remove: Eliminar
+            response_option: Opción de resposta
+            save_warning: Lembra gardar o formulario antes de configurar as condicións de visualización
+            select_condition_question: Seleccionar unha pregunta
+            select_condition_type: Seleccionar un tipo de condición
+            select_response_option: Seleccionar unha opción de resposta
           edit:
             save: Gardar
+            title: Editar cuestionario
+          edit_questions:
+            add_question: Engadir pregunta
+            add_separator: Engadir separador
+            add_title_and_description: Engadir título e descrición
+            save: Gardar
+            title: Preguntas
           form:
             add_question: Engadir pregunta
+            collapse: Contraer todas as preguntas
+            expand: Expandir todas as preguntas
+            preview: Vista previa
+            title: Editar o formulario de %{questionnaire_for}
           matrix_row:
+            matrix_row: Fila
             remove: Quitar
             statement: Declaración
           question:
+            add_display_condition: Engadir condición de visualización
+            add_display_condition_info: Garda o formulario para configurar as condicións de visualización
+            add_matrix_row: Engadir fila
+            add_response_option: Engadir opción de resposta
             any: Calquera
+            collapse: Contraer
             description: Descrición
+            expand: Expandir
             question: Pregunta
             remove: Quitar
             statement: Declaración
+          questions_form:
+            already_responded_warning: O formulario xa foi respondido por algunhas persoas participantes, polo que non podes modificar as súas preguntas.
+            collapse: Contraer todas as preguntas
+            expand: Expandir todas as preguntas
+            unpublished_warning: O formulario non está publicado. Podes modificar as súas preguntas, pero ao facelo eliminaranse as respostas actuais.
+            update:
+              success: As preguntas da enquisa gardáronse correctamente.
+          response_option:
+            free_text: Texto libre
+            remove: Eliminar
+            response_option: Opción de resposta
+            statement: Declaración
+          responses:
+            actions:
+              back: Volver ás respostas
+              export: Exportar
+              next: Seguinte ›
+              previous: "‹ Anterior"
+            empty: Aínda non hai respostas
+            export:
+              response:
+                title: 'Resposta n.º %{number}'
+            export_response:
+              title: survey_participant_responses_%{token}
+            index:
+              title: "%{total} respostas en total"
+            show:
+              title: 'Resposta n.º %{number}'
+          separator:
+            remove: Eliminar
+            separator: Separador
           title_and_description:
             collapse: Contraer
             description: Descrición
@@ -37,25 +146,83 @@ gl:
             title_and_description: Título e descrición
           update:
             invalid: Produciuse un erro ao gardar o cuestionario.
+            success: O formulario gardouse correctamente.
+      admin_log:
+        question:
+          publish_responses: "%{user_name} publicou as respostas da pregunta %{resource_name} no espazo %{space_name}"
+          unpublish_responses: "%{user_name} retirou a publicación das respostas da pregunta %{resource_name} no espazo %{space_name}"
+        questionnaire:
+          update: "%{user_name} actualizou o cuestionario %{resource_name}"
+      errors:
+        response:
+          body: O corpo non pode estar baleiro
       images:
         processors:
           resize_and_pad: A imaxe axustarase para se encadrar a %{dimensions}.
           resize_to_fit: A imaxe axustarase para se adaptar a %{dimensions}.
       question_types:
+        files: Arquivos
+        long_response: Resposta longa
+        matrix_multiple: Matriz (opción múltiple)
+        matrix_single: Matriz (opción única)
         multiple_option: Múltipla opción
+        short_response: Resposta curta
         single_option: Opción única
         sorting: Clasificación
         title_and_description: Título e descrición
+      questionnaire_response_presenter:
+        download_attachment: Descargar anexo
       questionnaires:
         question:
           max_choices: 'Opcións máximas: %{n}'
+        response:
+          invalid: Produciuse un problema ao responder ao formulario.
+          max_choices_alert: Seleccionáronse demasiadas opcións
+          success: O formulario respondeuse correctamente.
         show:
+          current_step: Paso %{step}
+          empty: Aínda non hai preguntas configuradas para este formulario.
+          of_total_steps: de %{total_steps}
           questionnaire_closed:
+            body: O formulario está pechado e non se pode responder.
             title: Cuestionario pechado
           questionnaire_for_private_users:
             body: O cuestionario só está dispoñible para usuarios privados
             title: Cuestionario pechado
+          questionnaire_js_disabled:
+            body: Algunhas funcións deste formulario estarán desactivadas. Para mellorar a experiencia, activa JavaScript no navegador.
+            title: JavaScript está desactivado
+          questionnaire_not_published:
+            body: Este formulario aínda non está publicado.
+          questionnaire_responded:
+            body: Xa respondiches a este formulario.
+            title: Xa respondido
+          questionnaire_responded_edit:
+            body: Xa respondiches a este formulario. %{link}
+            edit: Editar as túas respostas
+          response_questionnaire:
+            already_have_an_account?: Xa ten unha conta?
+            are_you_new?: Nova persoa participante?
+            sign_in_description: Inicia sesión para responder á enquisa
+            sign_up_description: Crea unha conta de participante para responder á enquisa
+            title: Responder ao formulario
           tos_agreement: Ao participar aceptas as Condicións de servizo
       step_navigation:
         show:
+          are_you_sure_edit_guest: Se queres poder editar as túas respostas máis adiante, debes iniciar sesión ou crear unha conta.
+          are_you_sure_no_edit: Esta acción non se pode desfacer e non poderás editar as túas respostas. Seguro que queres continuar?
+          back: Volver
+          continue: Continuar
+          disallowed: Non tes permiso para editar as túas respostas.
           submit: Enviar
+      user_responses_serializer:
+        body: Resposta
+        completion: Completado
+        created_at: Respondida o
+        id: ID da resposta
+        ip_hash: Hash da IP
+        question: Pregunta
+        registered: Rexistrada
+        session_token: Identificador da persoa participante
+        unregistered: Non rexistrada
+        user_status: Estado da persoa participante

data/lib/decidim/forms/test/shared_examples/manage_questionnaires/add_questions.rb

@@ -263,6 +263,7 @@ shared_examples_for "add questions" do
     select "Long response", from: "Type"
     click_on "Save"
 
+    expect(page).to have_css(".panel-error", visible: :visible)
     expand_all_questions
     expect(page).to have_select("Type", selected: "Long response", wait: 10)
   end
@@ -280,6 +281,7 @@ shared_examples_for "add questions" do
     select "Long response", from: "Type"
 
     click_on "Save"
+    expect(page).to have_css(".panel-error", visible: :visible)
     expand_all_questions
 
     expect(page).to have_text("Type")
@@ -303,6 +305,7 @@ shared_examples_for "add questions" do
     select "Long response", from: "Type"
 
     click_on "Save"
+    expect(page).to have_css(".panel-error", visible: :visible)
     expand_all_questions
 
     expect(page).to have_text("Type")
@@ -332,6 +335,7 @@ shared_examples_for "add questions" do
     select "3", from: "Maximum number of choices"
 
     click_on "Save"
+    expect(page).to have_css(".panel-error", visible: :visible)
     expand_all_questions
 
     expect(page).to have_css(".questionnaire-question-response-option")
@@ -359,6 +363,7 @@ shared_examples_for "add questions" do
     click_on "Add row"
 
     click_on "Save"
+    expect(page).to have_css(".panel-error", visible: :visible)
     expand_all_questions
 
     within ".questionnaire-question-matrix-row:first-of-type" do

data/lib/decidim/forms/test/shared_examples/manage_questionnaires/update_questions.rb

@@ -45,6 +45,7 @@ shared_examples_for "update questions" do
       end
 
       click_on "Save"
+      expect(page).to have_css(".panel-error", visible: :visible)
       click_on "Expand all questions"
 
       expect(page).to have_admin_callout("There was a problem saving")
@@ -512,6 +513,7 @@ shared_examples_for "update questions" do
       end
 
       click_on "Save"
+      expect(page).to have_css(".panel-error", visible: :visible)
       expand_all_questions
 
       within ".questionnaire-question:last-of-type" do

data/lib/decidim/forms/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-forms version.
   module Forms
     def self.version
-      "0.31.7"
+      "0.31.8"
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-forms
 version: !ruby/object:Gem::Version
-  version: 0.31.7
+  version: 0.31.8
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2026-07-30 00:00:00.000000000 Z
+date: 2026-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -19,42 +19,42 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.7
+        version: 0.31.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.7
+        version: 0.31.8
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.7
+        version: 0.31.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.7
+        version: 0.31.8
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.7
+        version: 0.31.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.31.7
+        version: 0.31.8
 description: A forms gem for decidim.
 email:
 - josepjaume@gmail.com
@@ -117,6 +117,8 @@ files:
 - app/packs/src/decidim/forms/admin/live_text_update.component.js
 - app/packs/src/decidim/forms/admin/publish_responses_buttons.js
 - app/packs/src/decidim/forms/display_conditions.component.js
+- app/packs/src/decidim/forms/display_conditions.component.test.js
+- app/packs/src/decidim/forms/display_conditions_hidden_responses.test.js
 - app/packs/src/decidim/forms/forms.js
 - app/packs/src/decidim/forms/max_choices_alert.component.js
 - app/packs/src/decidim/forms/option_attached_inputs.component.js