diff --git a/apps/web/components/dashboard/hours/HourMeasurementsDialog.tsx b/apps/web/components/dashboard/hours/HourMeasurementsDialog.tsx index 3c613a0..679d331 100644 --- a/apps/web/components/dashboard/hours/HourMeasurementsDialog.tsx +++ b/apps/web/components/dashboard/hours/HourMeasurementsDialog.tsx @@ -252,9 +252,9 @@ export default function HourMeasurementsDialog({ } {Object.keys(metricsByType).map(type => ( -
+
{titleCase(type)}
-
+
{metricsByType[type].map(metric => ( // If metric.name is in currentMeasurements, don't show it currentMeasurements.includes(metric.name) ? null : diff --git a/packages/trpc/routers/measurements.ts b/packages/trpc/routers/measurements.ts index d15a454..c45adca 100644 --- a/packages/trpc/routers/measurements.ts +++ b/packages/trpc/routers/measurements.ts @@ -91,7 +91,7 @@ export const measurementsAppRouter = router({ .output(zMeasurementSchema) .mutation(async ({ input, ctx }) => { const metric = await getMetricFromInput(ctx, input); - if (!metric[0]) { + if (!metric) { throw new TRPCError({ code: "NOT_FOUND", message: "Metric not found", @@ -109,8 +109,8 @@ export const measurementsAppRouter = router({ return { ...updatedMeasurement[0], - icon: metric[0].icon, - metricName: metric[0].name, + icon: metric.icon, + metricName: metric.name, }; } else { const newMeasurement = await ctx.db.insert(measurements).values({ @@ -122,8 +122,8 @@ export const measurementsAppRouter = router({ }).returning(); return { ...newMeasurement[0], - icon: metric[0].icon, - metricName: metric[0].name, + icon: metric.icon, + metricName: metric.name, }; } }),