🐛 fix: not able to select involved officers with incidents (closes #273)

SnailyCAD · Jan 11, 2022 · ccc2772 · ccc2772
1 parent 934bbf3
commit ccc2772
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 9 deletions.
diff --git a/packages/api/src/controllers/leo/IncidentController.ts b/packages/api/src/controllers/leo/IncidentController.ts
@@ -21,7 +21,11 @@ export class IncidentController {
       },
     });
 
-    return incidents;
+    const officers = await prisma.officer.findMany({
+      include: leoProperties,
+    });
+
+    return { incidents, officers };
   }
 
   @UseBefore(ActiveOfficer)

diff --git a/packages/client/src/components/leo/modals/CreateIncidentModal.tsx b/packages/client/src/components/leo/modals/CreateIncidentModal.tsx
@@ -1,7 +1,7 @@
 import { LEO_INCIDENT_SCHEMA } from "@snailycad/schemas";
 import { Button } from "components/Button";
 import { FormField } from "components/form/FormField";
-import { Select } from "components/form/Select";
+import { Select, SelectValue } from "components/form/Select";
 import { Loader } from "components/Loader";
 import { Modal } from "components/modal/Modal";
 import { useModal } from "context/ModalContext";
@@ -31,9 +31,14 @@ export function CreateIncidentModal() {
   const { allOfficers } = useDispatchState();
 
   async function onSubmit(values: typeof INITIAL_VALUES) {
+    const data = {
+      ...values,
+      involvedOfficers: values.involvedOfficers.map((v) => v.value),
+    };
+
     const { json } = await execute("/incidents", {
       method: "POST",
-      data: values,
+      data,
     });
 
     if (json.id) {
@@ -48,7 +53,7 @@ export function CreateIncidentModal() {
   const validate = handleValidate(LEO_INCIDENT_SCHEMA);
   const INITIAL_VALUES = {
     description: "",
-    involvedOfficers: [],
+    involvedOfficers: [] as SelectValue[],
     firearmsInvolved: false,
     injuriesOrFatalities: false,
     arrestsMade: false,
@@ -69,6 +74,7 @@ export function CreateIncidentModal() {
               label={t("involvedOfficers")}
             >
               <Select
+                isMulti
                 value={values.involvedOfficers}
                 name="involvedOfficers"
                 onChange={handleChange}

diff --git a/packages/client/src/pages/officer/call-history.tsx b/packages/client/src/pages/officer/call-history.tsx
@@ -142,9 +142,9 @@ export default function CallHistory({ data: calls, incidents }: Props) {
 }
 
 export const getServerSideProps: GetServerSideProps = async ({ req, locale }) => {
-  const [calls, incidents] = await requestAll(req, [
+  const [calls, { incidents }] = await requestAll(req, [
     ["/911-calls?includeEnded=true", []],
-    ["/incidents", []],
+    ["/incidents", [{ incidents: [] }]],
   ]);
 
   return {

diff --git a/packages/client/src/pages/officer/incidents.tsx b/packages/client/src/pages/officer/incidents.tsx
@@ -112,6 +112,10 @@ export default function LeoIncidents({ officers, activeOfficer, incidents }: Pro
         <p className="mt-5">{t("noIncidents")}</p>
       ) : (
         <Table
+          defaultSort={{
+            columnId: "caseNumber",
+            descending: true,
+          }}
           data={incidents.map((incident) => ({
             caseNumber: `#${incident.caseNumber}`,
             officer: (
@@ -174,10 +178,9 @@ export default function LeoIncidents({ officers, activeOfficer, incidents }: Pro
 }
 
 export const getServerSideProps: GetServerSideProps = async ({ req, locale }) => {
-  const [incidents, activeOfficer, { officers }] = await requestAll(req, [
-    ["/incidents", []],
+  const [{ incidents, officers }, activeOfficer] = await requestAll(req, [
+    ["/incidents", [{ officers: [], incidents: [] }]],
     ["/leo/active-officer", null],
-    ["/leo", { officers: [] }],
   ]);
 
   return {