Merge pull request #1351 from cityofaustin/patch_trauma_fields

Patch missing near trauma fields and revoke Editor access to Changes tab
cityofaustin · Jan 25, 2024 · 13fe029 · 13fe029
2 parents d3889d2 + 46d3296
commit 13fe029
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 17 deletions.
diff --git a/atd-vzd/metadata/databases/default/tables/public_atd_txdot_crashes.yaml b/atd-vzd/metadata/databases/default/tables/public_atd_txdot_crashes.yaml
@@ -473,6 +473,8 @@ select_permissions:
         - milepoint_2
         - mpo_id
         - nbr_of_lane
+        - near_trauma_center_distance
+        - near_trauma_center_id
         - non_injry_cnt
         - nonincap_injry_cnt
         - obj_struck_id
@@ -701,6 +703,8 @@ select_permissions:
         - milepoint_2
         - mpo_id
         - nbr_of_lane
+        - near_trauma_center_distance
+        - near_trauma_center_id
         - non_injry_cnt
         - nonincap_injry_cnt
         - obj_struck_id

diff --git a/atd-vzd/migrations/default/1706048745536_crashes_add_near_trauma_center_fields/down.sql b/atd-vzd/migrations/default/1706048745536_crashes_add_near_trauma_center_fields/down.sql
@@ -0,0 +1,2 @@
+ALTER TABLE public.atd_txdot_crashes DROP COLUMN near_trauma_center_id;
+ALTER TABLE public.atd_txdot_crashes DROP COLUMN near_trauma_center_distance;
diff --git a/atd-vzd/migrations/default/1706048745536_crashes_add_near_trauma_center_fields/up.sql b/atd-vzd/migrations/default/1706048745536_crashes_add_near_trauma_center_fields/up.sql
@@ -0,0 +1,5 @@
+-- Add new trauma center fields from CRIS to the crashes table
+alter table "public"."atd_txdot_crashes" add column "near_trauma_center_id" integer
+ null;
+alter table "public"."atd_txdot_crashes" add column "near_trauma_center_distance" float8
+ null;
diff --git a/atd-vze/package.json b/atd-vze/package.json
@@ -1,6 +1,6 @@
 {
   "name": "atd-vz-data",
-  "version": "1.40.0",
+  "version": "1.40.2",
   "homepage": "./",
   "description": "ATD Vision Zero Editor",
   "author": "ATD Data & Technology Services",

diff --git a/atd-vze/src/_nav.js b/atd-vze/src/_nav.js
@@ -1,4 +1,4 @@
-import { isAdmin, isItSupervisor, isEditor } from "./auth/authContext";
+import { isAdmin, isItSupervisor } from "./auth/authContext";
 
 // Accept roles arg to restrict nav links by role
 export const navigation = roles => {
@@ -36,17 +36,13 @@ export const navigation = roles => {
     ],
   };
 
-  // Editor nav itmes
-  const editorNavItems = [
+  // Admin nav items
+  const adminNavItems = [
     {
       name: "Changes",
       url: "/changes",
       icon: "icon-layers",
     },
-  ];
-
-  // Admin nav items
-  const adminNavItems = [
     {
       title: true,
       name: "Admin",
@@ -92,12 +88,7 @@ export const navigation = roles => {
     },
   ];
 
-  if (isEditor(roles)) {
-    editorNavItems.forEach(item => nav.items.splice(-1, 0, item));
-  }
-
   if (isAdmin(roles) || isItSupervisor(roles)) {
-    editorNavItems.forEach(item => nav.items.splice(-1, 0, item));
     adminNavItems.forEach(item => nav.items.splice(-1, 0, item));
   }
 

diff --git a/atd-vze/src/routes.js b/atd-vze/src/routes.js
@@ -1,5 +1,5 @@
 import React from "react";
-import { isAdmin, isItSupervisor, isEditor } from "./auth/authContext";
+import { isAdmin, isItSupervisor } from "./auth/authContext";
 
 const Breadcrumbs = React.lazy(() => import("./views/Base/Breadcrumbs"));
 const Cards = React.lazy(() => import("./views/Base/Cards"));
@@ -179,13 +179,13 @@ const routes = roles => [
     name: "Demo UI Components",
     component: Dev,
   },
-  (isEditor(roles) || isAdmin(roles) || isItSupervisor(roles)) && {
+  (isAdmin(roles) || isItSupervisor(roles)) && {
     path: "/changes",
     exact: true,
     name: "Crash Changes",
     component: CrashesChanges,
   },
-  (isEditor(roles) || isAdmin(roles) || isItSupervisor(roles)) && {
+  (isAdmin(roles) || isItSupervisor(roles)) && {
     path: "/changes/:id",
     exact: true,
     name: "Crash Change",

diff --git a/atd-vzv/package.json b/atd-vzv/package.json
@@ -1,6 +1,6 @@
 {
   "name": "atd-vzv",
-  "version": "1.40.1",
+  "version": "1.40.2",
   "homepage": "/viewer",
   "description": "ATD Vision Zero Viewer",
   "author": "ATD Data & Technology Services",