Questionnaire v2: fill experience rebuild (stack base)

public/locale/en.json

@@ -512,6 +512,7 @@
   "add_product_knowledge": "Add Product Knowledge",
   "add_products_to_receive": "Add products to receive",
   "add_question": "Add Question",
+  "add_question_here": "Add question here",
   "add_questionnaire": "Add Questionnaire",
   "add_range": "Add Range",
   "add_remarks": "Add remarks",
@@ -683,11 +684,15 @@
   "already_a_member": "Already a member?",
   "already_marked_as_error": "Already marked as error",
   "already_selected": "Already selected",
+  "also_capture": "Also capture",
+  "also_capture_hint": "Extra fields recorded alongside the answer.",
   "alt": "Alt.",
   "alternate": "Alternate",
   "alternate_phone_number": "Alternate Phone Number",
   "alternative_names": "Alternative Names",
   "alternatives_coming_soon": "Alternatives coming soon",
+  "always_shown": "Always shown",
+  "always_shown_hint": "Add a rule to show this question only in certain cases.",
   "ambulance_driver_name": "Name of ambulance driver",
   "ambulance_number": "Ambulance No",
   "ambulance_phone_number": "Phone number of Ambulance",
@@ -709,6 +714,7 @@
   "answer": "Answer",
   "answer_options": "Answer options",
   "answer_options_hint": "Define possible answers for this question",
+  "answer_type": "Answer type",
   "antenatal": "Antenatal",
   "any_additional_information": "Any Additional Information",
   "any_condition_or": "Any condition is true (OR)",
@@ -1004,6 +1010,7 @@
   "beds": "Beds",
   "beds_creation_failed": "Failed to create beds",
   "before": "before",
+  "before_you_save": "Before you save",
   "begin_clinical_encounter": "Begin a new clinical encounter for <strong>{{patientName}}</strong>. Select the appropriate encounter type, status, and priority to ensure proper documentation and care delivery.",
   "behavioral": "Behavioral",
   "behaviour": "Behaviour",
@@ -1037,8 +1044,8 @@
   "blood_group": "Blood Group",
   "blood_group_is_required": "Blood group is required",
   "blood_pressure_error": {
-    "missing": "Field is required. Either specify both or clear both.",
     "exceed": "Value cannot exceed 250 mmHg.",
+    "missing": "Field is required. Either specify both or clear both.",
     "systolic_less_than_diastolic": "Systolic must be greater than diastolic."
   },
   "blood_pressure_systolic_diastolic": "Blood Pressure (Systolic + Diastolic)",
@@ -1272,6 +1279,7 @@
   "click": "Click",
   "click_add_department_team": "Click <strong>Add Department/Team</strong> to create a new department/team.",
   "click_add_main_location": "Click <strong>Add Location</strong> to add a main location.",
+  "click_any_question_to_edit": "Click any question to edit it",
   "click_link_department_to_get_started": "Click on a department to get started",
   "click_manage_create_users": "Click <strong>See Details</strong><CareIcon /> to create or manage users and departments/teams within the corresponding dept/team.",
   "click_manage_create_users_mobile": "Click <CareIcon /> to create or manage users and departments/teams within the corresponding dept/team.",
@@ -1312,7 +1320,9 @@
   "code": "Code",
   "code_verified": "Code Verified",
   "code_verified_successfully": "Code verified successfully",
+  "coding": "Coding",
   "coding_details": "Coding Details",
+  "coding_tab_intro": "Link this question to a standard code so answers are comparable across facilities.",
   "collapse": "Collapse",
   "collapse_all": "Collapse All",
   "collapse_sidebar": "Collapse Sidebar",
@@ -1394,6 +1404,8 @@
   "condition_operation__equality": "Equals to",
   "condition_operation__has_tag": "Has tag",
   "condition_operation__in_range": "In range",
+  "condition_rule": "“{{question}}” {{operator}} “{{answer}}”",
+  "condition_rule_answered": "“{{question}}” is answered",
   "condition_target_not_answerable": "Visibility conditions can't target group or display questions — pick a question that records an answer",
   "condition_target_required": "Every visibility condition needs a target question",
   "conditional": "Conditional",
@@ -2061,6 +2073,7 @@
   "draft_error_loading": "Failed to load draft",
   "draft_forms": "Draft Forms",
   "draft_invoice_created": "Draft Invoice Created",
+  "draft_load_failed": "Couldn't load this draft. Go back and try again.",
   "draft_not_found": "The draft you are trying to continue could not be found.",
   "draft_not_recoverable": "Draft cannot be recovered",
   "draft_questionnaire_mismatch": "This draft cannot be recovered because the questionnaire has changed or is no longer available.",
@@ -2078,6 +2091,7 @@
   "duplicate_patient_record_birth_unknown": "Please contact your district care coordinator, the shifting facility or the patient themselves if you are not sure about the patient's year of birth.",
   "duplicate_patient_record_confirmation": "Admit the patient record to your facility by adding the year of birth",
   "duplicate_patient_record_rejection": "I confirm that the patient I want to create is not on the list.",
+  "duplicate_question": "Duplicate question",
   "duration": "Duration",
   "duration_input_placeholder": "Type eg. 5 days, 2 weeks",
   "duration_period_title": "Fixed dates",
@@ -2169,6 +2183,7 @@
   "edit_value_set": "Edit ValueSet",
   "edited_by": "Edited by",
   "edited_on": "Edited on",
+  "editing": "Editing",
   "education": "Education",
   "effect": "Effect",
   "eg_abc": "Eg. ABC",
@@ -2661,7 +2676,14 @@
   "filed_by": "filed by",
   "files": "Files",
   "fill_color": "Fill Color",
+  "fill_draft_form_dropped": "Couldn't restore \"{{title}}\" — the questionnaire changed since the draft was saved.",
+  "fill_draft_form_unavailable": "Couldn't load \"{{title}}\" just now — it's still in your saved draft.",
+  "fill_draft_includes_added_forms_one": "Includes {{count}} added questionnaire.",
+  "fill_draft_includes_added_forms_other": "Includes {{count}} added questionnaires.",
+  "fill_draft_resume_prompt": "You have an unsaved entry from {{time}}. Resume where you left off?",
+  "fill_draft_structured_skipped": "Structured answers (medications, symptoms, files…) aren't covered by local drafts — please re-check those sections.",
   "fill_my_details": "Fill My Details",
+  "fill_questionnaire": "Fill questionnaire",
   "filler_order": "Filler Order",
   "filter": "Filter",
   "filter_bed_availability_by_ward_and_status": "Filter bed availability by ward and status",
@@ -2690,6 +2712,7 @@
   "final": "Final",
   "final_price": "Final price",
   "financial_overview": "Financial Overview",
+  "find_a_question": "Find a question…",
   "finished": "Finished",
   "first_name": "First Name",
   "fixed_amount": "Fixed Amount",
@@ -2700,7 +2723,11 @@
   "footer_image": "Footer Image",
   "forget_password": "Forgot password?",
   "forget_password_instruction": "Enter your username, and if it exists, we will send you a link to reset your password.",
+  "form_canvas": "Form canvas",
   "form_properties": "Questionnaire Properties",
+  "form_settings": "Form Settings",
+  "form_settings_hint": "Applies to the whole form.",
+  "form_settings_invalid": "Fix the highlighted form settings before saving",
   "form_submission_discard_failed": "Failed to discard form submission",
   "form_submission_discarded": "Form submission discarded",
   "form_submissions": "Form Submissions",
@@ -2810,7 +2837,11 @@
   "help_provisional": "This is a tentative diagnosis - still a candidate that is under consideration.",
   "help_refuted": "This condition has been ruled out by subsequent diagnostic and clinical evidence.",
   "help_unconfirmed": "There is not sufficient diagnostic and/or clinical evidence to treat this as a confirmed condition.",
+  "helper_text": "Helper text",
+  "helper_text_hint": "Shown under the question",
+  "helper_text_placeholder": "Add guidance for the person filling this in",
   "hey_user": "Hey {{user}} 👋",
+  "hidden_by_conditions": "Hidden by conditions",
   "hide": "Hide",
   "hide_advanced_fields": "Hide Advanced Fields",
   "hide_category_grouping": "Hide Category Grouping",
@@ -2872,6 +2903,7 @@
   "in": "in",
   "in_cart": "In Cart",
   "in_consultation": "In-Consultation",
+  "in_plain_words": "In plain words",
   "in_progress": "In Progress",
   "in_range": "In Range",
   "in_service": "In Service",
@@ -3061,6 +3093,8 @@
   "issue_invoice": "Issue Invoice",
   "issued": "Issued",
   "issuer_type": "Issuer Type",
+  "issues_to_fix_one": "{{count}} to fix",
+  "issues_to_fix_other": "{{count}} to fix",
   "item": "Item",
   "item_condition": "Item Condition?",
   "item_location": "Item Location",
@@ -3261,6 +3295,8 @@
   "log_updates": "Log Updates",
   "logged_by": "Logged by",
   "logged_in_as": "Logged in as",
+  "logic": "Logic",
+  "logic_tab_intro": "Choose when this question appears. With no rules it is always shown.",
   "login": "Login",
   "login_already_registered": "Already registered? Log in to your account.",
   "logo": "Logo",
@@ -3553,6 +3589,8 @@
   "move_down": "Move Down",
   "move_left": "Move Left",
   "move_n_questions": "Move {{count}} questions",
+  "move_question_down": "Move question down",
+  "move_question_up": "Move question up",
   "move_questions_count": "Move <strong>{{count}}</strong> questions",
   "move_right": "Move Right",
   "move_this_to_draft": "move this to draft",
@@ -3578,6 +3616,10 @@
   "my_schedules": "My Schedules",
   "n_discontinued_medications_hidden": "{{count}} discontinued medication(s) hidden",
   "n_discontinued_nutritional_products_hidden": "{{count}} discontinued nutritional product(s) hidden",
+  "n_questions_one": "{{count}} question",
+  "n_questions_other": "{{count}} questions",
+  "n_sections_one": "{{count}} section",
+  "n_sections_other": "{{count}} sections",
   "na": "N/A",
   "name": "Name",
   "name_is_required": "Name is required",
@@ -3639,6 +3681,7 @@
   "no_allergies_recorded": "No allergies recorded",
   "no_allergies_recorded_description": "No Allergies have been recorded",
   "no_alternative_names_added": "No alternative names added",
+  "no_answers_to_submit": "Nothing to submit yet — answer at least one question",
   "no_appointments": "No appointments found",
   "no_appointments_found_for_today": "No matching appointment found for today. Redirecting to Patient Home...",
   "no_apps_found": "No apps found",
@@ -3877,6 +3920,7 @@
   "no_products_in_category": "This category doesn't have any products yet",
   "no_purchase_orders_found": "No purchase orders found",
   "no_purchase_orders_found_description": "No purchase order found for selected status or priority.",
+  "no_question_matches_search": "No question matches that search.",
   "no_questionnaire_responses": "No Questionnaire Responses",
   "no_questionnaires_found": "No questionnaires found",
   "no_questions_added_yet": "No questions added yet!",
@@ -3996,6 +4040,7 @@
   "not_specified": "Not Specified",
   "not_started": "Not started",
   "note": "Note",
+  "note_added": "Note added",
   "notes": "Notes",
   "notes__all_discussions": "All Discussions",
   "notes__all_discussions_description": "View and manage encounternotes discussion threads",
@@ -4251,6 +4296,7 @@
   "patient_body": "Patient Body",
   "patient_care": "Patient Care",
   "patient_category": "Patient Category",
+  "patient_clinical_history": "Patient Clinical History",
   "patient_clinical_history_page_title": "{{ name }}'s clinical history",
   "patient_consultation__admission": "Date of admission",
   "patient_consultation__consultation_notes": "General Instructions",
@@ -4417,6 +4463,8 @@
   "pk_form_definitional_description": "Specify definitional details about the product - dosage, route, etc.",
   "pk_form_intended_routes_description": "Add intended routes of administration",
   "pk_form_storage_guidelines_description": "Add storage guidelines for this product",
+  "plain_words_always": "This question is always shown.",
+  "plain_words_shown_when": "Show this question when {{summary}}.",
   "plan": "Plan",
   "planned": "Planned",
   "planned_location": "Planned Location",
@@ -4793,8 +4841,10 @@
   "reactivate_prescription": "Reactivate Prescription",
   "read_more": "Read more",
   "read_only": "Read only",
+  "read_only_toggle_hint": "Displayed, but can't be answered.",
   "readmission": "Re-admission",
   "ready_for_admission": "Ready For Admission",
+  "ready_to_save": "Ready to save",
   "real_time_bed_status": "Real-time bed status",
   "reason": "Reason",
   "reason_for_discontinuation": "Reason for discontinuation",
@@ -4915,6 +4965,7 @@
   "remove_medication_confirmation": "Are you sure you want to remove {{medication}}?",
   "remove_name": "Remove {{name}}",
   "remove_organization": "Remove organization",
+  "remove_questionnaire": "Remove {{title}}",
   "remove_questions_confirmation": "Are you sure do you want to remove the selected questions ?",
   "remove_questions_count": "Remove {{count}} questions",
   "remove_root_observation_interpretation": "Remove Root Observation Interpretation",
@@ -4933,6 +4984,7 @@
   "rename_file": "Rename File",
   "reopen_order": "Reopen Order",
   "repeatable": "Repeatable",
+  "repeatable_toggle_hint": "Lets the person record more than one answer.",
   "replace_home_facility": "Replace Home Facility",
   "replace_home_facility_confirm": "Are you sure you want to replace",
   "replace_home_facility_confirm_as": "as home facility for user",
@@ -5006,6 +5058,7 @@
   "required_method": "Required Method",
   "required_processing_storage": "Required Processing & Storage",
   "required_quantity": "Required Quantity",
+  "required_toggle_hint": "The form can't be submitted without it.",
   "required_type": "Required Type",
   "requirement": "Requirement",
   "requirements": "Requirements",
@@ -5569,6 +5622,7 @@
   "select_purchase_order": "Select Purchase Order",
   "select_question": "Select question",
   "select_questionnaire": "Select Questionnaire",
+  "select_questionnaire_to_fill": "Select a questionnaire to fill",
   "select_reconciliation_type": "Select reconciliation type",
   "select_register_patient": "Select/Register Patient",
   "select_report": "Select Report",
@@ -5792,6 +5846,9 @@
   "showing_count_templates": "Showing {{count}} template(s)",
   "showing_latest_of_versions": "Showing latest {{shown}} of {{total}} versions",
   "showing_x_of_y": "Showing <strong>{{x}}</strong> of <strong>{{y}}</strong>",
+  "shown_when": "Shown when {{summary}}",
+  "shown_when_n_rules_one": "Shown when {{count}} rule matches",
+  "shown_when_n_rules_other": "Shown when {{count}} rules match",
   "sidebar": "sidebar",
   "sidebar_description": "sidebar provides navigation to different sections",
   "sign_in": "Sign in",
@@ -5929,7 +5986,11 @@
   "stream_uuid": "Stream UUID",
   "string": "String",
   "stroke": "Stroke",
+  "structure": "Structure",
+  "structured_question_render_failed": "This section couldn't be displayed. Reload the page, or contact support if it keeps happening.",
   "structured_question_requires_context": "This section is available when filling the form with {{contexts}}.",
+  "structured_question_submit_failed": "This section couldn't be prepared for submission. Review or remove the entries, then try again.",
+  "structured_question_validate_failed": "This section couldn't be checked. Review or remove the entries, then try again.",
   "structured_type__allergy_intolerance": "Allergies",
   "structured_type__appointment": "Appointment",
   "structured_type__charge_item": "Charge Items",
@@ -5941,6 +6002,9 @@
   "structured_type__service_request": "Service Request",
   "structured_type__symptom": "Symptoms",
   "structured_type__time_of_death": "Time of Death",
+  "structured_type_plugin_missing": "This question requires a plugin that isn't enabled ({{type}}).",
+  "structured_type_subject_mismatch": "{{type}} questions can't be used on a {{subject}} questionnaire.",
+  "structured_type_unknown": "Unknown structured type",
   "style_list": "List",
   "style_text": "Text",
   "styling": "Styling",

src/PluginEngine.tsx

@@ -15,6 +15,7 @@ import React, { Suspense, useEffect, useMemo, useRef } from "react";
 import ErrorBoundary from "@/components/Common/ErrorBoundary";
 import Loading from "@/components/Common/Loading";
 import { PluginErrorBoundary } from "@/components/Common/PluginErrorBoundary";
+import { registerPluginStructuredType } from "@/components/QuestionnaireV2/structured/pluginRegistry";
 import { addOverride } from "@/lib/override";
 import { PlugConfig, PlugConfigMeta } from "@/types/plugConfig";
 import plugConfigApi from "@/types/plugConfig/plugConfigApi";
@@ -116,7 +117,7 @@ export default function PluginEngine({
     window.__CARE_PLUGIN_RUNTIME__ = deepFreeze({ meta: pluginMeta });
   }, [pluginMeta]);
 
-  // Register plugin overrides
+  // Register plugin overrides and structured question types
   const overrideCleanupRef = useRef<(() => void)[]>([]);
 
   useEffect(() => {
@@ -126,9 +127,9 @@ export default function PluginEngine({
 
     // Register new overrides from all loaded plugins
     for (const plugin of pluginsQuery) {
-      if (plugin.isLoading || !plugin.overrides) continue;
+      if (plugin.isLoading) continue;
 
-      for (const override of plugin.overrides) {
+      for (const override of plugin.overrides ?? []) {
         const cleanup = addOverride(override.component, {
           component: override.replacement,
           condition: override.condition,
@@ -138,6 +139,25 @@ export default function PluginEngine({
         });
         overrideCleanupRef.current.push(cleanup);
       }
+
+      // Structured question types the plugin contributes. Registration
+      // throws on a non-namespaced id — one malformed definition is logged
+      // and skipped, never fatal to the app. The registering plugin's slug
+      // goes in so the registry can verify the `{plugin_slug}.` half of the
+      // id actually belongs to it: namespacing is the isolation guarantee,
+      // and it is only a guarantee if someone checks.
+      for (const definition of plugin.structuredQuestionTypes ?? []) {
+        try {
+          overrideCleanupRef.current.push(
+            registerPluginStructuredType(definition, plugin.plugin),
+          );
+        } catch (error) {
+          console.error(
+            `Invalid structured type from plugin ${plugin.plugin}`,
+            error,
+          );
+        }
+      }
     }
 
     // Cleanup on unmount

src/Providers/AuthUserProvider.tsx

@@ -5,6 +5,7 @@ import { navigate, usePath } from "raviger";
 import { useCallback, useEffect, useState } from "react";
 
 import Loading from "@/components/Common/Loading";
+import { clearQuestionnaireFillDrafts } from "@/components/QuestionnaireV2/fill/draft/fillDraftCache";
 
 import { AuthUserContext } from "@/hooks/useAuthUser";
 
@@ -163,6 +164,7 @@ export default function AuthUserProvider({
     localStorage.removeItem(LocalStorageKeys.accessToken);
     localStorage.removeItem(LocalStorageKeys.refreshToken);
     localStorage.removeItem(LocalStorageKeys.patientTokenKey);
+    clearQuestionnaireFillDrafts();
     setAccessToken(null);
     setPatientToken(null);
 

src/Routers/AppRouter.tsx

@@ -50,8 +50,16 @@ const PATHS_WITHOUT_SIDEBAR = [
   /^\/facility\/[^/]+\/locations\/[^/]+\/external_supply\/purchase_orders\/[^/]+\/edit$/,
   /^\/facility\/[^/]+\/locations\/[^/]+\/external_supply\/deliveries\/[^/]+$/,
   /^\/facility\/[^/]+\/queues\/[^/]+\/tokens\/[^/]+$/,
-  // Questionnaire form routes
+  // Questionnaire fill routes (fullscreen v2 fill experience)
   /^\/facility\/[^/]+\/patient\/[^/]+\/encounter\/[^/]+\/questionnaire(\/[^/]+)?$/,
+  /^\/facility\/[^/]+\/patient\/[^/]+\/questionnaire(\/[^/]+)?$/,
+  /^\/facility\/[^/]+\/patient\/[^/]+\/consultation$/,
+  /^\/patient\/[^/]+\/questionnaire(\/[^/]+)?$/,
+  /^\/facility\/[^/]+\/locations\/[^/]+\/questionnaire(\/[^/]+)?$/,
+  /^\/facility\/[^/]+\/settings\/devices\/[^/]+\/questionnaire(\/[^/]+)?$/,
+  // Questionnaire studio (fullscreen builder) routes
+  /^\/facility\/[^/]+\/settings\/questionnaires\/[^/]+\/edit$/,
+  /^\/admin\/questionnaires\/[^/]+\/edit$/,
 ];
 
 export type RouteParams<T extends string> =