Add null check to actions (#1137)

* Add null check to actions
equinor · Sep 4, 2024 · bd42d62 · bd42d62
1 parent 6a9c42a
commit bd42d62
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/frontend/src/components/ActionTable/ActionTable.tsx b/frontend/src/components/ActionTable/ActionTable.tsx
@@ -87,8 +87,8 @@ const ActionTable = ({ onClickAction, actionsWithAdditionalInfo, personDetailsLi
                 return 0
             case 'project':
                 if (projects) {
-                    const projectNameA = getFusionProjectName(projects, a.action.question.evaluation.project.fusionProjectId)
-                    const projectNameB = getFusionProjectName(projects, b.action.question.evaluation.project.fusionProjectId)
+                    const projectNameA = getFusionProjectName(projects, a.action?.question?.evaluation?.project?.fusionProjectId)
+                    const projectNameB = getFusionProjectName(projects, b.action?.question?.evaluation?.project?.fusionProjectId)
                     return projectNameA && projectNameB ? sort(projectNameA.toLowerCase(), projectNameB.toLowerCase(), sortDirection) : 0
                 }
                 return 0

diff --git a/frontend/src/utils/helpers.ts b/frontend/src/utils/helpers.ts
@@ -62,6 +62,7 @@ export const selectSeverity = (severityCount: SeverityCount) => {
 }
 
 export const getFusionProjectName = (projects: Context[] | undefined, fusionProjectId: string) => {
+    if (!fusionProjectId || !projects) { return undefined }
     const fusionProject = projects?.find(project => project.id === fusionProjectId)
     return fusionProject?.title
 }
@@ -102,7 +103,7 @@ export const canSetEvaluationAsIndicator = (evaluation: Evaluation, userRoles: U
     let reasonsForNotBeingAbleToSelect = []
 
     if (!isFacilitator && !userIsAdmin) {
-            reasonsForNotBeingAbleToSelect.push("only facilitators and admins can set an evaluation as active")
+        reasonsForNotBeingAbleToSelect.push("only facilitators and admins can set an evaluation as active")
     }
     if (!evaluationIsNotActive) {
         reasonsForNotBeingAbleToSelect.push("this evaluation is already active")