Merge pull request #5119 from bcgov/fix-manual-handling-readonly-decision-and-back-url

Show director's decision read-only to analysts and fix manual handling back url

Author: Sepehr-Sobhani

bciers/apps/compliance/src/app/components/compliance-summary/manual-handling/internal/InternalManualHandlingComponent.tsx

@@ -10,7 +10,7 @@ import {
 import { ManualHandlingData } from "@/compliance/src/app/types";
 import { IChangeEvent } from "@rjsf/core";
 import { useSessionRole } from "@bciers/utils/src/sessionUtils";
-import { FrontEndRoles } from "@bciers/utils/src/enums";
+import { FrontEndRoles, ManualHandlingDecison } from "@bciers/utils/src/enums";
 import { actionHandler } from "@bciers/actions";
 import FormAlerts from "@bciers/components/form/FormAlerts";
 import SubmitButton from "@bciers/components/button/SubmitButton";
@@ -47,7 +47,7 @@ const InternalManualHandlingComponent = ({
   // Success state for the Submit button
   const [isSuccess, setIsSuccess] = useState(false);
 
-  const backUrl = `/compliance-administration/compliance-summaries/${complianceReportVersionId}/review-compliance-earned-credits-report`;
+  const backUrl = `/compliance-administration/compliance-summaries`;
 
   const isAnalystLockedByDirector =
     isCasAnalyst && formData._initial_director_decision === "issue_resolved";
@@ -106,6 +106,8 @@ const InternalManualHandlingComponent = ({
       uiSchema={internalManualHandlingUiSchema(
         initialFormData.analyst_submitted_date || "",
         initialFormData.analyst_submitted_by || "",
+        isCasDirector,
+        formData.director_decision as ManualHandlingDecison | undefined,
       )}
       formData={formData}
       onSubmit={handleSubmit}

bciers/apps/compliance/src/app/data/jsonSchema/manualHandling/internal/internalManualHandlingSchema.tsx

@@ -215,6 +215,8 @@ const getAnalystSubmissionInfoElement = (
 export const internalManualHandlingUiSchema = (
   analystSubmittedDate?: string,
   analystSubmittedBy?: string,
+  isDirectorDecisionEditable: boolean = false,
+  directorDecision?: ManualHandlingDecison,
 ): UiSchema => ({
   "ui:FieldTemplate": FieldTemplate,
   "ui:classNames": "form-heading-label",
@@ -258,9 +260,19 @@ export const internalManualHandlingUiSchema = (
     ),
   },
 
-  director_decision: {
-    "ui:widget": "RadioWidget",
-    "ui:classNames": "md:gap-16 [&>div:nth-child(2)]:w-full",
-    "ui:options": { inline: false },
-  },
+  director_decision: isDirectorDecisionEditable
+    ? {
+        "ui:widget": "RadioWidget",
+        "ui:classNames": "md:gap-16 [&>div:nth-child(2)]:w-full",
+        "ui:options": { inline: false },
+      }
+    : {
+        "ui:widget": "ReadOnlyRadioWidget",
+        "ui:classNames": "md:gap-16 [&>div:nth-child(2)]:w-full",
+        "ui:options": {
+          customizedValue: directorDecision
+            ? MANUAL_HANDLING_DECISION_LABELS[directorDecision]
+            : "",
+        },
+      },
 });

bciers/apps/compliance/src/tests/components/compliance-summary/manual-handling/internal/InternalManualHandlingComponent.test.tsx

@@ -5,6 +5,7 @@ import { FrontEndRoles } from "@bciers/utils/src/enums";
 import InternalManualHandlingComponent from "@/compliance/src/app/components/compliance-summary/manual-handling/internal/InternalManualHandlingComponent";
 import { ManualHandlingData } from "@/compliance/src/app/types";
 import { actionHandler } from "@bciers/actions";
+import expectRadio from "@bciers/testConfig/helpers/expectRadio";
 
 // Mock actionHandler so submit doesn't actually call the API
 vi.mock("@bciers/actions", () => ({
@@ -101,7 +102,7 @@ describe("InternalManualHandlingComponent", () => {
     expect(screen.getByText("The issue has been resolved.")).toBeVisible();
   });
 
-  it("navigates back to the earned credits review page when Back is clicked", () => {
+  it("navigates back to the compliance summaries grid when Back is clicked", () => {
     render(
       <InternalManualHandlingComponent
         initialFormData={baseFormData}
@@ -115,10 +116,38 @@ describe("InternalManualHandlingComponent", () => {
     fireEvent.click(backButton);
 
     expect(mockRouterPush).toHaveBeenCalledWith(
-      `/compliance-administration/compliance-summaries/${CRV_ID}/review-compliance-earned-credits-report`,
+      "/compliance-administration/compliance-summaries",
     );
   });
 
+  it("shows the director's decision as read-only text for CAS analysts", () => {
+    render(
+      <InternalManualHandlingComponent
+        initialFormData={baseFormData}
+        complianceReportVersionId={CRV_ID}
+      />,
+    );
+
+    expect(screen.getByText("Pending manual handling")).toBeVisible();
+    expect(screen.queryByRole("radio")).toBeNull();
+  });
+
+  it("shows the director's decision as radio options for CAS directors", () => {
+    useSessionRole.mockReturnValue(FrontEndRoles.CAS_DIRECTOR);
+
+    render(
+      <InternalManualHandlingComponent
+        initialFormData={baseFormData}
+        complianceReportVersionId={CRV_ID}
+      />,
+    );
+
+    expect(screen.getByText("Pending manual handling")).toBeVisible();
+    expect(screen.getByText("Issue has been resolved")).toBeVisible();
+    expectRadio(/Pending manual handling/i);
+    expectRadio(/Issue has been resolved/i);
+  });
+
   it("submits updated analyst_comment and director_decision when Submit is clicked", async () => {
     render(
       <InternalManualHandlingComponent

bciers/libs/testConfig/src/helpers/expectRadio.ts

@@ -1,9 +1,18 @@
 import { screen } from "@testing-library/react";
 import { expect } from "vitest";
 
+/**
+ * Assert that a radio option exists under the given accessible name.
+ *
+ * Uses toBeInTheDocument rather than toBeVisible on purpose: MUI renders the
+ * real <input type="radio"> visually hidden (PrivateSwitchBase-input, zero
+ * opacity) behind the painted SVG control, so toBeVisible always fails on it;
+ * assert toBeVisible on the option's label if you also need to prove the user
+ * can see it.
+ */
 export const expectRadio = (label: RegExp) => {
   const radio = screen.getByRole("radio", { name: label });
-  expect(radio).toBeInTheDocument(); // Verify that the radio button is visible
+  expect(radio).toBeInTheDocument();
 };
 
 export default expectRadio;