Made changes to show both error messages for create donor cases and r…

…eissue new donor case
ONSdigital · Oct 28, 2024 · 64016e9 · 64016e9
1 parent 1be9226
commit 64016e9
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 16 deletions.
diff --git a/src/components/createDonorCasePage/createDonorCasesConfirmation.tsx b/src/components/createDonorCasePage/createDonorCasesConfirmation.tsx
@@ -33,7 +33,7 @@ function CreateDonorCasesConfirmation(): ReactElement {
             };
         }
         isLoading(false);
-        navigate(`/questionnaire/${questionnaire.name}`, { state: { donorCasesResponseMessage: res.data, donorCasesStatusCode: res.status, questionnaire: questionnaire, role: role } });
+        navigate(`/questionnaire/${questionnaire.name}`, { state: { section: "createDonorCases", responseMessage: res.data, statusCode: res.status, questionnaire: questionnaire, role: role } });
     }
     if (loading) {
         return <ONSLoadingPanel />;
@@ -61,7 +61,7 @@ function CreateDonorCasesConfirmation(): ReactElement {
                             />
                             <ONSButton
                                 label="Cancel"
-                                onClick={() => navigate(`/questionnaire/${questionnaire.name}`, { state: { donorCasesResponseMessage: "", donorCasesStatusCode: 0, questionnaire: questionnaire, role: "" } })} primary={false} />
+                                onClick={() => navigate(`/questionnaire/${questionnaire.name}`, { state: { section: "createDonorCases", responseMessage: "", statusCode: 0, questionnaire: questionnaire, role: "" } })} primary={false} />
                         </>
                     )
                 }
@@ -70,4 +70,4 @@ function CreateDonorCasesConfirmation(): ReactElement {
     );
 }
 
-export default CreateDonorCasesConfirmation;
+export default CreateDonorCasesConfirmation;
diff --git a/src/components/questionnaireDetailsPage/questionnaireDetailsPage.tsx b/src/components/questionnaireDetailsPage/questionnaireDetailsPage.tsx
@@ -17,6 +17,7 @@ import ReissueNewDonorCase from "./sections/reissueNewDonorCase";
 import ReissueNewDonorCaseSummary from "../reissueNewDonorCasePage/reissueNewDonorCaseSummary";
 
 interface State {
+    section?: string;
     questionnaire: Questionnaire | null;
     responseMessage?: string;
     statusCode?: number;
@@ -33,7 +34,7 @@ function QuestionnaireDetailsPage(): ReactElement {
     const [loaded, setLoaded] = useState<boolean>(false);
     const initialState = location || { questionnaire: null };
     const { questionnaireName } = useParams();
-    const { responseMessage, statusCode, role } = location || { responseMessage: "", statusCode: 0, role: "" };
+    const { section, responseMessage, statusCode, role } = location || { section: "", responseMessage: "", statusCode: 0, role: "" };
 
     useEffect(() => {
         if (initialState.questionnaire === null) {
@@ -117,11 +118,11 @@ function QuestionnaireDetailsPage(): ReactElement {
                     {questionnaire.name}
                 </h1>
 
-                {responseMessage && statusCode && role && <CreateDonorCasesSummary donorCasesResponseMessage={responseMessage} donorCasesStatusCode={statusCode} role={role} />}
-                {responseMessage && statusCode && role && <ReissueNewDonorCaseSummary responseMessage={responseMessage} statusCode={statusCode} role={role} />}
+                {section === "createDonorCases" && responseMessage && statusCode && role && <CreateDonorCasesSummary donorCasesResponseMessage={responseMessage} donorCasesStatusCode={statusCode} role={role} />}
+                {section === "reissueNewDonorCase" && responseMessage && statusCode && role && <ReissueNewDonorCaseSummary responseMessage={responseMessage} statusCode={statusCode} role={role} />}
                 <QuestionnaireDetails questionnaire={questionnaire} modes={modes} />
                 {questionnaire.name.includes("IPS") && <CreateDonorCases questionnaire={questionnaire} />}
-                <ReissueNewDonorCase questionnaire={questionnaire} />
+                {questionnaire.name.includes("IPS") && <ReissueNewDonorCase questionnaire={questionnaire} />}
                 <CatiModeDetails questionnaireName={questionnaire.name} modes={modes} />
                 <CawiModeDetails questionnaire={questionnaire} modes={modes} />
                 <TotalmobileDetails questionnaireName={questionnaire.name} />

diff --git a/src/components/questionnaireDetailsPage/sections/createDonorCases.tsx b/src/components/questionnaireDetailsPage/sections/createDonorCases.tsx
@@ -38,7 +38,7 @@ function CreateDonorCases({ questionnaire }: Props): ReactElement {
                                     </td>
                                     <td className="ons-summary__values" colSpan={2}>
                                         <Link to="/createDonorCasesConfirmation"
-                                            state={{ questionnaire: questionnaire, role: role }}
+                                            state={{ section: "createDonorCases", questionnaire: questionnaire, role: role }}
                                             className="ons-summary__button"
                                             aria-label={`Create donor cases for questionnaire ${questionnaire.name}`}>
                                             Create cases

diff --git a/src/components/questionnaireDetailsPage/sections/reissueNewDonorCase.tsx b/src/components/questionnaireDetailsPage/sections/reissueNewDonorCase.tsx
@@ -15,12 +15,6 @@ function ReissueNewDonorCase({ questionnaire }: Props): ReactElement {
                 <div className="ons-summary__group">
                     <h2 className="ons-summary__group-title">Reissue New Donor Case for User</h2>
                     <table className="ons-summary__items">
-                        <thead className="ons-u-vh">
-                            <tr>
-                                <th>Detail</th>
-                                <th>Output</th>
-                            </tr>
-                        </thead>
                         <tbody className="ons-summary__item">
                             <tr className="ons-summary__row ons-summary__row--has-values">
                                 <td className="ons-summary__item-title">
@@ -39,6 +33,7 @@ function ReissueNewDonorCase({ questionnaire }: Props): ReactElement {
                                     <Link
                                         to="/reissueNewDonorCaseConfirmation"
                                         state={{
+                                            section: "reissueNewDonorCase",
                                             questionnaire: questionnaire,
                                             user: user
                                         }}

diff --git a/src/components/reissueNewDonorCasePage/reissueNewDonorCaseConfirmation.tsx b/src/components/reissueNewDonorCasePage/reissueNewDonorCaseConfirmation.tsx
@@ -33,7 +33,7 @@ function ReissueNewDonorCaseConfirmation(): ReactElement {
             };
         }
         isLoading(false);
-        navigate(`/questionnaire/${questionnaire.name}`, { state: { reissueNewDonorCaseResponseMessage: res.data, reissueNewDonorCaseStatusCode: res.status, questionnaire: questionnaire, user: user } });
+        navigate(`/questionnaire/${questionnaire.name}`, { state: { section: "reissueNewDonorCase", responseMessage: res.data, statusCode: res.status, questionnaire: questionnaire, role: user } });
     }
     if (loading) {
         return <ONSLoadingPanel />;
@@ -61,7 +61,7 @@ function ReissueNewDonorCaseConfirmation(): ReactElement {
                             />
                             <ONSButton
                                 label="Cancel"
-                                onClick={() => navigate(`/questionnaire/${questionnaire.name}`, { state: { reissueNewDonorCaseResponseMessage: "", reissueNewDonorCaseStatusCode: 0, questionnaire: questionnaire, user: "" } })} primary={false} />
+                                onClick={() => navigate(`/questionnaire/${questionnaire.name}`, { state: { section: "reissueNewDonorCase", responseMessage: "", statusCode: 0, questionnaire: questionnaire, role: "" } })} primary={false} />
                         </>
                     )
                 }