Questionnaire actions

src/Routers/routes/ConsultationRoutes.tsx

@@ -103,12 +103,12 @@ const consultationRoutes: AppRoutes = {
       />
     ),
 
-  "/facility/:facilityId/patient/:patientId/encounter/:encounterId/questionnaire/:slug":
-    ({ facilityId, encounterId, slug, patientId }) => (
+  "/facility/:facilityId/patient/:patientId/encounter/:encounterId/questionnaire/:questionnaireId":
+    ({ facilityId, encounterId, questionnaireId, patientId }) => (
       <EncounterQuestionnaire
         facilityId={facilityId}
         encounterId={encounterId}
-        questionnaireSlug={slug}
+        questionnaireId={questionnaireId}
         patientId={patientId}
         subjectType="encounter"
       />
@@ -138,7 +138,7 @@ const consultationRoutes: AppRoutes = {
     <EncounterQuestionnaire
       facilityId={facilityId}
       patientId={patientId}
-      questionnaireSlug="encounter"
+      questionnaireId="encounter"
       subjectType="encounter"
     />
   ),

src/Routers/routes/adminRoutes.tsx

@@ -1,7 +1,10 @@
 import { navigate } from "raviger";
 
-import QuestionnaireEditor from "@/components/Questionnaire/QuestionnaireEditor";
-import { QuestionnaireList } from "@/components/Questionnaire/QuestionnaireList";
+import { QuestionnaireBuilderPage } from "@/components/QuestionnaireV2/builder/QuestionnaireBuilderPage";
+import { QuestionnaireCreatePage } from "@/components/QuestionnaireV2/manage/QuestionnaireCreatePage";
+import { QuestionnaireDetailPage } from "@/components/QuestionnaireV2/manage/QuestionnaireDetailPage";
+import { QuestionnaireListPage } from "@/components/QuestionnaireV2/manage/QuestionnaireListPage";
+import { QuestionnaireRevisionPage } from "@/components/QuestionnaireV2/manage/QuestionnaireRevisionPage";
 import { ValueSetEditor } from "@/components/ValueSet/ValueSetEditor";
 import { ValueSetList } from "@/components/ValueSet/ValueSetList";
 
@@ -16,17 +19,41 @@ import { PlugConfigList } from "@/pages/Apps/PlugConfigList";
 import PatientIdentifierConfigForm from "@/pages/settings/patientIdentifierConfig/PatientIdentifierConfigForm";
 import PatientIdentifierConfigList from "@/pages/settings/patientIdentifierConfig/PatientIdentifierConfigList";
 
+const INSTANCE_SCOPE = {
+  authContext: "instance",
+  basePath: "/admin/questionnaires",
+} as const;
+
 const AdminRoutes: AppRoutes = {
-  "/admin/questionnaire": () => <QuestionnaireList />,
-  "/admin/questionnaire/create": () => <QuestionnaireEditor />,
-  "/admin/questionnaire/:slug/edit": ({ slug }) => (
-    <QuestionnaireEditor slug={slug} />
+  "/admin/questionnaires": () => (
+    <QuestionnaireListPage scope={INSTANCE_SCOPE} />
+  ),
+  // Must be registered before "/admin/questionnaires/:id" — raviger matches
+  // routes in object order, and "new" would otherwise be captured as an :id.
+  "/admin/questionnaires/new": () => (
+    <QuestionnaireCreatePage scope={INSTANCE_SCOPE} />
+  ),
+  // Must be registered before "/admin/questionnaires/:id" for the same
+  // reason — otherwise "edit" would be captured as an :id.
+  "/admin/questionnaires/:id/edit": ({ id }) => (
+    <QuestionnaireBuilderPage scope={INSTANCE_SCOPE} id={id} />
+  ),
+  // Registered before "/admin/questionnaires/:id" like the routes above.
+  "/admin/questionnaires/:id/versions/:revisionId": ({ id, revisionId }) => (
+    <QuestionnaireRevisionPage
+      scope={INSTANCE_SCOPE}
+      id={id}
+      revisionId={revisionId}
+    />
+  ),
+  "/admin/questionnaires/:id": ({ id }) => (
+    <QuestionnaireDetailPage scope={INSTANCE_SCOPE} id={id} />
   ),
   "/admin/valuesets": () => <ValueSetList />,
   "/admin/valuesets/create": () => (
     <ValueSetEditor onSuccess={() => navigate(`/admin/valuesets`)} />
   ),
-  "/admin/valuesets/:slug/edit": ({ slug }) => <ValueSetEditor slug={slug} />,
+  "/admin/valuesets/:id/edit": ({ id }) => <ValueSetEditor id={id} />,
   "/admin/patient_identifier_config": () => <PatientIdentifierConfigList />,
   "/admin/patient_identifier_config/new": () => <PatientIdentifierConfigForm />,
   "/admin/patient_identifier_config/:id": ({ id }) => (

src/components/Encounter/EncounterCommandDialog.tsx

@@ -24,7 +24,7 @@ import {
   RotateCcw,
   Users,
 } from "lucide-react";
-import { useCallback, useEffect, useMemo, useState } from "react";
+import { useCallback, useMemo, useState } from "react";
 
 import { PLUGIN_Component } from "@/PluginEngine";
 import query from "@/Utils/request/query";
@@ -85,11 +85,15 @@ export function EncounterCommandDialog({
     }),
   });
 
-  useEffect(() => {
-    if (!open) {
-      setSearch("");
-    }
-  }, [open]);
+  const handleOpenChange = useCallback(
+    (nextOpen: boolean) => {
+      if (!nextOpen) {
+        setSearch("");
+      }
+      onOpenChange(nextOpen);
+    },
+    [onOpenChange],
+  );
 
   const getShortcutDisplay = useShortcutDisplay();
 
@@ -182,8 +186,8 @@ export function EncounterCommandDialog({
 
       // Handle dynamic questionnaire actions
       if (actionId.startsWith("questionnaire-")) {
-        const slug = actionId.replace("questionnaire-", "");
-        navigate(buildEncounterUrl(`/questionnaire/${slug}`));
+        const questionnaireId = actionId.replace("questionnaire-", "");
+        navigate(buildEncounterUrl(`/questionnaire/${questionnaireId}`));
       }
     },
     [navigate, buildEncounterUrl, actions, encounter],
@@ -407,10 +411,10 @@ export function EncounterCommandDialog({
         group: t("questionnaire"),
         items: [
           ...(questionnaires?.results || []).map((option) => ({
-            id: `questionnaire-${option.slug}`,
+            id: `questionnaire-${option.id}`,
             label: option.title,
             icon: <NotebookPen />,
-            shortcut: getShortcutDisplay(`questionnaire-${option.slug}`),
+            shortcut: getShortcutDisplay(`questionnaire-${option.id}`),
           })),
         ],
       });
@@ -420,12 +424,10 @@ export function EncounterCommandDialog({
   }, [
     t,
     questionnaires,
-    search,
     getShortcutDisplay,
     canWriteSelectedEncounter,
     canRestartSelectedEncounter,
-    encounter.encounter_class,
-    encounter.status,
+    encounter,
   ]);
 
   const findRecentActions = useCallback(
@@ -459,9 +461,9 @@ export function EncounterCommandDialog({
     (actionId: string) => {
       addRecentAction(actionId);
       handleAction(actionId);
-      onOpenChange(false);
+      handleOpenChange(false);
     },
-    [handleAction, onOpenChange, addRecentAction],
+    [handleAction, handleOpenChange, addRecentAction],
   );
 
   const careApps = useCareApps();
@@ -471,7 +473,7 @@ export function EncounterCommandDialog({
       {trigger}
       <CommandDialog
         open={open}
-        onOpenChange={onOpenChange}
+        onOpenChange={handleOpenChange}
         className="md:max-w-2xl"
       >
         <div className="border-b border-gray-100 shadow-xs">

src/components/Patient/EncounterQuestionnaire.tsx

@@ -18,15 +18,15 @@ interface Props {
   facilityId?: string;
   patientId: string;
   encounterId?: string;
-  questionnaireSlug?: string;
+  questionnaireId?: string;
   subjectType?: string;
 }
 
 export default function EncounterQuestionnaire({
   facilityId,
   patientId,
   encounterId,
-  questionnaireSlug,
+  questionnaireId,
   subjectType,
 }: Props) {
   const { t } = useTranslation();
@@ -64,7 +64,7 @@ export default function EncounterQuestionnaire({
               patientId={patientId}
               subjectType={subjectType}
               encounterId={encounterId}
-              questionnaireSlug={questionnaireSlug}
+              questionnaireId={questionnaireId}
               onSubmit={() => {
                 if (encounterId && facilityId) {
                   navigate(