🔨 bug fixes

closes #160 closes #159
SnailyCAD · Nov 21, 2021 · 3105354 · 3105354
1 parent 071e6c7
commit 3105354
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git a/packages/client/src/components/dispatch/ActiveOfficers.tsx b/packages/client/src/components/dispatch/ActiveOfficers.tsx
@@ -47,10 +47,17 @@ export const ActiveOfficers = () => {
   }
 
   async function handleunMerge(id: string) {
-    await execute(`/dispatch/status/unmerge/${id}`, {
+    const { json } = await execute(`/dispatch/status/unmerge/${id}`, {
       data: { id },
       method: "POST",
     });
+
+    if (json) {
+      router.replace({
+        pathname: router.pathname,
+        query: router.query,
+      });
+    }
   }
 
   async function setCode(id: string, status: StatusValue) {
@@ -97,7 +104,10 @@ export const ActiveOfficers = () => {
                   const canBeOpened =
                     isDispatch ||
                     shouldShowSplit ||
-                    (activeOfficer && activeOfficer.id !== officer.id);
+                    (activeOfficer &&
+                      activeOfficer.id !== officer.id &&
+                      !("officers" in officer) &&
+                      !("officers" in activeOfficer));
 
                   const codesMapped = codes10.values
                     .filter((v) => v.type === "STATUS_CODE")

diff --git a/packages/config/src/routes.ts b/packages/config/src/routes.ts
@@ -25,7 +25,7 @@ export type PermissionRoute = [Method[] | "*", string | RegExp, (user: _User) =>
 
 export const PERMISSION_ROUTES: PermissionRoute[] = [
   [["POST"], "/v1/dispatch/status/merge", (u) => u.isLeo],
-  [["POST"], "/v1/dispatch/status/unmerge", (u) => u.isDispatch],
+  [["POST"], "/v1/dispatch/status/unmerge", (u) => u.isDispatch || u.isLeo],
   [
     "*",
     /\/v1\/dispatch\/status\/\w+/i,