Bugfix: catch Kimai data invalid actions/projects/customers

KatjaGlassConsulting · Feb 25, 2022 · 4ba33dc · 4ba33dc
1 parent a4bcaa5
commit 4ba33dc
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "timekex",
-    "version": "0.1.1",
+    "version": "0.1.2",
     "private": true,
     "homepage": ".",
     "license": "MIT",

diff --git a/src/components/WeekDataDisplay.js b/src/components/WeekDataDisplay.js
@@ -96,17 +96,17 @@ export const WeekDataDisplay = ({ dispatch }) => {
     var kimaiDisplayData = kimaiTimesheets.filter(item => item.begin.split('T')[0] >= startDay && item.end?.split('T')[0] <= endDay);
 
     // loop through DB data and update Sheet link if available, otherwise include into display data
-    kimaiDisplayData.forEach(item => {
+    kimaiDisplayData.forEach(item => {  
         const entry = {
             timesheetId: item.id,
             date: item.begin.split('T')[0],
             start: item.begin.substring(11, 16),
             end: item.end.substring(11, 16),
             project: kimaiData.projects[item.project].name,
             projectId: item.project,
-            customer: kimaiData.projects[item.project].customer.name,
-            customerId: kimaiData.projects[item.project].customer.id,
-            activity: kimaiData.activities[item.activity].name,
+            customer: kimaiData.projects[item.project].customer.name || "ERROR - invalid customer",
+            customerId: kimaiData.projects[item.project]?.customer.id || "ERROR - invalid project",
+            activity: kimaiData.activities[item.activity]?.name || "ERROR - invalid activity",
             activityId: item.activity,
             description: item.description ? item.description : "",
             billable: item.billable