feat: display non assessable requirement on table-mode

intuitem · Sep 16, 2024 · 81f875f · 81f875f
1 parent e269446
commit 81f875f
Show file tree

Hide file tree

Showing 3 changed files with 204 additions and 198 deletions.
diff --git a/frontend/src/lib/utils/schemas.ts b/frontend/src/lib/utils/schemas.ts
@@ -322,7 +322,6 @@ export const representativeSchema = z.object({
  phone: z.string().optional(),
  role: z.string().optional(),
  description: z.string().optional(),
- create_user: z.boolean().optional().default(false)
 });
 
 const SCHEMA_MAP: Record<string, AnyZodObject> = {

diff --git a/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/table-mode/+page.server.ts b/frontend/src/routes/(app)/compliance-assessments/[id=uuid]/table-mode/+page.server.ts
@@ -36,14 +36,27 @@ export const load = (async ({ fetch, params }) => {
  }
  );
  const observationBuffer = requirementAssessment.observation;
+ const assessable = true;
  return {
  ...requirementAssessment,
  evidenceCreateForm,
- observationBuffer
+ observationBuffer,
+ assessable
  };
  })
  );
- const requirements = tableMode.requirements;
+
+ const requirementAssessmentsById = requirement_assessments.reduce((acc, requirementAssessment) => {
+ acc[requirementAssessment.requirement] = requirementAssessment;
+ return acc;
+ }, {});
+
+ const requirements = tableMode.requirements.map(requirement => {
+ if (requirementAssessmentsById[requirement.id]) {
+ return requirementAssessmentsById[requirement.id]
+ }
+ return requirement;
+ });
 
  const schema = z.object({ id: z.string().uuid() });
  const deleteForm = await superValidate(zod(schema));