COMP-724 add multiple sources and conditions to requirement grid (#657)

Author: tom0827

compliance-api/src/compliance_api/schemas/inspection_requirement_grid.py

@@ -52,7 +52,10 @@ class InspectionRequirementGridItemSchema(Schema):
     ir_number = fields.Str(
         metadata={"description": "The inspection requirement number"}
     )
-    requirement_number = fields.Str(metadata={"description": "The requirement number"})
+    requirement_number = fields.List(
+        fields.Str(),
+        metadata={"description": "The list of requirement numbers"}
+    )
     requirement_source = fields.Nested(
         KeyValueSchema, metadata={"description": "The requirement source"}
     )

compliance-api/src/compliance_api/services/inspection_requirement.py

@@ -1599,12 +1599,14 @@ def parse_requirement_sources(sources):
         item["progress"] = progress
         if requirement["requirement_source_details"]:
             first_requirement_details = requirement["requirement_source_details"][0]
-            number_field = ServiceUtils.get_requirement_source_number_field(
-                first_requirement_details
-            )
-            item["requirement_number"] = (
-                number_field.split(" ")[1] if number_field else None
-            )
+            requirement_numbers = []
+            req_sources = []
+            for detail in requirement["requirement_source_details"]:
+                if detail.requirement_source not in req_sources:
+                    req_sources.append(detail.requirement_source)
+                    number_field = ServiceUtils.get_requirement_source_number_field(detail)
+                    requirement_numbers.append(number_field.split(" ")[1] if number_field else [])
+            item["requirement_number"] = requirement_numbers
             item["requirement_source"] = first_requirement_details.requirement_source
         requirement_details.append(item)
     return requirement_details

compliance-web/src/components/App/RequirementsGrid/RequirementsGridUtils.tsx

@@ -226,7 +226,7 @@ export const useRequirementsGridColumns = (
       size: 80,
     },
     {
-      accessorFn: (row) => row.requirement_number,
+      accessorFn: (row) => row.requirement_number.join(", "),
       id: "req_src_num",
       header: "Condition #",
       filterFn: "contains",

compliance-web/src/models/InspectionRequirementGrid.ts

@@ -17,7 +17,7 @@ export interface InspectionRequirementGrid {
   sort_order: number;
   date_issued: string;
   ir_number: string;
-  requirement_number: string;
+  requirement_number: string[];
   requirement_sources: RequirementSource[];
   approved_by: StaffUser;
   approved_by_id: number;