broguinn

diff --git a/infra/ansible/inventory/group_vars/bna1/zabbix.yml b/infra/ansible/inventory/group_vars/bna1/zabbix.yml
index e978c22..31387f6 100644
--- a/infra/ansible/inventory/group_vars/bna1/zabbix.yml
+++ b/infra/ansible/inventory/group_vars/bna1/zabbix.yml
@@ -138,8 +138,5 @@ ups_defaults:
   groups: ["BNA1 Power", "BNA1", "Power"]
   templates: ["CyberPower Cloud UPS"]
   interface_type: agent # An interface is required, but not used for API calls
-  macros:
-    - macro: '{$CYBERPOWER_API_TOKEN}'

broguinn

diff --git a/infra/ansible/roles/zabbix_config/templates/cyberpower_ups_template.yaml b/infra/ansible/roles/zabbix_config/templates/cyberpower_ups_template.yaml
index 533745e..a7be26e 100644
--- a/infra/ansible/roles/zabbix_config/templates/cyberpower_ups_template.yaml
+++ b/infra/ansible/roles/zabbix_config/templates/cyberpower_ups_template.yaml
@@ -10,9 +10,6 @@ zabbix_export:
       description: 'Template for monitoring basic details of CyberPower UPS devices'
       groups:
         - name: Templates/Power
-      macros:
-        - macro: '{$CYBERPOWER_API_TOKEN}'

broguinn

diff --git a/packages/frontend-config/.eslintrc.js b/packages/frontend-config/.eslintrc.js
index 5ccf08cd1..b5ab6969a 100644
--- a/packages/frontend-config/.eslintrc.js
+++ b/packages/frontend-config/.eslintrc.js
@@ -28,6 +28,7 @@ module.exports = {
   rules: {
     // Browser compatibility checking
     'compat/compat': 'error',
+    'import/extensions': 'off',
     'import/order': 'off',

broguinn

diff --git a/.gitignore b/.gitignore
index d69066c9c..d4f4b2c9e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,6 +44,7 @@ localdev/temporal-dev
 # Next.js
 .next/
 out/
+next-env.d.ts
 

broguinn

diff --git a/apps/api/package.json b/apps/api/package.json
index ec1d44764..244c565df 100644
--- a/apps/api/package.json
+++ b/apps/api/package.json
@@ -156,7 +156,6 @@
     "migrate": "scripts/migrate.sh",
     "migrate:revert": "scripts/migrate.sh --revert",
     "migration:create": "yarn build && scripts/migration-create.sh",
-    "lint-staged": "lint-staged",
     "lint": "eslint src/**/*.ts",

broguinn

commit b53f49f72eb05019723bd3eecb7dbdd886403877
Author: Braden O'Guinn <braden.oguinn@outpost.us>
Date:   Mon Mar 9 16:39:29 2026 -0500

    Perms

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
index f89832048..1d09b928e 100644
--- a/.github/workflows/validate.yml
+++ b/.github/workflows/validate.yml

broguinn

diff --git a/src/schema/yard/schema.graphql b/src/schema/yard/schema.graphql
index 5fee3d49..90ac6203 100644
--- a/src/schema/yard/schema.graphql
+++ b/src/schema/yard/schema.graphql
@@ -38,7 +38,7 @@ type Yard {
   """
   supportsContainerStacking: Boolean!
   gateActivityConnection(filters: GateActivityFilters!, cursor: String, pageSize: Int!): GateActivityConnection @auth(rule: OpsRequired)
-  lanes: [Lane!] @auth(or: [OpsRequired, GatekeeperRequired], gatekeeperPermissionsSource: Yard)
+  lanes: [Lane!]

broguinn

diff --git a/apps/command-center/src/apollo/client.ts b/apps/command-center/src/apollo/client.ts
index 34b2be73..2f6e0b43 100644
--- a/apps/command-center/src/apollo/client.ts
+++ b/apps/command-center/src/apollo/client.ts
@@ -1,6 +1,6 @@
 import { createClient } from 'graphql-ws';
 import { SentryLink } from 'apollo-link-sentry';
-import { buildGenericConnectionMerge } from 'shared';
+import { buildGenericConnectionMerge,  } from 'shared';
 import { setContext } from '@apollo/client/link/context';

broguinn

diff --git a/packages/shared/src/utils/apollo.ts b/packages/shared/src/utils/apollo.ts
index 3f3ab69c..d6301226 100644
--- a/packages/shared/src/utils/apollo.ts
+++ b/packages/shared/src/utils/apollo.ts
@@ -1,8 +1,15 @@
 export function buildGenericConnectionMerge() {
   return {
-    keyArgs: () => ['filters'],
-    merge(existing: any, incoming: any, { readField }: any) {
-      const edges = existing ? { ...existing.edges } : {};

broguinn

diff --git a/apps/command-center/src/app/dashboard/gate-events/auto-recognition/history/page.tsx b/apps/command-center/src/app/dashboard/gate-events/auto-recognition/history/page.tsx
index dd96fc51..464af5a5 100644
--- a/apps/command-center/src/app/dashboard/gate-events/auto-recognition/history/page.tsx
+++ b/apps/command-center/src/app/dashboard/gate-events/auto-recognition/history/page.tsx
@@ -23,6 +23,7 @@ const GetYardsVehicleRecognition = gql(`
       yards {
         id
         ...yardVehicleRecognitionFilters
+        ...yardVehicleDetectionGrid
       }