feat: able to assign/unassign

SnailyCAD · Sep 27, 2023 · 2f3d85b · 2f3d85b
1 parent e9a979f
commit 2f3d85b
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 22 deletions.
diff --git a/apps/api/src/controllers/leo/incidents/IncidentController.ts b/apps/api/src/controllers/leo/incidents/IncidentController.ts
@@ -168,6 +168,7 @@ export class IncidentController {
   }
 
   @Post("/:type/:incidentId")
+  @Description("Assign or unassign a unit from an Active Incident")
   @UsePermissions({
     permissions: [Permissions.Dispatch, Permissions.Leo, Permissions.EmsFd],
   })

diff --git a/apps/client/locales/en/leo.json b/apps/client/locales/en/leo.json
@@ -346,7 +346,9 @@
     "layoutSavedMessage": "Your layout has been saved.",
     "editDashboardLayout": "Edit Dashboard Layout",
     "vehicleInvolved": "Vehicle Involved",
-    "fireType": "Fire Type"
+    "fireType": "Fire Type",
+    "unassignFromIncident": "Unassign from incident",
+    "assignToIncident": "Assign to incident"
   },
   "Bolos": {
     "activeBolos": "Active Bolos",

diff --git a/apps/client/src/components/dispatch/active-incidents/active-incidents.tsx b/apps/client/src/components/dispatch/active-incidents/active-incidents.tsx
@@ -164,6 +164,7 @@ export function ActiveIncidents() {
                 description: <CallDescription data={incident} />,
                 actions: (
                   <ActiveIncidentsActionsColumn
+                    handleAssignUnassignToIncident={handleAssignUnassignToIncident}
                     setTempIncident={setTempIncident}
                     unit={activeUnitForRoute}
                     isUnitAssigned={isUnitAssigned}

diff --git a/apps/client/src/components/dispatch/active-incidents/columns/actions-column.tsx b/apps/client/src/components/dispatch/active-incidents/columns/actions-column.tsx
@@ -15,12 +15,16 @@ interface Props {
   unit: ActiveOfficer | ActiveDeputy | null;
   isUnitAssigned: boolean;
   setTempIncident(incident: LeoIncident): void;
-
-  // handleAssignUnassignToCall(call: Full911Call, type: "assign" | "unassign"): void;
+  handleAssignUnassignToIncident(
+    incident: LeoIncident,
+    unitId: string,
+    type: "assign" | "unassign",
+  ): void;
 }
 
 export function ActiveIncidentsActionsColumn({
   setTempIncident,
+  handleAssignUnassignToIncident,
   isUnitAssigned,
   unit,
   incident,
@@ -30,7 +34,7 @@ export function ActiveIncidentsActionsColumn({
   const { hasPermissions } = usePermission();
   const router = useRouter();
 
-  const t = useTranslations("Calls");
+  const t = useTranslations("Leo");
   const common = useTranslations("Common");
 
   const hasDispatchPermissions = hasPermissions(defaultPermissions.defaultDispatchPermissions);
@@ -69,17 +73,23 @@ export function ActiveIncidentsActionsColumn({
         >
           {t("end")}
         </Button>
-      ) : // <Button
-      //   className="ml-2"
-      //   disabled={!isUnitActive}
-      //   size="xs"
-      //   onPress={() =>
-      //     handleAssignUnassignToCall(incident, isUnitAssigned ? "unassign" : "assign")
-      //   }
-      // >
-      //   {isUnitAssigned ? t("unassignFromIncident") : t("assignToIncident")}
-      // </Button>
-      null}
+      ) : (
+        <Button
+          className="ml-2"
+          disabled={!isUnitActive}
+          size="xs"
+          onPress={() =>
+            unit &&
+            handleAssignUnassignToIncident(
+              incident,
+              unit.id,
+              isUnitAssigned ? "unassign" : "assign",
+            )
+          }
+        >
+          {isUnitAssigned ? t("unassignFromIncident") : t("assignToIncident")}
+        </Button>
+      )}
     </>
   );
 }
diff --git a/apps/client/src/components/leo/incidents/manage-incident-modal.tsx b/apps/client/src/components/leo/incidents/manage-incident-modal.tsx
@@ -117,13 +117,6 @@ export function ManageIncidentModal<T extends LeoIncident | EmsFdIncident>({
     activeUnit,
   });
 
-  console.log({
-    hasActiveDispatchers,
-    isDispatch,
-    isReadOnly,
-    areFieldsDisabled,
-  });
-
   function handleAddUpdateCallEvent(incident: LeoIncident) {
     setActiveIncidents(activeIncidents.map((inc) => (inc.id === incident.id ? incident : inc)));
   }