From 5fa44e32d7afa92cccd9252b9aee403e4b1a2c01 Mon Sep 17 00:00:00 2001
From: gregorylavery <100631366+gregorylavery@users.noreply.github.com>
Date: Thu, 26 Sep 2024 14:16:04 -0700
Subject: [PATCH 1/7] Recreated the fixes directly on the Orca release avoiding
 the rebase.

---
 backend/src/types/models/code-tables/index.ts |  1 +
 .../code-tables/schedule-sector-xref.ts       |  6 ++++++
 .../src/v1/code-table/code-table.service.ts   | 20 ++++++++++++++++++
 .../ceeb/ceeb-decision/decision-form.tsx      | 21 +++++++++++++++++--
 .../ceeb/ceeb-decision/decision-item.tsx      | 11 +++++++++-
 .../src/app/constants/code-table-types.ts     |  2 ++
 frontend/src/app/store/migrations.ts          |  2 ++
 .../src/app/store/migrations/migration-18.ts  | 12 +++++++++++
 .../store/reducers/code-table-selectors.ts    | 18 ++++++++++++++++
 .../app/store/reducers/code-table-thunks.ts   | 11 ++++++++++
 frontend/src/app/store/reducers/code-table.ts | 12 +++++++++--
 .../app/code-tables/schedule-sector-xref.ts   |  6 ++++++
 .../app/types/code-tables/schedule-sector.ts  |  4 ++++
 .../src/app/types/state/code-table-state.ts   |  3 +++
 14 files changed, 124 insertions(+), 5 deletions(-)
 create mode 100644 backend/src/types/models/code-tables/schedule-sector-xref.ts
 create mode 100644 frontend/src/app/store/migrations/migration-18.ts
 create mode 100644 frontend/src/app/types/app/code-tables/schedule-sector-xref.ts
 create mode 100644 frontend/src/app/types/code-tables/schedule-sector.ts

diff --git a/backend/src/types/models/code-tables/index.ts b/backend/src/types/models/code-tables/index.ts
index 196253555..bfea70379 100644
--- a/backend/src/types/models/code-tables/index.ts
+++ b/backend/src/types/models/code-tables/index.ts
@@ -55,6 +55,7 @@ export const AvailableCodeTables = [
   "non-compliance",
   "sector",
   "schedule",
+  "schedule-sector-type",
   "decision-type",
   "team",
   "complaint-method-received-codes",
diff --git a/backend/src/types/models/code-tables/schedule-sector-xref.ts b/backend/src/types/models/code-tables/schedule-sector-xref.ts
new file mode 100644
index 000000000..fd6de0e9a
--- /dev/null
+++ b/backend/src/types/models/code-tables/schedule-sector-xref.ts
@@ -0,0 +1,6 @@
+import { BaseCodeTable } from "./code-table";
+
+export interface ScheduleSectorXref extends BaseCodeTable {
+  schedule: string;
+  sector: 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..e5bb66d9d 100644
--- a/backend/src/v1/code-table/code-table.service.ts
+++ b/backend/src/v1/code-table/code-table.service.ts
@@ -57,6 +57,7 @@ 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";
 import { ComplaintMethodReceivedType } from "src/types/models/code-tables/complaint-method-received-type";
+import { ScheduleSectorXref } from "src/types/models/code-tables/schedule-sector-xref";
 
 @Injectable()
 export class CodeTableService {
@@ -590,6 +591,25 @@ export class CodeTableService {
         );
         return results;
       }
+      case "schedule-sector-type": {
+        const { data } = await get(token, {
+          query: "{scheduleSectorXrefs{scheduleCode sectorCode shortDescription longDescription activeIndicator}}",
+        });
+        const results = data.scheduleSectorXrefs.map(
+          ({ sectorCode, scheduleCode, shortDescription, longDescription, activeIndicator: isActive }) => {
+            const table: ScheduleSectorXref = {
+              schedule: scheduleCode,
+              sector: sectorCode,
+              shortDescription,
+              longDescription,
+              displayOrder: 1,
+              isActive,
+            };
+            return table;
+          },
+        );
+        return results;
+      }
       case "discharge": {
         const { data } = await get(token, {
           query: "{ dischargeCodes { dischargeCode shortDescription longDescription displayOrder activeIndicator} }",
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..74491abd3 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
@@ -7,6 +7,8 @@ import {
   selectSectorDropdown,
   selectScheduleDropdown,
   selectDecisionTypeDropdown,
+  selectScheduleSectorDropdown,
+  selectScheduleSectorXref,
 } from "../../../../../../store/reducers/code-table-selectors";
 import { selectLeadAgencyDropdown } from "../../../../../../store/reducers/code-table";
 import { Decision } from "../../../../../../types/app/case-files/ceeb/decision/decision";
@@ -77,6 +79,7 @@ export const DecisionForm: FC<props> = ({
   const leadAgencyOptions = useAppSelector(selectLeadAgencyDropdown);
   const { ownedByAgencyCode } = useAppSelector(selectComplaintCallerInformation);
   const officerOptions = useAppSelector(selectOfficersByAgencyDropdown(ownedByAgencyCode?.agency));
+  const scheduleSectorType = useAppSelector(selectScheduleSectorXref);
 
   //-- error messgaes
   const [scheduleErrorMessage, setScheduleErrorMessage] = useState("");
@@ -105,6 +108,8 @@ export const DecisionForm: FC<props> = ({
     actionTakenDate,
   });
 
+  const [_sector, setSector] = useState<Array<Option>>();
+
   useEffect(() => {
     if (officerAssigned) {
       applyData({ ...data, assignedTo: officerAssigned });
@@ -185,6 +190,16 @@ export const DecisionForm: FC<props> = ({
     updateModel("actionTakenDate", date);
   };
 
+  const handleScheduleChange = (schedule: string) => {
+    let options = scheduleSectorType.filter((item) => item.schedule === schedule).map(item => {
+      const record: Option = { label: item.longDescription, value: item.sector };
+      return record
+    });
+    const model = { ...data, sector: "", schedule: schedule };
+    applyData(model);
+    setSector(options);
+  };
+
   const handleActionTakenChange = (value: string) => {
     //-- if the action taken changes make sure to clear the
     //-- lead agency and inspection number
@@ -361,7 +376,9 @@ export const DecisionForm: FC<props> = ({
               errorMessage={scheduleErrorMessage}
               placeholder="Select "
               onChange={(evt) => {
-                updateModel("schedule", evt?.value);
+                if (evt?.value) {
+                  handleScheduleChange(evt.value);
+                }
               }}
               value={getValue("schedule")}
             />
@@ -377,7 +394,7 @@ export const DecisionForm: FC<props> = ({
               id="outcome-decision-sector-category"
               className="comp-details-input"
               classNamePrefix="comp-select"
-              options={sectorsOptions}
+              options={_sector}
               enableValidation={true}
               errorMessage={sectorErrorMessage}
               placeholder="Select "
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..90c8eb2c4 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
@@ -9,6 +9,7 @@ import {
   selectSectorDropdown,
   selectScheduleDropdown,
   selectDecisionTypeDropdown,
+  selectScheduleSectorDropdown,
 } from "../../../../../../store/reducers/code-table-selectors";
 import { selectOfficersDropdown } from "../../../../../../store/reducers/officer";
 import Option from "../../../../../../types/app/option";
@@ -47,6 +48,7 @@ export const DecisionItem: FC<props> = ({
   const rationaleOptions = useAppSelector(selectRationaleDropdown);
   const sectorsOptions = useAppSelector(selectSectorDropdown);
   const schedulesOptions = useAppSelector(selectScheduleDropdown);
+  const scheduleSectorsOptions = useAppSelector(selectScheduleSectorDropdown);
   const decisionTypeOptions = useAppSelector(selectDecisionTypeDropdown);
   const agencyOptions = useAppSelector(selectLeadAgencyDropdown);
   const officerOptions = useAppSelector(selectOfficersDropdown(true));
@@ -64,7 +66,14 @@ export const DecisionItem: FC<props> = ({
         result = sectorsOptions.find((item) => item.value === sector);
         break;
       }
-
+      case "schedule-sector": {
+        result = scheduleSectorsOptions.find((item) => item.value === sector);
+        break;
+      }
+      case "schedule-sector-type": {
+        result = scheduleSectorsOptions.find((item) => item.value === sector);
+        break;
+      }
       case "discharge": {
         result = dischargesOptions.find((item) => item.value === discharge);
         break;
diff --git a/frontend/src/app/constants/code-table-types.ts b/frontend/src/app/constants/code-table-types.ts
index 77e5d9d46..7357f5c89 100644
--- a/frontend/src/app/constants/code-table-types.ts
+++ b/frontend/src/app/constants/code-table-types.ts
@@ -34,6 +34,8 @@ export const CODE_TABLE_TYPES = {
   TEAM: "team",
   COMPLAINT_METHOD_RECEIVED: "complaint-method-received-codes",
   LEAD_AGENCY: "lead-agency",
+  SCHEDULE_SECTOR: "schedule-sector",
+  SCHEDULE_SECTOR_TYPE: "schedule-sector-type",
 
   //  ORGANIZATION_UNIT_TYPE: "organization-unit-type",
   //  ORGANIZATION_UNIT: "organization-unit",
diff --git a/frontend/src/app/store/migrations.ts b/frontend/src/app/store/migrations.ts
index 121b1f705..08389f6aa 100644
--- a/frontend/src/app/store/migrations.ts
+++ b/frontend/src/app/store/migrations.ts
@@ -14,6 +14,7 @@ import { AddTeamCode } from "./migrations/migration-14";
 import { Decision } from "./migrations/migration-15";
 import { AddComplaintMethodReceivedCodes } from "./migrations/migration-16";
 import { AddLeadAgencyCode } from "./migrations/migration-17";
+import { AddScheduleSectorTypes } from "./migrations/migration-18";
 
 const BaseMigration = {
   0: (state: any) => {
@@ -42,6 +43,7 @@ migration = {
   ...Decision,
   ...AddComplaintMethodReceivedCodes,
   ...AddLeadAgencyCode,
+  ...AddScheduleSectorTypes,
 };
 
 export default migration;
diff --git a/frontend/src/app/store/migrations/migration-18.ts b/frontend/src/app/store/migrations/migration-18.ts
new file mode 100644
index 000000000..8e870b269
--- /dev/null
+++ b/frontend/src/app/store/migrations/migration-18.ts
@@ -0,0 +1,12 @@
+//Add Schedule Sector Type Codes in code table
+export const AddScheduleSectorTypes = {
+  18: (state: any) => {
+    return {
+      ...state,
+      codeTables: {
+        ...state.codeTables,
+        "schedule-sector-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..2bf6ae536 100644
--- a/frontend/src/app/store/reducers/code-table-selectors.ts
+++ b/frontend/src/app/store/reducers/code-table-selectors.ts
@@ -1,5 +1,6 @@
 import { RootState } from "../store";
 import Option from "../../types/app/option";
+import { ScheduleSectorXref } from "../../types/app/code-tables/schedule-sector-xref";
 
 export const selectDischargeDropdown = (state: RootState): Array<Option> => {
   const {
@@ -48,7 +49,24 @@ export const selectSectorDropdown = (state: RootState): Array<Option> => {
 
   return data;
 };
+export const selectScheduleSectorDropdown = (state: RootState): Array<Option> => {
+  const {
+    codeTables: { sector: items, "schedule-sector": scheduleSector },
+  } = state;
+  let _scheduleSector = scheduleSector;
+  const data = items.map(({ sector: value, longDescription: label }) => {
+    return { label, value };
+  });
 
+  return data;
+};
+
+export const selectScheduleSectorXref = (state: RootState): Array<ScheduleSectorXref> => {
+  const {
+    codeTables: { "schedule-sector-type": scheduleSectorType },
+  } = state;
+  return scheduleSectorType;
+};
 export const selectScheduleDropdown = (state: RootState): Array<Option> => {
   const {
     codeTables: { schedule: items },
diff --git a/frontend/src/app/store/reducers/code-table-thunks.ts b/frontend/src/app/store/reducers/code-table-thunks.ts
index ec5f8dff3..89a647497 100644
--- a/frontend/src/app/store/reducers/code-table-thunks.ts
+++ b/frontend/src/app/store/reducers/code-table-thunks.ts
@@ -10,6 +10,7 @@ import { Sector } from "../../types/app/code-tables/sector";
 import { AppThunk } from "../store";
 import { setCodeTable } from "./code-table";
 import { DecisionType } from "../../types/app/code-tables/decision-type";
+import { ScheduleSectorXref } from "../../types/app/code-tables/schedule-sector-xref";
 
 export const fetchDischargeTypes = (): AppThunk => async (dispatch) => {
   const parameters = generateApiParameters(`${config.API_BASE_URL}/v1/code-table/${CODE_TABLE_TYPES.DISCHARGE}`);
@@ -50,7 +51,17 @@ export const fetchSectorTypes = (): AppThunk => async (dispatch) => {
     dispatch(setCodeTable(payload));
   }
 };
+export const fetchScheduleSectorTypes = (): AppThunk => async (dispatch) => {
+  const parameters = generateApiParameters(
+    `${config.API_BASE_URL}/v1/code-table/${CODE_TABLE_TYPES.SCHEDULE_SECTOR_TYPE}`,
+  );
 
+  const response = await get<Array<ScheduleSectorXref>>(dispatch, parameters);
+  if (response && from(response).any()) {
+    const payload = { key: CODE_TABLE_TYPES.SCHEDULE_SECTOR_TYPE, data: response };
+    dispatch(setCodeTable(payload));
+  }
+};
 export const fetchScheduleTypes = (): AppThunk => async (dispatch) => {
   const parameters = generateApiParameters(`${config.API_BASE_URL}/v1/code-table/${CODE_TABLE_TYPES.SCHEDULE}`);
 
diff --git a/frontend/src/app/store/reducers/code-table.ts b/frontend/src/app/store/reducers/code-table.ts
index 6be089b1e..139101f32 100644
--- a/frontend/src/app/store/reducers/code-table.ts
+++ b/frontend/src/app/store/reducers/code-table.ts
@@ -41,6 +41,7 @@ import {
   fetchSectorTypes,
   fetchScheduleTypes,
   fetchCEEBDecisionTypes,
+  fetchScheduleSectorTypes,
 } from "./code-table-thunks";
 import { TeamType } from "../../types/app/code-tables/team";
 
@@ -77,6 +78,8 @@ const initialState: CodeTableState = {
   sector: [],
   schedule: [],
   "decision-type": [],
+  scheduleSector: [],
+  "schedule-sector-type": [],
   team: [],
   "complaint-method-received-codes": [],
   "lead-agency": [],
@@ -135,9 +138,10 @@ export const fetchAllCodeTables = (): AppThunk => async (dispatch) => {
       discharge,
       "non-compliance": nonCompliance,
       rationale,
-      sector,
-      schedule,
+      sector: sector,
+      schedule: schedule,
       "decision-type": decisionType,
+      "schedule-sector-type": scheduleSectorType,
       team,
       "complaint-method-received-codes": complaintMethodReceived,
       "lead-agency": leadAgency,
@@ -249,6 +253,9 @@ export const fetchAllCodeTables = (): AppThunk => async (dispatch) => {
     if (!from(schedule).any()) {
       dispatch(fetchScheduleTypes());
     }
+    if (!from(scheduleSectorType).any()) {
+      dispatch(fetchScheduleSectorTypes());
+    }
     if (!from(decisionType).any()) {
       dispatch(fetchCEEBDecisionTypes());
     }
@@ -305,6 +312,7 @@ export const fetchCaseCodeTables = (): AppThunk => async (dispatch) => {
     dispatch(fetchSectorTypes());
     dispatch(fetchScheduleTypes());
     dispatch(fetchCEEBDecisionTypes());
+    dispatch(fetchScheduleSectorTypes());
     dispatch(fetchLeadAgencies());
   } catch (error) {
     console.error(error);
diff --git a/frontend/src/app/types/app/code-tables/schedule-sector-xref.ts b/frontend/src/app/types/app/code-tables/schedule-sector-xref.ts
new file mode 100644
index 000000000..c7f38bfcf
--- /dev/null
+++ b/frontend/src/app/types/app/code-tables/schedule-sector-xref.ts
@@ -0,0 +1,6 @@
+import { BaseCodeTable } from "./base-code-table";
+
+export interface ScheduleSectorXref extends BaseCodeTable {
+  schedule: string;
+  sector: string;
+}
diff --git a/frontend/src/app/types/code-tables/schedule-sector.ts b/frontend/src/app/types/code-tables/schedule-sector.ts
new file mode 100644
index 000000000..f88f81d39
--- /dev/null
+++ b/frontend/src/app/types/code-tables/schedule-sector.ts
@@ -0,0 +1,4 @@
+export interface ScheduleSector {
+  schedule: string;
+  sector: string;
+}
diff --git a/frontend/src/app/types/state/code-table-state.ts b/frontend/src/app/types/state/code-table-state.ts
index 2a0bd3de8..9ff98366f 100644
--- a/frontend/src/app/types/state/code-table-state.ts
+++ b/frontend/src/app/types/state/code-table-state.ts
@@ -35,6 +35,7 @@ import { Schedule } from "../app/code-tables/schedule";
 import { DecisionType } from "../app/code-tables/decision-type";
 import { TeamType } from "../app/code-tables/team";
 import { ComplaintMethodReceivedType } from "../app/code-tables/complaint-method-received-type";
+import { ScheduleSectorXref } from "../app/code-tables/schedule-sector-xref";
 
 export interface CodeTableState {
   [key: string]:
@@ -72,6 +73,7 @@ export interface CodeTableState {
     | Array<Sector>
     | Array<Schedule>
     | Array<GirType>
+    | Array<ScheduleSectorXref>
     | Array<ComplaintMethodReceivedType>
     | Array<DecisionType>
     | Array<TeamType>;
@@ -107,6 +109,7 @@ export interface CodeTableState {
   rationale: Array<Rationale>;
   sector: Array<Sector>;
   schedule: Array<Schedule>;
+  "schedule-sector-type": Array<ScheduleSectorXref>;
   "decision-type": Array<DecisionType>;
   team: Array<TeamType>;
   "complaint-method-received-codes": Array<ComplaintMethodReceivedType>;

From d3bd77718ee756d54d0015eb49865fb728c3762a Mon Sep 17 00:00:00 2001
From: gregorylavery <100631366+gregorylavery@users.noreply.github.com>
Date: Thu, 26 Sep 2024 14:41:32 -0700
Subject: [PATCH 2/7] Fixes for sonarCloud suggestions.

---
 .../outcomes/ceeb/ceeb-decision/decision-form.tsx   | 13 ++++++-------
 frontend/src/app/store/reducers/code-table.ts       |  4 ++--
 2 files changed, 8 insertions(+), 9 deletions(-)

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 74491abd3..849a8368f 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
@@ -7,7 +7,6 @@ import {
   selectSectorDropdown,
   selectScheduleDropdown,
   selectDecisionTypeDropdown,
-  selectScheduleSectorDropdown,
   selectScheduleSectorXref,
 } from "../../../../../../store/reducers/code-table-selectors";
 import { selectLeadAgencyDropdown } from "../../../../../../store/reducers/code-table";
@@ -95,7 +94,7 @@ export const DecisionForm: FC<props> = ({
 
   //-- component data
   // eslint-disable-line no-console, max-len
-  const [data, applyData] = useState<Decision>({
+  const [data, setData] = useState<Decision>({
     schedule,
     sector,
     discharge,
@@ -112,7 +111,7 @@ export const DecisionForm: FC<props> = ({
 
   useEffect(() => {
     if (officerAssigned) {
-      applyData({ ...data, assignedTo: officerAssigned });
+      setData({ ...data, assignedTo: officerAssigned });
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [officerAssigned]);
@@ -120,7 +119,7 @@ export const DecisionForm: FC<props> = ({
   //-- update the decision state by property
   const updateModel = (property: string, value: string | Date | undefined) => {
     const model = { ...data, [property]: value };
-    applyData(model);
+    setData(model);
   };
 
   const getValue = (property: string): Option | undefined | null => {
@@ -196,7 +195,7 @@ export const DecisionForm: FC<props> = ({
       return record
     });
     const model = { ...data, sector: "", schedule: schedule };
-    applyData(model);
+    setData(model);
     setSector(options);
   };
 
@@ -204,7 +203,7 @@ export const DecisionForm: FC<props> = ({
     //-- if the action taken changes make sure to clear the
     //-- lead agency and inspection number
     const update = { ...data, actionTaken: value, leadAgency: undefined, inspectionNumber: undefined };
-    applyData(update);
+    setData(update);
   };
 
   const handleCancelButtonClick = () => {
@@ -217,7 +216,7 @@ export const DecisionForm: FC<props> = ({
           description: "Your changes will be lost.",
           cancelConfirmed: () => {
             //-- reset the form to its original state
-            applyData({
+            setData({
               schedule,
               sector,
               discharge,
diff --git a/frontend/src/app/store/reducers/code-table.ts b/frontend/src/app/store/reducers/code-table.ts
index 139101f32..e3a9fff91 100644
--- a/frontend/src/app/store/reducers/code-table.ts
+++ b/frontend/src/app/store/reducers/code-table.ts
@@ -138,8 +138,8 @@ export const fetchAllCodeTables = (): AppThunk => async (dispatch) => {
       discharge,
       "non-compliance": nonCompliance,
       rationale,
-      sector: sector,
-      schedule: schedule,
+      sector,
+      schedule,
       "decision-type": decisionType,
       "schedule-sector-type": scheduleSectorType,
       team,

From 114299bf175d93248239a4e30e6d1a4ca09cf0c1 Mon Sep 17 00:00:00 2001
From: gregorylavery <100631366+gregorylavery@users.noreply.github.com>
Date: Thu, 26 Sep 2024 14:45:44 -0700
Subject: [PATCH 3/7] Fixes consistency issue identified by sonarcloud

---
 .../outcomes/ceeb/ceeb-decision/decision-form.tsx           | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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 849a8368f..47816e877 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
@@ -107,7 +107,7 @@ export const DecisionForm: FC<props> = ({
     actionTakenDate,
   });
 
-  const [_sector, setSector] = useState<Array<Option>>();
+  const [sectorList, setSectorList] = useState<Array<Option>>();
 
   useEffect(() => {
     if (officerAssigned) {
@@ -196,7 +196,7 @@ export const DecisionForm: FC<props> = ({
     });
     const model = { ...data, sector: "", schedule: schedule };
     setData(model);
-    setSector(options);
+    setSectorList(options);
   };
 
   const handleActionTakenChange = (value: string) => {
@@ -393,7 +393,7 @@ export const DecisionForm: FC<props> = ({
               id="outcome-decision-sector-category"
               className="comp-details-input"
               classNamePrefix="comp-select"
-              options={_sector}
+              options={sectorList}
               enableValidation={true}
               errorMessage={sectorErrorMessage}
               placeholder="Select "

From d0407d3e2c24e84f336ff48f5654135e570022a1 Mon Sep 17 00:00:00 2001
From: gregorylavery <100631366+gregorylavery@users.noreply.github.com>
Date: Thu, 26 Sep 2024 15:19:45 -0700
Subject: [PATCH 4/7] Fixes issue with the sector dropdown not being populated
 on update.

---
 .../outcomes/ceeb/ceeb-decision/decision-form.tsx    | 12 ++++++++++++
 .../src/app/store/reducers/code-table-selectors.ts   |  1 -
 2 files changed, 12 insertions(+), 1 deletion(-)

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 2bd2c654d..8482b7a76 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
@@ -114,6 +114,18 @@ export const DecisionForm: FC<props> = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [officerAssigned]);
 
+  useEffect(() => {
+    if (sector && schedule) {
+      let options = scheduleSectorType.filter((item) => item.schedule === schedule).map(item => {
+        const record: Option = { label: item.longDescription, value: item.sector };
+        return record
+      });
+      const model = { ...data, sector: sector, schedule: schedule };
+      setData(model);
+      setSectorList(options);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [officerAssigned]);
   //-- update the decision state by property
   const updateModel = (property: string, value: string | Date | undefined) => {
     const model = { ...data, [property]: value };
diff --git a/frontend/src/app/store/reducers/code-table-selectors.ts b/frontend/src/app/store/reducers/code-table-selectors.ts
index a5db4c73a..714e36b17 100644
--- a/frontend/src/app/store/reducers/code-table-selectors.ts
+++ b/frontend/src/app/store/reducers/code-table-selectors.ts
@@ -41,7 +41,6 @@ export const selectScheduleSectorDropdown = (state: RootState): Array<Option> =>
   const {
     codeTables: { sector: items, "schedule-sector": scheduleSector },
   } = state;
-  let _scheduleSector = scheduleSector;
   const data = items.map(({ sector: value, longDescription: label }) => {
     return { label, value };
   });

From 4f4126ccc6e95b2682259bd0c301a05ee5059c53 Mon Sep 17 00:00:00 2001
From: gregorylavery <100631366+gregorylavery@users.noreply.github.com>
Date: Thu, 26 Sep 2024 15:33:43 -0700
Subject: [PATCH 5/7] Revised fix to avoid too many updates.

---
 .../complaints/outcomes/ceeb/ceeb-decision/decision-form.tsx  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 8482b7a76..73437c185 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
@@ -120,8 +120,8 @@ export const DecisionForm: FC<props> = ({
         const record: Option = { label: item.longDescription, value: item.sector };
         return record
       });
-      const model = { ...data, sector: sector, schedule: schedule };
-      setData(model);
+      // const model = { ...data, sector: sector, schedule: schedule };
+      // setData(model);
       setSectorList(options);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps

From 8e12dec772c4490d242027db3a353b7ea852ea07 Mon Sep 17 00:00:00 2001
From: gregorylavery <100631366+gregorylavery@users.noreply.github.com>
Date: Thu, 26 Sep 2024 15:34:14 -0700
Subject: [PATCH 6/7] Remove code rather than comment it out...

---
 .../complaints/outcomes/ceeb/ceeb-decision/decision-form.tsx    | 2 --
 1 file changed, 2 deletions(-)

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 73437c185..2b9c8a06f 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
@@ -120,8 +120,6 @@ export const DecisionForm: FC<props> = ({
         const record: Option = { label: item.longDescription, value: item.sector };
         return record
       });
-      // const model = { ...data, sector: sector, schedule: schedule };
-      // setData(model);
       setSectorList(options);
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps

From effa187983614d2cb576aa5e87582373bdfea04b Mon Sep 17 00:00:00 2001
From: gregorylavery <100631366+gregorylavery@users.noreply.github.com>
Date: Fri, 27 Sep 2024 09:28:09 -0700
Subject: [PATCH 7/7] Fixing up a code smell.

---
 .../outcomes/ceeb/ceeb-decision/decision-item.tsx      |  3 +--
 .../src/app/store/reducers/code-table-selectors.ts     | 10 ----------
 2 files changed, 1 insertion(+), 12 deletions(-)

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 c26eda6ad..b237b7d39 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
@@ -8,7 +8,6 @@ import {
   selectSectorDropdown,
   selectScheduleDropdown,
   selectDecisionTypeDropdown,
-  selectScheduleSectorDropdown,
 } from "../../../../../../store/reducers/code-table-selectors";
 import { selectOfficersDropdown } from "../../../../../../store/reducers/officer";
 import Option from "../../../../../../types/app/option";
@@ -46,7 +45,7 @@ export const DecisionItem: FC<props> = ({
   const nonComplianceOptions = useAppSelector(selectNonComplianceDropdown);
   const sectorsOptions = useAppSelector(selectSectorDropdown);
   const schedulesOptions = useAppSelector(selectScheduleDropdown);
-  const scheduleSectorsOptions = useAppSelector(selectScheduleSectorDropdown);
+  const scheduleSectorsOptions = useAppSelector(selectSectorDropdown);
   const decisionTypeOptions = useAppSelector(selectDecisionTypeDropdown);
   const agencyOptions = useAppSelector(selectLeadAgencyDropdown);
   const officerOptions = useAppSelector(selectOfficersDropdown(true));
diff --git a/frontend/src/app/store/reducers/code-table-selectors.ts b/frontend/src/app/store/reducers/code-table-selectors.ts
index 714e36b17..0723a9e4f 100644
--- a/frontend/src/app/store/reducers/code-table-selectors.ts
+++ b/frontend/src/app/store/reducers/code-table-selectors.ts
@@ -37,16 +37,6 @@ export const selectSectorDropdown = (state: RootState): Array<Option> => {
 
   return data;
 };
-export const selectScheduleSectorDropdown = (state: RootState): Array<Option> => {
-  const {
-    codeTables: { sector: items, "schedule-sector": scheduleSector },
-  } = state;
-  const data = items.map(({ sector: value, longDescription: label }) => {
-    return { label, value };
-  });
-
-  return data;
-};
 
 export const selectScheduleSectorXref = (state: RootState): Array<ScheduleSectorXref> => {
   const {