diff --git a/backend/src/types/models/code-tables/index.ts b/backend/src/types/models/code-tables/index.ts index 196253555..4432cba00 100644 --- a/backend/src/types/models/code-tables/index.ts +++ b/backend/src/types/models/code-tables/index.ts @@ -51,7 +51,6 @@ export const AvailableCodeTables = [ "equipment", "gir-type", "discharge", - "rationale", "non-compliance", "sector", "schedule", diff --git a/backend/src/types/models/code-tables/rationale.ts b/backend/src/types/models/code-tables/rationale.ts deleted file mode 100644 index 0f4f4db08..000000000 --- a/backend/src/types/models/code-tables/rationale.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { BaseCodeTable } from "./code-table"; - -export interface Rationale extends BaseCodeTable { - rationale: string; -} diff --git a/backend/src/v1/code-table/code-table.service.ts b/backend/src/v1/code-table/code-table.service.ts index 481c03f00..964f43f51 100644 --- a/backend/src/v1/code-table/code-table.service.ts +++ b/backend/src/v1/code-table/code-table.service.ts @@ -52,7 +52,6 @@ import { SectorCode } from "src/types/models/code-tables/sector-code"; import { Discharge } from "src/types/models/code-tables/discharge"; import { NonCompliance } from "src/types/models/code-tables/non-compliance"; import { DecisionType } from "src/types/models/code-tables/decision-type"; -import { Rationale } from "src/types/models/code-tables/rationale"; import { TeamCode } from "../team_code/entities/team_code.entity"; import { TeamType } from "src/types/models/code-tables/team-type"; import { CompMthdRecvCdAgcyCdXref } from "../comp_mthd_recv_cd_agcy_cd_xref/entities/comp_mthd_recv_cd_agcy_cd_xref"; @@ -608,24 +607,6 @@ export class CodeTableService { ); return results; } - case "rationale": { - const { data } = await get(token, { - query: "{rationaleCodes{rationaleCode shortDescription longDescription displayOrder activeIndicator}}", - }); - const results = data.rationaleCodes.map( - ({ rationaleCode, shortDescription, longDescription, displayOrder, activeIndicator }) => { - const table: Rationale = { - rationale: rationaleCode, - shortDescription: shortDescription, - longDescription: longDescription, - displayOrder: displayOrder, - isActive: activeIndicator, - }; - return table; - }, - ); - return results; - } case "non-compliance": { const { data } = await get(token, { query: diff --git a/frontend/src/app/components/containers/complaints/outcomes/ceeb/ceeb-decision/decision-form.tsx b/frontend/src/app/components/containers/complaints/outcomes/ceeb/ceeb-decision/decision-form.tsx index 6336ece17..15c7e4394 100644 --- a/frontend/src/app/components/containers/complaints/outcomes/ceeb/ceeb-decision/decision-form.tsx +++ b/frontend/src/app/components/containers/complaints/outcomes/ceeb/ceeb-decision/decision-form.tsx @@ -3,7 +3,6 @@ import { useAppDispatch, useAppSelector } from "../../../../../../hooks/hooks"; import { selectDischargeDropdown, selectNonComplianceDropdown, - selectRationaleDropdown, selectSectorDropdown, selectScheduleDropdown, selectDecisionTypeDropdown, @@ -26,6 +25,7 @@ import { getComplaintById, selectComplaintCallerInformation } from "../../../../ import { ToggleError } from "../../../../../../common/toast"; import COMPLAINT_TYPES from "../../../../../../types/app/complaint-types"; +import { ValidationTextArea } from "../../../../../../common/validation-textarea"; type props = { officerAssigned: string | null; @@ -70,7 +70,6 @@ export const DecisionForm: FC = ({ //-- drop-downs const dischargesOptions = useAppSelector(selectDischargeDropdown); const nonComplianceOptions = useAppSelector(selectNonComplianceDropdown); - const rationaleOptions = useAppSelector(selectRationaleDropdown); const sectorsOptions = useAppSelector(selectSectorDropdown); const schedulesOptions = useAppSelector(selectScheduleDropdown); const decisionTypeOptions = useAppSelector(selectDecisionTypeDropdown); @@ -82,7 +81,6 @@ export const DecisionForm: FC = ({ const [scheduleErrorMessage, setScheduleErrorMessage] = useState(""); const [sectorErrorMessage, setSectorErrorMessage] = useState(""); const [dischargeErrorMessage, setDischargeErrorMessage] = useState(""); - const [rationaleErrorMessage] = useState(""); const [nonComplianceErrorMessage] = useState(""); const [dateActionTakenErrorMessage, setDateActionTakenErrorMessage] = useState(""); const [leadAgencyErrorMessage, setLeadAgencyErrorMessage] = useState(""); @@ -146,12 +144,6 @@ export const DecisionForm: FC = ({ break; } - case "rationale": { - const { rationale } = data; - result = rationaleOptions.find((item) => item.value === rationale); - break; - } - case "leadAgency": { const { leadAgency } = data; result = leadAgencyOptions.find((item) => item.value === leadAgency); @@ -181,6 +173,10 @@ export const DecisionForm: FC = ({ updateModel("assignedTo", value); }; + const handleRationaleChange = (value: string) => { + updateModel("rationale", value.trim()); + }; + const handleDateChange = (date?: Date) => { updateModel("actionTakenDate", date); }; @@ -508,18 +504,14 @@ export const DecisionForm: FC = ({ >
- { - updateModel("rationale", evt?.value); - }} - value={getValue("rationale")} + defaultValue={rationale} + rows={2} + errMsg={""} + maxLength={4000} + onChange={handleRationaleChange} />
diff --git a/frontend/src/app/components/containers/complaints/outcomes/ceeb/ceeb-decision/decision-item.tsx b/frontend/src/app/components/containers/complaints/outcomes/ceeb/ceeb-decision/decision-item.tsx index 478cf652a..97974b523 100644 --- a/frontend/src/app/components/containers/complaints/outcomes/ceeb/ceeb-decision/decision-item.tsx +++ b/frontend/src/app/components/containers/complaints/outcomes/ceeb/ceeb-decision/decision-item.tsx @@ -5,7 +5,6 @@ import { selectLeadAgencyDropdown } from "../../../../../../store/reducers/code- import { selectDischargeDropdown, selectNonComplianceDropdown, - selectRationaleDropdown, selectSectorDropdown, selectScheduleDropdown, selectDecisionTypeDropdown, @@ -44,7 +43,6 @@ export const DecisionItem: FC = ({ //-- drop-downs const dischargesOptions = useAppSelector(selectDischargeDropdown); const nonComplianceOptions = useAppSelector(selectNonComplianceDropdown); - const rationaleOptions = useAppSelector(selectRationaleDropdown); const sectorsOptions = useAppSelector(selectSectorDropdown); const schedulesOptions = useAppSelector(selectScheduleDropdown); const decisionTypeOptions = useAppSelector(selectDecisionTypeDropdown); @@ -75,11 +73,6 @@ export const DecisionItem: FC = ({ break; } - case "rationale": { - result = rationaleOptions.find((item) => item.value === rationale); - break; - } - case "leadAgency": { result = agencyOptions.find((item) => item.value === leadAgency); break; @@ -136,7 +129,7 @@ export const DecisionItem: FC = ({
Rationale
-
{getValue("rationale")?.label}
+
{rationale}
Assigned to
diff --git a/frontend/src/app/constants/code-table-types.ts b/frontend/src/app/constants/code-table-types.ts index 77e5d9d46..10e4d42b7 100644 --- a/frontend/src/app/constants/code-table-types.ts +++ b/frontend/src/app/constants/code-table-types.ts @@ -27,7 +27,6 @@ export const CODE_TABLE_TYPES = { GIR_TYPE: "gir-type", DISCHARGE: "discharge", NON_COMPLIANCE: "non-compliance", - RATIONALE: "rationale", SECTOR: "sector", SCHEDULE: "schedule", DECISION_TYPE: "decision-type", diff --git a/frontend/src/app/store/reducers/code-table-selectors.ts b/frontend/src/app/store/reducers/code-table-selectors.ts index 466a10693..513935be9 100644 --- a/frontend/src/app/store/reducers/code-table-selectors.ts +++ b/frontend/src/app/store/reducers/code-table-selectors.ts @@ -25,18 +25,6 @@ export const selectNonComplianceDropdown = (state: RootState): Array