Merge branch 'develop' into extra-vertical-scrollbar

ohcnetwork · Feb 28, 2025 · 859d16e · 859d16e
2 parents 82e7dc3 + 3b16dc7
commit 859d16e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 329 deletions.
diff --git a/src/Routers/routes/adminRoutes.tsx b/src/Routers/routes/adminRoutes.tsx
@@ -1,6 +1,5 @@
 import QuestionnaireEditor from "@/components/Questionnaire/QuestionnaireEditor";
 import { QuestionnaireList } from "@/components/Questionnaire/QuestionnaireList";
-import { QuestionnaireShow } from "@/components/Questionnaire/show";
 import { ValueSetEditor } from "@/components/ValueSet/ValueSetEditor";
 import { ValueSetList } from "@/components/ValueSet/ValueSetList";
 
@@ -9,7 +8,6 @@ import { AppRoutes } from "@/Routers/AppRouter";
 const AdminRoutes: AppRoutes = {
   "/admin/questionnaire": () => <QuestionnaireList />,
   "/admin/questionnaire/create": () => <QuestionnaireEditor />,
-  "/admin/questionnaire/:id": ({ id }) => <QuestionnaireShow id={id} />,
   "/admin/questionnaire/:id/edit": ({ id }) => <QuestionnaireEditor id={id} />,
   "/admin/valuesets": () => <ValueSetList />,
   "/admin/valuesets/create": () => <ValueSetEditor />,

diff --git a/src/components/Questionnaire/QuestionnaireList.tsx b/src/components/Questionnaire/QuestionnaireList.tsx
@@ -50,7 +50,7 @@ const RenderCard = ({
             key={questionnaire.id}
             className="overflow-hidden bg-white rounded-lg cursor-pointer transition-shadow transform hover:shadow-lg"
             onClick={() =>
-              navigate(`/admin/questionnaire/${questionnaire.slug}`)
+              navigate(`/admin/questionnaire/${questionnaire.slug}/edit`)
             }
           >
             <CardContent className="p-6 relative flex flex-col">
@@ -117,7 +117,7 @@ const RenderCard = ({
                   size="sm"
                   onClick={(e) => {
                     e.stopPropagation();
-                    navigate(`/admin/questionnaire/${questionnaire.slug}`);
+                    navigate(`/admin/questionnaire/${questionnaire.slug}/edit`);
                   }}
                   className="font-semibold shadow-gray-300 text-gray-950 border-gray-400"
                 >
@@ -163,7 +163,7 @@ const RenderTable = ({
                 key={questionnaire.id}
                 className="cursor-pointer hover:bg-gray-50"
                 onClick={() =>
-                  navigate(`/admin/questionnaire/${questionnaire.slug}`)
+                  navigate(`/admin/questionnaire/${questionnaire.slug}/edit`)
                 }
               >
                 <TableCell className="px-6 py-2">

diff --git a/src/components/Questionnaire/show.tsx b/src/components/Questionnaire/show.tsx