fix: update webhook service taxonomy and guard against undefined service

- Rename service values from signals.vss/events.behavior/events.safety to signals/events
- Prefix condition field names with vss. namespace
- Merge event name options into single events key
- Change isEventService to use strict equality instead of startsWith (fixes crash when service is undefined)
- Add service default value to NewWebhookForm to prevent undefined on initial render

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>

Author: 0xsemaj

src/components/Webhooks/NewWebhookForm.tsx

@@ -49,6 +49,7 @@ export const NewWebhookForm = ({
   const methods = useForm<WebhookFormInput>({
     mode: 'onChange',
     defaultValues: {
+      service: '',
       coolDownPeriod: 0,
       cel: { operator: 'AND', conditions: [{ field: '', value: '', operator: '' }] },
       subscribe: {

src/components/Webhooks/fields/Service.tsx

@@ -36,9 +36,8 @@ export const WebhookServiceField = () => {
           required: 'Please select a webhook service',
         })}
         options={[
-          { value: 'signals.vss', text: 'VSS Signals' },
-          { value: 'events.behavior', text: 'Driving Behavior' },
-          { value: 'events.safety', text: 'Safety Events' },
+          { value: 'signals', text: 'VSS Signals' },
+          { value: 'events', text: 'Events' },
         ]}
         control={control}
       />

src/utils/webhook.ts

@@ -50,92 +50,92 @@ const booleanValidation: RegisterOptions = {
 };
 
 export const eventNamesByService: Record<string, { value: string; label: string }[]> = {
-  'events.behavior': [
-    { value: 'harshBraking', label: 'Harsh Braking' },
-    { value: 'extremeBraking', label: 'Extreme Braking' },
-    { value: 'harshAcceleration', label: 'Harsh Acceleration' },
-    { value: 'harshCornering', label: 'Harsh Cornering' },
+  events: [
+    { value: 'behavior.harshBraking', label: 'Harsh Braking' },
+    { value: 'behavior.extremeBraking', label: 'Extreme Braking' },
+    { value: 'behavior.harshAcceleration', label: 'Harsh Acceleration' },
+    { value: 'behavior.harshCornering', label: 'Harsh Cornering' },
+    { value: 'safety.collision', label: 'Collision' },
   ],
-  'events.safety': [{ value: 'collision', label: 'Collision' }],
 };
 
-export const isEventService = (service: string): boolean => service.startsWith('events.');
+export const isEventService = (service: string): boolean => service === 'events';
 
 export const conditionsConfig: ConditionConfig[] = [
   {
-    field: 'speed',
+    field: 'vss.speed',
     label: 'Speed',
     inputType: 'number',
     validation: numericValidation,
   },
   {
-    field: 'obdIsPluggedIn',
+    field: 'vss.obdIsPluggedIn',
     label: 'Device Plugged In',
     inputType: 'boolean',
     validation: booleanValidation,
   },
   {
-    field: 'isIgnitionOn',
+    field: 'vss.isIgnitionOn',
     label: 'Is Ignition On',
     inputType: 'boolean',
     validation: booleanValidation,
   },
   {
-    field: 'powertrainTractionBatteryCurrentPower',
+    field: 'vss.powertrainTractionBatteryCurrentPower',
     label: 'Battery current power',
     inputType: 'number',
     validation: numericValidation,
   },
   {
-    field: 'powertrainTractionBatteryChargingIsCharging',
+    field: 'vss.powertrainTractionBatteryChargingIsCharging',
     label: 'Battery is charging',
     inputType: 'boolean',
     validation: booleanValidation,
   },
   {
-    field: 'powertrainTransmissionTravelledDistance',
+    field: 'vss.powertrainTransmissionTravelledDistance',
     label: 'Odometer',
     inputType: 'number',
     validation: numericValidation,
   },
   {
-    field: 'powertrainTractionBatteryStateOfChargeCurrent',
+    field: 'vss.powertrainTractionBatteryStateOfChargeCurrent',
     label: 'Charge level',
     inputType: 'number',
     validation: numericValidation,
   },
   {
-    field: 'powertrainFuelSystemRelativeLevel',
+    field: 'vss.powertrainFuelSystemRelativeLevel',
     label: 'Fuel System Relative Level',
     inputType: 'number',
     validation: numericValidation,
   },
   {
-    field: 'powertrainFuelSystemAbsoluteLevel',
+    field: 'vss.powertrainFuelSystemAbsoluteLevel',
     label: 'Fuel System Absolute Level',
     inputType: 'number',
     validation: numericValidation,
   },
   {
-    field: 'chassisAxleRow1WheelLeftTirePressure',
+    field: 'vss.chassisAxleRow1WheelLeftTirePressure',
     label: 'Tire pressure (front left)',
     inputType: 'number',
     validation: numericValidation,
   },
   {
-    field: 'chassisAxleRow1WheelRightTirePressure',
+    field: 'vss.chassisAxleRow1WheelRightTirePressure',
     label: 'Tire pressure (front right)',
     inputType: 'number',
     validation: numericValidation,
   },
   {
-    field: 'chassisAxleRow2WheelLeftTirePressure',
+    field: 'vss.chassisAxleRow2WheelLeftTirePressure',
     label: 'Tire pressure (back left)',
     inputType: 'number',
     validation: numericValidation,
   },
   {
-    field: 'chassisAxleRow2WheelRightTirePressure',
+    field: 'vss.chassisAxleRow2WheelRightTirePressure',
     label: 'Tire pressure (back right)',
     inputType: 'number',
     validation: numericValidation,