Merge branch 'main' into CA-615-refactor-breadcrumbs

intuitem · Dec 20, 2024 · 6bc68fb · 6bc68fb
2 parents 73ff076 + 21b8750
commit 6bc68fb
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/frontend/src/lib/utils/table.ts b/frontend/src/lib/utils/table.ts
@@ -123,7 +123,7 @@ const APPROVER_FILTER: ListViewFilterConfig = {
 
 const RISK_ASSESSMENT_FILTER: ListViewFilterConfig = {
 	component: SelectFilter,
-	getColumn: (row) => row.risk_assessment.name,
+	getColumn: (row) => row.risk_assessment?.name,
 	extraProps: {
 		defaultOptionName: 'riskAssessment'
 	}
@@ -257,7 +257,7 @@ const STAKEHOLDER_FILTER: ListViewFilterConfig = {
 
 const FRAMEWORK_FILTER: ListViewFilterConfig = {
 	component: SelectFilter,
-	getColumn: (row) => row.framework.ref_id,
+	getColumn: (row) => row.framework?.ref_id,
 	extraProps: {
 		defaultOptionName: 'framework' // Make translations
 	}