fix(device): include widget type and add widgetsCount on dashboard update

- Add widget 'type' field to the deviceRouter dashboard widgets mapping
- Retrieve current dashboard with widgets to get widgetsCount before update
- Throw 'NOT_FOUND' error if dashboard is missing during update
- Return updated dashboard with widgetsCount included in response
- Add 'type' field to DeviceInfoWidgetSchema for validation
- Fix enhanced-logger functions to return null explicitly when no error found

Author: EndyKaufman

web/src/server/trpc/routers/device.ts

@@ -1,7 +1,7 @@
 import { TRPCError } from '@trpc/server';
 
 import { prisma } from '../../prisma';
-import { DashboardSchema, DashboardType } from '../../types/DashboardSchema';
+import { DashboardSchema } from '../../types/DashboardSchema';
 import {
   DeviceInfoSchema,
   DeviceLinkSchema,
@@ -132,8 +132,9 @@ export const deviceRouter = router({
       id: dashboard.id,
       name: dashboard.name,
       isBlackTheme: dashboard.isBlackTheme,
-      widgets: dashboard.Widget.map(widget => ({
+      widgets: dashboard.Widget.map((widget) => ({
         id: widget.id,
+        type: widget.type,
         options: widget.options,
         state: widget.state,
         columnIndex: widget.columnIndex,
@@ -159,12 +160,34 @@ export const deviceRouter = router({
           message: 'Device ID not found!',
         });
       }
-      return (await prisma.dashboard.update({
+      // Get the current dashboard to get the widgetsCount
+      const currentDashboard = await prisma.dashboard.findFirst({
+        where: { deviceId: ctx.deviceId, userId: ctx.user.id },
+        include: {
+          Widget: true,
+        },
+      });
+
+      if (!currentDashboard) {
+        throw new TRPCError({
+          code: 'NOT_FOUND',
+          message: 'Dashboard not found!',
+        });
+      }
+
+      // Update the dashboard
+      const updatedDashboard = await prisma.dashboard.update({
         data: {
           isBlackTheme: input.isBlackTheme,
           updatedAt: new Date(),
         },
         where: { deviceId: ctx.deviceId, userId: ctx.user.id },
-      })) satisfies DashboardType;
+      });
+
+      // Return the dashboard with widgetsCount
+      return {
+        ...updatedDashboard,
+        widgetsCount: currentDashboard.Widget.length,
+      };
     }),
 });

web/src/server/types/DeviceSchema.ts

@@ -17,6 +17,7 @@ export type DeviceLinkType = z.infer<typeof DeviceLinkSchema>;
 // Device info response schema
 export const DeviceInfoWidgetSchema = z.object({
   [WidgetScalarFieldEnum.id]: z.string().uuid(),
+  [WidgetScalarFieldEnum.type]: z.string(),
   [WidgetScalarFieldEnum.options]: z.any().nullish(),
   [WidgetScalarFieldEnum.state]: z.any().nullish(),
   [WidgetScalarFieldEnum.columnIndex]: z.number().nullish(),
@@ -47,4 +48,4 @@ export const SaveDeviceSettingsSchema = z.object({
   [DashboardScalarFieldEnum.isBlackTheme]: z.boolean(),
 });
 
-export type SaveDeviceSettingsType = z.infer<typeof SaveDeviceSettingsSchema>;
+export type SaveDeviceSettingsType = z.infer<typeof SaveDeviceSettingsSchema>;

web/src/server/utils/enhanced-logger.ts

@@ -213,6 +213,7 @@ export function ifThisIsAnObjectWithCauseThatsAZodErrorTRPCWrapsZod({
     }
     return { serverError, clientError };
   }
+  return null;
 }
 
 // standardErrorObjectHandlingErrorInstancesOrTRPCError
@@ -278,6 +279,7 @@ export function standardErrorObjectHandlingErrorInstancesOrTRPCError(
       },
     };
   }
+  return null;
 }
 
 // catchPrismaErrors
@@ -356,6 +358,7 @@ export function catchPrismaErrors(
       clientError,
     };
   }
+  return null;
 }
 
 // normalStructuredOrStringPayloads