Improve composite evaluation creation form validation

Author: neoxelox

apps/web/src/app/(private)/projects/[projectId]/versions/[commitUuid]/documents/[documentUuid]/(withTabs)/evaluations/_components/EvaluationsActions.tsx

@@ -340,6 +340,7 @@ function CombineEvaluations({
         Combine evaluations
       </TableWithHeader.Button>
       <ConfirmModal
+        dismissible
         size='medium'
         open={openCreateModal}
         title='Create a new composite score'

apps/web/src/app/(private)/projects/[projectId]/versions/[commitUuid]/issues/_components/IssueSpansTable/index.tsx

@@ -38,7 +38,7 @@ export function IssueSpansTable({
       <TableHeader className='sticky top-0 z-10'>
         <TableRow>
           <TableHead>Time</TableHead>
-          <TableHead>Commit</TableHead>
+          <TableHead>Version</TableHead>
           <TableHead>Duration</TableHead>
           <TableHead />
         </TableRow>

packages/core/src/services/evaluationsV2/composite/index.ts

@@ -4,6 +4,7 @@ import {
   CompositeEvaluationMetric,
   CompositeEvaluationResultError,
   CompositeEvaluationResultMetadata,
+  EvaluationConfiguration,
   EvaluationResultValue,
   EvaluationType,
   EvaluationV2,
@@ -40,28 +41,15 @@ export const CompositeEvaluationSpecification = {
   metrics: METRICS,
 }
 
-async function validate<M extends CompositeEvaluationMetric>(
-  {
-    metric,
-    uuid,
-    configuration,
-    evaluations,
-    ...rest
-  }: EvaluationMetricValidateArgs<EvaluationType.Composite, M> & {
-    metric: M
-  },
-  db = database,
-) {
-  const metricSpecification = METRICS[metric]
-  if (!metricSpecification) {
-    return Result.error(new BadRequestError('Invalid metric'))
-  }
-
-  const parsing = metricSpecification.configuration.safeParse(configuration)
-  if (parsing.error) {
-    return Result.error(parsing.error)
-  }
-
+async function validateSubEvaluations<M extends CompositeEvaluationMetric>({
+  uuid,
+  configuration,
+  evaluations,
+}: {
+  uuid?: string
+  configuration: EvaluationConfiguration<EvaluationType.Composite, M>
+  evaluations: EvaluationV2[]
+}) {
   if (configuration.evaluationUuids?.length === 0) {
     return Result.error(new BadRequestError('Sub-evaluations are required'))
   }
@@ -115,6 +103,49 @@ async function validate<M extends CompositeEvaluationMetric>(
     }
   }
 
+  return Result.ok(configuration)
+}
+
+async function validate<M extends CompositeEvaluationMetric>(
+  {
+    metric,
+    uuid,
+    configuration,
+    evaluations,
+    ...rest
+  }: EvaluationMetricValidateArgs<EvaluationType.Composite, M> & {
+    metric: M
+  },
+  db = database,
+) {
+  const metricSpecification = METRICS[metric]
+  if (!metricSpecification) {
+    return Result.error(new BadRequestError('Invalid metric'))
+  }
+
+  const parsing = metricSpecification.configuration.safeParse(configuration)
+  if (parsing.error) {
+    return Result.error(parsing.error)
+  }
+
+  const validating = await validateSubEvaluations({ uuid, configuration, evaluations }) // prettier-ignore
+  if (validating.error) {
+    if (validating.error instanceof BadRequestError) {
+      return Result.error(
+        new z.ZodError([
+          {
+            code: 'custom',
+            path: ['evaluationUuids'],
+            message: validating.error.message,
+          },
+        ]),
+      )
+    }
+
+    return Result.error(validating.error)
+  }
+  configuration = validating.value
+
   if (
     configuration.minThreshold !== undefined &&
     (configuration.minThreshold < 0 || configuration.minThreshold > 100)