From 3b16dc73139de4802030ff2af275258a18474f0d Mon Sep 17 00:00:00 2001 From: Amjith Titus Date: Fri, 28 Feb 2025 12:00:50 +0530 Subject: [PATCH] Remove Questionnaire show screen (#10864) --- src/Routers/routes/adminRoutes.tsx | 2 - .../Questionnaire/QuestionnaireList.tsx | 2 +- src/components/Questionnaire/show.tsx | 324 ------------------ 3 files changed, 1 insertion(+), 327 deletions(-) delete mode 100644 src/components/Questionnaire/show.tsx diff --git a/src/Routers/routes/adminRoutes.tsx b/src/Routers/routes/adminRoutes.tsx index abbc7bef952..bbf0aa1e185 100644 --- 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": () => , "/admin/questionnaire/create": () => , - "/admin/questionnaire/:id": ({ id }) => , "/admin/questionnaire/:id/edit": ({ id }) => , "/admin/valuesets": () => , "/admin/valuesets/create": () => , diff --git a/src/components/Questionnaire/QuestionnaireList.tsx b/src/components/Questionnaire/QuestionnaireList.tsx index b046f818d10..d3ba62e4f70 100644 --- a/src/components/Questionnaire/QuestionnaireList.tsx +++ b/src/components/Questionnaire/QuestionnaireList.tsx @@ -109,7 +109,7 @@ export function QuestionnaireList() { - navigate(`/admin/questionnaire/${questionnaire.slug}`) + navigate(`/admin/questionnaire/${questionnaire.slug}/edit`) } className="cursor-pointer hover:bg-gray-50" > diff --git a/src/components/Questionnaire/show.tsx b/src/components/Questionnaire/show.tsx deleted file mode 100644 index 62868e5ed67..00000000000 --- a/src/components/Questionnaire/show.tsx +++ /dev/null @@ -1,324 +0,0 @@ -import { useMutation, useQuery } from "@tanstack/react-query"; -import { Tags } from "lucide-react"; -import { useNavigate } from "raviger"; -import { useState } from "react"; - -import { cn } from "@/lib/utils"; - -import CareIcon from "@/CAREUI/icons/CareIcon"; - -import { Alert, AlertDescription, AlertTitle } from "@/components/ui/alert"; -import { - AlertDialog, - AlertDialogAction, - AlertDialogCancel, - AlertDialogContent, - AlertDialogDescription, - AlertDialogFooter, - AlertDialogHeader, - AlertDialogTitle, -} from "@/components/ui/alert-dialog"; -import { Badge } from "@/components/ui/badge"; -import { Button, buttonVariants } from "@/components/ui/button"; -import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card"; -import { - DropdownMenu, - DropdownMenuContent, - DropdownMenuItem, - DropdownMenuSeparator, - DropdownMenuTrigger, -} from "@/components/ui/dropdown-menu"; -import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs"; - -import Loading from "@/components/Common/Loading"; - -import mutate from "@/Utils/request/mutate"; -import query from "@/Utils/request/query"; -import type { Question } from "@/types/questionnaire/question"; -import questionnaireApi from "@/types/questionnaire/questionnaireApi"; - -import CloneQuestionnaireSheet from "./CloneQuestionnaireSheet"; -import ManageQuestionnaireOrganizationsSheet from "./ManageQuestionnaireOrganizationsSheet"; -import ManageQuestionnaireTagsSheet from "./ManageQuestionnaireTagsSheet"; -import { QuestionnaireForm } from "./QuestionnaireForm"; - -interface QuestionnaireShowProps { - id: string; -} - -type TabValue = "preview" | "details"; - -function QuestionItem({ - question, - depth = 0, -}: { - question: Question; - depth?: number; -}) { - const isGroup = question.type === "group"; - - return ( -
0 ? "border-l border-gray-200" : ""}`}> -
-
-

{question.text}

-
- {question.type} - {question.required && Required} - {question.code && ( - - {question.code.display} - - )} -
-
-
- - {isGroup && question.questions && question.questions.length > 0 && ( -
- {question.questions.map((q: Question) => ( - - ))} -
- )} -
- ); -} - -export function QuestionnaireShow({ id }: QuestionnaireShowProps) { - const navigate = useNavigate(); - const [activeTab, setActiveTab] = useState("details"); - const [showDeleteDialog, setShowDeleteDialog] = useState(false); - - const { - data: questionnaire, - isLoading, - error, - } = useQuery({ - queryKey: ["questionnaireDetail", id], - queryFn: query(questionnaireApi.detail, { - pathParams: { id }, - }), - }); - - const { mutate: deleteQuestionnaire, isPending } = useMutation({ - mutationFn: mutate(questionnaireApi.delete, { - pathParams: { id }, - }), - onSuccess: () => { - navigate("/admin/questionnaire"); - }, - }); - - const handleDelete = () => { - deleteQuestionnaire({}); - }; - - if (isLoading) { - return ; - } - - if (error) { - return ( - - - Error - - Failed to load questionnaire. Please try again later. - - - ); - } - - if (!questionnaire) { - return ( - - - Not Found - - The requested questionnaire could not be found. - - - ); - } - - return ( -
-
-
-

{questionnaire.title}

-

{questionnaire.description}

-
-
- - - - - - - - e.preventDefault()}> - - Manage Organizations - - } - /> - e.preventDefault()}> - - Manage Tags - - } - /> - e.preventDefault()}> - - Clone Questionnaire - - } - /> - - setShowDeleteDialog(true)} - > - - Delete Questionnaire - - - - - - - - Delete Questionnaire - - Are you sure you want to delete this questionnaire? This - action cannot be undone. - - - - Cancel - - {isPending ? "Deleting..." : "Delete"} - - - - -
-
- - setActiveTab(value as TabValue)} - > - - Details - Preview Form - - - -
- - - Details - - -
-
-
- Status -
-
- - {questionnaire.status} - -
-
-
-
- Version -
-
{questionnaire.version}
-
-
-
- Subject Type -
-
{questionnaire.subject_type}
-
-
-
-
- - - - Questions - - -
- {questionnaire.questions.map((question: Question) => ( - - ))} -
-
-
-
-
- - - - - {questionnaire.title} -

- {questionnaire.description} -

-
- - - -
-
-
-
- ); -}